This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-samples.git
The following commit(s) were added to refs/heads/main by this push:
new 74f578c #243: Convert fsm samples to pekko (#24)
74f578c is described below
commit 74f578c9cd4c0e13d0450ed1fe14ced8d1d325e2
Author: Sam Byng <[email protected]>
AuthorDate: Mon Mar 27 14:20:21 2023 +0100
#243: Convert fsm samples to pekko (#24)
* Convert fsm-java to pekko:
Change dirnames and filepaths
Update pom.xml
Update src code
Update README
* Convert fsm-scala to pekko:
Change dirname and filepaths
Update build.sbt
Update src code
Update README
---------
Co-authored-by: sb5 <[email protected]>
---
.github/workflows/build-test.yml | 8 +++----
akka-sample-fsm-scala/build.sbt | 12 ----------
docs-gen/build.sbt | 8 +++----
.../COPYING | 0
.../LICENSE | 0
.../README.md | 4 ++--
.../pom.xml | 26 ++++++++++++++++------
.../src/main/java/sample/Chopstick.java | 8 +++----
.../src/main/java/sample/DiningHakkers.java | 12 +++++-----
.../src/main/java/sample/Hakker.java | 8 +++----
.../src/main/resources/logback.xml | 0
.../COPYING | 0
.../LICENSE | 0
.../README.md | 4 ++--
pekko-sample-fsm-scala/build.sbt | 15 +++++++++++++
.../project/build.properties | 0
.../project/plugins.sbt | 0
.../src/main/resources/logback.xml | 0
.../src/main/scala/sample/DiningHakkers.scala | 14 ++++++------
19 files changed, 67 insertions(+), 52 deletions(-)
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index fbc7fe5..45e4370 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -44,11 +44,11 @@ jobs:
- name: Test pekko-sample-distributed-workers-scala
run: cd pekko-sample-distributed-workers-scala && sbt test
- - name: Test akka-sample-fsm-java
- run: cd akka-sample-fsm-java && mvn test
+ - name: Test pekko-sample-fsm-java
+ run: cd pekko-sample-fsm-java && mvn test
- - name: Test akka-sample-fsm-scala
- run: cd akka-sample-fsm-scala && sbt test
+ - name: Test pekko-sample-fsm-scala
+ run: cd pekko-sample-fsm-scala && sbt test
- name: Test pekko-sample-persistence-java
run: cd pekko-sample-persistence-java && mvn test
diff --git a/akka-sample-fsm-scala/build.sbt b/akka-sample-fsm-scala/build.sbt
deleted file mode 100644
index f530982..0000000
--- a/akka-sample-fsm-scala/build.sbt
+++ /dev/null
@@ -1,12 +0,0 @@
-organization := "com.lightbend.akka.samples"
-name := "akka-sample-fsm-scala"
-
-val akkaVersion = "2.6.20"
-
-scalaVersion := "2.13.8"
-libraryDependencies ++= Seq(
- "com.typesafe.akka" %% "akka-actor-typed" % akkaVersion,
- "ch.qos.logback" % "logback-classic" % "1.2.11")
-
-licenses := Seq(
- ("CC0", url("http://creativecommons.org/publicdomain/zero/1.0";)))
diff --git a/docs-gen/build.sbt b/docs-gen/build.sbt
index 0b1f924..74ce6dd 100644
--- a/docs-gen/build.sbt
+++ b/docs-gen/build.sbt
@@ -28,17 +28,17 @@ lazy val `pekko-sample-distributed-workers-scala` = project
name := "Akka Distributed Workers with Scala",
baseProject := "pekko-sample-distributed-workers-scala")
-lazy val `akka-sample-fsm-java` = project
+lazy val `pekko-sample-fsm-java` = project
.enablePlugins(AkkaSamplePlugin)
.settings(
name := "Akka FSM with Java",
- baseProject := "akka-sample-fsm-java")
+ baseProject := "pekko-sample-fsm-java")
-lazy val `akka-sample-fsm-scala` = project
+lazy val `pekko-sample-fsm-scala` = project
.enablePlugins(AkkaSamplePlugin)
.settings(
name := "Akka FSM with Scala",
- baseProject := "akka-sample-fsm-scala")
+ baseProject := "pekko-sample-fsm-scala")
lazy val `pekko-sample-persistence-java` = project
.enablePlugins(AkkaSamplePlugin)
diff --git a/akka-sample-fsm-java/COPYING b/pekko-sample-fsm-java/COPYING
similarity index 100%
rename from akka-sample-fsm-java/COPYING
rename to pekko-sample-fsm-java/COPYING
diff --git a/akka-sample-fsm-java/LICENSE b/pekko-sample-fsm-java/LICENSE
similarity index 100%
rename from akka-sample-fsm-java/LICENSE
rename to pekko-sample-fsm-java/LICENSE
diff --git a/akka-sample-fsm-java/README.md b/pekko-sample-fsm-java/README.md
similarity index 75%
rename from akka-sample-fsm-java/README.md
rename to pekko-sample-fsm-java/README.md
index 843f97b..0ad204e 100644
--- a/akka-sample-fsm-java/README.md
+++ b/pekko-sample-fsm-java/README.md
@@ -4,8 +4,8 @@ This sample is an adaptation of [Dining
Hakkers](http://www.dalnefre.com/wp/2010
Open [DiningHakkersTyped.scala](src/main/java/sample/DiningHakkers.java).
-It illustrates how the behaviors and transitions can be defined with Akka
Typed.
+It illustrates how the behaviors and transitions can be defined with Apache
Pekko Typed.
Start the application by typing `mvn compile exec:java
-Dexec.mainClass="sample.DiningHakkers"`. In the log output you can see the
actions of the `Hakker` actors.
-Read more about Akka Typed in [the
documentation](https://pekko.apache.org/docs/pekko/current/typed/index.html).
+Read more about Apache Pekko Typed in [the
documentation](https://pekko.apache.org/docs/pekko/current/typed/index.html).
diff --git a/akka-sample-fsm-java/pom.xml b/pekko-sample-fsm-java/pom.xml
similarity index 59%
rename from akka-sample-fsm-java/pom.xml
rename to pekko-sample-fsm-java/pom.xml
index 4b8dbcf..ea38b30 100644
--- a/akka-sample-fsm-java/pom.xml
+++ b/pekko-sample-fsm-java/pom.xml
@@ -5,20 +5,32 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <akka.version>2.6.20</akka.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <pekko.version>0.0.0+26626-3e1231c3-SNAPSHOT</pekko.version>
</properties>
- <groupId>com.lightbend.akka.samples</groupId>
- <artifactId>akka-sample-fsm-java</artifactId>
+ <groupId>org.apache.pekko</groupId>
+ <artifactId>pekko-sample-fsm-java</artifactId>
<packaging>jar</packaging>
<version>1.0</version>
+ <repositories>
+ <repository>
+ <id>apache-pekko-snapshots</id>
+ <name>Apache Snapshots Repository</name>
+ <url>https://repository.apache.org/content/repositories/snapshots/</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
- <groupId>com.typesafe.akka</groupId>
- <artifactId>akka-actor-typed_2.13</artifactId>
- <version>${akka.version}</version>
+ <groupId>org.apache.pekko</groupId>
+ <artifactId>pekko-actor-typed_2.13</artifactId>
+ <version>${pekko.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
diff --git a/akka-sample-fsm-java/src/main/java/sample/Chopstick.java
b/pekko-sample-fsm-java/src/main/java/sample/Chopstick.java
similarity index 92%
rename from akka-sample-fsm-java/src/main/java/sample/Chopstick.java
rename to pekko-sample-fsm-java/src/main/java/sample/Chopstick.java
index 5994025..869ebd5 100644
--- a/akka-sample-fsm-java/src/main/java/sample/Chopstick.java
+++ b/pekko-sample-fsm-java/src/main/java/sample/Chopstick.java
@@ -1,9 +1,9 @@
package sample;
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
public class Chopstick {
interface Command { }
diff --git a/akka-sample-fsm-java/src/main/java/sample/DiningHakkers.java
b/pekko-sample-fsm-java/src/main/java/sample/DiningHakkers.java
similarity index 82%
rename from akka-sample-fsm-java/src/main/java/sample/DiningHakkers.java
rename to pekko-sample-fsm-java/src/main/java/sample/DiningHakkers.java
index d8ab966..42631d9 100644
--- a/akka-sample-fsm-java/src/main/java/sample/DiningHakkers.java
+++ b/pekko-sample-fsm-java/src/main/java/sample/DiningHakkers.java
@@ -1,11 +1,11 @@
package sample;
-import akka.NotUsed;
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.ActorSystem;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
import java.util.Arrays;
import java.util.List;
diff --git a/akka-sample-fsm-java/src/main/java/sample/Hakker.java
b/pekko-sample-fsm-java/src/main/java/sample/Hakker.java
similarity index 96%
rename from akka-sample-fsm-java/src/main/java/sample/Hakker.java
rename to pekko-sample-fsm-java/src/main/java/sample/Hakker.java
index 7cd74f2..94a16b4 100644
--- a/akka-sample-fsm-java/src/main/java/sample/Hakker.java
+++ b/pekko-sample-fsm-java/src/main/java/sample/Hakker.java
@@ -1,9 +1,9 @@
package sample;
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
import java.time.Duration;
diff --git a/akka-sample-fsm-java/src/main/resources/logback.xml
b/pekko-sample-fsm-java/src/main/resources/logback.xml
similarity index 100%
rename from akka-sample-fsm-java/src/main/resources/logback.xml
rename to pekko-sample-fsm-java/src/main/resources/logback.xml
diff --git a/akka-sample-fsm-scala/COPYING b/pekko-sample-fsm-scala/COPYING
similarity index 100%
rename from akka-sample-fsm-scala/COPYING
rename to pekko-sample-fsm-scala/COPYING
diff --git a/akka-sample-fsm-scala/LICENSE b/pekko-sample-fsm-scala/LICENSE
similarity index 100%
rename from akka-sample-fsm-scala/LICENSE
rename to pekko-sample-fsm-scala/LICENSE
diff --git a/akka-sample-fsm-scala/README.md b/pekko-sample-fsm-scala/README.md
similarity index 74%
rename from akka-sample-fsm-scala/README.md
rename to pekko-sample-fsm-scala/README.md
index 1a9039b..fa0e33a 100644
--- a/akka-sample-fsm-scala/README.md
+++ b/pekko-sample-fsm-scala/README.md
@@ -4,9 +4,9 @@ This sample is an adaptation of [Dining
Hakkers](http://www.dalnefre.com/wp/2010
Open [DiningHakkersTyped.scala](src/main/scala/sample/DiningHakkers.scala).
-It illustrates how the behaviors and transitions can be defined with Akka
Typed.
+It illustrates how the behaviors and transitions can be defined with Apache
Pekko Typed.
Start the application by typing `sbt "runMain sample.DiningHakkers"`. In the
log output you can see the actions of the `Hakker` actors.
-Read more about Akka Typed in [the
documentation](https://pekko.apache.org/docs/pekko/current/typed/index.html).
+Read more about Apache Pekko Typed in [the
documentation](https://pekko.apache.org/docs/pekko/current/typed/index.html).
diff --git a/pekko-sample-fsm-scala/build.sbt b/pekko-sample-fsm-scala/build.sbt
new file mode 100644
index 0000000..61183f8
--- /dev/null
+++ b/pekko-sample-fsm-scala/build.sbt
@@ -0,0 +1,15 @@
+organization := "org.apache.pekko"
+name := "pekko-sample-fsm-scala"
+
+def pekkoVersion = "0.0.0+26626-3e1231c3-SNAPSHOT"
+
+// allow access to snapshots
+resolvers += "Apache Nexus
Snapshots".at("https://repository.apache.org/content/groups/snapshots/";)
+
+scalaVersion := "2.13.8"
+libraryDependencies ++= Seq(
+ "org.apache.pekko" %% "pekko-actor-typed" % pekkoVersion,
+ "ch.qos.logback" % "logback-classic" % "1.2.11")
+
+licenses := Seq(
+ ("CC0", url("http://creativecommons.org/publicdomain/zero/1.0";)))
diff --git a/akka-sample-fsm-scala/project/build.properties
b/pekko-sample-fsm-scala/project/build.properties
similarity index 100%
rename from akka-sample-fsm-scala/project/build.properties
rename to pekko-sample-fsm-scala/project/build.properties
diff --git a/akka-sample-fsm-scala/project/plugins.sbt
b/pekko-sample-fsm-scala/project/plugins.sbt
similarity index 100%
rename from akka-sample-fsm-scala/project/plugins.sbt
rename to pekko-sample-fsm-scala/project/plugins.sbt
diff --git a/akka-sample-fsm-scala/src/main/resources/logback.xml
b/pekko-sample-fsm-scala/src/main/resources/logback.xml
similarity index 100%
rename from akka-sample-fsm-scala/src/main/resources/logback.xml
rename to pekko-sample-fsm-scala/src/main/resources/logback.xml
diff --git a/akka-sample-fsm-scala/src/main/scala/sample/DiningHakkers.scala
b/pekko-sample-fsm-scala/src/main/scala/sample/DiningHakkers.scala
similarity index 95%
rename from akka-sample-fsm-scala/src/main/scala/sample/DiningHakkers.scala
rename to pekko-sample-fsm-scala/src/main/scala/sample/DiningHakkers.scala
index 93d199e..370d23b 100644
--- a/akka-sample-fsm-scala/src/main/scala/sample/DiningHakkers.scala
+++ b/pekko-sample-fsm-scala/src/main/scala/sample/DiningHakkers.scala
@@ -1,11 +1,11 @@
package sample
-import akka.NotUsed
-import akka.actor.typed.ActorRef
-import akka.actor.typed.ActorSystem
-import akka.actor.typed.Behavior
-import akka.actor.typed.scaladsl.ActorContext
-import akka.actor.typed.scaladsl.Behaviors
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.typed.ActorRef
+import org.apache.pekko.actor.typed.ActorSystem
+import org.apache.pekko.actor.typed.Behavior
+import org.apache.pekko.actor.typed.scaladsl.ActorContext
+import org.apache.pekko.actor.typed.scaladsl.Behaviors
import sample.Chopstick.Busy
import sample.Chopstick.ChopstickAnswer
import sample.Chopstick.ChopstickMessage
@@ -16,7 +16,7 @@ import sample.Hakker.Command
import scala.concurrent.duration._
-// Akka adaptation of
+// Apache Pekko adaptation of
// http://www.dalnefre.com/wp/2010/08/dining-philosophers-in-humus/
/*
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
