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 ecda20f 243: Update docs-gen to use pekko-sbt-paradox extension (#27)
ecda20f is described below
commit ecda20f55b0c5cf4c8c4af351e932a4c8defd959
Author: Sam Byng <[email protected]>
AuthorDate: Tue Apr 11 21:22:20 2023 +0100
243: Update docs-gen to use pekko-sbt-paradox extension (#27)
* 243: Update docs-gen to pekko-sbt-paradox
Change akka -> Pekko in filenames
Import pekko-sbt-paradox extension
Minimal changes to pekkosampleplugin to accommodate this
* Markups: Run scalafmt
* #243: markups: final replacements of akka in docs
---------
Co-authored-by: sb5 <[email protected]>
---
docs-gen/akka-sample-cluster-java/build.sbt | 2 -
docs-gen/akka-sample-cluster-scala/build.sbt | 2 -
.../akka-sample-distributed-data-java/build.sbt | 2 -
.../akka-sample-distributed-data-scala/build.sbt | 2 -
.../build.sbt | 2 -
docs-gen/akka-sample-fsm-java/build.sbt | 2 -
docs-gen/akka-sample-fsm-scala/build.sbt | 2 -
.../akka-sample-kafka-to-sharding-scala/build.sbt | 2 -
docs-gen/akka-sample-persistence-java/build.sbt | 2 -
docs-gen/akka-sample-persistence-scala/build.sbt | 2 -
docs-gen/build.sbt | 52 +++++++++++-----------
...aSamplePlugin.scala => PekkoSamplePlugin.scala} | 5 ++-
docs-gen/project/plugins.sbt | 10 ++++-
pekko-sample-sharding-java/pom.xml | 2 +-
.../scala/sample/killrweather/WeatherStation.scala | 4 +-
15 files changed, 40 insertions(+), 53 deletions(-)
diff --git a/docs-gen/akka-sample-cluster-java/build.sbt
b/docs-gen/akka-sample-cluster-java/build.sbt
deleted file mode 100644
index 3640405..0000000
--- a/docs-gen/akka-sample-cluster-java/build.sbt
+++ /dev/null
@@ -1,2 +0,0 @@
-// This gets replaced later automatically
-paradoxTheme := Some(builtinParadoxTheme("generic"))
diff --git a/docs-gen/akka-sample-cluster-scala/build.sbt
b/docs-gen/akka-sample-cluster-scala/build.sbt
deleted file mode 100644
index 3640405..0000000
--- a/docs-gen/akka-sample-cluster-scala/build.sbt
+++ /dev/null
@@ -1,2 +0,0 @@
-// This gets replaced later automatically
-paradoxTheme := Some(builtinParadoxTheme("generic"))
diff --git a/docs-gen/akka-sample-distributed-data-java/build.sbt
b/docs-gen/akka-sample-distributed-data-java/build.sbt
deleted file mode 100644
index 3640405..0000000
--- a/docs-gen/akka-sample-distributed-data-java/build.sbt
+++ /dev/null
@@ -1,2 +0,0 @@
-// This gets replaced later automatically
-paradoxTheme := Some(builtinParadoxTheme("generic"))
diff --git a/docs-gen/akka-sample-distributed-data-scala/build.sbt
b/docs-gen/akka-sample-distributed-data-scala/build.sbt
deleted file mode 100644
index 3640405..0000000
--- a/docs-gen/akka-sample-distributed-data-scala/build.sbt
+++ /dev/null
@@ -1,2 +0,0 @@
-// This gets replaced later automatically
-paradoxTheme := Some(builtinParadoxTheme("generic"))
diff --git a/docs-gen/akka-sample-distributed-workers-scala/build.sbt
b/docs-gen/akka-sample-distributed-workers-scala/build.sbt
deleted file mode 100644
index 3640405..0000000
--- a/docs-gen/akka-sample-distributed-workers-scala/build.sbt
+++ /dev/null
@@ -1,2 +0,0 @@
-// This gets replaced later automatically
-paradoxTheme := Some(builtinParadoxTheme("generic"))
diff --git a/docs-gen/akka-sample-fsm-java/build.sbt
b/docs-gen/akka-sample-fsm-java/build.sbt
deleted file mode 100644
index 3640405..0000000
--- a/docs-gen/akka-sample-fsm-java/build.sbt
+++ /dev/null
@@ -1,2 +0,0 @@
-// This gets replaced later automatically
-paradoxTheme := Some(builtinParadoxTheme("generic"))
diff --git a/docs-gen/akka-sample-fsm-scala/build.sbt
b/docs-gen/akka-sample-fsm-scala/build.sbt
deleted file mode 100644
index 3640405..0000000
--- a/docs-gen/akka-sample-fsm-scala/build.sbt
+++ /dev/null
@@ -1,2 +0,0 @@
-// This gets replaced later automatically
-paradoxTheme := Some(builtinParadoxTheme("generic"))
diff --git a/docs-gen/akka-sample-kafka-to-sharding-scala/build.sbt
b/docs-gen/akka-sample-kafka-to-sharding-scala/build.sbt
deleted file mode 100644
index 3640405..0000000
--- a/docs-gen/akka-sample-kafka-to-sharding-scala/build.sbt
+++ /dev/null
@@ -1,2 +0,0 @@
-// This gets replaced later automatically
-paradoxTheme := Some(builtinParadoxTheme("generic"))
diff --git a/docs-gen/akka-sample-persistence-java/build.sbt
b/docs-gen/akka-sample-persistence-java/build.sbt
deleted file mode 100644
index 3640405..0000000
--- a/docs-gen/akka-sample-persistence-java/build.sbt
+++ /dev/null
@@ -1,2 +0,0 @@
-// This gets replaced later automatically
-paradoxTheme := Some(builtinParadoxTheme("generic"))
diff --git a/docs-gen/akka-sample-persistence-scala/build.sbt
b/docs-gen/akka-sample-persistence-scala/build.sbt
deleted file mode 100644
index 3640405..0000000
--- a/docs-gen/akka-sample-persistence-scala/build.sbt
+++ /dev/null
@@ -1,2 +0,0 @@
-// This gets replaced later automatically
-paradoxTheme := Some(builtinParadoxTheme("generic"))
diff --git a/docs-gen/build.sbt b/docs-gen/build.sbt
index 2102614..a81c1f1 100644
--- a/docs-gen/build.sbt
+++ b/docs-gen/build.sbt
@@ -1,71 +1,71 @@
-lazy val `akka-sample-cluster-java` = project
- .enablePlugins(AkkaSamplePlugin)
+lazy val `pekko-sample-cluster-java` = project
+ .enablePlugins(PekkoSamplePlugin)
.settings(
- name := "Akka Cluster with Java",
+ name := "Apache Pekko Cluster with Java",
baseProject := "pekko-sample-cluster-java")
-lazy val `akka-sample-cluster-scala` = project
- .enablePlugins(AkkaSamplePlugin)
+lazy val `pekko-sample-cluster-scala` = project
+ .enablePlugins(PekkoSamplePlugin)
.settings(
- name := "Akka Cluster with Scala",
+ name := "Apache Pekko Cluster with Scala",
baseProject := "pekko-sample-cluster-scala")
lazy val `pekko-sample-distributed-data-java` = project
- .enablePlugins(AkkaSamplePlugin)
+ .enablePlugins(PekkoSamplePlugin)
.settings(
- name := "Akka Distributed Data with Java",
+ name := "Apache Pekko Distributed Data with Java",
baseProject := "pekko-sample-distributed-data-java")
lazy val `pekko-sample-distributed-data-scala` = project
- .enablePlugins(AkkaSamplePlugin)
+ .enablePlugins(PekkoSamplePlugin)
.settings(
- name := "Akka Distributed Data with Scala",
+ name := "Apache Pekko Distributed Data with Scala",
baseProject := "pekko-sample-distributed-data-scala")
lazy val `pekko-sample-distributed-workers-scala` = project
- .enablePlugins(AkkaSamplePlugin)
+ .enablePlugins(PekkoSamplePlugin)
.settings(
- name := "Akka Distributed Workers with Scala",
+ name := "Apache Pekko Distributed Workers with Scala",
baseProject := "pekko-sample-distributed-workers-scala")
lazy val `pekko-sample-fsm-java` = project
- .enablePlugins(AkkaSamplePlugin)
+ .enablePlugins(PekkoSamplePlugin)
.settings(
- name := "Akka FSM with Java",
+ name := "Apache Pekko FSM with Java",
baseProject := "pekko-sample-fsm-java")
lazy val `pekko-sample-fsm-scala` = project
- .enablePlugins(AkkaSamplePlugin)
+ .enablePlugins(PekkoSamplePlugin)
.settings(
- name := "Akka FSM with Scala",
+ name := "Apache Pekko FSM with Scala",
baseProject := "pekko-sample-fsm-scala")
lazy val `pekko-sample-persistence-java` = project
- .enablePlugins(AkkaSamplePlugin)
+ .enablePlugins(PekkoSamplePlugin)
.settings(
- name := "Akka Persistence with Java",
+ name := "Apache Pekko Persistence with Java",
baseProject := "pekko-sample-persistence-java")
lazy val `pekko-sample-persistence-scala` = project
- .enablePlugins(AkkaSamplePlugin)
+ .enablePlugins(PekkoSamplePlugin)
.settings(
- name := "Akka Persistence with Scala",
+ name := "Apache Pekko Persistence with Scala",
baseProject := "pekko-sample-persistence-scala")
lazy val `pekko-sample-sharding-java` = project
- .enablePlugins(AkkaSamplePlugin)
+ .enablePlugins(PekkoSamplePlugin)
.settings(
- name := "Akka Cluster Sharding with Java",
+ name := "Apache Pekko Cluster Sharding with Java",
baseProject := "pekko-sample-sharding-java")
lazy val `pekko-sample-sharding-scala` = project
- .enablePlugins(AkkaSamplePlugin)
+ .enablePlugins(PekkoSamplePlugin)
.settings(
- name := "Akka Cluster Sharding with Scala",
+ name := "Apache Pekko Cluster Sharding with Scala",
baseProject := "pekko-sample-sharding-scala")
lazy val `pekko-sample-kafka-to-sharding-scala` = project
- .enablePlugins(AkkaSamplePlugin)
+ .enablePlugins(PekkoSamplePlugin)
.settings(
- name := "Akka Kafka to Sharding with Scala",
+ name := "Apache Pekko Kafka to Sharding with Scala",
baseProject := "pekko-sample-kafka-to-sharding-scala")
diff --git a/docs-gen/project/AkkaSamplePlugin.scala
b/docs-gen/project/PekkoSamplePlugin.scala
similarity index 91%
rename from docs-gen/project/AkkaSamplePlugin.scala
rename to docs-gen/project/PekkoSamplePlugin.scala
index 2ae7ceb..8ecaecc 100644
--- a/docs-gen/project/AkkaSamplePlugin.scala
+++ b/docs-gen/project/PekkoSamplePlugin.scala
@@ -1,8 +1,9 @@
import sbt._
import Keys._
import com.lightbend.paradox.sbt.ParadoxPlugin
+import org.apache.pekko.PekkoParadoxPlugin
-object AkkaSamplePlugin extends sbt.AutoPlugin {
+object PekkoSamplePlugin extends sbt.AutoPlugin {
override def requires = ParadoxPlugin
override def trigger = allRequirements
object autoImport {
@@ -15,7 +16,7 @@ object AkkaSamplePlugin extends sbt.AutoPlugin {
import autoImport._
import ParadoxPlugin.autoImport._
override def projectSettings: Seq[Setting[_]] = Seq(
- baseUrl := "https://github.com/akka/akka-samples/blob/2.6";,
+ baseUrl := "https://github.com/apache/incubator-pekko-samples/tree/main";,
crossPaths := false,
// Copy README.md file
Compile / paradox / sourceDirectory := {
diff --git a/docs-gen/project/plugins.sbt b/docs-gen/project/plugins.sbt
index c5ea6be..2203017 100644
--- a/docs-gen/project/plugins.sbt
+++ b/docs-gen/project/plugins.sbt
@@ -1,2 +1,8 @@
-// sbt-paradox, used for documentation
-addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.4.0")
+// allow access to snapshots for pekko-sbt-paradox
+resolvers += "Apache Nexus
Snapshots".at("https://repository.apache.org/content/repositories/snapshots/";)
+
+// We have to deliberately use older versions of sbt-paradox because current
Pekko sbt build
+// only loads on JDK 1.8 so we need to bring in older versions of parboiled
which support JDK 1.8
+addSbtPlugin(("org.apache.pekko" % "pekko-sbt-paradox" %
"0.0.0+30-8bee46d0-SNAPSHOT").excludeAll(
+ "com.lightbend.paradox", "sbt-paradox"))
+addSbtPlugin(("com.lightbend.paradox" % "sbt-paradox" % "0.9.2").force())
diff --git a/pekko-sample-sharding-java/pom.xml
b/pekko-sample-sharding-java/pom.xml
index 9f66e23..666844c 100644
--- a/pekko-sample-sharding-java/pom.xml
+++ b/pekko-sample-sharding-java/pom.xml
@@ -9,7 +9,7 @@
<version>1.0-SNAPSHOT</version>
- <name>Akka Sample Sharding</name>
+ <name>Apache Pekko Sample Sharding</name>
<modules>
<module>killrweather</module>
diff --git
a/pekko-sample-sharding-scala/killrweather/src/main/scala/sample/killrweather/WeatherStation.scala
b/pekko-sample-sharding-scala/killrweather/src/main/scala/sample/killrweather/WeatherStation.scala
index 6e48a94..01f6182 100644
---
a/pekko-sample-sharding-scala/killrweather/src/main/scala/sample/killrweather/WeatherStation.scala
+++
b/pekko-sample-sharding-scala/killrweather/src/main/scala/sample/killrweather/WeatherStation.scala
@@ -18,14 +18,14 @@ import
com.fasterxml.jackson.databind.annotation.JsonSerialize
* For each weather station common cumulative computations can be run:
* aggregate, averages, high/low, topK (e.g. the top N highest temperatures).
*
- * Note that since this station is not storing its state anywhere else than in
JVM memory, if Akka Cluster Sharding
+ * Note that since this station is not storing its state anywhere else than in
JVM memory, if Apache Pekko Cluster Sharding
* rebalances it - moves it to another node because of cluster nodes added
removed etc - it will lose all its state.
* For a sharded entity to have state that survives being stopped and started
again it needs to be persistent,
* for example by being an EventSourcedBehavior.
*/
private[killrweather] object WeatherStation {
- // setup for using WeatherStations through Akka Cluster Sharding
+ // setup for using WeatherStations through Apache Pekko Cluster Sharding
// these could also live elsewhere and the WeatherStation class be completely
// oblivious to being used in sharding
val TypeKey: EntityTypeKey[WeatherStation.Command] =
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
