Skip to content

Commit

Permalink
Unify XOOM branding
Browse files Browse the repository at this point in the history
  • Loading branch information
jakzal committed Apr 13, 2021
1 parent 1290265 commit b48538f
Show file tree
Hide file tree
Showing 14 changed files with 33 additions and 33 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## How to contribute to the vlingo/actors
## How to contribute to the VLINGO XOOM Actors

#### **Did you find a bug?**

Expand Down Expand Up @@ -34,4 +34,4 @@

Thanks for your kind assistence! :smile:

Vaughn Vernon and the vlingo/platform team
Vaughn Vernon and the VLINGO XOOM Team
2 changes: 1 addition & 1 deletion pom-relocation.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<developers>
<developer>
<id>vlingo</id>
<name>vlingo/PLATFORM Team</name>
<name>VLINGO XOOM Team</name>
<email>[email protected]</email>
<organization>vlingo</organization>
<organizationUrl>https://vlingo.io/contributors/</organizationUrl>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<developers>
<developer>
<id>vlingo</id>
<name>vlingo/PLATFORM Team</name>
<name>VLINGO XOOM Team</name>
<email>[email protected]</email>
<organization>vlingo</organization>
<organizationUrl>https://vlingo.io/contributors/</organizationUrl>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/vlingo/xoom/actors/Directory.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ final class Directory {
// (2) Configuration: 128, 16,384; used by Grid
// This tuning enables millions of actors at any one time.
// For example, there will be very few actors in some
// "applications" such as vlingo/cluster, but then the application
// "applications" such as VLINGO XOOM Cluster, but then the application
// running on the cluster itself may have many, many actors. These
// run on a different stage, and thus should be tuned separately.
// For example, preallocate 128 buckets that each have a Map of 16K
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/io/vlingo/xoom/actors/LifeCycle.java
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void afterStop(final Actor actor) {
try {
actor.afterStop();
} catch (Throwable t) {
environment.logger.error("vlingo/actors: Actor afterStop() failed: " + t.getMessage(), t);
environment.logger.error("XOOM: Actor afterStop() failed: " + t.getMessage(), t);
environment.stage.handleFailureOf(new StageSupervisedActor(Stoppable.class, actor, t));
}
}
Expand All @@ -74,7 +74,7 @@ void beforeStart(final Actor actor) {
try {
actor.beforeStart();
} catch (Throwable t) {
environment.logger.error("vlingo/actors: Actor beforeStart() failed: " + t.getMessage());
environment.logger.error("XOOM: Actor beforeStart() failed: " + t.getMessage());
environment.stage.handleFailureOf(new StageSupervisedActor(Startable.class, actor, t));
}
}
Expand All @@ -83,7 +83,7 @@ void afterRestart(final Actor actor, final Throwable throwable, final Class<?> p
try {
actor.afterRestart(throwable);
} catch (Throwable t) {
environment.logger.error("vlingo/actors: Actor beforeStart() failed: " + t.getMessage());
environment.logger.error("XOOM: Actor beforeStart() failed: " + t.getMessage());
environment.stage.handleFailureOf(new StageSupervisedActor(Startable.class, actor, t));
}
}
Expand All @@ -92,7 +92,7 @@ void beforeRestart(final Actor actor, final Throwable reason, final Class<?> pro
try {
actor.beforeRestart(reason);
} catch (Throwable t) {
environment.logger.error("vlingo/actors: Actor beforeRestart() failed: " + t.getMessage());
environment.logger.error("XOOM: Actor beforeRestart() failed: " + t.getMessage());
environment.stage.handleFailureOf(new StageSupervisedActor(protocol, actor, t));
}
}
Expand All @@ -101,7 +101,7 @@ void beforeResume(final Actor actor, final Throwable reason, final Class<?> prot
try {
actor.beforeResume(reason);
} catch (Throwable t) {
environment.logger.error("vlingo/actors: Actor beforeResume() failed: " + t.getMessage());
environment.logger.error("XOOM: Actor beforeResume() failed: " + t.getMessage());
environment.stage.handleFailureOf(new StageSupervisedActor(protocol, actor, t));
}
}
Expand All @@ -116,7 +116,7 @@ void sendStart(final Actor targetActor) {
environment.mailbox.send(targetActor, Startable.class, consumer, null, "start()");
}
} catch (Throwable t) {
environment.logger.error("vlingo/actors: Actor start() failed: " + t.getMessage());
environment.logger.error("XOOM: Actor start() failed: " + t.getMessage());
environment.stage.handleFailureOf(new StageSupervisedActor(Startable.class, targetActor, t));
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/vlingo/xoom/actors/LocalMessage.java
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ private void deadLetter() {
if (deadLetters != null) {
deadLetters.failedDelivery(deadLetter);
} else {
actor.logger().warn("vlingo/actors: MISSING DEAD LETTERS FOR: " + deadLetter);
actor.logger().warn("XOOM: MISSING DEAD LETTERS FOR: " + deadLetter);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/vlingo/xoom/actors/ProxyGenerator.java
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public void close() throws Exception {
}

public Result generateFor(final String actorProtocol) {
logger.debug("vlingo/actors: Generating proxy for " + (type == DynaType.Main ? "main":"test") + ": " + actorProtocol);
logger.debug("XOOM: Generating proxy for " + (type == DynaType.Main ? "main":"test") + ": " + actorProtocol);

try {
final Class<?> protocolInterface = readProtocolInterface(actorProtocol);
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/io/vlingo/xoom/actors/Stage.java
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ public final <T> TestActor<T> testActorFor(final Class<T> protocol, final Defini
).toTestActor();

} catch (Exception e) {
world.defaultLogger().error("vlingo/actors: FAILED: " + e.getMessage(), e);
world.defaultLogger().error("XOOM: FAILED: " + e.getMessage(), e);
e.printStackTrace();
return null;
}
Expand Down Expand Up @@ -531,7 +531,7 @@ <T> ActorProtocolActor<T> actorProtocolFor(
throw e;
}
catch (Exception e) {
world.defaultLogger().error("vlingo/actors: FAILED: " + e.getMessage(), e);
world.defaultLogger().error("XOOM: FAILED: " + e.getMessage(), e);
return null;
}
}
Expand Down Expand Up @@ -561,7 +561,7 @@ ActorProtocolActor<Object>[] actorProtocolFor(
final Object[] protocolActors = actorProxyFor(protocols, actor, actor.lifeCycle.environment.mailbox);
return ActorProtocolActor.allOf(protocolActors, actor);
} catch (Exception e) {
world.defaultLogger().error("vlingo/actors: FAILED: " + e.getMessage(), e);
world.defaultLogger().error("XOOM: FAILED: " + e.getMessage(), e);
return null;
}
}
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/io/vlingo/xoom/actors/World.java
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public static World startWithDefaults(final String name) {
*/
public <T,A extends Actor> T actorFor(final Class<T> protocol, final Class<? extends Actor> type, final ActorInstantiator<A> instantiator) {
if (isTerminated()) {
throw new IllegalStateException("vlingo/actors: Stopped.");
throw new IllegalStateException("XOOM: Stopped.");
}

return stage().actorFor(protocol, type, instantiator);
Expand All @@ -120,7 +120,7 @@ public <T,A extends Actor> T actorFor(final Class<T> protocol, final Class<? ext
*/
public <T> T actorFor(final Class<T> protocol, final Class<? extends Actor> type, final Object...parameters) {
if (isTerminated()) {
throw new IllegalStateException("vlingo/actors: Stopped.");
throw new IllegalStateException("XOOM: Stopped.");
}

return stage().actorFor(protocol, type, parameters);
Expand All @@ -136,7 +136,7 @@ public <T> T actorFor(final Class<T> protocol, final Class<? extends Actor> type
*/
public <T> T actorFor(final Class<T> protocol, final Definition definition) {
if (isTerminated()) {
throw new IllegalStateException("vlingo/actors: Stopped.");
throw new IllegalStateException("XOOM: Stopped.");
}

return stage().actorFor(protocol, definition);
Expand All @@ -152,7 +152,7 @@ public <T> T actorFor(final Class<T> protocol, final Definition definition) {
*/
public Protocols actorFor(final Class<?>[] protocols, final Class<? extends Actor> type, final Object...parameters) {
if (isTerminated()) {
throw new IllegalStateException("vlingo/actors: Stopped.");
throw new IllegalStateException("XOOM: Stopped.");
}

return stage().actorFor(protocols, type, parameters);
Expand All @@ -167,7 +167,7 @@ public Protocols actorFor(final Class<?>[] protocols, final Class<? extends Acto
*/
public Protocols actorFor(final Class<?>[] protocols, final Definition definition) {
if (isTerminated()) {
throw new IllegalStateException("vlingo/actors: Stopped.");
throw new IllegalStateException("XOOM: Stopped.");
}

return stage().actorFor(protocols, definition);
Expand Down Expand Up @@ -334,7 +334,7 @@ public void registerCommonSupervisor(final String stageName, final String name,
final Supervisor common = stage.actorFor(Supervisor.class, Definition.has(supervisorClass, Definition.NoParameters, name));
stage.registerCommonSupervisor(supervisedProtocol, common);
} catch (Exception e) {
defaultLogger().error("vlingo/actors: World cannot register common supervisor: " + supervisedProtocol.getName(), e);
defaultLogger().error("XOOM: World cannot register common supervisor: " + supervisedProtocol.getName(), e);
}
}

Expand All @@ -352,7 +352,7 @@ public void registerDefaultSupervisor(final String stageName, final String name,
final Stage stage = stageNamed(actualStageName);
defaultSupervisor = stage.actorFor(Supervisor.class, Definition.has(supervisorClass, Definition.NoParameters, name));
} catch (Exception e) {
defaultLogger().error("vlingo/actors: World cannot register default supervisor override: " + supervisorClass.getName(), e);
defaultLogger().error("XOOM: World cannot register default supervisor override: " + supervisorClass.getName(), e);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public String name() {

@Override
public void build(Configuration configuration) {
configuration.with(defaultLogger().name("vlingo/actors"));
configuration.with(defaultLogger().name("XOOM"));
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/io/vlingo/xoom/actors/testkit/TestWorld.java
Original file line number Diff line number Diff line change
Expand Up @@ -61,23 +61,23 @@ public static synchronized TestWorld startWithDefaults(final String name) {

public <T> TestActor<T> actorFor(final Class<T> protocol, final Class<? extends Actor> type, final Object...parameters) {
if (isTerminated()) {
throw new IllegalStateException("vlingo/actors: Stopped.");
throw new IllegalStateException("XOOM: Stopped.");
}

return world.stage().testActorFor(protocol, type, parameters);
}

public <T> TestActor<T> actorFor(final Class<T> protocol, final Definition definition) {
if (world.isTerminated()) {
throw new IllegalStateException("vlingo/actors: TestWorld has stopped.");
throw new IllegalStateException("XOOM: TestWorld has stopped.");
}

return world.stage().testActorFor(protocol, definition);
}

public Protocols actorFor(final Class<?>[] protocols, final Definition definition) {
if (world.isTerminated()) {
throw new IllegalStateException("vlingo/actors: TestWorld has stopped.");
throw new IllegalStateException("XOOM: TestWorld has stopped.");
}

return world.stage().testActorFor(protocols, definition);
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/io/vlingo/xoom/actors/actors/ActorsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public void setUp() throws Exception {
.Slf4jLoggerPluginConfiguration
.define()
.defaultLogger()
.name("vlingo/actors"));
.name("XOOM"));

testWorld = TestWorld.start("test", configuration);
world = testWorld.world();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public void testThatConfigurationConfirgures() {
.with(Slf4jLoggerPlugin.Slf4jLoggerPluginConfiguration
.define()
.defaultLogger()
.name("vlingo/actors(test)"))
.name("XOOM(test)"))
.with(CommonSupervisorsPluginConfiguration
.define()
.supervisor("default", "pingSupervisor", Ping.class, PingSupervisorActor.class)
Expand Down Expand Up @@ -103,7 +103,7 @@ public void testThatConfigurationConfirgures() {

assertNotNull(configuration.slf4jPluginConfiguration());
assertTrue(configuration.slf4jPluginConfiguration().isDefaultLogger());
assertEquals("vlingo/actors(test)", configuration.slf4jPluginConfiguration().name());
assertEquals("XOOM(test)", configuration.slf4jPluginConfiguration().name());

assertNotNull(configuration.commonSupervisorsPluginConfiguration());
assertEquals(2, configuration.commonSupervisorsPluginConfiguration().count());
Expand Down Expand Up @@ -165,7 +165,7 @@ public void testThatConfigurationDefaults() {

assertNotNull(configuration.slf4jPluginConfiguration());
assertTrue(configuration.slf4jPluginConfiguration().isDefaultLogger());
assertEquals("vlingo/actors", configuration.slf4jPluginConfiguration().name());
assertEquals("XOOM", configuration.slf4jPluginConfiguration().name());

assertNotNull(configuration.defaultSupervisorOverridePluginConfiguration());
assertEquals(1, configuration.defaultSupervisorOverridePluginConfiguration().count());
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/xoom-actors.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# was not distributed with this file, You can obtain
# one at https://mozilla.org/MPL/2.0/.

# vlingo/actors startup properties
# VLINGO XOOM Actors startup properties

plugin.name.pooledCompletes = true
plugin.pooledCompletes.classname = io.vlingo.xoom.actors.plugin.completes.PooledCompletesPlugin
Expand Down Expand Up @@ -47,7 +47,7 @@ plugin.reuseQueueMailbox.dispatcherThrottlingCount = 1

plugin.name.slf4jLogger = true
plugin.slf4jLogger.classname = io.vlingo.xoom.actors.plugin.logging.slf4j.Slf4jLoggerPlugin
plugin.slf4jLogger.name = vlingo/actors(test)
plugin.slf4jLogger.name = XOOM
plugin.slf4jLogger.defaultLogger = true

plugin.name.common_supervisors = true
Expand Down

0 comments on commit b48538f

Please sign in to comment.