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 com.gemstone.gemfire.modules.util.SessionCustomExpiry; -import com.gemstone.gemfire.modules.util.TouchPartitionedRegionEntriesFunction; -import com.gemstone.gemfire.modules.util.TouchReplicatedRegionEntriesFunction; +package org.apache.geode.modules.session.catalina; + +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.InterestResultPolicy; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionShortcut; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.client.ClientRegionFactory; +import org.apache.geode.cache.client.ClientRegionShortcut; +import org.apache.geode.cache.client.PoolManager; +import org.apache.geode.cache.client.internal.PoolImpl; +import org.apache.geode.cache.execute.Execution; +import org.apache.geode.cache.execute.FunctionService; +import org.apache.geode.cache.execute.ResultCollector; +import org.apache.geode.modules.session.catalina.callback.SessionExpirationCacheListener; +import org.apache.geode.modules.util.BootstrappingFunction; +import org.apache.geode.modules.util.CreateRegionFunction; +import org.apache.geode.modules.util.RegionConfiguration; +import org.apache.geode.modules.util.RegionSizeFunction; +import org.apache.geode.modules.util.RegionStatus; +import org.apache.geode.modules.util.SessionCustomExpiry; +import org.apache.geode.modules.util.TouchPartitionedRegionEntriesFunction; +import org.apache.geode.modules.util.TouchReplicatedRegionEntriesFunction; import javax.servlet.http.HttpSession; import java.util.HashSet; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/CommitSessionValve.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/CommitSessionValve.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/CommitSessionValve.java index 379fb18..a6568e6 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/CommitSessionValve.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/CommitSessionValve.java @@ -14,7 +14,7 @@ * 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 org.apache.catalina.Manager; import org.apache.catalina.connector.Request; @@ -30,7 +30,7 @@ public class CommitSessionValve extends ValveBase { private static final Log log = LogFactory.getLog(CommitSessionValve.class); - protected static final String info = "com.gemstone.gemfire.modules.session.catalina.CommitSessionValve/1.0"; + protected static final String info = "org.apache.geode.modules.session.catalina.CommitSessionValve/1.0"; public CommitSessionValve() { log.info("Initialized"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession.java index 754376a..8691829 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession.java @@ -14,21 +14,21 @@ * 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.DataSerializable; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.Delta; -import com.gemstone.gemfire.InvalidDeltaException; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.internal.cache.lru.Sizeable; -import com.gemstone.gemfire.internal.util.BlobHelper; -import com.gemstone.gemfire.modules.gatewaydelta.GatewayDelta; -import com.gemstone.gemfire.modules.gatewaydelta.GatewayDeltaEvent; -import com.gemstone.gemfire.modules.session.catalina.internal.DeltaSessionAttributeEvent; -import com.gemstone.gemfire.modules.session.catalina.internal.DeltaSessionAttributeEventBatch; -import com.gemstone.gemfire.modules.session.catalina.internal.DeltaSessionDestroyAttributeEvent; -import com.gemstone.gemfire.modules.session.catalina.internal.DeltaSessionUpdateAttributeEvent; +package org.apache.geode.modules.session.catalina; + +import org.apache.geode.DataSerializable; +import org.apache.geode.DataSerializer; +import org.apache.geode.Delta; +import org.apache.geode.InvalidDeltaException; +import org.apache.geode.cache.Region; +import org.apache.geode.internal.cache.lru.Sizeable; +import org.apache.geode.internal.util.BlobHelper; +import org.apache.geode.modules.gatewaydelta.GatewayDelta; +import org.apache.geode.modules.gatewaydelta.GatewayDeltaEvent; +import org.apache.geode.modules.session.catalina.internal.DeltaSessionAttributeEvent; +import org.apache.geode.modules.session.catalina.internal.DeltaSessionAttributeEventBatch; +import org.apache.geode.modules.session.catalina.internal.DeltaSessionDestroyAttributeEvent; +import org.apache.geode.modules.session.catalina.internal.DeltaSessionUpdateAttributeEvent; import org.apache.catalina.Manager; import org.apache.catalina.ha.session.SerializablePrincipal; import org.apache.catalina.realm.GenericPrincipal; @@ -86,7 +86,7 @@ public class DeltaSession extends StandardSession implements DataSerializable, D * The string manager for this package. */ // protected static StringManager STRING_MANAGER = -// StringManager.getManager("com.gemstone.gemfire.modules.session.catalina"); +// StringManager.getManager("org.apache.geode.modules.session.catalina"); /** * Construct a new <code>Session</code> associated with no <code>Manager</code>. The <code>Manager</code> will be http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionFacade.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionFacade.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionFacade.java index 2259ffe..a64e408 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionFacade.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionFacade.java @@ -14,7 +14,7 @@ * 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 org.apache.catalina.session.StandardSessionFacade; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionInterface.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionInterface.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionInterface.java index a293432..cbcd569 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionInterface.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionInterface.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.cache.Region; +import org.apache.geode.cache.Region; @@ -28,7 +28,7 @@ import java.util.List; import org.apache.catalina.Session; import org.apache.catalina.session.ManagerBase; -import com.gemstone.gemfire.modules.session.catalina.internal.DeltaSessionAttributeEvent; +import org.apache.geode.modules.session.catalina.internal.DeltaSessionAttributeEvent; public interface DeltaSessionInterface extends Session { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java index d1b6011..5e70c2f 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java @@ -14,18 +14,18 @@ * 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.CacheFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.query.Query; -import com.gemstone.gemfire.cache.query.QueryService; -import com.gemstone.gemfire.cache.query.SelectResults; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.modules.session.catalina.internal.DeltaSessionStatistics; -import com.gemstone.gemfire.modules.util.ContextMapper; -import com.gemstone.gemfire.modules.util.RegionConfiguration; -import com.gemstone.gemfire.modules.util.RegionHelper; +package org.apache.geode.modules.session.catalina; + +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.query.Query; +import org.apache.geode.cache.query.QueryService; +import org.apache.geode.cache.query.SelectResults; +import org.apache.geode.internal.cache.GemFireCacheImpl; +import org.apache.geode.modules.session.catalina.internal.DeltaSessionStatistics; +import org.apache.geode.modules.util.ContextMapper; +import org.apache.geode.modules.util.RegionConfiguration; +import org.apache.geode.modules.util.RegionHelper; import org.apache.catalina.Container; import org.apache.catalina.Context; import org.apache.catalina.Lifecycle; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/JvmRouteBinderValve.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/JvmRouteBinderValve.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/JvmRouteBinderValve.java index 98481c7..0254fb4 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/JvmRouteBinderValve.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/JvmRouteBinderValve.java @@ -14,7 +14,7 @@ * 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 org.apache.catalina.Manager; import org.apache.catalina.Session; @@ -27,7 +27,7 @@ import java.io.IOException; public class JvmRouteBinderValve extends ValveBase { - protected static final String info = "com.gemstone.gemfire.modules.session.JvmRouteBinderValve/1.0"; + protected static final String info = "org.apache.geode.modules.session.JvmRouteBinderValve/1.0"; @Override public void invoke(Request request, Response response) throws IOException, ServletException { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerCacheLifecycleListener.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerCacheLifecycleListener.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerCacheLifecycleListener.java index a86486c..254e4d3 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerCacheLifecycleListener.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerCacheLifecycleListener.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.PeerToPeerCache; +import org.apache.geode.modules.session.bootstrap.PeerToPeerCache; /** * This is a thin wrapper around a peer-to-peer cache. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java index 2c76ca5..82bcc6f 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java @@ -14,24 +14,24 @@ * 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.Cache; -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.RegionShortcut; -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.LocalSessionCacheLoader; -import com.gemstone.gemfire.modules.session.catalina.callback.LocalSessionCacheWriter; -import com.gemstone.gemfire.modules.session.catalina.callback.SessionExpirationCacheListener; -import com.gemstone.gemfire.modules.util.RegionConfiguration; -import com.gemstone.gemfire.modules.util.RegionHelper; -import com.gemstone.gemfire.modules.util.SessionCustomExpiry; -import com.gemstone.gemfire.modules.util.TouchPartitionedRegionEntriesFunction; -import com.gemstone.gemfire.modules.util.TouchReplicatedRegionEntriesFunction; +package org.apache.geode.modules.session.catalina; + +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionFactory; +import org.apache.geode.cache.RegionShortcut; +import org.apache.geode.cache.execute.Execution; +import org.apache.geode.cache.execute.FunctionService; +import org.apache.geode.cache.execute.ResultCollector; +import org.apache.geode.modules.session.catalina.callback.LocalSessionCacheLoader; +import org.apache.geode.modules.session.catalina.callback.LocalSessionCacheWriter; +import org.apache.geode.modules.session.catalina.callback.SessionExpirationCacheListener; +import org.apache.geode.modules.util.RegionConfiguration; +import org.apache.geode.modules.util.RegionHelper; +import org.apache.geode.modules.util.SessionCustomExpiry; +import org.apache.geode.modules.util.TouchPartitionedRegionEntriesFunction; +import org.apache.geode.modules.util.TouchReplicatedRegionEntriesFunction; import javax.servlet.http.HttpSession; import java.util.Set; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionCache.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionCache.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionCache.java index b1128e7..fc6c3cd 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionCache.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionCache.java @@ -14,11 +14,11 @@ * 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.GemFireCache; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.modules.session.catalina.internal.DeltaSessionStatistics; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.Region; +import org.apache.geode.modules.session.catalina.internal.DeltaSessionStatistics; 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/SessionManager.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionManager.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionManager.java index e3d6c7e..6afd1ca 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionManager.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionManager.java @@ -14,7 +14,7 @@ * 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 org.apache.juli.logging.Log; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/Tomcat6DeltaSessionManager.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/Tomcat6DeltaSessionManager.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/Tomcat6DeltaSessionManager.java index c89b990..f35c088 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/Tomcat6DeltaSessionManager.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/Tomcat6DeltaSessionManager.java @@ -14,7 +14,7 @@ * 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 org.apache.catalina.LifecycleException; import org.apache.catalina.LifecycleListener; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheLoader.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheLoader.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheLoader.java index a4afad4..ca86051 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheLoader.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheLoader.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.callback; +package org.apache.geode.modules.session.catalina.callback; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.Declarable; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.Region; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheLoaderException; +import org.apache.geode.cache.Declarable; +import org.apache.geode.cache.LoaderHelper; +import org.apache.geode.cache.Region; import javax.servlet.http.HttpSession; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheWriter.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheWriter.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheWriter.java index 0385ebf..a138f86 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheWriter.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheWriter.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.session.catalina.callback; - -import com.gemstone.gemfire.cache.CacheWriterException; -import com.gemstone.gemfire.cache.Declarable; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.cache.EntryNotFoundException; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.util.CacheWriterAdapter; +package org.apache.geode.modules.session.catalina.callback; + +import org.apache.geode.cache.CacheWriterException; +import org.apache.geode.cache.Declarable; +import org.apache.geode.cache.EntryEvent; +import org.apache.geode.cache.EntryNotFoundException; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.util.CacheWriterAdapter; import javax.servlet.http.HttpSession; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/SessionExpirationCacheListener.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/SessionExpirationCacheListener.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/SessionExpirationCacheListener.java index da9fffc..fd2b472 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/SessionExpirationCacheListener.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/SessionExpirationCacheListener.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.session.catalina.callback; +package org.apache.geode.modules.session.catalina.callback; -import com.gemstone.gemfire.cache.Declarable; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.cache.Operation; -import com.gemstone.gemfire.cache.util.CacheListenerAdapter; -import com.gemstone.gemfire.modules.session.catalina.DeltaSessionInterface; -import com.gemstone.gemfire.modules.util.ContextMapper; +import org.apache.geode.cache.Declarable; +import org.apache.geode.cache.EntryEvent; +import org.apache.geode.cache.Operation; +import org.apache.geode.cache.util.CacheListenerAdapter; +import org.apache.geode.modules.session.catalina.DeltaSessionInterface; +import org.apache.geode.modules.util.ContextMapper; import javax.servlet.http.HttpSession; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEvent.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEvent.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEvent.java index c930d6f..9bc9f7e 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEvent.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEvent.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.session.catalina.internal; +package org.apache.geode.modules.session.catalina.internal; -import com.gemstone.gemfire.DataSerializable; -import com.gemstone.gemfire.modules.session.catalina.DeltaSession; -import com.gemstone.gemfire.modules.session.catalina.DeltaSessionInterface; +import org.apache.geode.DataSerializable; +import org.apache.geode.modules.session.catalina.DeltaSession; +import org.apache.geode.modules.session.catalina.DeltaSessionInterface; public interface DeltaSessionAttributeEvent extends DataSerializable { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEventBatch.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEventBatch.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEventBatch.java index 8e4c0c3..3ccd2d0 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEventBatch.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEventBatch.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.session.catalina.internal; +package org.apache.geode.modules.session.catalina.internal; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.modules.gatewaydelta.AbstractGatewayDeltaEvent; -import com.gemstone.gemfire.modules.session.catalina.DeltaSession; -import com.gemstone.gemfire.modules.session.catalina.DeltaSessionInterface; +import org.apache.geode.DataSerializer; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.Region; +import org.apache.geode.modules.gatewaydelta.AbstractGatewayDeltaEvent; +import org.apache.geode.modules.session.catalina.DeltaSession; +import org.apache.geode.modules.session.catalina.DeltaSessionInterface; import java.io.DataInput; import java.io.DataOutput; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionDestroyAttributeEvent.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionDestroyAttributeEvent.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionDestroyAttributeEvent.java index dd96f49..021f2ef 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionDestroyAttributeEvent.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionDestroyAttributeEvent.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.internal; +package org.apache.geode.modules.session.catalina.internal; -import com.gemstone.gemfire.DataSerializable; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.Instantiator; -import com.gemstone.gemfire.modules.session.catalina.DeltaSession; -import com.gemstone.gemfire.modules.session.catalina.DeltaSessionInterface; +import org.apache.geode.DataSerializable; +import org.apache.geode.DataSerializer; +import org.apache.geode.Instantiator; +import org.apache.geode.modules.session.catalina.DeltaSession; +import org.apache.geode.modules.session.catalina.DeltaSessionInterface; import java.io.DataInput; import java.io.DataOutput; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionStatistics.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionStatistics.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionStatistics.java index 99a3a83..ed0196f 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionStatistics.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionStatistics.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.session.catalina.internal; - -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.modules.session.catalina.internal; + +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; public class DeltaSessionStatistics { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionUpdateAttributeEvent.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionUpdateAttributeEvent.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionUpdateAttributeEvent.java index 7b47280..0ea8635 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionUpdateAttributeEvent.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionUpdateAttributeEvent.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.internal; +package org.apache.geode.modules.session.catalina.internal; -import com.gemstone.gemfire.DataSerializable; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.Instantiator; -import com.gemstone.gemfire.modules.session.catalina.DeltaSession; -import com.gemstone.gemfire.modules.session.catalina.DeltaSessionInterface; +import org.apache.geode.DataSerializable; +import org.apache.geode.DataSerializer; +import org.apache.geode.Instantiator; +import org.apache.geode.modules.session.catalina.DeltaSession; +import org.apache.geode.modules.session.catalina.DeltaSessionInterface; import java.io.DataInput; import java.io.DataOutput; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/Banner.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/Banner.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/Banner.java index 413da07..7aeb9ff 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/Banner.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/Banner.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.util; +package org.apache.geode.modules.util; -import com.gemstone.gemfire.internal.GemFireVersion; +import org.apache.geode.internal.GemFireVersion; import java.io.IOException; import java.io.InputStream; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/BootstrappingFunction.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/BootstrappingFunction.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/BootstrappingFunction.java index 827c6f7..943a803 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/BootstrappingFunction.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/BootstrappingFunction.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.util; - -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.execute.Execution; -import com.gemstone.gemfire.cache.execute.Function; -import com.gemstone.gemfire.cache.execute.FunctionContext; -import com.gemstone.gemfire.cache.execute.FunctionService; -import com.gemstone.gemfire.cache.execute.ResultCollector; -import com.gemstone.gemfire.distributed.internal.DM; -import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; -import com.gemstone.gemfire.distributed.internal.MembershipListener; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; +package org.apache.geode.modules.util; + +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.execute.Execution; +import org.apache.geode.cache.execute.Function; +import org.apache.geode.cache.execute.FunctionContext; +import org.apache.geode.cache.execute.FunctionService; +import org.apache.geode.cache.execute.ResultCollector; +import org.apache.geode.distributed.internal.DM; +import org.apache.geode.distributed.internal.InternalDistributedSystem; +import org.apache.geode.distributed.internal.MembershipListener; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; import java.util.List; import java.util.Set; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ClassLoaderObjectInputStream.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ClassLoaderObjectInputStream.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ClassLoaderObjectInputStream.java index 8cd600e..e0297bb 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ClassLoaderObjectInputStream.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ClassLoaderObjectInputStream.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.util; +package org.apache.geode.modules.util; import java.io.IOException; import java.io.InputStream; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ContextMapper.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ContextMapper.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ContextMapper.java index e539d89..505b797 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ContextMapper.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ContextMapper.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.util; +package org.apache.geode.modules.util; -import com.gemstone.gemfire.modules.session.catalina.DeltaSessionManager; +import org.apache.geode.modules.session.catalina.DeltaSessionManager; import java.util.HashMap; import java.util.Map; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java index a9c9322..21d11d9 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.util; +package org.apache.geode.modules.util; import java.io.File; import java.io.FileWriter; @@ -22,27 +22,27 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.Properties; -import com.gemstone.gemfire.InternalGemFireError; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.Declarable; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.RegionShortcut; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.execute.Function; -import com.gemstone.gemfire.cache.execute.FunctionContext; -import com.gemstone.gemfire.cache.partition.PartitionRegionHelper; -import com.gemstone.gemfire.distributed.DistributedLockService; -import com.gemstone.gemfire.distributed.internal.locks.DistributedMemberLock; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.cache.InternalRegionArguments; -import com.gemstone.gemfire.internal.cache.PartitionedRegion; -import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; +import org.apache.geode.InternalGemFireError; +import org.apache.geode.cache.AttributesFactory; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.Declarable; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.RegionFactory; +import org.apache.geode.cache.RegionShortcut; +import org.apache.geode.cache.Scope; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.execute.Function; +import org.apache.geode.cache.execute.FunctionContext; +import org.apache.geode.cache.partition.PartitionRegionHelper; +import org.apache.geode.distributed.DistributedLockService; +import org.apache.geode.distributed.internal.locks.DistributedMemberLock; +import org.apache.geode.internal.cache.GemFireCacheImpl; +import org.apache.geode.internal.cache.InternalRegionArguments; +import org.apache.geode.internal.cache.PartitionedRegion; +import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator; +import org.apache.geode.internal.i18n.LocalizedStrings; public class CreateRegionFunction implements Function, Declarable { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/DebugCacheListener.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/DebugCacheListener.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/DebugCacheListener.java index baca5b8..2882f58 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/DebugCacheListener.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/DebugCacheListener.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.util; +package org.apache.geode.modules.util; -import com.gemstone.gemfire.cache.Declarable; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.cache.util.CacheListenerAdapter; +import org.apache.geode.cache.Declarable; +import org.apache.geode.cache.EntryEvent; +import org.apache.geode.cache.util.CacheListenerAdapter; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ModuleStatistics.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ModuleStatistics.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ModuleStatistics.java index 48020a3..1c41ec9 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ModuleStatistics.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ModuleStatistics.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.util; - -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.distributed.DistributedSystem; -import com.gemstone.gemfire.internal.statistics.StatisticsTypeFactoryImpl; +package org.apache.geode.modules.util; + +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.distributed.DistributedSystem; +import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl; /** * Statistics for modules. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfiguration.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfiguration.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfiguration.java index 55d2599..f8825d2 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfiguration.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfiguration.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.util; +package org.apache.geode.modules.util; -import com.gemstone.gemfire.DataSerializable; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.Instantiator; -import com.gemstone.gemfire.cache.CacheWriter; -import com.gemstone.gemfire.cache.CustomExpiry; +import org.apache.geode.DataSerializable; +import org.apache.geode.DataSerializer; +import org.apache.geode.Instantiator; +import org.apache.geode.cache.CacheWriter; +import org.apache.geode.cache.CustomExpiry; import java.io.DataInput; import java.io.DataOutput; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfigurationCacheListener.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfigurationCacheListener.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfigurationCacheListener.java index c25082b..c05d9d6 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfigurationCacheListener.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfigurationCacheListener.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.util; +package org.apache.geode.modules.util; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.Declarable; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionEvent; -import com.gemstone.gemfire.cache.RegionExistsException; -import com.gemstone.gemfire.cache.util.CacheListenerAdapter; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.Declarable; +import org.apache.geode.cache.EntryEvent; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionEvent; +import org.apache.geode.cache.RegionExistsException; +import org.apache.geode.cache.util.CacheListenerAdapter; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionHelper.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionHelper.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionHelper.java index 78e4423..dc338a1 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionHelper.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionHelper.java @@ -14,27 +14,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.util; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheWriter; -import com.gemstone.gemfire.cache.ExpirationAction; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.control.RebalanceFactory; -import com.gemstone.gemfire.cache.control.RebalanceOperation; -import com.gemstone.gemfire.cache.control.RebalanceResults; -import com.gemstone.gemfire.cache.control.ResourceManager; -import com.gemstone.gemfire.cache.partition.PartitionMemberInfo; -import com.gemstone.gemfire.cache.partition.PartitionRebalanceInfo; -import com.gemstone.gemfire.cache.partition.PartitionRegionHelper; -import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator; -import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation; -import com.gemstone.gemfire.modules.gatewaydelta.GatewayDeltaForwarderCacheListener; -import com.gemstone.gemfire.modules.session.catalina.callback.SessionExpirationCacheListener; +package org.apache.geode.modules.util; + +import org.apache.geode.cache.AttributesFactory; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheWriter; +import org.apache.geode.cache.ExpirationAction; +import org.apache.geode.cache.ExpirationAttributes; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.control.RebalanceFactory; +import org.apache.geode.cache.control.RebalanceOperation; +import org.apache.geode.cache.control.RebalanceResults; +import org.apache.geode.cache.control.ResourceManager; +import org.apache.geode.cache.partition.PartitionMemberInfo; +import org.apache.geode.cache.partition.PartitionRebalanceInfo; +import org.apache.geode.cache.partition.PartitionRegionHelper; +import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator; +import org.apache.geode.internal.cache.xmlcache.RegionAttributesCreation; +import org.apache.geode.modules.gatewaydelta.GatewayDeltaForwarderCacheListener; +import org.apache.geode.modules.session.catalina.callback.SessionExpirationCacheListener; import java.io.PrintWriter; import java.io.StringWriter; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionSizeFunction.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionSizeFunction.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionSizeFunction.java index 13791a3..5cad86c 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionSizeFunction.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionSizeFunction.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.util; +package org.apache.geode.modules.util; -import com.gemstone.gemfire.cache.Declarable; -import com.gemstone.gemfire.cache.execute.Function; -import com.gemstone.gemfire.cache.execute.FunctionContext; -import com.gemstone.gemfire.cache.execute.RegionFunctionContext; +import org.apache.geode.cache.Declarable; +import org.apache.geode.cache.execute.Function; +import org.apache.geode.cache.execute.FunctionContext; +import org.apache.geode.cache.execute.RegionFunctionContext; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionStatus.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionStatus.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionStatus.java index fec1fc1..d539a5c 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionStatus.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionStatus.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.util; +package org.apache.geode.modules.util; public enum RegionStatus { VALID, INVALID http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ResourceManagerValidator.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ResourceManagerValidator.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ResourceManagerValidator.java index c5edeea..bf39bb2 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ResourceManagerValidator.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ResourceManagerValidator.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.util; +package org.apache.geode.modules.util; -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.control.ResourceManager; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.control.ResourceManager; import java.lang.management.ManagementFactory; import java.lang.management.RuntimeMXBean; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/SessionCustomExpiry.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/SessionCustomExpiry.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/SessionCustomExpiry.java index 25ee3b1..2e6b3cf 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/SessionCustomExpiry.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/SessionCustomExpiry.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.util; +package org.apache.geode.modules.util; -import com.gemstone.gemfire.cache.CustomExpiry; -import com.gemstone.gemfire.cache.Declarable; -import com.gemstone.gemfire.cache.ExpirationAction; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.Region; +import org.apache.geode.cache.CustomExpiry; +import org.apache.geode.cache.Declarable; +import org.apache.geode.cache.ExpirationAction; +import org.apache.geode.cache.ExpirationAttributes; +import org.apache.geode.cache.Region; import javax.servlet.http.HttpSession; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchPartitionedRegionEntriesFunction.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchPartitionedRegionEntriesFunction.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchPartitionedRegionEntriesFunction.java index 15212b7..ab630a2 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchPartitionedRegionEntriesFunction.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchPartitionedRegionEntriesFunction.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.util; - -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.Declarable; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.execute.Function; -import com.gemstone.gemfire.cache.execute.FunctionContext; -import com.gemstone.gemfire.cache.execute.RegionFunctionContext; -import com.gemstone.gemfire.cache.partition.PartitionRegionHelper; +package org.apache.geode.modules.util; + +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.Declarable; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.execute.Function; +import org.apache.geode.cache.execute.FunctionContext; +import org.apache.geode.cache.execute.RegionFunctionContext; +import org.apache.geode.cache.partition.PartitionRegionHelper; import java.util.Properties; import java.util.Set; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchReplicatedRegionEntriesFunction.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchReplicatedRegionEntriesFunction.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchReplicatedRegionEntriesFunction.java index 0e1561e..f3bb294 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchReplicatedRegionEntriesFunction.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchReplicatedRegionEntriesFunction.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.util; - -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.Declarable; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.execute.Function; -import com.gemstone.gemfire.cache.execute.FunctionContext; +package org.apache.geode.modules.util; + +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.Declarable; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.execute.Function; +import org.apache.geode.cache.execute.FunctionContext; import java.util.Properties; import java.util.Set; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Callback.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Callback.java b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Callback.java index 12e935d..4b04b56 100644 --- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Callback.java +++ b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Callback.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.session; +package org.apache.geode.modules.session; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/CommandServlet.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/CommandServlet.java b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/CommandServlet.java index 32ac7d8..89e8d8d 100644 --- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/CommandServlet.java +++ b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/CommandServlet.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.gemstone.gemfire.modules.session; +package org.apache.geode.modules.session; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/EmbeddedTomcat.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/EmbeddedTomcat.java b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/EmbeddedTomcat.java index 53a305e..1d97149 100644 --- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/EmbeddedTomcat.java +++ b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/EmbeddedTomcat.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; +package org.apache.geode.modules.session; -import com.gemstone.gemfire.modules.session.catalina.JvmRouteBinderValve; +import org.apache.geode.modules.session.catalina.JvmRouteBinderValve; import org.apache.catalina.Context; import org.apache.catalina.Engine; import org.apache.catalina.Host; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/QueryCommand.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/QueryCommand.java b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/QueryCommand.java index a891c5a..81d5301 100644 --- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/QueryCommand.java +++ b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/QueryCommand.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.session; +package org.apache.geode.modules.session; /** * Basic commands to pass to our test servlet http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/TestSessionsBase.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/TestSessionsBase.java b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/TestSessionsBase.java index f2d1d4d..a680d9e 100644 --- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/TestSessionsBase.java +++ b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/TestSessionsBase.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; +package org.apache.geode.modules.session; -import static com.gemstone.gemfire.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.*; import static org.junit.Assert.*; import java.beans.PropertyChangeEvent; @@ -35,10 +35,10 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.Test; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.internal.AvailablePortHelper; -import com.gemstone.gemfire.modules.session.catalina.DeltaSessionManager; -import com.gemstone.gemfire.modules.session.catalina.PeerToPeerCacheLifecycleListener; +import org.apache.geode.cache.Region; +import org.apache.geode.internal.AvailablePortHelper; +import org.apache.geode.modules.session.catalina.DeltaSessionManager; +import org.apache.geode.modules.session.catalina.PeerToPeerCacheLifecycleListener; public abstract class TestSessionsBase { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java index bccf695..1a9c715 100644 --- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java +++ b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.session; +package org.apache.geode.modules.session; -import com.gemstone.gemfire.modules.session.catalina.Tomcat6DeltaSessionManager; -import com.gemstone.gemfire.test.junit.categories.UnitTest; +import org.apache.geode.modules.session.catalina.Tomcat6DeltaSessionManager; +import org.apache.geode.test.junit.categories.UnitTest; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/test/resources/org/apache/geode/modules/Event.hbm.xml ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/test/resources/org/apache/geode/modules/Event.hbm.xml b/extensions/geode-modules/src/test/resources/org/apache/geode/modules/Event.hbm.xml index 17faf29..9843c51 100644 --- a/extensions/geode-modules/src/test/resources/org/apache/geode/modules/Event.hbm.xml +++ b/extensions/geode-modules/src/test/resources/org/apache/geode/modules/Event.hbm.xml @@ -3,7 +3,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";> -<hibernate-mapping package="com.gemstone.gemfire.modules"> +<hibernate-mapping package="org.apache.geode.modules"> <class name="Event" table="EVENTS"> <cache usage="read-write"/> <id name="id" column="EVENT_ID"> http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/test/resources/org/apache/geode/modules/Person.hbm.xml ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/test/resources/org/apache/geode/modules/Person.hbm.xml b/extensions/geode-modules/src/test/resources/org/apache/geode/modules/Person.hbm.xml index c6380e7..7f6b0da 100644 --- a/extensions/geode-modules/src/test/resources/org/apache/geode/modules/Person.hbm.xml +++ b/extensions/geode-modules/src/test/resources/org/apache/geode/modules/Person.hbm.xml @@ -3,7 +3,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";> -<hibernate-mapping package="com.gemstone.gemfire.modules"> +<hibernate-mapping package="org.apache.geode.modules"> <class name="Person" table="PERSON"> <cache usage="read-write"/> <id name="id" column="PERSON_ID"> http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/build.gradle ---------------------------------------------------------------------- diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle index fd9f76c..3ed864b 100755 --- a/geode-assembly/build.gradle +++ b/geode-assembly/build.gradle @@ -99,7 +99,7 @@ tasks.withType(Test){ task defaultDistributionConfig(type: JavaExec, dependsOn: classes) { outputs.file file("$buildDir/gemfire.properties") - main 'com.gemstone.gemfire.distributed.internal.DistributionConfigImpl' + main 'org.apache.geode.distributed.internal.DistributionConfigImpl' classpath project(':geode-core').sourceSets.main.runtimeClasspath workingDir buildDir @@ -110,7 +110,7 @@ task defaultDistributionConfig(type: JavaExec, dependsOn: classes) { task defaultCacheConfig(type: JavaExec, dependsOn: classes) { outputs.file file("$buildDir/cache.xml") - main 'com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator' + main 'org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator' classpath project(':geode-core').sourceSets.main.runtimeClasspath workingDir buildDir @@ -215,12 +215,12 @@ task docs(type: Javadoc) { source parent.subprojects*.javadoc*.source classpath = files(parent.subprojects*.javadoc*.classpath) title = "${productName} ${project.version}" - include 'com/gemstone/gemfire/**/' - exclude 'com/gemstone/gemfire/internal/**/' - exclude 'com/gemstone/gemfire/**/internal/**/' - exclude 'com/gemstone/gemfire/**/xml/**/' - exclude 'com/gemstone/gemfire/distributed/**/util/**/' - exclude 'com/gemstone/gemfire/test/**/' + include 'org/apache/geode/**/' + exclude 'org/apache/geode/internal/**/' + exclude 'org/apache/geode/**/internal/**/' + exclude 'org/apache/geode/**/xml/**/' + exclude 'org/apache/geode/distributed/**/util/**/' + exclude 'org/apache/geode/test/**/' destinationDir = docsDir doLast { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/main/dist/bin/gfsh ---------------------------------------------------------------------- diff --git a/geode-assembly/src/main/dist/bin/gfsh b/geode-assembly/src/main/dist/bin/gfsh index 48d3696..7e6531e 100755 --- a/geode-assembly/src/main/dist/bin/gfsh +++ b/geode-assembly/src/main/dist/bin/gfsh @@ -58,7 +58,7 @@ fi if [ "x$WINDIR" != "x" ]; then if [ "${UNAME}" = "cygwin" ]; then # Added for making backspace work under cygwin - JLINE_TERMINAL="-Djline.terminal=com.gemstone.gemfire.management.internal.cli.shell.jline.CygwinMinttyTerminal" + JLINE_TERMINAL="-Djline.terminal=org.apache.geode.management.internal.cli.shell.jline.CygwinMinttyTerminal" else echo "ERROR: The variable WINDIR is set indicating this script is running in a Windows OS, please use the .bat file version instead." exit 1 @@ -91,7 +91,7 @@ CLASSPATH=$GEMFIRE_JARS # mkdir -p $HOME/.gemfire/gfsh #fi -LAUNCHER=com.gemstone.gemfire.management.internal.cli.Launcher +LAUNCHER=org.apache.geode.management.internal.cli.Launcher if [ "x$JAVA_ARGS" != "x" ]; then JAVA_ARGS="$JAVA_ARGS" http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/main/dist/bin/gfsh.bat ---------------------------------------------------------------------- diff --git a/geode-assembly/src/main/dist/bin/gfsh.bat b/geode-assembly/src/main/dist/bin/gfsh.bat index 706146a..8206b6e 100755 --- a/geode-assembly/src/main/dist/bin/gfsh.bat +++ b/geode-assembly/src/main/dist/bin/gfsh.bat @@ -76,7 +76,7 @@ REM Expect to find the tools.jar from the JDK set TOOLS_JAR= ) -@set LAUNCHER=com.gemstone.gemfire.management.internal.cli.Launcher +@set LAUNCHER=org.apache.geode.management.internal.cli.Launcher @if defined JAVA_ARGS ( @set JAVA_ARGS="%JAVA_ARGS%" ) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java index 9b59f80..415866b 100644 --- a/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java +++ b/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire; +package org.apache.geode; import static org.junit.Assert.*; @@ -35,9 +35,9 @@ import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import com.gemstone.gemfire.internal.FileUtil; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; -import com.gemstone.gemfire.util.test.TestUtil; +import org.apache.geode.internal.FileUtil; +import org.apache.geode.test.junit.categories.IntegrationTest; +import org.apache.geode.util.test.TestUtil; @Category(IntegrationTest.class) public class BundledJarsJUnitTest { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/distributed/LocatorLauncherAssemblyIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-assembly/src/test/java/org/apache/geode/distributed/LocatorLauncherAssemblyIntegrationTest.java b/geode-assembly/src/test/java/org/apache/geode/distributed/LocatorLauncherAssemblyIntegrationTest.java index c37c0b5..ee72b30 100644 --- a/geode-assembly/src/test/java/org/apache/geode/distributed/LocatorLauncherAssemblyIntegrationTest.java +++ b/geode-assembly/src/test/java/org/apache/geode/distributed/LocatorLauncherAssemblyIntegrationTest.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed; - -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.distributed.AbstractLauncher.Status; -import com.gemstone.gemfire.distributed.LocatorLauncher.Builder; -import com.gemstone.gemfire.internal.AvailablePortHelper; -import com.gemstone.gemfire.internal.process.ProcessType; -import com.gemstone.gemfire.internal.process.ProcessUtils; -import com.gemstone.gemfire.management.ManagementService; -import com.gemstone.gemfire.management.ManagerMXBean; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; -import com.gemstone.gemfire.test.junit.runners.CategoryWithParameterizedRunnerFactory; +package org.apache.geode.distributed; + +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.distributed.AbstractLauncher.Status; +import org.apache.geode.distributed.LocatorLauncher.Builder; +import org.apache.geode.internal.AvailablePortHelper; +import org.apache.geode.internal.process.ProcessType; +import org.apache.geode.internal.process.ProcessUtils; +import org.apache.geode.management.ManagementService; +import org.apache.geode.management.ManagerMXBean; +import org.apache.geode.test.junit.categories.IntegrationTest; +import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -38,7 +38,7 @@ import java.io.File; import static org.junit.Assert.*; -import static com.gemstone.gemfire.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.*; /** * These tests are part of assembly as they require the REST war file to be present. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java index 59da3cf..78cf167 100644 --- a/geode-assembly/src/test/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java +++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.management.internal; +package org.apache.geode.management.internal; -import com.gemstone.gemfire.internal.GemFireVersion; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import org.apache.geode.internal.GemFireVersion; +import org.apache.geode.test.junit.categories.IntegrationTest; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java index 50201ba..490e309 100644 --- a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java +++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.management.internal.cli.commands; +package org.apache.geode.management.internal.cli.commands; -import static com.gemstone.gemfire.distributed.ConfigurationProperties.*; -import static com.gemstone.gemfire.test.dunit.Assert.*; -import static com.gemstone.gemfire.test.dunit.Wait.*; +import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.apache.geode.test.dunit.Assert.*; +import static org.apache.geode.test.dunit.Wait.*; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -52,49 +52,49 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runners.MethodSorters; -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.client.Pool; -import com.gemstone.gemfire.cache.client.PoolFactory; -import com.gemstone.gemfire.cache.client.PoolManager; -import com.gemstone.gemfire.distributed.AbstractLauncher.ServiceState; -import com.gemstone.gemfire.distributed.AbstractLauncher.Status; -import com.gemstone.gemfire.distributed.LocatorLauncher; -import com.gemstone.gemfire.distributed.LocatorLauncher.Builder; -import com.gemstone.gemfire.distributed.LocatorLauncher.Command; -import com.gemstone.gemfire.distributed.LocatorLauncher.LocatorState; -import com.gemstone.gemfire.distributed.ServerLauncher; -import com.gemstone.gemfire.distributed.ServerLauncher.ServerState; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.internal.AvailablePortHelper; -import com.gemstone.gemfire.internal.lang.ObjectUtils; -import com.gemstone.gemfire.internal.lang.StringUtils; -import com.gemstone.gemfire.internal.lang.SystemUtils; -import com.gemstone.gemfire.internal.process.ProcessType; -import com.gemstone.gemfire.internal.util.IOUtils; -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.util.CommandStringBuilder; -import com.gemstone.gemfire.test.dunit.WaitCriterion; -import com.gemstone.gemfire.test.junit.categories.DistributedTest; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.client.ClientCacheFactory; +import org.apache.geode.cache.client.ClientRegionFactory; +import org.apache.geode.cache.client.ClientRegionShortcut; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.client.PoolFactory; +import org.apache.geode.cache.client.PoolManager; +import org.apache.geode.distributed.AbstractLauncher.ServiceState; +import org.apache.geode.distributed.AbstractLauncher.Status; +import org.apache.geode.distributed.LocatorLauncher; +import org.apache.geode.distributed.LocatorLauncher.Builder; +import org.apache.geode.distributed.LocatorLauncher.Command; +import org.apache.geode.distributed.LocatorLauncher.LocatorState; +import org.apache.geode.distributed.ServerLauncher; +import org.apache.geode.distributed.ServerLauncher.ServerState; +import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.internal.AvailablePortHelper; +import org.apache.geode.internal.lang.ObjectUtils; +import org.apache.geode.internal.lang.StringUtils; +import org.apache.geode.internal.lang.SystemUtils; +import org.apache.geode.internal.process.ProcessType; +import org.apache.geode.internal.util.IOUtils; +import org.apache.geode.management.cli.Result; +import org.apache.geode.management.internal.cli.i18n.CliStrings; +import org.apache.geode.management.internal.cli.result.CommandResult; +import org.apache.geode.management.internal.cli.util.CommandStringBuilder; +import org.apache.geode.test.dunit.WaitCriterion; +import org.apache.geode.test.junit.categories.DistributedTest; /** * The LauncherLifecycleCommandsDUnitTest class is a test suite of integration tests testing the contract and * functionality of the GemFire launcher lifecycle commands inside Gfsh. * @see javax.management.MBeanServerConnection * @see javax.management.remote.JMXConnector - * @see com.gemstone.gemfire.distributed.AbstractLauncher - * @see com.gemstone.gemfire.distributed.LocatorLauncher - * @see com.gemstone.gemfire.distributed.ServerLauncher - * @see com.gemstone.gemfire.internal.AvailablePortHelper - * @see com.gemstone.gemfire.management.internal.cli.shell.Gfsh - * @see com.gemstone.gemfire.management.internal.cli.commands.CliCommandTestBase - * @see com.gemstone.gemfire.management.internal.cli.commands.LauncherLifecycleCommands - * @see com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder + * @see org.apache.geode.distributed.AbstractLauncher + * @see org.apache.geode.distributed.LocatorLauncher + * @see org.apache.geode.distributed.ServerLauncher + * @see org.apache.geode.internal.AvailablePortHelper + * @see org.apache.geode.management.internal.cli.shell.Gfsh + * @see org.apache.geode.management.internal.cli.commands.CliCommandTestBase + * @see org.apache.geode.management.internal.cli.commands.LauncherLifecycleCommands + * @see org.apache.geode.management.internal.cli.util.CommandStringBuilder * @since GemFire 7.0 */ @Category(DistributedTest.class) @@ -315,7 +315,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase { assertTrue(resultString, resultString.contains("Exception in thread \"main\" java.lang.RuntimeException: A PID file already exists and a Locator may be running in " + IOUtils .tryGetCanonicalFileElseGetAbsoluteFile(workingDirectory))); - assertTrue(resultString, resultString.contains("Caused by: com.gemstone.gemfire.internal.process.FileAlreadyExistsException: Pid file already exists: " + IOUtils + assertTrue(resultString, resultString.contains("Caused by: org.apache.geode.internal.process.FileAlreadyExistsException: Pid file already exists: " + IOUtils .tryGetCanonicalFileElseGetAbsoluteFile(pidFile))); }
