diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 206350f..0000000 --- a/.travis.yml +++ /dev/null @@ -1,11 +0,0 @@ -language: java -sudo: false - -jdk: -- openjdk8 - -install: /bin/true - -script: -- mvn --batch-mode install -DskipTests=true -Dmaven.javadoc.skip=true -Dgpg.skip=true --show-version -- mvn --batch-mode verify -Dgpg.skip=true diff --git a/backing-store/pom.xml b/backing-store/pom.xml index 010f5c0..400f01a 100644 --- a/backing-store/pom.xml +++ b/backing-store/pom.xml @@ -1,6 +1,6 @@ - + 4.0.0 org.glassfish.shoal shoal - 3.1.1-SNAPSHOT - ../pom.xml + 4.0.0-SNAPSHOT shoal-backing-store jar shoal-backing-store - - ${project.artifactId} - - - maven-jar-plugin - - - ${basedir}/src/main/resources/META-INF/MANIFEST.MF - - - - - - mk111283 @@ -70,4 +55,21 @@ + + + + org.apache.felix + maven-bundle-plugin + + + bundle-manifest + process-classes + + manifest + + + + + + diff --git a/backing-store/src/main/java/module-info.java b/backing-store/src/main/java/module-info.java new file mode 100644 index 0000000..8afa6f9 --- /dev/null +++ b/backing-store/src/main/java/module-info.java @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2026 Contributors to the Eclipse Foundation + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0, which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the + * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + * version 2 with the GNU Classpath Exception, which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + */ + +/** + * @author David Matejcek + */ +module org.glassfish.shoal.backingstore { + + requires org.glassfish.ha.api; + requires org.glassfish.shoal.ha.cache; + + exports org.glassfish.shoal.adapter.store; +} diff --git a/backing-store/src/main/java/org/shoal/adapter/store/ReplicationBackingStoreFactory.java b/backing-store/src/main/java/org/glassfish/shoal/adapter/store/GlassFishReplicationBackingStoreFactory.java similarity index 64% rename from backing-store/src/main/java/org/shoal/adapter/store/ReplicationBackingStoreFactory.java rename to backing-store/src/main/java/org/glassfish/shoal/adapter/store/GlassFishReplicationBackingStoreFactory.java index 86bd488..afdecc6 100644 --- a/backing-store/src/main/java/org/shoal/adapter/store/ReplicationBackingStoreFactory.java +++ b/backing-store/src/main/java/org/glassfish/shoal/adapter/store/GlassFishReplicationBackingStoreFactory.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2023 Contributors to the Eclipse Foundation. * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -14,43 +15,33 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.adapter.store; - -import org.glassfish.ha.store.api.*; +package org.glassfish.shoal.adapter.store; import java.io.Serializable; -import java.util.Properties; + +import org.glassfish.ha.store.api.BackingStore; +import org.glassfish.ha.store.api.BackingStoreConfiguration; +import org.glassfish.ha.store.api.BackingStoreException; +import org.glassfish.ha.store.api.BackingStoreFactory; +import org.glassfish.ha.store.api.BackingStoreTransaction; /** * @author Mahesh Kannan */ -public class ReplicationBackingStoreFactory - implements BackingStoreFactory { - - private Properties props; - - public ReplicationBackingStoreFactory() { - } - - public ReplicationBackingStoreFactory(Properties p) { - this.props=p; - } +public class GlassFishReplicationBackingStoreFactory implements BackingStoreFactory { @Override - public BackingStore createBackingStore(BackingStoreConfiguration conf) throws BackingStoreException { - - InMemoryBackingStore bStore = new InMemoryBackingStore(); + public BackingStore createBackingStore( + BackingStoreConfiguration conf) throws BackingStoreException { + InMemoryBackingStore bStore = new InMemoryBackingStore<>(); bStore.initialize(conf); System.out.println("ReplicationBackingStoreFactory:: CREATED an instance of: " + bStore.getClass().getName()); return bStore; } + @Override public BackingStoreTransaction createBackingStoreTransaction() { - return new BackingStoreTransaction() { - @Override - public void commit() throws BackingStoreException { - } - }; + return new NoCommitBackingStoreTransaction(); } } diff --git a/backing-store/src/main/java/org/shoal/adapter/store/InMemoryBackingStore.java b/backing-store/src/main/java/org/glassfish/shoal/adapter/store/InMemoryBackingStore.java similarity index 85% rename from backing-store/src/main/java/org/shoal/adapter/store/InMemoryBackingStore.java rename to backing-store/src/main/java/org/glassfish/shoal/adapter/store/InMemoryBackingStore.java index 5405544..98caca7 100644 --- a/backing-store/src/main/java/org/shoal/adapter/store/InMemoryBackingStore.java +++ b/backing-store/src/main/java/org/glassfish/shoal/adapter/store/InMemoryBackingStore.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2023 Contributors to the Eclipse Foundation. * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -14,22 +15,26 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.adapter.store; +package org.glassfish.shoal.adapter.store; + +import java.io.Serializable; +import java.util.Map; import org.glassfish.ha.store.api.BackingStore; import org.glassfish.ha.store.api.BackingStoreConfiguration; import org.glassfish.ha.store.api.BackingStoreException; -import org.shoal.ha.cache.api.*; - -import java.io.Serializable; -import java.util.Map; import org.glassfish.ha.store.api.BackingStoreFactory; +import org.glassfish.shoal.ha.cache.api.DataStore; +import org.glassfish.shoal.ha.cache.api.DataStoreContext; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.api.DataStoreFactory; /** + * @param Key type + * @param Value type * @author Mahesh Kannan */ -public class InMemoryBackingStore - extends BackingStore { +public class InMemoryBackingStore extends BackingStore { DataStore dataStore; @@ -37,7 +42,7 @@ public class InMemoryBackingStore conf) throws BackingStoreException { super.initialize(conf); - DataStoreContext dsConf = new DataStoreContext(); + DataStoreContext dsConf = new DataStoreContext<>(); dsConf.setInstanceName(conf.getInstanceName()) .setGroupName(conf.getClusterName()) .setStoreName(conf.getStoreName()) @@ -49,25 +54,17 @@ protected void initialize(BackingStoreConfiguration conf) boolean startGMS = false; if (stGMS != null) { if (stGMS instanceof String) { - try { - startGMS = Boolean.valueOf((String) stGMS); - } catch (Throwable th) { - //Ignore - } + startGMS = Boolean.parseBoolean((String) stGMS); } else if (stGMS instanceof Boolean) { startGMS = (Boolean) stGMS; } } - Object cacheLocally = vendorSpecificMap.get("local.caching");; + Object cacheLocally = vendorSpecificMap.get("local.caching"); boolean enableLocalCaching = false; if (cacheLocally != null) { if (cacheLocally instanceof String) { - try { - enableLocalCaching = Boolean.valueOf((String) cacheLocally); - } catch (Throwable th) { - //Ignore - } + enableLocalCaching = Boolean.parseBoolean((String) cacheLocally); } else if (cacheLocally instanceof Boolean) { enableLocalCaching = (Boolean) cacheLocally; } @@ -80,7 +77,7 @@ protected void initialize(BackingStoreConfiguration conf) dsConf.setClassLoader(cl) .setStartGMS(startGMS) .setCacheLocally(enableLocalCaching); - + dataStore = DataStoreFactory.createDataStore(dsConf); } @@ -137,7 +134,6 @@ public void updateTimestamp(K key, long time) throws BackingStoreException { @Override public BackingStoreFactory getBackingStoreFactory() { - return new GlassFishReplicationBackingStoreFactory(); + return new ReplicationBackingStoreFactory(); } - } diff --git a/backing-store/src/main/java/org/glassfish/shoal/adapter/store/NoCommitBackingStoreTransaction.java b/backing-store/src/main/java/org/glassfish/shoal/adapter/store/NoCommitBackingStoreTransaction.java new file mode 100644 index 0000000..047cf09 --- /dev/null +++ b/backing-store/src/main/java/org/glassfish/shoal/adapter/store/NoCommitBackingStoreTransaction.java @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2023, 2026 Contributors to the Eclipse Foundation. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0, which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the + * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + * version 2 with the GNU Classpath Exception, which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + */ + +package org.glassfish.shoal.adapter.store; + +import org.glassfish.ha.store.api.BackingStoreException; +import org.glassfish.ha.store.api.BackingStoreTransaction; + +/** + * A special {@link BackingStoreTransaction} ignoring {@link #commit()} calls. + */ +public class NoCommitBackingStoreTransaction implements BackingStoreTransaction { + @Override + public void commit() throws BackingStoreException { + // ignored + } +} diff --git a/backing-store/src/main/java/org/shoal/adapter/store/GlassFishReplicationBackingStoreFactory.java b/backing-store/src/main/java/org/glassfish/shoal/adapter/store/ReplicationBackingStoreFactory.java similarity index 54% rename from backing-store/src/main/java/org/shoal/adapter/store/GlassFishReplicationBackingStoreFactory.java rename to backing-store/src/main/java/org/glassfish/shoal/adapter/store/ReplicationBackingStoreFactory.java index fb2839a..9d72de4 100644 --- a/backing-store/src/main/java/org/shoal/adapter/store/GlassFishReplicationBackingStoreFactory.java +++ b/backing-store/src/main/java/org/glassfish/shoal/adapter/store/ReplicationBackingStoreFactory.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2023 Contributors to the Eclipse Foundation. * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -14,43 +15,37 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.adapter.store; - -import org.glassfish.ha.store.api.*; +package org.glassfish.shoal.adapter.store; import java.io.Serializable; -import java.util.Properties; +import java.lang.System.Logger; +import java.lang.System.Logger.Level; + +import org.glassfish.ha.store.api.BackingStore; +import org.glassfish.ha.store.api.BackingStoreConfiguration; +import org.glassfish.ha.store.api.BackingStoreException; +import org.glassfish.ha.store.api.BackingStoreFactory; +import org.glassfish.ha.store.api.BackingStoreTransaction; /** * @author Mahesh Kannan */ -public class GlassFishReplicationBackingStoreFactory - implements BackingStoreFactory { +public class ReplicationBackingStoreFactory implements BackingStoreFactory { - private Properties props; - - public GlassFishReplicationBackingStoreFactory() { - } - - public GlassFishReplicationBackingStoreFactory(Properties p) { - this.props=p; - } + private static final Logger LOG = System.getLogger(ReplicationBackingStoreFactory.class.getName()); @Override - public BackingStore createBackingStore(BackingStoreConfiguration conf) throws BackingStoreException { - - InMemoryBackingStore bStore = new InMemoryBackingStore(); + public BackingStore createBackingStore( + BackingStoreConfiguration conf) throws BackingStoreException { + InMemoryBackingStore bStore = new InMemoryBackingStore<>(); bStore.initialize(conf); - System.out.println("ReplicationBackingStoreFactory:: CREATED an instance of: " + bStore.getClass().getName()); + LOG.log(Level.INFO, "CREATED an instance of {0}", bStore.getClass()); return bStore; } + @Override public BackingStoreTransaction createBackingStoreTransaction() { - return new BackingStoreTransaction() { - @Override - public void commit() throws BackingStoreException { - } - }; + return new NoCommitBackingStoreTransaction(); } } diff --git a/backing-store/src/main/resources/META-INF/MANIFEST.MF b/backing-store/src/main/resources/META-INF/MANIFEST.MF deleted file mode 100644 index e916e5f..0000000 --- a/backing-store/src/main/resources/META-INF/MANIFEST.MF +++ /dev/null @@ -1,26 +0,0 @@ -Manifest-Version: 1.0 -Export-Package: org.shoal.adapter.store;uses:="org.shoal.ha.cache.api, - org.glassfish.ha.store.api,org.jvnet.hk2.annotations" -Bundle-Version: 1.5.1.SNAPSHOT -Build-Jdk: 1.6.0_16 -Built-By: mk -Tool: Bnd-0.0.357 -Bnd-LastModified: 1276789359128 -Bundle-Name: shoal-backing-store -Bundle-ManifestVersion: 2 -Created-By: Apache Maven Bundle Plugin -Extension-Name: shoal-backing-store -Import-Package: org.glassfish.ha.store.api;version="3.1", - org.shoal.adapter.store,org.shoal.ha.cache.api -Bundle-SymbolicName: org.shoal.backing-store -HK2-Class-Path-Id: org.shoal:shoal-cache:jar:1.5.1-SNAPSHOT org.shoal: - shoal-gms:jar:1.5.1-SNAPSHOT org.glassfish.ha:ha-api:jar:3.1-SNAPSHOT - com.sun.enterprise:hk2:jar:1.0.25 com.sun.enterprise:hk2-core:jar:1. - 0.25 com.sun.enterprise:config:jar:1.0.25 com.sun.enterprise:auto-dep - ends:jar:1.0.25 org.glassfish.hk2.external:asm-all-repackaged:jar:1.0 - .25 org.glassfish:bean-validator:jar:3.0-JBoss-4.0.2_03 -Class-Path: shoal-cache.jar shoal-gms.jar ha-api.jar hk2.jar hk2-core. - jar config.jar auto-depends.jar asm-all-repackaged.jar bean-validator - .jar - - diff --git a/backing-store/src/main/resources/META-INF/inhabitants/default b/backing-store/src/main/resources/META-INF/inhabitants/default index a68faa1..47cc630 100644 --- a/backing-store/src/main/resources/META-INF/inhabitants/default +++ b/backing-store/src/main/resources/META-INF/inhabitants/default @@ -1,4 +1,5 @@ # +# Copyright (c) 2026 Contributors to the Eclipse Foundation # Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the @@ -14,6 +15,5 @@ # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 # -# generated on 17 Jun 2010 15:23:45 GMT -class=org.shoal.adapter.store.ReplicationBackingStoreFactory,index=org.glassfish.ha.store.api.BackingStoreFactory:replication -class=org.shoal.adapter.store.GlassFishReplicationBackingStoreFactory,index=org.glassfish.ha.store.api.BackingStoreFactory:shoal-backing-store +class=org.glassfish.shoal.adapter.store.ReplicationBackingStoreFactory,index=org.glassfish.ha.store.api.BackingStoreFactory:replication +class=org.glassfish.shoal.adapter.store.GlassFishReplicationBackingStoreFactory,index=org.glassfish.ha.store.api.BackingStoreFactory:shoal-backing-store diff --git a/backing-store/tests/build.xml b/backing-store/tests/build.xml index 0600da0..66503df 100644 --- a/backing-store/tests/build.xml +++ b/backing-store/tests/build.xml @@ -45,11 +45,11 @@ - - + diff --git a/backing-store/tests/src/com/sun/enterprise/ee/tests/BackingStore/KillTest.java b/backing-store/tests/src/com/sun/enterprise/ee/tests/BackingStore/KillTest.java index d62098e..25ceb02 100644 --- a/backing-store/tests/src/com/sun/enterprise/ee/tests/BackingStore/KillTest.java +++ b/backing-store/tests/src/com/sun/enterprise/ee/tests/BackingStore/KillTest.java @@ -16,32 +16,32 @@ package com.sun.enterprise.ee.tests.BackingStore; -import com.sun.enterprise.ee.cms.core.CallBack; -import com.sun.enterprise.ee.cms.core.FailureNotificationSignal; -import com.sun.enterprise.ee.cms.core.FailureSuspectedSignal; -import com.sun.enterprise.ee.cms.core.GMSConstants; -import com.sun.enterprise.ee.cms.core.GMSException; -import com.sun.enterprise.ee.cms.core.GMSFactory; -import com.sun.enterprise.ee.cms.core.GroupManagementService; -import com.sun.enterprise.ee.cms.core.JoinNotificationSignal; -import com.sun.enterprise.ee.cms.core.JoinedAndReadyNotificationSignal; -import com.sun.enterprise.ee.cms.core.MessageSignal; -import com.sun.enterprise.ee.cms.core.PlannedShutdownSignal; -import com.sun.enterprise.ee.cms.core.ServiceProviderConfigurationKeys; -import com.sun.enterprise.ee.cms.core.Signal; -import com.sun.enterprise.ee.cms.impl.base.Utility; -import com.sun.enterprise.ee.cms.impl.client.FailureNotificationActionFactoryImpl; -import com.sun.enterprise.ee.cms.impl.client.FailureSuspectedActionFactoryImpl; -import com.sun.enterprise.ee.cms.impl.client.JoinNotificationActionFactoryImpl; -import com.sun.enterprise.ee.cms.impl.client.JoinedAndReadyNotificationActionFactoryImpl; -import com.sun.enterprise.ee.cms.impl.client.MessageActionFactoryImpl; -import com.sun.enterprise.ee.cms.impl.client.PlannedShutdownActionFactoryImpl; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.api.core.CallBack; +import org.glassfish.shoal.gms.api.core.FailureNotificationSignal; +import org.glassfish.shoal.gms.api.core.FailureSuspectedSignal; +import org.glassfish.shoal.gms.api.core.GMSConstants; +import org.glassfish.shoal.gms.api.core.GMSException; +import org.glassfish.shoal.gms.api.core.GMSFactory; +import org.glassfish.shoal.gms.api.core.GroupManagementService; +import org.glassfish.shoal.gms.api.core.JoinNotificationSignal; +import org.glassfish.shoal.gms.api.core.JoinedAndReadyNotificationSignal; +import org.glassfish.shoal.gms.api.core.MessageSignal; +import org.glassfish.shoal.gms.api.core.PlannedShutdownSignal; +import org.glassfish.shoal.gms.api.core.ServiceProviderConfigurationKeys; +import org.glassfish.shoal.gms.api.core.Signal; +import org.glassfish.shoal.gms.base.Utility; +import org.glassfish.shoal.gms.client.FailureNotificationActionFactoryImpl; +import org.glassfish.shoal.gms.client.FailureSuspectedActionFactoryImpl; +import org.glassfish.shoal.gms.client.JoinNotificationActionFactoryImpl; +import org.glassfish.shoal.gms.client.JoinedAndReadyNotificationActionFactoryImpl; +import org.glassfish.shoal.gms.client.MessageActionFactoryImpl; +import org.glassfish.shoal.gms.client.PlannedShutdownActionFactoryImpl; +import org.glassfish.shoal.gms.logging.GMSLogDomain; //import com.sun.enterprise.ee.cms.tests.GMSAdminConstants; -import com.sun.enterprise.ee.cms.logging.NiceLogFormatter; +import org.glassfish.shoal.gms.logging.NiceLogFormatter; import com.sun.enterprise.ee.cms.tests.GMSAdminAgent; import com.sun.enterprise.ee.cms.tests.GMSAdminConstants; -import com.sun.enterprise.mgmt.transport.grizzly.GrizzlyUtil; +import org.glassfish.shoal.gms.mgmt.transport.grizzly.GrizzlyUtil; import java.io.Serializable; import java.util.Properties; import java.util.concurrent.atomic.AtomicBoolean; @@ -54,7 +54,7 @@ import org.glassfish.ha.store.api.BackingStore; import org.glassfish.ha.store.api.BackingStoreFactory; import org.glassfish.ha.store.spi.BackingStoreFactoryRegistry; -import org.shoal.adapter.store.ReplicationBackingStoreFactory; +import org.glassfish.shoal.adapter.store.ReplicationBackingStoreFactory; public class KillTest implements CallBack { diff --git a/build.xml b/build.xml index 204be1b..fc7038e 100644 --- a/build.xml +++ b/build.xml @@ -17,7 +17,7 @@ --> - + diff --git a/cache/cmshell b/cache/cmshell index 05a7bf1..f19b121 100755 --- a/cache/cmshell +++ b/cache/cmshell @@ -34,4 +34,4 @@ HA_API_JAR=/gf/ha-api-3.1.10-SNAPSHOT.jar CP=${HA_API_JAR}:${CACHE_HOME}/target/classes:${CACHE_HOME}/../gms/api/target/shoal-gms-api.jar:${CACHE_HOME}/../gms/impl/target/shoal-gms-impl.jar:${CACHE_HOME}/../gms/lib/grizzly-framework.jar:${CACHE_HOME}/../gms/lib/grizzly-utils.jar -java -cp ${CP} org.shoal.ha.cache.impl.util.CommandManagerShell $1 shoal-shell-group +java -cp ${CP} org.glassfish.shoal.ha.cache.util.CommandManagerShell $1 shoal-shell-group diff --git a/cache/dshell b/cache/dshell index 3e3dbd9..2f5e9fe 100755 --- a/cache/dshell +++ b/cache/dshell @@ -34,4 +34,4 @@ CACHE_HOME=. CP=${HA_API_JAR}:${CACHE_HOME}/target/classes:${CACHE_HOME}/../gms/api/target/shoal-gms-api.jar:${CACHE_HOME}/../gms/impl/target/shoal-gms-impl.jar:${CACHE_HOME}/../gms/lib/grizzly-framework.jar:${CACHE_HOME}/../gms/lib/grizzly-utils.jar -java -cp ${CP} -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 org.shoal.ha.cache.impl.util.DataStoreShell cache $1 $2 +java -cp ${CP} -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 org.glassfish.shoal.ha.cache.util.DataStoreShell cache $1 $2 diff --git a/cache/dsimplestore.sh b/cache/dsimplestore.sh index 14ccacc..988b420 100755 --- a/cache/dsimplestore.sh +++ b/cache/dsimplestore.sh @@ -34,5 +34,5 @@ CACHE_HOME=. CP=${HA_API_JAR}:${CACHE_HOME}/target/classes:${CACHE_HOME}/../gms/api/target/shoal-gms-api.jar:${CACHE_HOME}/../gms/impl/target/shoal-gms-impl.jar:${CACHE_HOME}/../gms/lib/grizzly-framework.jar:${CACHE_HOME}/../gms/lib/grizzly-utils.jar -#java -cp ${CP} -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 org.shoal.ha.cache.impl.util.StoreableBackingStoreShell cache $1 $2 -java -cp ${CP} -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 org.shoal.ha.cache.impl.util.SimpleStoreableBackingStoreShell cache $1 $2 +#java -cp ${CP} -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 org.glassfish.shoal.ha.cache.util.StoreableBackingStoreShell cache $1 $2 +java -cp ${CP} -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 org.glassfish.shoal.ha.cache.util.SimpleStoreableBackingStoreShell cache $1 $2 diff --git a/cache/dstore.sh b/cache/dstore.sh index fd72d2d..2cea8b1 100755 --- a/cache/dstore.sh +++ b/cache/dstore.sh @@ -36,5 +36,5 @@ HA_API_JAR=/space/work/ha-api/target/ha-api-3.1.10-SNAPSHOT.jar CP=${HA_API_JAR}:${CACHE_HOME}/target/classes:${CACHE_HOME}/../gms/api/target/shoal-gms-api.jar:${CACHE_HOME}/../gms/impl/target/shoal-gms-impl.jar:${CACHE_HOME}/../gms/lib/grizzly-framework.jar:${CACHE_HOME}/../gms/lib/grizzly-utils.jar -#java -cp ${CP} -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 org.shoal.ha.cache.impl.util.StoreableBackingStoreShell cache $1 $2 -java -cp ${CP} org.shoal.ha.cache.impl.util.StoreableBackingStoreShell cache $1 $2 +#java -cp ${CP} -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 org.glassfish.shoal.ha.cache.util.StoreableBackingStoreShell cache $1 $2 +java -cp ${CP} org.glassfish.shoal.ha.cache.util.StoreableBackingStoreShell cache $1 $2 diff --git a/cache/pom.xml b/cache/pom.xml index 7262e91..f5060c5 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -1,6 +1,6 @@ - + 4.0.0 org.glassfish.shoal shoal - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT shoal-cache - bundle + jar shoal-cache @@ -46,9 +46,9 @@ ha-api provided - + - ${junit.group.id} + junit junit test @@ -56,18 +56,19 @@ ${project.artifactId} - org.apache.felix maven-bundle-plugin - true - - - org.shoal.adapter.store,org.shoal.ha.mapper - - - + + + bundle-manifest + process-classes + + manifest + + + diff --git a/cache/shell b/cache/shell index b814788..c93adb0 100644 --- a/cache/shell +++ b/cache/shell @@ -36,4 +36,4 @@ HA_API_JAR=/space/work/ha-api/target/ha-api-3.1.10-SNAPSHOT.jar CP=${HA_API_JAR}:${CACHE_HOME}/target/classes:${CACHE_HOME}/../gms/api/target/shoal-gms-api.jar:${CACHE_HOME}/../gms/impl/target/shoal-gms-impl.jar:${CACHE_HOME}/../gms/lib/grizzly-framework.jar:${CACHE_HOME}/../gms/lib/grizzly-utils.jar -java -cp ${CP} org.shoal.ha.cache.impl.util.DataStoreShell cache $1 shoal-shell-group +java -cp ${CP} org.glassfish.shoal.ha.cache.util.DataStoreShell cache $1 shoal-shell-group diff --git a/cache/simpleshell b/cache/simpleshell index 2b6b1ee..75ef97c 100755 --- a/cache/simpleshell +++ b/cache/simpleshell @@ -34,4 +34,4 @@ HA_API_JAR=/space/work/v3/ha-api/target/ha-api-3.1.9-SNAPSHOT.jar CP=${HA_API_JAR}:${CACHE_HOME}/target/classes:${CACHE_HOME}/../gms/api/target/shoal-gms-api.jar:${CACHE_HOME}/../gms/impl/target/shoal-gms-impl.jar:${CACHE_HOME}/../gms/lib/grizzly-framework.jar:${CACHE_HOME}/../gms/lib/grizzly-utils.jar -java -cp ${CP} org.shoal.ha.cache.impl.util.SimpleDataStoreShell $1 shoal-shell-group +java -cp ${CP} org.glassfish.shoal.ha.cache.util.SimpleDataStoreShell $1 shoal-shell-group diff --git a/cache/simplestore.sh b/cache/simplestore.sh index 0ff358e..50c2444 100755 --- a/cache/simplestore.sh +++ b/cache/simplestore.sh @@ -1,5 +1,6 @@ #! /bin/sh # +# Copyright (c) 2021, 2026 Contributors to the Eclipse Foundation. # Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the @@ -35,5 +36,5 @@ CACHE_HOME=. CP=${HA_API_JAR}:${CACHE_HOME}/target/classes:${CACHE_HOME}/../gms/api/target/shoal-gms-api.jar:${CACHE_HOME}/../gms/impl/target/shoal-gms-impl.jar:${CACHE_HOME}/../gms/lib/grizzly-framework.jar:${CACHE_HOME}/../gms/lib/grizzly-utils.jar -#java -cp ${CP} -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 org.shoal.ha.cache.impl.util.StoreableBackingStoreShell cache $1 $2 -java -cp ${CP} -Dorg.shoal.ha.cache.mbean.register=true org.shoal.ha.cache.impl.util.SimpleStoreableBackingStoreShell cache $1 shoal-shell-group +#java -cp ${CP} -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 org.glassfish.shoal.ha.cache.util.StoreableBackingStoreShell cache $1 $2 +java -cp ${CP} -Dorg.glassfish.shoal.ha.cache.mbean.register=true org.glassfish.shoal.ha.cache.util.SimpleStoreableBackingStoreShell cache $1 shoal-shell-group diff --git a/cache/src/main/java/module-info.java b/cache/src/main/java/module-info.java new file mode 100644 index 0000000..e074a81 --- /dev/null +++ b/cache/src/main/java/module-info.java @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2026 Contributors to the Eclipse Foundation + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0, which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the + * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + * version 2 with the GNU Classpath Exception, which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + */ + +/** + * @author David Matejcek + */ +module org.glassfish.shoal.ha.cache { + + requires java.logging; + requires java.management; + + requires org.glassfish.ha.api; + requires org.glassfish.shoal.gms.api; + requires org.glassfish.shoal.gms.impl; + + exports org.glassfish.shoal.ha.cache.api; + exports org.glassfish.shoal.ha.cache.command; + exports org.glassfish.shoal.ha.cache.util; + exports org.glassfish.shoal.ha.cache.store; + exports org.glassfish.shoal.ha.cache.store.backing; + exports org.glassfish.shoal.ha.cache.store.backing.commands; + exports org.glassfish.shoal.ha.cache.mapper; +} diff --git a/cache/src/main/java/org/shoal/ha/cache/api/AbstractCommandInterceptor.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/AbstractCommandInterceptor.java similarity index 93% rename from cache/src/main/java/org/shoal/ha/cache/api/AbstractCommandInterceptor.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/api/AbstractCommandInterceptor.java index f5fc7ea..4011664 100644 --- a/cache/src/main/java/org/shoal/ha/cache/api/AbstractCommandInterceptor.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/AbstractCommandInterceptor.java @@ -14,10 +14,10 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.api; +package org.glassfish.shoal.ha.cache.api; -import org.shoal.ha.cache.impl.command.Command; -import org.shoal.ha.cache.impl.command.CommandManager; +import org.glassfish.shoal.ha.cache.command.Command; +import org.glassfish.shoal.ha.cache.command.CommandManager; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/ha/cache/api/DataStore.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/DataStore.java similarity index 98% rename from cache/src/main/java/org/shoal/ha/cache/api/DataStore.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/api/DataStore.java index 072ee8c..edad34a 100644 --- a/cache/src/main/java/org/shoal/ha/cache/api/DataStore.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/DataStore.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.api; +package org.glassfish.shoal.ha.cache.api; /** * A DataStore allows (#{Serializable} / #{Storable}) objects to be placed in the cache. The cache itself is created and diff --git a/cache/src/main/java/org/shoal/ha/cache/api/DataStoreAlreadyClosedException.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/DataStoreAlreadyClosedException.java similarity index 96% rename from cache/src/main/java/org/shoal/ha/cache/api/DataStoreAlreadyClosedException.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/api/DataStoreAlreadyClosedException.java index 7a684d8..eba94b4 100644 --- a/cache/src/main/java/org/shoal/ha/cache/api/DataStoreAlreadyClosedException.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/DataStoreAlreadyClosedException.java @@ -14,14 +14,14 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.api; +package org.glassfish.shoal.ha.cache.api; /** * @author Mahesh Kannan */ public class DataStoreAlreadyClosedException extends DataStoreException { - + private static final long serialVersionUID = 6828272055892858480L; public DataStoreAlreadyClosedException() { diff --git a/cache/src/main/java/org/shoal/ha/cache/api/DataStoreConfigurator.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/DataStoreConfigurator.java similarity index 97% rename from cache/src/main/java/org/shoal/ha/cache/api/DataStoreConfigurator.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/api/DataStoreConfigurator.java index ff0f8a5..e0ca41e 100644 --- a/cache/src/main/java/org/shoal/ha/cache/api/DataStoreConfigurator.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/DataStoreConfigurator.java @@ -15,15 +15,15 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.api; +package org.glassfish.shoal.ha.cache.api; import java.util.ArrayList; import java.util.List; import org.glassfish.ha.store.util.KeyTransformer; -import org.shoal.ha.cache.impl.command.Command; -import org.shoal.ha.cache.impl.store.DataStoreEntryUpdater; -import org.shoal.ha.mapper.KeyMapper; +import org.glassfish.shoal.ha.cache.command.Command; +import org.glassfish.shoal.ha.cache.mapper.KeyMapper; +import org.glassfish.shoal.ha.cache.store.DataStoreEntryUpdater; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/ha/cache/api/DataStoreContext.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/DataStoreContext.java similarity index 96% rename from cache/src/main/java/org/shoal/ha/cache/api/DataStoreContext.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/api/DataStoreContext.java index 1da2646..6f1c0ec 100644 --- a/cache/src/main/java/org/shoal/ha/cache/api/DataStoreContext.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/DataStoreContext.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.api; +package org.glassfish.shoal.ha.cache.api; import java.util.Map; import java.util.concurrent.locks.ReentrantReadWriteLock; @@ -23,11 +23,11 @@ import org.glassfish.ha.store.api.BackingStoreConfiguration; import org.glassfish.ha.store.util.KeyTransformer; -import org.shoal.ha.cache.impl.command.CommandManager; -import org.shoal.ha.cache.impl.store.ReplicaStore; -import org.shoal.ha.cache.impl.util.ResponseMediator; -import org.shoal.ha.group.GroupService; -import org.shoal.ha.mapper.KeyMapper; +import org.glassfish.shoal.ha.cache.command.CommandManager; +import org.glassfish.shoal.ha.cache.group.GroupService; +import org.glassfish.shoal.ha.cache.mapper.KeyMapper; +import org.glassfish.shoal.ha.cache.store.ReplicaStore; +import org.glassfish.shoal.ha.cache.util.ResponseMediator; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/ha/cache/api/DataStoreEntryEvaluator.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/DataStoreEntryEvaluator.java similarity index 90% rename from cache/src/main/java/org/shoal/ha/cache/api/DataStoreEntryEvaluator.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/api/DataStoreEntryEvaluator.java index 5fd470f..88db848 100644 --- a/cache/src/main/java/org/shoal/ha/cache/api/DataStoreEntryEvaluator.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/DataStoreEntryEvaluator.java @@ -14,9 +14,9 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.api; +package org.glassfish.shoal.ha.cache.api; -import org.shoal.ha.cache.impl.store.DataStoreEntry; +import org.glassfish.shoal.ha.cache.store.DataStoreEntry; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/ha/cache/api/DataStoreException.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/DataStoreException.java similarity index 96% rename from cache/src/main/java/org/shoal/ha/cache/api/DataStoreException.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/api/DataStoreException.java index 68c4e06..2293926 100644 --- a/cache/src/main/java/org/shoal/ha/cache/api/DataStoreException.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/DataStoreException.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.api; +package org.glassfish.shoal.ha.cache.api; import java.io.IOException; @@ -22,7 +22,7 @@ * @author Mahesh Kannan */ public class DataStoreException extends IOException { - + private static final long serialVersionUID = 212794329970352801L; public DataStoreException() { diff --git a/cache/src/main/java/org/shoal/ha/cache/api/DataStoreFactory.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/DataStoreFactory.java similarity index 92% rename from cache/src/main/java/org/shoal/ha/cache/api/DataStoreFactory.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/api/DataStoreFactory.java index 14bf113..945f2d8 100644 --- a/cache/src/main/java/org/shoal/ha/cache/api/DataStoreFactory.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/DataStoreFactory.java @@ -15,14 +15,14 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.api; +package org.glassfish.shoal.ha.cache.api; import java.io.Serializable; -import org.shoal.ha.cache.impl.store.ReplicatedDataStore; -import org.shoal.ha.group.GroupService; -import org.shoal.ha.group.GroupServiceFactory; -import org.shoal.ha.mapper.DefaultKeyMapper; +import org.glassfish.shoal.ha.cache.group.GroupService; +import org.glassfish.shoal.ha.cache.group.GroupServiceFactory; +import org.glassfish.shoal.ha.cache.mapper.DefaultKeyMapper; +import org.glassfish.shoal.ha.cache.store.ReplicatedDataStore; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/ha/cache/api/DataStoreMBean.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/DataStoreMBean.java similarity index 97% rename from cache/src/main/java/org/shoal/ha/cache/api/DataStoreMBean.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/api/DataStoreMBean.java index f36c589..175ea2c 100644 --- a/cache/src/main/java/org/shoal/ha/cache/api/DataStoreMBean.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/DataStoreMBean.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.api; +package org.glassfish.shoal.ha.cache.api; /** * @author Mahesh KannanR diff --git a/cache/src/main/java/org/shoal/ha/cache/api/IdleEntryDetector.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/IdleEntryDetector.java similarity index 89% rename from cache/src/main/java/org/shoal/ha/cache/api/IdleEntryDetector.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/api/IdleEntryDetector.java index 35a91da..db0ff41 100644 --- a/cache/src/main/java/org/shoal/ha/cache/api/IdleEntryDetector.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/IdleEntryDetector.java @@ -14,9 +14,9 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.api; +package org.glassfish.shoal.ha.cache.api; -import org.shoal.ha.cache.impl.store.DataStoreEntry; +import org.glassfish.shoal.ha.cache.store.DataStoreEntry; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/ha/cache/api/ObjectInputStreamWithLoader.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/ObjectInputStreamWithLoader.java similarity index 98% rename from cache/src/main/java/org/shoal/ha/cache/api/ObjectInputStreamWithLoader.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/api/ObjectInputStreamWithLoader.java index 773a439..2d013da 100644 --- a/cache/src/main/java/org/shoal/ha/cache/api/ObjectInputStreamWithLoader.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/ObjectInputStreamWithLoader.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.api; +package org.glassfish.shoal.ha.cache.api; import java.io.IOException; import java.io.InputStream; diff --git a/cache/src/main/java/org/shoal/ha/cache/api/ReplicatedDataStoreStatsHolder.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/ReplicatedDataStoreStatsHolder.java similarity index 99% rename from cache/src/main/java/org/shoal/ha/cache/api/ReplicatedDataStoreStatsHolder.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/api/ReplicatedDataStoreStatsHolder.java index 615bd28..d77078a 100644 --- a/cache/src/main/java/org/shoal/ha/cache/api/ReplicatedDataStoreStatsHolder.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/ReplicatedDataStoreStatsHolder.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.api; +package org.glassfish.shoal.ha.cache.api; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; diff --git a/cache/src/main/java/org/shoal/ha/cache/api/ShoalCacheLoggerConstants.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/ShoalCacheLoggerConstants.java similarity index 50% rename from cache/src/main/java/org/shoal/ha/cache/api/ShoalCacheLoggerConstants.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/api/ShoalCacheLoggerConstants.java index 4169b7a..b796bb6 100644 --- a/cache/src/main/java/org/shoal/ha/cache/api/ShoalCacheLoggerConstants.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/ShoalCacheLoggerConstants.java @@ -14,49 +14,49 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.api; +package org.glassfish.shoal.ha.cache.api; /** * @author Mahesh Kannan */ public class ShoalCacheLoggerConstants { - public static final String CACHE = "org.shoal.ha.cache"; + public static final String CACHE = "org.glassfish.shoal.ha.cache"; - public static final String CACHE_STATS = "org.shoal.ha.cache.stats"; + public static final String CACHE_STATS = "org.glassfish.shoal.ha.cache.stats"; - public static final String CACHE_CONFIG = "org.shoal.ha.cache.config"; + public static final String CACHE_CONFIG = "org.glassfish.shoal.ha.cache.config"; - public static final String CACHE_KEY_MAPPER = "org.shoal.ha.cache.mapper"; + public static final String CACHE_KEY_MAPPER = "org.glassfish.shoal.ha.cache.mapper"; - public static final String CACHE_COMMAND = "org.shoal.ha.cache.command"; + public static final String CACHE_COMMAND = "org.glassfish.shoal.ha.cache.command"; - public static final String CACHE_SAVE_COMMAND = "org.shoal.ha.cache.command.save"; + public static final String CACHE_SAVE_COMMAND = "org.glassfish.shoal.ha.cache.command.save"; - public static final String CACHE_REPLICATION_FRAME_COMMAND = "org.shoal.ha.cache.command.frame"; + public static final String CACHE_REPLICATION_FRAME_COMMAND = "org.glassfish.shoal.ha.cache.command.frame"; - public static final String CACHE_REMOVE_COMMAND = "org.shoal.ha.cache.command.remove"; + public static final String CACHE_REMOVE_COMMAND = "org.glassfish.shoal.ha.cache.command.remove"; - public static final String CACHE_STALE_REMOVE_COMMAND = "org.shoal.ha.cache.command.remove"; + public static final String CACHE_STALE_REMOVE_COMMAND = "org.glassfish.shoal.ha.cache.command.remove"; - public static final String CACHE_LOAD_REQUEST_COMMAND = "org.shoal.ha.cache.command.load_request"; + public static final String CACHE_LOAD_REQUEST_COMMAND = "org.glassfish.shoal.ha.cache.command.load_request"; - public static final String CACHE_LOAD_RESPONSE_COMMAND = "org.shoal.ha.cache.command.load_response"; + public static final String CACHE_LOAD_RESPONSE_COMMAND = "org.glassfish.shoal.ha.cache.command.load_response"; - public static final String CACHE_TOUCH_COMMAND = "org.shoal.ha.cache.command.touch"; + public static final String CACHE_TOUCH_COMMAND = "org.glassfish.shoal.ha.cache.command.touch"; - public static final String CACHE_TRANSMIT_INTERCEPTOR = "org.shoal.ha.cache.interceptor.transmit"; + public static final String CACHE_TRANSMIT_INTERCEPTOR = "org.glassfish.shoal.ha.cache.interceptor.transmit"; - public static final String CACHE_REVEIVE_INTERCEPTOR = "org.shoal.ha.cache.interceptor.receive"; + public static final String CACHE_REVEIVE_INTERCEPTOR = "org.glassfish.shoal.ha.cache.interceptor.receive"; - public static final String CACHE_DATA_STORE = "org.shoal.ha.cache.store"; + public static final String CACHE_DATA_STORE = "org.glassfish.shoal.ha.cache.store.backing"; - public static final String CACHE_MONITOR = "org.shoal.ha.monitor"; + public static final String CACHE_MONITOR = "org.glassfish.shoal.ha.monitor"; - public static final String CACHE_SIZE_REQUEST_COMMAND = "org.shoal.ha.cache.command.size"; + public static final String CACHE_SIZE_REQUEST_COMMAND = "org.glassfish.shoal.ha.cache.command.size"; - public static final String CACHE_SIZE_RESPONSE_COMMAND = "org.shoal.ha.cache.command.size"; + public static final String CACHE_SIZE_RESPONSE_COMMAND = "org.glassfish.shoal.ha.cache.command.size"; - public static final String CACHE_REMOVE_EXPIRED_COMMAND = "org.shoal.ha.cache.command.remove_expired"; + public static final String CACHE_REMOVE_EXPIRED_COMMAND = "org.glassfish.shoal.ha.cache.command.remove_expired"; } diff --git a/cache/src/main/java/org/shoal/ha/cache/api/TooManyRetriesException.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/TooManyRetriesException.java similarity index 96% rename from cache/src/main/java/org/shoal/ha/cache/api/TooManyRetriesException.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/api/TooManyRetriesException.java index d28af91..143ac19 100644 --- a/cache/src/main/java/org/shoal/ha/cache/api/TooManyRetriesException.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/api/TooManyRetriesException.java @@ -14,14 +14,14 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.api; +package org.glassfish.shoal.ha.cache.api; /** * @author Mahesh Kannan */ public class TooManyRetriesException extends DataStoreException { - + private static final long serialVersionUID = -6309507580534901353L; public TooManyRetriesException() { diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/command/Command.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/command/Command.java similarity index 95% rename from cache/src/main/java/org/shoal/ha/cache/impl/command/Command.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/command/Command.java index 68bf3a5..c075544 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/command/Command.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/command/Command.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.command; +package org.glassfish.shoal.ha.cache.command; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -25,9 +25,9 @@ import java.util.logging.Logger; import org.glassfish.ha.store.util.KeyTransformer; -import org.shoal.ha.cache.api.DataStoreContext; -import org.shoal.ha.cache.api.DataStoreException; -import org.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.api.DataStoreContext; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.api.ShoalCacheLoggerConstants; /** * @author Mahesh Kannan @@ -35,7 +35,7 @@ */ public abstract class Command implements Serializable { - + private static final long serialVersionUID = 6608726132108978791L; private transient static final Logger _logger = Logger.getLogger(ShoalCacheLoggerConstants.CACHE_SAVE_COMMAND); diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/command/CommandManager.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/command/CommandManager.java similarity index 89% rename from cache/src/main/java/org/shoal/ha/cache/impl/command/CommandManager.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/command/CommandManager.java index 357e554..f4d5b40 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/command/CommandManager.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/command/CommandManager.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.command; +package org.glassfish.shoal.ha.cache.command; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -23,14 +23,14 @@ import java.util.logging.Level; import java.util.logging.Logger; -import org.shoal.ha.cache.api.AbstractCommandInterceptor; -import org.shoal.ha.cache.api.DataStoreContext; -import org.shoal.ha.cache.api.DataStoreException; -import org.shoal.ha.cache.api.ObjectInputStreamWithLoader; -import org.shoal.ha.cache.api.ShoalCacheLoggerConstants; -import org.shoal.ha.cache.impl.interceptor.CommandHandlerInterceptor; -import org.shoal.ha.cache.impl.interceptor.TransmitInterceptor; -import org.shoal.ha.cache.impl.util.MessageReceiver; +import org.glassfish.shoal.ha.cache.api.AbstractCommandInterceptor; +import org.glassfish.shoal.ha.cache.api.DataStoreContext; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.api.ObjectInputStreamWithLoader; +import org.glassfish.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.interceptor.CommandHandlerInterceptor; +import org.glassfish.shoal.ha.cache.interceptor.TransmitInterceptor; +import org.glassfish.shoal.ha.cache.util.MessageReceiver; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/command/ReplicationCommandOpcode.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/command/ReplicationCommandOpcode.java similarity index 97% rename from cache/src/main/java/org/shoal/ha/cache/impl/command/ReplicationCommandOpcode.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/command/ReplicationCommandOpcode.java index b3a7d18..5a1c50e 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/command/ReplicationCommandOpcode.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/command/ReplicationCommandOpcode.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.command; +package org.glassfish.shoal.ha.cache.command; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/ha/group/GroupMemberEventListener.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/group/GroupMemberEventListener.java similarity index 95% rename from cache/src/main/java/org/shoal/ha/group/GroupMemberEventListener.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/group/GroupMemberEventListener.java index f817277..0122514 100644 --- a/cache/src/main/java/org/shoal/ha/group/GroupMemberEventListener.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/group/GroupMemberEventListener.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.group; +package org.glassfish.shoal.ha.cache.group; import java.util.Collection; diff --git a/cache/src/main/java/org/shoal/ha/group/GroupService.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/group/GroupService.java similarity index 92% rename from cache/src/main/java/org/shoal/ha/group/GroupService.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/group/GroupService.java index 16c63f3..eda6977 100644 --- a/cache/src/main/java/org/shoal/ha/group/GroupService.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/group/GroupService.java @@ -14,11 +14,11 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.group; +package org.glassfish.shoal.ha.cache.group; import java.util.List; -import org.shoal.ha.cache.impl.util.MessageReceiver; +import org.glassfish.shoal.ha.cache.util.MessageReceiver; /** * The minimal methods that a GS must implement to be used by the replication service. diff --git a/cache/src/main/java/org/shoal/ha/group/GroupServiceFactory.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/group/GroupServiceFactory.java similarity index 96% rename from cache/src/main/java/org/shoal/ha/group/GroupServiceFactory.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/group/GroupServiceFactory.java index dc61417..84510a1 100644 --- a/cache/src/main/java/org/shoal/ha/group/GroupServiceFactory.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/group/GroupServiceFactory.java @@ -14,12 +14,10 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.group; +package org.glassfish.shoal.ha.cache.group; import java.util.concurrent.ConcurrentHashMap; -import org.shoal.ha.group.gms.GroupServiceProvider; - /** * @author Mahesh Kannan * diff --git a/cache/src/main/java/org/shoal/ha/group/gms/GroupServiceProvider.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/group/GroupServiceProvider.java similarity index 90% rename from cache/src/main/java/org/shoal/ha/group/gms/GroupServiceProvider.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/group/GroupServiceProvider.java index d531eb0..29f2ce4 100644 --- a/cache/src/main/java/org/shoal/ha/group/gms/GroupServiceProvider.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/group/GroupServiceProvider.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.group.gms; +package org.glassfish.shoal.ha.cache.group; import java.util.ArrayList; import java.util.List; @@ -27,28 +27,25 @@ import java.util.logging.Level; import java.util.logging.Logger; -import org.shoal.ha.cache.impl.util.MessageReceiver; -import org.shoal.ha.group.GroupMemberEventListener; -import org.shoal.ha.group.GroupService; - -import com.sun.enterprise.ee.cms.core.AliveAndReadyView; -import com.sun.enterprise.ee.cms.core.CallBack; -import com.sun.enterprise.ee.cms.core.FailureNotificationSignal; -import com.sun.enterprise.ee.cms.core.GMSException; -import com.sun.enterprise.ee.cms.core.GMSFactory; -import com.sun.enterprise.ee.cms.core.GroupHandle; -import com.sun.enterprise.ee.cms.core.GroupManagementService; -import com.sun.enterprise.ee.cms.core.JoinedAndReadyNotificationSignal; -import com.sun.enterprise.ee.cms.core.MemberNotInViewException; -import com.sun.enterprise.ee.cms.core.PlannedShutdownSignal; -import com.sun.enterprise.ee.cms.core.ServiceProviderConfigurationKeys; -import com.sun.enterprise.ee.cms.core.Signal; -import com.sun.enterprise.ee.cms.impl.client.FailureNotificationActionFactoryImpl; -import com.sun.enterprise.ee.cms.impl.client.JoinNotificationActionFactoryImpl; -import com.sun.enterprise.ee.cms.impl.client.JoinedAndReadyNotificationActionFactoryImpl; -import com.sun.enterprise.ee.cms.impl.client.MessageActionFactoryImpl; -import com.sun.enterprise.ee.cms.impl.client.PlannedShutdownActionFactoryImpl; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.api.core.AliveAndReadyView; +import org.glassfish.shoal.gms.api.core.CallBack; +import org.glassfish.shoal.gms.api.core.FailureNotificationSignal; +import org.glassfish.shoal.gms.api.core.GMSException; +import org.glassfish.shoal.gms.api.core.GMSFactory; +import org.glassfish.shoal.gms.api.core.GroupHandle; +import org.glassfish.shoal.gms.api.core.GroupManagementService; +import org.glassfish.shoal.gms.api.core.JoinedAndReadyNotificationSignal; +import org.glassfish.shoal.gms.api.core.MemberNotInViewException; +import org.glassfish.shoal.gms.api.core.PlannedShutdownSignal; +import org.glassfish.shoal.gms.api.core.ServiceProviderConfigurationKeys; +import org.glassfish.shoal.gms.api.core.Signal; +import org.glassfish.shoal.gms.client.FailureNotificationActionFactoryImpl; +import org.glassfish.shoal.gms.client.JoinNotificationActionFactoryImpl; +import org.glassfish.shoal.gms.client.JoinedAndReadyNotificationActionFactoryImpl; +import org.glassfish.shoal.gms.client.MessageActionFactoryImpl; +import org.glassfish.shoal.gms.client.PlannedShutdownActionFactoryImpl; +import org.glassfish.shoal.gms.logging.GMSLogDomain; +import org.glassfish.shoal.ha.cache.util.MessageReceiver; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/interceptor/CommandCollector.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/interceptor/CommandCollector.java similarity index 82% rename from cache/src/main/java/org/shoal/ha/cache/impl/interceptor/CommandCollector.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/interceptor/CommandCollector.java index 1b12f4a..86397ed 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/interceptor/CommandCollector.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/interceptor/CommandCollector.java @@ -14,11 +14,11 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.interceptor; +package org.glassfish.shoal.ha.cache.interceptor; -import org.shoal.ha.cache.api.DataStoreContext; -import org.shoal.ha.cache.api.DataStoreException; -import org.shoal.ha.cache.impl.command.Command; +import org.glassfish.shoal.ha.cache.api.DataStoreContext; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.command.Command; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/interceptor/CommandHandlerInterceptor.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/interceptor/CommandHandlerInterceptor.java similarity index 86% rename from cache/src/main/java/org/shoal/ha/cache/impl/interceptor/CommandHandlerInterceptor.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/interceptor/CommandHandlerInterceptor.java index 9db9f01..7b12e41 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/interceptor/CommandHandlerInterceptor.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/interceptor/CommandHandlerInterceptor.java @@ -14,15 +14,15 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.interceptor; +package org.glassfish.shoal.ha.cache.interceptor; import java.util.logging.Level; import java.util.logging.Logger; -import org.shoal.ha.cache.api.AbstractCommandInterceptor; -import org.shoal.ha.cache.api.DataStoreException; -import org.shoal.ha.cache.api.ShoalCacheLoggerConstants; -import org.shoal.ha.cache.impl.command.Command; +import org.glassfish.shoal.ha.cache.api.AbstractCommandInterceptor; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.command.Command; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/interceptor/ReplicationCommandTransmitterManager.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/interceptor/ReplicationCommandTransmitterManager.java similarity index 86% rename from cache/src/main/java/org/shoal/ha/cache/impl/interceptor/ReplicationCommandTransmitterManager.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/interceptor/ReplicationCommandTransmitterManager.java index 48e2ac3..38dc39e 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/interceptor/ReplicationCommandTransmitterManager.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/interceptor/ReplicationCommandTransmitterManager.java @@ -14,19 +14,19 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.interceptor; +package org.glassfish.shoal.ha.cache.interceptor; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import org.shoal.adapter.store.commands.NoOpCommand; -import org.shoal.ha.cache.api.AbstractCommandInterceptor; -import org.shoal.ha.cache.api.DataStoreContext; -import org.shoal.ha.cache.api.DataStoreException; -import org.shoal.ha.cache.api.ShoalCacheLoggerConstants; -import org.shoal.ha.cache.impl.command.Command; -import org.shoal.ha.cache.impl.command.ReplicationCommandOpcode; +import org.glassfish.shoal.ha.cache.api.AbstractCommandInterceptor; +import org.glassfish.shoal.ha.cache.api.DataStoreContext; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.command.Command; +import org.glassfish.shoal.ha.cache.command.ReplicationCommandOpcode; +import org.glassfish.shoal.ha.cache.store.backing.commands.NoOpCommand; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/interceptor/ReplicationCommandTransmitterWithList.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/interceptor/ReplicationCommandTransmitterWithList.java similarity index 93% rename from cache/src/main/java/org/shoal/ha/cache/impl/interceptor/ReplicationCommandTransmitterWithList.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/interceptor/ReplicationCommandTransmitterWithList.java index 897607e..a6e5831 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/interceptor/ReplicationCommandTransmitterWithList.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/interceptor/ReplicationCommandTransmitterWithList.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.interceptor; +package org.glassfish.shoal.ha.cache.interceptor; import java.io.IOException; import java.util.concurrent.ConcurrentLinkedQueue; @@ -29,14 +29,14 @@ import java.util.logging.Level; import java.util.logging.Logger; -import org.shoal.adapter.store.commands.NoOpCommand; -import org.shoal.ha.cache.api.DataStoreAlreadyClosedException; -import org.shoal.ha.cache.api.DataStoreContext; -import org.shoal.ha.cache.api.DataStoreException; -import org.shoal.ha.cache.api.ShoalCacheLoggerConstants; -import org.shoal.ha.cache.impl.command.Command; -import org.shoal.ha.cache.impl.command.ReplicationCommandOpcode; -import org.shoal.ha.cache.impl.util.ASyncReplicationManager; +import org.glassfish.shoal.ha.cache.api.DataStoreAlreadyClosedException; +import org.glassfish.shoal.ha.cache.api.DataStoreContext; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.command.Command; +import org.glassfish.shoal.ha.cache.command.ReplicationCommandOpcode; +import org.glassfish.shoal.ha.cache.store.backing.commands.NoOpCommand; +import org.glassfish.shoal.ha.cache.util.ASyncReplicationManager; /** * @author Mahesh Kannan @@ -51,9 +51,9 @@ public class ReplicationCommandTransmitterWithList implements Runnable, Co private ScheduledFuture future; - private static final String TRANSMITTER_FREQUECNCY_PROP_NAME = "org.shoal.cache.transmitter.frequency.in.millis"; + private static final String TRANSMITTER_FREQUECNCY_PROP_NAME = "org.glassfish.shoal.cache.transmitter.frequency.in.millis"; - private static final String MAX_BATCH_SIZE_PROP_NAME = "org.shoal.cache.transmitter.max.batch.size"; + private static final String MAX_BATCH_SIZE_PROP_NAME = "org.glassfish.shoal.cache.transmitter.max.batch.size"; private static int TRANSMITTER_FREQUECNCY_IN_MILLIS = 100; diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/interceptor/ReplicationCommandTransmitterWithMap.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/interceptor/ReplicationCommandTransmitterWithMap.java similarity index 95% rename from cache/src/main/java/org/shoal/ha/cache/impl/interceptor/ReplicationCommandTransmitterWithMap.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/interceptor/ReplicationCommandTransmitterWithMap.java index 6b4cb88..7c01c1f 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/interceptor/ReplicationCommandTransmitterWithMap.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/interceptor/ReplicationCommandTransmitterWithMap.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.interceptor; +package org.glassfish.shoal.ha.cache.interceptor; import java.io.IOException; import java.util.concurrent.ConcurrentHashMap; @@ -29,15 +29,15 @@ import java.util.logging.Level; import java.util.logging.Logger; -import org.shoal.adapter.store.commands.NoOpCommand; -import org.shoal.adapter.store.commands.SaveCommand; -import org.shoal.ha.cache.api.DataStoreAlreadyClosedException; -import org.shoal.ha.cache.api.DataStoreContext; -import org.shoal.ha.cache.api.DataStoreException; -import org.shoal.ha.cache.api.ShoalCacheLoggerConstants; -import org.shoal.ha.cache.impl.command.Command; -import org.shoal.ha.cache.impl.command.ReplicationCommandOpcode; -import org.shoal.ha.cache.impl.util.ASyncReplicationManager; +import org.glassfish.shoal.ha.cache.api.DataStoreAlreadyClosedException; +import org.glassfish.shoal.ha.cache.api.DataStoreContext; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.command.Command; +import org.glassfish.shoal.ha.cache.command.ReplicationCommandOpcode; +import org.glassfish.shoal.ha.cache.store.backing.commands.NoOpCommand; +import org.glassfish.shoal.ha.cache.store.backing.commands.SaveCommand; +import org.glassfish.shoal.ha.cache.util.ASyncReplicationManager; /** * @author Mahesh Kannan @@ -54,9 +54,9 @@ public class ReplicationCommandTransmitterWithMap implements Runnable, Com private ScheduledFuture future; - private static final String TRANSMITTER_FREQUECNCY_PROP_NAME = "org.shoal.cache.transmitter.frequency.in.millis"; + private static final String TRANSMITTER_FREQUECNCY_PROP_NAME = "org.glassfish.shoal.cache.transmitter.frequency.in.millis"; - private static final String MAX_BATCH_SIZE_PROP_NAME = "org.shoal.cache.transmitter.max.batch.size"; + private static final String MAX_BATCH_SIZE_PROP_NAME = "org.glassfish.shoal.cache.transmitter.max.batch.size"; private static int TRANSMITTER_FREQUECNCY_IN_MILLIS = 100; diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/interceptor/ReplicationFramePayloadCommand.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/interceptor/ReplicationFramePayloadCommand.java similarity index 94% rename from cache/src/main/java/org/shoal/ha/cache/impl/interceptor/ReplicationFramePayloadCommand.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/interceptor/ReplicationFramePayloadCommand.java index 381200c..818a41f 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/interceptor/ReplicationFramePayloadCommand.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/interceptor/ReplicationFramePayloadCommand.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.interceptor; +package org.glassfish.shoal.ha.cache.interceptor; import java.io.IOException; import java.io.ObjectInputStream; @@ -26,17 +26,17 @@ import java.util.logging.Logger; import org.glassfish.ha.store.util.KeyTransformer; -import org.shoal.ha.cache.api.DataStoreException; -import org.shoal.ha.cache.api.ShoalCacheLoggerConstants; -import org.shoal.ha.cache.impl.command.Command; -import org.shoal.ha.cache.impl.command.ReplicationCommandOpcode; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.command.Command; +import org.glassfish.shoal.ha.cache.command.ReplicationCommandOpcode; /** * @author Mahesh Kannan */ public class ReplicationFramePayloadCommand extends Command { - + private static final long serialVersionUID = -7673740871785789916L; private transient static final Logger _logger = Logger.getLogger(ShoalCacheLoggerConstants.CACHE_REPLICATION_FRAME_COMMAND); diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/interceptor/TransmitInterceptor.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/interceptor/TransmitInterceptor.java similarity index 87% rename from cache/src/main/java/org/shoal/ha/cache/impl/interceptor/TransmitInterceptor.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/interceptor/TransmitInterceptor.java index 6aa414e..ed295d4 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/interceptor/TransmitInterceptor.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/interceptor/TransmitInterceptor.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.interceptor; +package org.glassfish.shoal.ha.cache.interceptor; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -22,12 +22,12 @@ import java.util.logging.Level; import java.util.logging.Logger; -import org.shoal.ha.cache.api.AbstractCommandInterceptor; -import org.shoal.ha.cache.api.DataStoreContext; -import org.shoal.ha.cache.api.DataStoreException; -import org.shoal.ha.cache.api.ShoalCacheLoggerConstants; -import org.shoal.ha.cache.impl.command.Command; -import org.shoal.ha.group.GroupService; +import org.glassfish.shoal.ha.cache.api.AbstractCommandInterceptor; +import org.glassfish.shoal.ha.cache.api.DataStoreContext; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.command.Command; +import org.glassfish.shoal.ha.cache.group.GroupService; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/ha/mapper/DefaultKeyMapper.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/mapper/DefaultKeyMapper.java similarity index 78% rename from cache/src/main/java/org/shoal/ha/mapper/DefaultKeyMapper.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/mapper/DefaultKeyMapper.java index f57202d..62b71e0 100644 --- a/cache/src/main/java/org/shoal/ha/mapper/DefaultKeyMapper.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/mapper/DefaultKeyMapper.java @@ -1,6 +1,6 @@ /* + * Copyright (c) 2024, 2026 Contributors to the Eclipse Foundation. * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2024 Contributors to the Eclipse Foundation. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.mapper; +package org.glassfish.shoal.ha.cache.mapper; import java.util.Collection; import java.util.TreeSet; @@ -24,8 +24,8 @@ import java.util.logging.Logger; import org.glassfish.ha.store.api.HashableKey; -import org.shoal.ha.cache.api.ShoalCacheLoggerConstants; -import org.shoal.ha.group.GroupMemberEventListener; +import org.glassfish.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.group.GroupMemberEventListener; /** * @author Mahesh Kannan @@ -48,14 +48,6 @@ public class DefaultKeyMapper implements KeyMapper, GroupMemberEventListener { private static final String _EMPTY_REPLICAS = ""; - /** - * @deprecated use {@link #DefaultKeyMapper(String)} instead - */ - @Deprecated(forRemoval = true) - public DefaultKeyMapper(String myName, String groupName) { - this(myName); - } - public DefaultKeyMapper(String myName) { this.myName = myName; ReentrantReadWriteLock rwLock = new ReentrantReadWriteLock(); @@ -114,37 +106,24 @@ public String getReplicaChoices(String groupName, Object key) { public String[] getCurrentMembers() { return members; } - /* - * @Override public String[] getKeyMappingInfo(String groupName, Object key1) { int hc = key1.hashCode(); if (key1 - * instanceof HashableKey) { HashableKey k = (HashableKey) key1; hc = k.getHashKey() == null ? hc : - * k.getHashKey().hashCode(); } hc = Math.abs(hc); - * - * try { rLock.lock(); return getKeyMappingInfo(members, hc); } finally { rLock.unlock(); } } - * - * protected String[] getKeyMappingInfo(String[] instances, int hc) { if (members.length == 0) { return _EMPTY_TARGETS; - * } else if (members.length == 1) { return new String[] {members[0], null}; } else { int index = hc % members.length; - * return new String[] {members[index], members[(index + 1) % members.length]}; } } - */ @Override public String[] findReplicaInstance(String groupName, Object key1, String keyMappingInfo) { if (keyMappingInfo != null) { return keyMappingInfo.split(":"); - } else { - - int hc = key1.hashCode(); - if (key1 instanceof HashableKey) { - HashableKey k = (HashableKey) key1; - hc = k.getHashKey() == null ? hc : k.getHashKey().hashCode(); - } + } + int hc = key1.hashCode(); + if (key1 instanceof HashableKey) { + HashableKey k = (HashableKey) key1; + hc = k.getHashKey() == null ? hc : k.getHashKey().hashCode(); + } - try { - rLock.lock(); - return previuousAliveAndReadyMembers.length == 0 ? new String[] { _EMPTY_REPLICAS } - : new String[] { previuousAliveAndReadyMembers[Math.abs(hc % previuousAliveAndReadyMembers.length)] }; - } finally { - rLock.unlock(); - } + try { + rLock.lock(); + return previuousAliveAndReadyMembers.length == 0 ? new String[] { _EMPTY_REPLICAS } + : new String[] { previuousAliveAndReadyMembers[Math.abs(hc % previuousAliveAndReadyMembers.length)] }; + } finally { + rLock.unlock(); } } diff --git a/cache/src/main/java/org/shoal/ha/mapper/KeyMapper.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/mapper/KeyMapper.java similarity index 95% rename from cache/src/main/java/org/shoal/ha/mapper/KeyMapper.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/mapper/KeyMapper.java index ad1340f..53d3af5 100644 --- a/cache/src/main/java/org/shoal/ha/mapper/KeyMapper.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/mapper/KeyMapper.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.mapper; +package org.glassfish.shoal.ha.cache.mapper; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/ha/mapper/KeyMappingInfo.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/mapper/KeyMappingInfo.java similarity index 95% rename from cache/src/main/java/org/shoal/ha/mapper/KeyMappingInfo.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/mapper/KeyMappingInfo.java index 391df74..9ae93e7 100644 --- a/cache/src/main/java/org/shoal/ha/mapper/KeyMappingInfo.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/mapper/KeyMappingInfo.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.mapper; +package org.glassfish.shoal.ha.cache.mapper; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/store/DataStoreEntry.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/DataStoreEntry.java similarity index 96% rename from cache/src/main/java/org/shoal/ha/cache/impl/store/DataStoreEntry.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/store/DataStoreEntry.java index 8f32259..76b0fa4 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/store/DataStoreEntry.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/DataStoreEntry.java @@ -14,12 +14,12 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.store; +package org.glassfish.shoal.ha.cache.store; import java.util.Comparator; import java.util.TreeSet; -import org.shoal.adapter.store.commands.AbstractSaveCommand; +import org.glassfish.shoal.ha.cache.store.backing.commands.AbstractSaveCommand; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/store/DataStoreEntryUpdater.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/DataStoreEntryUpdater.java similarity index 88% rename from cache/src/main/java/org/shoal/ha/cache/impl/store/DataStoreEntryUpdater.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/store/DataStoreEntryUpdater.java index d049d82..a0a5386 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/store/DataStoreEntryUpdater.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/DataStoreEntryUpdater.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.store; +package org.glassfish.shoal.ha.cache.store; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -23,14 +23,14 @@ import java.util.logging.Level; import java.util.logging.Logger; -import org.shoal.adapter.store.commands.AbstractSaveCommand; -import org.shoal.adapter.store.commands.LoadResponseCommand; -import org.shoal.adapter.store.commands.SaveCommand; -import org.shoal.adapter.store.commands.TouchCommand; -import org.shoal.ha.cache.api.DataStoreContext; -import org.shoal.ha.cache.api.DataStoreException; -import org.shoal.ha.cache.api.ObjectInputStreamWithLoader; -import org.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.api.DataStoreContext; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.api.ObjectInputStreamWithLoader; +import org.glassfish.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.store.backing.commands.AbstractSaveCommand; +import org.glassfish.shoal.ha.cache.store.backing.commands.LoadResponseCommand; +import org.glassfish.shoal.ha.cache.store.backing.commands.SaveCommand; +import org.glassfish.shoal.ha.cache.store.backing.commands.TouchCommand; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/store/ReplicaStore.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/ReplicaStore.java similarity index 94% rename from cache/src/main/java/org/shoal/ha/cache/impl/store/ReplicaStore.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/store/ReplicaStore.java index 912100c..c5535c5 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/store/ReplicaStore.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/ReplicaStore.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.store; +package org.glassfish.shoal.ha.cache.store; import java.util.Collection; import java.util.Iterator; @@ -24,10 +24,10 @@ import java.util.logging.Level; import java.util.logging.Logger; -import org.shoal.ha.cache.api.DataStoreContext; -import org.shoal.ha.cache.api.DataStoreException; -import org.shoal.ha.cache.api.IdleEntryDetector; -import org.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.api.DataStoreContext; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.api.IdleEntryDetector; +import org.glassfish.shoal.ha.cache.api.ShoalCacheLoggerConstants; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/store/ReplicatedDataStore.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/ReplicatedDataStore.java similarity index 92% rename from cache/src/main/java/org/shoal/ha/cache/impl/store/ReplicatedDataStore.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/store/ReplicatedDataStore.java index 741ddff..c2758fa 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/store/ReplicatedDataStore.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/ReplicatedDataStore.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.store; +package org.glassfish.shoal.ha.cache.store; import java.io.Serializable; import java.lang.management.ManagementFactory; @@ -37,32 +37,32 @@ import org.glassfish.ha.store.api.Storeable; import org.glassfish.ha.store.util.KeyTransformer; import org.glassfish.ha.store.util.SimpleMetadata; -import org.shoal.adapter.store.commands.LoadRequestCommand; -import org.shoal.adapter.store.commands.RemoveCommand; -import org.shoal.adapter.store.commands.RemoveExpiredCommand; -import org.shoal.adapter.store.commands.SaveCommand; -import org.shoal.adapter.store.commands.SizeRequestCommand; -import org.shoal.adapter.store.commands.StaleCopyRemoveCommand; -import org.shoal.adapter.store.commands.TouchCommand; -import org.shoal.ha.cache.api.DataStore; -import org.shoal.ha.cache.api.DataStoreAlreadyClosedException; -import org.shoal.ha.cache.api.DataStoreContext; -import org.shoal.ha.cache.api.DataStoreException; -import org.shoal.ha.cache.api.DataStoreMBean; -import org.shoal.ha.cache.api.IdleEntryDetector; -import org.shoal.ha.cache.api.ReplicatedDataStoreStatsHolder; -import org.shoal.ha.cache.api.ShoalCacheLoggerConstants; -import org.shoal.ha.cache.impl.command.Command; -import org.shoal.ha.cache.impl.command.CommandManager; -import org.shoal.ha.cache.impl.interceptor.ReplicationCommandTransmitterManager; -import org.shoal.ha.cache.impl.interceptor.ReplicationFramePayloadCommand; -import org.shoal.ha.cache.impl.util.CommandResponse; -import org.shoal.ha.cache.impl.util.ResponseMediator; -import org.shoal.ha.cache.impl.util.StringKeyTransformer; -import org.shoal.ha.group.GroupMemberEventListener; -import org.shoal.ha.group.GroupService; -import org.shoal.ha.mapper.DefaultKeyMapper; -import org.shoal.ha.mapper.KeyMapper; +import org.glassfish.shoal.ha.cache.api.DataStore; +import org.glassfish.shoal.ha.cache.api.DataStoreAlreadyClosedException; +import org.glassfish.shoal.ha.cache.api.DataStoreContext; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.api.DataStoreMBean; +import org.glassfish.shoal.ha.cache.api.IdleEntryDetector; +import org.glassfish.shoal.ha.cache.api.ReplicatedDataStoreStatsHolder; +import org.glassfish.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.command.Command; +import org.glassfish.shoal.ha.cache.command.CommandManager; +import org.glassfish.shoal.ha.cache.group.GroupMemberEventListener; +import org.glassfish.shoal.ha.cache.group.GroupService; +import org.glassfish.shoal.ha.cache.interceptor.ReplicationCommandTransmitterManager; +import org.glassfish.shoal.ha.cache.interceptor.ReplicationFramePayloadCommand; +import org.glassfish.shoal.ha.cache.mapper.DefaultKeyMapper; +import org.glassfish.shoal.ha.cache.mapper.KeyMapper; +import org.glassfish.shoal.ha.cache.store.backing.commands.LoadRequestCommand; +import org.glassfish.shoal.ha.cache.store.backing.commands.RemoveCommand; +import org.glassfish.shoal.ha.cache.store.backing.commands.RemoveExpiredCommand; +import org.glassfish.shoal.ha.cache.store.backing.commands.SaveCommand; +import org.glassfish.shoal.ha.cache.store.backing.commands.SizeRequestCommand; +import org.glassfish.shoal.ha.cache.store.backing.commands.StaleCopyRemoveCommand; +import org.glassfish.shoal.ha.cache.store.backing.commands.TouchCommand; +import org.glassfish.shoal.ha.cache.util.CommandResponse; +import org.glassfish.shoal.ha.cache.util.ResponseMediator; +import org.glassfish.shoal.ha.cache.util.StringKeyTransformer; /** * @author Mahesh Kannan @@ -207,10 +207,10 @@ private void postInitialization() { dscMBean = new ReplicatedDataStoreStatsHolder(dsc); dsc.setDataStoreMBean(dscMBean); - boolean registerInMBeanServer = Boolean.getBoolean("org.shoal.ha.cache.mbean.register"); + boolean registerInMBeanServer = Boolean.getBoolean("org.glassfish.shoal.ha.cache.mbean.register"); if (registerInMBeanServer) { try { - mbeanObjectName = new ObjectName("org.shoal.ha.cache.jmx.ReplicatedDataStore" + ":name=" + dsc.getStoreName() + "_" + dsc.getInstanceName()); + mbeanObjectName = new ObjectName("org.glassfish.shoal.ha.cache.jmx.ReplicatedDataStore" + ":name=" + dsc.getStoreName() + "_" + dsc.getInstanceName()); mbs = ManagementFactory.getPlatformMBeanServer(); mbs.registerMBean(new StandardMBean(dscMBean, DataStoreMBean.class), mbeanObjectName); diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/store/SimpleDataStoreEntryUpdater.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/SimpleDataStoreEntryUpdater.java similarity index 93% rename from cache/src/main/java/org/shoal/ha/cache/impl/store/SimpleDataStoreEntryUpdater.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/store/SimpleDataStoreEntryUpdater.java index efadfe0..2cc03aa 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/store/SimpleDataStoreEntryUpdater.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/SimpleDataStoreEntryUpdater.java @@ -14,17 +14,17 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.store; +package org.glassfish.shoal.ha.cache.store; import java.util.Iterator; import java.util.TreeSet; import java.util.logging.Level; -import org.shoal.adapter.store.commands.AbstractSaveCommand; -import org.shoal.adapter.store.commands.LoadResponseCommand; -import org.shoal.adapter.store.commands.SaveCommand; -import org.shoal.adapter.store.commands.TouchCommand; -import org.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.store.backing.commands.AbstractSaveCommand; +import org.glassfish.shoal.ha.cache.store.backing.commands.LoadResponseCommand; +import org.glassfish.shoal.ha.cache.store.backing.commands.SaveCommand; +import org.glassfish.shoal.ha.cache.store.backing.commands.TouchCommand; /** * An entry updater used for plain Serializable POJOs diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/store/SimpleStoreableDataStoreEntryUpdater.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/SimpleStoreableDataStoreEntryUpdater.java similarity index 93% rename from cache/src/main/java/org/shoal/ha/cache/impl/store/SimpleStoreableDataStoreEntryUpdater.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/store/SimpleStoreableDataStoreEntryUpdater.java index 405916f..dc4041b 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/store/SimpleStoreableDataStoreEntryUpdater.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/SimpleStoreableDataStoreEntryUpdater.java @@ -14,18 +14,18 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.store; +package org.glassfish.shoal.ha.cache.store; import java.util.Iterator; import java.util.TreeSet; import java.util.logging.Level; import org.glassfish.ha.store.util.SimpleMetadata; -import org.shoal.adapter.store.commands.AbstractSaveCommand; -import org.shoal.adapter.store.commands.LoadResponseCommand; -import org.shoal.adapter.store.commands.SaveCommand; -import org.shoal.adapter.store.commands.TouchCommand; -import org.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.store.backing.commands.AbstractSaveCommand; +import org.glassfish.shoal.ha.cache.store.backing.commands.LoadResponseCommand; +import org.glassfish.shoal.ha.cache.store.backing.commands.SaveCommand; +import org.glassfish.shoal.ha.cache.store.backing.commands.TouchCommand; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/store/StoreableDataStoreEntryUpdater.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/StoreableDataStoreEntryUpdater.java similarity index 93% rename from cache/src/main/java/org/shoal/ha/cache/impl/store/StoreableDataStoreEntryUpdater.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/store/StoreableDataStoreEntryUpdater.java index f320175..65a446e 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/store/StoreableDataStoreEntryUpdater.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/StoreableDataStoreEntryUpdater.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.store; +package org.glassfish.shoal.ha.cache.store; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -23,11 +23,11 @@ import java.util.logging.Level; import org.glassfish.ha.store.api.Storeable; -import org.shoal.adapter.store.commands.AbstractSaveCommand; -import org.shoal.adapter.store.commands.LoadResponseCommand; -import org.shoal.adapter.store.commands.SaveCommand; -import org.shoal.adapter.store.commands.TouchCommand; -import org.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.store.backing.commands.AbstractSaveCommand; +import org.glassfish.shoal.ha.cache.store.backing.commands.LoadResponseCommand; +import org.glassfish.shoal.ha.cache.store.backing.commands.SaveCommand; +import org.glassfish.shoal.ha.cache.store.backing.commands.TouchCommand; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/adapter/store/RepliatedBackingStoreRegistry.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/RepliatedBackingStoreRegistry.java similarity index 94% rename from cache/src/main/java/org/shoal/adapter/store/RepliatedBackingStoreRegistry.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/RepliatedBackingStoreRegistry.java index 0738886..f82c298 100644 --- a/cache/src/main/java/org/shoal/adapter/store/RepliatedBackingStoreRegistry.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/RepliatedBackingStoreRegistry.java @@ -14,14 +14,14 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.adapter.store; +package org.glassfish.shoal.ha.cache.store.backing; import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.glassfish.ha.store.api.BackingStoreConfiguration; -import org.shoal.ha.cache.api.DataStoreContext; +import org.glassfish.shoal.ha.cache.api.DataStoreContext; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/adapter/store/ReplicatedBackingStore.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/ReplicatedBackingStore.java similarity index 91% rename from cache/src/main/java/org/shoal/adapter/store/ReplicatedBackingStore.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/ReplicatedBackingStore.java index 70f5b5d..efde1ff 100644 --- a/cache/src/main/java/org/shoal/adapter/store/ReplicatedBackingStore.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/ReplicatedBackingStore.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.adapter.store; +package org.glassfish.shoal.ha.cache.store.backing; import java.io.Serializable; import java.util.logging.Level; @@ -24,12 +24,12 @@ import org.glassfish.ha.store.api.BackingStoreConfiguration; import org.glassfish.ha.store.api.BackingStoreException; import org.glassfish.ha.store.api.BackingStoreFactory; -import org.shoal.ha.cache.api.DataStore; -import org.shoal.ha.cache.api.DataStoreContext; -import org.shoal.ha.cache.api.DataStoreException; -import org.shoal.ha.cache.api.DataStoreFactory; -import org.shoal.ha.cache.api.ShoalCacheLoggerConstants; -import org.shoal.ha.cache.impl.store.ReplicatedDataStore; +import org.glassfish.shoal.ha.cache.api.DataStore; +import org.glassfish.shoal.ha.cache.api.DataStoreContext; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.api.DataStoreFactory; +import org.glassfish.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.store.ReplicatedDataStore; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/adapter/store/ReplicatedBackingStoreFactory.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/ReplicatedBackingStoreFactory.java similarity index 97% rename from cache/src/main/java/org/shoal/adapter/store/ReplicatedBackingStoreFactory.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/ReplicatedBackingStoreFactory.java index e956474..a7b97eb 100644 --- a/cache/src/main/java/org/shoal/adapter/store/ReplicatedBackingStoreFactory.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/ReplicatedBackingStoreFactory.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.adapter.store; +package org.glassfish.shoal.ha.cache.store.backing; import java.io.Serializable; import java.util.Properties; diff --git a/cache/src/main/java/org/shoal/adapter/store/StoreableReplicatedBackingStore.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/StoreableReplicatedBackingStore.java similarity index 94% rename from cache/src/main/java/org/shoal/adapter/store/StoreableReplicatedBackingStore.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/StoreableReplicatedBackingStore.java index e607f81..8ab092f 100644 --- a/cache/src/main/java/org/shoal/adapter/store/StoreableReplicatedBackingStore.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/StoreableReplicatedBackingStore.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.adapter.store; +package org.glassfish.shoal.ha.cache.store.backing; import java.io.Serializable; diff --git a/cache/src/main/java/org/shoal/adapter/store/commands/AbstractSaveCommand.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/AbstractSaveCommand.java similarity index 94% rename from cache/src/main/java/org/shoal/adapter/store/commands/AbstractSaveCommand.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/AbstractSaveCommand.java index cb286d0..ebdc2a1 100644 --- a/cache/src/main/java/org/shoal/adapter/store/commands/AbstractSaveCommand.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/AbstractSaveCommand.java @@ -14,21 +14,21 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.adapter.store.commands; +package org.glassfish.shoal.ha.cache.store.backing.commands; import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; -import org.shoal.ha.cache.api.DataStoreException; -import org.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.api.ShoalCacheLoggerConstants; /** * @author Mahesh Kannan */ public abstract class AbstractSaveCommand extends AcknowledgedCommand { - + private static final long serialVersionUID = 241699054955846907L; protected transient static final Logger _logger = Logger.getLogger(ShoalCacheLoggerConstants.CACHE_SAVE_COMMAND); diff --git a/cache/src/main/java/org/shoal/adapter/store/commands/AcknowledgedCommand.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/AcknowledgedCommand.java similarity index 92% rename from cache/src/main/java/org/shoal/adapter/store/commands/AcknowledgedCommand.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/AcknowledgedCommand.java index 32bf0f3..792f997 100644 --- a/cache/src/main/java/org/shoal/adapter/store/commands/AcknowledgedCommand.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/AcknowledgedCommand.java @@ -14,24 +14,24 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.adapter.store.commands; +package org.glassfish.shoal.ha.cache.store.backing.commands; import java.io.IOException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.shoal.ha.cache.api.DataStoreException; -import org.shoal.ha.cache.impl.command.Command; -import org.shoal.ha.cache.impl.util.CommandResponse; -import org.shoal.ha.cache.impl.util.ResponseMediator; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.command.Command; +import org.glassfish.shoal.ha.cache.util.CommandResponse; +import org.glassfish.shoal.ha.cache.util.ResponseMediator; /** * @author Mahesh Kannan */ public abstract class AcknowledgedCommand extends Command { - + private static final long serialVersionUID = -4027862351560585449L; private transient CommandResponse resp; diff --git a/cache/src/main/java/org/shoal/adapter/store/commands/LoadRequestCommand.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/LoadRequestCommand.java similarity index 92% rename from cache/src/main/java/org/shoal/adapter/store/commands/LoadRequestCommand.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/LoadRequestCommand.java index bea8553..1359f40 100644 --- a/cache/src/main/java/org/shoal/adapter/store/commands/LoadRequestCommand.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/LoadRequestCommand.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.adapter.store.commands; +package org.glassfish.shoal.ha.cache.store.backing.commands; import java.io.IOException; import java.util.concurrent.ExecutionException; @@ -24,20 +24,20 @@ import java.util.logging.Level; import java.util.logging.Logger; -import org.shoal.ha.cache.api.DataStoreException; -import org.shoal.ha.cache.api.ShoalCacheLoggerConstants; -import org.shoal.ha.cache.impl.command.Command; -import org.shoal.ha.cache.impl.command.ReplicationCommandOpcode; -import org.shoal.ha.cache.impl.store.DataStoreEntry; -import org.shoal.ha.cache.impl.util.CommandResponse; -import org.shoal.ha.cache.impl.util.ResponseMediator; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.command.Command; +import org.glassfish.shoal.ha.cache.command.ReplicationCommandOpcode; +import org.glassfish.shoal.ha.cache.store.DataStoreEntry; +import org.glassfish.shoal.ha.cache.util.CommandResponse; +import org.glassfish.shoal.ha.cache.util.ResponseMediator; /** * @author Mahesh Kannan */ public class LoadRequestCommand extends Command { - + private static final long serialVersionUID = 3672209854011660431L; private static final Logger _logger = Logger.getLogger(ShoalCacheLoggerConstants.CACHE_LOAD_REQUEST_COMMAND); diff --git a/cache/src/main/java/org/shoal/adapter/store/commands/LoadResponseCommand.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/LoadResponseCommand.java similarity index 89% rename from cache/src/main/java/org/shoal/adapter/store/commands/LoadResponseCommand.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/LoadResponseCommand.java index 5ac7731..1f8077d 100644 --- a/cache/src/main/java/org/shoal/adapter/store/commands/LoadResponseCommand.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/LoadResponseCommand.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.adapter.store.commands; +package org.glassfish.shoal.ha.cache.store.backing.commands; import java.io.IOException; import java.io.ObjectInputStream; @@ -22,12 +22,12 @@ import java.util.logging.Level; import java.util.logging.Logger; -import org.shoal.ha.cache.api.DataStoreException; -import org.shoal.ha.cache.api.ShoalCacheLoggerConstants; -import org.shoal.ha.cache.impl.command.Command; -import org.shoal.ha.cache.impl.command.ReplicationCommandOpcode; -import org.shoal.ha.cache.impl.util.CommandResponse; -import org.shoal.ha.cache.impl.util.ResponseMediator; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.command.Command; +import org.glassfish.shoal.ha.cache.command.ReplicationCommandOpcode; +import org.glassfish.shoal.ha.cache.util.CommandResponse; +import org.glassfish.shoal.ha.cache.util.ResponseMediator; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/adapter/store/commands/NoOpCommand.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/NoOpCommand.java similarity index 87% rename from cache/src/main/java/org/shoal/adapter/store/commands/NoOpCommand.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/NoOpCommand.java index 1a1d90b..2d6424b 100644 --- a/cache/src/main/java/org/shoal/adapter/store/commands/NoOpCommand.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/NoOpCommand.java @@ -14,18 +14,18 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.adapter.store.commands; +package org.glassfish.shoal.ha.cache.store.backing.commands; -import org.shoal.ha.cache.api.DataStoreException; -import org.shoal.ha.cache.impl.command.Command; -import org.shoal.ha.cache.impl.command.ReplicationCommandOpcode; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.command.Command; +import org.glassfish.shoal.ha.cache.command.ReplicationCommandOpcode; /** * @author Mahesh Kannan */ public class NoOpCommand extends Command { - + private static final long serialVersionUID = 3353080048287174569L; private transient static final byte[] rawReadState = new byte[] { ReplicationCommandOpcode.NOOP_COMMAND, (byte) 123 }; diff --git a/cache/src/main/java/org/shoal/adapter/store/commands/RemoveCommand.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/RemoveCommand.java similarity index 89% rename from cache/src/main/java/org/shoal/adapter/store/commands/RemoveCommand.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/RemoveCommand.java index af23e74..6fb962c 100644 --- a/cache/src/main/java/org/shoal/adapter/store/commands/RemoveCommand.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/RemoveCommand.java @@ -14,19 +14,19 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.adapter.store.commands; +package org.glassfish.shoal.ha.cache.store.backing.commands; import java.util.logging.Logger; -import org.shoal.ha.cache.api.ShoalCacheLoggerConstants; -import org.shoal.ha.cache.impl.command.ReplicationCommandOpcode; +import org.glassfish.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.command.ReplicationCommandOpcode; /** * @author Mahesh Kannan */ public class RemoveCommand extends AcknowledgedCommand { - + private static final long serialVersionUID = -8067458552974086794L; protected static final Logger _logger = Logger.getLogger(ShoalCacheLoggerConstants.CACHE_REMOVE_COMMAND); diff --git a/cache/src/main/java/org/shoal/adapter/store/commands/RemoveExpiredCommand.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/RemoveExpiredCommand.java similarity index 91% rename from cache/src/main/java/org/shoal/adapter/store/commands/RemoveExpiredCommand.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/RemoveExpiredCommand.java index 07ec39e..0606de6 100644 --- a/cache/src/main/java/org/shoal/adapter/store/commands/RemoveExpiredCommand.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/RemoveExpiredCommand.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.adapter.store.commands; +package org.glassfish.shoal.ha.cache.store.backing.commands; import java.io.IOException; import java.io.ObjectInputStream; @@ -22,16 +22,16 @@ import java.util.logging.Level; import java.util.logging.Logger; -import org.shoal.ha.cache.api.ShoalCacheLoggerConstants; -import org.shoal.ha.cache.impl.command.Command; -import org.shoal.ha.cache.impl.command.ReplicationCommandOpcode; +import org.glassfish.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.command.Command; +import org.glassfish.shoal.ha.cache.command.ReplicationCommandOpcode; /** * @author Mahesh Kannan */ public class RemoveExpiredCommand extends Command { - + private static final long serialVersionUID = 5377972855354679059L; protected static final Logger _logger = Logger.getLogger(ShoalCacheLoggerConstants.CACHE_REMOVE_COMMAND); diff --git a/cache/src/main/java/org/shoal/adapter/store/commands/RemoveExpiredResultCommand.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/RemoveExpiredResultCommand.java similarity index 89% rename from cache/src/main/java/org/shoal/adapter/store/commands/RemoveExpiredResultCommand.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/RemoveExpiredResultCommand.java index 0ba8521..29ffceb 100644 --- a/cache/src/main/java/org/shoal/adapter/store/commands/RemoveExpiredResultCommand.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/RemoveExpiredResultCommand.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.adapter.store.commands; +package org.glassfish.shoal.ha.cache.store.backing.commands; import java.io.IOException; import java.io.ObjectInputStream; @@ -22,18 +22,18 @@ import java.util.logging.Level; import java.util.logging.Logger; -import org.shoal.ha.cache.api.ShoalCacheLoggerConstants; -import org.shoal.ha.cache.impl.command.Command; -import org.shoal.ha.cache.impl.command.ReplicationCommandOpcode; -import org.shoal.ha.cache.impl.util.CommandResponse; -import org.shoal.ha.cache.impl.util.ResponseMediator; +import org.glassfish.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.command.Command; +import org.glassfish.shoal.ha.cache.command.ReplicationCommandOpcode; +import org.glassfish.shoal.ha.cache.util.CommandResponse; +import org.glassfish.shoal.ha.cache.util.ResponseMediator; /** * @author Mahesh Kannan */ public class RemoveExpiredResultCommand extends Command { - + private static final long serialVersionUID = -6402834139071754486L; protected static final Logger _logger = Logger.getLogger(ShoalCacheLoggerConstants.CACHE_REMOVE_COMMAND); diff --git a/cache/src/main/java/org/shoal/adapter/store/commands/SaveCommand.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/SaveCommand.java similarity index 92% rename from cache/src/main/java/org/shoal/adapter/store/commands/SaveCommand.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/SaveCommand.java index c0e9112..63644ea 100644 --- a/cache/src/main/java/org/shoal/adapter/store/commands/SaveCommand.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/SaveCommand.java @@ -14,21 +14,21 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.adapter.store.commands; +package org.glassfish.shoal.ha.cache.store.backing.commands; import java.io.IOException; import java.util.logging.Level; -import org.shoal.ha.cache.api.DataStoreException; -import org.shoal.ha.cache.impl.command.ReplicationCommandOpcode; -import org.shoal.ha.cache.impl.store.DataStoreEntry; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.command.ReplicationCommandOpcode; +import org.glassfish.shoal.ha.cache.store.DataStoreEntry; /** * @author Mahesh Kannan */ public class SaveCommand extends AbstractSaveCommand { - + private static final long serialVersionUID = -1681470355087702983L; private transient V v; diff --git a/cache/src/main/java/org/shoal/adapter/store/commands/SimpleAckCommand.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/SimpleAckCommand.java similarity index 87% rename from cache/src/main/java/org/shoal/adapter/store/commands/SimpleAckCommand.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/SimpleAckCommand.java index 4d45dfc..63b15d8 100644 --- a/cache/src/main/java/org/shoal/adapter/store/commands/SimpleAckCommand.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/SimpleAckCommand.java @@ -14,18 +14,18 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.adapter.store.commands; +package org.glassfish.shoal.ha.cache.store.backing.commands; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.util.logging.Logger; -import org.shoal.ha.cache.api.ShoalCacheLoggerConstants; -import org.shoal.ha.cache.impl.command.Command; -import org.shoal.ha.cache.impl.command.ReplicationCommandOpcode; -import org.shoal.ha.cache.impl.util.CommandResponse; -import org.shoal.ha.cache.impl.util.ResponseMediator; +import org.glassfish.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.command.Command; +import org.glassfish.shoal.ha.cache.command.ReplicationCommandOpcode; +import org.glassfish.shoal.ha.cache.util.CommandResponse; +import org.glassfish.shoal.ha.cache.util.ResponseMediator; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/adapter/store/commands/SizeRequestCommand.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/SizeRequestCommand.java similarity index 87% rename from cache/src/main/java/org/shoal/adapter/store/commands/SizeRequestCommand.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/SizeRequestCommand.java index dec17d4..2aa84f3 100644 --- a/cache/src/main/java/org/shoal/adapter/store/commands/SizeRequestCommand.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/SizeRequestCommand.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.adapter.store.commands; +package org.glassfish.shoal.ha.cache.store.backing.commands; import java.io.IOException; import java.io.ObjectInputStream; @@ -23,12 +23,12 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; -import org.shoal.ha.cache.api.DataStoreException; -import org.shoal.ha.cache.api.ShoalCacheLoggerConstants; -import org.shoal.ha.cache.impl.command.Command; -import org.shoal.ha.cache.impl.command.ReplicationCommandOpcode; -import org.shoal.ha.cache.impl.util.CommandResponse; -import org.shoal.ha.cache.impl.util.ResponseMediator; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.command.Command; +import org.glassfish.shoal.ha.cache.command.ReplicationCommandOpcode; +import org.glassfish.shoal.ha.cache.util.CommandResponse; +import org.glassfish.shoal.ha.cache.util.ResponseMediator; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/adapter/store/commands/SizeResponseCommand.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/SizeResponseCommand.java similarity index 88% rename from cache/src/main/java/org/shoal/adapter/store/commands/SizeResponseCommand.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/SizeResponseCommand.java index c321c53..bfe0ba5 100644 --- a/cache/src/main/java/org/shoal/adapter/store/commands/SizeResponseCommand.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/SizeResponseCommand.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.adapter.store.commands; +package org.glassfish.shoal.ha.cache.store.backing.commands; import java.io.IOException; import java.io.ObjectInputStream; @@ -22,11 +22,11 @@ import java.util.logging.Level; import java.util.logging.Logger; -import org.shoal.ha.cache.api.ShoalCacheLoggerConstants; -import org.shoal.ha.cache.impl.command.Command; -import org.shoal.ha.cache.impl.command.ReplicationCommandOpcode; -import org.shoal.ha.cache.impl.util.CommandResponse; -import org.shoal.ha.cache.impl.util.ResponseMediator; +import org.glassfish.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.command.Command; +import org.glassfish.shoal.ha.cache.command.ReplicationCommandOpcode; +import org.glassfish.shoal.ha.cache.util.CommandResponse; +import org.glassfish.shoal.ha.cache.util.ResponseMediator; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/adapter/store/commands/StaleCopyRemoveCommand.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/StaleCopyRemoveCommand.java similarity index 88% rename from cache/src/main/java/org/shoal/adapter/store/commands/StaleCopyRemoveCommand.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/StaleCopyRemoveCommand.java index c7a1727..90abd7d 100644 --- a/cache/src/main/java/org/shoal/adapter/store/commands/StaleCopyRemoveCommand.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/StaleCopyRemoveCommand.java @@ -14,21 +14,21 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.adapter.store.commands; +package org.glassfish.shoal.ha.cache.store.backing.commands; import java.util.logging.Level; import java.util.logging.Logger; -import org.shoal.ha.cache.api.ShoalCacheLoggerConstants; -import org.shoal.ha.cache.impl.command.Command; -import org.shoal.ha.cache.impl.command.ReplicationCommandOpcode; +import org.glassfish.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.command.Command; +import org.glassfish.shoal.ha.cache.command.ReplicationCommandOpcode; /** * @author Mahesh Kannan */ public class StaleCopyRemoveCommand extends Command { - + private static final long serialVersionUID = -5823823481273689103L; protected static final Logger _logger = Logger.getLogger(ShoalCacheLoggerConstants.CACHE_STALE_REMOVE_COMMAND); diff --git a/cache/src/main/java/org/shoal/adapter/store/commands/TouchCommand.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/TouchCommand.java similarity index 89% rename from cache/src/main/java/org/shoal/adapter/store/commands/TouchCommand.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/TouchCommand.java index b45d752..46b8af1 100644 --- a/cache/src/main/java/org/shoal/adapter/store/commands/TouchCommand.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/store/backing/commands/TouchCommand.java @@ -14,20 +14,20 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.adapter.store.commands; +package org.glassfish.shoal.ha.cache.store.backing.commands; import java.util.logging.Level; -import org.shoal.ha.cache.api.DataStoreException; -import org.shoal.ha.cache.impl.command.ReplicationCommandOpcode; -import org.shoal.ha.cache.impl.store.DataStoreEntry; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.command.ReplicationCommandOpcode; +import org.glassfish.shoal.ha.cache.store.DataStoreEntry; /** * @author Mahesh Kannan */ public class TouchCommand extends AbstractSaveCommand { - + private static final long serialVersionUID = -7824388716058350739L; public TouchCommand() { diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/util/ASyncReplicationManager.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/ASyncReplicationManager.java similarity index 83% rename from cache/src/main/java/org/shoal/ha/cache/impl/util/ASyncReplicationManager.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/util/ASyncReplicationManager.java index 0bb34e2..728916a 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/util/ASyncReplicationManager.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/ASyncReplicationManager.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.util; +package org.glassfish.shoal.ha.cache.util; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ScheduledThreadPoolExecutor; @@ -38,10 +38,10 @@ public static ASyncReplicationManager _getInstance() { } private ASyncReplicationManager() { - int corePoolSize = getSystemProp("org.shoal.ha.threadpool.core.pool.size", 16); - int maxPoolSize = getSystemProp("org.shoal.ha.threadpool.max.pool.size", 16); - int keepAliveInSeconds = getSystemProp("org.shoal.ha.threadpool.keepalive.in.seconds", 300); - int boundedPoolSize = getSystemProp("org.shoal.ha.threadpool.max.pending.replication.limit", 32 * 1024); + int corePoolSize = getSystemProp("org.glassfish.shoal.ha.threadpool.core.pool.size", 16); + int maxPoolSize = getSystemProp("org.glassfish.shoal.ha.threadpool.max.pool.size", 16); + int keepAliveInSeconds = getSystemProp("org.glassfish.shoal.ha.threadpool.keepalive.in.seconds", 300); + int boundedPoolSize = getSystemProp("org.glassfish.shoal.ha.threadpool.max.pending.replication.limit", 32 * 1024); LinkedBlockingQueue queue = new LinkedBlockingQueue(boundedPoolSize); _asyncPool = new ASyncThreadPool(corePoolSize, maxPoolSize, keepAliveInSeconds, queue); diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/util/ASyncThreadPool.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/ASyncThreadPool.java similarity index 97% rename from cache/src/main/java/org/shoal/ha/cache/impl/util/ASyncThreadPool.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/util/ASyncThreadPool.java index 354e5a0..9a4a4a0 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/util/ASyncThreadPool.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/ASyncThreadPool.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.util; +package org.glassfish.shoal.ha.cache.util; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/util/CommandManagerShell.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/CommandManagerShell.java similarity index 94% rename from cache/src/main/java/org/shoal/ha/cache/impl/util/CommandManagerShell.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/util/CommandManagerShell.java index a91c463..2ba0d7a 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/util/CommandManagerShell.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/CommandManagerShell.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.util; +package org.glassfish.shoal.ha.cache.util; import java.io.BufferedReader; import java.io.IOException; @@ -32,12 +32,12 @@ import org.glassfish.ha.store.api.BackingStoreException; import org.glassfish.ha.store.api.HashableKey; import org.glassfish.ha.store.util.SimpleMetadata; -import org.shoal.adapter.store.ReplicatedBackingStore; -import org.shoal.adapter.store.ReplicatedBackingStoreFactory; -import org.shoal.adapter.store.commands.SaveCommand; -import org.shoal.adapter.store.commands.TouchCommand; -import org.shoal.ha.cache.api.DataStoreException; -import org.shoal.ha.cache.impl.command.CommandManager; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.command.CommandManager; +import org.glassfish.shoal.ha.cache.store.backing.ReplicatedBackingStore; +import org.glassfish.shoal.ha.cache.store.backing.ReplicatedBackingStoreFactory; +import org.glassfish.shoal.ha.cache.store.backing.commands.SaveCommand; +import org.glassfish.shoal.ha.cache.store.backing.commands.TouchCommand; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/util/CommandResponse.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/CommandResponse.java similarity index 98% rename from cache/src/main/java/org/shoal/ha/cache/impl/util/CommandResponse.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/util/CommandResponse.java index b16368b..867091b 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/util/CommandResponse.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/CommandResponse.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.util; +package org.glassfish.shoal.ha.cache.util; import java.util.concurrent.Callable; import java.util.concurrent.FutureTask; diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/util/CumulativeCommandResponse.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/CumulativeCommandResponse.java similarity index 97% rename from cache/src/main/java/org/shoal/ha/cache/impl/util/CumulativeCommandResponse.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/util/CumulativeCommandResponse.java index f30b2d2..6a0e036 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/util/CumulativeCommandResponse.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/CumulativeCommandResponse.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.util; +package org.glassfish.shoal.ha.cache.util; import java.util.concurrent.CountDownLatch; diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/util/DataStoreShell.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/DataStoreShell.java similarity index 96% rename from cache/src/main/java/org/shoal/ha/cache/impl/util/DataStoreShell.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/util/DataStoreShell.java index 49d89a2..f438185 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/util/DataStoreShell.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/DataStoreShell.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.util; +package org.glassfish.shoal.ha.cache.util; import java.io.BufferedReader; import java.io.IOException; @@ -31,8 +31,8 @@ import org.glassfish.ha.store.api.BackingStore; import org.glassfish.ha.store.api.BackingStoreConfiguration; import org.glassfish.ha.store.api.BackingStoreException; -import org.shoal.adapter.store.ReplicatedBackingStoreFactory; -import org.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.store.backing.ReplicatedBackingStoreFactory; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/util/DefaultKeyTransformer.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/DefaultKeyTransformer.java similarity index 96% rename from cache/src/main/java/org/shoal/ha/cache/impl/util/DefaultKeyTransformer.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/util/DefaultKeyTransformer.java index f5e8a54..0213c27 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/util/DefaultKeyTransformer.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/DefaultKeyTransformer.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.util; +package org.glassfish.shoal.ha.cache.util; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -23,7 +23,7 @@ import java.util.logging.Logger; import org.glassfish.ha.store.util.KeyTransformer; -import org.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.api.ShoalCacheLoggerConstants; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/util/GroupEventListener.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/GroupEventListener.java similarity index 95% rename from cache/src/main/java/org/shoal/ha/cache/impl/util/GroupEventListener.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/util/GroupEventListener.java index bfacfd8..5d33247 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/util/GroupEventListener.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/GroupEventListener.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.util; +package org.glassfish.shoal.ha.cache.util; /** * Created by IntelliJ IDEA. User: maheshk Date: Mar 20, 2010 Time: 6:08:24 PM To change this template use File | diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/util/MessageReceiver.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/MessageReceiver.java similarity index 90% rename from cache/src/main/java/org/shoal/ha/cache/impl/util/MessageReceiver.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/util/MessageReceiver.java index c23f44f..e414d88 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/util/MessageReceiver.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/MessageReceiver.java @@ -14,13 +14,13 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.util; +package org.glassfish.shoal.ha.cache.util; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.CallBack; -import com.sun.enterprise.ee.cms.core.MessageSignal; -import com.sun.enterprise.ee.cms.core.Signal; +import org.glassfish.shoal.gms.api.core.CallBack; +import org.glassfish.shoal.gms.api.core.MessageSignal; +import org.glassfish.shoal.gms.api.core.Signal; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/util/ObjectInputStreamWithLoader.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/ObjectInputStreamWithLoader.java similarity index 98% rename from cache/src/main/java/org/shoal/ha/cache/impl/util/ObjectInputStreamWithLoader.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/util/ObjectInputStreamWithLoader.java index 375dbb8..6b214ab 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/util/ObjectInputStreamWithLoader.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/ObjectInputStreamWithLoader.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.util; +package org.glassfish.shoal.ha.cache.util; import java.io.IOException; import java.io.InputStream; diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/util/Replicable.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/Replicable.java similarity index 95% rename from cache/src/main/java/org/shoal/ha/cache/impl/util/Replicable.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/util/Replicable.java index 796df96..3b39406 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/util/Replicable.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/Replicable.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.util; +package org.glassfish.shoal.ha.cache.util; import java.io.IOException; diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/util/ReplicationInputStream.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/ReplicationInputStream.java similarity index 98% rename from cache/src/main/java/org/shoal/ha/cache/impl/util/ReplicationInputStream.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/util/ReplicationInputStream.java index 244310c..f20e827 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/util/ReplicationInputStream.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/ReplicationInputStream.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.util; +package org.glassfish.shoal.ha.cache.util; import java.io.ByteArrayInputStream; import java.nio.charset.Charset; diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/util/ReplicationOutputStream.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/ReplicationOutputStream.java similarity index 98% rename from cache/src/main/java/org/shoal/ha/cache/impl/util/ReplicationOutputStream.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/util/ReplicationOutputStream.java index d787c40..3fae44f 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/util/ReplicationOutputStream.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/ReplicationOutputStream.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.util; +package org.glassfish.shoal.ha.cache.util; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/util/ResponseMediator.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/ResponseMediator.java similarity index 97% rename from cache/src/main/java/org/shoal/ha/cache/impl/util/ResponseMediator.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/util/ResponseMediator.java index 7eaa6e3..0f5688c 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/util/ResponseMediator.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/ResponseMediator.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.util; +package org.glassfish.shoal.ha.cache.util; import java.util.concurrent.ConcurrentHashMap; diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/util/SimpleDataStoreShell.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/SimpleDataStoreShell.java similarity index 97% rename from cache/src/main/java/org/shoal/ha/cache/impl/util/SimpleDataStoreShell.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/util/SimpleDataStoreShell.java index 7eee056..f08fae6 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/util/SimpleDataStoreShell.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/SimpleDataStoreShell.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.util; +package org.glassfish.shoal.ha.cache.util; import java.io.BufferedReader; import java.io.DataInputStream; @@ -33,10 +33,10 @@ import java.util.logging.Logger; import org.glassfish.ha.store.api.Storeable; -import org.shoal.ha.cache.api.DataStore; -import org.shoal.ha.cache.api.DataStoreContext; -import org.shoal.ha.cache.api.DataStoreFactory; -import org.shoal.ha.cache.api.ShoalCacheLoggerConstants; +import org.glassfish.shoal.ha.cache.api.DataStore; +import org.glassfish.shoal.ha.cache.api.DataStoreContext; +import org.glassfish.shoal.ha.cache.api.DataStoreFactory; +import org.glassfish.shoal.ha.cache.api.ShoalCacheLoggerConstants; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/util/SimpleSerializer.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/SimpleSerializer.java similarity index 98% rename from cache/src/main/java/org/shoal/ha/cache/impl/util/SimpleSerializer.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/util/SimpleSerializer.java index 9e6dca9..effeb3d 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/util/SimpleSerializer.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/SimpleSerializer.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.util; +package org.glassfish.shoal.ha.cache.util; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/util/SimpleStoreableBackingStoreShell.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/SimpleStoreableBackingStoreShell.java similarity index 96% rename from cache/src/main/java/org/shoal/ha/cache/impl/util/SimpleStoreableBackingStoreShell.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/util/SimpleStoreableBackingStoreShell.java index 2d07a23..0fb326b 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/util/SimpleStoreableBackingStoreShell.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/SimpleStoreableBackingStoreShell.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.util; +package org.glassfish.shoal.ha.cache.util; import java.io.BufferedReader; import java.io.IOException; @@ -32,9 +32,9 @@ import org.glassfish.ha.store.api.BackingStoreException; import org.glassfish.ha.store.api.HashableKey; import org.glassfish.ha.store.util.SimpleMetadata; -import org.shoal.adapter.store.ReplicatedBackingStore; -import org.shoal.adapter.store.ReplicatedBackingStoreFactory; -import org.shoal.ha.cache.impl.command.CommandManager; +import org.glassfish.shoal.ha.cache.command.CommandManager; +import org.glassfish.shoal.ha.cache.store.backing.ReplicatedBackingStore; +import org.glassfish.shoal.ha.cache.store.backing.ReplicatedBackingStoreFactory; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/util/SimpleStoreableMetadata.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/SimpleStoreableMetadata.java similarity index 98% rename from cache/src/main/java/org/shoal/ha/cache/impl/util/SimpleStoreableMetadata.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/util/SimpleStoreableMetadata.java index 8928297..8dbccf5 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/util/SimpleStoreableMetadata.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/SimpleStoreableMetadata.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.util; +package org.glassfish.shoal.ha.cache.util; import java.io.IOException; import java.io.InputStream; @@ -29,7 +29,7 @@ */ public class SimpleStoreableMetadata implements Storeable { - + private static final long serialVersionUID = 2852227115353486022L; private long version; diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/util/StoreableBackingStoreShell.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/StoreableBackingStoreShell.java similarity index 98% rename from cache/src/main/java/org/shoal/ha/cache/impl/util/StoreableBackingStoreShell.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/util/StoreableBackingStoreShell.java index 24ec427..4cb38d5 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/util/StoreableBackingStoreShell.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/StoreableBackingStoreShell.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.util; +package org.glassfish.shoal.ha.cache.util; import java.io.BufferedReader; import java.io.DataInputStream; @@ -35,7 +35,7 @@ import org.glassfish.ha.store.api.BackingStoreConfiguration; import org.glassfish.ha.store.api.BackingStoreException; import org.glassfish.ha.store.api.Storeable; -import org.shoal.adapter.store.ReplicatedBackingStoreFactory; +import org.glassfish.shoal.ha.cache.store.backing.ReplicatedBackingStoreFactory; /** * @author Mahesh Kannan diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/util/StringKeyTransformer.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/StringKeyTransformer.java similarity index 97% rename from cache/src/main/java/org/shoal/ha/cache/impl/util/StringKeyTransformer.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/util/StringKeyTransformer.java index 57a7cf4..6a2b3f0 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/util/StringKeyTransformer.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/StringKeyTransformer.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.util; +package org.glassfish.shoal.ha.cache.util; import java.nio.charset.Charset; diff --git a/cache/src/main/java/org/shoal/ha/cache/impl/util/Utility.java b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/Utility.java similarity index 98% rename from cache/src/main/java/org/shoal/ha/cache/impl/util/Utility.java rename to cache/src/main/java/org/glassfish/shoal/ha/cache/util/Utility.java index aa5e250..d3eaf9e 100644 --- a/cache/src/main/java/org/shoal/ha/cache/impl/util/Utility.java +++ b/cache/src/main/java/org/glassfish/shoal/ha/cache/util/Utility.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.cache.impl.util; +package org.glassfish.shoal.ha.cache.util; /** * @author V2.x diff --git a/cache/src/test/java/org/shoal/cache/dummy/.gitkeep b/cache/src/test/java/org/glassfish/shoal/cache/dummy/.gitkeep similarity index 100% rename from cache/src/test/java/org/shoal/cache/dummy/.gitkeep rename to cache/src/test/java/org/glassfish/shoal/cache/dummy/.gitkeep diff --git a/cache/src/test/java/org/shoal/ha/group/gms/GroupServiceProviderTest.java b/cache/src/test/java/org/glassfish/shoal/ha/group/GroupServiceProviderTest.java similarity index 94% rename from cache/src/test/java/org/shoal/ha/group/gms/GroupServiceProviderTest.java rename to cache/src/test/java/org/glassfish/shoal/ha/group/GroupServiceProviderTest.java index 13a18b8..93fd4e0 100644 --- a/cache/src/test/java/org/shoal/ha/group/gms/GroupServiceProviderTest.java +++ b/cache/src/test/java/org/glassfish/shoal/ha/group/GroupServiceProviderTest.java @@ -14,16 +14,16 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.ha.group.gms; +package org.glassfish.shoal.ha.group; import java.util.Arrays; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; import java.util.logging.Logger; -import org.shoal.ha.cache.impl.util.MessageReceiver; - -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.logging.GMSLogDomain; +import org.glassfish.shoal.ha.cache.group.GroupServiceProvider; +import org.glassfish.shoal.ha.cache.util.MessageReceiver; import junit.framework.Test; import junit.framework.TestCase; diff --git a/cache/src/test/java/org/shoal/test/command/BatchedNoopCommand.java b/cache/src/test/java/org/glassfish/shoal/test/command/BatchedNoopCommand.java similarity index 92% rename from cache/src/test/java/org/shoal/test/command/BatchedNoopCommand.java rename to cache/src/test/java/org/glassfish/shoal/test/command/BatchedNoopCommand.java index e1dc28b..c1d9fe3 100644 --- a/cache/src/test/java/org/shoal/test/command/BatchedNoopCommand.java +++ b/cache/src/test/java/org/glassfish/shoal/test/command/BatchedNoopCommand.java @@ -14,16 +14,16 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.test.command; +package org.glassfish.shoal.test.command; -import org.shoal.ha.cache.impl.command.Command; +import org.glassfish.shoal.ha.cache.command.Command; /** * @author Mahesh Kannan */ public class BatchedNoopCommand extends Command { - + private static final long serialVersionUID = 4048003960462018415L; public BatchedNoopCommand() { diff --git a/cache/src/test/java/org/shoal/test/command/BatchedNoopCommandInterceptor.java b/cache/src/test/java/org/glassfish/shoal/test/command/BatchedNoopCommandInterceptor.java similarity index 88% rename from cache/src/test/java/org/shoal/test/command/BatchedNoopCommandInterceptor.java rename to cache/src/test/java/org/glassfish/shoal/test/command/BatchedNoopCommandInterceptor.java index a670ef8..b43d5f1 100644 --- a/cache/src/test/java/org/shoal/test/command/BatchedNoopCommandInterceptor.java +++ b/cache/src/test/java/org/glassfish/shoal/test/command/BatchedNoopCommandInterceptor.java @@ -14,13 +14,13 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.test.command; +package org.glassfish.shoal.test.command; import java.util.concurrent.atomic.AtomicInteger; -import org.shoal.ha.cache.api.AbstractCommandInterceptor; -import org.shoal.ha.cache.api.DataStoreException; -import org.shoal.ha.cache.impl.command.Command; +import org.glassfish.shoal.ha.cache.api.AbstractCommandInterceptor; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.command.Command; /** * @author Mahesh Kannan diff --git a/cache/src/test/java/org/shoal/test/command/CommandManagerTest.java b/cache/src/test/java/org/glassfish/shoal/test/command/CommandManagerTest.java similarity index 90% rename from cache/src/test/java/org/shoal/test/command/CommandManagerTest.java rename to cache/src/test/java/org/glassfish/shoal/test/command/CommandManagerTest.java index aa11947..1c9521d 100644 --- a/cache/src/test/java/org/shoal/test/command/CommandManagerTest.java +++ b/cache/src/test/java/org/glassfish/shoal/test/command/CommandManagerTest.java @@ -14,14 +14,14 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.test.command; +package org.glassfish.shoal.test.command; -import org.shoal.ha.cache.api.DataStoreContext; -import org.shoal.ha.cache.api.DataStoreException; -import org.shoal.ha.cache.api.ReplicatedDataStoreStatsHolder; -import org.shoal.ha.cache.impl.command.CommandManager; -import org.shoal.ha.group.GroupService; -import org.shoal.test.common.DummyGroupService; +import org.glassfish.shoal.ha.cache.api.DataStoreContext; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.api.ReplicatedDataStoreStatsHolder; +import org.glassfish.shoal.ha.cache.command.CommandManager; +import org.glassfish.shoal.ha.cache.group.GroupService; +import org.glassfish.shoal.test.common.DummyGroupService; import junit.framework.Test; import junit.framework.TestCase; @@ -83,17 +83,17 @@ public void testRegistercommands() { * CommandMonitorInterceptor cmi1 = new CommandMonitorInterceptor(); CommandMonitorInterceptor cmi2 = new * CommandMonitorInterceptor(); cm.registerExecutionInterceptor(cmi1); cm.registerExecutionInterceptor(cmi2); * cm.executeCommand(new NoopCommand()); - * + * * boolean stat = cmi1.getTransmitCount() == 1; stat = stat && (cmi2.getTransmitCount() == cmi1.getTransmitCount()); * assertTrue(stat); } - * + * * public void testLoopBackInterceptors() { GroupService gs = new DummyGroupService("inst1", "grp1"); DataStoreContext * dsc = new DataStoreContext("test", gs); CommandManager cm = dsc.getCommandManager(); - * + * * cm.registerCommand(new NoopCommand()); cm.registerCommand(new BatchedNoopCommand()); NoopCommandInterceptor cmi1 = * new NoopCommandInterceptor(); BatchedNoopCommandInterceptor bat = new BatchedNoopCommandInterceptor(); * cm.registerExecutionInterceptor(cmi1); cm.registerExecutionInterceptor(bat); cm.executeCommand(new NoopCommand()); - * + * * System.out.println("****** testLoopBackInterceptors ******"); System.out.println("* cmi1.getTotalTransCount(): " + * cmi1.getTotalTransCount()); System.out.println("* cmi1.getNoopTransCount(): " + cmi1.getNoopTransCount()); * System.out.println("* bat.getNoopTransCount(): " + bat.getTransmitCount()); boolean stat = cmi1.getTotalTransCount() diff --git a/cache/src/test/java/org/shoal/test/command/NoopCommand.java b/cache/src/test/java/org/glassfish/shoal/test/command/NoopCommand.java similarity index 92% rename from cache/src/test/java/org/shoal/test/command/NoopCommand.java rename to cache/src/test/java/org/glassfish/shoal/test/command/NoopCommand.java index 4a94861..e5bcbd6 100644 --- a/cache/src/test/java/org/shoal/test/command/NoopCommand.java +++ b/cache/src/test/java/org/glassfish/shoal/test/command/NoopCommand.java @@ -14,16 +14,16 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.test.command; +package org.glassfish.shoal.test.command; -import org.shoal.ha.cache.impl.command.Command; +import org.glassfish.shoal.ha.cache.command.Command; /** * @author Mahesh Kannan */ public class NoopCommand extends Command { - + private static final long serialVersionUID = -7331429541785561201L; public NoopCommand() { diff --git a/cache/src/test/java/org/shoal/test/command/NoopCommandInterceptor.java b/cache/src/test/java/org/glassfish/shoal/test/command/NoopCommandInterceptor.java similarity index 90% rename from cache/src/test/java/org/shoal/test/command/NoopCommandInterceptor.java rename to cache/src/test/java/org/glassfish/shoal/test/command/NoopCommandInterceptor.java index 535a909..ac042f2 100644 --- a/cache/src/test/java/org/shoal/test/command/NoopCommandInterceptor.java +++ b/cache/src/test/java/org/glassfish/shoal/test/command/NoopCommandInterceptor.java @@ -14,13 +14,13 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.test.command; +package org.glassfish.shoal.test.command; import java.util.concurrent.atomic.AtomicInteger; -import org.shoal.ha.cache.api.AbstractCommandInterceptor; -import org.shoal.ha.cache.api.DataStoreException; -import org.shoal.ha.cache.impl.command.Command; +import org.glassfish.shoal.ha.cache.api.AbstractCommandInterceptor; +import org.glassfish.shoal.ha.cache.api.DataStoreException; +import org.glassfish.shoal.ha.cache.command.Command; /** * @author Mahesh Kannan diff --git a/cache/src/test/java/org/shoal/test/common/DummyGroupService.java b/cache/src/test/java/org/glassfish/shoal/test/common/DummyGroupService.java similarity index 91% rename from cache/src/test/java/org/shoal/test/common/DummyGroupService.java rename to cache/src/test/java/org/glassfish/shoal/test/common/DummyGroupService.java index 15cec54..704abeb 100644 --- a/cache/src/test/java/org/shoal/test/common/DummyGroupService.java +++ b/cache/src/test/java/org/glassfish/shoal/test/common/DummyGroupService.java @@ -14,14 +14,14 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.test.common; +package org.glassfish.shoal.test.common; import java.util.Collections; import java.util.List; -import org.shoal.ha.cache.impl.util.MessageReceiver; -import org.shoal.ha.group.GroupMemberEventListener; -import org.shoal.ha.group.GroupService; +import org.glassfish.shoal.ha.cache.group.GroupMemberEventListener; +import org.glassfish.shoal.ha.cache.group.GroupService; +import org.glassfish.shoal.ha.cache.util.MessageReceiver; /** * @author Mahesh Kannan diff --git a/cache/src/test/java/org/shoal/test/maptest/KeyMapperTest.java b/cache/src/test/java/org/glassfish/shoal/test/maptest/KeyMapperTest.java similarity index 97% rename from cache/src/test/java/org/shoal/test/maptest/KeyMapperTest.java rename to cache/src/test/java/org/glassfish/shoal/test/maptest/KeyMapperTest.java index ae3f242..970e268 100644 --- a/cache/src/test/java/org/shoal/test/maptest/KeyMapperTest.java +++ b/cache/src/test/java/org/glassfish/shoal/test/maptest/KeyMapperTest.java @@ -15,13 +15,13 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.test.maptest; +package org.glassfish.shoal.test.maptest; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.shoal.ha.mapper.DefaultKeyMapper; +import org.glassfish.shoal.ha.cache.mapper.DefaultKeyMapper; import junit.framework.Test; import junit.framework.TestCase; @@ -191,26 +191,26 @@ public void testReplicaUponFailure() { /* * public void testReplicaUponFailureFromAllOtherNodes() { - * + * * String[] aliveInstances = new String[10]; for (int i=0; i<10; i++) {aliveInstances[i] = "inst"+i;} - * + * * String[] previousView = new String[] {}; - * + * * int sz = 10; DefaultKeyMapper[] mappers = new DefaultKeyMapper[sz]; for (int i = 0; i < sz; i++) { mappers[i] * = new DefaultKeyMapper("n"+i, "g1"); mappers[i].onViewChange(Arrays.asList(aliveInstances), * Arrays.asList(previousView), true); } - * + * * String[] keys = new String[16]; String[] replicaInstanceNames = new String[16]; - * + * * int count = keys.length; - * + * * for (int i = 0; i < count; i++) { keys[i] = "Key-" + Math.random(); replicaInstanceNames[i] = * mappers[0].getMappedInstance("g1", keys[i]); } - * + * * for (int i = 0; i < sz; i++) { List currentMembers = new ArrayList(); * currentMembers.addAll(Arrays.asList(aliveInstances)); currentMembers.remove("inst5"); * mappers[i].onViewChange(currentMembers, Arrays.asList(aliveInstances), false); } - * + * * boolean result = true; for (int id = 1; id < sz; id++) { for (int i = 0; i < keys.length; i++) { String * mappedInstanceName = mappers[id].findReplicaInstance("g1", keys[i]); if * (!mappedInstanceName.equals(replicaInstanceNames[i])) { result = false; System.err.println("For key: " + keys[i] + @@ -224,20 +224,20 @@ public void testReplicaUponFailure() { * public void testReplicaUponRestart() { Integer[] keys = new Integer[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, * 14}; String[] expectedReplica = new String[]{ "n0", "n1", "n2", "n4", "n4", "n5", "n0", "n1", "n2", "n5", "n4", "n5", * "n0", "n1", "n2"}; - * + * * boolean result = true; - * - * - * - * + * + * + * + * * DefaultKeyMapper mapper = new DefaultKeyMapper("n3", "g1"); mapper.registerInstance("n0"); * mapper.registerInstance("n1"); mapper.registerInstance("n2"); mapper.registerInstance("n4"); * mapper.registerInstance("n5"); mapper.removeInstance("n3"); mapper.registerInstance("n3"); for (int i = 0; i < * keys.length; i++) { if (!mapper.findReplicaInstance("g1", keys[i]).equals(expectedReplica[i])) { result = false; * System.err.println("testReplicaUponRestart:: For key: " + keys[i] + " exptected Replica was: " + expectedReplica[i] + * " but got mapped to: " + mapper.findReplicaInstance("g1", keys[i])); } } - * - * + * + * * System.out.println("* Test[testReplicaUponRestart] => " + result); assert (result); } */ diff --git a/cache/src/test/java/org/shoal/test/util/ReplicationIOStreamTest.java b/cache/src/test/java/org/glassfish/shoal/test/util/ReplicationIOStreamTest.java similarity index 95% rename from cache/src/test/java/org/shoal/test/util/ReplicationIOStreamTest.java rename to cache/src/test/java/org/glassfish/shoal/test/util/ReplicationIOStreamTest.java index 8abc7b5..835b77a 100644 --- a/cache/src/test/java/org/shoal/test/util/ReplicationIOStreamTest.java +++ b/cache/src/test/java/org/glassfish/shoal/test/util/ReplicationIOStreamTest.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package org.shoal.test.util; +package org.glassfish.shoal.test.util; import junit.framework.Test; import junit.framework.TestCase; @@ -46,23 +46,23 @@ public void testReplicationTestSetup() { /* * public void testReplicationBooleanIO() { boolean result = false; try { ReplicationOutputStream ros = new * ReplicationOutputStream(); ros.writeBoolean(true); Boolean b = new Boolean(false); ros.writeBoolean(b); - * + * * ReplicationInputStream ris = new ReplicationInputStream(ros.toByteArray()); result = ris.readBoolean() && (! * ris.readBoolean()); } catch (IOException ioEx) { ioEx.printStackTrace(); } catch (Exception ex) { * ex.printStackTrace(); } - * + * * assert(result); } - * - * - * + * + * + * * public void testReplicationIntIO() { boolean result = false; try { ReplicationOutputStream ros = new * ReplicationOutputStream(); ros.writeInt(34); ros.writeBoolean(true); ros.write(79); ros.writeInt(7); * ReplicationInputStream ris = new ReplicationInputStream(ros.toByteArray()); result = ris.readInt() == 34 && * ris.readBoolean() && ris.read() == 79 && ris.readInt() == 7; } catch (IOException ioEx) { ioEx.printStackTrace(); } * catch (Exception ex) { ex.printStackTrace(); } - * + * * assert(result); } - * + * * public void testReplicationStringIO() { boolean result = false; try { ReplicationOutputStream ros = new * ReplicationOutputStream(); ros.writeInt(34); ros.writeBoolean(true); ros.write(79); ros.writeInt(7); * ros.writeLengthPrefixedString(ReplicationIOStreamTest.class.getName()); ros.writeLong(789); ReplicationInputStream @@ -70,112 +70,112 @@ public void testReplicationTestSetup() { * == 79 && ris.readInt() == 7 && (ris.readLengthPrefixedString().equals(ReplicationIOStreamTest.class.getName())) && * ris.readLong() == 789; } catch (IOException ioEx) { ioEx.printStackTrace(); } catch (Exception ex) { * ex.printStackTrace(); } - * + * * assert(result); } - * + * * public void testReplicationByteIO() { - * + * * boolean result = false; try { ReplicationOutputStream ros = new ReplicationOutputStream(); ros.writeInt(34); * ros.writeBoolean(true); ros.write(79); ros.writeInt(7); * ros.writeLengthPrefixedString(ReplicationIOStreamTest.class.getName()); ros.writeLong(789); byte[] data = * ros.toByteArray(); ros.writeLengthPrefixedBytes(data); - * + * * ReplicationInputStream ris = new ReplicationInputStream(ros.toByteArray()); boolean result1 = ris.readInt() == 34 && * ris.readBoolean() && ris.read() == 79 && ris.readInt() == 7 && * (ris.readLengthPrefixedString().equals(ReplicationIOStreamTest.class.getName())) && ris.readLong() == 789; data = * ris.readLengthPrefixedBytes(); - * + * * ReplicationInputStream ris2 = new ReplicationInputStream(data); boolean result2 = ris2.readInt() == 34 && * ris2.readBoolean() && ris2.read() == 79 && ris2.readInt() == 7 && * (ris2.readLengthPrefixedString().equals(ReplicationIOStreamTest.class.getName())) && ris2.readLong() == 789; - * - * + * + * * result = result1 && result2; } catch (IOException ioEx) { ioEx.printStackTrace(); } catch (Exception ex) { * ex.printStackTrace(); } - * + * * assert(result); } - * + * * public void testMarkAndMoveTo() { boolean result = false; try { ReplicationOutputStream ros = new * ReplicationOutputStream(); ros.writeInt(7); ros.writeBoolean(true); int markPos = ros.mark(); ros.writeInt(1645); * ros.write(79); ros.writeInt(7); - * + * * ros.moveTo(markPos); ros.writeInt(7); - * + * * ros.backToAppendMode(); - * + * * ReplicationInputStream ris = new ReplicationInputStream(ros.toByteArray()); result = ris.readInt() == 7 && * ris.readBoolean() && ris.readInt() == 7 && ris.read() == 79 && ris.readInt() == 7; - * + * * } catch (IOException ioEx) { ioEx.printStackTrace(); } catch (Exception ex) { ex.printStackTrace(); } - * + * * assert(result); } - * + * * public void testMark() { boolean result = false; try { ReplicationOutputStream ros = new ReplicationOutputStream(); * ros.writeInt(34); ros.writeBoolean(true); ros.write(79); ros.writeInt(7); - * + * * int lenPos = ros.mark(); - * + * * System.out.println("**Marked [1]: " + lenPos); ros.writeInt(0); byte[] strData = * ReplicationIOStreamTest.class.getName().getBytes(); ros.write(strData); ros.writeLong(789); * System.out.println("[1] Now pos: " + ros.size()); - * + * * ros.moveTo(lenPos); ros.writeInt(strData.length); - * + * * ros.backToAppendMode(); System.out.println("[2] Now pos: " + ros.size()); - * + * * ros.writeInt(34); ros.writeBoolean(true); ros.write(79); - * + * * System.out.println("**So far len: " + ros.size() + "; strLen: " + strData.length); - * + * * byte[] data1 = ros.toByteArray(); ros.writeLengthPrefixedBytes(data1); - * + * * System.out.println("**So far len: " + ros.size()); - * + * * ReplicationInputStream ris = new ReplicationInputStream(ros.toByteArray()); boolean result1 = ris.readInt() == 34 && * ris.readBoolean() && ris.read() == 79 && ris.readInt() == 7 && * (ris.readLengthPrefixedString().equals(ReplicationIOStreamTest.class.getName())) && ris.readLong() == 789 && * ris.readInt() == 34 && ris.readBoolean() && ris.read() == 79; byte[] data = ris.readLengthPrefixedBytes(); - * + * * boolean byteResult = true; for (int i=0; i - + diff --git a/cache/tests/src/com/sun/enterprise/ee/tests/DataStore/PutGetRemoveTest.java b/cache/tests/src/com/sun/enterprise/ee/tests/DataStore/PutGetRemoveTest.java index 608d34b..9cb98fb 100644 --- a/cache/tests/src/com/sun/enterprise/ee/tests/DataStore/PutGetRemoveTest.java +++ b/cache/tests/src/com/sun/enterprise/ee/tests/DataStore/PutGetRemoveTest.java @@ -17,28 +17,28 @@ /* this program is run using the runSimplePutGetRemove.sh */ package com.sun.enterprise.ee.tests.DataStore; -import com.sun.enterprise.ee.cms.core.CallBack; -import com.sun.enterprise.ee.cms.core.GMSConstants; -import com.sun.enterprise.ee.cms.core.GMSException; -import com.sun.enterprise.ee.cms.core.GMSFactory; -import com.sun.enterprise.ee.cms.core.GroupManagementService; -import com.sun.enterprise.ee.cms.core.JoinNotificationSignal; -import com.sun.enterprise.ee.cms.core.JoinedAndReadyNotificationSignal; -import com.sun.enterprise.ee.cms.core.MessageSignal; -import com.sun.enterprise.ee.cms.core.PlannedShutdownSignal; -import com.sun.enterprise.ee.cms.core.ServiceProviderConfigurationKeys; -import com.sun.enterprise.ee.cms.core.Signal; -import com.sun.enterprise.ee.cms.impl.base.Utility; -import com.sun.enterprise.ee.cms.impl.client.JoinNotificationActionFactoryImpl; -import com.sun.enterprise.ee.cms.impl.client.JoinedAndReadyNotificationActionFactoryImpl; -import com.sun.enterprise.ee.cms.impl.client.MessageActionFactoryImpl; -import com.sun.enterprise.ee.cms.impl.client.PlannedShutdownActionFactoryImpl; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.api.core.CallBack; +import org.glassfish.shoal.gms.api.core.GMSConstants; +import org.glassfish.shoal.gms.api.core.GMSException; +import org.glassfish.shoal.gms.api.core.GMSFactory; +import org.glassfish.shoal.gms.api.core.GroupManagementService; +import org.glassfish.shoal.gms.api.core.JoinNotificationSignal; +import org.glassfish.shoal.gms.api.core.JoinedAndReadyNotificationSignal; +import org.glassfish.shoal.gms.api.core.MessageSignal; +import org.glassfish.shoal.gms.api.core.PlannedShutdownSignal; +import org.glassfish.shoal.gms.api.core.ServiceProviderConfigurationKeys; +import org.glassfish.shoal.gms.api.core.Signal; +import org.glassfish.shoal.gms.base.Utility; +import org.glassfish.shoal.gms.client.JoinNotificationActionFactoryImpl; +import org.glassfish.shoal.gms.client.JoinedAndReadyNotificationActionFactoryImpl; +import org.glassfish.shoal.gms.client.MessageActionFactoryImpl; +import org.glassfish.shoal.gms.client.PlannedShutdownActionFactoryImpl; +import org.glassfish.shoal.gms.logging.GMSLogDomain; //import com.sun.enterprise.ee.cms.tests.GMSAdminConstants; -import com.sun.enterprise.ee.cms.logging.NiceLogFormatter; +import org.glassfish.shoal.gms.logging.NiceLogFormatter; import com.sun.enterprise.ee.cms.tests.GMSAdminAgent; import com.sun.enterprise.ee.cms.tests.GMSAdminConstants; -import com.sun.enterprise.mgmt.transport.grizzly.GrizzlyUtil; +import org.glassfish.shoal.gms.mgmt.transport.grizzly.GrizzlyUtil; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -49,8 +49,8 @@ import java.util.logging.ErrorManager; import java.util.logging.Level; import java.util.logging.Logger; -import org.shoal.ha.cache.api.DataStore; -import org.shoal.ha.cache.api.DataStoreFactory; +import org.glassfish.shoal.ha.cache.api.DataStore; +import org.glassfish.shoal.ha.cache.api.DataStoreFactory; public class PutGetRemoveTest implements CallBack { diff --git a/gms/analyzelogs.sh b/gms/analyzelogs.sh index a8fcd6c..b03278c 100755 --- a/gms/analyzelogs.sh +++ b/gms/analyzelogs.sh @@ -50,7 +50,7 @@ do ;; *) echo "ERROR: Invalid argument [${1}]" - usage + usage ;; esac done @@ -437,5 +437,5 @@ elif [ "${CMD}" = "add" ]; then else grep WARNING ${ALLLOGS} | grep -v ${APPLICATIONADMIN} fi -echo Exceptions +echo Exceptions grep "Exception" ${ALLLOGS} | grep -v ${APPLICATIONADMIN} | grep -v "stack trace" diff --git a/gms/api/pom.xml b/gms/api/pom.xml index d54fa1d..3859c6d 100644 --- a/gms/api/pom.xml +++ b/gms/api/pom.xml @@ -1,6 +1,6 @@ - + 4.0.0 org.glassfish.shoal shoal-gms - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT shoal-gms-api - bundle + jar shoal-gms-api @@ -36,7 +36,7 @@ - ${junit.group.id} + junit junit test @@ -48,12 +48,6 @@ org.apache.felix maven-bundle-plugin - true - - - com.sun.enterprise.ee.cms.core;com.sun.enterprise.ee.cms.spi - - bundle-manifest @@ -64,11 +58,8 @@ - - org.apache.maven.plugins maven-source-plugin - true attach-sources @@ -78,10 +69,8 @@ - maven-javadoc-plugin - true none diff --git a/gms/api/src/main/java/module-info.java b/gms/api/src/main/java/module-info.java new file mode 100644 index 0000000..5404f88 --- /dev/null +++ b/gms/api/src/main/java/module-info.java @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2026 Contributors to the Eclipse Foundation + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0, which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the + * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + * version 2 with the GNU Classpath Exception, which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + */ + +/** + * @author David Matejcek + */ +module org.glassfish.shoal.gms.api { + + requires java.logging; + + exports org.glassfish.shoal.gms.api.core; + exports org.glassfish.shoal.gms.api.spi; +} diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/Action.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/Action.java similarity index 97% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/Action.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/Action.java index 3e6c754..551eb3f 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/Action.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/Action.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * Base interface to denote an Action. An Action consumes a Signal which represents an Event. An Action instance is diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/ActionException.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/ActionException.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/ActionException.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/ActionException.java index 1a14448..f414ade 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/ActionException.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/ActionException.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * This exception is a general exception thrown by the consumeSignal method of concrete Action @@ -24,7 +24,7 @@ * @version $Revision$ */ public class ActionException extends Exception { - + private static final long serialVersionUID = 1991775566532192729L; public ActionException() { diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/ActionFactory.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/ActionFactory.java similarity index 97% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/ActionFactory.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/ActionFactory.java index 44db8fb..7733408 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/ActionFactory.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/ActionFactory.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * Produces Action instances. This pattern enables implementors to provide Action instances only when called, along with diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/AliveAndReadySignal.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/AliveAndReadySignal.java similarity index 95% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/AliveAndReadySignal.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/AliveAndReadySignal.java index 3f32491..23f09ef 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/AliveAndReadySignal.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/AliveAndReadySignal.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * Any signal that results in a change in the AliveAndReady members should implement this interface. diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/AliveAndReadyView.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/AliveAndReadyView.java similarity index 98% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/AliveAndReadyView.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/AliveAndReadyView.java index 85baf24..6aba781 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/AliveAndReadyView.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/AliveAndReadyView.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; import java.util.SortedSet; diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/CallBack.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/CallBack.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/CallBack.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/CallBack.java index 55ff7f9..905079d 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/CallBack.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/CallBack.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * This is a convenience interface that an Action implementation's parent thread can implement and pass to the Action diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/DistributedStateCache.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/DistributedStateCache.java similarity index 99% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/DistributedStateCache.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/DistributedStateCache.java index 03111ba..afdab97 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/DistributedStateCache.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/DistributedStateCache.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; import java.io.Serializable; import java.util.Map; diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureNotificationAction.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureNotificationAction.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureNotificationAction.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureNotificationAction.java index df85c7a..87b65e4 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureNotificationAction.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureNotificationAction.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * Implementations of this interface consume FailureNotificationSignals which provide specifics associated with a failed diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureNotificationActionFactory.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureNotificationActionFactory.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureNotificationActionFactory.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureNotificationActionFactory.java index e92582d..0520deb 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureNotificationActionFactory.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureNotificationActionFactory.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * Marker interface to provide a specific type of ActionFactory. The GroupManagementService module internals would diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureNotificationSignal.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureNotificationSignal.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureNotificationSignal.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureNotificationSignal.java index e5add4c..229c0d5 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureNotificationSignal.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureNotificationSignal.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * Signal corresponding to FailureNotificationAction. This Signal enables the consumer to get specifics about a failure diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureRecoveryAction.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureRecoveryAction.java similarity index 97% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureRecoveryAction.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureRecoveryAction.java index 813e9b6..f554584 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureRecoveryAction.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureRecoveryAction.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * Action type corresponding to a recovery oriented action.Implementations consume a FailureRecoverySignal. The diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureRecoveryActionFactory.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureRecoveryActionFactory.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureRecoveryActionFactory.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureRecoveryActionFactory.java index 764fe3c..fbea3d6 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureRecoveryActionFactory.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureRecoveryActionFactory.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * Marker interface to provide a specific type of ActionFactory. The GroupManagementService module internals would diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureRecoverySignal.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureRecoverySignal.java similarity index 98% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureRecoverySignal.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureRecoverySignal.java index 90b7e42..1de92e7 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureRecoverySignal.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureRecoverySignal.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * Specific to recovery related signal. This Signal type will only be delivered to the corresponding Action (i.e. an diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureSuspectedAction.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureSuspectedAction.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureSuspectedAction.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureSuspectedAction.java index 759c353..9883853 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureSuspectedAction.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureSuspectedAction.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * An Action type that consumes FailureSuspectedSignal. When a failure is first detected but diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureSuspectedActionFactory.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureSuspectedActionFactory.java similarity index 95% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureSuspectedActionFactory.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureSuspectedActionFactory.java index b281ed5..47cc15a 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureSuspectedActionFactory.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureSuspectedActionFactory.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * Marker interface to provide a specific type of Action standing for creation of FailureSuspicionAction instances. diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureSuspectedSignal.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureSuspectedSignal.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureSuspectedSignal.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureSuspectedSignal.java index a2c23eb..56da65e 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/FailureSuspectedSignal.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/FailureSuspectedSignal.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * Provides notification of a member's suspected (unconfirmed) failure. This is sent on the first detection of an diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GMSCacheable.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GMSCacheable.java similarity index 98% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GMSCacheable.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GMSCacheable.java index ffbaa0e..59c4a06 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GMSCacheable.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GMSCacheable.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; import java.io.Serializable; import java.util.Comparator; diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GMSConstants.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GMSConstants.java similarity index 97% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GMSConstants.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GMSConstants.java index c73565b..6730a15 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GMSConstants.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GMSConstants.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * Herein we specify client facing constants that may be applicable to specific GMS notifications, api calls or key diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GMSException.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GMSException.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GMSException.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GMSException.java index f535230..d5d7502 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GMSException.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GMSException.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * An exception class that captures exception conditions occuring while startup or shutdown of the GMS layer. @@ -23,7 +23,7 @@ * @version $Revision$ */ public class GMSException extends Exception { - + private static final long serialVersionUID = 3979325025517304424L; public GMSException() { diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GMSFactory.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GMSFactory.java similarity index 76% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GMSFactory.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GMSFactory.java index 04a1e28..cac97b8 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GMSFactory.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GMSFactory.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2026 Contributors to the Eclipse Foundation. * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -14,17 +15,19 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; +import java.lang.System.Logger; import java.util.Collection; -import java.util.HashMap; import java.util.Hashtable; import java.util.Iterator; import java.util.Map; import java.util.Properties; import java.util.ServiceLoader; -import java.util.logging.Level; -import java.util.logging.Logger; + +import static java.lang.System.Logger.Level.DEBUG; +import static java.lang.System.Logger.Level.ERROR; +import static java.lang.System.Logger.Level.WARNING; /** *

@@ -73,11 +76,11 @@ */ public class GMSFactory { - static private Logger LOG = Logger.getLogger("ShoalLogger.api", StringManager.LOG_STRINGS); - static private StringManager sm = StringManager.getInstance(); + private static final Logger LOG = System.getLogger(GMSFactory.class.getName()); + + private static final Hashtable GROUPS = new Hashtable<>(); + private static final Map GMS_ENABLED_MAP = new Hashtable<>(); - private static Hashtable groups = new Hashtable(); - private static Map gmsEnabledMap = new HashMap(); private static String memberToken; private GMSFactory() { @@ -106,17 +109,17 @@ private GMSFactory() { public static Runnable startGMSModule(final String serverToken, final String groupName, final GroupManagementService.MemberType memberType, final Properties properties) { if (serverToken == null) { - throw new RuntimeException(sm.get("ex.factory.start.missing.instance")); + throw new RuntimeException("instance name was not specified and cannot be null"); } if (groupName == null) { - throw new RuntimeException(sm.get("ex.factory.start.missing.group")); + throw new RuntimeException("group name was not specified and cannot be null"); } GroupManagementService gms; // if this method is called, GMS is enabled. It is assumed that // calling code made checks in configurations about the enablement // The recommended way for calling code for this purpose is to call the // setGMSEnabledState() method in this class(see below). - gmsEnabledMap.put(groupName, Boolean.TRUE); + GMS_ENABLED_MAP.put(groupName, Boolean.TRUE); try { // sanity check: if this group instance is // already created return that instance gms = getGMSModule(groupName); @@ -124,7 +127,7 @@ public static Runnable startGMSModule(final String serverToken, final String gro gms = getGroupManagementServiceInstance(); gms.initialize(serverToken, groupName, memberType, properties); memberToken = serverToken; - groups.put(getCompositeKey(groupName), gms); + GROUPS.put(getCompositeKey(groupName), gms); } return (Runnable) gms; } @@ -141,15 +144,15 @@ public static Runnable startGMSModule(final String serverToken, final String gro */ public static GroupManagementService getGMSModule(final String groupName) throws GMSNotEnabledException, GMSException, GMSNotInitializedException { if (groupName == null) { - throw new GMSException(sm.get("ex.factory.start.missing.group")); + throw new GMSException("group name was not specified and cannot be null"); } final String key = getCompositeKey(groupName); - if (groups.containsKey(key)) { - return groups.get(key); + if (GROUPS.containsKey(key)) { + return GROUPS.get(key); } else if (!isGMSEnabled(groupName)) { - throw new GMSNotEnabledException(sm.get("ex.factory.get.gms.is.disabled", new Object[] { groupName })); + throw new GMSNotEnabledException("GMS not enabled for group " + groupName); } else { - throw new GMSNotInitializedException(sm.get("ex.factory.get.not.init", new Object[] { groupName })); + throw new GMSNotInitializedException("Group Management Service is not initialized for group " + groupName); } } @@ -164,20 +167,20 @@ public static GroupManagementService getGMSModule(final String groupName) throws public static GroupManagementService getGMSModule() throws GMSException { GroupManagementService gms; final Collection instances = getAllGMSInstancesForMember(); - if (instances.size() == 0) { - throw new GMSNotInitializedException(sm.get("ex.init.failure")); + if (instances.isEmpty()) { + throw new GMSNotInitializedException("Group Management Service is not initialized for any group"); } gms = (GroupManagementService) instances.toArray()[0]; return gms; } /** - * For the case where there are multiple groups in which this process has become a member. + * For the case where there are multiple GROUPS in which this process has become a member. * * @return Collection */ public static Collection getAllGMSInstancesForMember() { - return groups.values(); + return GROUPS.values(); } private static String getCompositeKey(final String groupName) { @@ -191,8 +194,8 @@ private static String getCompositeKey(final String groupName) { * @return true if GMS is enabled */ public static boolean isGMSEnabled(final String groupName) { - final Boolean val = gmsEnabledMap.get(groupName); - return !(val == null || val.equals(Boolean.FALSE)); + final Boolean val = GMS_ENABLED_MAP.get(groupName); + return val != null && !Boolean.FALSE.equals(val); } /** @@ -203,7 +206,7 @@ public static boolean isGMSEnabled(final String groupName) { * @param value a Boolean value */ public static void setGMSEnabledState(final String groupName, final Boolean value) { - gmsEnabledMap.put(groupName, value); + GMS_ENABLED_MAP.put(groupName, value); } /** @@ -215,8 +218,8 @@ public static void setGMSEnabledState(final String groupName, final Boolean valu public static void removeGMSModule(final String groupName) { if (groupName != null) { final String key = getCompositeKey(groupName); - if (groups.containsKey(key)) { - groups.remove(key); + if (GROUPS.containsKey(key)) { + GROUPS.remove(key); } } } @@ -228,38 +231,31 @@ private static GroupManagementService findByServiceLoader() { if (iter.hasNext()) { try { - groupManagementService = iter.next().getClass().newInstance(); + groupManagementService = iter.next().getClass().getConstructor().newInstance(); } catch (Throwable t) { - LOG.log(Level.WARNING, "factory.load.service.error"); - LOG.log(Level.WARNING, "stack trace", t); + LOG.log(WARNING, "GMS2002: error instantiating GroupManagementService service", t); } } if (groupManagementService == null) { - LOG.log(Level.SEVERE, sm.get("factory.fatal")); + LOG.log(ERROR, "SMG2003: fatal error, no GroupManagementService implementations found"); } else { - if (LOG.isLoggable(Level.FINE)) { - LOG.log(Level.FINE, "factory.findservice", new Object[] { groupManagementService.getClass().getName() }); - } + LOG.log(DEBUG, "GMS2001: findByServiceLoader() loaded service {0}", groupManagementService.getClass()); } return groupManagementService; } private static GroupManagementService findByClassLoader(String classname) { GroupManagementService gmsImpl = null; - // for jdk 5. just use class loader. try { - Class GmsImplClass = Class.forName(classname); - if (GmsImplClass == null) { - LOG.log(Level.SEVERE, "factory.load.service.error"); + Class gmsImplClass = Class.forName(classname); + if (gmsImplClass == null) { + LOG.log(ERROR, "factory.load.service.error"); } else { - gmsImpl = (GroupManagementService) GmsImplClass.newInstance(); - if (LOG.isLoggable(Level.FINE)) { - LOG.log(Level.FINE, "findByClassLoader() loaded service " + gmsImpl.getClass().getName()); - } + gmsImpl = (GroupManagementService) gmsImplClass.getConstructor().newInstance(); + LOG.log(DEBUG, "findByClassLoader() loaded service " + gmsImpl.getClass()); } } catch (Throwable x) { - LOG.log(Level.SEVERE, "factory.classload.failed"); - LOG.log(Level.SEVERE, "stack trace", x); + LOG.log(ERROR, "GMS2004: fatal error instantiating GroupManagementService service", x); } return gmsImpl; } @@ -272,7 +268,7 @@ public static GroupManagementService getGroupManagementServiceInstance() { // jdk 5 will end up here. Not a reportable error. } if (gmsImpl == null) { - String classname = "com.sun.enterprise.ee.cms.impl.common.GroupManagementServiceImpl"; + String classname = "org.glassfish.shoal.gms.common.GroupManagementServiceImpl"; gmsImpl = findByClassLoader(classname); } return gmsImpl; diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GMSMember.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GMSMember.java similarity index 93% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GMSMember.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GMSMember.java index d68148d..a2057ce 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GMSMember.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GMSMember.java @@ -14,16 +14,16 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; - -import static com.sun.enterprise.ee.cms.core.GroupManagementService.MemberType.CORE; -import static com.sun.enterprise.ee.cms.core.GroupManagementService.MemberType.WATCHDOG; +package org.glassfish.shoal.gms.api.core; import java.io.Serializable; import java.text.MessageFormat; import java.util.Date; import java.util.List; +import static org.glassfish.shoal.gms.api.core.GroupManagementService.MemberType.CORE; +import static org.glassfish.shoal.gms.api.core.GroupManagementService.MemberType.WATCHDOG; + /** * Encapsulates the member token and the member type in a serializable * diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GMSNotEnabledException.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GMSNotEnabledException.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GMSNotEnabledException.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GMSNotEnabledException.java index 2e71243..eb13a3c 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GMSNotEnabledException.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GMSNotEnabledException.java @@ -14,14 +14,14 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * @author Shreedhar Ganapathy Date: Aug 9, 2005 * @version $Revision$ */ public class GMSNotEnabledException extends GMSException { - + private static final long serialVersionUID = -9164334926157710973L; public GMSNotEnabledException() { diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GMSNotInitializedException.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GMSNotInitializedException.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GMSNotInitializedException.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GMSNotInitializedException.java index e624dbd..6734b8f 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GMSNotInitializedException.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GMSNotInitializedException.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * An exception class that captures exception conditions occuring while startup or shutdown of the GMS layer. @@ -23,7 +23,7 @@ * @version $Revision$ */ public class GMSNotInitializedException extends GMSException { - + private static final long serialVersionUID = -6120235287892833517L; public GMSNotInitializedException() { diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GroupHandle.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GroupHandle.java similarity index 99% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GroupHandle.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GroupHandle.java index b862529..89972dc 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GroupHandle.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GroupHandle.java @@ -14,11 +14,11 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; import java.util.List; -import com.sun.enterprise.ee.cms.spi.MemberStates; +import org.glassfish.shoal.gms.api.spi.MemberStates; /** * Provides a handle to the interact with the membership group. Using this interface, applications can send messages to diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GroupLeadershipNotificationAction.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GroupLeadershipNotificationAction.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GroupLeadershipNotificationAction.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GroupLeadershipNotificationAction.java index e0bb285..8dfc4c6 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GroupLeadershipNotificationAction.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GroupLeadershipNotificationAction.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * An Action type that consumes GroupLeadershipNotificationSignal. When the master for the diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GroupLeadershipNotificationActionFactory.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GroupLeadershipNotificationActionFactory.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GroupLeadershipNotificationActionFactory.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GroupLeadershipNotificationActionFactory.java index 89a8f2e..f1fb09c 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GroupLeadershipNotificationActionFactory.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GroupLeadershipNotificationActionFactory.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * Marker interface to provide a specific type of ActionFactory namely GroupLeadershipNotificationActionFactory. The diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GroupLeadershipNotificationSignal.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GroupLeadershipNotificationSignal.java similarity index 98% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GroupLeadershipNotificationSignal.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GroupLeadershipNotificationSignal.java index 0f94ba3..78a30bc 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GroupLeadershipNotificationSignal.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GroupLeadershipNotificationSignal.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; import java.util.List; diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GroupManagementService.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GroupManagementService.java similarity index 99% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GroupManagementService.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GroupManagementService.java index f8049cf..4709a50 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GroupManagementService.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GroupManagementService.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; import java.io.Serializable; import java.util.List; @@ -184,7 +184,7 @@ public static enum RECOVERY_STATE { /** * Returns an implementation of GroupHandle * - * @return com.sun.enterprise.ee.cms.core.GroupHandle + * @return org.glassfish.shoal.gms.api.core.GroupHandle */ GroupHandle getGroupHandle(); diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GroupStartupNotificationSignal.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GroupStartupNotificationSignal.java similarity index 92% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GroupStartupNotificationSignal.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GroupStartupNotificationSignal.java index 5158133..3d4ef72 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/GroupStartupNotificationSignal.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/GroupStartupNotificationSignal.java @@ -14,14 +14,14 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * Represents Signal state corresponding to whether a signal is part of an entire group startup or the start of an * individual member of the group. * * @see GroupManagementService#announceGroupStartup(String, - * com.sun.enterprise.ee.cms.core.GMSConstants.groupStartupState, java.util.List) + * org.glassfish.shoal.gms.api.core.GMSConstants.groupStartupState, java.util.List) * @author Joe Fialli Date: April 1, 2009 */ public interface GroupStartupNotificationSignal { diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/JoinNotificationAction.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/JoinNotificationAction.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/JoinNotificationAction.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/JoinNotificationAction.java index 49e87c8..71fa084 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/JoinNotificationAction.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/JoinNotificationAction.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * An Action type that consumes JoinNotificationSignal. When a member has joined the group, a diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/JoinNotificationActionFactory.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/JoinNotificationActionFactory.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/JoinNotificationActionFactory.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/JoinNotificationActionFactory.java index 477e790..b2d2360 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/JoinNotificationActionFactory.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/JoinNotificationActionFactory.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * Marker interface to provide a specific type of ActionFactory namely JoinNotificationActionFactory. The diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/JoinNotificationSignal.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/JoinNotificationSignal.java similarity index 95% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/JoinNotificationSignal.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/JoinNotificationSignal.java index 847f3ef..4a68e22 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/JoinNotificationSignal.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/JoinNotificationSignal.java @@ -14,11 +14,11 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; import java.util.List; -import com.sun.enterprise.ee.cms.spi.MemberStates; +import org.glassfish.shoal.gms.api.spi.MemberStates; /** * Signal corresponding to JoinNotificationAction. This Signal enables the consumer to get specifics about a Join diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/JoinedAndReadyNotificationAction.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/JoinedAndReadyNotificationAction.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/JoinedAndReadyNotificationAction.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/JoinedAndReadyNotificationAction.java index 72327ee..0351bb8 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/JoinedAndReadyNotificationAction.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/JoinedAndReadyNotificationAction.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * An Action type that consumes JoinedAndReadyNotificationSignal. When a member has joined the diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/JoinedAndReadyNotificationActionFactory.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/JoinedAndReadyNotificationActionFactory.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/JoinedAndReadyNotificationActionFactory.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/JoinedAndReadyNotificationActionFactory.java index 1ab5bbf..6d19c83 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/JoinedAndReadyNotificationActionFactory.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/JoinedAndReadyNotificationActionFactory.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * Marker interface to provide a specific type of ActionFactory namely JoinedAndReadyNotificationActionFactory. The diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/JoinedAndReadyNotificationSignal.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/JoinedAndReadyNotificationSignal.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/JoinedAndReadyNotificationSignal.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/JoinedAndReadyNotificationSignal.java index d04968b..760b904 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/JoinedAndReadyNotificationSignal.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/JoinedAndReadyNotificationSignal.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; import java.util.List; diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/MemberNotInViewException.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/MemberNotInViewException.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/MemberNotInViewException.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/MemberNotInViewException.java index 582ccb3..4e31fa2 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/MemberNotInViewException.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/MemberNotInViewException.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * Created by IntelliJ IDEA. User: sheetal Date: Apr 4, 2008 Time: 1:54:34 PM This Exception class has been created to @@ -22,7 +22,7 @@ */ public class MemberNotInViewException extends GMSException { - + private static final long serialVersionUID = -8581553671167071724L; public MemberNotInViewException() { diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/MessageAction.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/MessageAction.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/MessageAction.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/MessageAction.java index 64cfa7c..363b220 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/MessageAction.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/MessageAction.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * An Action type that consumes MessageSignal. Messages sent by other Group members through diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/MessageActionFactory.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/MessageActionFactory.java similarity index 95% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/MessageActionFactory.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/MessageActionFactory.java index fe137a2..eedb40f 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/MessageActionFactory.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/MessageActionFactory.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * Marker interface to provide a specific type of ActionFactory namely MessageActionFactory. diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/MessageSignal.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/MessageSignal.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/MessageSignal.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/MessageSignal.java index be365c1..835702f 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/MessageSignal.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/MessageSignal.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * A Signal type that enables consumers to acquire the MessageSignal, get the message( i.e payload), diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/PlannedShutdownAction.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/PlannedShutdownAction.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/PlannedShutdownAction.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/PlannedShutdownAction.java index 32ecb85..4958e27 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/PlannedShutdownAction.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/PlannedShutdownAction.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * Implementations of this interface consume a PlannedShutdownNotificationSignal which provides specifics associated diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/PlannedShutdownActionFactory.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/PlannedShutdownActionFactory.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/PlannedShutdownActionFactory.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/PlannedShutdownActionFactory.java index 15aa851..461d9d2 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/PlannedShutdownActionFactory.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/PlannedShutdownActionFactory.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * Marker interface to provide a specific type of ActionFactory This factory's implementation provides a API to produce diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/PlannedShutdownSignal.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/PlannedShutdownSignal.java similarity index 93% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/PlannedShutdownSignal.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/PlannedShutdownSignal.java index df33936..0d2efad 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/PlannedShutdownSignal.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/PlannedShutdownSignal.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * Signal corresponding to PlannedShutdownAction. This Signal enables the consumer to get specifics about a graceful @@ -28,7 +28,7 @@ public interface PlannedShutdownSignal extends Signal, AliveAndReadySignal { * Planned shutdown events can be one of two types, Group Shutdown or Instance Shutdown. These types are defined in an * enum in the class GMSConstants.shutdownType * - * @see com.sun.enterprise.ee.cms.core.GMSConstants + * @see org.glassfish.shoal.gms.api.core.GMSConstants * @return GMSConstants.shutdownType */ GMSConstants.shutdownType getEventSubType(); diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/RejoinSubevent.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/RejoinSubevent.java similarity index 95% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/RejoinSubevent.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/RejoinSubevent.java index bf78113..7c5da16 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/RejoinSubevent.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/RejoinSubevent.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; import java.io.Serializable; diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/RejoinableEvent.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/RejoinableEvent.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/RejoinableEvent.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/RejoinableEvent.java index 65a83ef..a6f245c 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/RejoinableEvent.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/RejoinableEvent.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; public interface RejoinableEvent { diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/ServiceProviderConfigurationKeys.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/ServiceProviderConfigurationKeys.java similarity index 99% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/ServiceProviderConfigurationKeys.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/ServiceProviderConfigurationKeys.java index 286cd48..3fa2da4 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/ServiceProviderConfigurationKeys.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/ServiceProviderConfigurationKeys.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * Provides the keys that correspond to properties within group communication providers that can be configured. Note diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/Signal.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/Signal.java similarity index 98% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/Signal.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/Signal.java index 790cbc4..7a8d1f9 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/Signal.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/Signal.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; import java.io.Serializable; import java.util.Map; diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/SignalAcquireException.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/SignalAcquireException.java similarity index 97% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/SignalAcquireException.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/SignalAcquireException.java index 43c3644..a553870 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/SignalAcquireException.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/SignalAcquireException.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * Raises exceptions occuring while acquiring signals. If such an exception is raised, a deadlock on group resources @@ -29,7 +29,7 @@ * @version $Revision$ */ public class SignalAcquireException extends Exception { - + private static final long serialVersionUID = -1507353998630657590L; public SignalAcquireException() { diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/SignalReleaseException.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/SignalReleaseException.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/SignalReleaseException.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/SignalReleaseException.java index 1916c66..946f0b4 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/SignalReleaseException.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/SignalReleaseException.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; /** * Raises exceptions occuring while releasing signals. @@ -25,7 +25,7 @@ * @version $Revision$ */ public class SignalReleaseException extends Exception { - + private static final long serialVersionUID = 4568715109280384599L; public SignalReleaseException() { diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/StringManager.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/StringManager.java similarity index 92% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/StringManager.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/StringManager.java index d7ca3b6..1f76804 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/StringManager.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/StringManager.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.core; +package org.glassfish.shoal.gms.api.core; import java.text.MessageFormat; import java.util.Locale; @@ -26,7 +26,7 @@ class StringManager { private static final StringManager instance = new StringManager(); - public static final String LOG_STRINGS = "com.sun.enterprise.ee.cms.core.LogStrings"; + public static final String LOG_STRINGS = "org.glassfish.shoal.gms.api.core.LogStrings"; private static final ResourceBundle bundle = ResourceBundle.getBundle(LOG_STRINGS, Locale.getDefault()); private StringManager() { diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/package.html b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/package.html similarity index 97% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/core/package.html rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/core/package.html index 5a5aafd..ebbb97e 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/core/package.html +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/core/package.html @@ -19,7 +19,7 @@ - Description of com.sun.enterprise.ee.cms.core package + Description of org.glassfish.shoal.gms.api.core package

Shoal GMS's core client API

diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/spi/GMSMessage.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/spi/GMSMessage.java similarity index 98% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/spi/GMSMessage.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/spi/GMSMessage.java index 162df85..fcabc61 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/spi/GMSMessage.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/spi/GMSMessage.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.spi; +package org.glassfish.shoal.gms.api.spi; import java.io.Serializable; import java.nio.charset.Charset; diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/spi/GroupCommunicationProvider.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/spi/GroupCommunicationProvider.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/spi/GroupCommunicationProvider.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/spi/GroupCommunicationProvider.java index 20c3e2c..718ea5d 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/spi/GroupCommunicationProvider.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/spi/GroupCommunicationProvider.java @@ -14,16 +14,16 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.spi; +package org.glassfish.shoal.gms.api.spi; import java.io.Serializable; import java.util.List; import java.util.Map; -import com.sun.enterprise.ee.cms.core.GMSConstants; -import com.sun.enterprise.ee.cms.core.GMSConstants.groupStartupState; -import com.sun.enterprise.ee.cms.core.GMSException; -import com.sun.enterprise.ee.cms.core.MemberNotInViewException; +import org.glassfish.shoal.gms.api.core.GMSConstants; +import org.glassfish.shoal.gms.api.core.GMSException; +import org.glassfish.shoal.gms.api.core.MemberNotInViewException; +import org.glassfish.shoal.gms.api.core.GMSConstants.groupStartupState; /** * Provides a plugging interface for integrating group communication providers(GCP). Acts as a bridge between GCP @@ -79,7 +79,7 @@ public interface GroupCommunicationProvider { * unpack this message appropriately. * @param synchronous setting true here will call the underlying GCP's api that corresponds to a synchronous message, if * available. - * @throws com.sun.enterprise.ee.cms.core.GMSException wraps the underlying exception + * @throws org.glassfish.shoal.gms.api.core.GMSException wraps the underlying exception */ void sendMessage(String targetMemberIdentityToken, Serializable message, boolean synchronous) throws GMSException, MemberNotInViewException; diff --git a/gms/api/src/main/java/com/sun/enterprise/ee/cms/spi/MemberStates.java b/gms/api/src/main/java/org/glassfish/shoal/gms/api/spi/MemberStates.java similarity index 96% rename from gms/api/src/main/java/com/sun/enterprise/ee/cms/spi/MemberStates.java rename to gms/api/src/main/java/org/glassfish/shoal/gms/api/spi/MemberStates.java index 5cfb3a8..759e868 100644 --- a/gms/api/src/main/java/com/sun/enterprise/ee/cms/spi/MemberStates.java +++ b/gms/api/src/main/java/org/glassfish/shoal/gms/api/spi/MemberStates.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.spi; +package org.glassfish.shoal.gms.api.spi; /** * Represents the set of states that members in the group can be as part of their existence in the group. These are diff --git a/gms/api/src/main/resources/com/sun/enterprise/ee/cms/core/LogStrings.properties b/gms/api/src/main/resources/com/sun/enterprise/ee/cms/core/LogStrings.properties deleted file mode 100644 index 306679b..0000000 --- a/gms/api/src/main/resources/com/sun/enterprise/ee/cms/core/LogStrings.properties +++ /dev/null @@ -1,30 +0,0 @@ -# -# Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -#used for ShoalLogger for api -factory.findservice=GMS2001: findByServiceLoader() loaded service {0} -factory.load.service.error=GMS2002: error instantiating GroupManagementService service -factory.fatal=SMG2003: fatal error, no GroupManagementService implementations found -factory.classload.failed=GMS2004: fatal error instantiating GroupManagementService service - -ex.factory.start.missing.instance=instance name was not specified and cannot be null -ex.factory.start.missing.group=group name was not specified and cannot be null -ex.factory.get.gms.is.disabled=GMS not enabled for group {0} -ex.factory.get.not.init=Group Management Service is not initialized for group {0} -ex.init.failure=Group Management Service is not initialized for any group - - - diff --git a/gms/api/src/test/java/com/sun/enterprise/ee/cms/core/GMSFactoryTest.java b/gms/api/src/test/java/com/sun/enterprise/ee/cms/core/GMSFactoryTest.java index f6277c0..f772050 100644 --- a/gms/api/src/test/java/com/sun/enterprise/ee/cms/core/GMSFactoryTest.java +++ b/gms/api/src/test/java/com/sun/enterprise/ee/cms/core/GMSFactoryTest.java @@ -20,6 +20,10 @@ import java.util.Properties; +import org.glassfish.shoal.gms.api.core.GMSException; +import org.glassfish.shoal.gms.api.core.GMSFactory; +import org.glassfish.shoal.gms.api.core.GroupManagementService; + import junit.framework.TestCase; public class GMSFactoryTest extends TestCase { diff --git a/gms/build.xml b/gms/build.xml index d980ea6..d8d2948 100644 --- a/gms/build.xml +++ b/gms/build.xml @@ -17,7 +17,7 @@ --> - + @@ -172,7 +172,7 @@ - + @@ -252,12 +252,12 @@ - - - - - - + + + + + + @@ -282,7 +282,7 @@ - @@ -462,7 +462,7 @@ - + diff --git a/gms/collectlogs.sh b/gms/collectlogs.sh index cd5a653..1c3f509 100755 --- a/gms/collectlogs.sh +++ b/gms/collectlogs.sh @@ -50,6 +50,6 @@ SERVER=configs/clusters/${GROUPNAME}/server.properties TMP=`egrep "^MACHINE_NAME" ${SERVER}` MACHINE_NAME=`echo $TMP | awk -F= '{print $2}' ` - ${EXECUTE_REMOTE_CONNECT} ${MACHINENAME} "cd ${WORKSPACE_HOME}; analyzelogs.sh -l ${TMP_SAVE_LOG_DIR}/${COUNT} ${TEST} > ${RESULTFILE}; chmod 777 ${RESULTFILE}" + ${EXECUTE_REMOTE_CONNECT} ${MACHINENAME} "cd ${WORKSPACE_HOME}; analyzelogs.sh -l ${TMP_SAVE_LOG_DIR}/${COUNT} ${TEST} > ${RESULTFILE}; chmod 777 ${RESULTFILE}" done diff --git a/gms/crosssubnetdemo.bat b/gms/crosssubnetdemo.bat index 017fc62..06acec6 100644 --- a/gms/crosssubnetdemo.bat +++ b/gms/crosssubnetdemo.bat @@ -1,46 +1,46 @@ -@echo off - -REM -REM # Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved. -REM -REM This program and the accompanying materials are made available under the -REM terms of the Eclipse Public License v. 2.0, which is available at -REM http://www.eclipse.org/legal/epl-2.0. - -REM This Source Code may also be made available under the following Secondary -REM Licenses when the conditions for such availability set forth in the -REM Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -REM version 2 with the GNU Classpath Exception, which is available at -REM https://www.gnu.org/software/classpath/license.html. - -REM SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -REM - -setlocal -set publish_home=.\dist -set lib_home=.\lib -set jdk_home=%JAVA_HOME%\bin -echo %jdk_home% - - -if "%1a"=="a" goto usage -if "%2a"=="a" goto usage -if "%3a"=="a" goto usage -if "%4a"=="a" goto usage -if "%5a"=="a" goto usage -if "%6a"=="a" goto usage -if "%7a"=="a" goto usage - -echo "%jdk_home%"\java -Dcom.sun.management.jmxremote -DMEMBERTYPE=%3 -DINSTANCEID=%1 -DCLUSTERNAME=%2 -DMESSAGING_MODE=true -DLIFEINMILLIS=%4 -DLOG_LEVEL=%5 -D%6=%7 -D%8=%9 -cp %publish_home%/shoal-gms-tests.jar;%publish_home%/shoal-gms.jar;%lib_home%/jxta.jar com.sun.enterprise.ee.cms.tests.ApplicationServer -"%jdk_home%"\java -Dcom.sun.management.jmxremote -DMEMBERTYPE=%3 -DINSTANCEID=%1 -DCLUSTERNAME=%2 -DMESSAGING_MODE=true -DLIFEINMILLIS=%4 -DLOG_LEVEL=%5 -D%6=%7 -D%8=%9 -cp %publish_home%/shoal-gms-tests.jar;%publish_home%/shoal-gms.jar;%lib_home%/jxta.jar com.sun.enterprise.ee.cms.tests.ApplicationServer - -goto end - -:usage -echo Usage: %0 parameters... -echo The required parameters are : -echo instance_id_token groupname membertype{CORE--OR--SPECTATOR} Life-In-Milliseconds log-level IS_INITIAL_HOST={true--OR--false} INITIAL_HOST_LIST={comma separated (no space) list of tcp addresses in the form tcp://ipaddress:port} -echo Life in milliseconds should be at least 60000 to demo failure fencing. - -:end -endlocal +@echo off + +REM +REM # Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved. +REM +REM This program and the accompanying materials are made available under the +REM terms of the Eclipse Public License v. 2.0, which is available at +REM http://www.eclipse.org/legal/epl-2.0. + +REM This Source Code may also be made available under the following Secondary +REM Licenses when the conditions for such availability set forth in the +REM Eclipse Public License v. 2.0 are satisfied: GNU General Public License, +REM version 2 with the GNU Classpath Exception, which is available at +REM https://www.gnu.org/software/classpath/license.html. + +REM SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 +REM + +setlocal +set publish_home=.\dist +set lib_home=.\lib +set jdk_home=%JAVA_HOME%\bin +echo %jdk_home% + + +if "%1a"=="a" goto usage +if "%2a"=="a" goto usage +if "%3a"=="a" goto usage +if "%4a"=="a" goto usage +if "%5a"=="a" goto usage +if "%6a"=="a" goto usage +if "%7a"=="a" goto usage + +echo "%jdk_home%"\java -Dcom.sun.management.jmxremote -DMEMBERTYPE=%3 -DINSTANCEID=%1 -DCLUSTERNAME=%2 -DMESSAGING_MODE=true -DLIFEINMILLIS=%4 -DLOG_LEVEL=%5 -D%6=%7 -D%8=%9 -cp %publish_home%/shoal-gms-tests.jar;%publish_home%/shoal-gms.jar;%lib_home%/jxta.jar com.sun.enterprise.ee.cms.tests.ApplicationServer +"%jdk_home%"\java -Dcom.sun.management.jmxremote -DMEMBERTYPE=%3 -DINSTANCEID=%1 -DCLUSTERNAME=%2 -DMESSAGING_MODE=true -DLIFEINMILLIS=%4 -DLOG_LEVEL=%5 -D%6=%7 -D%8=%9 -cp %publish_home%/shoal-gms-tests.jar;%publish_home%/shoal-gms.jar;%lib_home%/jxta.jar com.sun.enterprise.ee.cms.tests.ApplicationServer + +goto end + +:usage +echo Usage: %0 parameters... +echo The required parameters are : +echo instance_id_token groupname membertype{CORE--OR--SPECTATOR} Life-In-Milliseconds log-level IS_INITIAL_HOST={true--OR--false} INITIAL_HOST_LIST={comma separated (no space) list of tcp addresses in the form tcp://ipaddress:port} +echo Life in milliseconds should be at least 60000 to demo failure fencing. + +:end +endlocal diff --git a/gms/crosssubnetdemo.sh b/gms/crosssubnetdemo.sh index 167f3ca..c30e643 100755 --- a/gms/crosssubnetdemo.sh +++ b/gms/crosssubnetdemo.sh @@ -19,8 +19,8 @@ publish_home=./dist lib_home=./lib usage () { - cat << USAGE -Usage: $0 + cat << USAGE +Usage: $0 The required parameters are : IS_INITIAL_HOST=[true|false] INITIAL_HOST_LIST=[comma separated list of tcp addresses in the form tcp://ipaddress:port] Life in milliseconds should be at least 60000 to demo failure fencing. @@ -32,12 +32,12 @@ if [ $# -lt 3 ]; then usage; fi -if [ -n $5 ]; then +if [ -n $5 ]; then if [ $5 = "-debug" ]; then - java -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -DMEMBERTYPE=$3 -DINSTANCEID=$1 -DCLUSTERNAME=$2 -DMESSAGING_MODE=true -DLIFEINMILLIS=$4 -DLOG_LEVEL=INFO -cp ${publish_home}/shoal-gms-tests.jar:${publish_home}/shoal-gms.jar:${lib_home}/jxta.jar:${lib_home}/bcprov-jdk14.jar com.sun.enterprise.ee.cms.tests.ApplicationServer; + java -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -DMEMBERTYPE=$3 -DINSTANCEID=$1 -DCLUSTERNAME=$2 -DMESSAGING_MODE=true -DLIFEINMILLIS=$4 -DLOG_LEVEL=INFO -cp ${publish_home}/shoal-gms-tests.jar:${publish_home}/shoal-gms.jar:${lib_home}/jxta.jar:${lib_home}/bcprov-jdk14.jar com.sun.enterprise.ee.cms.tests.ApplicationServer; else echo java -Dcom.sun.management.jmxremote -DMEMBERTYPE=$3 -DINSTANCEID=$1 -DCLUSTERNAME=$2 -DMESSAGING_MODE=true -DLIFEINMILLIS=$4 -DLOG_LEVEL=$5 -D$6 -D$7 -cp ${publish_home}/shoal-gms-tests.jar:${publish_home}/shoal-gms.jar:${lib_home}/jxta.jar:${lib_home}/bcprov-jdk14.jar com.sun.enterprise.ee.cms.tests.ApplicationServer; - java -Dcom.sun.management.jmxremote -DMEMBERTYPE=$3 -DINSTANCEID=$1 -DCLUSTERNAME=$2 -DMESSAGING_MODE=true -DLIFEINMILLIS=$4 -DLOG_LEVEL=$5 -D$6 -D$7 -cp ${publish_home}/shoal-gms-tests.jar:${publish_home}/shoal-gms.jar:${lib_home}/jxta.jar:${lib_home}/bcprov-jdk14.jar com.sun.enterprise.ee.cms.tests.ApplicationServer; + java -Dcom.sun.management.jmxremote -DMEMBERTYPE=$3 -DINSTANCEID=$1 -DCLUSTERNAME=$2 -DMESSAGING_MODE=true -DLIFEINMILLIS=$4 -DLOG_LEVEL=$5 -D$6 -D$7 -cp ${publish_home}/shoal-gms-tests.jar:${publish_home}/shoal-gms.jar:${lib_home}/jxta.jar:${lib_home}/bcprov-jdk14.jar com.sun.enterprise.ee.cms.tests.ApplicationServer; fi fi diff --git a/gms/etc/META-INF/services/com.sun.enterprise.ee.cms.core.GroupManagementService b/gms/etc/META-INF/services/com.sun.enterprise.ee.cms.core.GroupManagementService deleted file mode 100644 index 6c42c3f..0000000 --- a/gms/etc/META-INF/services/com.sun.enterprise.ee.cms.core.GroupManagementService +++ /dev/null @@ -1 +0,0 @@ -com.sun.enterprise.ee.cms.impl.common.GroupManagementServiceImpl diff --git a/gms/etc/META-INF/services/com.sun.enterprise.mgmt.transport.NetworkManager b/gms/etc/META-INF/services/com.sun.enterprise.mgmt.transport.NetworkManager deleted file mode 100644 index ccf844a..0000000 --- a/gms/etc/META-INF/services/com.sun.enterprise.mgmt.transport.NetworkManager +++ /dev/null @@ -1,2 +0,0 @@ -com.sun.enterprise.mgmt.transport.grizzly.grizzly2.GrizzlyNetworkManager2 -com.sun.enterprise.mgmt.transport.jxta.JxtaNetworkManager diff --git a/gms/etc/META-INF/services/org.glassfish.shoal.gms.api.core.GroupManagementService b/gms/etc/META-INF/services/org.glassfish.shoal.gms.api.core.GroupManagementService new file mode 100644 index 0000000..28d6d8b --- /dev/null +++ b/gms/etc/META-INF/services/org.glassfish.shoal.gms.api.core.GroupManagementService @@ -0,0 +1 @@ +org.glassfish.shoal.gms.common.GroupManagementServiceImpl diff --git a/gms/etc/META-INF/services/org.glassfish.shoal.gms.mgmt.transport.NetworkManager b/gms/etc/META-INF/services/org.glassfish.shoal.gms.mgmt.transport.NetworkManager new file mode 100644 index 0000000..55c904f --- /dev/null +++ b/gms/etc/META-INF/services/org.glassfish.shoal.gms.mgmt.transport.NetworkManager @@ -0,0 +1,2 @@ +org.glassfish.shoal.gms.mgmt.transport.grizzly.grizzly2.GrizzlyNetworkManager2 +org.glassfish.shoal.gms.mgmt.transport.jxta.JxtaNetworkManager diff --git a/gms/history_transport_abstraction.txt b/gms/history_transport_abstraction.txt deleted file mode 100644 index 751149f..0000000 --- a/gms/history_transport_abstraction.txt +++ /dev/null @@ -1,120 +0,0 @@ -2009-06-08 -Description: - initial version is committed -Modified: - com.sun.enterprise.ee.cms.core.GMSConstans.java - com.sun.enterprise.ee.cms.impl.common.GMSContext.java - com.sun.enterprise.ee.cms.impl.common.GMSContextFactory.java - com.sun.enterprise.ee.cms.impl.common.ViewWindow.java - build.properties - build.xml -Added: - com.sun.enterprise.ee.cms.impl.base.* - com.sun.enterprise.mgmt.transport.* - history_transport_abstraction.txt - readme_transport_abstraction.txt - -2009-06-09 -Description: - Fixed the bug which allowed different group's multicast packet. -Modified: - com.sun.enterprise.mgmt.transport.AbstractNetworkManager.java - -2009-06-11 -Description: - When Grizzly transport layer used, the network manager sets an available tcp port between TCPSTARTPORT and TCPENDPORT. - This case is useful for member's joining the different group in same JVM. -Modified: - com.sun.enterprise.mgmt.transport.NetworkUtility.java - com.sun.enterprise.mgmt.transport.grizzly.GrizzlyNetworkManager.java - com.sun.enterprise.mgmt.transport.grizzly.GrizzlyConfigConstants.java - -2009-06-23 -Description: - Remove dependent codes which are related to Shoal issue #61 -Modified: - com.sun.enterprise.ee.cms.impl.base.ViewWindowImpl.java - com.sun.enterprise.mgmt.ClusterViewManager.java - com.sun.enterprise.mgmt.HealthMonitor.java - com.sun.enterprise.mgmt.MasterNode.java - -Description: - When Grizzly transport layer is used, use ReusableTCP|UDPSelectorHandler which has been supported from grizzly-framework-1.9.17-SNAPSHOT.jar - For more information, please see https://grizzly.dev.java.net/issues/show_bug.cgi?id=676 - Update grizzly libraries from 1.9.16 to 1.9.17-SNAPSHOT(2009/06/23) -Modified: - com.sun.enterprise.mgmt.transport.grizzly.MulticastSelectorHandler.java - com.sun.enterprise.mgmt.transport.grizzly.GrizzlyNetworkManager.java -Added: - lib/grizzly-framework.jar - lib/grizzly-utils.jar -Removed: - lib/grizzly-framework-1.9.16.jar - lib/grizzly-utils-1.9.16.jar - -2009-06-28 -Description: - Fix the compilation errors on JDK5 or some JDK6s -Modified: - com.sun.enterprise.mgmt.transport.BlockingIOMulticastSender.java - com.sun.enterprise.mgmt.transport.MessageIOException.java - com.sun.enterprise.mgmt.transport.NetworkUtility.java - com.sun.enterprise.mgmt.transport.grizzly.MulticastSelectorHandler.java - com.sun.enterprise.mgmt.transport.jxta.JxtaNetworkManager.java - -2009-07-03 -Description: - Support IPv6 - Fix the following error on IPv6 ---- -[#|2009-07-02T13:47:02.520-0700|FINE|Shoal|ShoalLogger|_ThreadID=16;_ThreadName=FailureVerifier Thread for Group:g1;ClassName=SystemAdvertisementImpl;MethodName=getURIs;|Exception occurred : -java.net.URISyntaxException: Malformed escape pair at index 35: tcp://fe80:0:0:0:223:12ff:fe23:d00e%6:4000 - at java.net.URI$Parser.fail(URI.java:2809) - at java.net.URI$Parser.scanEscape(URI.java:2939) - at java.net.URI$Parser.scan(URI.java:2962) - at java.net.URI$Parser.parseAuthority(URI.java:3103) - at java.net.URI$Parser.parseHierarchical(URI.java:3058) - at java.net.URI$Parser.parse(URI.java:3014) - at java.net.URI.(URI.java:578) - at com.sun.enterprise.ee.cms.impl.base.SystemAdvertisementImpl.getURIs(SystemAdvertisementImpl.java:282) - at com.sun.enterprise.mgmt.HealthMonitor.isConnected(HealthMonitor.java:1423) - at com.sun.enterprise.mgmt.HealthMonitor$FailureVerifier.verify(HealthMonitor.java:1302) - at com.sun.enterprise.mgmt.HealthMonitor$FailureVerifier.run(HealthMonitor.java:1284) - at java.lang.Thread.run(Thread.java:637) ---- -Modified: - com.sun.enterprise.ee.cms.impl.base.SystemAdvertisementImpl.java - com.sun.enterprise.mgmt.ClusterManager.java - com.sun.enterprise.mgmt.transport.BlockingIOMulticastSender.java - com.sun.enterprise.mgmt.transport.grizzly.GrizzlyNetworkManager.java - com.sun.enterprise.mgmt.transport.grizzly.GrizzlyUDPConnectorWrapper.java - com.sun.enterprise.mgmt.transport.NetworkUtility.java - -2009-07-21 -Description: - On Linux, a MulticastSocket bound to the specified socket address doesn't work in some circumstance.(I don't know why it doesn't work correctly) - So I applied the workaround. -Modified: - com.sun.enterprise.mgmt.transport.BlockingIOMulticastSender.java - -2009-07-22 -Description: - Supports the circumstance that cluster members are located beyond one subnet or multicast traffic is disabled in Grizzly transport layer. - By system properties or local properties, you can set VIRTUAL_MULTICAST_URI_LIST to be like this. - i.g. -DVIRTUAL_MULTICAST_URI_LIST="tcp://192.168.0.3:9090,tcp://61.77.153.2:9090" -Modified: - com.sun.enterprise.mgmt.transport.grizzly.GrizzlyConfigConstants.java - com.sun.enterprise.mgmt.transport.grizzly.GrizzlyNetworkManager.java -Added: - com.sun.enterprise.mgmt.transport.VirtualMulticastSender.java - -2009-07-27 -Description: - Improves the logic of finding the default first interface and inet address. - If the found interface doesn't have any appropriate inet address, skips it and tries to find another again. -Modified: - com.sun.enterprise.mgmt.transport.NetworkUtility.java - -2009-09-10 -Description: - Current CVS code base is merged \ No newline at end of file diff --git a/gms/impl/pom.xml b/gms/impl/pom.xml index 269e073..761c2a3 100644 --- a/gms/impl/pom.xml +++ b/gms/impl/pom.xml @@ -1,6 +1,6 @@ - + 4.0.0 org.glassfish.shoal shoal-gms - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT shoal-gms-impl - bundle + jar shoal-gms-impl @@ -41,31 +41,22 @@ ${project.version} - ${junit.group.id} + junit junit test - ${grizzly.group.id} + org.glassfish.grizzly grizzly-framework - ${grizzly.version} - ${project.artifactId} - org.apache.felix maven-bundle-plugin - true - - - com.sun.enterprise.ee.cms.impl.*;com.sun.enterprise.gms.tools;com.sun.enterprise.ee.cms.logging;com.sun.enterprise.mgmt.*;com.sun.enterprise.osgi - - bundle-manifest @@ -76,11 +67,8 @@ - - org.apache.maven.plugins maven-source-plugin - true attach-sources @@ -90,10 +78,7 @@ - - true - org.apache.maven.plugins maven-javadoc-plugin none diff --git a/gms/impl/src/main/java/module-info.java b/gms/impl/src/main/java/module-info.java new file mode 100644 index 0000000..234eadf --- /dev/null +++ b/gms/impl/src/main/java/module-info.java @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2026 Contributors to the Eclipse Foundation + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0, which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the + * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + * version 2 with the GNU Classpath Exception, which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + */ + +/** + * @author David Matejcek + */ +module org.glassfish.shoal.gms.impl { + + requires java.logging; + requires java.management; + + requires org.glassfish.grizzly; + requires org.glassfish.shoal.gms.api; + + exports org.glassfish.shoal.gms.logging; + exports org.glassfish.shoal.gms.client; + exports org.glassfish.shoal.gms.common; +} diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/CustomTagNames.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/CustomTagNames.java similarity index 95% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/CustomTagNames.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/base/CustomTagNames.java index 64f995c..2c4385b 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/CustomTagNames.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/CustomTagNames.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.base; +package org.glassfish.shoal.gms.base; /** * @author Shreedhar Ganapathy Date: Jul 14, 2006 diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/DistributedStateCacheImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/DistributedStateCacheImpl.java similarity index 97% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/DistributedStateCacheImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/base/DistributedStateCacheImpl.java index cec3b77..fb4eb11 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/DistributedStateCacheImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/DistributedStateCacheImpl.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.base; +package org.glassfish.shoal.gms.base; import static java.util.logging.Level.FINER; @@ -30,15 +30,15 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.DistributedStateCache; -import com.sun.enterprise.ee.cms.core.GMSCacheable; -import com.sun.enterprise.ee.cms.core.GMSException; -import com.sun.enterprise.ee.cms.core.GMSMember; -import com.sun.enterprise.ee.cms.core.MemberNotInViewException; -import com.sun.enterprise.ee.cms.impl.common.DSCMessage; -import com.sun.enterprise.ee.cms.impl.common.GMSContext; -import com.sun.enterprise.ee.cms.impl.common.GMSContextFactory; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.api.core.DistributedStateCache; +import org.glassfish.shoal.gms.api.core.GMSCacheable; +import org.glassfish.shoal.gms.api.core.GMSException; +import org.glassfish.shoal.gms.api.core.GMSMember; +import org.glassfish.shoal.gms.api.core.MemberNotInViewException; +import org.glassfish.shoal.gms.common.DSCMessage; +import org.glassfish.shoal.gms.common.GMSContext; +import org.glassfish.shoal.gms.common.GMSContextFactory; +import org.glassfish.shoal.gms.logging.GMSLogDomain; /** * Messaging based implementation of a shared distributed state cache(DSC). Every write entry made such as adding a new @@ -519,7 +519,7 @@ private static GMSCacheable createCompositeKey(final String componentName, final * @return boolean true if the message has been sent otherwise false. false. is * commonly returned for non-error related congestion, meaning that you should be able to send the message after waiting * some amount of time. - * @throws com.sun.enterprise.ee.cms.core.GMSException + * @throws org.glassfish.shoal.gms.api.core.GMSException * */ private boolean sendMessage(final String member, final DSCMessage msg) throws GMSException { diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/EventPacket.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/EventPacket.java similarity index 92% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/EventPacket.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/base/EventPacket.java index 9f006d1..1ffa06b 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/EventPacket.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/EventPacket.java @@ -14,10 +14,10 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.base; +package org.glassfish.shoal.gms.base; -import com.sun.enterprise.mgmt.ClusterView; -import com.sun.enterprise.mgmt.ClusterViewEvents; +import org.glassfish.shoal.gms.mgmt.ClusterView; +import org.glassfish.shoal.gms.mgmt.ClusterViewEvents; /** * @author Shreedhar Ganapathy Date: Jun 27, 2006 diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/GMSContextImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/GMSContextImpl.java similarity index 91% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/GMSContextImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/base/GMSContextImpl.java index d111a25..62d3380 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/GMSContextImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/GMSContextImpl.java @@ -14,9 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.base; - -import static com.sun.enterprise.ee.cms.core.GroupManagementService.MemberType.WATCHDOG; +package org.glassfish.shoal.gms.base; import java.util.ArrayList; import java.util.HashMap; @@ -28,22 +26,24 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; -import com.sun.enterprise.ee.cms.core.AliveAndReadyView; -import com.sun.enterprise.ee.cms.core.DistributedStateCache; -import com.sun.enterprise.ee.cms.core.GMSConstants; -import com.sun.enterprise.ee.cms.core.GMSException; -import com.sun.enterprise.ee.cms.core.GroupHandle; -import com.sun.enterprise.ee.cms.core.GroupManagementService; -import com.sun.enterprise.ee.cms.core.RejoinSubevent; -import com.sun.enterprise.ee.cms.core.ServiceProviderConfigurationKeys; -import com.sun.enterprise.ee.cms.impl.common.AliveAndReadyViewWindow; -import com.sun.enterprise.ee.cms.impl.common.GMSContextBase; -import com.sun.enterprise.ee.cms.impl.common.GMSMonitor; -import com.sun.enterprise.ee.cms.impl.common.Router; -import com.sun.enterprise.ee.cms.impl.common.ShutdownHelper; -import com.sun.enterprise.ee.cms.spi.GMSMessage; -import com.sun.enterprise.ee.cms.spi.GroupCommunicationProvider; -import com.sun.enterprise.ee.cms.spi.MemberStates; +import org.glassfish.shoal.gms.api.core.AliveAndReadyView; +import org.glassfish.shoal.gms.api.core.DistributedStateCache; +import org.glassfish.shoal.gms.api.core.GMSConstants; +import org.glassfish.shoal.gms.api.core.GMSException; +import org.glassfish.shoal.gms.api.core.GroupHandle; +import org.glassfish.shoal.gms.api.core.GroupManagementService; +import org.glassfish.shoal.gms.api.core.RejoinSubevent; +import org.glassfish.shoal.gms.api.core.ServiceProviderConfigurationKeys; +import org.glassfish.shoal.gms.api.spi.GMSMessage; +import org.glassfish.shoal.gms.api.spi.GroupCommunicationProvider; +import org.glassfish.shoal.gms.api.spi.MemberStates; +import org.glassfish.shoal.gms.common.AliveAndReadyViewWindow; +import org.glassfish.shoal.gms.common.GMSContextBase; +import org.glassfish.shoal.gms.common.GMSMonitor; +import org.glassfish.shoal.gms.common.Router; +import org.glassfish.shoal.gms.common.ShutdownHelper; + +import static org.glassfish.shoal.gms.api.core.GroupManagementService.MemberType.WATCHDOG; /** * @author Shreedhar Ganapathy Date: Jun 26, 2006 @@ -289,7 +289,7 @@ public GroupCommunicationProvider getGroupCommunicationProvider() { } @Override - public com.sun.enterprise.ee.cms.impl.common.ViewWindow getViewWindow() { + public org.glassfish.shoal.gms.common.ViewWindow getViewWindow() { return viewWindow; } diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/GMSThreadFactory.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/GMSThreadFactory.java similarity index 97% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/GMSThreadFactory.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/base/GMSThreadFactory.java index 9f987e1..f07fbcc 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/GMSThreadFactory.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/GMSThreadFactory.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.base; +package org.glassfish.shoal.gms.base; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/GroupCommunicationProviderImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/GroupCommunicationProviderImpl.java similarity index 95% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/GroupCommunicationProviderImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/base/GroupCommunicationProviderImpl.java index 54bfa82..31b3eab 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/GroupCommunicationProviderImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/GroupCommunicationProviderImpl.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.base; +package org.glassfish.shoal.gms.base; import java.io.IOException; import java.io.Serializable; @@ -26,22 +26,22 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.GMSConstants; -import com.sun.enterprise.ee.cms.core.GMSException; -import com.sun.enterprise.ee.cms.core.MemberNotInViewException; -import com.sun.enterprise.ee.cms.impl.common.GMSContextFactory; -import com.sun.enterprise.ee.cms.impl.common.GMSMonitor; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; -import com.sun.enterprise.ee.cms.spi.GMSMessage; -import com.sun.enterprise.ee.cms.spi.GroupCommunicationProvider; -import com.sun.enterprise.ee.cms.spi.MemberStates; -import com.sun.enterprise.mgmt.ClusterManager; -import com.sun.enterprise.mgmt.ClusterMessageListener; -import com.sun.enterprise.mgmt.ClusterView; -import com.sun.enterprise.mgmt.ClusterViewEvent; -import com.sun.enterprise.mgmt.ClusterViewEventListener; -import com.sun.enterprise.mgmt.HealthMonitor; -import com.sun.enterprise.mgmt.transport.MessageIOException; +import org.glassfish.shoal.gms.api.core.GMSConstants; +import org.glassfish.shoal.gms.api.core.GMSException; +import org.glassfish.shoal.gms.api.core.MemberNotInViewException; +import org.glassfish.shoal.gms.api.spi.GMSMessage; +import org.glassfish.shoal.gms.api.spi.GroupCommunicationProvider; +import org.glassfish.shoal.gms.api.spi.MemberStates; +import org.glassfish.shoal.gms.common.GMSContextFactory; +import org.glassfish.shoal.gms.common.GMSMonitor; +import org.glassfish.shoal.gms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.mgmt.ClusterManager; +import org.glassfish.shoal.gms.mgmt.ClusterMessageListener; +import org.glassfish.shoal.gms.mgmt.ClusterView; +import org.glassfish.shoal.gms.mgmt.ClusterViewEvent; +import org.glassfish.shoal.gms.mgmt.ClusterViewEventListener; +import org.glassfish.shoal.gms.mgmt.HealthMonitor; +import org.glassfish.shoal.gms.mgmt.transport.MessageIOException; /** * Implements the GroupCommunicationProvider interface to plug in JxtaClusterManagement layer as a Group Communication @@ -196,7 +196,7 @@ public boolean sendMessage(final PeerID id, final Serializable msg) { * unpack this message appropriately. * @param synchronous setting true here will call the underlying GCP's api that corresponds to a synchronous message, if * available. - * @throws com.sun.enterprise.ee.cms.core.GMSException the GMS generic expection + * @throws org.glassfish.shoal.gms.api.core.GMSException the GMS generic expection * */ public void sendMessage(final String targetMemberIdentityToken, final Serializable message, final boolean synchronous) diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/GroupHandleImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/GroupHandleImpl.java similarity index 95% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/GroupHandleImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/base/GroupHandleImpl.java index ce94a6d..0065e69 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/GroupHandleImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/GroupHandleImpl.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.base; +package org.glassfish.shoal.gms.base; import java.io.Serializable; import java.util.ArrayList; @@ -24,20 +24,20 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.AliveAndReadyView; -import com.sun.enterprise.ee.cms.core.DistributedStateCache; -import com.sun.enterprise.ee.cms.core.GMSCacheable; -import com.sun.enterprise.ee.cms.core.GMSException; -import com.sun.enterprise.ee.cms.core.GMSMember; -import com.sun.enterprise.ee.cms.core.GroupHandle; -import com.sun.enterprise.ee.cms.core.GroupManagementService; -import com.sun.enterprise.ee.cms.impl.common.GMSContext; -import com.sun.enterprise.ee.cms.impl.common.GMSContextFactory; -import com.sun.enterprise.ee.cms.impl.common.ViewWindow; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; -import com.sun.enterprise.ee.cms.spi.GMSMessage; -import com.sun.enterprise.ee.cms.spi.GroupCommunicationProvider; -import com.sun.enterprise.ee.cms.spi.MemberStates; +import org.glassfish.shoal.gms.api.core.AliveAndReadyView; +import org.glassfish.shoal.gms.api.core.DistributedStateCache; +import org.glassfish.shoal.gms.api.core.GMSCacheable; +import org.glassfish.shoal.gms.api.core.GMSException; +import org.glassfish.shoal.gms.api.core.GMSMember; +import org.glassfish.shoal.gms.api.core.GroupHandle; +import org.glassfish.shoal.gms.api.core.GroupManagementService; +import org.glassfish.shoal.gms.api.spi.GMSMessage; +import org.glassfish.shoal.gms.api.spi.GroupCommunicationProvider; +import org.glassfish.shoal.gms.api.spi.MemberStates; +import org.glassfish.shoal.gms.common.GMSContext; +import org.glassfish.shoal.gms.common.GMSContextFactory; +import org.glassfish.shoal.gms.common.ViewWindow; +import org.glassfish.shoal.gms.logging.GMSLogDomain; /** * Implementation of GroupHandle interface. @@ -143,7 +143,7 @@ public void sendMessage(List targetServerTokens, String targetComponentN * returns a DistributedStateCache object that provides the ability to set and retrieve CachedStates. * * @return DistributedStateCache - * @see com.sun.enterprise.ee.cms.core.DistributedStateCache + * @see org.glassfish.shoal.gms.api.core.DistributedStateCache */ public DistributedStateCache getDistributedStateCache() { // TBD: code review comment to follow up on in future. diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/MessagePacket.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/MessagePacket.java similarity index 96% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/MessagePacket.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/base/MessagePacket.java index 146a0c2..35d66e9 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/MessagePacket.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/MessagePacket.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.base; +package org.glassfish.shoal.gms.base; /** * @author Shreedhar Ganapathy Date: Jul 11, 2006 diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/MessageWindow.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/MessageWindow.java similarity index 92% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/MessageWindow.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/base/MessageWindow.java index c02135d..f544bfb 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/MessageWindow.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/MessageWindow.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.base; +package org.glassfish.shoal.gms.base; import java.nio.charset.Charset; import java.text.MessageFormat; @@ -27,18 +27,18 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.GMSConstants; -import com.sun.enterprise.ee.cms.core.GMSException; -import com.sun.enterprise.ee.cms.core.MessageSignal; -import com.sun.enterprise.ee.cms.impl.common.DSCMessage; -import com.sun.enterprise.ee.cms.impl.common.GMSContext; -import com.sun.enterprise.ee.cms.impl.common.GMSContextFactory; -import com.sun.enterprise.ee.cms.impl.common.MessageSignalImpl; -import com.sun.enterprise.ee.cms.impl.common.Router; -import com.sun.enterprise.ee.cms.impl.common.ShutdownHelper; -import com.sun.enterprise.ee.cms.impl.common.SignalPacket; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; -import com.sun.enterprise.ee.cms.spi.GMSMessage; +import org.glassfish.shoal.gms.api.core.GMSConstants; +import org.glassfish.shoal.gms.api.core.GMSException; +import org.glassfish.shoal.gms.api.core.MessageSignal; +import org.glassfish.shoal.gms.api.spi.GMSMessage; +import org.glassfish.shoal.gms.common.DSCMessage; +import org.glassfish.shoal.gms.common.GMSContext; +import org.glassfish.shoal.gms.common.GMSContextFactory; +import org.glassfish.shoal.gms.common.MessageSignalImpl; +import org.glassfish.shoal.gms.common.Router; +import org.glassfish.shoal.gms.common.ShutdownHelper; +import org.glassfish.shoal.gms.common.SignalPacket; +import org.glassfish.shoal.gms.logging.GMSLogDomain; /** * Handles messages from the message queue and dispatches them to the interested parties. Also specially handles @@ -217,7 +217,7 @@ private Router getRouter() { return getGMSContext().getRouter(); } - private void writeLog(final String sender, final com.sun.enterprise.ee.cms.spi.GMSMessage message) { + private void writeLog(final String sender, final org.glassfish.shoal.gms.api.spi.GMSMessage message) { final String localId = getGMSContext().getServerIdentityToken(); if (logger.isLoggable(Level.FINER)) { logger.log(Level.FINER, MessageFormat.format("Sender:{0}, Receiver :{1}, TargetComponent :{2}, Message :{3}", sender, localId, diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/PeerID.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/PeerID.java similarity index 98% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/PeerID.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/base/PeerID.java index 83bda98..eef66e3 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/PeerID.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/PeerID.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.base; +package org.glassfish.shoal.gms.base; import java.io.Serializable; diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/SystemAdvertisement.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/SystemAdvertisement.java similarity index 98% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/SystemAdvertisement.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/base/SystemAdvertisement.java index 32c3c7e..a8cefd7 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/SystemAdvertisement.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/SystemAdvertisement.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.base; +package org.glassfish.shoal.gms.base; import java.io.Serializable; import java.net.URI; diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/SystemAdvertisementImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/SystemAdvertisementImpl.java similarity index 98% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/SystemAdvertisementImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/base/SystemAdvertisementImpl.java index 0b1bd1b..5e1b0ab 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/SystemAdvertisementImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/SystemAdvertisementImpl.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.base; +package org.glassfish.shoal.gms.base; import java.net.URI; import java.text.MessageFormat; @@ -27,11 +27,11 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.logging.GMSLogDomain; /** * This class is a default system advertisement and implements - * {@link com.sun.enterprise.ee.cms.impl.base.SystemAdvertisement} + * {@link org.glassfish.shoal.gms.base.SystemAdvertisement} * * @author Bongjae Chang */ diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/Utility.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/Utility.java similarity index 96% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/Utility.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/base/Utility.java index 72de935..72934f8 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/Utility.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/Utility.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.base; +package org.glassfish.shoal.gms.base; import java.util.Map; import java.util.logging.ConsoleHandler; @@ -22,10 +22,10 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.GMSMember; -import com.sun.enterprise.ee.cms.core.GroupManagementService; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; -import com.sun.enterprise.ee.cms.logging.NiceLogFormatter; +import org.glassfish.shoal.gms.api.core.GMSMember; +import org.glassfish.shoal.gms.api.core.GroupManagementService; +import org.glassfish.shoal.gms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.logging.NiceLogFormatter; /** * Utility class that can be used by any calling code to do common routines diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/ViewWindowImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/ViewWindowImpl.java similarity index 95% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/ViewWindowImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/base/ViewWindowImpl.java index 0dfe55a..808c1db 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/base/ViewWindowImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/base/ViewWindowImpl.java @@ -15,10 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.base; - -import static com.sun.enterprise.ee.cms.core.GMSConstants.startupType.GROUP_STARTUP; -import static com.sun.enterprise.ee.cms.core.GMSConstants.startupType.INSTANCE_STARTUP; +package org.glassfish.shoal.gms.base; import java.io.Serializable; import java.text.MessageFormat; @@ -35,31 +32,34 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.DistributedStateCache; -import com.sun.enterprise.ee.cms.core.GMSCacheable; -import com.sun.enterprise.ee.cms.core.GMSConstants; -import com.sun.enterprise.ee.cms.core.GMSException; -import com.sun.enterprise.ee.cms.core.GMSMember; -import com.sun.enterprise.ee.cms.core.GroupManagementService; -import com.sun.enterprise.ee.cms.core.RejoinSubevent; -import com.sun.enterprise.ee.cms.core.Signal; -import com.sun.enterprise.ee.cms.impl.common.FailureNotificationSignalImpl; -import com.sun.enterprise.ee.cms.impl.common.FailureRecoverySignalImpl; -import com.sun.enterprise.ee.cms.impl.common.FailureSuspectedSignalImpl; -import com.sun.enterprise.ee.cms.impl.common.GMSContext; -import com.sun.enterprise.ee.cms.impl.common.GMSContextFactory; -import com.sun.enterprise.ee.cms.impl.common.GroupLeadershipNotificationSignalImpl; -import com.sun.enterprise.ee.cms.impl.common.JoinNotificationSignalImpl; -import com.sun.enterprise.ee.cms.impl.common.JoinedAndReadyNotificationSignalImpl; -import com.sun.enterprise.ee.cms.impl.common.PlannedShutdownSignalImpl; -import com.sun.enterprise.ee.cms.impl.common.RecoveryTargetSelector; -import com.sun.enterprise.ee.cms.impl.common.Router; -import com.sun.enterprise.ee.cms.impl.common.SignalPacket; -import com.sun.enterprise.ee.cms.impl.common.ViewWindow; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; -import com.sun.enterprise.ee.cms.spi.MemberStates; -import com.sun.enterprise.mgmt.ClusterView; -import com.sun.enterprise.mgmt.ClusterViewEvents; +import org.glassfish.shoal.gms.api.core.DistributedStateCache; +import org.glassfish.shoal.gms.api.core.GMSCacheable; +import org.glassfish.shoal.gms.api.core.GMSConstants; +import org.glassfish.shoal.gms.api.core.GMSException; +import org.glassfish.shoal.gms.api.core.GMSMember; +import org.glassfish.shoal.gms.api.core.GroupManagementService; +import org.glassfish.shoal.gms.api.core.RejoinSubevent; +import org.glassfish.shoal.gms.api.core.Signal; +import org.glassfish.shoal.gms.api.spi.MemberStates; +import org.glassfish.shoal.gms.common.FailureNotificationSignalImpl; +import org.glassfish.shoal.gms.common.FailureRecoverySignalImpl; +import org.glassfish.shoal.gms.common.FailureSuspectedSignalImpl; +import org.glassfish.shoal.gms.common.GMSContext; +import org.glassfish.shoal.gms.common.GMSContextFactory; +import org.glassfish.shoal.gms.common.GroupLeadershipNotificationSignalImpl; +import org.glassfish.shoal.gms.common.JoinNotificationSignalImpl; +import org.glassfish.shoal.gms.common.JoinedAndReadyNotificationSignalImpl; +import org.glassfish.shoal.gms.common.PlannedShutdownSignalImpl; +import org.glassfish.shoal.gms.common.RecoveryTargetSelector; +import org.glassfish.shoal.gms.common.Router; +import org.glassfish.shoal.gms.common.SignalPacket; +import org.glassfish.shoal.gms.common.ViewWindow; +import org.glassfish.shoal.gms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.mgmt.ClusterView; +import org.glassfish.shoal.gms.mgmt.ClusterViewEvents; + +import static org.glassfish.shoal.gms.api.core.GMSConstants.startupType.GROUP_STARTUP; +import static org.glassfish.shoal.gms.api.core.GMSConstants.startupType.INSTANCE_STARTUP; /** * @author Shreedhar Ganapathy Date: Jun 26, 2006 diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/FailureNotificationActionFactoryImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/FailureNotificationActionFactoryImpl.java similarity index 85% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/FailureNotificationActionFactoryImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/client/FailureNotificationActionFactoryImpl.java index 6a872cd..1391139 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/FailureNotificationActionFactoryImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/FailureNotificationActionFactoryImpl.java @@ -14,11 +14,11 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.client; +package org.glassfish.shoal.gms.client; -import com.sun.enterprise.ee.cms.core.Action; -import com.sun.enterprise.ee.cms.core.CallBack; -import com.sun.enterprise.ee.cms.core.FailureNotificationActionFactory; +import org.glassfish.shoal.gms.api.core.Action; +import org.glassfish.shoal.gms.api.core.CallBack; +import org.glassfish.shoal.gms.api.core.FailureNotificationActionFactory; /** * Reference implementation of FailureNotificationActionFactory diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/FailureNotificationActionImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/FailureNotificationActionImpl.java similarity index 84% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/FailureNotificationActionImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/client/FailureNotificationActionImpl.java index db78884..f9264d7 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/FailureNotificationActionImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/FailureNotificationActionImpl.java @@ -14,18 +14,18 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.client; +package org.glassfish.shoal.gms.client; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.ActionException; -import com.sun.enterprise.ee.cms.core.CallBack; -import com.sun.enterprise.ee.cms.core.FailureNotificationAction; -import com.sun.enterprise.ee.cms.core.Signal; -import com.sun.enterprise.ee.cms.core.SignalAcquireException; -import com.sun.enterprise.ee.cms.core.SignalReleaseException; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.api.core.ActionException; +import org.glassfish.shoal.gms.api.core.CallBack; +import org.glassfish.shoal.gms.api.core.FailureNotificationAction; +import org.glassfish.shoal.gms.api.core.Signal; +import org.glassfish.shoal.gms.api.core.SignalAcquireException; +import org.glassfish.shoal.gms.api.core.SignalReleaseException; +import org.glassfish.shoal.gms.logging.GMSLogDomain; /** * Reference implementation of the FailureNotificationAction diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/FailureRecoveryActionFactoryImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/FailureRecoveryActionFactoryImpl.java similarity index 85% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/FailureRecoveryActionFactoryImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/client/FailureRecoveryActionFactoryImpl.java index 5ebe19a..b9b373d 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/FailureRecoveryActionFactoryImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/FailureRecoveryActionFactoryImpl.java @@ -14,11 +14,11 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.client; +package org.glassfish.shoal.gms.client; -import com.sun.enterprise.ee.cms.core.Action; -import com.sun.enterprise.ee.cms.core.CallBack; -import com.sun.enterprise.ee.cms.core.FailureRecoveryActionFactory; +import org.glassfish.shoal.gms.api.core.Action; +import org.glassfish.shoal.gms.api.core.CallBack; +import org.glassfish.shoal.gms.api.core.FailureRecoveryActionFactory; /** * Reference implementation of FailureRecoveryActionFactory interface diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/FailureRecoveryActionImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/FailureRecoveryActionImpl.java similarity index 84% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/FailureRecoveryActionImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/client/FailureRecoveryActionImpl.java index 4100a00..d33478b 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/FailureRecoveryActionImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/FailureRecoveryActionImpl.java @@ -14,19 +14,19 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.client; +package org.glassfish.shoal.gms.client; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.ActionException; -import com.sun.enterprise.ee.cms.core.CallBack; -import com.sun.enterprise.ee.cms.core.FailureRecoveryAction; -import com.sun.enterprise.ee.cms.core.FailureRecoverySignal; -import com.sun.enterprise.ee.cms.core.Signal; -import com.sun.enterprise.ee.cms.core.SignalAcquireException; -import com.sun.enterprise.ee.cms.core.SignalReleaseException; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.api.core.ActionException; +import org.glassfish.shoal.gms.api.core.CallBack; +import org.glassfish.shoal.gms.api.core.FailureRecoveryAction; +import org.glassfish.shoal.gms.api.core.FailureRecoverySignal; +import org.glassfish.shoal.gms.api.core.Signal; +import org.glassfish.shoal.gms.api.core.SignalAcquireException; +import org.glassfish.shoal.gms.api.core.SignalReleaseException; +import org.glassfish.shoal.gms.logging.GMSLogDomain; /** * Reference implementation of FailureRecoveryAction interface diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/FailureSuspectedActionFactoryImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/FailureSuspectedActionFactoryImpl.java similarity index 85% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/FailureSuspectedActionFactoryImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/client/FailureSuspectedActionFactoryImpl.java index c13f1ce..df1a3c2 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/FailureSuspectedActionFactoryImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/FailureSuspectedActionFactoryImpl.java @@ -14,11 +14,11 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.client; +package org.glassfish.shoal.gms.client; -import com.sun.enterprise.ee.cms.core.Action; -import com.sun.enterprise.ee.cms.core.CallBack; -import com.sun.enterprise.ee.cms.core.FailureSuspectedActionFactory; +import org.glassfish.shoal.gms.api.core.Action; +import org.glassfish.shoal.gms.api.core.CallBack; +import org.glassfish.shoal.gms.api.core.FailureSuspectedActionFactory; /** * Reference implementation of FailureSuspectedActionFactory diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/FailureSuspectedActionImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/FailureSuspectedActionImpl.java similarity index 85% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/FailureSuspectedActionImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/client/FailureSuspectedActionImpl.java index 80bddf9..b415569 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/FailureSuspectedActionImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/FailureSuspectedActionImpl.java @@ -14,17 +14,17 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.client; +package org.glassfish.shoal.gms.client; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.CallBack; -import com.sun.enterprise.ee.cms.core.FailureSuspectedAction; -import com.sun.enterprise.ee.cms.core.Signal; -import com.sun.enterprise.ee.cms.core.SignalAcquireException; -import com.sun.enterprise.ee.cms.core.SignalReleaseException; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.api.core.CallBack; +import org.glassfish.shoal.gms.api.core.FailureSuspectedAction; +import org.glassfish.shoal.gms.api.core.Signal; +import org.glassfish.shoal.gms.api.core.SignalAcquireException; +import org.glassfish.shoal.gms.api.core.SignalReleaseException; +import org.glassfish.shoal.gms.logging.GMSLogDomain; /** * Reference Implementation of FailureSuspicionAction interface diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/GroupLeadershipNotificationActionFactoryImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/GroupLeadershipNotificationActionFactoryImpl.java similarity index 85% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/GroupLeadershipNotificationActionFactoryImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/client/GroupLeadershipNotificationActionFactoryImpl.java index ba9ed7f..38f8b5a 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/GroupLeadershipNotificationActionFactoryImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/GroupLeadershipNotificationActionFactoryImpl.java @@ -14,11 +14,11 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.client; +package org.glassfish.shoal.gms.client; -import com.sun.enterprise.ee.cms.core.Action; -import com.sun.enterprise.ee.cms.core.CallBack; -import com.sun.enterprise.ee.cms.core.GroupLeadershipNotificationActionFactory; +import org.glassfish.shoal.gms.api.core.Action; +import org.glassfish.shoal.gms.api.core.CallBack; +import org.glassfish.shoal.gms.api.core.GroupLeadershipNotificationActionFactory; /** * Reference Implementation of GroupLeadershipNotificationActionFactory diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/GroupLeadershipNotificationActionImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/GroupLeadershipNotificationActionImpl.java similarity index 80% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/GroupLeadershipNotificationActionImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/client/GroupLeadershipNotificationActionImpl.java index d3a31ac..8996377 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/GroupLeadershipNotificationActionImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/GroupLeadershipNotificationActionImpl.java @@ -14,18 +14,18 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.client; +package org.glassfish.shoal.gms.client; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.ActionException; -import com.sun.enterprise.ee.cms.core.CallBack; -import com.sun.enterprise.ee.cms.core.GroupLeadershipNotificationAction; -import com.sun.enterprise.ee.cms.core.Signal; -import com.sun.enterprise.ee.cms.core.SignalAcquireException; -import com.sun.enterprise.ee.cms.core.SignalReleaseException; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.api.core.ActionException; +import org.glassfish.shoal.gms.api.core.CallBack; +import org.glassfish.shoal.gms.api.core.GroupLeadershipNotificationAction; +import org.glassfish.shoal.gms.api.core.Signal; +import org.glassfish.shoal.gms.api.core.SignalAcquireException; +import org.glassfish.shoal.gms.api.core.SignalReleaseException; +import org.glassfish.shoal.gms.logging.GMSLogDomain; /** * Reference Implementation of GroupLeadershipNotificationAction diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/JoinNotificationActionFactoryImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/JoinNotificationActionFactoryImpl.java similarity index 86% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/JoinNotificationActionFactoryImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/client/JoinNotificationActionFactoryImpl.java index fb4a8ca..145e4f6 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/JoinNotificationActionFactoryImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/JoinNotificationActionFactoryImpl.java @@ -14,11 +14,11 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.client; +package org.glassfish.shoal.gms.client; -import com.sun.enterprise.ee.cms.core.Action; -import com.sun.enterprise.ee.cms.core.CallBack; -import com.sun.enterprise.ee.cms.core.JoinNotificationActionFactory; +import org.glassfish.shoal.gms.api.core.Action; +import org.glassfish.shoal.gms.api.core.CallBack; +import org.glassfish.shoal.gms.api.core.JoinNotificationActionFactory; /** * Reference Implementation of JoinNotificationActionFactory diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/JoinNotificationActionImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/JoinNotificationActionImpl.java similarity index 81% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/JoinNotificationActionImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/client/JoinNotificationActionImpl.java index 6fa3473..969880a 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/JoinNotificationActionImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/JoinNotificationActionImpl.java @@ -14,18 +14,18 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.client; +package org.glassfish.shoal.gms.client; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.ActionException; -import com.sun.enterprise.ee.cms.core.CallBack; -import com.sun.enterprise.ee.cms.core.JoinNotificationAction; -import com.sun.enterprise.ee.cms.core.Signal; -import com.sun.enterprise.ee.cms.core.SignalAcquireException; -import com.sun.enterprise.ee.cms.core.SignalReleaseException; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.api.core.ActionException; +import org.glassfish.shoal.gms.api.core.CallBack; +import org.glassfish.shoal.gms.api.core.JoinNotificationAction; +import org.glassfish.shoal.gms.api.core.Signal; +import org.glassfish.shoal.gms.api.core.SignalAcquireException; +import org.glassfish.shoal.gms.api.core.SignalReleaseException; +import org.glassfish.shoal.gms.logging.GMSLogDomain; /** * Reference Implementation of JoinNotificationAction diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/JoinedAndReadyNotificationActionFactoryImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/JoinedAndReadyNotificationActionFactoryImpl.java similarity index 85% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/JoinedAndReadyNotificationActionFactoryImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/client/JoinedAndReadyNotificationActionFactoryImpl.java index 862ce32..dd07409 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/JoinedAndReadyNotificationActionFactoryImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/JoinedAndReadyNotificationActionFactoryImpl.java @@ -14,11 +14,11 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.client; +package org.glassfish.shoal.gms.client; -import com.sun.enterprise.ee.cms.core.Action; -import com.sun.enterprise.ee.cms.core.CallBack; -import com.sun.enterprise.ee.cms.core.JoinedAndReadyNotificationActionFactory; +import org.glassfish.shoal.gms.api.core.Action; +import org.glassfish.shoal.gms.api.core.CallBack; +import org.glassfish.shoal.gms.api.core.JoinedAndReadyNotificationActionFactory; /** * Reference Implementation of JoinedAndReadyNotificationActionFactory diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/JoinedAndReadyNotificationActionImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/JoinedAndReadyNotificationActionImpl.java similarity index 81% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/JoinedAndReadyNotificationActionImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/client/JoinedAndReadyNotificationActionImpl.java index c65e219..959e870 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/JoinedAndReadyNotificationActionImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/JoinedAndReadyNotificationActionImpl.java @@ -14,18 +14,18 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.client; +package org.glassfish.shoal.gms.client; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.ActionException; -import com.sun.enterprise.ee.cms.core.CallBack; -import com.sun.enterprise.ee.cms.core.JoinedAndReadyNotificationAction; -import com.sun.enterprise.ee.cms.core.Signal; -import com.sun.enterprise.ee.cms.core.SignalAcquireException; -import com.sun.enterprise.ee.cms.core.SignalReleaseException; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.api.core.ActionException; +import org.glassfish.shoal.gms.api.core.CallBack; +import org.glassfish.shoal.gms.api.core.JoinedAndReadyNotificationAction; +import org.glassfish.shoal.gms.api.core.Signal; +import org.glassfish.shoal.gms.api.core.SignalAcquireException; +import org.glassfish.shoal.gms.api.core.SignalReleaseException; +import org.glassfish.shoal.gms.logging.GMSLogDomain; /** * Reference Implementation of JoinedAndReadyNotificationAction diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/MessageActionFactoryImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/MessageActionFactoryImpl.java similarity index 86% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/MessageActionFactoryImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/client/MessageActionFactoryImpl.java index 8bc4ee8..fb83ec4 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/MessageActionFactoryImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/MessageActionFactoryImpl.java @@ -14,11 +14,11 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.client; +package org.glassfish.shoal.gms.client; -import com.sun.enterprise.ee.cms.core.Action; -import com.sun.enterprise.ee.cms.core.CallBack; -import com.sun.enterprise.ee.cms.core.MessageActionFactory; +import org.glassfish.shoal.gms.api.core.Action; +import org.glassfish.shoal.gms.api.core.CallBack; +import org.glassfish.shoal.gms.api.core.MessageActionFactory; /** * Reference implementation of MessageActionFactory interface. diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/MessageActionImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/MessageActionImpl.java similarity index 86% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/MessageActionImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/client/MessageActionImpl.java index 7b59614..5b279ff 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/MessageActionImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/MessageActionImpl.java @@ -14,18 +14,18 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.client; +package org.glassfish.shoal.gms.client; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.ActionException; -import com.sun.enterprise.ee.cms.core.CallBack; -import com.sun.enterprise.ee.cms.core.MessageAction; -import com.sun.enterprise.ee.cms.core.Signal; -import com.sun.enterprise.ee.cms.core.SignalAcquireException; -import com.sun.enterprise.ee.cms.core.SignalReleaseException; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.api.core.ActionException; +import org.glassfish.shoal.gms.api.core.CallBack; +import org.glassfish.shoal.gms.api.core.MessageAction; +import org.glassfish.shoal.gms.api.core.Signal; +import org.glassfish.shoal.gms.api.core.SignalAcquireException; +import org.glassfish.shoal.gms.api.core.SignalReleaseException; +import org.glassfish.shoal.gms.logging.GMSLogDomain; /** * Reference implementation of MessageAction interface. diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/PlannedShutdownActionFactoryImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/PlannedShutdownActionFactoryImpl.java similarity index 86% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/PlannedShutdownActionFactoryImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/client/PlannedShutdownActionFactoryImpl.java index 161c5ae..7e239db 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/PlannedShutdownActionFactoryImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/PlannedShutdownActionFactoryImpl.java @@ -14,11 +14,11 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.client; +package org.glassfish.shoal.gms.client; -import com.sun.enterprise.ee.cms.core.Action; -import com.sun.enterprise.ee.cms.core.CallBack; -import com.sun.enterprise.ee.cms.core.PlannedShutdownActionFactory; +import org.glassfish.shoal.gms.api.core.Action; +import org.glassfish.shoal.gms.api.core.CallBack; +import org.glassfish.shoal.gms.api.core.PlannedShutdownActionFactory; /** * Reference implementation of PlannedShutdownActionFactory. diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/PlannedShutdownActionImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/PlannedShutdownActionImpl.java similarity index 81% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/PlannedShutdownActionImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/client/PlannedShutdownActionImpl.java index b6e637f..8714660 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/PlannedShutdownActionImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/PlannedShutdownActionImpl.java @@ -14,18 +14,18 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.client; +package org.glassfish.shoal.gms.client; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.ActionException; -import com.sun.enterprise.ee.cms.core.CallBack; -import com.sun.enterprise.ee.cms.core.PlannedShutdownAction; -import com.sun.enterprise.ee.cms.core.Signal; -import com.sun.enterprise.ee.cms.core.SignalAcquireException; -import com.sun.enterprise.ee.cms.core.SignalReleaseException; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.api.core.ActionException; +import org.glassfish.shoal.gms.api.core.CallBack; +import org.glassfish.shoal.gms.api.core.PlannedShutdownAction; +import org.glassfish.shoal.gms.api.core.Signal; +import org.glassfish.shoal.gms.api.core.SignalAcquireException; +import org.glassfish.shoal.gms.api.core.SignalReleaseException; +import org.glassfish.shoal.gms.logging.GMSLogDomain; /** * Reference Implementation of PlannedShutdownAction diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/RejoinSubeventImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/RejoinSubeventImpl.java similarity index 92% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/RejoinSubeventImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/client/RejoinSubeventImpl.java index 747d6bc..a316412 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/RejoinSubeventImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/RejoinSubeventImpl.java @@ -14,11 +14,11 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.client; +package org.glassfish.shoal.gms.client; import java.util.Date; -import com.sun.enterprise.ee.cms.core.RejoinSubevent; +import org.glassfish.shoal.gms.api.core.RejoinSubevent; /** * Implementation of rejoin subevent that captures the time that a previously failed instance had joined the cluster. diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/package.html b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/package.html similarity index 96% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/package.html rename to gms/impl/src/main/java/org/glassfish/shoal/gms/client/package.html index 4f208dd..f1e598c 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/client/package.html +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/client/package.html @@ -19,7 +19,7 @@ - Description of com.sun.enterprise.ee.cms.impl.client package + Description of org.glassfish.shoal.gms.client package

Shoal GMS's reference implementations of the client-side diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/AliveAndReadyViewImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/AliveAndReadyViewImpl.java similarity index 96% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/AliveAndReadyViewImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/common/AliveAndReadyViewImpl.java index d322b9a..78cd7e1 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/AliveAndReadyViewImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/AliveAndReadyViewImpl.java @@ -15,15 +15,15 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.common; +package org.glassfish.shoal.gms.common; import java.text.MessageFormat; import java.util.Collections; import java.util.SortedSet; import java.util.TreeSet; -import com.sun.enterprise.ee.cms.core.AliveAndReadyView; -import com.sun.enterprise.ee.cms.core.Signal; +import org.glassfish.shoal.gms.api.core.AliveAndReadyView; +import org.glassfish.shoal.gms.api.core.Signal; public class AliveAndReadyViewImpl implements AliveAndReadyView { private Signal signal; diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/AliveAndReadyViewWindow.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/AliveAndReadyViewWindow.java similarity index 94% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/AliveAndReadyViewWindow.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/common/AliveAndReadyViewWindow.java index 668da60..9362e44 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/AliveAndReadyViewWindow.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/AliveAndReadyViewWindow.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.common; +package org.glassfish.shoal.gms.common; import java.util.LinkedList; import java.util.List; @@ -25,20 +25,20 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.AliveAndReadyView; -import com.sun.enterprise.ee.cms.core.CallBack; -import com.sun.enterprise.ee.cms.core.FailureNotificationSignal; -import com.sun.enterprise.ee.cms.core.GMSConstants; -import com.sun.enterprise.ee.cms.core.GroupHandle; -import com.sun.enterprise.ee.cms.core.JoinedAndReadyNotificationSignal; -import com.sun.enterprise.ee.cms.core.PlannedShutdownSignal; -import com.sun.enterprise.ee.cms.core.RejoinSubevent; -import com.sun.enterprise.ee.cms.core.Signal; -import com.sun.enterprise.ee.cms.impl.client.FailureNotificationActionFactoryImpl; -import com.sun.enterprise.ee.cms.impl.client.JoinedAndReadyNotificationActionFactoryImpl; -import com.sun.enterprise.ee.cms.impl.client.PlannedShutdownActionFactoryImpl; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; -import com.sun.enterprise.ee.cms.spi.MemberStates; +import org.glassfish.shoal.gms.api.core.AliveAndReadyView; +import org.glassfish.shoal.gms.api.core.CallBack; +import org.glassfish.shoal.gms.api.core.FailureNotificationSignal; +import org.glassfish.shoal.gms.api.core.GMSConstants; +import org.glassfish.shoal.gms.api.core.GroupHandle; +import org.glassfish.shoal.gms.api.core.JoinedAndReadyNotificationSignal; +import org.glassfish.shoal.gms.api.core.PlannedShutdownSignal; +import org.glassfish.shoal.gms.api.core.RejoinSubevent; +import org.glassfish.shoal.gms.api.core.Signal; +import org.glassfish.shoal.gms.api.spi.MemberStates; +import org.glassfish.shoal.gms.client.FailureNotificationActionFactoryImpl; +import org.glassfish.shoal.gms.client.JoinedAndReadyNotificationActionFactoryImpl; +import org.glassfish.shoal.gms.client.PlannedShutdownActionFactoryImpl; +import org.glassfish.shoal.gms.logging.GMSLogDomain; public class AliveAndReadyViewWindow { protected static final Logger LOG = Logger.getLogger(GMSLogDomain.GMS_LOGGER + ".ready"); diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/DSCMessage.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/DSCMessage.java similarity index 96% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/DSCMessage.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/common/DSCMessage.java index 71ad6b9..8e15ebb 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/DSCMessage.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/DSCMessage.java @@ -15,12 +15,12 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.common; +package org.glassfish.shoal.gms.common; import java.io.Serializable; import java.util.concurrent.ConcurrentHashMap; -import com.sun.enterprise.ee.cms.core.GMSCacheable; +import org.glassfish.shoal.gms.api.core.GMSCacheable; /** * This is a wrapper Serializable dedicated to support the DistributedStateCache such that the message ncapsulates the diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/FailureNotificationSignalImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/FailureNotificationSignalImpl.java similarity index 88% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/FailureNotificationSignalImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/common/FailureNotificationSignalImpl.java index 007961d..ee3ef99 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/FailureNotificationSignalImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/FailureNotificationSignalImpl.java @@ -14,18 +14,18 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.common; +package org.glassfish.shoal.gms.common; import java.io.Serializable; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.AliveAndReadyView; -import com.sun.enterprise.ee.cms.core.FailureNotificationSignal; -import com.sun.enterprise.ee.cms.core.SignalAcquireException; -import com.sun.enterprise.ee.cms.core.SignalReleaseException; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.api.core.AliveAndReadyView; +import org.glassfish.shoal.gms.api.core.FailureNotificationSignal; +import org.glassfish.shoal.gms.api.core.SignalAcquireException; +import org.glassfish.shoal.gms.api.core.SignalReleaseException; +import org.glassfish.shoal.gms.logging.GMSLogDomain; /** * Implements FailureNotificationSignal @@ -69,7 +69,7 @@ public FailureNotificationSignalImpl(final String failedMember, final String gro * Signal is acquired prior to processing of the signal to protect group resources that are being acquired from being * affected by a race condition * - * @throws com.sun.enterprise.ee.cms.core.SignalAcquireException the exception when signal is not acquired + * @throws org.glassfish.shoal.gms.api.core.SignalAcquireException the exception when signal is not acquired */ public void acquire() throws SignalAcquireException { logger.log(Level.FINE, "FailureNotificationSignal Acquired..."); @@ -78,7 +78,7 @@ public void acquire() throws SignalAcquireException { /** * Signal is released after processing of the signal to bring the group resources to a state of availability * - * @throws com.sun.enterprise.ee.cms.core.SignalReleaseException the exception when signal is not released + * @throws org.glassfish.shoal.gms.api.core.SignalReleaseException the exception when signal is not released */ public void release() throws SignalReleaseException { failedMember = null; diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/FailureRecoverySignalImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/FailureRecoverySignalImpl.java similarity index 92% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/FailureRecoverySignalImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/common/FailureRecoverySignalImpl.java index 3db1055..a31b96b 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/FailureRecoverySignalImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/FailureRecoverySignalImpl.java @@ -14,12 +14,12 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.common; +package org.glassfish.shoal.gms.common; -import com.sun.enterprise.ee.cms.core.FailureRecoverySignal; -import com.sun.enterprise.ee.cms.core.GMSException; -import com.sun.enterprise.ee.cms.core.SignalAcquireException; -import com.sun.enterprise.ee.cms.core.SignalReleaseException; +import org.glassfish.shoal.gms.api.core.FailureRecoverySignal; +import org.glassfish.shoal.gms.api.core.GMSException; +import org.glassfish.shoal.gms.api.core.SignalAcquireException; +import org.glassfish.shoal.gms.api.core.SignalReleaseException; /** * Implements the FailureRecoverySignal Interface and provides operations corresponding to a recovery oriented Signal's diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/FailureSuspectedSignalImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/FailureSuspectedSignalImpl.java similarity index 88% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/FailureSuspectedSignalImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/common/FailureSuspectedSignalImpl.java index 6a4bada..1700145 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/FailureSuspectedSignalImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/FailureSuspectedSignalImpl.java @@ -14,17 +14,17 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.common; +package org.glassfish.shoal.gms.common; import java.io.Serializable; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.FailureSuspectedSignal; -import com.sun.enterprise.ee.cms.core.SignalAcquireException; -import com.sun.enterprise.ee.cms.core.SignalReleaseException; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.api.core.FailureSuspectedSignal; +import org.glassfish.shoal.gms.api.core.SignalAcquireException; +import org.glassfish.shoal.gms.api.core.SignalReleaseException; +import org.glassfish.shoal.gms.logging.GMSLogDomain; /** * @author Shreedhar Ganapathy Date: Sep 14, 2005 @@ -62,7 +62,7 @@ public FailureSuspectedSignalImpl(final String failedMember, final String groupN * Signal is acquired prior to processing of the signal to protect group resources being acquired from being affected by * a race condition Signal must be mandatorily acquired before any processing for recovery operations. * - * @throws com.sun.enterprise.ee.cms.core.SignalAcquireException Exception when unable to acquire the signal + * @throws org.glassfish.shoal.gms.api.core.SignalAcquireException Exception when unable to acquire the signal * */ public void acquire() throws SignalAcquireException { @@ -73,7 +73,7 @@ public void acquire() throws SignalAcquireException { * Signal is released after processing of the signal to bring the group resources to a state of availability Signal * should be madatorily released after recovery process is completed. * - * @throws com.sun.enterprise.ee.cms.core.SignalReleaseException Exception when unable to release the signal + * @throws org.glassfish.shoal.gms.api.core.SignalReleaseException Exception when unable to release the signal * */ public void release() throws SignalReleaseException { diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/GMSConfigConstants.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/GMSConfigConstants.java similarity index 97% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/GMSConfigConstants.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/common/GMSConfigConstants.java index a071564..586d9a7 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/GMSConfigConstants.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/GMSConfigConstants.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.common; +package org.glassfish.shoal.gms.common; /** * Configuration constants used to denote keys for configuration elements. These are used both to populate values for diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/GMSContext.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/GMSContext.java similarity index 86% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/GMSContext.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/common/GMSContext.java index 1d263ec..dea34d9 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/GMSContext.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/GMSContext.java @@ -14,21 +14,21 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.common; +package org.glassfish.shoal.gms.common; import java.util.List; import java.util.Map; import java.util.Set; -import com.sun.enterprise.ee.cms.core.AliveAndReadyView; -import com.sun.enterprise.ee.cms.core.DistributedStateCache; -import com.sun.enterprise.ee.cms.core.GMSConstants; -import com.sun.enterprise.ee.cms.core.GMSException; -import com.sun.enterprise.ee.cms.core.GroupHandle; -import com.sun.enterprise.ee.cms.core.GroupManagementService; -import com.sun.enterprise.ee.cms.core.RejoinSubevent; -import com.sun.enterprise.ee.cms.spi.GroupCommunicationProvider; -import com.sun.enterprise.ee.cms.spi.MemberStates; +import org.glassfish.shoal.gms.api.core.AliveAndReadyView; +import org.glassfish.shoal.gms.api.core.DistributedStateCache; +import org.glassfish.shoal.gms.api.core.GMSConstants; +import org.glassfish.shoal.gms.api.core.GMSException; +import org.glassfish.shoal.gms.api.core.GroupHandle; +import org.glassfish.shoal.gms.api.core.GroupManagementService; +import org.glassfish.shoal.gms.api.core.RejoinSubevent; +import org.glassfish.shoal.gms.api.spi.GroupCommunicationProvider; +import org.glassfish.shoal.gms.api.spi.MemberStates; /** * Provides contextual information about all useful GMS artifacts. These are GMS objects that are tied to a particular diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/GMSContextBase.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/GMSContextBase.java similarity index 93% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/GMSContextBase.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/common/GMSContextBase.java index 0e5ba8c..c0042dd 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/GMSContextBase.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/GMSContextBase.java @@ -14,14 +14,14 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.common; +package org.glassfish.shoal.gms.common; import java.util.ArrayList; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.GMSMember; -import com.sun.enterprise.ee.cms.core.GroupManagementService; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.api.core.GMSMember; +import org.glassfish.shoal.gms.api.core.GroupManagementService; +import org.glassfish.shoal.gms.logging.GMSLogDomain; /** * @author Shreedhar Ganapathy Date: Jan 31, 2006 diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/GMSContextFactory.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/GMSContextFactory.java similarity index 87% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/GMSContextFactory.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/common/GMSContextFactory.java index 8dd32e9..272d7f0 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/GMSContextFactory.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/GMSContextFactory.java @@ -14,15 +14,15 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.common; +package org.glassfish.shoal.gms.common; import java.util.HashMap; import java.util.Map; import java.util.Properties; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.GroupManagementService; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.api.core.GroupManagementService; +import org.glassfish.shoal.gms.logging.GMSLogDomain; /** * Produces and retains the GMSContext for the lifetime of the GMS instance @@ -43,7 +43,7 @@ static GMSContext produceGMSContext(final String serverToken, final String group final Properties properties) { GMSContext ctx; if ((ctx = ctxCache.get(groupName)) == null) { - ctx = new com.sun.enterprise.ee.cms.impl.base.GMSContextImpl(serverToken, groupName, memberType, properties); + ctx = new org.glassfish.shoal.gms.base.GMSContextImpl(serverToken, groupName, memberType, properties); ctxCache.put(groupName, ctx); } return ctx; diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/GMSMonitor.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/GMSMonitor.java similarity index 97% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/GMSMonitor.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/common/GMSMonitor.java index 0ffbcd8..f5d98e5 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/GMSMonitor.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/GMSMonitor.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.common; +package org.glassfish.shoal.gms.common; import java.lang.management.ManagementFactory; import java.util.Properties; @@ -34,9 +34,9 @@ import javax.management.ObjectName; import javax.management.StandardMBean; -import com.sun.enterprise.ee.cms.core.ServiceProviderConfigurationKeys; -import com.sun.enterprise.ee.cms.impl.base.Utility; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.api.core.ServiceProviderConfigurationKeys; +import org.glassfish.shoal.gms.base.Utility; +import org.glassfish.shoal.gms.logging.GMSLogDomain; /** * Lightweight monitoring solution. @@ -203,7 +203,7 @@ public void register() { if (mbs != null) { try { - mbeanObjectName = new ObjectName("com.sun.enterprise.ee.cms.impl.common.GMSMonitor.MessageStats" + ":name=" + gmsMonitor.groupName + "_" + mbeanObjectName = new ObjectName("org.glassfish.shoal.gms.common.GMSMonitor.MessageStats" + ":name=" + gmsMonitor.groupName + "_" + gmsMonitor.instanceName + "_" + targetComponent); gmsMonitor.mbs.registerMBean(new StandardMBean(this, GMSMessageStatsMBean.class), mbeanObjectName); diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/GroupLeadershipNotificationSignalImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/GroupLeadershipNotificationSignalImpl.java similarity index 90% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/GroupLeadershipNotificationSignalImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/common/GroupLeadershipNotificationSignalImpl.java index b1613ce..cc5b655 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/GroupLeadershipNotificationSignalImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/GroupLeadershipNotificationSignalImpl.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.common; +package org.glassfish.shoal.gms.common; import java.io.Serializable; import java.util.HashMap; @@ -23,12 +23,12 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.DistributedStateCache; -import com.sun.enterprise.ee.cms.core.GMSMember; -import com.sun.enterprise.ee.cms.core.GroupLeadershipNotificationSignal; -import com.sun.enterprise.ee.cms.core.SignalAcquireException; -import com.sun.enterprise.ee.cms.core.SignalReleaseException; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.api.core.DistributedStateCache; +import org.glassfish.shoal.gms.api.core.GMSMember; +import org.glassfish.shoal.gms.api.core.GroupLeadershipNotificationSignal; +import org.glassfish.shoal.gms.api.core.SignalAcquireException; +import org.glassfish.shoal.gms.api.core.SignalReleaseException; +import org.glassfish.shoal.gms.logging.GMSLogDomain; /** * Implements GroupLeadershipNotificationSignal diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/GroupManagementServiceImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/GroupManagementServiceImpl.java similarity index 93% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/GroupManagementServiceImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/common/GroupManagementServiceImpl.java index fcdd7a9..b03013e 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/GroupManagementServiceImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/GroupManagementServiceImpl.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.common; +package org.glassfish.shoal.gms.common; /** * Provides API for joining, and leaving the group and to register Action Factories of * specific types for specific Group Event Signals. @@ -33,21 +33,21 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.FailureNotificationActionFactory; -import com.sun.enterprise.ee.cms.core.FailureRecoveryActionFactory; -import com.sun.enterprise.ee.cms.core.FailureSuspectedActionFactory; -import com.sun.enterprise.ee.cms.core.GMSCacheable; -import com.sun.enterprise.ee.cms.core.GMSConstants; -import com.sun.enterprise.ee.cms.core.GMSException; -import com.sun.enterprise.ee.cms.core.GMSFactory; -import com.sun.enterprise.ee.cms.core.GroupHandle; -import com.sun.enterprise.ee.cms.core.GroupLeadershipNotificationActionFactory; -import com.sun.enterprise.ee.cms.core.GroupManagementService; -import com.sun.enterprise.ee.cms.core.JoinNotificationActionFactory; -import com.sun.enterprise.ee.cms.core.JoinedAndReadyNotificationActionFactory; -import com.sun.enterprise.ee.cms.core.MessageActionFactory; -import com.sun.enterprise.ee.cms.core.PlannedShutdownActionFactory; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.api.core.FailureNotificationActionFactory; +import org.glassfish.shoal.gms.api.core.FailureRecoveryActionFactory; +import org.glassfish.shoal.gms.api.core.FailureSuspectedActionFactory; +import org.glassfish.shoal.gms.api.core.GMSCacheable; +import org.glassfish.shoal.gms.api.core.GMSConstants; +import org.glassfish.shoal.gms.api.core.GMSException; +import org.glassfish.shoal.gms.api.core.GMSFactory; +import org.glassfish.shoal.gms.api.core.GroupHandle; +import org.glassfish.shoal.gms.api.core.GroupLeadershipNotificationActionFactory; +import org.glassfish.shoal.gms.api.core.GroupManagementService; +import org.glassfish.shoal.gms.api.core.JoinNotificationActionFactory; +import org.glassfish.shoal.gms.api.core.JoinedAndReadyNotificationActionFactory; +import org.glassfish.shoal.gms.api.core.MessageActionFactory; +import org.glassfish.shoal.gms.api.core.PlannedShutdownActionFactory; +import org.glassfish.shoal.gms.logging.GMSLogDomain; public class GroupManagementServiceImpl implements GroupManagementService, Runnable { private GMSContext ctx; @@ -316,7 +316,7 @@ public String getInstanceName() { * * @param serverToken - member token id for this member. * @param keyValuePairs - a Map containing key-value pairs - * @throws com.sun.enterprise.ee.cms.core.GMSException wraps underlying exception that caused adding of member details + * @throws org.glassfish.shoal.gms.api.core.GMSException wraps underlying exception that caused adding of member details * to fail. */ public void setMemberDetails(final String serverToken, final Map keyValuePairs) throws GMSException { @@ -468,6 +468,6 @@ private boolean isWatchdog() { } public int outstandingNotifications() { - return ((com.sun.enterprise.ee.cms.impl.base.GMSContextImpl) ctx).outstandingNotifications(); + return ((org.glassfish.shoal.gms.base.GMSContextImpl) ctx).outstandingNotifications(); } } diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/JoinNotificationSignalImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/JoinNotificationSignalImpl.java similarity index 87% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/JoinNotificationSignalImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/common/JoinNotificationSignalImpl.java index 409b4de..ae726b2 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/JoinNotificationSignalImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/JoinNotificationSignalImpl.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.common; +package org.glassfish.shoal.gms.common; import java.io.Serializable; import java.util.HashMap; @@ -23,15 +23,15 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.DistributedStateCache; -import com.sun.enterprise.ee.cms.core.GMSConstants; -import com.sun.enterprise.ee.cms.core.JoinNotificationSignal; -import com.sun.enterprise.ee.cms.core.RejoinSubevent; -import com.sun.enterprise.ee.cms.core.SignalAcquireException; -import com.sun.enterprise.ee.cms.core.SignalReleaseException; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; -import com.sun.enterprise.ee.cms.spi.GroupCommunicationProvider; -import com.sun.enterprise.ee.cms.spi.MemberStates; +import org.glassfish.shoal.gms.api.core.DistributedStateCache; +import org.glassfish.shoal.gms.api.core.GMSConstants; +import org.glassfish.shoal.gms.api.core.JoinNotificationSignal; +import org.glassfish.shoal.gms.api.core.RejoinSubevent; +import org.glassfish.shoal.gms.api.core.SignalAcquireException; +import org.glassfish.shoal.gms.api.core.SignalReleaseException; +import org.glassfish.shoal.gms.api.spi.GroupCommunicationProvider; +import org.glassfish.shoal.gms.api.spi.MemberStates; +import org.glassfish.shoal.gms.logging.GMSLogDomain; /** * Implementation of JoinNotificationSignal @@ -77,7 +77,7 @@ public JoinNotificationSignalImpl(final String memberToken, final List c * Signal is acquired prior to processing of the signal to protect group resources being acquired from being affected by * a race condition * - * @throws com.sun.enterprise.ee.cms.core.SignalAcquireException Exception when unable to aquire the signal + * @throws org.glassfish.shoal.gms.api.core.SignalAcquireException Exception when unable to aquire the signal * */ @Override @@ -88,7 +88,7 @@ public void acquire() throws SignalAcquireException { /** * Signal is released after processing of the signal to bring the group resources to a state of availability * - * @throws com.sun.enterprise.ee.cms.core.SignalReleaseException Exception when unable to release the signal + * @throws org.glassfish.shoal.gms.api.core.SignalReleaseException Exception when unable to release the signal */ @Override public void release() throws SignalReleaseException { diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/JoinedAndReadyNotificationSignalImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/JoinedAndReadyNotificationSignalImpl.java similarity index 88% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/JoinedAndReadyNotificationSignalImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/common/JoinedAndReadyNotificationSignalImpl.java index 58f68cc..4b7f461 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/JoinedAndReadyNotificationSignalImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/JoinedAndReadyNotificationSignalImpl.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.common; +package org.glassfish.shoal.gms.common; import java.io.Serializable; import java.util.HashMap; @@ -23,14 +23,14 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.AliveAndReadyView; -import com.sun.enterprise.ee.cms.core.DistributedStateCache; -import com.sun.enterprise.ee.cms.core.GMSConstants; -import com.sun.enterprise.ee.cms.core.JoinedAndReadyNotificationSignal; -import com.sun.enterprise.ee.cms.core.RejoinSubevent; -import com.sun.enterprise.ee.cms.core.SignalAcquireException; -import com.sun.enterprise.ee.cms.core.SignalReleaseException; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.api.core.AliveAndReadyView; +import org.glassfish.shoal.gms.api.core.DistributedStateCache; +import org.glassfish.shoal.gms.api.core.GMSConstants; +import org.glassfish.shoal.gms.api.core.JoinedAndReadyNotificationSignal; +import org.glassfish.shoal.gms.api.core.RejoinSubevent; +import org.glassfish.shoal.gms.api.core.SignalAcquireException; +import org.glassfish.shoal.gms.api.core.SignalReleaseException; +import org.glassfish.shoal.gms.logging.GMSLogDomain; /** * Implements JoinedAndReadyNotificationSignal @@ -84,7 +84,7 @@ public JoinedAndReadyNotificationSignalImpl(final String memberToken, final List * Signal is acquired prior to processing of the signal to protect group resources being acquired from being affected by * a race condition * - * @throws com.sun.enterprise.ee.cms.core.SignalAcquireException Exception when unable to acquire the signal + * @throws org.glassfish.shoal.gms.api.core.SignalAcquireException Exception when unable to acquire the signal * */ @Override @@ -95,7 +95,7 @@ public void acquire() throws SignalAcquireException { /** * Signal is released after processing of the signal to bring the group resources to a state of availability * - * @throws com.sun.enterprise.ee.cms.core.SignalReleaseException Exception when unable to release the signal + * @throws org.glassfish.shoal.gms.api.core.SignalReleaseException Exception when unable to release the signal * */ @Override diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/MessageSignalImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/MessageSignalImpl.java similarity index 87% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/MessageSignalImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/common/MessageSignalImpl.java index 9300b9b..12afaa5 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/MessageSignalImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/MessageSignalImpl.java @@ -14,15 +14,15 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.common; +package org.glassfish.shoal.gms.common; import java.io.Serializable; import java.util.Hashtable; import java.util.Map; -import com.sun.enterprise.ee.cms.core.MessageSignal; -import com.sun.enterprise.ee.cms.core.SignalAcquireException; -import com.sun.enterprise.ee.cms.core.SignalReleaseException; +import org.glassfish.shoal.gms.api.core.MessageSignal; +import org.glassfish.shoal.gms.api.core.SignalAcquireException; +import org.glassfish.shoal.gms.api.core.SignalReleaseException; /** * Implements MessageSignal and provides methods to access message sent by a remote member. @@ -67,7 +67,7 @@ public byte[] getMessage() { * Signal is acquired prior to processing of the signal to protect group resources being acquired from being affected by * a race condition * - * @throws com.sun.enterprise.ee.cms.core.SignalAcquireException Exception when unable to aquire the signal + * @throws org.glassfish.shoal.gms.api.core.SignalAcquireException Exception when unable to aquire the signal */ public void acquire() throws SignalAcquireException { } @@ -75,7 +75,7 @@ public void acquire() throws SignalAcquireException { /** * Signal is released after processing of the signal to bring the group resources to a state of availability * - * @throws com.sun.enterprise.ee.cms.core.SignalReleaseException Exception when unable to release the signal + * @throws org.glassfish.shoal.gms.api.core.SignalReleaseException Exception when unable to release the signal */ public void release() throws SignalReleaseException { // JMF: do not release message resources. diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/PlannedShutdownSignalImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/PlannedShutdownSignalImpl.java similarity index 86% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/PlannedShutdownSignalImpl.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/common/PlannedShutdownSignalImpl.java index 04415ff..1f47115 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/PlannedShutdownSignalImpl.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/PlannedShutdownSignalImpl.java @@ -14,18 +14,18 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.common; +package org.glassfish.shoal.gms.common; import java.io.Serializable; import java.util.Map; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.AliveAndReadyView; -import com.sun.enterprise.ee.cms.core.GMSConstants; -import com.sun.enterprise.ee.cms.core.PlannedShutdownSignal; -import com.sun.enterprise.ee.cms.core.SignalAcquireException; -import com.sun.enterprise.ee.cms.core.SignalReleaseException; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.api.core.AliveAndReadyView; +import org.glassfish.shoal.gms.api.core.GMSConstants; +import org.glassfish.shoal.gms.api.core.PlannedShutdownSignal; +import org.glassfish.shoal.gms.api.core.SignalAcquireException; +import org.glassfish.shoal.gms.api.core.SignalReleaseException; +import org.glassfish.shoal.gms.logging.GMSLogDomain; /** * Implementation of PlannedShutdownSignal. @@ -67,7 +67,7 @@ public PlannedShutdownSignalImpl(final String memberToken, final String groupNam * Signal is acquired prior to processing of the signal to protect group resources being acquired from being affected by * a race condition * - * @throws com.sun.enterprise.ee.cms.core.SignalAcquireException Exception when unable to aquire the signal + * @throws org.glassfish.shoal.gms.api.core.SignalAcquireException Exception when unable to aquire the signal * */ public void acquire() throws SignalAcquireException { @@ -77,7 +77,7 @@ public void acquire() throws SignalAcquireException { /** * Signal is released after processing of the signal to bring the group resources to a state of availability * - * @throws com.sun.enterprise.ee.cms.core.SignalReleaseException Exception when unable to release the signal + * @throws org.glassfish.shoal.gms.api.core.SignalReleaseException Exception when unable to release the signal * */ public void release() throws SignalReleaseException { @@ -115,7 +115,7 @@ public long getStartTime() { * Planned shutdown events can be one of two types, Group Shutdown or Instance Shutdown. These types are defined in an * enum in the class GMSConstants.shutdownType * - * @see com.sun.enterprise.ee.cms.core.GMSConstants + * @see org.glassfish.shoal.gms.api.core.GMSConstants * @return GMSConstants.shutdownType */ public GMSConstants.shutdownType getEventSubType() { diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/RecoverySelectorMode.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/RecoverySelectorMode.java similarity index 95% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/RecoverySelectorMode.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/common/RecoverySelectorMode.java index 727cbe2..b09be99 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/RecoverySelectorMode.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/RecoverySelectorMode.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.common; +package org.glassfish.shoal.gms.common; /** * diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/RecoveryTargetSelector.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/RecoveryTargetSelector.java similarity index 97% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/RecoveryTargetSelector.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/common/RecoveryTargetSelector.java index 6cd6d1c..13838ce 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/RecoveryTargetSelector.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/RecoveryTargetSelector.java @@ -16,7 +16,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.common; +package org.glassfish.shoal.gms.common; import java.util.ArrayList; import java.util.Hashtable; @@ -24,12 +24,12 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.DistributedStateCache; -import com.sun.enterprise.ee.cms.core.FailureRecoveryActionFactory; -import com.sun.enterprise.ee.cms.core.GMSException; -import com.sun.enterprise.ee.cms.core.GMSMember; -import com.sun.enterprise.ee.cms.core.GroupManagementService; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.api.core.DistributedStateCache; +import org.glassfish.shoal.gms.api.core.FailureRecoveryActionFactory; +import org.glassfish.shoal.gms.api.core.GMSException; +import org.glassfish.shoal.gms.api.core.GMSMember; +import org.glassfish.shoal.gms.api.core.GroupManagementService; +import org.glassfish.shoal.gms.logging.GMSLogDomain; /** * Uses a specified algorithm to determine a member that will be selected to handle recovery operations on failure of a diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/Router.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/Router.java similarity index 93% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/Router.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/common/Router.java index 1357ec1..5db8af9 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/Router.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/Router.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.common; +package org.glassfish.shoal.gms.common; import java.text.MessageFormat; import java.util.Hashtable; @@ -33,36 +33,36 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.Action; -import com.sun.enterprise.ee.cms.core.ActionException; -import com.sun.enterprise.ee.cms.core.FailureNotificationAction; -import com.sun.enterprise.ee.cms.core.FailureNotificationActionFactory; -import com.sun.enterprise.ee.cms.core.FailureNotificationSignal; -import com.sun.enterprise.ee.cms.core.FailureRecoveryAction; -import com.sun.enterprise.ee.cms.core.FailureRecoveryActionFactory; -import com.sun.enterprise.ee.cms.core.FailureRecoverySignal; -import com.sun.enterprise.ee.cms.core.FailureSuspectedAction; -import com.sun.enterprise.ee.cms.core.FailureSuspectedActionFactory; -import com.sun.enterprise.ee.cms.core.FailureSuspectedSignal; -import com.sun.enterprise.ee.cms.core.GroupLeadershipNotificationAction; -import com.sun.enterprise.ee.cms.core.GroupLeadershipNotificationActionFactory; -import com.sun.enterprise.ee.cms.core.GroupLeadershipNotificationSignal; -import com.sun.enterprise.ee.cms.core.GroupManagementService; -import com.sun.enterprise.ee.cms.core.JoinNotificationAction; -import com.sun.enterprise.ee.cms.core.JoinNotificationActionFactory; -import com.sun.enterprise.ee.cms.core.JoinNotificationSignal; -import com.sun.enterprise.ee.cms.core.JoinedAndReadyNotificationAction; -import com.sun.enterprise.ee.cms.core.JoinedAndReadyNotificationActionFactory; -import com.sun.enterprise.ee.cms.core.JoinedAndReadyNotificationSignal; -import com.sun.enterprise.ee.cms.core.MessageAction; -import com.sun.enterprise.ee.cms.core.MessageActionFactory; -import com.sun.enterprise.ee.cms.core.MessageSignal; -import com.sun.enterprise.ee.cms.core.PlannedShutdownAction; -import com.sun.enterprise.ee.cms.core.PlannedShutdownActionFactory; -import com.sun.enterprise.ee.cms.core.PlannedShutdownSignal; -import com.sun.enterprise.ee.cms.core.Signal; -import com.sun.enterprise.ee.cms.impl.base.GMSThreadFactory; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.api.core.Action; +import org.glassfish.shoal.gms.api.core.ActionException; +import org.glassfish.shoal.gms.api.core.FailureNotificationAction; +import org.glassfish.shoal.gms.api.core.FailureNotificationActionFactory; +import org.glassfish.shoal.gms.api.core.FailureNotificationSignal; +import org.glassfish.shoal.gms.api.core.FailureRecoveryAction; +import org.glassfish.shoal.gms.api.core.FailureRecoveryActionFactory; +import org.glassfish.shoal.gms.api.core.FailureRecoverySignal; +import org.glassfish.shoal.gms.api.core.FailureSuspectedAction; +import org.glassfish.shoal.gms.api.core.FailureSuspectedActionFactory; +import org.glassfish.shoal.gms.api.core.FailureSuspectedSignal; +import org.glassfish.shoal.gms.api.core.GroupLeadershipNotificationAction; +import org.glassfish.shoal.gms.api.core.GroupLeadershipNotificationActionFactory; +import org.glassfish.shoal.gms.api.core.GroupLeadershipNotificationSignal; +import org.glassfish.shoal.gms.api.core.GroupManagementService; +import org.glassfish.shoal.gms.api.core.JoinNotificationAction; +import org.glassfish.shoal.gms.api.core.JoinNotificationActionFactory; +import org.glassfish.shoal.gms.api.core.JoinNotificationSignal; +import org.glassfish.shoal.gms.api.core.JoinedAndReadyNotificationAction; +import org.glassfish.shoal.gms.api.core.JoinedAndReadyNotificationActionFactory; +import org.glassfish.shoal.gms.api.core.JoinedAndReadyNotificationSignal; +import org.glassfish.shoal.gms.api.core.MessageAction; +import org.glassfish.shoal.gms.api.core.MessageActionFactory; +import org.glassfish.shoal.gms.api.core.MessageSignal; +import org.glassfish.shoal.gms.api.core.PlannedShutdownAction; +import org.glassfish.shoal.gms.api.core.PlannedShutdownActionFactory; +import org.glassfish.shoal.gms.api.core.PlannedShutdownSignal; +import org.glassfish.shoal.gms.api.core.Signal; +import org.glassfish.shoal.gms.base.GMSThreadFactory; +import org.glassfish.shoal.gms.logging.GMSLogDomain; /** * Routes signals to appropriate destinations diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/ShutdownHelper.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/ShutdownHelper.java similarity index 98% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/ShutdownHelper.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/common/ShutdownHelper.java index 452c4be..71177ce 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/ShutdownHelper.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/ShutdownHelper.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.common; +package org.glassfish.shoal.gms.common; import java.util.ArrayList; import java.util.List; diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/SignalHandler.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/SignalHandler.java similarity index 88% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/SignalHandler.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/common/SignalHandler.java index 0726590..e72f225 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/SignalHandler.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/SignalHandler.java @@ -14,23 +14,23 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.common; +package org.glassfish.shoal.gms.common; import java.util.concurrent.BlockingQueue; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.FailureNotificationSignal; -import com.sun.enterprise.ee.cms.core.FailureRecoverySignal; -import com.sun.enterprise.ee.cms.core.FailureSuspectedSignal; -import com.sun.enterprise.ee.cms.core.GroupLeadershipNotificationSignal; -import com.sun.enterprise.ee.cms.core.JoinNotificationSignal; -import com.sun.enterprise.ee.cms.core.JoinedAndReadyNotificationSignal; -import com.sun.enterprise.ee.cms.core.MessageSignal; -import com.sun.enterprise.ee.cms.core.PlannedShutdownSignal; -import com.sun.enterprise.ee.cms.core.Signal; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.api.core.FailureNotificationSignal; +import org.glassfish.shoal.gms.api.core.FailureRecoverySignal; +import org.glassfish.shoal.gms.api.core.FailureSuspectedSignal; +import org.glassfish.shoal.gms.api.core.GroupLeadershipNotificationSignal; +import org.glassfish.shoal.gms.api.core.JoinNotificationSignal; +import org.glassfish.shoal.gms.api.core.JoinedAndReadyNotificationSignal; +import org.glassfish.shoal.gms.api.core.MessageSignal; +import org.glassfish.shoal.gms.api.core.PlannedShutdownSignal; +import org.glassfish.shoal.gms.api.core.Signal; +import org.glassfish.shoal.gms.logging.GMSLogDomain; /** * On a separate thread, analyses and handles the Signals delivered to it. Picks up signals from a BlockingQueue and diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/SignalPacket.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/SignalPacket.java similarity index 94% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/SignalPacket.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/common/SignalPacket.java index d052f1b..d5f63a3 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/SignalPacket.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/SignalPacket.java @@ -14,9 +14,9 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.common; +package org.glassfish.shoal.gms.common; -import com.sun.enterprise.ee.cms.core.Signal; +import org.glassfish.shoal.gms.api.core.Signal; /** * A packet containing the Signal(s) being delivered to the Router's signal queue. diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/ViewWindow.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/ViewWindow.java similarity index 93% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/ViewWindow.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/common/ViewWindow.java index 3365275..2a6847c 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/impl/common/ViewWindow.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/common/ViewWindow.java @@ -14,11 +14,11 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.impl.common; +package org.glassfish.shoal.gms.common; import java.util.List; -import com.sun.enterprise.ee.cms.core.GMSMember; +import org.glassfish.shoal.gms.api.core.GMSMember; /** * Caches Membership information for each snapshot so as to provide determination of failure, joins, and/or planned diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/logging/GMSLogDomain.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/logging/GMSLogDomain.java similarity index 92% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/logging/GMSLogDomain.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/logging/GMSLogDomain.java index c348385..ca7ecf3 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/logging/GMSLogDomain.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/logging/GMSLogDomain.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2026 Contributors to the Eclipse Foundation. * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -14,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.logging; +package org.glassfish.shoal.gms.logging; import java.util.logging.Logger; @@ -29,7 +30,7 @@ public class GMSLogDomain { public static final String GMS_LOGGER = "ShoalLogger"; - private static final String LOG_STRINGS = "com.sun.enterprise.ee.cms.logging.LogStrings"; + private static final String LOG_STRINGS = "org.glassfish.shoal.gms.logging.LogStrings"; private static final String GMS_MONITOR_LOGGER = GMS_LOGGER + ".monitor"; private static final String GMS_HANDLER_LOGGER = GMS_LOGGER + ".handler"; diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/logging/NiceLogFormatter.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/logging/NiceLogFormatter.java similarity index 99% rename from gms/impl/src/main/java/com/sun/enterprise/ee/cms/logging/NiceLogFormatter.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/logging/NiceLogFormatter.java index 16ac9eb..b7ad298 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/logging/NiceLogFormatter.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/logging/NiceLogFormatter.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.ee.cms.logging; +package org.glassfish.shoal.gms.logging; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/ClusterManager.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ClusterManager.java similarity index 95% rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/ClusterManager.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ClusterManager.java index b2cb32e..d412b97 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/ClusterManager.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ClusterManager.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.mgmt; +package org.glassfish.shoal.gms.mgmt; import java.io.IOException; import java.io.Serializable; @@ -26,24 +26,24 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.core.GMSConstants; -import com.sun.enterprise.ee.cms.core.GMSException; -import com.sun.enterprise.ee.cms.core.GroupManagementService; -import com.sun.enterprise.ee.cms.core.MemberNotInViewException; -import com.sun.enterprise.ee.cms.impl.base.CustomTagNames; -import com.sun.enterprise.ee.cms.impl.base.PeerID; -import com.sun.enterprise.ee.cms.impl.base.SystemAdvertisement; -import com.sun.enterprise.ee.cms.impl.base.SystemAdvertisementImpl; -import com.sun.enterprise.ee.cms.impl.base.Utility; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; -import com.sun.enterprise.mgmt.transport.AbstractNetworkManager; -import com.sun.enterprise.mgmt.transport.Message; -import com.sun.enterprise.mgmt.transport.MessageEvent; -import com.sun.enterprise.mgmt.transport.MessageIOException; -import com.sun.enterprise.mgmt.transport.MessageImpl; -import com.sun.enterprise.mgmt.transport.MessageListener; -import com.sun.enterprise.mgmt.transport.NetworkManager; -import com.sun.enterprise.mgmt.transport.NetworkUtility; +import org.glassfish.shoal.gms.api.core.GMSConstants; +import org.glassfish.shoal.gms.api.core.GMSException; +import org.glassfish.shoal.gms.api.core.GroupManagementService; +import org.glassfish.shoal.gms.api.core.MemberNotInViewException; +import org.glassfish.shoal.gms.base.CustomTagNames; +import org.glassfish.shoal.gms.base.PeerID; +import org.glassfish.shoal.gms.base.SystemAdvertisement; +import org.glassfish.shoal.gms.base.SystemAdvertisementImpl; +import org.glassfish.shoal.gms.base.Utility; +import org.glassfish.shoal.gms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.mgmt.transport.AbstractNetworkManager; +import org.glassfish.shoal.gms.mgmt.transport.Message; +import org.glassfish.shoal.gms.mgmt.transport.MessageEvent; +import org.glassfish.shoal.gms.mgmt.transport.MessageIOException; +import org.glassfish.shoal.gms.mgmt.transport.MessageImpl; +import org.glassfish.shoal.gms.mgmt.transport.MessageListener; +import org.glassfish.shoal.gms.mgmt.transport.NetworkManager; +import org.glassfish.shoal.gms.mgmt.transport.NetworkUtility; /** * The ClusterManager is the entry point for using the cluster management module which provides group communications and diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/ClusterMessageListener.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ClusterMessageListener.java similarity index 91% rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/ClusterMessageListener.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ClusterMessageListener.java index bd73fed..009a17b 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/ClusterMessageListener.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ClusterMessageListener.java @@ -14,9 +14,9 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.mgmt; +package org.glassfish.shoal.gms.mgmt; -import com.sun.enterprise.ee.cms.impl.base.SystemAdvertisement; +import org.glassfish.shoal.gms.base.SystemAdvertisement; /** * @author Shreedhar Ganapathy Date: Jul 10, 2006 diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/ClusterView.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ClusterView.java similarity index 97% rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/ClusterView.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ClusterView.java index 615f04c..396a279 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/ClusterView.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ClusterView.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.mgmt; +package org.glassfish.shoal.gms.mgmt; import java.text.MessageFormat; import java.util.ArrayList; @@ -25,9 +25,9 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.ee.cms.impl.base.PeerID; -import com.sun.enterprise.ee.cms.impl.base.SystemAdvertisement; -import com.sun.enterprise.ee.cms.logging.GMSLogDomain; +import org.glassfish.shoal.gms.base.PeerID; +import org.glassfish.shoal.gms.base.SystemAdvertisement; +import org.glassfish.shoal.gms.logging.GMSLogDomain; /** * ClusterView is a snapshot of the current membership of the group. The ClusterView is created anew each time a diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/ClusterViewEvent.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ClusterViewEvent.java similarity index 95% rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/ClusterViewEvent.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ClusterViewEvent.java index 5bdbc6a..cc091e0 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/ClusterViewEvent.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ClusterViewEvent.java @@ -14,11 +14,11 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.mgmt; +package org.glassfish.shoal.gms.mgmt; import java.io.Serializable; -import com.sun.enterprise.ee.cms.impl.base.SystemAdvertisement; +import org.glassfish.shoal.gms.base.SystemAdvertisement; /** * Denotes a Cluster View Change Event. Provides the event and the system advertisement in question. diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/ClusterViewEventListener.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ClusterViewEventListener.java similarity index 90% rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/ClusterViewEventListener.java rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ClusterViewEventListener.java index 92a783f..87c6cb3 100644 --- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/ClusterViewEventListener.java +++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ClusterViewEventListener.java @@ -14,14 +14,14 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.mgmt; +package org.glassfish.shoal.gms.mgmt; import java.util.EventListener; /** * The listener interface for receiving ClusterViewManager events. *

- * The following example illustrates how to implement a {@link com.sun.enterprise.mgmt.ClusterViewEventListener}: + * The following example illustrates how to implement a {@link org.glassfish.shoal.gms.mgmt.ClusterViewEventListener}: * * 

  * 
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/ClusterViewEvents.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ClusterViewEvents.java
similarity index 96%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/ClusterViewEvents.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ClusterViewEvents.java
index 26d2149..25b693c 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/ClusterViewEvents.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ClusterViewEvents.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt;
+package org.glassfish.shoal.gms.mgmt;
 
 /**
  * An enumeration of the type of events expected to be disseminated by the ClusterManagement layer to consuming
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/ClusterViewManager.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ClusterViewManager.java
similarity index 97%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/ClusterViewManager.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ClusterViewManager.java
index fa6b9e1..c22aa80 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/ClusterViewManager.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ClusterViewManager.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt;
+package org.glassfish.shoal.gms.mgmt;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -27,16 +27,16 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.sun.enterprise.ee.cms.core.GMSMember;
-import com.sun.enterprise.ee.cms.core.RejoinSubevent;
-import com.sun.enterprise.ee.cms.impl.base.CustomTagNames;
-import com.sun.enterprise.ee.cms.impl.base.PeerID;
-import com.sun.enterprise.ee.cms.impl.base.SystemAdvertisement;
-import com.sun.enterprise.ee.cms.impl.base.Utility;
-import com.sun.enterprise.ee.cms.impl.client.RejoinSubeventImpl;
-import com.sun.enterprise.ee.cms.impl.common.GMSContext;
-import com.sun.enterprise.ee.cms.impl.common.GMSContextFactory;
-import com.sun.enterprise.ee.cms.logging.GMSLogDomain;
+import org.glassfish.shoal.gms.api.core.GMSMember;
+import org.glassfish.shoal.gms.api.core.RejoinSubevent;
+import org.glassfish.shoal.gms.base.CustomTagNames;
+import org.glassfish.shoal.gms.base.PeerID;
+import org.glassfish.shoal.gms.base.SystemAdvertisement;
+import org.glassfish.shoal.gms.base.Utility;
+import org.glassfish.shoal.gms.client.RejoinSubeventImpl;
+import org.glassfish.shoal.gms.common.GMSContext;
+import org.glassfish.shoal.gms.common.GMSContextFactory;
+import org.glassfish.shoal.gms.logging.GMSLogDomain;
 
 /**
  * Manages Cluster Views and notifies cluster view listeners when cluster view changes
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/ConfigConstants.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ConfigConstants.java
similarity index 97%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/ConfigConstants.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ConfigConstants.java
index 906002c..f86daff 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/ConfigConstants.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ConfigConstants.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt;
+package org.glassfish.shoal.gms.mgmt;
 
 /**
  * Specifies constants that are allowed to be used as keys for configuration elements that are sought to be set or
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/HealthMessage.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/HealthMessage.java
similarity index 94%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/HealthMessage.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/HealthMessage.java
index ddbb6fb..ffc24ee 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/HealthMessage.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/HealthMessage.java
@@ -14,22 +14,22 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt;
+package org.glassfish.shoal.gms.mgmt;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
 
-import com.sun.enterprise.ee.cms.impl.base.PeerID;
-import com.sun.enterprise.ee.cms.impl.base.SystemAdvertisement;
-import com.sun.enterprise.ee.cms.impl.base.Utility;
-import com.sun.enterprise.ee.cms.logging.GMSLogDomain;
+import org.glassfish.shoal.gms.base.PeerID;
+import org.glassfish.shoal.gms.base.SystemAdvertisement;
+import org.glassfish.shoal.gms.base.Utility;
+import org.glassfish.shoal.gms.logging.GMSLogDomain;
 
 /**
  * This class contains health states of members
  *
- * {@link com.sun.enterprise.mgmt.HealthMonitor} uses this messages to check the member's health.
+ * {@link org.glassfish.shoal.gms.mgmt.HealthMonitor} uses this messages to check the member's health.
  */
 public class HealthMessage implements Serializable {
 
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/HealthMonitor.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/HealthMonitor.java
similarity index 99%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/HealthMonitor.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/HealthMonitor.java
index cbc0bda..7ba4890 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/HealthMonitor.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/HealthMonitor.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt;
+package org.glassfish.shoal.gms.mgmt;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
@@ -44,17 +44,17 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.sun.enterprise.ee.cms.core.GMSMember;
-import com.sun.enterprise.ee.cms.impl.base.GMSThreadFactory;
-import com.sun.enterprise.ee.cms.impl.base.PeerID;
-import com.sun.enterprise.ee.cms.impl.base.SystemAdvertisement;
-import com.sun.enterprise.ee.cms.impl.base.Utility;
-import com.sun.enterprise.ee.cms.logging.GMSLogDomain;
-import com.sun.enterprise.mgmt.transport.Message;
-import com.sun.enterprise.mgmt.transport.MessageEvent;
-import com.sun.enterprise.mgmt.transport.MessageIOException;
-import com.sun.enterprise.mgmt.transport.MessageImpl;
-import com.sun.enterprise.mgmt.transport.MessageListener;
+import org.glassfish.shoal.gms.api.core.GMSMember;
+import org.glassfish.shoal.gms.base.GMSThreadFactory;
+import org.glassfish.shoal.gms.base.PeerID;
+import org.glassfish.shoal.gms.base.SystemAdvertisement;
+import org.glassfish.shoal.gms.base.Utility;
+import org.glassfish.shoal.gms.logging.GMSLogDomain;
+import org.glassfish.shoal.gms.mgmt.transport.Message;
+import org.glassfish.shoal.gms.mgmt.transport.MessageEvent;
+import org.glassfish.shoal.gms.mgmt.transport.MessageIOException;
+import org.glassfish.shoal.gms.mgmt.transport.MessageImpl;
+import org.glassfish.shoal.gms.mgmt.transport.MessageListener;
 
 /**
  * HealthMonitor utilizes MasterNode to determine self designation. All nodes cache other node's states, and can act as
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/LWRMulticast.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/LWRMulticast.java
similarity index 96%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/LWRMulticast.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/LWRMulticast.java
index 55cbcd5..5d37c4f 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/LWRMulticast.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/LWRMulticast.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt;
+package org.glassfish.shoal.gms.mgmt;
 
 import java.io.IOException;
 import java.net.SocketTimeoutException;
@@ -25,15 +25,15 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.sun.enterprise.ee.cms.impl.base.PeerID;
-import com.sun.enterprise.mgmt.transport.Message;
-import com.sun.enterprise.mgmt.transport.MessageEvent;
-import com.sun.enterprise.mgmt.transport.MessageIOException;
-import com.sun.enterprise.mgmt.transport.MessageImpl;
-import com.sun.enterprise.mgmt.transport.MessageListener;
-import com.sun.enterprise.mgmt.transport.MessageSender;
-import com.sun.enterprise.mgmt.transport.MulticastMessageSender;
-import com.sun.enterprise.mgmt.transport.ShoalMessageSender;
+import org.glassfish.shoal.gms.base.PeerID;
+import org.glassfish.shoal.gms.mgmt.transport.Message;
+import org.glassfish.shoal.gms.mgmt.transport.MessageEvent;
+import org.glassfish.shoal.gms.mgmt.transport.MessageIOException;
+import org.glassfish.shoal.gms.mgmt.transport.MessageImpl;
+import org.glassfish.shoal.gms.mgmt.transport.MessageListener;
+import org.glassfish.shoal.gms.mgmt.transport.MessageSender;
+import org.glassfish.shoal.gms.mgmt.transport.MulticastMessageSender;
+import org.glassfish.shoal.gms.mgmt.transport.ShoalMessageSender;
 
 /**
  * The LWRMulticast class is useful for sending and receiving JXTA multicast messages. A LWRMulticast is a (UDP)
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/MasterNode.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/MasterNode.java
similarity index 98%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/MasterNode.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/MasterNode.java
index 23564fa..28f1541 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/MasterNode.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/MasterNode.java
@@ -16,12 +16,12 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt;
+package org.glassfish.shoal.gms.mgmt;
 
-import static com.sun.enterprise.ee.cms.core.ServiceProviderConfigurationKeys.DISCOVERY_URI_LIST;
-import static com.sun.enterprise.ee.cms.core.ServiceProviderConfigurationKeys.VIRTUAL_MULTICAST_URI_LIST;
-import static com.sun.enterprise.mgmt.ClusterViewEvents.ADD_EVENT;
-import static com.sun.enterprise.mgmt.ClusterViewEvents.JOINED_AND_READY_EVENT;
+import static org.glassfish.shoal.gms.api.core.ServiceProviderConfigurationKeys.DISCOVERY_URI_LIST;
+import static org.glassfish.shoal.gms.api.core.ServiceProviderConfigurationKeys.VIRTUAL_MULTICAST_URI_LIST;
+import static org.glassfish.shoal.gms.mgmt.ClusterViewEvents.ADD_EVENT;
+import static org.glassfish.shoal.gms.mgmt.ClusterViewEvents.JOINED_AND_READY_EVENT;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -44,23 +44,23 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.sun.enterprise.ee.cms.core.GMSConstants;
-import com.sun.enterprise.ee.cms.core.GMSMember;
-import com.sun.enterprise.ee.cms.core.RejoinSubevent;
-import com.sun.enterprise.ee.cms.impl.base.CustomTagNames;
-import com.sun.enterprise.ee.cms.impl.base.GMSThreadFactory;
-import com.sun.enterprise.ee.cms.impl.base.PeerID;
-import com.sun.enterprise.ee.cms.impl.base.SystemAdvertisement;
-import com.sun.enterprise.ee.cms.impl.base.Utility;
-import com.sun.enterprise.ee.cms.impl.common.GMSContext;
-import com.sun.enterprise.ee.cms.impl.common.GMSContextFactory;
-import com.sun.enterprise.ee.cms.logging.GMSLogDomain;
-import com.sun.enterprise.ee.cms.spi.MemberStates;
-import com.sun.enterprise.mgmt.transport.Message;
-import com.sun.enterprise.mgmt.transport.MessageEvent;
-import com.sun.enterprise.mgmt.transport.MessageIOException;
-import com.sun.enterprise.mgmt.transport.MessageImpl;
-import com.sun.enterprise.mgmt.transport.MessageListener;
+import org.glassfish.shoal.gms.api.core.GMSConstants;
+import org.glassfish.shoal.gms.api.core.GMSMember;
+import org.glassfish.shoal.gms.api.core.RejoinSubevent;
+import org.glassfish.shoal.gms.api.spi.MemberStates;
+import org.glassfish.shoal.gms.base.CustomTagNames;
+import org.glassfish.shoal.gms.base.GMSThreadFactory;
+import org.glassfish.shoal.gms.base.PeerID;
+import org.glassfish.shoal.gms.base.SystemAdvertisement;
+import org.glassfish.shoal.gms.base.Utility;
+import org.glassfish.shoal.gms.common.GMSContext;
+import org.glassfish.shoal.gms.common.GMSContextFactory;
+import org.glassfish.shoal.gms.logging.GMSLogDomain;
+import org.glassfish.shoal.gms.mgmt.transport.Message;
+import org.glassfish.shoal.gms.mgmt.transport.MessageEvent;
+import org.glassfish.shoal.gms.mgmt.transport.MessageIOException;
+import org.glassfish.shoal.gms.mgmt.transport.MessageImpl;
+import org.glassfish.shoal.gms.mgmt.transport.MessageListener;
 
 /**
  * Master Node defines a protocol by which a set of nodes connected to a JXTA infrastructure group may dynamically
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/ReliableMulticast.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ReliableMulticast.java
similarity index 96%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/ReliableMulticast.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ReliableMulticast.java
index 0779ef1..60d8680 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/ReliableMulticast.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/ReliableMulticast.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt;
+package org.glassfish.shoal.gms.mgmt;
 
 import java.io.IOException;
 import java.util.Set;
@@ -25,10 +25,10 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.sun.enterprise.ee.cms.impl.base.PeerID;
-import com.sun.enterprise.ee.cms.logging.GMSLogDomain;
-import com.sun.enterprise.mgmt.transport.Message;
-import com.sun.enterprise.mgmt.transport.MulticastMessageSender;
+import org.glassfish.shoal.gms.base.PeerID;
+import org.glassfish.shoal.gms.logging.GMSLogDomain;
+import org.glassfish.shoal.gms.mgmt.transport.Message;
+import org.glassfish.shoal.gms.mgmt.transport.MulticastMessageSender;
 
 public class ReliableMulticast {
     private static final Logger logger = GMSLogDomain.getMcastLogger();
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/AbstractMessageSender.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/AbstractMessageSender.java
similarity index 96%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/AbstractMessageSender.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/AbstractMessageSender.java
index ea7e9a3..2dfdd5a 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/AbstractMessageSender.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/AbstractMessageSender.java
@@ -14,11 +14,11 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport;
+package org.glassfish.shoal.gms.mgmt.transport;
 
 import java.io.IOException;
 
-import com.sun.enterprise.ee.cms.impl.base.PeerID;
+import org.glassfish.shoal.gms.base.PeerID;
 
 /**
  * This class implements a common {@link MessageSender} logic simply in order to help the specific transport layer to be
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/AbstractMultiMessageSender.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/AbstractMultiMessageSender.java
similarity index 97%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/AbstractMultiMessageSender.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/AbstractMultiMessageSender.java
index 25896f8..8c7e5de 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/AbstractMultiMessageSender.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/AbstractMultiMessageSender.java
@@ -14,11 +14,11 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport;
+package org.glassfish.shoal.gms.mgmt.transport;
 
 import java.io.IOException;
 
-import com.sun.enterprise.ee.cms.impl.base.PeerID;
+import org.glassfish.shoal.gms.base.PeerID;
 
 /**
  * This class implements both a common {@link MulticastMessageSender} and {@link MessageSender} logic simply in order to
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/AbstractMulticastMessageSender.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/AbstractMulticastMessageSender.java
similarity index 96%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/AbstractMulticastMessageSender.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/AbstractMulticastMessageSender.java
index 82b5199..311ced3 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/AbstractMulticastMessageSender.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/AbstractMulticastMessageSender.java
@@ -14,11 +14,11 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport;
+package org.glassfish.shoal.gms.mgmt.transport;
 
 import java.io.IOException;
 
-import com.sun.enterprise.ee.cms.impl.base.PeerID;
+import org.glassfish.shoal.gms.base.PeerID;
 
 /**
  * This class implements a common {@link MulticastMessageSender} logic simply in order to help the specific transport
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/AbstractNetworkManager.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/AbstractNetworkManager.java
similarity index 94%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/AbstractNetworkManager.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/AbstractNetworkManager.java
index 8075f74..ca1dd4a 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/AbstractNetworkManager.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/AbstractNetworkManager.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport;
+package org.glassfish.shoal.gms.mgmt.transport;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -25,11 +25,11 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.sun.enterprise.ee.cms.core.GMSConstants;
-import com.sun.enterprise.ee.cms.core.ServiceProviderConfigurationKeys;
-import com.sun.enterprise.ee.cms.impl.base.PeerID;
-import com.sun.enterprise.ee.cms.impl.base.Utility;
-import com.sun.enterprise.ee.cms.logging.GMSLogDomain;
+import org.glassfish.shoal.gms.api.core.GMSConstants;
+import org.glassfish.shoal.gms.api.core.ServiceProviderConfigurationKeys;
+import org.glassfish.shoal.gms.base.PeerID;
+import org.glassfish.shoal.gms.base.Utility;
+import org.glassfish.shoal.gms.logging.GMSLogDomain;
 
 /**
  * This class implements a common {@link NetworkManager} logic simply in order to help the specific transport layer to
@@ -206,11 +206,11 @@ public static NetworkManager getInstance(String transport) {
         }
         if (networkManager == null) {
             String classname = null;
-            final String GRIZZLY_TRANSPORT_BASE_DIR = "com.sun.enterprise.mgmt.transport.grizzly.";
+            final String GRIZZLY_TRANSPORT_BASE_DIR = "org.glassfish.shoal.gms.mgmt.transport.grizzly.";
             if (transport.startsWith("grizzly2")) {
                 classname = GRIZZLY_TRANSPORT_BASE_DIR + transport + ".GrizzlyNetworkManager2";
             } else {
-                classname = "com.sun.enterprise.mgmt.transport.jxta.JxtaNetworkManager";
+                classname = "org.glassfish.shoal.gms.mgmt.transport.jxta.JxtaNetworkManager";
             }
             networkManager = findByClassLoader(classname);
         }
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/ArrayUtils.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/ArrayUtils.java
similarity index 96%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/ArrayUtils.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/ArrayUtils.java
index 259d00f..c526785 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/ArrayUtils.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/ArrayUtils.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport;
+package org.glassfish.shoal.gms.mgmt.transport;
 
 /**
  * Set of utility methods to work with Arrays.
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/BlockingIOMulticastSender.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/BlockingIOMulticastSender.java
similarity index 98%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/BlockingIOMulticastSender.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/BlockingIOMulticastSender.java
index fba57b9..3c76780 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/BlockingIOMulticastSender.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/BlockingIOMulticastSender.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport;
+package org.glassfish.shoal.gms.mgmt.transport;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
@@ -32,9 +32,9 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.sun.enterprise.ee.cms.core.GMSConstants;
-import com.sun.enterprise.ee.cms.impl.base.PeerID;
-import com.sun.enterprise.ee.cms.logging.GMSLogDomain;
+import org.glassfish.shoal.gms.api.core.GMSConstants;
+import org.glassfish.shoal.gms.base.PeerID;
+import org.glassfish.shoal.gms.logging.GMSLogDomain;
 
 /**
  * This class is a default {@link MulticastMessageSender}'s implementation and extends
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/Message.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/Message.java
similarity index 88%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/Message.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/Message.java
index 456b7f6..af83498 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/Message.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/Message.java
@@ -14,15 +14,15 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport;
+package org.glassfish.shoal.gms.mgmt.transport;
 
 import java.io.Serializable;
 import java.nio.ByteBuffer;
 import java.util.Map;
 import java.util.Set;
 
-import com.sun.enterprise.mgmt.transport.buffers.Buffer;
-import com.sun.enterprise.mgmt.transport.buffers.ExpandableBufferWriterFactory;
+import org.glassfish.shoal.gms.mgmt.transport.buffers.Buffer;
+import org.glassfish.shoal.gms.mgmt.transport.buffers.ExpandableBufferWriterFactory;
 
 /**
  * This represents internal message interface which is sent and received on the top of Shoal management module
@@ -33,7 +33,7 @@
  * doesn't need it.
  *
  * This message can contain various elements with key-value pair. i.g. For the purpose of storing a source's
- * {@link com.sun.enterprise.ee.cms.impl.base.PeerID} from which the message is sent, SOURCE_PEER_ID_TAG
+ * {@link org.glassfish.shoal.gms.base.PeerID} from which the message is sent, SOURCE_PEER_ID_TAG
  * key is used.
  *
  * @author Bongjae Chang
@@ -43,30 +43,30 @@ public interface Message extends Serializable {
     long serialVersionUID = -8835127468511258700L;
 
     /**
-     * The type of the {@link com.sun.enterprise.mgmt.ClusterManager} message
+     * The type of the {@link org.glassfish.shoal.gms.mgmt.ClusterManager} message
      */
     int TYPE_CLUSTER_MANAGER_MESSAGE = 1;
 
     /**
-     * The type of {@link com.sun.enterprise.mgmt.HealthMonitor}'s message
+     * The type of {@link org.glassfish.shoal.gms.mgmt.HealthMonitor}'s message
      *
-     * Currently, {@link com.sun.enterprise.mgmt.HealthMessage} will be used for message elements
+     * Currently, {@link org.glassfish.shoal.gms.mgmt.HealthMessage} will be used for message elements
      */
     int TYPE_HEALTH_MONITOR_MESSAGE = 2;
 
     /**
-     * The type of the com.sun.enterprise.mgmt.MasterNode message
+     * The type of the org.glassfish.shoal.gms.mgmt.MasterNode message
      */
     int TYPE_MASTER_NODE_MESSAGE = 3;
 
     /**
-     * The type of the {@link com.sun.enterprise.mgmt.LWRMulticast} message
+     * The type of the {@link org.glassfish.shoal.gms.mgmt.LWRMulticast} message
      */
     int TYPE_MCAST_MESSAGE = 4;
 
     /**
      * Currently, this type is used in only Grizzly transport layer when
-     * {@link NetworkManager#isConnected(com.sun.enterprise.ee.cms.impl.base.PeerID)} send the ping message to suspicious
+     * {@link NetworkManager#isConnected(org.glassfish.shoal.gms.base.PeerID)} send the ping message to suspicious
      * member
      */
     int TYPE_PING_MESSAGE = 5;
@@ -78,12 +78,12 @@ public interface Message extends Serializable {
     int TYPE_PONG_MESSAGE = 6;
 
     /**
-     * The element's key for storing and getting source's {@link com.sun.enterprise.ee.cms.impl.base.PeerID}
+     * The element's key for storing and getting source's {@link org.glassfish.shoal.gms.base.PeerID}
      */
     String SOURCE_PEER_ID_TAG = "sourcePeerId";
 
     /**
-     * The element's key for storing and getting destination's {@link com.sun.enterprise.ee.cms.impl.base.PeerID}
+     * The element's key for storing and getting destination's {@link org.glassfish.shoal.gms.base.PeerID}
      */
     String TARGET_PEER_ID_TAG = "targetPeerId";
 
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/MessageEvent.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/MessageEvent.java
similarity index 96%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/MessageEvent.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/MessageEvent.java
index 05228da..79da9d3 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/MessageEvent.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/MessageEvent.java
@@ -14,11 +14,11 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport;
+package org.glassfish.shoal.gms.mgmt.transport;
 
 import java.util.EventObject;
 
-import com.sun.enterprise.ee.cms.impl.base.PeerID;
+import org.glassfish.shoal.gms.base.PeerID;
 
 /**
  * This class represents a received message event
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/MessageIOException.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/MessageIOException.java
similarity index 96%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/MessageIOException.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/MessageIOException.java
index 1ddeec1..444e911 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/MessageIOException.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/MessageIOException.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport;
+package org.glassfish.shoal.gms.mgmt.transport;
 
 import java.io.IOException;
 
@@ -25,7 +25,7 @@
  */
 public class MessageIOException extends IOException {
 
-   
+
     private static final long serialVersionUID = -3243045948393446810L;
 
     public MessageIOException(String msg) {
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/MessageImpl.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/MessageImpl.java
similarity index 96%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/MessageImpl.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/MessageImpl.java
index 8f34596..8ee371b 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/MessageImpl.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/MessageImpl.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport;
+package org.glassfish.shoal.gms.mgmt.transport;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -32,16 +32,16 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.sun.enterprise.ee.cms.impl.common.GMSContext;
-import com.sun.enterprise.ee.cms.impl.common.GMSContextFactory;
-import com.sun.enterprise.ee.cms.impl.common.GMSMonitor;
-import com.sun.enterprise.ee.cms.logging.GMSLogDomain;
-import com.sun.enterprise.ee.cms.spi.GMSMessage;
-import com.sun.enterprise.mgmt.transport.buffers.Buffer;
-import com.sun.enterprise.mgmt.transport.buffers.BufferInputStream;
-import com.sun.enterprise.mgmt.transport.buffers.BufferUtils;
-import com.sun.enterprise.mgmt.transport.buffers.ExpandableBufferWriter;
-import com.sun.enterprise.mgmt.transport.buffers.ExpandableBufferWriterFactory;
+import org.glassfish.shoal.gms.api.spi.GMSMessage;
+import org.glassfish.shoal.gms.common.GMSContext;
+import org.glassfish.shoal.gms.common.GMSContextFactory;
+import org.glassfish.shoal.gms.common.GMSMonitor;
+import org.glassfish.shoal.gms.logging.GMSLogDomain;
+import org.glassfish.shoal.gms.mgmt.transport.buffers.Buffer;
+import org.glassfish.shoal.gms.mgmt.transport.buffers.BufferInputStream;
+import org.glassfish.shoal.gms.mgmt.transport.buffers.BufferUtils;
+import org.glassfish.shoal.gms.mgmt.transport.buffers.ExpandableBufferWriter;
+import org.glassfish.shoal.gms.mgmt.transport.buffers.ExpandableBufferWriterFactory;
 
 /**
  * This is a default {@link Message}'s implementation
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/MessageListener.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/MessageListener.java
similarity index 91%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/MessageListener.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/MessageListener.java
index 125d5e3..c29a516 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/MessageListener.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/MessageListener.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport;
+package org.glassfish.shoal.gms.mgmt.transport;
 
 import java.util.EventListener;
 
@@ -24,7 +24,7 @@
  * For receiving and processing inbound messages, this listener should be registered on {@link NetworkManager} with
  * corresponding to the appropriate message type i.g. For adding the listener, use
  * {@link NetworkManager#addMessageListener(MessageListener)}} and for removing the listener, use
- * {@link com.sun.enterprise.mgmt.transport.NetworkManager#removeMessageListener(MessageListener)}
+ * {@link org.glassfish.shoal.gms.mgmt.transport.NetworkManager#removeMessageListener(MessageListener)}
  *
  * @author Bongjae Chang
  */
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/MessageSender.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/MessageSender.java
similarity index 94%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/MessageSender.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/MessageSender.java
index bb568ea..e11c226 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/MessageSender.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/MessageSender.java
@@ -14,11 +14,11 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport;
+package org.glassfish.shoal.gms.mgmt.transport;
 
 import java.io.IOException;
 
-import com.sun.enterprise.ee.cms.impl.base.PeerID;
+import org.glassfish.shoal.gms.base.PeerID;
 
 /**
  * This interface is for sending a {@link Message} to the specific destination
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/MulticastMessageSender.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/MulticastMessageSender.java
similarity index 96%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/MulticastMessageSender.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/MulticastMessageSender.java
index f6ab6a3..de9875d 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/MulticastMessageSender.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/MulticastMessageSender.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport;
+package org.glassfish.shoal.gms.mgmt.transport;
 
 import java.io.IOException;
 
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/NetworkManager.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/NetworkManager.java
similarity index 86%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/NetworkManager.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/NetworkManager.java
index 7d8084a..543afc8 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/NetworkManager.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/NetworkManager.java
@@ -14,20 +14,20 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport;
+package org.glassfish.shoal.gms.mgmt.transport;
 
 import java.io.IOException;
 import java.util.Map;
 
-import com.sun.enterprise.ee.cms.impl.base.PeerID;
+import org.glassfish.shoal.gms.base.PeerID;
 
 /**
  * This interface has common APIs for network managements
  *
  * According to a kind of transport layers, this interface will be implemented adequately. Currently,
- * {@link com.sun.enterprise.mgmt.ClusterManager} initializes this with calling
+ * {@link org.glassfish.shoal.gms.mgmt.ClusterManager} initializes this with calling
  * {@link NetworkManager#initialize(String, String, java.util.Map)}. After initialization,
- * {@link com.sun.enterprise.mgmt.transport.NetworkManager#start()} ) will be called.
+ * {@link org.glassfish.shoal.gms.mgmt.transport.NetworkManager#start()} ) will be called.
  *
  * @author Bongjae Chang
  */
@@ -47,7 +47,7 @@ public interface NetworkManager extends MulticastMessageSender, MessageSender {
      * Starts this network manager
      *
      * This method will be called after
-     * {@link com.sun.enterprise.mgmt.transport.NetworkManager#initialize(String, String, java.util.Map)} internally
+     * {@link org.glassfish.shoal.gms.mgmt.transport.NetworkManager#initialize(String, String, java.util.Map)} internally
      *
      * @throws IOException if an I/O error occurs
      */
@@ -63,14 +63,14 @@ public interface NetworkManager extends MulticastMessageSender, MessageSender {
     void stop() throws IOException;
 
     /**
-     * Adds the {@link com.sun.enterprise.mgmt.transport.MessageListener}
+     * Adds the {@link org.glassfish.shoal.gms.mgmt.transport.MessageListener}
      *
      * @param messageListener a message listener which should be registered on this network manager
      */
     void addMessageListener(final MessageListener messageListener);
 
     /**
-     * Removes the {@link com.sun.enterprise.mgmt.transport.MessageListener}
+     * Removes the {@link org.glassfish.shoal.gms.mgmt.transport.MessageListener}
      *
      * @param messageListener a message listener which should be removed
      */
@@ -119,7 +119,7 @@ public interface NetworkManager extends MulticastMessageSender, MessageSender {
     /**
      * Check whether the suspicious peer is alive or not
      *
-     * This API is mainly used in {@link com.sun.enterprise.mgmt.HealthMonitor} in order to determine the failure member
+     * This API is mainly used in {@link org.glassfish.shoal.gms.mgmt.HealthMonitor} in order to determine the failure member
      *
      * @param peerID peer id
      * @return true if the peer is still alive, otherwise false
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/NetworkUtility.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/NetworkUtility.java
similarity index 99%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/NetworkUtility.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/NetworkUtility.java
index 2a649e3..84f7ba9 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/NetworkUtility.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/NetworkUtility.java
@@ -15,9 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport;
-
-import com.sun.enterprise.ee.cms.logging.GMSLogDomain;
+package org.glassfish.shoal.gms.mgmt.transport;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -41,6 +39,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.glassfish.shoal.gms.logging.GMSLogDomain;
+
 /**
  * Utility class that can be used by any calling code to do common routines about Network I/O
  *
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/ShoalMessageSender.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/ShoalMessageSender.java
similarity index 95%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/ShoalMessageSender.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/ShoalMessageSender.java
index de24f22..ded1e6e 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/ShoalMessageSender.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/ShoalMessageSender.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport;
+package org.glassfish.shoal.gms.mgmt.transport;
 
 import java.io.IOException;
 
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/VirtualMulticastSender.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/VirtualMulticastSender.java
similarity index 97%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/VirtualMulticastSender.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/VirtualMulticastSender.java
index 16e2e50..ec4e3c4 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/VirtualMulticastSender.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/VirtualMulticastSender.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport;
+package org.glassfish.shoal.gms.mgmt.transport;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -27,8 +27,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.sun.enterprise.ee.cms.impl.base.PeerID;
-import com.sun.enterprise.ee.cms.logging.GMSLogDomain;
+import org.glassfish.shoal.gms.base.PeerID;
+import org.glassfish.shoal.gms.logging.GMSLogDomain;
 
 /**
  * This class extends {@link BlockingIOMulticastSender} for supporting the circumstance that cluster members are located
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/buffers/Buffer.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/buffers/Buffer.java
similarity index 99%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/buffers/Buffer.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/buffers/Buffer.java
index bae7cea..cfd5cec 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/buffers/Buffer.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/buffers/Buffer.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport.buffers;
+package org.glassfish.shoal.gms.mgmt.transport.buffers;
 
 import java.nio.charset.Charset;
 
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/buffers/BufferInputStream.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/buffers/BufferInputStream.java
similarity index 96%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/buffers/BufferInputStream.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/buffers/BufferInputStream.java
index b9e4304..1724244 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/buffers/BufferInputStream.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/buffers/BufferInputStream.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport.buffers;
+package org.glassfish.shoal.gms.mgmt.transport.buffers;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/buffers/BufferUtils.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/buffers/BufferUtils.java
similarity index 99%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/buffers/BufferUtils.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/buffers/BufferUtils.java
index 57504c0..d1a2666 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/buffers/BufferUtils.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/buffers/BufferUtils.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport.buffers;
+package org.glassfish.shoal.gms.mgmt.transport.buffers;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.BufferOverflowException;
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/buffers/ExpandableBufferWriter.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/buffers/ExpandableBufferWriter.java
similarity index 99%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/buffers/ExpandableBufferWriter.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/buffers/ExpandableBufferWriter.java
index 74365c7..140293d 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/buffers/ExpandableBufferWriter.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/buffers/ExpandableBufferWriter.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport.buffers;
+package org.glassfish.shoal.gms.mgmt.transport.buffers;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/buffers/ExpandableBufferWriterFactory.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/buffers/ExpandableBufferWriterFactory.java
similarity index 93%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/buffers/ExpandableBufferWriterFactory.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/buffers/ExpandableBufferWriterFactory.java
index 43a1852..6954710 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/buffers/ExpandableBufferWriterFactory.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/buffers/ExpandableBufferWriterFactory.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport.buffers;
+package org.glassfish.shoal.gms.mgmt.transport.buffers;
 
 /**
  * {@link ExpandableBufferWriter} factory.
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/GrizzlyConfigConstants.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/GrizzlyConfigConstants.java
similarity index 97%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/GrizzlyConfigConstants.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/GrizzlyConfigConstants.java
index 98aae10..71db695 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/GrizzlyConfigConstants.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/GrizzlyConfigConstants.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport.grizzly;
+package org.glassfish.shoal.gms.mgmt.transport.grizzly;
 
 /**
  * Specifies constants that are allowed to be used as keys for configuration elements that are sought to be set or
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/GrizzlyNetworkManager.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/GrizzlyNetworkManager.java
similarity index 90%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/GrizzlyNetworkManager.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/GrizzlyNetworkManager.java
index 4ce992b..21433ba 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/GrizzlyNetworkManager.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/GrizzlyNetworkManager.java
@@ -14,23 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport.grizzly;
-
-import static com.sun.enterprise.mgmt.ConfigConstants.BIND_INTERFACE_ADDRESS;
-import static com.sun.enterprise.mgmt.ConfigConstants.FAILURE_DETECTION_TCP_RETRANSMIT_TIMEOUT;
-import static com.sun.enterprise.mgmt.ConfigConstants.MULTICASTADDRESS;
-import static com.sun.enterprise.mgmt.ConfigConstants.MULTICASTPORT;
-import static com.sun.enterprise.mgmt.ConfigConstants.MULTICAST_PACKET_SIZE;
-import static com.sun.enterprise.mgmt.transport.grizzly.GrizzlyConfigConstants.DISCOVERY_URI_LIST;
-import static com.sun.enterprise.mgmt.transport.grizzly.GrizzlyConfigConstants.HIGH_WATER_MARK;
-import static com.sun.enterprise.mgmt.transport.grizzly.GrizzlyConfigConstants.MAX_PARALLEL;
-import static com.sun.enterprise.mgmt.transport.grizzly.GrizzlyConfigConstants.MAX_WRITE_SELECTOR_POOL_SIZE;
-import static com.sun.enterprise.mgmt.transport.grizzly.GrizzlyConfigConstants.MULTICAST_TIME_TO_LIVE;
-import static com.sun.enterprise.mgmt.transport.grizzly.GrizzlyConfigConstants.NUMBER_TO_RECLAIM;
-import static com.sun.enterprise.mgmt.transport.grizzly.GrizzlyConfigConstants.START_TIMEOUT;
-import static com.sun.enterprise.mgmt.transport.grizzly.GrizzlyConfigConstants.TCPENDPORT;
-import static com.sun.enterprise.mgmt.transport.grizzly.GrizzlyConfigConstants.TCPSTARTPORT;
-import static com.sun.enterprise.mgmt.transport.grizzly.GrizzlyConfigConstants.WRITE_TIMEOUT;
+package org.glassfish.shoal.gms.mgmt.transport.grizzly;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -50,20 +34,36 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.sun.enterprise.ee.cms.core.GMSConstants;
-import com.sun.enterprise.ee.cms.impl.base.PeerID;
-import com.sun.enterprise.ee.cms.impl.base.Utility;
-import com.sun.enterprise.ee.cms.logging.GMSLogDomain;
-import com.sun.enterprise.mgmt.HealthMessage;
-import com.sun.enterprise.mgmt.HealthMonitor;
-import com.sun.enterprise.mgmt.transport.AbstractNetworkManager;
-import com.sun.enterprise.mgmt.transport.Message;
-import com.sun.enterprise.mgmt.transport.MessageEvent;
-import com.sun.enterprise.mgmt.transport.MessageImpl;
-import com.sun.enterprise.mgmt.transport.MessageSender;
-import com.sun.enterprise.mgmt.transport.MulticastMessageSender;
-import com.sun.enterprise.mgmt.transport.NetworkUtility;
-import com.sun.enterprise.mgmt.transport.VirtualMulticastSender;
+import org.glassfish.shoal.gms.api.core.GMSConstants;
+import org.glassfish.shoal.gms.base.PeerID;
+import org.glassfish.shoal.gms.base.Utility;
+import org.glassfish.shoal.gms.logging.GMSLogDomain;
+import org.glassfish.shoal.gms.mgmt.HealthMessage;
+import org.glassfish.shoal.gms.mgmt.HealthMonitor;
+import org.glassfish.shoal.gms.mgmt.transport.AbstractNetworkManager;
+import org.glassfish.shoal.gms.mgmt.transport.Message;
+import org.glassfish.shoal.gms.mgmt.transport.MessageEvent;
+import org.glassfish.shoal.gms.mgmt.transport.MessageImpl;
+import org.glassfish.shoal.gms.mgmt.transport.MessageSender;
+import org.glassfish.shoal.gms.mgmt.transport.MulticastMessageSender;
+import org.glassfish.shoal.gms.mgmt.transport.NetworkUtility;
+import org.glassfish.shoal.gms.mgmt.transport.VirtualMulticastSender;
+
+import static org.glassfish.shoal.gms.mgmt.ConfigConstants.BIND_INTERFACE_ADDRESS;
+import static org.glassfish.shoal.gms.mgmt.ConfigConstants.FAILURE_DETECTION_TCP_RETRANSMIT_TIMEOUT;
+import static org.glassfish.shoal.gms.mgmt.ConfigConstants.MULTICASTADDRESS;
+import static org.glassfish.shoal.gms.mgmt.ConfigConstants.MULTICASTPORT;
+import static org.glassfish.shoal.gms.mgmt.ConfigConstants.MULTICAST_PACKET_SIZE;
+import static org.glassfish.shoal.gms.mgmt.transport.grizzly.GrizzlyConfigConstants.DISCOVERY_URI_LIST;
+import static org.glassfish.shoal.gms.mgmt.transport.grizzly.GrizzlyConfigConstants.HIGH_WATER_MARK;
+import static org.glassfish.shoal.gms.mgmt.transport.grizzly.GrizzlyConfigConstants.MAX_PARALLEL;
+import static org.glassfish.shoal.gms.mgmt.transport.grizzly.GrizzlyConfigConstants.MAX_WRITE_SELECTOR_POOL_SIZE;
+import static org.glassfish.shoal.gms.mgmt.transport.grizzly.GrizzlyConfigConstants.MULTICAST_TIME_TO_LIVE;
+import static org.glassfish.shoal.gms.mgmt.transport.grizzly.GrizzlyConfigConstants.NUMBER_TO_RECLAIM;
+import static org.glassfish.shoal.gms.mgmt.transport.grizzly.GrizzlyConfigConstants.START_TIMEOUT;
+import static org.glassfish.shoal.gms.mgmt.transport.grizzly.GrizzlyConfigConstants.TCPENDPORT;
+import static org.glassfish.shoal.gms.mgmt.transport.grizzly.GrizzlyConfigConstants.TCPSTARTPORT;
+import static org.glassfish.shoal.gms.mgmt.transport.grizzly.GrizzlyConfigConstants.WRITE_TIMEOUT;
 
 /**
  * @author Bongjae Chang
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/GrizzlyPeerID.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/GrizzlyPeerID.java
similarity index 98%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/GrizzlyPeerID.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/GrizzlyPeerID.java
index 0625177..696e7d7 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/GrizzlyPeerID.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/GrizzlyPeerID.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport.grizzly;
+package org.glassfish.shoal.gms.mgmt.transport.grizzly;
 
 import java.io.Serializable;
 
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/GrizzlyUtil.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/GrizzlyUtil.java
similarity index 96%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/GrizzlyUtil.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/GrizzlyUtil.java
index 5e618ba..5be129d 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/GrizzlyUtil.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/GrizzlyUtil.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport.grizzly;
+package org.glassfish.shoal.gms.mgmt.transport.grizzly;
 
 import java.lang.reflect.Method;
 import java.util.logging.Logger;
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/PingMessageListener.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/PingMessageListener.java
similarity index 82%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/PingMessageListener.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/PingMessageListener.java
index 5832d0c..09dea65 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/PingMessageListener.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/PingMessageListener.java
@@ -14,19 +14,19 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport.grizzly;
+package org.glassfish.shoal.gms.mgmt.transport.grizzly;
 
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.sun.enterprise.ee.cms.impl.base.PeerID;
-import com.sun.enterprise.mgmt.transport.Message;
-import com.sun.enterprise.mgmt.transport.MessageEvent;
-import com.sun.enterprise.mgmt.transport.MessageIOException;
-import com.sun.enterprise.mgmt.transport.MessageImpl;
-import com.sun.enterprise.mgmt.transport.MessageListener;
-import com.sun.enterprise.mgmt.transport.NetworkManager;
+import org.glassfish.shoal.gms.base.PeerID;
+import org.glassfish.shoal.gms.mgmt.transport.Message;
+import org.glassfish.shoal.gms.mgmt.transport.MessageEvent;
+import org.glassfish.shoal.gms.mgmt.transport.MessageIOException;
+import org.glassfish.shoal.gms.mgmt.transport.MessageImpl;
+import org.glassfish.shoal.gms.mgmt.transport.MessageListener;
+import org.glassfish.shoal.gms.mgmt.transport.NetworkManager;
 
 /**
  * @author Bongjae Chang
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/PongMessageListener.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/PongMessageListener.java
similarity index 84%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/PongMessageListener.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/PongMessageListener.java
index 4b24002..a9415fd 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/PongMessageListener.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/PongMessageListener.java
@@ -14,16 +14,16 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport.grizzly;
+package org.glassfish.shoal.gms.mgmt.transport.grizzly;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.logging.Logger;
 
-import com.sun.enterprise.ee.cms.impl.base.PeerID;
-import com.sun.enterprise.mgmt.transport.Message;
-import com.sun.enterprise.mgmt.transport.MessageEvent;
-import com.sun.enterprise.mgmt.transport.MessageIOException;
-import com.sun.enterprise.mgmt.transport.MessageListener;
+import org.glassfish.shoal.gms.base.PeerID;
+import org.glassfish.shoal.gms.mgmt.transport.Message;
+import org.glassfish.shoal.gms.mgmt.transport.MessageEvent;
+import org.glassfish.shoal.gms.mgmt.transport.MessageIOException;
+import org.glassfish.shoal.gms.mgmt.transport.MessageListener;
 
 /**
  * @author Bongjae Chang
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/grizzly2/ConnectionCache.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/grizzly2/ConnectionCache.java
similarity index 99%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/grizzly2/ConnectionCache.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/grizzly2/ConnectionCache.java
index d33d9d3..97c4082 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/grizzly2/ConnectionCache.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/grizzly2/ConnectionCache.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport.grizzly.grizzly2;
+package org.glassfish.shoal.gms.mgmt.transport.grizzly.grizzly2;
 
 import java.io.IOException;
 import java.net.SocketAddress;
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/grizzly2/GMSBufferWrapper.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/grizzly2/GMSBufferWrapper.java
similarity index 98%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/grizzly2/GMSBufferWrapper.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/grizzly2/GMSBufferWrapper.java
index f9223a4..40433c8 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/grizzly2/GMSBufferWrapper.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/grizzly2/GMSBufferWrapper.java
@@ -14,11 +14,11 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport.grizzly.grizzly2;
+package org.glassfish.shoal.gms.mgmt.transport.grizzly.grizzly2;
 
 import java.nio.charset.Charset;
 
-import com.sun.enterprise.mgmt.transport.buffers.Buffer;
+import org.glassfish.shoal.gms.mgmt.transport.buffers.Buffer;
 
 /**
  * Shoal GMS {@link Buffer} wrapper over Grizzly 2.0 {@link org.glassfish.grizzly.Buffer}.
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/grizzly2/Grizzly2ExpandableBufferWriter.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/grizzly2/Grizzly2ExpandableBufferWriter.java
similarity index 89%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/grizzly2/Grizzly2ExpandableBufferWriter.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/grizzly2/Grizzly2ExpandableBufferWriter.java
index f4c8737..a816541 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/grizzly2/Grizzly2ExpandableBufferWriter.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/grizzly2/Grizzly2ExpandableBufferWriter.java
@@ -14,13 +14,12 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport.grizzly.grizzly2;
+package org.glassfish.shoal.gms.mgmt.transport.grizzly.grizzly2;
 
 import org.glassfish.grizzly.memory.MemoryManager;
-
-import com.sun.enterprise.mgmt.transport.buffers.Buffer;
-import com.sun.enterprise.mgmt.transport.buffers.ExpandableBufferWriter;
-import com.sun.enterprise.mgmt.transport.buffers.ExpandableBufferWriterFactory;
+import org.glassfish.shoal.gms.mgmt.transport.buffers.Buffer;
+import org.glassfish.shoal.gms.mgmt.transport.buffers.ExpandableBufferWriter;
+import org.glassfish.shoal.gms.mgmt.transport.buffers.ExpandableBufferWriterFactory;
 
 /**
  * Grizzly 2.0 based expandable Buffer writer.
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/grizzly2/GrizzlyNetworkManager2.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/grizzly2/GrizzlyNetworkManager2.java
similarity index 91%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/grizzly2/GrizzlyNetworkManager2.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/grizzly2/GrizzlyNetworkManager2.java
index d21c400..e5b8e28 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/grizzly2/GrizzlyNetworkManager2.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/grizzly2/GrizzlyNetworkManager2.java
@@ -15,13 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport.grizzly.grizzly2;
-
-import static com.sun.enterprise.mgmt.transport.grizzly.GrizzlyConfigConstants.CORE_POOLSIZE;
-import static com.sun.enterprise.mgmt.transport.grizzly.GrizzlyConfigConstants.DISCOVERY_URI_LIST;
-import static com.sun.enterprise.mgmt.transport.grizzly.GrizzlyConfigConstants.KEEP_ALIVE_TIME;
-import static com.sun.enterprise.mgmt.transport.grizzly.GrizzlyConfigConstants.MAX_POOLSIZE;
-import static com.sun.enterprise.mgmt.transport.grizzly.GrizzlyConfigConstants.POOL_QUEUE_SIZE;
+package org.glassfish.shoal.gms.mgmt.transport.grizzly.grizzly2;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -55,25 +49,30 @@
 import org.glassfish.grizzly.ssl.SSLEngineConfigurator;
 import org.glassfish.grizzly.ssl.SSLFilter;
 import org.glassfish.grizzly.threadpool.ThreadPoolConfig;
-
-import com.sun.enterprise.ee.cms.impl.base.GMSThreadFactory;
-import com.sun.enterprise.ee.cms.impl.base.PeerID;
-import com.sun.enterprise.ee.cms.impl.base.Utility;
-import com.sun.enterprise.ee.cms.impl.common.GMSContext;
-import com.sun.enterprise.ee.cms.impl.common.GMSContextFactory;
-import com.sun.enterprise.ee.cms.impl.common.GMSMonitor;
-import com.sun.enterprise.mgmt.transport.BlockingIOMulticastSender;
-import com.sun.enterprise.mgmt.transport.MessageEvent;
-import com.sun.enterprise.mgmt.transport.NetworkUtility;
-import com.sun.enterprise.mgmt.transport.VirtualMulticastSender;
-import com.sun.enterprise.mgmt.transport.grizzly.GrizzlyPeerID;
-import com.sun.enterprise.mgmt.transport.grizzly.PingMessageListener;
-import com.sun.enterprise.mgmt.transport.grizzly.PongMessageListener;
+import org.glassfish.shoal.gms.base.GMSThreadFactory;
+import org.glassfish.shoal.gms.base.PeerID;
+import org.glassfish.shoal.gms.base.Utility;
+import org.glassfish.shoal.gms.common.GMSContext;
+import org.glassfish.shoal.gms.common.GMSContextFactory;
+import org.glassfish.shoal.gms.common.GMSMonitor;
+import org.glassfish.shoal.gms.mgmt.transport.BlockingIOMulticastSender;
+import org.glassfish.shoal.gms.mgmt.transport.MessageEvent;
+import org.glassfish.shoal.gms.mgmt.transport.NetworkUtility;
+import org.glassfish.shoal.gms.mgmt.transport.VirtualMulticastSender;
+import org.glassfish.shoal.gms.mgmt.transport.grizzly.GrizzlyPeerID;
+import org.glassfish.shoal.gms.mgmt.transport.grizzly.PingMessageListener;
+import org.glassfish.shoal.gms.mgmt.transport.grizzly.PongMessageListener;
+
+import static org.glassfish.shoal.gms.mgmt.transport.grizzly.GrizzlyConfigConstants.CORE_POOLSIZE;
+import static org.glassfish.shoal.gms.mgmt.transport.grizzly.GrizzlyConfigConstants.DISCOVERY_URI_LIST;
+import static org.glassfish.shoal.gms.mgmt.transport.grizzly.GrizzlyConfigConstants.KEEP_ALIVE_TIME;
+import static org.glassfish.shoal.gms.mgmt.transport.grizzly.GrizzlyConfigConstants.MAX_POOLSIZE;
+import static org.glassfish.shoal.gms.mgmt.transport.grizzly.GrizzlyConfigConstants.POOL_QUEUE_SIZE;
 
 /**
  * @author Bongjae Chang
  */
-public class GrizzlyNetworkManager2 extends com.sun.enterprise.mgmt.transport.grizzly.GrizzlyNetworkManager {
+public class GrizzlyNetworkManager2 extends org.glassfish.shoal.gms.mgmt.transport.grizzly.GrizzlyNetworkManager {
     public static final String MESSAGE_CONNECTION_TAG = "connection";
     private static final int SERVER_CONNECTION_BACKLOG = 4096;
 
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/grizzly2/GrizzlyTCPMessageSender.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/grizzly2/GrizzlyTCPMessageSender.java
similarity index 92%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/grizzly2/GrizzlyTCPMessageSender.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/grizzly2/GrizzlyTCPMessageSender.java
index 971707b..ed8249b 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/grizzly2/GrizzlyTCPMessageSender.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/grizzly2/GrizzlyTCPMessageSender.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport.grizzly.grizzly2;
+package org.glassfish.shoal.gms.mgmt.transport.grizzly.grizzly2;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -29,13 +29,12 @@
 import org.glassfish.grizzly.impl.FutureImpl;
 import org.glassfish.grizzly.nio.transport.TCPNIOTransport;
 import org.glassfish.grizzly.utils.Futures;
-
-import com.sun.enterprise.ee.cms.impl.base.PeerID;
-import com.sun.enterprise.mgmt.transport.AbstractMessageSender;
-import com.sun.enterprise.mgmt.transport.Message;
-import com.sun.enterprise.mgmt.transport.MessageIOException;
-import com.sun.enterprise.mgmt.transport.grizzly.GrizzlyNetworkManager;
-import com.sun.enterprise.mgmt.transport.grizzly.GrizzlyPeerID;
+import org.glassfish.shoal.gms.base.PeerID;
+import org.glassfish.shoal.gms.mgmt.transport.AbstractMessageSender;
+import org.glassfish.shoal.gms.mgmt.transport.Message;
+import org.glassfish.shoal.gms.mgmt.transport.MessageIOException;
+import org.glassfish.shoal.gms.mgmt.transport.grizzly.GrizzlyNetworkManager;
+import org.glassfish.shoal.gms.mgmt.transport.grizzly.GrizzlyPeerID;
 
 /**
  * @author Bongjae Chang
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/grizzly2/MessageDispatcherFilter.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/grizzly2/MessageDispatcherFilter.java
similarity index 94%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/grizzly2/MessageDispatcherFilter.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/grizzly2/MessageDispatcherFilter.java
index 43f27a4..ec497af 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/grizzly2/MessageDispatcherFilter.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/grizzly2/MessageDispatcherFilter.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport.grizzly.grizzly2;
+package org.glassfish.shoal.gms.mgmt.transport.grizzly.grizzly2;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -26,8 +26,7 @@
 import org.glassfish.grizzly.filterchain.BaseFilter;
 import org.glassfish.grizzly.filterchain.FilterChainContext;
 import org.glassfish.grizzly.filterchain.NextAction;
-
-import com.sun.enterprise.mgmt.transport.Message;
+import org.glassfish.shoal.gms.mgmt.transport.Message;
 
 /**
  * Message dispatcher Filter.
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/grizzly2/MessageFilter.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/grizzly2/MessageFilter.java
similarity index 90%
rename from gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/grizzly2/MessageFilter.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/grizzly2/MessageFilter.java
index 2431faf..7746e2f 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/grizzly/grizzly2/MessageFilter.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/grizzly2/MessageFilter.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport.grizzly.grizzly2;
+package org.glassfish.shoal.gms.mgmt.transport.grizzly.grizzly2;
 
 import java.io.IOException;
 
@@ -27,9 +27,8 @@
 import org.glassfish.grizzly.filterchain.FilterChainContext;
 import org.glassfish.grizzly.filterchain.NextAction;
 import org.glassfish.grizzly.memory.MemoryManager;
-
-import com.sun.enterprise.mgmt.transport.Message;
-import com.sun.enterprise.mgmt.transport.MessageImpl;
+import org.glassfish.shoal.gms.mgmt.transport.Message;
+import org.glassfish.shoal.gms.mgmt.transport.MessageImpl;
 
 /**
  * Filter, responsible for {@link Buffer} to {@link Message} transformation.
@@ -42,8 +41,8 @@
  *
  * Message Body is composed of following fields. payload byte[messageLen]
  *
- * MessageHeader {@link Message#parseHeader(com.sun.enterprise.mgmt.transport.buffers.Buffer, int)}
- * MessageBody {@link Message#parseMessage(com.sun.enterprise.mgmt.transport.buffers.Buffer, int, int)}
+ * MessageHeader {@link Message#parseHeader(org.glassfish.shoal.gms.mgmt.transport.buffers.Buffer, int)}
+ * MessageBody {@link Message#parseMessage(org.glassfish.shoal.gms.mgmt.transport.buffers.Buffer, int, int)}
  *
  * @author Bongjae Chang
  * @author Joe Fialli
@@ -118,7 +117,7 @@ public NextAction handleWrite(final FilterChainContext ctx) throws IOException {
 
         final MemoryManager mm = ctx.getConnection().getTransport().getMemoryManager();
 
-        com.sun.enterprise.mgmt.transport.buffers.Buffer buffer = message.getPlainBuffer(Grizzly2ExpandableBufferWriter.createFactory(mm));
+        org.glassfish.shoal.gms.mgmt.transport.buffers.Buffer buffer = message.getPlainBuffer(Grizzly2ExpandableBufferWriter.createFactory(mm));
 
         ctx.setMessage(buffer.underlying());
 
diff --git a/gms/impl/src/main/java/com/sun/enterprise/gms/tools/MultiCastReceiverThread.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/tools/MultiCastReceiverThread.java
similarity index 97%
rename from gms/impl/src/main/java/com/sun/enterprise/gms/tools/MultiCastReceiverThread.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/tools/MultiCastReceiverThread.java
index e8fbdd2..c584fcc 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/gms/tools/MultiCastReceiverThread.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/tools/MultiCastReceiverThread.java
@@ -14,9 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.gms.tools;
-
-import static com.sun.enterprise.gms.tools.MulticastTester.SEP;
+package org.glassfish.shoal.gms.tools;
 
 import java.net.DatagramPacket;
 import java.net.InetAddress;
@@ -28,6 +26,8 @@
 import java.util.StringTokenizer;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import static org.glassfish.shoal.gms.tools.MulticastTester.SEP;
+
 /**
  * Used to listen for multicast messages.
  */
diff --git a/gms/impl/src/main/java/com/sun/enterprise/gms/tools/MulticastSenderThread.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/tools/MulticastSenderThread.java
similarity index 96%
rename from gms/impl/src/main/java/com/sun/enterprise/gms/tools/MulticastSenderThread.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/tools/MulticastSenderThread.java
index 89d0d79..f8cf7d8 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/gms/tools/MulticastSenderThread.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/tools/MulticastSenderThread.java
@@ -14,9 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.gms.tools;
-
-import static com.sun.enterprise.ee.cms.core.GMSConstants.MINIMUM_MULTICAST_TIME_TO_LIVE;
+package org.glassfish.shoal.gms.tools;
 
 import java.io.IOException;
 import java.net.DatagramPacket;
@@ -26,8 +24,10 @@
 import java.nio.charset.Charset;
 import java.util.logging.Level;
 
-import com.sun.enterprise.ee.cms.logging.GMSLogDomain;
-import com.sun.enterprise.mgmt.transport.NetworkUtility;
+import org.glassfish.shoal.gms.logging.GMSLogDomain;
+import org.glassfish.shoal.gms.mgmt.transport.NetworkUtility;
+
+import static org.glassfish.shoal.gms.api.core.GMSConstants.MINIMUM_MULTICAST_TIME_TO_LIVE;
 
 /**
  * Used to periodically send multicast messages.
diff --git a/gms/impl/src/main/java/com/sun/enterprise/gms/tools/MulticastTester.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/tools/MulticastTester.java
similarity index 99%
rename from gms/impl/src/main/java/com/sun/enterprise/gms/tools/MulticastTester.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/tools/MulticastTester.java
index 88924a0..c6d6528 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/gms/tools/MulticastTester.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/tools/MulticastTester.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.gms.tools;
+package org.glassfish.shoal.gms.tools;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
diff --git a/gms/impl/src/main/java/com/sun/enterprise/gms/tools/StringManager.java b/gms/impl/src/main/java/org/glassfish/shoal/gms/tools/StringManager.java
similarity index 92%
rename from gms/impl/src/main/java/com/sun/enterprise/gms/tools/StringManager.java
rename to gms/impl/src/main/java/org/glassfish/shoal/gms/tools/StringManager.java
index d6c65b1..1dd3b27 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/gms/tools/StringManager.java
+++ b/gms/impl/src/main/java/org/glassfish/shoal/gms/tools/StringManager.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.gms.tools;
+package org.glassfish.shoal.gms.tools;
 
 import java.text.MessageFormat;
 import java.util.Locale;
@@ -27,7 +27,7 @@ public class StringManager {
 
     private static final StringManager instance = new StringManager();
 
-    private static final ResourceBundle bundle = ResourceBundle.getBundle("com.sun.enterprise.gms.tools.LocalStrings", Locale.getDefault());
+    private static final ResourceBundle bundle = ResourceBundle.getBundle("org.glassfish.shoal.gms.tools.LocalStrings", Locale.getDefault());
 
     private StringManager() {
     }
diff --git a/gms/impl/src/main/resources/META-INF/services/com.sun.enterprise.ee.cms.core.GroupManagementService b/gms/impl/src/main/resources/META-INF/services/com.sun.enterprise.ee.cms.core.GroupManagementService
deleted file mode 100644
index 6c42c3f..0000000
--- a/gms/impl/src/main/resources/META-INF/services/com.sun.enterprise.ee.cms.core.GroupManagementService
+++ /dev/null
@@ -1 +0,0 @@
-com.sun.enterprise.ee.cms.impl.common.GroupManagementServiceImpl
diff --git a/gms/impl/src/main/resources/META-INF/services/com.sun.enterprise.mgmt.transport.NetworkManager b/gms/impl/src/main/resources/META-INF/services/com.sun.enterprise.mgmt.transport.NetworkManager
deleted file mode 100644
index 5192abb..0000000
--- a/gms/impl/src/main/resources/META-INF/services/com.sun.enterprise.mgmt.transport.NetworkManager
+++ /dev/null
@@ -1 +0,0 @@
-com.sun.enterprise.mgmt.transport.grizzly.grizzly2.GrizzlyNetworkManager2
diff --git a/gms/impl/src/main/resources/META-INF/services/org.glassfish.shoal.gms.api.core.GroupManagementService b/gms/impl/src/main/resources/META-INF/services/org.glassfish.shoal.gms.api.core.GroupManagementService
new file mode 100644
index 0000000..28d6d8b
--- /dev/null
+++ b/gms/impl/src/main/resources/META-INF/services/org.glassfish.shoal.gms.api.core.GroupManagementService
@@ -0,0 +1 @@
+org.glassfish.shoal.gms.common.GroupManagementServiceImpl
diff --git a/gms/impl/src/main/resources/META-INF/services/org.glassfish.shoal.gms.mgmt.transport.NetworkManager b/gms/impl/src/main/resources/META-INF/services/org.glassfish.shoal.gms.mgmt.transport.NetworkManager
new file mode 100644
index 0000000..df7ab5c
--- /dev/null
+++ b/gms/impl/src/main/resources/META-INF/services/org.glassfish.shoal.gms.mgmt.transport.NetworkManager
@@ -0,0 +1 @@
+org.glassfish.shoal.gms.mgmt.transport.grizzly.grizzly2.GrizzlyNetworkManager2
diff --git a/gms/impl/src/main/resources/com/sun/enterprise/ee/cms/logging/LogStrings.properties b/gms/impl/src/main/resources/org/glassfish/shoal/gms/logging/LogStrings.properties
similarity index 99%
rename from gms/impl/src/main/resources/com/sun/enterprise/ee/cms/logging/LogStrings.properties
rename to gms/impl/src/main/resources/org/glassfish/shoal/gms/logging/LogStrings.properties
index 98a2da3..fbfbf2d 100644
--- a/gms/impl/src/main/resources/com/sun/enterprise/ee/cms/logging/LogStrings.properties
+++ b/gms/impl/src/main/resources/org/glassfish/shoal/gms/logging/LogStrings.properties
@@ -89,7 +89,7 @@ mgmt.masternode.missgroupstartupcomplete=GMS1063: missed GroupStartupComplete me
 mgmt.masternode.processmsgexception=GMS1064: MasterNode.ProcessOutstandingMessages.run: ignoring exception {0}
 mgmt.masternode.processmsgcompleted=GMS1065: Completed processing outstanding master node messages for member: {0} group: {1} outstandingMessages to process: {2}
 grizzlynetmgr.invalidmcastaddr=GMS1066: invalid multicast address: {0} defaulting to {1}. Valid multicast address is a Class D IP address in the range 224.0.0.0-239.255.255.255 inclusive. Address 224.0.0.0 is reserved and should not be used.
-grizzlynetmgr.invalidbindaddr=GMS1067: GrizzlyNetworkManager.configure: unable to configure NetworkInterfaceName due to {0}     
+grizzlynetmgr.invalidbindaddr=GMS1067: GrizzlyNetworkManager.configure: unable to configure NetworkInterfaceName due to {0}
 absnetmgr.beforefailed=GMS1068: failed to execute beforeDispatchingMessage()
 absnetmgr.afterfailed=GMS1069: failed to execute afterDispatchingMessage()
 absnetmgr.receivemsg=GMS1070: failed to receive a message: type = {0}
diff --git a/gms/impl/src/main/resources/com/sun/enterprise/gms/tools/LocalStrings.properties b/gms/impl/src/main/resources/org/glassfish/shoal/gms/tools/LocalStrings.properties
similarity index 100%
rename from gms/impl/src/main/resources/com/sun/enterprise/gms/tools/LocalStrings.properties
rename to gms/impl/src/main/resources/org/glassfish/shoal/gms/tools/LocalStrings.properties
diff --git a/gms/impl/src/test/java/com/sun/enterprise/ee/cms/impl/common/AliveAndReadyViewWindowTest.java b/gms/impl/src/test/java/org/glassfish/shoal/gms/common/AliveAndReadyViewWindowTest.java
similarity index 96%
rename from gms/impl/src/test/java/com/sun/enterprise/ee/cms/impl/common/AliveAndReadyViewWindowTest.java
rename to gms/impl/src/test/java/org/glassfish/shoal/gms/common/AliveAndReadyViewWindowTest.java
index 5cf574c..c3881b4 100644
--- a/gms/impl/src/test/java/com/sun/enterprise/ee/cms/impl/common/AliveAndReadyViewWindowTest.java
+++ b/gms/impl/src/test/java/org/glassfish/shoal/gms/common/AliveAndReadyViewWindowTest.java
@@ -14,20 +14,24 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.ee.cms.impl.common;
+package org.glassfish.shoal.gms.common;
 
 import java.util.LinkedList;
 import java.util.List;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import com.sun.enterprise.ee.cms.core.FailureNotificationSignal;
-import com.sun.enterprise.ee.cms.core.GMSConstants;
-import com.sun.enterprise.ee.cms.core.GMSException;
-import com.sun.enterprise.ee.cms.core.JoinedAndReadyNotificationSignal;
-import com.sun.enterprise.ee.cms.core.PlannedShutdownSignal;
-import com.sun.enterprise.ee.cms.core.RejoinSubevent;
-import com.sun.enterprise.ee.cms.impl.client.RejoinSubeventImpl;
+import org.glassfish.shoal.gms.api.core.FailureNotificationSignal;
+import org.glassfish.shoal.gms.api.core.GMSConstants;
+import org.glassfish.shoal.gms.api.core.GMSException;
+import org.glassfish.shoal.gms.api.core.JoinedAndReadyNotificationSignal;
+import org.glassfish.shoal.gms.api.core.PlannedShutdownSignal;
+import org.glassfish.shoal.gms.api.core.RejoinSubevent;
+import org.glassfish.shoal.gms.client.RejoinSubeventImpl;
+import org.glassfish.shoal.gms.common.AliveAndReadyViewWindow;
+import org.glassfish.shoal.gms.common.FailureNotificationSignalImpl;
+import org.glassfish.shoal.gms.common.JoinedAndReadyNotificationSignalImpl;
+import org.glassfish.shoal.gms.common.PlannedShutdownSignalImpl;
 
 import junit.framework.TestCase;
 
diff --git a/gms/impl/src/test/java/com/sun/enterprise/ee/cms/impl/common/GroupManagementServiceImplTest.java b/gms/impl/src/test/java/org/glassfish/shoal/gms/common/GroupManagementServiceImplTest.java
similarity index 88%
rename from gms/impl/src/test/java/com/sun/enterprise/ee/cms/impl/common/GroupManagementServiceImplTest.java
rename to gms/impl/src/test/java/org/glassfish/shoal/gms/common/GroupManagementServiceImplTest.java
index eefcd73..da9e9dc 100644
--- a/gms/impl/src/test/java/com/sun/enterprise/ee/cms/impl/common/GroupManagementServiceImplTest.java
+++ b/gms/impl/src/test/java/org/glassfish/shoal/gms/common/GroupManagementServiceImplTest.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.ee.cms.impl.common;
+package org.glassfish.shoal.gms.common;
 
 import java.util.Arrays;
 import java.util.Properties;
@@ -23,28 +23,31 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.sun.enterprise.ee.cms.core.CallBack;
-import com.sun.enterprise.ee.cms.core.GMSConstants;
-import com.sun.enterprise.ee.cms.core.GMSException;
-import com.sun.enterprise.ee.cms.core.GMSFactory;
-import com.sun.enterprise.ee.cms.core.GroupLeadershipNotificationSignal;
-import com.sun.enterprise.ee.cms.core.GroupManagementService;
-import com.sun.enterprise.ee.cms.core.JoinNotificationSignal;
-import com.sun.enterprise.ee.cms.core.JoinedAndReadyNotificationSignal;
-import com.sun.enterprise.ee.cms.core.MemberNotInViewException;
-import com.sun.enterprise.ee.cms.core.MessageSignal;
-import com.sun.enterprise.ee.cms.core.PlannedShutdownSignal;
-import com.sun.enterprise.ee.cms.core.ServiceProviderConfigurationKeys;
-import com.sun.enterprise.ee.cms.core.Signal;
-import com.sun.enterprise.ee.cms.impl.client.GroupLeadershipNotificationActionFactoryImpl;
-import com.sun.enterprise.ee.cms.impl.client.JoinNotificationActionFactoryImpl;
-import com.sun.enterprise.ee.cms.impl.client.JoinedAndReadyNotificationActionFactoryImpl;
-import com.sun.enterprise.ee.cms.impl.client.MessageActionFactoryImpl;
-import com.sun.enterprise.ee.cms.impl.client.PlannedShutdownActionFactoryImpl;
-import com.sun.enterprise.ee.cms.logging.GMSLogDomain;
-import com.sun.enterprise.ee.cms.spi.MemberStates;
-import com.sun.enterprise.mgmt.transport.MessageIOException;
-import com.sun.enterprise.mgmt.transport.MessageImpl;
+import org.glassfish.shoal.gms.api.core.CallBack;
+import org.glassfish.shoal.gms.api.core.GMSConstants;
+import org.glassfish.shoal.gms.api.core.GMSException;
+import org.glassfish.shoal.gms.api.core.GMSFactory;
+import org.glassfish.shoal.gms.api.core.GroupLeadershipNotificationSignal;
+import org.glassfish.shoal.gms.api.core.GroupManagementService;
+import org.glassfish.shoal.gms.api.core.JoinNotificationSignal;
+import org.glassfish.shoal.gms.api.core.JoinedAndReadyNotificationSignal;
+import org.glassfish.shoal.gms.api.core.MemberNotInViewException;
+import org.glassfish.shoal.gms.api.core.MessageSignal;
+import org.glassfish.shoal.gms.api.core.PlannedShutdownSignal;
+import org.glassfish.shoal.gms.api.core.ServiceProviderConfigurationKeys;
+import org.glassfish.shoal.gms.api.core.Signal;
+import org.glassfish.shoal.gms.api.spi.MemberStates;
+import org.glassfish.shoal.gms.client.GroupLeadershipNotificationActionFactoryImpl;
+import org.glassfish.shoal.gms.client.JoinNotificationActionFactoryImpl;
+import org.glassfish.shoal.gms.client.JoinedAndReadyNotificationActionFactoryImpl;
+import org.glassfish.shoal.gms.client.MessageActionFactoryImpl;
+import org.glassfish.shoal.gms.client.PlannedShutdownActionFactoryImpl;
+import org.glassfish.shoal.gms.common.GMSContext;
+import org.glassfish.shoal.gms.common.GMSContextFactory;
+import org.glassfish.shoal.gms.common.GMSMonitor;
+import org.glassfish.shoal.gms.logging.GMSLogDomain;
+import org.glassfish.shoal.gms.mgmt.transport.MessageIOException;
+import org.glassfish.shoal.gms.mgmt.transport.MessageImpl;
 
 import junit.framework.TestCase;
 
diff --git a/gms/impl/src/test/java/com/sun/enterprise/mgmt/ClusterManagerTest.java b/gms/impl/src/test/java/org/glassfish/shoal/gms/mgmt/ClusterManagerTest.java
similarity index 92%
rename from gms/impl/src/test/java/com/sun/enterprise/mgmt/ClusterManagerTest.java
rename to gms/impl/src/test/java/org/glassfish/shoal/gms/mgmt/ClusterManagerTest.java
index 8d638d5..dc9df58 100644
--- a/gms/impl/src/test/java/com/sun/enterprise/mgmt/ClusterManagerTest.java
+++ b/gms/impl/src/test/java/org/glassfish/shoal/gms/mgmt/ClusterManagerTest.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt;
+package org.glassfish.shoal.gms.mgmt;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -23,12 +23,19 @@
 import java.util.Properties;
 import java.util.logging.Level;
 
-import com.sun.enterprise.ee.cms.core.GMSException;
-import com.sun.enterprise.ee.cms.core.GroupManagementService;
-import com.sun.enterprise.ee.cms.impl.base.CustomTagNames;
-import com.sun.enterprise.ee.cms.impl.base.PeerID;
-import com.sun.enterprise.ee.cms.impl.base.SystemAdvertisement;
-import com.sun.enterprise.ee.cms.logging.GMSLogDomain;
+import org.glassfish.shoal.gms.api.core.GMSException;
+import org.glassfish.shoal.gms.api.core.GroupManagementService;
+import org.glassfish.shoal.gms.base.CustomTagNames;
+import org.glassfish.shoal.gms.base.PeerID;
+import org.glassfish.shoal.gms.base.SystemAdvertisement;
+import org.glassfish.shoal.gms.logging.GMSLogDomain;
+import org.glassfish.shoal.gms.mgmt.ClusterManager;
+import org.glassfish.shoal.gms.mgmt.ClusterMessageListener;
+import org.glassfish.shoal.gms.mgmt.ClusterView;
+import org.glassfish.shoal.gms.mgmt.ClusterViewEvent;
+import org.glassfish.shoal.gms.mgmt.ClusterViewEventListener;
+import org.glassfish.shoal.gms.mgmt.ConfigConstants;
+import org.glassfish.shoal.gms.mgmt.MasterNode;
 
 import junit.framework.TestCase;
 
@@ -113,7 +120,7 @@ private void generateProcessedMasterChangeEvents(long mvceStartId, long mvceStop
         }
     }
 
-   
+
 
     public void testStartRunStopClusterManager() throws GMSException {
         mySetUp();
@@ -178,7 +185,7 @@ public void testStartRunStopClusterManager() throws GMSException {
         manager.isGroupStartup();
     }
 
-   
+
 
     public void testisWatchdogFalse() throws GMSException {
         mySetUp();
@@ -186,7 +193,7 @@ public void testisWatchdogFalse() throws GMSException {
         assertFalse(manager.isWatchdog());
     }
 
-   
+
 
     public void testisWatchdogTrue() throws GMSException {
         mySetUp();
diff --git a/gms/impl/src/test/java/com/sun/enterprise/mgmt/ReliableMulticastTest.java b/gms/impl/src/test/java/org/glassfish/shoal/gms/mgmt/ReliableMulticastTest.java
similarity index 90%
rename from gms/impl/src/test/java/com/sun/enterprise/mgmt/ReliableMulticastTest.java
rename to gms/impl/src/test/java/org/glassfish/shoal/gms/mgmt/ReliableMulticastTest.java
index e7b24c2..200490f 100644
--- a/gms/impl/src/test/java/com/sun/enterprise/mgmt/ReliableMulticastTest.java
+++ b/gms/impl/src/test/java/org/glassfish/shoal/gms/mgmt/ReliableMulticastTest.java
@@ -14,14 +14,16 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt;
+package org.glassfish.shoal.gms.mgmt;
 
 import java.text.SimpleDateFormat;
 import java.util.logging.Level;
 
-import com.sun.enterprise.ee.cms.logging.GMSLogDomain;
-import com.sun.enterprise.mgmt.transport.Message;
-import com.sun.enterprise.mgmt.transport.MessageImpl;
+import org.glassfish.shoal.gms.logging.GMSLogDomain;
+import org.glassfish.shoal.gms.mgmt.MasterNode;
+import org.glassfish.shoal.gms.mgmt.ReliableMulticast;
+import org.glassfish.shoal.gms.mgmt.transport.Message;
+import org.glassfish.shoal.gms.mgmt.transport.MessageImpl;
 
 import junit.framework.TestCase;
 
diff --git a/gms/impl/src/test/java/com/sun/enterprise/mgmt/transport/MessageImplTest.java b/gms/impl/src/test/java/org/glassfish/shoal/gms/mgmt/transport/MessageImplTest.java
similarity index 98%
rename from gms/impl/src/test/java/com/sun/enterprise/mgmt/transport/MessageImplTest.java
rename to gms/impl/src/test/java/org/glassfish/shoal/gms/mgmt/transport/MessageImplTest.java
index 4e54c31..4511fb9 100644
--- a/gms/impl/src/test/java/com/sun/enterprise/mgmt/transport/MessageImplTest.java
+++ b/gms/impl/src/test/java/org/glassfish/shoal/gms/mgmt/transport/MessageImplTest.java
@@ -14,7 +14,10 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport;
+package org.glassfish.shoal.gms.mgmt.transport;
+
+import org.glassfish.shoal.gms.mgmt.transport.Message;
+import org.glassfish.shoal.gms.mgmt.transport.MessageImpl;
 
 import junit.framework.TestCase;
 
diff --git a/gms/impl/src/test/java/com/sun/enterprise/mgmt/transport/NetworkUtilityTest.java b/gms/impl/src/test/java/org/glassfish/shoal/gms/mgmt/transport/NetworkUtilityTest.java
similarity index 97%
rename from gms/impl/src/test/java/com/sun/enterprise/mgmt/transport/NetworkUtilityTest.java
rename to gms/impl/src/test/java/org/glassfish/shoal/gms/mgmt/transport/NetworkUtilityTest.java
index 314963e..89f61ec 100644
--- a/gms/impl/src/test/java/com/sun/enterprise/mgmt/transport/NetworkUtilityTest.java
+++ b/gms/impl/src/test/java/org/glassfish/shoal/gms/mgmt/transport/NetworkUtilityTest.java
@@ -14,13 +14,15 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport;
+package org.glassfish.shoal.gms.mgmt.transport;
 
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.List;
 
+import org.glassfish.shoal.gms.mgmt.transport.NetworkUtility;
+
 import junit.framework.TestCase;
 
 public class NetworkUtilityTest extends TestCase {
diff --git a/gms/impl/src/test/java/com/sun/enterprise/mgmt/transport/grizzly/grizzly2/GrizzlyParserTest.java b/gms/impl/src/test/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/grizzly2/GrizzlyParserTest.java
similarity index 96%
rename from gms/impl/src/test/java/com/sun/enterprise/mgmt/transport/grizzly/grizzly2/GrizzlyParserTest.java
rename to gms/impl/src/test/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/grizzly2/GrizzlyParserTest.java
index 505de14..b4f4688 100644
--- a/gms/impl/src/test/java/com/sun/enterprise/mgmt/transport/grizzly/grizzly2/GrizzlyParserTest.java
+++ b/gms/impl/src/test/java/org/glassfish/shoal/gms/mgmt/transport/grizzly/grizzly2/GrizzlyParserTest.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.mgmt.transport.grizzly.grizzly2;
+package org.glassfish.shoal.gms.mgmt.transport.grizzly.grizzly2;
 
 import java.io.IOException;
 import java.util.concurrent.Future;
@@ -36,9 +36,9 @@
 import org.glassfish.grizzly.nio.transport.TCPNIOTransport;
 import org.glassfish.grizzly.nio.transport.TCPNIOTransportBuilder;
 import org.glassfish.grizzly.utils.ChunkingFilter;
-
-import com.sun.enterprise.mgmt.transport.Message;
-import com.sun.enterprise.mgmt.transport.MessageImpl;
+import org.glassfish.shoal.gms.mgmt.transport.Message;
+import org.glassfish.shoal.gms.mgmt.transport.MessageImpl;
+import org.glassfish.shoal.gms.mgmt.transport.grizzly.grizzly2.MessageFilter;
 
 import junit.framework.TestCase;
 
diff --git a/gms/impl/src/test/java/com/sun/enterprise/gms/tools/MulticastTesterTest.java b/gms/impl/src/test/java/org/glassfish/shoal/gms/tools/MulticastTesterTest.java
similarity index 96%
rename from gms/impl/src/test/java/com/sun/enterprise/gms/tools/MulticastTesterTest.java
rename to gms/impl/src/test/java/org/glassfish/shoal/gms/tools/MulticastTesterTest.java
index 63288df..fe90970 100644
--- a/gms/impl/src/test/java/com/sun/enterprise/gms/tools/MulticastTesterTest.java
+++ b/gms/impl/src/test/java/org/glassfish/shoal/gms/tools/MulticastTesterTest.java
@@ -14,7 +14,9 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package com.sun.enterprise.gms.tools;
+package org.glassfish.shoal.gms.tools;
+
+import org.glassfish.shoal.gms.tools.MulticastTester;
 
 import junit.framework.TestCase;
 
diff --git a/gms/killmembers.sh b/gms/killmembers.sh
index 50bbb84..de84dcf 100755
--- a/gms/killmembers.sh
+++ b/gms/killmembers.sh
@@ -22,7 +22,7 @@ else
 fi
 if [ ! -z "$PID" ]; then
    echo "Killing instance PID(s) :|$PID|"
-   echo "Date:";date 
+   echo "Date:";date
    kill -9  $PID
    if [ -z "${1}" ] ;then
        jps -v | grep ApplicationServer
diff --git a/gms/pom.xml b/gms/pom.xml
index 0c43650..7d6fa9d 100644
--- a/gms/pom.xml
+++ b/gms/pom.xml
@@ -1,6 +1,6 @@
 
 
 
-
+
     4.0.0
 
     
         org.glassfish.shoal
         shoal
-        3.1.1-SNAPSHOT
+        4.0.0-SNAPSHOT
     
-    
+
     shoal-gms
     pom
     shoal-gms
@@ -33,7 +33,7 @@
     
         ${basedir}
     
-    
+
     
         api
         impl
diff --git a/gms/runAPITests.sh b/gms/runAPITests.sh
index 03a55bd..0ec17e8 100755
--- a/gms/runAPITests.sh
+++ b/gms/runAPITests.sh
@@ -178,7 +178,7 @@ $ECHO
 $ECHO  "Killing any outstanding test processes"
 PIDS=`ps -ef | grep "com.sun.enterprise.ee.cms.tests.core.GroupHandleTest" | grep "${groupName}" | grep -v grep | awk '{printf ("%d ", $2)}'`
 if [ ! -z "${PIDS}" ]; then
-   $ECHO  "The following pids were found [${PIDS}], killing them"  
+   $ECHO  "The following pids were found [${PIDS}], killing them"
    kill -9 $PIDS
 fi
 PIDS1=`ps -ef | grep killoutstandingtestprocesses.sh | grep -v grep | awk '{printf ("%d ", $2)}' `
diff --git a/gms/runHAMessageReplicationSimulator.sh b/gms/runHAMessageReplicationSimulator.sh
index c3cc5d1..9f10d0e 100755
--- a/gms/runHAMessageReplicationSimulator.sh
+++ b/gms/runHAMessageReplicationSimulator.sh
@@ -99,8 +99,8 @@ analyzeLogs(){
     echo  "==============="
     grep -a "FAILED" ${LOGS_DIR}/instance*log
     echo  "==============="
-    echo  "The following are the time results for SENDING messages:" 
-    grep -a "Sending Messages Time data" ${LOGS_DIR}/instance*log 
+    echo  "The following are the time results for SENDING messages:"
+    grep -a "Sending Messages Time data" ${LOGS_DIR}/instance*log
     echo  "---------------"
     ${ECHO} "          Time Delta          MsgsPerSec  BytesPerSecond      KBytesPerSecond      Messagesize    NumOfObjects  MessagesPerObject    Signal Queue      Message Queue"
     #Delta
@@ -126,8 +126,8 @@ analyzeLogs(){
     ${ECHO} "send     ${DELTAMIN}-${DELTAMAX}     ${MPSMIN}-${MPSMAX}      ${BPSMIN}-${BPSMAX}     ${KBPSMIN}-${KBPSMAX}      ${MSGSIZE}         ${NUMOFOBJECTS}           ${MSGSPEROBJECT}                 ${SIGNALQUEUEWATERMARKMIN}-${SIGNALQUEUEWATERMARKMAX}         ${MESSAGEQUEUEWATERMARKMIN}-${MESSAGEQUEUEWATERMARKMAX}"
 
     echo  "==============="
-    echo  "The following are the time results for RECEIVING messages:" 
-    grep -a "Receiving Messages Time data" ${LOGS_DIR}/instance*log 
+    echo  "The following are the time results for RECEIVING messages:"
+    grep -a "Receiving Messages Time data" ${LOGS_DIR}/instance*log
     echo  "---------------"
     ${ECHO} "          Time Delta          MsgsPerSec  BytesPerSecond      KBytesPerSecond        Messagesize    NumOfObjects  MessagesPerObject"
     #Delta
@@ -410,7 +410,7 @@ if [ $DIST = false ]; then
         edtcp=`expr ${sdtcp} + 30`
         count=`expr ${count} + 1`
     done
-else 
+else
    # distributed environment startup
    ${ECHO} "Starting CORE members in the distributed environment"
 
diff --git a/gms/runHAMessagingSimulator.sh b/gms/runHAMessagingSimulator.sh
index d8db4eb..f287de5 100755
--- a/gms/runHAMessagingSimulator.sh
+++ b/gms/runHAMessagingSimulator.sh
@@ -224,6 +224,6 @@ done
 # give time for the instances to start
 sleep 3
 # monitor for the testing to begin
-${TMPDIR}/script3 ${numInstances} 
+${TMPDIR}/script3 ${numInstances}
 # monitor when the testing is complete
-${TMPDIR}/script2 ${numInstances} 
+${TMPDIR}/script2 ${numInstances}
diff --git a/gms/run_client.bat b/gms/run_client.bat
index d5605a6..3c9e492 100755
--- a/gms/run_client.bat
+++ b/gms/run_client.bat
@@ -1,21 +1,21 @@
-@echo off
-
-REM
-REM  # Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
-REM
-REM This program and the accompanying materials are made available under the
-REM terms of the Eclipse Public License v. 2.0, which is available at
-REM http://www.eclipse.org/legal/epl-2.0.
-
-REM This Source Code may also be made available under the following Secondary
-REM Licenses when the conditions for such availability set forth in the
-REM Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-REM version 2 with the GNU Classpath Exception, which is available at
-REM https://www.gnu.org/software/classpath/license.html.
-
-REM SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-REM
-
-setlocal
-java -Dcom.sun.management.jmxremote -DINAME=client%1 -cp .\lib\jxta.jar;dist\shoal-gms.jar com.sun.enterprise.jxtamgmt.ClusterManager
-endlocal
+@echo off
+
+REM
+REM  # Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+REM
+REM This program and the accompanying materials are made available under the
+REM terms of the Eclipse Public License v. 2.0, which is available at
+REM http://www.eclipse.org/legal/epl-2.0.
+
+REM This Source Code may also be made available under the following Secondary
+REM Licenses when the conditions for such availability set forth in the
+REM Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+REM version 2 with the GNU Classpath Exception, which is available at
+REM https://www.gnu.org/software/classpath/license.html.
+
+REM SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+REM
+
+setlocal
+java -Dcom.sun.management.jmxremote -DINAME=client%1 -cp .\lib\jxta.jar;dist\shoal-gms.jar com.sun.enterprise.jxtamgmt.ClusterManager
+endlocal
diff --git a/gms/rungmsbindinterfacetest.bat b/gms/rungmsbindinterfacetest.bat
index 2a76f23..d5a66a6 100755
--- a/gms/rungmsbindinterfacetest.bat
+++ b/gms/rungmsbindinterfacetest.bat
@@ -1,47 +1,47 @@
-@echo off
-
-REM
-REM  # Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
-REM
-REM This program and the accompanying materials are made available under the
-REM terms of the Eclipse Public License v. 2.0, which is available at
-REM http://www.eclipse.org/legal/epl-2.0.
-REM
-REM This Source Code may also be made available under the following Secondary
-REM Licenses when the conditions for such availability set forth in the
-REM Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-REM version 2 with the GNU Classpath Exception, which is available at
-REM https://www.gnu.org/software/classpath/license.html.
-REM
-REM SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-REM
-
-setlocal
-set publish_home=.\dist
-set lib_home=.\lib
-set jdk_home=%JAVA_HOME%
-echo %jdk_home%
-
-
-if "%1a"=="a" goto usage
-if "%2a"=="a" goto usage
-if "%3a"=="a" goto usage
-if "%4a"=="a" goto usage
-if "%5a"=="a" goto usage
-if "%6a"=="a" goto usage
-
-"%jdk_home%"\bin\java -Dcom.sun.management.jmxremote -DMEMBERTYPE=%3 -DINSTANCEID=%1 -DCLUSTERNAME=%2 -DMESSAGING_MODE=true -DLIFEINMILLIS=%4 -DLOG_LEVEL=%5 -DBIND_INTERFACE_ADDRESS=%6 -cp %publish_home%/shoal-gms-tests.jar;%publish_home%/shoal-gms.jar;%lib_home%/jxta.jar com.sun.enterprise.ee.cms.tests.ApplicationServer
-
-goto end
-
-
-:usage
-echo Usage: %0 parameters... 
-echo The required parameters are :
-echo instance_id_token groupname membertype{CORE--OR--SPECTATOR} Life-In-Milliseconds log-level 
-echo Life in milliseconds should be at least 60000 to demo failure fencing.
-echo  refers to the ip address of a virtual or physical network interface 
-echo which should be used by this test to bind to for all communications. Currently this test only accepts IPv4 addresses. 
-
-:end
-endlocal
+@echo off
+
+REM
+REM  # Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+REM
+REM This program and the accompanying materials are made available under the
+REM terms of the Eclipse Public License v. 2.0, which is available at
+REM http://www.eclipse.org/legal/epl-2.0.
+REM
+REM This Source Code may also be made available under the following Secondary
+REM Licenses when the conditions for such availability set forth in the
+REM Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+REM version 2 with the GNU Classpath Exception, which is available at
+REM https://www.gnu.org/software/classpath/license.html.
+REM
+REM SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+REM
+
+setlocal
+set publish_home=.\dist
+set lib_home=.\lib
+set jdk_home=%JAVA_HOME%
+echo %jdk_home%
+
+
+if "%1a"=="a" goto usage
+if "%2a"=="a" goto usage
+if "%3a"=="a" goto usage
+if "%4a"=="a" goto usage
+if "%5a"=="a" goto usage
+if "%6a"=="a" goto usage
+
+"%jdk_home%"\bin\java -Dcom.sun.management.jmxremote -DMEMBERTYPE=%3 -DINSTANCEID=%1 -DCLUSTERNAME=%2 -DMESSAGING_MODE=true -DLIFEINMILLIS=%4 -DLOG_LEVEL=%5 -DBIND_INTERFACE_ADDRESS=%6 -cp %publish_home%/shoal-gms-tests.jar;%publish_home%/shoal-gms.jar;%lib_home%/jxta.jar com.sun.enterprise.ee.cms.tests.ApplicationServer
+
+goto end
+
+
+:usage
+echo Usage: %0 parameters...
+echo The required parameters are :
+echo instance_id_token groupname membertype{CORE--OR--SPECTATOR} Life-In-Milliseconds log-level 
+echo Life in milliseconds should be at least 60000 to demo failure fencing.
+echo  refers to the ip address of a virtual or physical network interface
+echo which should be used by this test to bind to for all communications. Currently this test only accepts IPv4 addresses.
+
+:end
+endlocal
diff --git a/gms/rungmsbindinterfacetest.sh b/gms/rungmsbindinterfacetest.sh
index b0017ed..10f85ac 100755
--- a/gms/rungmsbindinterfacetest.sh
+++ b/gms/rungmsbindinterfacetest.sh
@@ -19,13 +19,13 @@ publish_home=./dist
 lib_home=./lib
 
 usage () {
-    cat << USAGE 
-Usage: $0  
+    cat << USAGE
+Usage: $0 
 The required parameters are :
       
 Life in milliseconds should be at least 60000 to demo failure fencing.
- refers to the IP address of a virtual or physical network interface which should be used 
-by this test to bind to, for all communications. Currently this test only accepts IPv4 addresses. 
+ refers to the IP address of a virtual or physical network interface which should be used
+by this test to bind to, for all communications. Currently this test only accepts IPv4 addresses.
 USAGE
    exit 0
 }
@@ -34,7 +34,7 @@ if [ $# -lt 3 ]; then
     usage;
 fi
 
-if [ -n $5 ]; then 
-	java -Dcom.sun.management.jmxremote -DMEMBERTYPE=$3 -DINSTANCEID=$1 -DCLUSTERNAME=$2 -DMESSAGING_MODE=true -DLIFEINMILLIS=$4 -DLOG_LEVEL=$5 -DBIND_INTERFACE_ADDRESS=$6 -cp ${publish_home}/shoal-gms-tests.jar:${publish_home}/shoal-gms.jar:${lib_home}/jxta.jar:${lib_home}/bcprov-jdk14.jar com.sun.enterprise.ee.cms.tests.ApplicationServer;
+if [ -n $5 ]; then
+    java -Dcom.sun.management.jmxremote -DMEMBERTYPE=$3 -DINSTANCEID=$1 -DCLUSTERNAME=$2 -DMESSAGING_MODE=true -DLIFEINMILLIS=$4 -DLOG_LEVEL=$5 -DBIND_INTERFACE_ADDRESS=$6 -cp ${publish_home}/shoal-gms-tests.jar:${publish_home}/shoal-gms.jar:${lib_home}/jxta.jar:${lib_home}/bcprov-jdk14.jar com.sun.enterprise.ee.cms.tests.ApplicationServer;
 fi
 
diff --git a/gms/rungmsdemo.bat b/gms/rungmsdemo.bat
index b227e18..e7beab9 100755
--- a/gms/rungmsdemo.bat
+++ b/gms/rungmsdemo.bat
@@ -1,155 +1,155 @@
-@echo off
-
-REM
-REM  # Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
-REM
-REM This program and the accompanying materials are made available under the
-REM terms of the Eclipse Public License v. 2.0, which is available at
-REM http://www.eclipse.org/legal/epl-2.0.
-REM
-REM This Source Code may also be made available under the following Secondary
-REM Licenses when the conditions for such availability set forth in the
-REM Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-REM version 2 with the GNU Classpath Exception, which is available at
-REM https://www.gnu.org/software/classpath/license.html.
-REM
-REM SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-REM
-
-setlocal
-set PUBLISH_HOME=.\dist
-set LIB_HOME=.\lib
-set JDK_HOME=%JAVA_HOME%\bin
-echo %JDK_HOME%
-
-
-
-set MAINCLASS=com.sun.enterprise.ee.cms.tests.ApplicationServer
-
-set GRIZZLY_JARS=%PUBLISH_HOME%\shoal-gms-tests.jar;%PUBLISH_HOME%\shoal-gms.jar;%LIB_HOME%\grizzly-framework.jar;%LIB_HOME%\grizzly-utils.jar
-set JXTA_JARS=%PUBLISH_HOME%\shoal-gms-tests.jar;%PUBLISH_HOME%\shoal-gms.jar;%LIB_HOME%\grizzly-framework.jar;%LIB_HOME%\grizzly-utils.jar;%LIB_HOME%\jxta.jar
-set DEBUGARGS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -DjxtaMulticastPoolsize=25"
-set NONDEBUGARGS="-Dcom.sun.management.jmxremote"
-set JARS=%GRIZZLY_JARS%
-
-
-
-set DEBUG=false
-set TCPSTARTPORT=""
-set TCPENDPORT=""
-set MULTICASTADDRESS="-DMULTICASTADDRESS=229.9.1.2"
-set MULTICASTPORT="-DMULTICASTPORT=2299"
-set TRANSPORT=grizzly
-
-
-if "%1a"=="a" goto usage
-if "%2a"=="a" goto usage
-if "%3a"=="a" goto usage
-if "%4a"=="a" goto usage
-if "%5a"=="a" goto usage
-if "%6a"=="a" goto usage
-
-set INSTANCEID=%1
-shift
-set CLUSTERNAME=%1
-shift
-set MEMBERTYPE=%1
-shift
-set LIFEINMILLIS=%1
-shift
-set LOGLEVEL=%1
-shift
-set TRANSPORT=%1
-
-:setdebug
-set DEBUG=true
-shift
-goto parseRemainingArgs
-
-:settcpstartport
-shift
-set TCPSTARTPORT=%1
-shift
-goto parseRemainingArgs
-
-:settcpendport
-shift
-set TCPENDPORT=%1
-shift
-goto parseRemainingArgs
-
-:setmulticastaddress
-shift
-set MULTICASTADDRESS=%1
-shift
-goto parseRemainingArgs
-
-:setmulticastport
-shift
-set MULTICASTPORT=%1
-shift
-goto parseRemainingArgs
-
-
-:parseRemainingArgs
-if ""%1""=="""" goto doneArgs
-if ""%1""==""-h"" goto usage
-if ""%1""==""-debug"" goto setdebug
-if ""%1""==""-ts"" goto settcpstartport
-if ""%1""==""-te"" goto settcpendport
-if ""%1""==""-ma"" goto setmulticastaddress
-if ""%1""==""-mp"" goto setmulticastport
-echo "ERRROR: ignoring invalid argument %1"
-shift
-goto usage
-
-:doneArgs
-
-
-if "%MEMBERTYPE%" == "CORE" goto continue1
-if "%MEMBERTYPE%" == "SPECTATOR" goto continue1
-if "%MEMBERTYPE%" == "WATCHDOG" goto continue1
-echo "ERROR: Invalid membertype specified"
-goto usage
-
-:continue1
-
-if "%TRANSPORT%" == "grizzly" goto continue2
-if "%TRANSPORT%" == "jxta" goto continue2
-if "%TRANSPORT%" == "jxtanew" goto continue2
-echo "ERROR: Invalid transport specified"
-goto usage
-
-:continue2
-
-if "%TRANSPORT%" == "grizzly" goto continue3
-set JARS=%JXTA_JARS%
-
-:continue3
-
-if "%DEBUG%" == "false" goto continue4
-set OTHERARGS=%NONDEBUGARGS%
-goto continue5
-:continue4
-set OTHERARGS=%DEBUGARGS%
-
-:continue5
-
-
-"%JDK_HOME%"\java %OTHERARGS% -DMEMBERTYPE=%MEMBERTYPE% -DINSTANCEID=%INSTANCEID% -DCLUSTERNAME=%CLUSTERNAME% -DMESSAGING_MODE=true -DLIFEINMILLIS=%LIFEINMILLIS% -DLOG_LEVEL=%LOGLEVEL% -cp %JARS% -DTCPSTARTPORT=%TCPSTARTPORT% -DTCPENDPORT=%TCPENDPORT% -DSHOAL_GROUP_COMMUNICATION_PROVIDER=%TRANSPORT% %MULTICASTADDRESS% %MULTICASTPORT% %MAINCLASS%
-
-goto end
-
-:usage
-echo Usage: $0 parameters...
-echo The required parameters are :
-echo instance_id_token groupname membertype{CORE--or--SPECTATOR} Life-In-Milliseconds> log-level transport{grizzly,jxtanew,jxta} -ts tcpstartport -tp tcpendport  -ma multicastaddress -mp multicastport
-echo
-echo Life in milliseconds should be either 0 or at least 60000 to demo failure fencing.
-echo
-echo -ts tcpstartport, -te tcpendport, -ma multicastaddress, -mp multicastport  are optional parameters.
-echo Grizzly and jxta transports have different defaults.
-
-
-:end
-endlocal
+@echo off
+
+REM
+REM  # Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+REM
+REM This program and the accompanying materials are made available under the
+REM terms of the Eclipse Public License v. 2.0, which is available at
+REM http://www.eclipse.org/legal/epl-2.0.
+REM
+REM This Source Code may also be made available under the following Secondary
+REM Licenses when the conditions for such availability set forth in the
+REM Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+REM version 2 with the GNU Classpath Exception, which is available at
+REM https://www.gnu.org/software/classpath/license.html.
+REM
+REM SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+REM
+
+setlocal
+set PUBLISH_HOME=.\dist
+set LIB_HOME=.\lib
+set JDK_HOME=%JAVA_HOME%\bin
+echo %JDK_HOME%
+
+
+
+set MAINCLASS=com.sun.enterprise.ee.cms.tests.ApplicationServer
+
+set GRIZZLY_JARS=%PUBLISH_HOME%\shoal-gms-tests.jar;%PUBLISH_HOME%\shoal-gms.jar;%LIB_HOME%\grizzly-framework.jar;%LIB_HOME%\grizzly-utils.jar
+set JXTA_JARS=%PUBLISH_HOME%\shoal-gms-tests.jar;%PUBLISH_HOME%\shoal-gms.jar;%LIB_HOME%\grizzly-framework.jar;%LIB_HOME%\grizzly-utils.jar;%LIB_HOME%\jxta.jar
+set DEBUGARGS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -DjxtaMulticastPoolsize=25"
+set NONDEBUGARGS="-Dcom.sun.management.jmxremote"
+set JARS=%GRIZZLY_JARS%
+
+
+
+set DEBUG=false
+set TCPSTARTPORT=""
+set TCPENDPORT=""
+set MULTICASTADDRESS="-DMULTICASTADDRESS=229.9.1.2"
+set MULTICASTPORT="-DMULTICASTPORT=2299"
+set TRANSPORT=grizzly
+
+
+if "%1a"=="a" goto usage
+if "%2a"=="a" goto usage
+if "%3a"=="a" goto usage
+if "%4a"=="a" goto usage
+if "%5a"=="a" goto usage
+if "%6a"=="a" goto usage
+
+set INSTANCEID=%1
+shift
+set CLUSTERNAME=%1
+shift
+set MEMBERTYPE=%1
+shift
+set LIFEINMILLIS=%1
+shift
+set LOGLEVEL=%1
+shift
+set TRANSPORT=%1
+
+:setdebug
+set DEBUG=true
+shift
+goto parseRemainingArgs
+
+:settcpstartport
+shift
+set TCPSTARTPORT=%1
+shift
+goto parseRemainingArgs
+
+:settcpendport
+shift
+set TCPENDPORT=%1
+shift
+goto parseRemainingArgs
+
+:setmulticastaddress
+shift
+set MULTICASTADDRESS=%1
+shift
+goto parseRemainingArgs
+
+:setmulticastport
+shift
+set MULTICASTPORT=%1
+shift
+goto parseRemainingArgs
+
+
+:parseRemainingArgs
+if ""%1""=="""" goto doneArgs
+if ""%1""==""-h"" goto usage
+if ""%1""==""-debug"" goto setdebug
+if ""%1""==""-ts"" goto settcpstartport
+if ""%1""==""-te"" goto settcpendport
+if ""%1""==""-ma"" goto setmulticastaddress
+if ""%1""==""-mp"" goto setmulticastport
+echo "ERRROR: ignoring invalid argument %1"
+shift
+goto usage
+
+:doneArgs
+
+
+if "%MEMBERTYPE%" == "CORE" goto continue1
+if "%MEMBERTYPE%" == "SPECTATOR" goto continue1
+if "%MEMBERTYPE%" == "WATCHDOG" goto continue1
+echo "ERROR: Invalid membertype specified"
+goto usage
+
+:continue1
+
+if "%TRANSPORT%" == "grizzly" goto continue2
+if "%TRANSPORT%" == "jxta" goto continue2
+if "%TRANSPORT%" == "jxtanew" goto continue2
+echo "ERROR: Invalid transport specified"
+goto usage
+
+:continue2
+
+if "%TRANSPORT%" == "grizzly" goto continue3
+set JARS=%JXTA_JARS%
+
+:continue3
+
+if "%DEBUG%" == "false" goto continue4
+set OTHERARGS=%NONDEBUGARGS%
+goto continue5
+:continue4
+set OTHERARGS=%DEBUGARGS%
+
+:continue5
+
+
+"%JDK_HOME%"\java %OTHERARGS% -DMEMBERTYPE=%MEMBERTYPE% -DINSTANCEID=%INSTANCEID% -DCLUSTERNAME=%CLUSTERNAME% -DMESSAGING_MODE=true -DLIFEINMILLIS=%LIFEINMILLIS% -DLOG_LEVEL=%LOGLEVEL% -cp %JARS% -DTCPSTARTPORT=%TCPSTARTPORT% -DTCPENDPORT=%TCPENDPORT% -DSHOAL_GROUP_COMMUNICATION_PROVIDER=%TRANSPORT% %MULTICASTADDRESS% %MULTICASTPORT% %MAINCLASS%
+
+goto end
+
+:usage
+echo Usage: $0 parameters...
+echo The required parameters are :
+echo instance_id_token groupname membertype{CORE--or--SPECTATOR} Life-In-Milliseconds> log-level transport{grizzly,jxtanew,jxta} -ts tcpstartport -tp tcpendport  -ma multicastaddress -mp multicastport
+echo
+echo Life in milliseconds should be either 0 or at least 60000 to demo failure fencing.
+echo
+echo -ts tcpstartport, -te tcpendport, -ma multicastaddress, -mp multicastport  are optional parameters.
+echo Grizzly and jxta transports have different defaults.
+
+
+:end
+endlocal
diff --git a/gms/rungmsdemo.sh b/gms/rungmsdemo.sh
index 111a490..2aa1060 100755
--- a/gms/rungmsdemo.sh
+++ b/gms/rungmsdemo.sh
@@ -19,8 +19,8 @@ PUBLISH_HOME=./dist
 LIB_HOME=./lib
 
 usage () {
-    cat << USAGE 
-Usage: $0  
+    cat << USAGE
+Usage: $0 
 The required parameters are :
       {grizzly,jxta} <-l logdir> <-ts tcpstartport> <-tp tcpendport> <-ma multicastaddress> <-mp multicastport> <-bia bindinginterfaceaddress>
 
diff --git a/gms/rungmsdemo_nomcast.sh b/gms/rungmsdemo_nomcast.sh
index 0910be2..fbb9742 100755
--- a/gms/rungmsdemo_nomcast.sh
+++ b/gms/rungmsdemo_nomcast.sh
@@ -19,8 +19,8 @@ PUBLISH_HOME=./dist
 LIB_HOME=./lib
 
 usage () {
-    cat << USAGE 
-Usage: $0  
+    cat << USAGE
+Usage: $0 
 The required parameters are :
       {grizzly,jxta} <-l logdir> <-ts tcpstartport> <-tp tcpendport> <-ma multicastaddress> <-mp multicastport> <-bia bindinginterfaceaddress>
 
diff --git a/gms/rungmsgetmemberstate.bat b/gms/rungmsgetmemberstate.bat
index 3ac7d49..5993ef1 100644
--- a/gms/rungmsgetmemberstate.bat
+++ b/gms/rungmsgetmemberstate.bat
@@ -1,51 +1,51 @@
-@echo off
-
-REM
-REM  # Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
-REM
-REM This program and the accompanying materials are made available under the
-REM terms of the Eclipse Public License v. 2.0, which is available at
-REM http://www.eclipse.org/legal/epl-2.0.
-REM
-REM This Source Code may also be made available under the following Secondary
-REM Licenses when the conditions for such availability set forth in the
-REM Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-REM version 2 with the GNU Classpath Exception, which is available at
-REM https://www.gnu.org/software/classpath/license.html.
-REM
-REM SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-REM
-
-setlocal
-set publish_home=.\dist
-set lib_home=.\lib
-set jdk_home=%JAVA_HOME%\bin
-echo %jdk_home%
-
-
-if "%1a"=="a" goto usage
-if "%2a"=="a" goto usage
-if "%3a"=="a" goto usage
-if "%4a"=="a" goto usage
-if "%5a"=="a" goto usage
-if "%6a"=="a" goto usage
-if "%7a"=="a" goto usage
-
-if "%5"=="-debug" goto debug
-
-"%jdk_home%"\java -Dcom.sun.management.jmxremote -DMEMBERTYPE=%3 -DINSTANCEID=%1 -DCLUSTERNAME=%2 -DMESSAGING_MODE=true -DLIFEINMILLIS=%4 -DLOG_LEVEL=%5 -DGETMEMBERSTATE=true -DGETMEMBERSTATE_THRESHOLD=$6 -DGETMEMBERSTATE_TIMEOUT=$7 -cp %publish_home%/shoal-gms-tests.jar;%publish_home%/shoal-gms.jar;%lib_home%/jxta.jar com.sun.enterprise.ee.cms.tests.ApplicationServer
-
-goto end
-
-:debug
-"%jdk_home%"\java -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp;transport=dt_socket,server=y,suspend=y,address=5005 -DMEMBERTYPE=%3 -DINSTANCEID=%1 -DCLUSTERNAME=%2 -DMESSAGING_MODE=true -DLIFEINMILLIS=%4 -DLOG_LEVEL=INFO -DGETMEMBERSTATE=true -DGETMEMBERSTATE_THRESHOLD=$6 -DGETMEMBERSTATE_TIMEOUT=$7 -cp %publish_home%/shoal-gms-tests.jar;%publish_home%/shoal-gms.jar;%lib_home%/jxta.jar com.sun.enterprise.ee.cms.tests.ApplicationServer
-goto end
-
-:usage
-echo Usage: %0 parameters... 
-echo The required parameters are :
-echo instance_id_token groupname membertype{CORE--OR--SPECTATOR} Life-In-Milliseconds log-level memberstate_threshold memberstate_timeout
-echo Life in milliseconds should be at least 60000 to demo failure fencing.
-
-:end
-endlocal
+@echo off
+
+REM
+REM  # Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+REM
+REM This program and the accompanying materials are made available under the
+REM terms of the Eclipse Public License v. 2.0, which is available at
+REM http://www.eclipse.org/legal/epl-2.0.
+REM
+REM This Source Code may also be made available under the following Secondary
+REM Licenses when the conditions for such availability set forth in the
+REM Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+REM version 2 with the GNU Classpath Exception, which is available at
+REM https://www.gnu.org/software/classpath/license.html.
+REM
+REM SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+REM
+
+setlocal
+set publish_home=.\dist
+set lib_home=.\lib
+set jdk_home=%JAVA_HOME%\bin
+echo %jdk_home%
+
+
+if "%1a"=="a" goto usage
+if "%2a"=="a" goto usage
+if "%3a"=="a" goto usage
+if "%4a"=="a" goto usage
+if "%5a"=="a" goto usage
+if "%6a"=="a" goto usage
+if "%7a"=="a" goto usage
+
+if "%5"=="-debug" goto debug
+
+"%jdk_home%"\java -Dcom.sun.management.jmxremote -DMEMBERTYPE=%3 -DINSTANCEID=%1 -DCLUSTERNAME=%2 -DMESSAGING_MODE=true -DLIFEINMILLIS=%4 -DLOG_LEVEL=%5 -DGETMEMBERSTATE=true -DGETMEMBERSTATE_THRESHOLD=$6 -DGETMEMBERSTATE_TIMEOUT=$7 -cp %publish_home%/shoal-gms-tests.jar;%publish_home%/shoal-gms.jar;%lib_home%/jxta.jar com.sun.enterprise.ee.cms.tests.ApplicationServer
+
+goto end
+
+:debug
+"%jdk_home%"\java -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp;transport=dt_socket,server=y,suspend=y,address=5005 -DMEMBERTYPE=%3 -DINSTANCEID=%1 -DCLUSTERNAME=%2 -DMESSAGING_MODE=true -DLIFEINMILLIS=%4 -DLOG_LEVEL=INFO -DGETMEMBERSTATE=true -DGETMEMBERSTATE_THRESHOLD=$6 -DGETMEMBERSTATE_TIMEOUT=$7 -cp %publish_home%/shoal-gms-tests.jar;%publish_home%/shoal-gms.jar;%lib_home%/jxta.jar com.sun.enterprise.ee.cms.tests.ApplicationServer
+goto end
+
+:usage
+echo Usage: %0 parameters...
+echo The required parameters are :
+echo instance_id_token groupname membertype{CORE--OR--SPECTATOR} Life-In-Milliseconds log-level memberstate_threshold memberstate_timeout
+echo Life in milliseconds should be at least 60000 to demo failure fencing.
+
+:end
+endlocal
diff --git a/gms/rungmsgetmemberstate.sh b/gms/rungmsgetmemberstate.sh
index 88cb56f..f393f82 100755
--- a/gms/rungmsgetmemberstate.sh
+++ b/gms/rungmsgetmemberstate.sh
@@ -19,8 +19,8 @@ publish_home=./dist
 lib_home=./lib
 
 usage () {
-    cat << USAGE 
-Usage: $0  
+    cat << USAGE
+Usage: $0 
 The required parameters are :
         Life in milliseconds should be at least 60000 to demo failure fencing.
 USAGE
@@ -31,11 +31,11 @@ if [ $# -lt 3 ]; then
     usage;
 fi
 
-if [ -n $5 ]; then 
+if [ -n $5 ]; then
     if [ $5 = "-debug" ]; then
-	java -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -DMEMBERTYPE=$3 -DINSTANCEID=$1 -DCLUSTERNAME=$2 -DMESSAGING_MODE=true -DLIFEINMILLIS=$4 -DLOG_LEVEL=INFO -DGETMEMBERSTATE=true -DGETMEMBERSTATE_THRESHOLD=$6 -DGETMEMBERSTATE_TIMEOUT=$7 -cp ${publish_home}/shoal-gms-tests.jar:${publish_home}/shoal-gms.jar:${lib_home}/jxta.jar:${lib_home}/bcprov-jdk14.jar com.sun.enterprise.ee.cms.tests.ApplicationServer;
+    java -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -DMEMBERTYPE=$3 -DINSTANCEID=$1 -DCLUSTERNAME=$2 -DMESSAGING_MODE=true -DLIFEINMILLIS=$4 -DLOG_LEVEL=INFO -DGETMEMBERSTATE=true -DGETMEMBERSTATE_THRESHOLD=$6 -DGETMEMBERSTATE_TIMEOUT=$7 -cp ${publish_home}/shoal-gms-tests.jar:${publish_home}/shoal-gms.jar:${lib_home}/jxta.jar:${lib_home}/bcprov-jdk14.jar com.sun.enterprise.ee.cms.tests.ApplicationServer;
     else
-	java -Dcom.sun.management.jmxremote -DMEMBERTYPE=$3 -DINSTANCEID=$1 -DCLUSTERNAME=$2 -DMESSAGING_MODE=true -DLIFEINMILLIS=$4 -DLOG_LEVEL=$5 -DGETMEMBERSTATE=true -DGETMEMBERSTATE_THRESHOLD=$6 -DGETMEMBERSTATE_TIMEOUT=$7 -cp ${publish_home}/shoal-gms-tests.jar:${publish_home}/shoal-gms.jar:${lib_home}/jxta.jar:${lib_home}/bcprov-jdk14.jar com.sun.enterprise.ee.cms.tests.ApplicationServer;
+    java -Dcom.sun.management.jmxremote -DMEMBERTYPE=$3 -DINSTANCEID=$1 -DCLUSTERNAME=$2 -DMESSAGING_MODE=true -DLIFEINMILLIS=$4 -DLOG_LEVEL=$5 -DGETMEMBERSTATE=true -DGETMEMBERSTATE_THRESHOLD=$6 -DGETMEMBERSTATE_TIMEOUT=$7 -cp ${publish_home}/shoal-gms-tests.jar:${publish_home}/shoal-gms.jar:${lib_home}/jxta.jar:${lib_home}/bcprov-jdk14.jar com.sun.enterprise.ee.cms.tests.ApplicationServer;
     fi
 fi
 
diff --git a/gms/runmessagetest.sh b/gms/runmessagetest.sh
index 6228bd2..ebf16f6 100755
--- a/gms/runmessagetest.sh
+++ b/gms/runmessagetest.sh
@@ -19,8 +19,8 @@ publish_home=./dist
 lib_home=./lib
 
 usage () {
-    cat << USAGE 
-Usage: $0  
+    cat << USAGE
+Usage: $0 
 The required parameters are :
       
  and  are optional.  Grizzly and jxta transports have different defaults.
diff --git a/gms/runnomcastsimulatecluster.sh b/gms/runnomcastsimulatecluster.sh
index c4cc2cc..a09841e 100755
--- a/gms/runnomcastsimulatecluster.sh
+++ b/gms/runnomcastsimulatecluster.sh
@@ -618,6 +618,6 @@ else
       WORKSPACE_HOME=`echo $TMP | awk -F= '{print $2}' `
       echo "Collecting netstat results from ${INSTANCE_NAME}"
       echo "---------------------------------------------------"
-      ${EXECUTE_REMOTE_CONNECT} ${MACHINE_NAME} "cd ${WORKSPACE_HOME}; netstat.sh -u ${LOGS_DIR}/netstat_${INSTANCE_NAME}.log" 
+      ${EXECUTE_REMOTE_CONNECT} ${MACHINE_NAME} "cd ${WORKSPACE_HOME}; netstat.sh -u ${LOGS_DIR}/netstat_${INSTANCE_NAME}.log"
    done
 fi
diff --git a/gms/runp2pmsgsendreceive.sh b/gms/runp2pmsgsendreceive.sh
index e1bfb6f..996f9c4 100755
--- a/gms/runp2pmsgsendreceive.sh
+++ b/gms/runp2pmsgsendreceive.sh
@@ -19,10 +19,10 @@ publish_home=./dist
 lib_home=./lib
 
 usage () {
-    cat << USAGE 
-Usage: $0  
+    cat << USAGE
+Usage: $0 
 The required parameters are :
-  
+ 
 USAGE
    exit 0
 }
@@ -31,7 +31,7 @@ USAGE
  #   usage;
 #fi
 
-#if [ -n $5 ]; then 
+#if [ -n $5 ]; then
 
 java -Dcom.sun.management.jmxremote -cp ${publish_home}/shoal-gms-tests.jar:${publish_home}/shoal-gms.jar:${lib_home}/jxta.jar:${lib_home}/bcprov-jdk14.jar -DTYPE=$1 com.sun.enterprise.ee.cms.tests.p2pmessagesend.P2PMessageSendAndReceive;
 
diff --git a/gms/runsimulatecluster.sh b/gms/runsimulatecluster.sh
index b1ba6b8..4d1fdff 100755
--- a/gms/runsimulatecluster.sh
+++ b/gms/runsimulatecluster.sh
@@ -618,6 +618,6 @@ else
       WORKSPACE_HOME=`echo $TMP | awk -F= '{print $2}' `
       echo "Collecting netstat results from ${INSTANCE_NAME}"
       echo "---------------------------------------------------"
-      ${EXECUTE_REMOTE_CONNECT} ${MACHINE_NAME} "cd ${WORKSPACE_HOME}; netstat.sh -u ${LOGS_DIR}/netstat_${INSTANCE_NAME}.log" 
+      ${EXECUTE_REMOTE_CONNECT} ${MACHINE_NAME} "cd ${WORKSPACE_HOME}; netstat.sh -u ${LOGS_DIR}/netstat_${INSTANCE_NAME}.log"
    done
 fi
diff --git a/gms/stress.sh b/gms/stress.sh
index 87b8326..c73afd6 100755
--- a/gms/stress.sh
+++ b/gms/stress.sh
@@ -21,10 +21,10 @@ iterations=$1
 count=0
 while [ $count -lt 6 ]
 do
-	echo Running instance $count 
-	pid=exec java -Dcom.sun.management.jmxremote -DINAME=client$count -cp ./lib/jxta.jar:./lib/log4j.jar:./lib/bcprov-jdk14.jar:dist/shoal-gms.jar com.sun.enterprise.jxtamgmt.ClusterManager >& logs/client$count &
-	sleep 2s
-	echo $pid
-	count=`expr $count + 1`
+    echo Running instance $count
+    pid=exec java -Dcom.sun.management.jmxremote -DINAME=client$count -cp ./lib/jxta.jar:./lib/log4j.jar:./lib/bcprov-jdk14.jar:dist/shoal-gms.jar com.sun.enterprise.jxtamgmt.ClusterManager >& logs/client$count &
+    sleep 2s
+    echo $pid
+    count=`expr $count + 1`
 done
 
diff --git a/gms/taskdefs.xml b/gms/taskdefs.xml
index 646c942..867b501 100644
--- a/gms/taskdefs.xml
+++ b/gms/taskdefs.xml
@@ -45,7 +45,7 @@
          
        
      
- 
+
     
         
     
diff --git a/gms/tests/com/sun/enterprise/ee/cms/tests/ApplicationServer.java b/gms/tests/com/sun/enterprise/ee/cms/tests/ApplicationServer.java
index dcdbe0f..6f33d8f 100644
--- a/gms/tests/com/sun/enterprise/ee/cms/tests/ApplicationServer.java
+++ b/gms/tests/com/sun/enterprise/ee/cms/tests/ApplicationServer.java
@@ -36,7 +36,7 @@
 import com.sun.enterprise.ee.cms.impl.client.JoinedAndReadyNotificationActionFactoryImpl;
 import com.sun.enterprise.ee.cms.impl.client.FailureNotificationActionFactoryImpl;
 import com.sun.enterprise.ee.cms.impl.client.PlannedShutdownActionFactoryImpl;
-import com.sun.enterprise.ee.cms.impl.common.GroupManagementServiceImpl;
+import org.glassfish.shoal.gms.common.GroupManagementServiceImpl;
 import com.sun.enterprise.ee.cms.impl.base.Utility;
 import com.sun.enterprise.ee.cms.logging.GMSLogDomain;
 import com.sun.enterprise.ee.cms.spi.MemberStates;
@@ -118,7 +118,7 @@ public void run() {
         } catch (InterruptedException ie) {}
         logger.log(Level.FINE,"reporting joined and ready state...");
         gms.reportJoinedAndReadyState();
-        
+
         logger.log(Level.INFO, "Waiting for timeout or group shutdown...");
         gaa.waitTillNotified();
 
@@ -166,7 +166,7 @@ public void startGMS() {
         try {
             gms.join();
             logger.info("joined group " + gms.getGroupName()  + " groupLeader: " + gms.getGroupHandle().getGroupLeader());
-            
+
         } catch (GMSException ge) {
             logger.log(Level.SEVERE, "failed to join gms group " + gms.getGroupName(), ge);
             throw new IllegalStateException("failed to join gms group" + gms.getGroupName());
@@ -284,19 +284,19 @@ public void processNotification(Signal notification) {
         }
 
     }
-    
+
     // simulate CLB polling getMemberState
     public class CLB implements Runnable {
         boolean getMemberState;
         long threshold;
         long timeout;
-        
+
         public CLB(boolean getMemberState, long threshold, long timeout) {
             this.getMemberState = getMemberState;
             this.threshold = threshold;
             this.timeout = timeout;
         }
-        
+
         private void getAllMemberStates() {
             long startTime = System.currentTimeMillis();
             List members = gms.getGroupHandle().getCurrentCoreMembers();
@@ -304,17 +304,17 @@ private void getAllMemberStates() {
                           " timeout(ms)=" + timeout);
             for (String member : members) {
                 MemberStates state = gms.getGroupHandle().getMemberState(member, threshold, timeout);
-                logger.info("getMemberState member=" + member + " state=" + state + 
+                logger.info("getMemberState member=" + member + " state=" + state +
                         " threshold=" + threshold + " timeout=" + timeout);
             }
             logger.info("exit getAllMemberStates()  elapsed time=" + (System.currentTimeMillis() - startTime) +
                     " ms " + "currentMembers#=" + members.size());
         }
-        
+
         public void run() {
             while (getMemberState && !stopped) {
                 getAllMemberStates();
-                try { 
+                try {
                     Thread.sleep(500);
                 } catch (InterruptedException ie) {}
             }
@@ -356,7 +356,7 @@ public static void main(final String[] args) {
         final ApplicationServer applicationServer;
         final String MEMBERTYPE_STRING = System.getProperty("MEMBERTYPE", "CORE").toUpperCase();
         final GroupManagementService.MemberType memberType = GroupManagementService.MemberType.valueOf(MEMBERTYPE_STRING);
-        
+
         Properties configProps = new Properties();
         configProps.put(ServiceProviderConfigurationKeys.MONITORING.toString(), "5"); //seconds
 
@@ -397,7 +397,7 @@ public static void main(final String[] args) {
             String threshold = System.getProperty("GETMEMBERSTATE_THRESHOLD","3000");
             long getMemberStateThreshold = Long.parseLong(threshold);
             long getMemberStateTimeout = Long.parseLong(System.getProperty("GETMEMBERSTATE_TIMEOUT", "3000"));
-            logger.fine("getMemberState=true threshold=" + getMemberStateThreshold + 
+            logger.fine("getMemberState=true threshold=" + getMemberStateThreshold +
                     " timeout=" + getMemberStateTimeout);
             clb = applicationServer.new CLB(getMemberState, getMemberStateThreshold, getMemberStateTimeout);
         }
@@ -411,13 +411,13 @@ public static void main(final String[] args) {
             // developer level manual WATCHDOG test.
             // Start each of the following items in a different terminal window.
             // Fix permissions for shell scripts: chmod +x rungmsdemo.sh killmembers.sh
-            // 1. ./rungmsdemo.sh server cluster1 SPECTATOR 600000 FINE &> server.log 
+            // 1. ./rungmsdemo.sh server cluster1 SPECTATOR 600000 FINE &> server.log
             // 2. ./rungmsdemo.sh instance1 cluster1 CORE 600000 FINE
             // 3. ./rungmsdemo.sh instance10 cluster1 CORE 600000 FINE
             // 4. ./rungmsdemo.sh nodeagent cluster1 WATCHDOG 600000 FINE
             //
-            // If WATCHDOG, then test reporting failure to cluster. 
-            // kill instance10 15 seconds after starting nodeagent WATCHDOG.  
+            // If WATCHDOG, then test reporting failure to cluster.
+            // kill instance10 15 seconds after starting nodeagent WATCHDOG.
             // Broadcast failure and check server.log for
             // immediate FAILURE detection, not FAILURE detected by GMS heartbeat.
             // grep server.log for WATCHDOG to see watchdog notification time compared to FAILURE report.
diff --git a/gms/tests/com/sun/enterprise/ee/cms/tests/GMSAdminAgent.java b/gms/tests/com/sun/enterprise/ee/cms/tests/GMSAdminAgent.java
index 2671b8e..2f56b88 100644
--- a/gms/tests/com/sun/enterprise/ee/cms/tests/GMSAdminAgent.java
+++ b/gms/tests/com/sun/enterprise/ee/cms/tests/GMSAdminAgent.java
@@ -18,7 +18,7 @@
 
 import com.sun.enterprise.ee.cms.core.*;
 import com.sun.enterprise.ee.cms.impl.client.*;
-import com.sun.enterprise.ee.cms.impl.common.GroupManagementServiceImpl;
+import org.glassfish.shoal.gms.common.GroupManagementServiceImpl;
 import com.sun.enterprise.ee.cms.logging.GMSLogDomain;
 import com.sun.enterprise.ee.cms.logging.NiceLogFormatter;
 import java.util.ArrayList;
diff --git a/gms/tests/com/sun/enterprise/ee/cms/tests/GMSClientService.java b/gms/tests/com/sun/enterprise/ee/cms/tests/GMSClientService.java
index 601d2c6..6293006 100644
--- a/gms/tests/com/sun/enterprise/ee/cms/tests/GMSClientService.java
+++ b/gms/tests/com/sun/enterprise/ee/cms/tests/GMSClientService.java
@@ -83,7 +83,7 @@ public void start(){
         flag = new Thread(this, "GMSClient:"+serviceName);
         flag.start();
     }
-    
+
     public void run() {
         GroupHandle gh = gms.getGroupHandle();
 
diff --git a/gms/tests/com/sun/enterprise/ee/cms/tests/checkgroupshutdown/CheckIfGroupShuttingDownTest.java b/gms/tests/com/sun/enterprise/ee/cms/tests/checkgroupshutdown/CheckIfGroupShuttingDownTest.java
index bce3981..efc9bc3 100644
--- a/gms/tests/com/sun/enterprise/ee/cms/tests/checkgroupshutdown/CheckIfGroupShuttingDownTest.java
+++ b/gms/tests/com/sun/enterprise/ee/cms/tests/checkgroupshutdown/CheckIfGroupShuttingDownTest.java
@@ -23,7 +23,7 @@
 import java.util.logging.Level;
 import com.sun.enterprise.ee.cms.core.*;
 import com.sun.enterprise.ee.cms.impl.client.*;
-import com.sun.enterprise.ee.cms.impl.common.GMSContextFactory;
+import org.glassfish.shoal.gms.common.GMSContextFactory;
 import com.sun.enterprise.ee.cms.impl.base.Utility;
 
 /**
@@ -72,7 +72,7 @@ private void runSimpleSample(String serverName) throws GMSException {
         registerForGroupEvents(gms);
         //join group
         joinGMSGroup(group, gms);
-        
+
         if (serverName.equals("C1"))
               logger.info("SHUTDOWN : Is the group shutting down ? : " + gms.isGroupBeingShutdown());
 
@@ -92,7 +92,7 @@ private void runSimpleSample(String serverName) throws GMSException {
         } catch (InterruptedException e) {
             logger.log(Level.WARNING, e.getMessage());
         }
-        
+
         if (serverName.equals("C1"))
             logger.info("SHUTDOWN : Now is the group shutting down ? : " + gms.isGroupBeingShutdown());
 
diff --git a/gms/tests/com/sun/enterprise/ee/cms/tests/core/GroupHandleTest.java b/gms/tests/com/sun/enterprise/ee/cms/tests/core/GroupHandleTest.java
index 7ee7b04..9dec8ef 100644
--- a/gms/tests/com/sun/enterprise/ee/cms/tests/core/GroupHandleTest.java
+++ b/gms/tests/com/sun/enterprise/ee/cms/tests/core/GroupHandleTest.java
@@ -663,7 +663,7 @@ private void testExecutionCoreMember() {
             gmsLogger.log(Level.SEVERE, "TEST39: sendMessage to doesnotexist member did not result in a MemberNotInViewException");
         } catch (MemberNotInViewException mnive) {
         } catch (GMSException ge) {
-            
+
         }
 
             // send a message to the TestComponent component of all members
@@ -786,7 +786,7 @@ private void testExecutionCoreMember() {
         } catch (GMSException ge) {
             // expect this for null target component.
         }
-        
+
         // send a message to the TestComponent component of all members
         numOfTests++;
         gmsLogger.log(Level.INFO, "Executing TEST35");
@@ -1217,7 +1217,7 @@ private void testExecutionCoreMember() {
             gmsLogger.log(Level.SEVERE, "TEST46: lowerFence(null, null): resulted in a non GMSException:" + ex);
         }
 
-        // JMF: COMMENT OUT all getMemberState test for STOPPED for now.  
+        // JMF: COMMENT OUT all getMemberState test for STOPPED for now.
 
         // try to get member state of core102 using negative threshold value
 //        numOfTests++;
diff --git a/gms/tests/com/sun/enterprise/ee/cms/tests/p2pmessagesend/P2PMessageSendAndReceive.java b/gms/tests/com/sun/enterprise/ee/cms/tests/p2pmessagesend/P2PMessageSendAndReceive.java
index 7509e4d..576926a 100644
--- a/gms/tests/com/sun/enterprise/ee/cms/tests/p2pmessagesend/P2PMessageSendAndReceive.java
+++ b/gms/tests/com/sun/enterprise/ee/cms/tests/p2pmessagesend/P2PMessageSendAndReceive.java
@@ -24,14 +24,14 @@
  * This test needs to be run on 2 terminals : one as a sender and the other as a receiver.
  * The sender sends 10 messages and the receiver receives them.
  * This test is to check the P2P functionality (with a new thread being spawned for
- * every message send operation) introduced for DSC messages and messages sent using 
- * the groupHandle. 
+ * every message send operation) introduced for DSC messages and messages sent using
+ * the groupHandle.
  */
 
 import com.sun.enterprise.ee.cms.core.*;
 import com.sun.enterprise.ee.cms.impl.client.*;
-import com.sun.enterprise.ee.cms.impl.common.GMSContextFactory;
-import com.sun.enterprise.ee.cms.impl.common.GMSContext;
+import org.glassfish.shoal.gms.common.GMSContextFactory;
+import org.glassfish.shoal.gms.common.GMSContext;
 import com.sun.enterprise.ee.cms.impl.base.Utility;
 
 import java.text.MessageFormat;
@@ -112,9 +112,9 @@ private void receive() throws GMSException {
         joinGMSGroup(group, gms);
 
         try {
-	    waitForShutdown();
-	} catch (InterruptedException e) {
-	    logger.log(Level.WARNING, e.getMessage());
+        waitForShutdown();
+    } catch (InterruptedException e) {
+        logger.log(Level.WARNING, e.getMessage());
         }
 
         //leave the group gracefully
diff --git a/gms/tests/com/sun/enterprise/shoal/ShoalMessagingTest.java b/gms/tests/com/sun/enterprise/shoal/ShoalMessagingTest.java
index 380712e..4e79cc0 100644
--- a/gms/tests/com/sun/enterprise/shoal/ShoalMessagingTest.java
+++ b/gms/tests/com/sun/enterprise/shoal/ShoalMessagingTest.java
@@ -128,8 +128,8 @@ public void processNotification(Signal signal) {
                 System.out.println("-- received " + total_msgs_received);
             }
             if (total_msgs_received == 2001) {
-		        throw new NullPointerException("simulated unchecked exception test");
-	        }
+                throw new NullPointerException("simulated unchecked exception test");
+            }
             if (total_msgs_received == num_msgs * nbOfMembers) {
                 // signal that completed receiving all expected messages so app can continue and shutdown.
                 synchronized(sendMessagesSignal) {
diff --git a/gms/tests/com/sun/enterprise/shoal/groupleadertest/GroupLeaderTest.java b/gms/tests/com/sun/enterprise/shoal/groupleadertest/GroupLeaderTest.java
index ef9f4a7..44bce41 100644
--- a/gms/tests/com/sun/enterprise/shoal/groupleadertest/GroupLeaderTest.java
+++ b/gms/tests/com/sun/enterprise/shoal/groupleadertest/GroupLeaderTest.java
@@ -32,37 +32,37 @@
 
 public class GroupLeaderTest {
 
-	
-	/**
-	 * main
-	 * 
-	 * @param args command line args
-	 */
-	public static void main(String[] args) {
-		
-		
-		String serverToken = UUID.randomUUID().toString();
-		GroupManagementService gms = (GroupManagementService) GMSFactory.startGMSModule(serverToken, "DemoGroup", MemberType.CORE, null);
-		try {
-			gms.join();
-		} catch (GMSException e) {
-			e.printStackTrace();
-		}
-		
-		GroupHandle groupHandle = gms.getGroupHandle();
-		System.out.println(groupHandle.isGroupLeader());
-		System.out.println(groupHandle.getGroupLeader());
-		
-		try {
-			Thread.sleep(10000);
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-		
-		System.out.println(groupHandle.isGroupLeader());
-		System.out.println(groupHandle.getGroupLeader());
-		
-		
-	}
+
+    /**
+     * main
+     *
+     * @param args command line args
+     */
+    public static void main(String[] args) {
+
+
+        String serverToken = UUID.randomUUID().toString();
+        GroupManagementService gms = (GroupManagementService) GMSFactory.startGMSModule(serverToken, "DemoGroup", MemberType.CORE, null);
+        try {
+            gms.join();
+        } catch (GMSException e) {
+            e.printStackTrace();
+        }
+
+        GroupHandle groupHandle = gms.getGroupHandle();
+        System.out.println(groupHandle.isGroupLeader());
+        System.out.println(groupHandle.getGroupLeader());
+
+        try {
+            Thread.sleep(10000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+
+        System.out.println(groupHandle.isGroupLeader());
+        System.out.println(groupHandle.getGroupLeader());
+
+
+    }
 
 }
diff --git a/gms/tests/com/sun/enterprise/shoal/memberdetailstest/MemberDetailsTest.java b/gms/tests/com/sun/enterprise/shoal/memberdetailstest/MemberDetailsTest.java
index 12bd1ef..bffe13e 100644
--- a/gms/tests/com/sun/enterprise/shoal/memberdetailstest/MemberDetailsTest.java
+++ b/gms/tests/com/sun/enterprise/shoal/memberdetailstest/MemberDetailsTest.java
@@ -27,7 +27,7 @@
 import com.sun.enterprise.ee.cms.core.GMSFactory;
 import com.sun.enterprise.ee.cms.core.GroupManagementService;
 import com.sun.enterprise.ee.cms.core.GroupManagementService.MemberType;
-import com.sun.enterprise.ee.cms.impl.common.GroupManagementServiceImpl;
+import org.glassfish.shoal.gms.common.GroupManagementServiceImpl;
 
 /**
  * Simple test for MemberDetails
@@ -37,55 +37,55 @@
 
 public class MemberDetailsTest {
 
-	/**
-	 * main
-	 * 
-	 * every node's member details contains a key named memberToken.
-	 * 
-	 * start MemberDetailsTest's serveral instance,see the console's infomation. 
-	 * 
-	 * @param args command line args
-	 */
-	public static void main(String[] args) {
-		
-		String serverToken = UUID.randomUUID().toString();
-		GroupManagementService gms = (GroupManagementService) GMSFactory.startGMSModule(serverToken, "DemoGroup", MemberType.CORE, null);
-		try {
-			gms.join();
-		} catch (GMSException e) {
-			e.printStackTrace();
-		}
-						
-		Map memberDetails = new Hashtable();			
-		memberDetails.put("memberToken", serverToken); 	
-		
-		try {
-			((GroupManagementServiceImpl)gms).setMemberDetails(serverToken, memberDetails);
-		} catch (GMSException e) {
-			e.printStackTrace();
-		}
-		
-		while(true){
-			try {
-				Thread.sleep(3000);
-			} catch (InterruptedException e) {
-				System.out.println("error");
-				break;
-			}
-			System.out.println("********************************************************");
-			Map members = gms.getAllMemberDetails("memberToken");
-			Collection memberValues = members.values();
-			for(Serializable member : memberValues){
-				System.out.println(member);
-			}
-			System.out.println("---The above print result should be the same as below---");
-			List allMembers = gms.getGroupHandle().getAllCurrentMembers();
-			for(String member : allMembers){
-				System.out.println(gms.getMemberDetails(member).get("memberToken"));
-			}
-			System.out.println();
-			
-		}
-	}
+    /**
+     * main
+     *
+     * every node's member details contains a key named memberToken.
+     *
+     * start MemberDetailsTest's serveral instance,see the console's infomation.
+     *
+     * @param args command line args
+     */
+    public static void main(String[] args) {
+
+        String serverToken = UUID.randomUUID().toString();
+        GroupManagementService gms = (GroupManagementService) GMSFactory.startGMSModule(serverToken, "DemoGroup", MemberType.CORE, null);
+        try {
+            gms.join();
+        } catch (GMSException e) {
+            e.printStackTrace();
+        }
+
+        Map memberDetails = new Hashtable();
+        memberDetails.put("memberToken", serverToken);
+
+        try {
+            ((GroupManagementServiceImpl)gms).setMemberDetails(serverToken, memberDetails);
+        } catch (GMSException e) {
+            e.printStackTrace();
+        }
+
+        while(true){
+            try {
+                Thread.sleep(3000);
+            } catch (InterruptedException e) {
+                System.out.println("error");
+                break;
+            }
+            System.out.println("********************************************************");
+            Map members = gms.getAllMemberDetails("memberToken");
+            Collection memberValues = members.values();
+            for(Serializable member : memberValues){
+                System.out.println(member);
+            }
+            System.out.println("---The above print result should be the same as below---");
+            List allMembers = gms.getGroupHandle().getAllCurrentMembers();
+            for(String member : allMembers){
+                System.out.println(gms.getMemberDetails(member).get("memberToken"));
+            }
+            System.out.println();
+
+        }
+    }
 
 }
diff --git a/gms/tests/com/sun/enterprise/shoal/multithreadmessagesendertest/MultiThreadMessageSender.java b/gms/tests/com/sun/enterprise/shoal/multithreadmessagesendertest/MultiThreadMessageSender.java
index 9ab1d3c..139ec01 100644
--- a/gms/tests/com/sun/enterprise/shoal/multithreadmessagesendertest/MultiThreadMessageSender.java
+++ b/gms/tests/com/sun/enterprise/shoal/multithreadmessagesendertest/MultiThreadMessageSender.java
@@ -20,11 +20,11 @@
 import com.sun.enterprise.ee.cms.impl.client.MessageActionFactoryImpl;
 import com.sun.enterprise.ee.cms.impl.client.JoinNotificationActionFactoryImpl;
 import com.sun.enterprise.ee.cms.impl.base.Utility;
-import com.sun.enterprise.ee.cms.impl.common.JoinNotificationSignalImpl;
-import com.sun.enterprise.ee.cms.impl.common.MessageSignalImpl;
+import org.glassfish.shoal.gms.common.JoinNotificationSignalImpl;
+import org.glassfish.shoal.gms.common.MessageSignalImpl;
 import com.sun.enterprise.ee.cms.logging.GMSLogDomain;
-import com.sun.enterprise.ee.cms.impl.common.GMSContext;
-import com.sun.enterprise.ee.cms.impl.common.GMSContextFactory;
+import org.glassfish.shoal.gms.common.GMSContext;
+import org.glassfish.shoal.gms.common.GMSContextFactory;
 
 import java.util.Properties;
 import java.util.List;
@@ -41,27 +41,27 @@
 
 public class MultiThreadMessageSender implements CallBack{
 
-	private GroupManagementService gms;
-	private String memberToken;
-	private String destMemberToken;
-	private int sendingThreadNum;
-	private String msg = "hello, world";
+    private GroupManagementService gms;
+    private String memberToken;
+    private String destMemberToken;
+    private int sendingThreadNum;
+    private String msg = "hello, world";
     private AtomicInteger masterMsgId = new AtomicInteger(-1);
     private Thread[] threads;
-	
-	public MultiThreadMessageSender(String memberToken,String destMemberToken,int sendingThreadNum){
-		
-		this.memberToken = memberToken;
-		this.destMemberToken = destMemberToken;
-		this.sendingThreadNum = sendingThreadNum;
+
+    public MultiThreadMessageSender(String memberToken,String destMemberToken,int sendingThreadNum){
+
+        this.memberToken = memberToken;
+        this.destMemberToken = destMemberToken;
+        this.sendingThreadNum = sendingThreadNum;
         this.threads = new Thread[sendingThreadNum];
-				
-	}
-	
-	public void start(){
-		initGMS();		
-		startSenderThread();
-	}
+
+    }
+
+    public void start(){
+        initGMS();
+        startSenderThread();
+    }
 
     public void waitTillDone() {
         boolean done = false;
@@ -108,23 +108,23 @@ public void waitTillDone() {
         gms.shutdown(GMSConstants.shutdownType.INSTANCE_SHUTDOWN);
     }
 
-	private void initGMS(){
-		try {
+    private void initGMS(){
+        try {
             Properties props = new Properties();
             props.put(ServiceProviderConfigurationKeys.INCOMING_MESSAGE_QUEUE_SIZE.toString(), "1500");
             props.put(ServiceProviderConfigurationKeys.MONITORING.toString(), "0");
-			gms = (GroupManagementService) GMSFactory.startGMSModule(memberToken,"DemoGroup", GroupManagementService.MemberType.CORE, props);
-			gms.addActionFactory(new MessageActionFactoryImpl(this),"SimpleSampleComponent");
+            gms = (GroupManagementService) GMSFactory.startGMSModule(memberToken,"DemoGroup", GroupManagementService.MemberType.CORE, props);
+            gms.addActionFactory(new MessageActionFactoryImpl(this),"SimpleSampleComponent");
             gms.addActionFactory(new JoinNotificationActionFactoryImpl(this));
-			gms.join();
-			Thread.sleep(5000);
-		} catch (GMSException e) {
-			e.printStackTrace();
-		} catch (InterruptedException e) {
+            gms.join();
+            Thread.sleep(5000);
+        } catch (GMSException e) {
+            e.printStackTrace();
+        } catch (InterruptedException e) {
 
-		}
-	}
-	private void startSenderThread(){
+        }
+    }
+    private void startSenderThread(){
 
         for(int i=0;i= EXPECTED_NUMBER_OF_MESSAGES) {
 //                                        String stopMsg = "stop";
 //                                        System.out.println("sending stop message");
@@ -161,7 +161,7 @@ public void run() {
                                         break;
                                     }
                                } catch (InterruptedException e) {
-							        e.printStackTrace();
+                                    e.printStackTrace();
                                     //break;
                                 } catch (GMSException e) {
                                     System.out.println("thread " + i + "caught GMSException " + e );
@@ -172,18 +172,18 @@ public void run() {
                             if (msgId >= EXPECTED_NUMBER_OF_MESSAGES) {
                                 break;
                             }
-	                    }
+                        }
                     } finally {
-					    System.out.println("Exiting threadid " + i1);
+                        System.out.println("Exiting threadid " + i1);
                     }
                 }
-			}, "SendingThread_" + i);
+            }, "SendingThread_" + i);
             threads[i].start();
-		}
-	}
+        }
+    }
 
 
-	public void processNotification(Signal arg0) {
+    public void processNotification(Signal arg0) {
         if (arg0 instanceof JoinNotificationSignal) {
             JoinNotificationSignal joinSig = (JoinNotificationSignal)arg0;
         } else if (arg0 instanceof MessageSignal) {
@@ -253,21 +253,21 @@ public void processNotification(Signal arg0) {
     private static final int PAYLOADSIZE = 80 * 1024;
     private static final StringBuffer payload = new StringBuffer(PAYLOADSIZE);
 
-	/**
-	 * main
-	 * 
-	 * start serveral threads to send message
-	 * 
-	 * usage: start two instance using following two commands for the test 
-	 * 			java MultiThreadMessageSender A B 20
-	 * 		  	java MultiThreadMessageSender B A 0
-	 * 
-	 * @param args command line args
-	 */
-	public static void main(String[] args) {
-		String memberToken = args[0];
-		String destMemberToken = args[1];
-		int sendingThreadNum = Integer.parseInt(args[2]);
+    /**
+     * main
+     *
+     * start serveral threads to send message
+     *
+     * usage: start two instance using following two commands for the test
+     *             java MultiThreadMessageSender A B 20
+     *               java MultiThreadMessageSender B A 0
+     *
+     * @param args command line args
+     */
+    public static void main(String[] args) {
+        String memberToken = args[0];
+        String destMemberToken = args[1];
+        int sendingThreadNum = Integer.parseInt(args[2]);
         EXPECTED_NUMBER_OF_MESSAGES = NUM_MESSAGES_TO_SEND * sendingThreadNum;
 
         msgIdReceived = new boolean[EXPECTED_NUMBER_OF_MESSAGES];
@@ -280,12 +280,12 @@ public static void main(String[] args) {
         logger.setLevel(Level.CONFIG);
         for (int i = 0; i < PAYLOADSIZE; i++) {
             payload.append('X');
-        }        
-		MultiThreadMessageSender multiThreadMessageSender = new MultiThreadMessageSender(memberToken,destMemberToken,sendingThreadNum);
-		multiThreadMessageSender.start();
+        }
+        MultiThreadMessageSender multiThreadMessageSender = new MultiThreadMessageSender(memberToken,destMemberToken,sendingThreadNum);
+        multiThreadMessageSender.start();
         multiThreadMessageSender.waitTillDone();
         logger.info("Test completed.");
 
-	}
+    }
 }
 
diff --git a/gms/tests/net/MulticastSender.java b/gms/tests/net/MulticastSender.java
index 093fb27..f3dd9fa 100644
--- a/gms/tests/net/MulticastSender.java
+++ b/gms/tests/net/MulticastSender.java
@@ -16,7 +16,7 @@
 
 package net;
 
-        
+
 import java.net.*;
 import java.io.*;
 
diff --git a/pom.xml b/pom.xml
index bcde710..6e8bba2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 
 
 
-
+
    4.0.0
 
     
@@ -29,7 +29,7 @@
     org.glassfish.shoal
     shoal
     pom
-    3.1.1-SNAPSHOT
+    4.0.0-SNAPSHOT
     shoal
     GlassFish project for scalable dynamic clustering infrastructure to for fault tolerance, reliability and availability.
     https://github.com/eclipse-ee4j/glassfish-shoal
@@ -96,13 +96,8 @@
     
 
     
-
-        org.glassfish.grizzly
         4.0.2
-
-        junit
         4.13.2
-
         3.1.13
 
         ${maven.multiModuleProjectDirectory}/
@@ -121,13 +116,20 @@
                     maven-compiler-plugin
                     3.14.1
                     
-                        11
+                        17
                     
                 
                 
                     org.apache.felix
                     maven-bundle-plugin
                     6.0.0
+                    
+                        true
+                        true
+                        
+                            <_consumer-policy>
+                        
+                    
                 
                 
                     maven-resources-plugin
@@ -172,6 +174,18 @@
                 
             
 
+            
+                maven-jar-plugin
+                
+                    
+                        
+                            false
+                        
+                        ${project.build.outputDirectory}/META-INF/MANIFEST.MF
+                    
+                
+            
+
             
                 maven-release-plugin
                 
@@ -185,17 +199,24 @@
 
     
         
-            
-                ${junit.group.id}
-                junit
-                ${junit.version}
-            
             
                 org.glassfish.ha
                 ha-api
                 ${ha.api.version}
                 provided
             
+
+            
+                org.glassfish.grizzly
+                grizzly-framework
+                ${grizzly.version}
+            
+
+            
+                junit
+                junit
+                ${junit.version}
+