diff --git a/akka-docs-new/build.sbt b/akka-docs-new/build.sbt deleted file mode 100644 index 70a54a1210..0000000000 --- a/akka-docs-new/build.sbt +++ /dev/null @@ -1,22 +0,0 @@ -import akka.{ AkkaBuild, Dependencies, Formatting } -import akka.ValidatePullRequest._ -import com.typesafe.sbt.SbtScalariform.ScalariformKeys - -AkkaBuild.defaultSettings -AkkaBuild.dontPublishSettings -Formatting.docFormatSettings -Dependencies.docs - -unmanagedSourceDirectories in ScalariformKeys.format in Test := (unmanagedSourceDirectories in Test).value -//TODO: additionalTasks in ValidatePR += paradox in Paradox - -enablePlugins(ScaladocNoVerificationOfDiagrams) -disablePlugins(MimaPlugin) -enablePlugins(ParadoxPlugin) - -paradoxProperties ++= Map( - "extref.wikipedia.base_url" -> "https://en.wikipedia.org/wiki/%s", - "scala.version" -> scalaVersion.value, - "akka.version" -> version.value -) -paradoxTheme := Some(builtinParadoxTheme("generic")) diff --git a/akka-docs-new/src/main/paradox/guide/actors-intro.md b/akka-docs/src/main/paradox/guide/actors-intro.md similarity index 100% rename from akka-docs-new/src/main/paradox/guide/actors-intro.md rename to akka-docs/src/main/paradox/guide/actors-intro.md diff --git a/akka-docs-new/src/main/paradox/guide/diagrams/actor_graph.png b/akka-docs/src/main/paradox/guide/diagrams/actor_graph.png similarity index 100% rename from akka-docs-new/src/main/paradox/guide/diagrams/actor_graph.png rename to akka-docs/src/main/paradox/guide/diagrams/actor_graph.png diff --git a/akka-docs-new/src/main/paradox/guide/diagrams/actor_graph.svg b/akka-docs/src/main/paradox/guide/diagrams/actor_graph.svg similarity index 100% rename from akka-docs-new/src/main/paradox/guide/diagrams/actor_graph.svg rename to akka-docs/src/main/paradox/guide/diagrams/actor_graph.svg diff --git a/akka-docs-new/src/main/paradox/guide/diagrams/actor_top_tree.png b/akka-docs/src/main/paradox/guide/diagrams/actor_top_tree.png similarity index 100% rename from akka-docs-new/src/main/paradox/guide/diagrams/actor_top_tree.png rename to akka-docs/src/main/paradox/guide/diagrams/actor_top_tree.png diff --git a/akka-docs-new/src/main/paradox/guide/diagrams/actor_top_tree.svg b/akka-docs/src/main/paradox/guide/diagrams/actor_top_tree.svg similarity index 100% rename from akka-docs-new/src/main/paradox/guide/diagrams/actor_top_tree.svg rename to akka-docs/src/main/paradox/guide/diagrams/actor_top_tree.svg diff --git a/akka-docs-new/src/main/paradox/guide/diagrams/actor_tree_supervision.png b/akka-docs/src/main/paradox/guide/diagrams/actor_tree_supervision.png similarity index 100% rename from akka-docs-new/src/main/paradox/guide/diagrams/actor_tree_supervision.png rename to akka-docs/src/main/paradox/guide/diagrams/actor_tree_supervision.png diff --git a/akka-docs-new/src/main/paradox/guide/diagrams/actor_tree_supervision.svg b/akka-docs/src/main/paradox/guide/diagrams/actor_tree_supervision.svg similarity index 100% rename from akka-docs-new/src/main/paradox/guide/diagrams/actor_tree_supervision.svg rename to akka-docs/src/main/paradox/guide/diagrams/actor_tree_supervision.svg diff --git a/akka-docs-new/src/main/paradox/guide/diagrams/arch_boxes_diagram.png b/akka-docs/src/main/paradox/guide/diagrams/arch_boxes_diagram.png similarity index 100% rename from akka-docs-new/src/main/paradox/guide/diagrams/arch_boxes_diagram.png rename to akka-docs/src/main/paradox/guide/diagrams/arch_boxes_diagram.png diff --git a/akka-docs-new/src/main/paradox/guide/diagrams/arch_boxes_diagram.svg b/akka-docs/src/main/paradox/guide/diagrams/arch_boxes_diagram.svg similarity index 100% rename from akka-docs-new/src/main/paradox/guide/diagrams/arch_boxes_diagram.svg rename to akka-docs/src/main/paradox/guide/diagrams/arch_boxes_diagram.svg diff --git a/akka-docs-new/src/main/paradox/guide/diagrams/arch_tree_diagram.png b/akka-docs/src/main/paradox/guide/diagrams/arch_tree_diagram.png similarity index 100% rename from akka-docs-new/src/main/paradox/guide/diagrams/arch_tree_diagram.png rename to akka-docs/src/main/paradox/guide/diagrams/arch_tree_diagram.png diff --git a/akka-docs-new/src/main/paradox/guide/diagrams/arch_tree_diagram.svg b/akka-docs/src/main/paradox/guide/diagrams/arch_tree_diagram.svg similarity index 100% rename from akka-docs-new/src/main/paradox/guide/diagrams/arch_tree_diagram.svg rename to akka-docs/src/main/paradox/guide/diagrams/arch_tree_diagram.svg diff --git a/akka-docs-new/src/main/paradox/guide/diagrams/device_manager_tree.png b/akka-docs/src/main/paradox/guide/diagrams/device_manager_tree.png similarity index 100% rename from akka-docs-new/src/main/paradox/guide/diagrams/device_manager_tree.png rename to akka-docs/src/main/paradox/guide/diagrams/device_manager_tree.png diff --git a/akka-docs-new/src/main/paradox/guide/diagrams/device_manager_tree.svg b/akka-docs/src/main/paradox/guide/diagrams/device_manager_tree.svg similarity index 100% rename from akka-docs-new/src/main/paradox/guide/diagrams/device_manager_tree.svg rename to akka-docs/src/main/paradox/guide/diagrams/device_manager_tree.svg diff --git a/akka-docs-new/src/main/paradox/guide/diagrams/exception_prop.png b/akka-docs/src/main/paradox/guide/diagrams/exception_prop.png similarity index 100% rename from akka-docs-new/src/main/paradox/guide/diagrams/exception_prop.png rename to akka-docs/src/main/paradox/guide/diagrams/exception_prop.png diff --git a/akka-docs-new/src/main/paradox/guide/diagrams/exception_prop.svg b/akka-docs/src/main/paradox/guide/diagrams/exception_prop.svg similarity index 100% rename from akka-docs-new/src/main/paradox/guide/diagrams/exception_prop.svg rename to akka-docs/src/main/paradox/guide/diagrams/exception_prop.svg diff --git a/akka-docs-new/src/main/paradox/guide/diagrams/object_graph.png b/akka-docs/src/main/paradox/guide/diagrams/object_graph.png similarity index 100% rename from akka-docs-new/src/main/paradox/guide/diagrams/object_graph.png rename to akka-docs/src/main/paradox/guide/diagrams/object_graph.png diff --git a/akka-docs-new/src/main/paradox/guide/diagrams/object_graph.svg b/akka-docs/src/main/paradox/guide/diagrams/object_graph.svg similarity index 100% rename from akka-docs-new/src/main/paradox/guide/diagrams/object_graph.svg rename to akka-docs/src/main/paradox/guide/diagrams/object_graph.svg diff --git a/akka-docs-new/src/main/paradox/guide/diagrams/object_graph_snakes.png b/akka-docs/src/main/paradox/guide/diagrams/object_graph_snakes.png similarity index 100% rename from akka-docs-new/src/main/paradox/guide/diagrams/object_graph_snakes.png rename to akka-docs/src/main/paradox/guide/diagrams/object_graph_snakes.png diff --git a/akka-docs-new/src/main/paradox/guide/diagrams/object_graph_snakes.svg b/akka-docs/src/main/paradox/guide/diagrams/object_graph_snakes.svg similarity index 100% rename from akka-docs-new/src/main/paradox/guide/diagrams/object_graph_snakes.svg rename to akka-docs/src/main/paradox/guide/diagrams/object_graph_snakes.svg diff --git a/akka-docs-new/src/main/paradox/guide/diagrams/seq_chart.png b/akka-docs/src/main/paradox/guide/diagrams/seq_chart.png similarity index 100% rename from akka-docs-new/src/main/paradox/guide/diagrams/seq_chart.png rename to akka-docs/src/main/paradox/guide/diagrams/seq_chart.png diff --git a/akka-docs-new/src/main/paradox/guide/diagrams/seq_chart.svg b/akka-docs/src/main/paradox/guide/diagrams/seq_chart.svg similarity index 100% rename from akka-docs-new/src/main/paradox/guide/diagrams/seq_chart.svg rename to akka-docs/src/main/paradox/guide/diagrams/seq_chart.svg diff --git a/akka-docs-new/src/main/paradox/guide/diagrams/seq_chart_multi_thread.png b/akka-docs/src/main/paradox/guide/diagrams/seq_chart_multi_thread.png similarity index 100% rename from akka-docs-new/src/main/paradox/guide/diagrams/seq_chart_multi_thread.png rename to akka-docs/src/main/paradox/guide/diagrams/seq_chart_multi_thread.png diff --git a/akka-docs-new/src/main/paradox/guide/diagrams/seq_chart_multi_thread.svg b/akka-docs/src/main/paradox/guide/diagrams/seq_chart_multi_thread.svg similarity index 100% rename from akka-docs-new/src/main/paradox/guide/diagrams/seq_chart_multi_thread.svg rename to akka-docs/src/main/paradox/guide/diagrams/seq_chart_multi_thread.svg diff --git a/akka-docs-new/src/main/paradox/guide/diagrams/seq_chart_thread.png b/akka-docs/src/main/paradox/guide/diagrams/seq_chart_thread.png similarity index 100% rename from akka-docs-new/src/main/paradox/guide/diagrams/seq_chart_thread.png rename to akka-docs/src/main/paradox/guide/diagrams/seq_chart_thread.png diff --git a/akka-docs-new/src/main/paradox/guide/diagrams/seq_chart_thread.svg b/akka-docs/src/main/paradox/guide/diagrams/seq_chart_thread.svg similarity index 100% rename from akka-docs-new/src/main/paradox/guide/diagrams/seq_chart_thread.svg rename to akka-docs/src/main/paradox/guide/diagrams/seq_chart_thread.svg diff --git a/akka-docs-new/src/main/paradox/guide/diagrams/serialized_timeline_invariants.png b/akka-docs/src/main/paradox/guide/diagrams/serialized_timeline_invariants.png similarity index 100% rename from akka-docs-new/src/main/paradox/guide/diagrams/serialized_timeline_invariants.png rename to akka-docs/src/main/paradox/guide/diagrams/serialized_timeline_invariants.png diff --git a/akka-docs-new/src/main/paradox/guide/diagrams/serialized_timeline_invariants.svg b/akka-docs/src/main/paradox/guide/diagrams/serialized_timeline_invariants.svg similarity index 100% rename from akka-docs-new/src/main/paradox/guide/diagrams/serialized_timeline_invariants.svg rename to akka-docs/src/main/paradox/guide/diagrams/serialized_timeline_invariants.svg diff --git a/akka-docs-new/src/main/paradox/guide/index.md b/akka-docs/src/main/paradox/guide/index.md similarity index 100% rename from akka-docs-new/src/main/paradox/guide/index.md rename to akka-docs/src/main/paradox/guide/index.md diff --git a/akka-docs-new/src/main/paradox/guide/introduction.md b/akka-docs/src/main/paradox/guide/introduction.md similarity index 100% rename from akka-docs-new/src/main/paradox/guide/introduction.md rename to akka-docs/src/main/paradox/guide/introduction.md diff --git a/akka-docs-new/src/main/paradox/guide/modules.md b/akka-docs/src/main/paradox/guide/modules.md similarity index 100% rename from akka-docs-new/src/main/paradox/guide/modules.md rename to akka-docs/src/main/paradox/guide/modules.md diff --git a/akka-docs-new/src/main/paradox/guide/quickstart.md b/akka-docs/src/main/paradox/guide/quickstart.md similarity index 100% rename from akka-docs-new/src/main/paradox/guide/quickstart.md rename to akka-docs/src/main/paradox/guide/quickstart.md diff --git a/akka-docs-new/src/main/paradox/guide/tutorial_1.md b/akka-docs/src/main/paradox/guide/tutorial_1.md similarity index 100% rename from akka-docs-new/src/main/paradox/guide/tutorial_1.md rename to akka-docs/src/main/paradox/guide/tutorial_1.md diff --git a/akka-docs-new/src/main/paradox/guide/tutorial_2.md b/akka-docs/src/main/paradox/guide/tutorial_2.md similarity index 100% rename from akka-docs-new/src/main/paradox/guide/tutorial_2.md rename to akka-docs/src/main/paradox/guide/tutorial_2.md diff --git a/akka-docs-new/src/main/paradox/guide/tutorial_3.md b/akka-docs/src/main/paradox/guide/tutorial_3.md similarity index 100% rename from akka-docs-new/src/main/paradox/guide/tutorial_3.md rename to akka-docs/src/main/paradox/guide/tutorial_3.md diff --git a/akka-docs-new/src/main/paradox/guide/tutorial_4.md b/akka-docs/src/main/paradox/guide/tutorial_4.md similarity index 100% rename from akka-docs-new/src/main/paradox/guide/tutorial_4.md rename to akka-docs/src/main/paradox/guide/tutorial_4.md diff --git a/akka-docs-new/src/main/paradox/index.md b/akka-docs/src/main/paradox/index.md similarity index 100% rename from akka-docs-new/src/main/paradox/index.md rename to akka-docs/src/main/paradox/index.md diff --git a/akka-docs-new/src/main/paradox/reference/index.md b/akka-docs/src/main/paradox/reference/index.md similarity index 100% rename from akka-docs-new/src/main/paradox/reference/index.md rename to akka-docs/src/main/paradox/reference/index.md diff --git a/akka-docs-new/src/test/java/jdocs/quickstart/HelloWorldActor.java b/akka-docs/src/test/java/jdocs/quickstart/HelloWorldActor.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/quickstart/HelloWorldActor.java rename to akka-docs/src/test/java/jdocs/quickstart/HelloWorldActor.java diff --git a/akka-docs-new/src/test/java/jdocs/quickstart/HelloWorldMain.java b/akka-docs/src/test/java/jdocs/quickstart/HelloWorldMain.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/quickstart/HelloWorldMain.java rename to akka-docs/src/test/java/jdocs/quickstart/HelloWorldMain.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_1/IotMain.java b/akka-docs/src/test/java/jdocs/tutorial_1/IotMain.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_1/IotMain.java rename to akka-docs/src/test/java/jdocs/tutorial_1/IotMain.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_1/IotSupervisor.java b/akka-docs/src/test/java/jdocs/tutorial_1/IotSupervisor.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_1/IotSupervisor.java rename to akka-docs/src/test/java/jdocs/tutorial_1/IotSupervisor.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_2/Device.java b/akka-docs/src/test/java/jdocs/tutorial_2/Device.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_2/Device.java rename to akka-docs/src/test/java/jdocs/tutorial_2/Device.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_2/DeviceInProgress.java b/akka-docs/src/test/java/jdocs/tutorial_2/DeviceInProgress.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_2/DeviceInProgress.java rename to akka-docs/src/test/java/jdocs/tutorial_2/DeviceInProgress.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_2/DeviceInProgress2.java b/akka-docs/src/test/java/jdocs/tutorial_2/DeviceInProgress2.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_2/DeviceInProgress2.java rename to akka-docs/src/test/java/jdocs/tutorial_2/DeviceInProgress2.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_2/DeviceInProgress3.java b/akka-docs/src/test/java/jdocs/tutorial_2/DeviceInProgress3.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_2/DeviceInProgress3.java rename to akka-docs/src/test/java/jdocs/tutorial_2/DeviceInProgress3.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_2/DeviceTest.java b/akka-docs/src/test/java/jdocs/tutorial_2/DeviceTest.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_2/DeviceTest.java rename to akka-docs/src/test/java/jdocs/tutorial_2/DeviceTest.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_3/Device.java b/akka-docs/src/test/java/jdocs/tutorial_3/Device.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_3/Device.java rename to akka-docs/src/test/java/jdocs/tutorial_3/Device.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_3/DeviceGroup.java b/akka-docs/src/test/java/jdocs/tutorial_3/DeviceGroup.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_3/DeviceGroup.java rename to akka-docs/src/test/java/jdocs/tutorial_3/DeviceGroup.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_3/DeviceGroupTest.java b/akka-docs/src/test/java/jdocs/tutorial_3/DeviceGroupTest.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_3/DeviceGroupTest.java rename to akka-docs/src/test/java/jdocs/tutorial_3/DeviceGroupTest.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_3/DeviceManager.java b/akka-docs/src/test/java/jdocs/tutorial_3/DeviceManager.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_3/DeviceManager.java rename to akka-docs/src/test/java/jdocs/tutorial_3/DeviceManager.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_3/DeviceTest.java b/akka-docs/src/test/java/jdocs/tutorial_3/DeviceTest.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_3/DeviceTest.java rename to akka-docs/src/test/java/jdocs/tutorial_3/DeviceTest.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_4/Device.java b/akka-docs/src/test/java/jdocs/tutorial_4/Device.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_4/Device.java rename to akka-docs/src/test/java/jdocs/tutorial_4/Device.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_4/DeviceGroup.java b/akka-docs/src/test/java/jdocs/tutorial_4/DeviceGroup.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_4/DeviceGroup.java rename to akka-docs/src/test/java/jdocs/tutorial_4/DeviceGroup.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_4/DeviceGroupQuery.java b/akka-docs/src/test/java/jdocs/tutorial_4/DeviceGroupQuery.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_4/DeviceGroupQuery.java rename to akka-docs/src/test/java/jdocs/tutorial_4/DeviceGroupQuery.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_4/DeviceGroupQueryTest.java b/akka-docs/src/test/java/jdocs/tutorial_4/DeviceGroupQueryTest.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_4/DeviceGroupQueryTest.java rename to akka-docs/src/test/java/jdocs/tutorial_4/DeviceGroupQueryTest.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_4/DeviceGroupTest.java b/akka-docs/src/test/java/jdocs/tutorial_4/DeviceGroupTest.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_4/DeviceGroupTest.java rename to akka-docs/src/test/java/jdocs/tutorial_4/DeviceGroupTest.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_4/DeviceManager.java b/akka-docs/src/test/java/jdocs/tutorial_4/DeviceManager.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_4/DeviceManager.java rename to akka-docs/src/test/java/jdocs/tutorial_4/DeviceManager.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_4/DeviceTest.java b/akka-docs/src/test/java/jdocs/tutorial_4/DeviceTest.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_4/DeviceTest.java rename to akka-docs/src/test/java/jdocs/tutorial_4/DeviceTest.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_5/Device.java b/akka-docs/src/test/java/jdocs/tutorial_5/Device.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_5/Device.java rename to akka-docs/src/test/java/jdocs/tutorial_5/Device.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_5/DeviceGroup.java b/akka-docs/src/test/java/jdocs/tutorial_5/DeviceGroup.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_5/DeviceGroup.java rename to akka-docs/src/test/java/jdocs/tutorial_5/DeviceGroup.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_5/DeviceGroupQuery.java b/akka-docs/src/test/java/jdocs/tutorial_5/DeviceGroupQuery.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_5/DeviceGroupQuery.java rename to akka-docs/src/test/java/jdocs/tutorial_5/DeviceGroupQuery.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_5/DeviceGroupQueryTest.java b/akka-docs/src/test/java/jdocs/tutorial_5/DeviceGroupQueryTest.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_5/DeviceGroupQueryTest.java rename to akka-docs/src/test/java/jdocs/tutorial_5/DeviceGroupQueryTest.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_5/DeviceGroupTest.java b/akka-docs/src/test/java/jdocs/tutorial_5/DeviceGroupTest.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_5/DeviceGroupTest.java rename to akka-docs/src/test/java/jdocs/tutorial_5/DeviceGroupTest.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_5/DeviceManager.java b/akka-docs/src/test/java/jdocs/tutorial_5/DeviceManager.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_5/DeviceManager.java rename to akka-docs/src/test/java/jdocs/tutorial_5/DeviceManager.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_5/DeviceTest.java b/akka-docs/src/test/java/jdocs/tutorial_5/DeviceTest.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_5/DeviceTest.java rename to akka-docs/src/test/java/jdocs/tutorial_5/DeviceTest.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_5/IotMain.java b/akka-docs/src/test/java/jdocs/tutorial_5/IotMain.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_5/IotMain.java rename to akka-docs/src/test/java/jdocs/tutorial_5/IotMain.java diff --git a/akka-docs-new/src/test/java/jdocs/tutorial_5/IotSupervisor.java b/akka-docs/src/test/java/jdocs/tutorial_5/IotSupervisor.java similarity index 100% rename from akka-docs-new/src/test/java/jdocs/tutorial_5/IotSupervisor.java rename to akka-docs/src/test/java/jdocs/tutorial_5/IotSupervisor.java diff --git a/akka-docs-new/src/test/scala/quickstart/HelloWorldApp.scala b/akka-docs/src/test/scala/quickstart/HelloWorldApp.scala similarity index 100% rename from akka-docs-new/src/test/scala/quickstart/HelloWorldApp.scala rename to akka-docs/src/test/scala/quickstart/HelloWorldApp.scala diff --git a/akka-docs-new/src/test/scala/tutorial_1/ActorHierarchyExperiments.scala b/akka-docs/src/test/scala/tutorial_1/ActorHierarchyExperiments.scala similarity index 100% rename from akka-docs-new/src/test/scala/tutorial_1/ActorHierarchyExperiments.scala rename to akka-docs/src/test/scala/tutorial_1/ActorHierarchyExperiments.scala diff --git a/akka-docs-new/src/test/scala/tutorial_1/IotApp.scala b/akka-docs/src/test/scala/tutorial_1/IotApp.scala similarity index 100% rename from akka-docs-new/src/test/scala/tutorial_1/IotApp.scala rename to akka-docs/src/test/scala/tutorial_1/IotApp.scala diff --git a/akka-docs-new/src/test/scala/tutorial_1/IotSupervisor.scala b/akka-docs/src/test/scala/tutorial_1/IotSupervisor.scala similarity index 100% rename from akka-docs-new/src/test/scala/tutorial_1/IotSupervisor.scala rename to akka-docs/src/test/scala/tutorial_1/IotSupervisor.scala diff --git a/akka-docs-new/src/test/scala/tutorial_2/Device.scala b/akka-docs/src/test/scala/tutorial_2/Device.scala similarity index 100% rename from akka-docs-new/src/test/scala/tutorial_2/Device.scala rename to akka-docs/src/test/scala/tutorial_2/Device.scala diff --git a/akka-docs-new/src/test/scala/tutorial_2/DeviceInProgress.scala b/akka-docs/src/test/scala/tutorial_2/DeviceInProgress.scala similarity index 100% rename from akka-docs-new/src/test/scala/tutorial_2/DeviceInProgress.scala rename to akka-docs/src/test/scala/tutorial_2/DeviceInProgress.scala diff --git a/akka-docs-new/src/test/scala/tutorial_2/DeviceSpec.scala b/akka-docs/src/test/scala/tutorial_2/DeviceSpec.scala similarity index 100% rename from akka-docs-new/src/test/scala/tutorial_2/DeviceSpec.scala rename to akka-docs/src/test/scala/tutorial_2/DeviceSpec.scala diff --git a/akka-docs-new/src/test/scala/tutorial_3/Device.scala b/akka-docs/src/test/scala/tutorial_3/Device.scala similarity index 100% rename from akka-docs-new/src/test/scala/tutorial_3/Device.scala rename to akka-docs/src/test/scala/tutorial_3/Device.scala diff --git a/akka-docs-new/src/test/scala/tutorial_3/DeviceGroup.scala b/akka-docs/src/test/scala/tutorial_3/DeviceGroup.scala similarity index 100% rename from akka-docs-new/src/test/scala/tutorial_3/DeviceGroup.scala rename to akka-docs/src/test/scala/tutorial_3/DeviceGroup.scala diff --git a/akka-docs-new/src/test/scala/tutorial_3/DeviceGroupSpec.scala b/akka-docs/src/test/scala/tutorial_3/DeviceGroupSpec.scala similarity index 100% rename from akka-docs-new/src/test/scala/tutorial_3/DeviceGroupSpec.scala rename to akka-docs/src/test/scala/tutorial_3/DeviceGroupSpec.scala diff --git a/akka-docs-new/src/test/scala/tutorial_3/DeviceManager.scala b/akka-docs/src/test/scala/tutorial_3/DeviceManager.scala similarity index 100% rename from akka-docs-new/src/test/scala/tutorial_3/DeviceManager.scala rename to akka-docs/src/test/scala/tutorial_3/DeviceManager.scala diff --git a/akka-docs-new/src/test/scala/tutorial_3/DeviceSpec.scala b/akka-docs/src/test/scala/tutorial_3/DeviceSpec.scala similarity index 100% rename from akka-docs-new/src/test/scala/tutorial_3/DeviceSpec.scala rename to akka-docs/src/test/scala/tutorial_3/DeviceSpec.scala diff --git a/akka-docs-new/src/test/scala/tutorial_4/Device.scala b/akka-docs/src/test/scala/tutorial_4/Device.scala similarity index 100% rename from akka-docs-new/src/test/scala/tutorial_4/Device.scala rename to akka-docs/src/test/scala/tutorial_4/Device.scala diff --git a/akka-docs-new/src/test/scala/tutorial_4/DeviceGroup.scala b/akka-docs/src/test/scala/tutorial_4/DeviceGroup.scala similarity index 100% rename from akka-docs-new/src/test/scala/tutorial_4/DeviceGroup.scala rename to akka-docs/src/test/scala/tutorial_4/DeviceGroup.scala diff --git a/akka-docs-new/src/test/scala/tutorial_4/DeviceGroupQuery.scala b/akka-docs/src/test/scala/tutorial_4/DeviceGroupQuery.scala similarity index 100% rename from akka-docs-new/src/test/scala/tutorial_4/DeviceGroupQuery.scala rename to akka-docs/src/test/scala/tutorial_4/DeviceGroupQuery.scala diff --git a/akka-docs-new/src/test/scala/tutorial_4/DeviceGroupQuerySpec.scala b/akka-docs/src/test/scala/tutorial_4/DeviceGroupQuerySpec.scala similarity index 100% rename from akka-docs-new/src/test/scala/tutorial_4/DeviceGroupQuerySpec.scala rename to akka-docs/src/test/scala/tutorial_4/DeviceGroupQuerySpec.scala diff --git a/akka-docs-new/src/test/scala/tutorial_4/DeviceGroupSpec.scala b/akka-docs/src/test/scala/tutorial_4/DeviceGroupSpec.scala similarity index 100% rename from akka-docs-new/src/test/scala/tutorial_4/DeviceGroupSpec.scala rename to akka-docs/src/test/scala/tutorial_4/DeviceGroupSpec.scala diff --git a/akka-docs-new/src/test/scala/tutorial_4/DeviceManager.scala b/akka-docs/src/test/scala/tutorial_4/DeviceManager.scala similarity index 100% rename from akka-docs-new/src/test/scala/tutorial_4/DeviceManager.scala rename to akka-docs/src/test/scala/tutorial_4/DeviceManager.scala diff --git a/akka-docs-new/src/test/scala/tutorial_5/Device.scala b/akka-docs/src/test/scala/tutorial_5/Device.scala similarity index 100% rename from akka-docs-new/src/test/scala/tutorial_5/Device.scala rename to akka-docs/src/test/scala/tutorial_5/Device.scala diff --git a/akka-docs-new/src/test/scala/tutorial_5/DeviceGroup.scala b/akka-docs/src/test/scala/tutorial_5/DeviceGroup.scala similarity index 100% rename from akka-docs-new/src/test/scala/tutorial_5/DeviceGroup.scala rename to akka-docs/src/test/scala/tutorial_5/DeviceGroup.scala diff --git a/akka-docs-new/src/test/scala/tutorial_5/DeviceGroupQuery.scala b/akka-docs/src/test/scala/tutorial_5/DeviceGroupQuery.scala similarity index 100% rename from akka-docs-new/src/test/scala/tutorial_5/DeviceGroupQuery.scala rename to akka-docs/src/test/scala/tutorial_5/DeviceGroupQuery.scala diff --git a/akka-docs-new/src/test/scala/tutorial_5/DeviceGroupQuerySpec.scala b/akka-docs/src/test/scala/tutorial_5/DeviceGroupQuerySpec.scala similarity index 100% rename from akka-docs-new/src/test/scala/tutorial_5/DeviceGroupQuerySpec.scala rename to akka-docs/src/test/scala/tutorial_5/DeviceGroupQuerySpec.scala diff --git a/akka-docs-new/src/test/scala/tutorial_5/DeviceGroupSpec.scala b/akka-docs/src/test/scala/tutorial_5/DeviceGroupSpec.scala similarity index 100% rename from akka-docs-new/src/test/scala/tutorial_5/DeviceGroupSpec.scala rename to akka-docs/src/test/scala/tutorial_5/DeviceGroupSpec.scala diff --git a/akka-docs-new/src/test/scala/tutorial_5/DeviceManager.scala b/akka-docs/src/test/scala/tutorial_5/DeviceManager.scala similarity index 100% rename from akka-docs-new/src/test/scala/tutorial_5/DeviceManager.scala rename to akka-docs/src/test/scala/tutorial_5/DeviceManager.scala diff --git a/akka-docs-new/src/test/scala/tutorial_5/DeviceSpec.scala b/akka-docs/src/test/scala/tutorial_5/DeviceSpec.scala similarity index 100% rename from akka-docs-new/src/test/scala/tutorial_5/DeviceSpec.scala rename to akka-docs/src/test/scala/tutorial_5/DeviceSpec.scala diff --git a/akka-docs-new/src/test/scala/tutorial_5/IotApp.scala b/akka-docs/src/test/scala/tutorial_5/IotApp.scala similarity index 100% rename from akka-docs-new/src/test/scala/tutorial_5/IotApp.scala rename to akka-docs/src/test/scala/tutorial_5/IotApp.scala diff --git a/akka-docs-new/src/test/scala/tutorial_5/IotSupervisor.scala b/akka-docs/src/test/scala/tutorial_5/IotSupervisor.scala similarity index 100% rename from akka-docs-new/src/test/scala/tutorial_5/IotSupervisor.scala rename to akka-docs/src/test/scala/tutorial_5/IotSupervisor.scala diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index 3c4ea4bd76..e04c38ffb9 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -265,19 +265,6 @@ object AkkaBuild extends Build { ) ) - lazy val newDocs = Project( - id = "akka-docs-new", - base = file("akka-docs-new"), - dependencies = Seq( - actor, - testkit % "compile;test->test", - remote % "compile;test->test", cluster, clusterMetrics, slf4j, agent, camel, osgi, - persistence % "compile;provided->provided;test->test", persistenceTck, persistenceQuery, - typed % "compile;test->test", distributedData, - stream, streamTestkit % "compile;test->test" - ) - ) - lazy val contrib = Project( id = "akka-contrib", base = file("akka-contrib"),