diff --git a/akka-docs/src/main/paradox/.htaccess b/akka-docs/src/main/paradox/.htaccess new file mode 100644 index 0000000000..33ea2ea499 --- /dev/null +++ b/akka-docs/src/main/paradox/.htaccess @@ -0,0 +1,2 @@ +RedirectMatch 301 ^(.*)/scala/(.*) $1/$2?language=scala +RedirectMatch 301 ^(.*)/java/(.*) $1/$2?language=java diff --git a/akka-docs/src/main/paradox/scala/actors.md b/akka-docs/src/main/paradox/actors.md similarity index 100% rename from akka-docs/src/main/paradox/scala/actors.md rename to akka-docs/src/main/paradox/actors.md diff --git a/akka-docs/src/main/paradox/scala/additional/books.md b/akka-docs/src/main/paradox/additional/books.md similarity index 100% rename from akka-docs/src/main/paradox/scala/additional/books.md rename to akka-docs/src/main/paradox/additional/books.md diff --git a/akka-docs/src/main/paradox/scala/additional/deploy.md b/akka-docs/src/main/paradox/additional/deploy.md similarity index 100% rename from akka-docs/src/main/paradox/scala/additional/deploy.md rename to akka-docs/src/main/paradox/additional/deploy.md diff --git a/akka-docs/src/main/paradox/scala/additional/faq.md b/akka-docs/src/main/paradox/additional/faq.md similarity index 100% rename from akka-docs/src/main/paradox/scala/additional/faq.md rename to akka-docs/src/main/paradox/additional/faq.md diff --git a/akka-docs/src/main/paradox/scala/additional/index.md b/akka-docs/src/main/paradox/additional/index.md similarity index 100% rename from akka-docs/src/main/paradox/scala/additional/index.md rename to akka-docs/src/main/paradox/additional/index.md diff --git a/akka-docs/src/main/paradox/scala/additional/osgi.md b/akka-docs/src/main/paradox/additional/osgi.md similarity index 100% rename from akka-docs/src/main/paradox/scala/additional/osgi.md rename to akka-docs/src/main/paradox/additional/osgi.md diff --git a/akka-docs/src/main/paradox/scala/agents.md b/akka-docs/src/main/paradox/agents.md similarity index 100% rename from akka-docs/src/main/paradox/scala/agents.md rename to akka-docs/src/main/paradox/agents.md diff --git a/akka-docs/src/main/paradox/scala/camel.md b/akka-docs/src/main/paradox/camel.md similarity index 100% rename from akka-docs/src/main/paradox/scala/camel.md rename to akka-docs/src/main/paradox/camel.md diff --git a/akka-docs/src/main/paradox/scala/cluster-client.md b/akka-docs/src/main/paradox/cluster-client.md similarity index 100% rename from akka-docs/src/main/paradox/scala/cluster-client.md rename to akka-docs/src/main/paradox/cluster-client.md diff --git a/akka-docs/src/main/paradox/scala/cluster-dc.md b/akka-docs/src/main/paradox/cluster-dc.md similarity index 100% rename from akka-docs/src/main/paradox/scala/cluster-dc.md rename to akka-docs/src/main/paradox/cluster-dc.md diff --git a/akka-docs/src/main/paradox/scala/cluster-metrics.md b/akka-docs/src/main/paradox/cluster-metrics.md similarity index 100% rename from akka-docs/src/main/paradox/scala/cluster-metrics.md rename to akka-docs/src/main/paradox/cluster-metrics.md diff --git a/akka-docs/src/main/paradox/scala/cluster-sharding.md b/akka-docs/src/main/paradox/cluster-sharding.md similarity index 100% rename from akka-docs/src/main/paradox/scala/cluster-sharding.md rename to akka-docs/src/main/paradox/cluster-sharding.md diff --git a/akka-docs/src/main/paradox/scala/cluster-singleton.md b/akka-docs/src/main/paradox/cluster-singleton.md similarity index 100% rename from akka-docs/src/main/paradox/scala/cluster-singleton.md rename to akka-docs/src/main/paradox/cluster-singleton.md diff --git a/akka-docs/src/main/paradox/scala/cluster-usage.md b/akka-docs/src/main/paradox/cluster-usage.md similarity index 99% rename from akka-docs/src/main/paradox/scala/cluster-usage.md rename to akka-docs/src/main/paradox/cluster-usage.md index 329176d03a..0ca853c4ba 100644 --- a/akka-docs/src/main/paradox/scala/cluster-usage.md +++ b/akka-docs/src/main/paradox/cluster-usage.md @@ -894,7 +894,7 @@ the actor system for a specific role. This can also be used to grab the `akka.ac ## How to Test Currently testing with the `sbt-multi-jvm` plugin is only documented for Scala. -Go to the corresponding @ref:[Scala page](../scala/cluster-usage.md#how-to-test) for details. +Go to the corresponding Scala version of this page for details. @@@ diff --git a/akka-docs/src/main/paradox/scala/common/binary-compatibility-rules.md b/akka-docs/src/main/paradox/common/binary-compatibility-rules.md similarity index 100% rename from akka-docs/src/main/paradox/scala/common/binary-compatibility-rules.md rename to akka-docs/src/main/paradox/common/binary-compatibility-rules.md diff --git a/akka-docs/src/main/paradox/scala/common/circuitbreaker.md b/akka-docs/src/main/paradox/common/circuitbreaker.md similarity index 100% rename from akka-docs/src/main/paradox/scala/common/circuitbreaker.md rename to akka-docs/src/main/paradox/common/circuitbreaker.md diff --git a/akka-docs/src/main/paradox/scala/common/cluster.md b/akka-docs/src/main/paradox/common/cluster.md similarity index 100% rename from akka-docs/src/main/paradox/scala/common/cluster.md rename to akka-docs/src/main/paradox/common/cluster.md diff --git a/akka-docs/src/main/paradox/scala/common/duration.md b/akka-docs/src/main/paradox/common/duration.md similarity index 100% rename from akka-docs/src/main/paradox/scala/common/duration.md rename to akka-docs/src/main/paradox/common/duration.md diff --git a/akka-docs/src/main/paradox/scala/common/io-layer.md b/akka-docs/src/main/paradox/common/io-layer.md similarity index 100% rename from akka-docs/src/main/paradox/scala/common/io-layer.md rename to akka-docs/src/main/paradox/common/io-layer.md diff --git a/akka-docs/src/main/paradox/scala/common/may-change.md b/akka-docs/src/main/paradox/common/may-change.md similarity index 94% rename from akka-docs/src/main/paradox/scala/common/may-change.md rename to akka-docs/src/main/paradox/common/may-change.md index a84a522b48..95d73631c0 100644 --- a/akka-docs/src/main/paradox/scala/common/may-change.md +++ b/akka-docs/src/main/paradox/common/may-change.md @@ -28,7 +28,7 @@ that the module or API wasn't useful. These are the current complete modules marked as **may change**: -* @ref:[Multi Node Testing](../../scala/multi-node-testing.md) -* @ref:[Akka Typed](../../scala/typed.md) +* @ref:[Multi Node Testing](../multi-node-testing.md) +* @ref:[Akka Typed](../typed.md) diff --git a/akka-docs/src/main/paradox/scala/common/other-modules.md b/akka-docs/src/main/paradox/common/other-modules.md similarity index 100% rename from akka-docs/src/main/paradox/scala/common/other-modules.md rename to akka-docs/src/main/paradox/common/other-modules.md diff --git a/akka-docs/src/main/paradox/scala/dispatchers.md b/akka-docs/src/main/paradox/dispatchers.md similarity index 100% rename from akka-docs/src/main/paradox/scala/dispatchers.md rename to akka-docs/src/main/paradox/dispatchers.md diff --git a/akka-docs/src/main/paradox/scala/distributed-data.md b/akka-docs/src/main/paradox/distributed-data.md similarity index 100% rename from akka-docs/src/main/paradox/scala/distributed-data.md rename to akka-docs/src/main/paradox/distributed-data.md diff --git a/akka-docs/src/main/paradox/scala/distributed-pub-sub.md b/akka-docs/src/main/paradox/distributed-pub-sub.md similarity index 100% rename from akka-docs/src/main/paradox/scala/distributed-pub-sub.md rename to akka-docs/src/main/paradox/distributed-pub-sub.md diff --git a/akka-docs/src/main/paradox/scala/event-bus.md b/akka-docs/src/main/paradox/event-bus.md similarity index 100% rename from akka-docs/src/main/paradox/scala/event-bus.md rename to akka-docs/src/main/paradox/event-bus.md diff --git a/akka-docs/src/main/paradox/scala/extending-akka.md b/akka-docs/src/main/paradox/extending-akka.md similarity index 100% rename from akka-docs/src/main/paradox/scala/extending-akka.md rename to akka-docs/src/main/paradox/extending-akka.md diff --git a/akka-docs/src/main/paradox/scala/fault-tolerance-sample.md b/akka-docs/src/main/paradox/fault-tolerance-sample.md similarity index 100% rename from akka-docs/src/main/paradox/scala/fault-tolerance-sample.md rename to akka-docs/src/main/paradox/fault-tolerance-sample.md diff --git a/akka-docs/src/main/paradox/scala/fault-tolerance.md b/akka-docs/src/main/paradox/fault-tolerance.md similarity index 100% rename from akka-docs/src/main/paradox/scala/fault-tolerance.md rename to akka-docs/src/main/paradox/fault-tolerance.md diff --git a/akka-docs/src/main/paradox/scala/fsm.md b/akka-docs/src/main/paradox/fsm.md similarity index 100% rename from akka-docs/src/main/paradox/scala/fsm.md rename to akka-docs/src/main/paradox/fsm.md diff --git a/akka-docs/src/main/paradox/scala/futures.md b/akka-docs/src/main/paradox/futures.md similarity index 100% rename from akka-docs/src/main/paradox/scala/futures.md rename to akka-docs/src/main/paradox/futures.md diff --git a/akka-docs/src/main/paradox/scala/general/ActorPath.png b/akka-docs/src/main/paradox/general/ActorPath.png similarity index 100% rename from akka-docs/src/main/paradox/scala/general/ActorPath.png rename to akka-docs/src/main/paradox/general/ActorPath.png diff --git a/akka-docs/src/main/paradox/scala/general/RemoteDeployment.png b/akka-docs/src/main/paradox/general/RemoteDeployment.png similarity index 100% rename from akka-docs/src/main/paradox/scala/general/RemoteDeployment.png rename to akka-docs/src/main/paradox/general/RemoteDeployment.png diff --git a/akka-docs/src/main/paradox/scala/general/actor-systems.md b/akka-docs/src/main/paradox/general/actor-systems.md similarity index 100% rename from akka-docs/src/main/paradox/scala/general/actor-systems.md rename to akka-docs/src/main/paradox/general/actor-systems.md diff --git a/akka-docs/src/main/paradox/scala/general/actors.md b/akka-docs/src/main/paradox/general/actors.md similarity index 100% rename from akka-docs/src/main/paradox/scala/general/actors.md rename to akka-docs/src/main/paradox/general/actors.md diff --git a/akka-docs/src/main/paradox/scala/general/addressing.md b/akka-docs/src/main/paradox/general/addressing.md similarity index 100% rename from akka-docs/src/main/paradox/scala/general/addressing.md rename to akka-docs/src/main/paradox/general/addressing.md diff --git a/akka-docs/src/main/paradox/scala/general/configuration.md b/akka-docs/src/main/paradox/general/configuration.md similarity index 100% rename from akka-docs/src/main/paradox/scala/general/configuration.md rename to akka-docs/src/main/paradox/general/configuration.md diff --git a/akka-docs/src/main/paradox/scala/general/guardians.png b/akka-docs/src/main/paradox/general/guardians.png similarity index 100% rename from akka-docs/src/main/paradox/scala/general/guardians.png rename to akka-docs/src/main/paradox/general/guardians.png diff --git a/akka-docs/src/main/paradox/scala/general/index.md b/akka-docs/src/main/paradox/general/index.md similarity index 100% rename from akka-docs/src/main/paradox/scala/general/index.md rename to akka-docs/src/main/paradox/general/index.md diff --git a/akka-docs/src/main/paradox/scala/general/jmm.md b/akka-docs/src/main/paradox/general/jmm.md similarity index 100% rename from akka-docs/src/main/paradox/scala/general/jmm.md rename to akka-docs/src/main/paradox/general/jmm.md diff --git a/akka-docs/src/main/paradox/scala/general/message-delivery-reliability.md b/akka-docs/src/main/paradox/general/message-delivery-reliability.md similarity index 100% rename from akka-docs/src/main/paradox/scala/general/message-delivery-reliability.md rename to akka-docs/src/main/paradox/general/message-delivery-reliability.md diff --git a/akka-docs/src/main/paradox/scala/general/remoting.md b/akka-docs/src/main/paradox/general/remoting.md similarity index 100% rename from akka-docs/src/main/paradox/scala/general/remoting.md rename to akka-docs/src/main/paradox/general/remoting.md diff --git a/akka-docs/src/main/paradox/scala/general/stream/stream-configuration.md b/akka-docs/src/main/paradox/general/stream/stream-configuration.md similarity index 100% rename from akka-docs/src/main/paradox/scala/general/stream/stream-configuration.md rename to akka-docs/src/main/paradox/general/stream/stream-configuration.md diff --git a/akka-docs/src/main/paradox/scala/general/stream/stream-design.md b/akka-docs/src/main/paradox/general/stream/stream-design.md similarity index 100% rename from akka-docs/src/main/paradox/scala/general/stream/stream-design.md rename to akka-docs/src/main/paradox/general/stream/stream-design.md diff --git a/akka-docs/src/main/paradox/scala/general/supervision.md b/akka-docs/src/main/paradox/general/supervision.md similarity index 100% rename from akka-docs/src/main/paradox/scala/general/supervision.md rename to akka-docs/src/main/paradox/general/supervision.md diff --git a/akka-docs/src/main/paradox/scala/general/terminology.md b/akka-docs/src/main/paradox/general/terminology.md similarity index 100% rename from akka-docs/src/main/paradox/scala/general/terminology.md rename to akka-docs/src/main/paradox/general/terminology.md diff --git a/akka-docs/src/main/paradox/scala/guide/actors-intro.md b/akka-docs/src/main/paradox/guide/actors-intro.md similarity index 100% rename from akka-docs/src/main/paradox/scala/guide/actors-intro.md rename to akka-docs/src/main/paradox/guide/actors-intro.md diff --git a/akka-docs/src/main/paradox/scala/guide/actors-motivation.md b/akka-docs/src/main/paradox/guide/actors-motivation.md similarity index 100% rename from akka-docs/src/main/paradox/scala/guide/actors-motivation.md rename to akka-docs/src/main/paradox/guide/actors-motivation.md diff --git a/akka-docs/src/main/paradox/scala/guide/diagrams/actor_graph.png b/akka-docs/src/main/paradox/guide/diagrams/actor_graph.png similarity index 100% rename from akka-docs/src/main/paradox/scala/guide/diagrams/actor_graph.png rename to akka-docs/src/main/paradox/guide/diagrams/actor_graph.png diff --git a/akka-docs/src/main/paradox/scala/guide/diagrams/actor_graph.svg b/akka-docs/src/main/paradox/guide/diagrams/actor_graph.svg similarity index 100% rename from akka-docs/src/main/paradox/scala/guide/diagrams/actor_graph.svg rename to akka-docs/src/main/paradox/guide/diagrams/actor_graph.svg diff --git a/akka-docs/src/main/paradox/scala/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/src/main/paradox/scala/guide/diagrams/actor_top_tree.png rename to akka-docs/src/main/paradox/guide/diagrams/actor_top_tree.png diff --git a/akka-docs/src/main/paradox/scala/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/src/main/paradox/scala/guide/diagrams/actor_top_tree.svg rename to akka-docs/src/main/paradox/guide/diagrams/actor_top_tree.svg diff --git a/akka-docs/src/main/paradox/scala/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/src/main/paradox/scala/guide/diagrams/actor_tree_supervision.png rename to akka-docs/src/main/paradox/guide/diagrams/actor_tree_supervision.png diff --git a/akka-docs/src/main/paradox/scala/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/src/main/paradox/scala/guide/diagrams/actor_tree_supervision.svg rename to akka-docs/src/main/paradox/guide/diagrams/actor_tree_supervision.svg diff --git a/akka-docs/src/main/paradox/scala/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/src/main/paradox/scala/guide/diagrams/arch_boxes_diagram.png rename to akka-docs/src/main/paradox/guide/diagrams/arch_boxes_diagram.png diff --git a/akka-docs/src/main/paradox/scala/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/src/main/paradox/scala/guide/diagrams/arch_boxes_diagram.svg rename to akka-docs/src/main/paradox/guide/diagrams/arch_boxes_diagram.svg diff --git a/akka-docs/src/main/paradox/scala/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/src/main/paradox/scala/guide/diagrams/arch_tree_diagram.png rename to akka-docs/src/main/paradox/guide/diagrams/arch_tree_diagram.png diff --git a/akka-docs/src/main/paradox/scala/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/src/main/paradox/scala/guide/diagrams/arch_tree_diagram.svg rename to akka-docs/src/main/paradox/guide/diagrams/arch_tree_diagram.svg diff --git a/akka-docs/src/main/paradox/scala/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/src/main/paradox/scala/guide/diagrams/device_manager_tree.png rename to akka-docs/src/main/paradox/guide/diagrams/device_manager_tree.png diff --git a/akka-docs/src/main/paradox/scala/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/src/main/paradox/scala/guide/diagrams/device_manager_tree.svg rename to akka-docs/src/main/paradox/guide/diagrams/device_manager_tree.svg diff --git a/akka-docs/src/main/paradox/scala/guide/diagrams/exception_prop.png b/akka-docs/src/main/paradox/guide/diagrams/exception_prop.png similarity index 100% rename from akka-docs/src/main/paradox/scala/guide/diagrams/exception_prop.png rename to akka-docs/src/main/paradox/guide/diagrams/exception_prop.png diff --git a/akka-docs/src/main/paradox/scala/guide/diagrams/exception_prop.svg b/akka-docs/src/main/paradox/guide/diagrams/exception_prop.svg similarity index 100% rename from akka-docs/src/main/paradox/scala/guide/diagrams/exception_prop.svg rename to akka-docs/src/main/paradox/guide/diagrams/exception_prop.svg diff --git a/akka-docs/src/main/paradox/scala/guide/diagrams/object_graph.png b/akka-docs/src/main/paradox/guide/diagrams/object_graph.png similarity index 100% rename from akka-docs/src/main/paradox/scala/guide/diagrams/object_graph.png rename to akka-docs/src/main/paradox/guide/diagrams/object_graph.png diff --git a/akka-docs/src/main/paradox/scala/guide/diagrams/object_graph.svg b/akka-docs/src/main/paradox/guide/diagrams/object_graph.svg similarity index 100% rename from akka-docs/src/main/paradox/scala/guide/diagrams/object_graph.svg rename to akka-docs/src/main/paradox/guide/diagrams/object_graph.svg diff --git a/akka-docs/src/main/paradox/scala/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/src/main/paradox/scala/guide/diagrams/object_graph_snakes.png rename to akka-docs/src/main/paradox/guide/diagrams/object_graph_snakes.png diff --git a/akka-docs/src/main/paradox/scala/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/src/main/paradox/scala/guide/diagrams/object_graph_snakes.svg rename to akka-docs/src/main/paradox/guide/diagrams/object_graph_snakes.svg diff --git a/akka-docs/src/main/paradox/scala/guide/diagrams/seq_chart.png b/akka-docs/src/main/paradox/guide/diagrams/seq_chart.png similarity index 100% rename from akka-docs/src/main/paradox/scala/guide/diagrams/seq_chart.png rename to akka-docs/src/main/paradox/guide/diagrams/seq_chart.png diff --git a/akka-docs/src/main/paradox/scala/guide/diagrams/seq_chart.svg b/akka-docs/src/main/paradox/guide/diagrams/seq_chart.svg similarity index 100% rename from akka-docs/src/main/paradox/scala/guide/diagrams/seq_chart.svg rename to akka-docs/src/main/paradox/guide/diagrams/seq_chart.svg diff --git a/akka-docs/src/main/paradox/scala/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/src/main/paradox/scala/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/src/main/paradox/scala/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/src/main/paradox/scala/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/src/main/paradox/scala/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/src/main/paradox/scala/guide/diagrams/seq_chart_thread.png rename to akka-docs/src/main/paradox/guide/diagrams/seq_chart_thread.png diff --git a/akka-docs/src/main/paradox/scala/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/src/main/paradox/scala/guide/diagrams/seq_chart_thread.svg rename to akka-docs/src/main/paradox/guide/diagrams/seq_chart_thread.svg diff --git a/akka-docs/src/main/paradox/scala/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/src/main/paradox/scala/guide/diagrams/serialized_timeline_invariants.png rename to akka-docs/src/main/paradox/guide/diagrams/serialized_timeline_invariants.png diff --git a/akka-docs/src/main/paradox/scala/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/src/main/paradox/scala/guide/diagrams/serialized_timeline_invariants.svg rename to akka-docs/src/main/paradox/guide/diagrams/serialized_timeline_invariants.svg diff --git a/akka-docs/src/main/paradox/scala/guide/index.md b/akka-docs/src/main/paradox/guide/index.md similarity index 100% rename from akka-docs/src/main/paradox/scala/guide/index.md rename to akka-docs/src/main/paradox/guide/index.md diff --git a/akka-docs/src/main/paradox/scala/guide/introduction.md b/akka-docs/src/main/paradox/guide/introduction.md similarity index 100% rename from akka-docs/src/main/paradox/scala/guide/introduction.md rename to akka-docs/src/main/paradox/guide/introduction.md diff --git a/akka-docs/src/main/paradox/scala/guide/modules.md b/akka-docs/src/main/paradox/guide/modules.md similarity index 100% rename from akka-docs/src/main/paradox/scala/guide/modules.md rename to akka-docs/src/main/paradox/guide/modules.md diff --git a/akka-docs/src/main/paradox/scala/guide/tutorial.md b/akka-docs/src/main/paradox/guide/tutorial.md similarity index 100% rename from akka-docs/src/main/paradox/scala/guide/tutorial.md rename to akka-docs/src/main/paradox/guide/tutorial.md diff --git a/akka-docs/src/main/paradox/scala/guide/tutorial_1.md b/akka-docs/src/main/paradox/guide/tutorial_1.md similarity index 100% rename from akka-docs/src/main/paradox/scala/guide/tutorial_1.md rename to akka-docs/src/main/paradox/guide/tutorial_1.md diff --git a/akka-docs/src/main/paradox/scala/guide/tutorial_2.md b/akka-docs/src/main/paradox/guide/tutorial_2.md similarity index 100% rename from akka-docs/src/main/paradox/scala/guide/tutorial_2.md rename to akka-docs/src/main/paradox/guide/tutorial_2.md diff --git a/akka-docs/src/main/paradox/scala/guide/tutorial_3.md b/akka-docs/src/main/paradox/guide/tutorial_3.md similarity index 100% rename from akka-docs/src/main/paradox/scala/guide/tutorial_3.md rename to akka-docs/src/main/paradox/guide/tutorial_3.md diff --git a/akka-docs/src/main/paradox/scala/guide/tutorial_4.md b/akka-docs/src/main/paradox/guide/tutorial_4.md similarity index 100% rename from akka-docs/src/main/paradox/scala/guide/tutorial_4.md rename to akka-docs/src/main/paradox/guide/tutorial_4.md diff --git a/akka-docs/src/main/paradox/scala/guide/tutorial_5.md b/akka-docs/src/main/paradox/guide/tutorial_5.md similarity index 100% rename from akka-docs/src/main/paradox/scala/guide/tutorial_5.md rename to akka-docs/src/main/paradox/guide/tutorial_5.md diff --git a/akka-docs/src/main/paradox/scala/howto.md b/akka-docs/src/main/paradox/howto.md similarity index 100% rename from akka-docs/src/main/paradox/scala/howto.md rename to akka-docs/src/main/paradox/howto.md diff --git a/akka-docs/src/main/paradox/scala/index-actors.md b/akka-docs/src/main/paradox/index-actors.md similarity index 100% rename from akka-docs/src/main/paradox/scala/index-actors.md rename to akka-docs/src/main/paradox/index-actors.md diff --git a/akka-docs/src/main/paradox/scala/index-futures.md b/akka-docs/src/main/paradox/index-futures.md similarity index 100% rename from akka-docs/src/main/paradox/scala/index-futures.md rename to akka-docs/src/main/paradox/index-futures.md diff --git a/akka-docs/src/main/paradox/scala/index-network.md b/akka-docs/src/main/paradox/index-network.md similarity index 100% rename from akka-docs/src/main/paradox/scala/index-network.md rename to akka-docs/src/main/paradox/index-network.md diff --git a/akka-docs/src/main/paradox/scala/index-utilities.md b/akka-docs/src/main/paradox/index-utilities.md similarity index 100% rename from akka-docs/src/main/paradox/scala/index-utilities.md rename to akka-docs/src/main/paradox/index-utilities.md diff --git a/akka-docs/src/main/paradox/index.md b/akka-docs/src/main/paradox/index.md index 581acc7149..cd9fb4e1cc 100644 --- a/akka-docs/src/main/paradox/index.md +++ b/akka-docs/src/main/paradox/index.md @@ -1,4 +1,20 @@ -# Contents +# Akka Documentation -* @ref:[Java Documentation](java/index.md) -* @ref:[Scala Documentation](scala/index.md) +@@toc { depth=2 } + +@@@ index + +* [security/index](security/index.md) +* [guide/index](guide/index.md) +* [general/index](general/index.md) +* [index-actors](index-actors.md) +* [index-network](index-network.md) +* [stream/index](stream/index.md) +* [index-futures](index-futures.md) +* [index-utilities](index-utilities.md) +* [common/other-modules](common/other-modules.md) +* [howto](howto.md) +* [project/index](project/index.md) +* [additional/index](additional/index.md) + +@@@ diff --git a/akka-docs/src/main/paradox/scala/io-tcp.md b/akka-docs/src/main/paradox/io-tcp.md similarity index 100% rename from akka-docs/src/main/paradox/scala/io-tcp.md rename to akka-docs/src/main/paradox/io-tcp.md diff --git a/akka-docs/src/main/paradox/scala/io-udp.md b/akka-docs/src/main/paradox/io-udp.md similarity index 100% rename from akka-docs/src/main/paradox/scala/io-udp.md rename to akka-docs/src/main/paradox/io-udp.md diff --git a/akka-docs/src/main/paradox/scala/io.md b/akka-docs/src/main/paradox/io.md similarity index 100% rename from akka-docs/src/main/paradox/scala/io.md rename to akka-docs/src/main/paradox/io.md diff --git a/akka-docs/src/main/paradox/java/actors.md b/akka-docs/src/main/paradox/java/actors.md deleted file mode 120000 index ae81a26b4d..0000000000 --- a/akka-docs/src/main/paradox/java/actors.md +++ /dev/null @@ -1 +0,0 @@ -../scala/actors.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/additional b/akka-docs/src/main/paradox/java/additional deleted file mode 120000 index b9b438df71..0000000000 --- a/akka-docs/src/main/paradox/java/additional +++ /dev/null @@ -1 +0,0 @@ -../scala/additional \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/agents.md b/akka-docs/src/main/paradox/java/agents.md deleted file mode 120000 index 554e5a331e..0000000000 --- a/akka-docs/src/main/paradox/java/agents.md +++ /dev/null @@ -1 +0,0 @@ -../scala/agents.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/camel.md b/akka-docs/src/main/paradox/java/camel.md deleted file mode 120000 index a70e89ae79..0000000000 --- a/akka-docs/src/main/paradox/java/camel.md +++ /dev/null @@ -1 +0,0 @@ -../scala/camel.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/cluster-client.md b/akka-docs/src/main/paradox/java/cluster-client.md deleted file mode 120000 index ee23909da4..0000000000 --- a/akka-docs/src/main/paradox/java/cluster-client.md +++ /dev/null @@ -1 +0,0 @@ -../scala/cluster-client.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/cluster-dc.md b/akka-docs/src/main/paradox/java/cluster-dc.md deleted file mode 120000 index 9adf7076c9..0000000000 --- a/akka-docs/src/main/paradox/java/cluster-dc.md +++ /dev/null @@ -1 +0,0 @@ -../scala/cluster-dc.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/cluster-metrics.md b/akka-docs/src/main/paradox/java/cluster-metrics.md deleted file mode 120000 index 10887d3ea2..0000000000 --- a/akka-docs/src/main/paradox/java/cluster-metrics.md +++ /dev/null @@ -1 +0,0 @@ -../scala/cluster-metrics.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/cluster-sharding.md b/akka-docs/src/main/paradox/java/cluster-sharding.md deleted file mode 120000 index c69117f3f2..0000000000 --- a/akka-docs/src/main/paradox/java/cluster-sharding.md +++ /dev/null @@ -1 +0,0 @@ -../scala/cluster-sharding.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/cluster-singleton.md b/akka-docs/src/main/paradox/java/cluster-singleton.md deleted file mode 120000 index a71dd76f25..0000000000 --- a/akka-docs/src/main/paradox/java/cluster-singleton.md +++ /dev/null @@ -1 +0,0 @@ -../scala/cluster-singleton.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/cluster-usage.md b/akka-docs/src/main/paradox/java/cluster-usage.md deleted file mode 120000 index 22fb0f3e3a..0000000000 --- a/akka-docs/src/main/paradox/java/cluster-usage.md +++ /dev/null @@ -1 +0,0 @@ -../scala/cluster-usage.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/common b/akka-docs/src/main/paradox/java/common deleted file mode 120000 index 8e9bd02a3b..0000000000 --- a/akka-docs/src/main/paradox/java/common +++ /dev/null @@ -1 +0,0 @@ -../scala/common \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/dev b/akka-docs/src/main/paradox/java/dev deleted file mode 120000 index d38eae8212..0000000000 --- a/akka-docs/src/main/paradox/java/dev +++ /dev/null @@ -1 +0,0 @@ -../scala/dev \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/dispatchers.md b/akka-docs/src/main/paradox/java/dispatchers.md deleted file mode 120000 index 4ffd76c4a9..0000000000 --- a/akka-docs/src/main/paradox/java/dispatchers.md +++ /dev/null @@ -1 +0,0 @@ -../scala/dispatchers.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/distributed-data.md b/akka-docs/src/main/paradox/java/distributed-data.md deleted file mode 120000 index 09729dd7b7..0000000000 --- a/akka-docs/src/main/paradox/java/distributed-data.md +++ /dev/null @@ -1 +0,0 @@ -../scala/distributed-data.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/distributed-pub-sub.md b/akka-docs/src/main/paradox/java/distributed-pub-sub.md deleted file mode 120000 index 66fda13075..0000000000 --- a/akka-docs/src/main/paradox/java/distributed-pub-sub.md +++ /dev/null @@ -1 +0,0 @@ -../scala/distributed-pub-sub.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/event-bus.md b/akka-docs/src/main/paradox/java/event-bus.md deleted file mode 120000 index 59eb3e0f7b..0000000000 --- a/akka-docs/src/main/paradox/java/event-bus.md +++ /dev/null @@ -1 +0,0 @@ -../scala/event-bus.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/extending-akka.md b/akka-docs/src/main/paradox/java/extending-akka.md deleted file mode 120000 index f707380ae3..0000000000 --- a/akka-docs/src/main/paradox/java/extending-akka.md +++ /dev/null @@ -1 +0,0 @@ -../scala/extending-akka.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/fault-tolerance-sample.md b/akka-docs/src/main/paradox/java/fault-tolerance-sample.md deleted file mode 120000 index 9c3e27aced..0000000000 --- a/akka-docs/src/main/paradox/java/fault-tolerance-sample.md +++ /dev/null @@ -1 +0,0 @@ -../scala/fault-tolerance-sample.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/fault-tolerance.md b/akka-docs/src/main/paradox/java/fault-tolerance.md deleted file mode 120000 index 813f37ec73..0000000000 --- a/akka-docs/src/main/paradox/java/fault-tolerance.md +++ /dev/null @@ -1 +0,0 @@ -../scala/fault-tolerance.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/fsm.md b/akka-docs/src/main/paradox/java/fsm.md deleted file mode 120000 index b020a4be10..0000000000 --- a/akka-docs/src/main/paradox/java/fsm.md +++ /dev/null @@ -1 +0,0 @@ -../scala/fsm.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/futures.md b/akka-docs/src/main/paradox/java/futures.md deleted file mode 120000 index afab2a277b..0000000000 --- a/akka-docs/src/main/paradox/java/futures.md +++ /dev/null @@ -1 +0,0 @@ -../scala/futures.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/general b/akka-docs/src/main/paradox/java/general deleted file mode 120000 index fd3a5a485c..0000000000 --- a/akka-docs/src/main/paradox/java/general +++ /dev/null @@ -1 +0,0 @@ -../scala/general \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/guide b/akka-docs/src/main/paradox/java/guide deleted file mode 120000 index e073c29a94..0000000000 --- a/akka-docs/src/main/paradox/java/guide +++ /dev/null @@ -1 +0,0 @@ -../scala/guide \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/howto.md b/akka-docs/src/main/paradox/java/howto.md deleted file mode 120000 index 95b66c90e5..0000000000 --- a/akka-docs/src/main/paradox/java/howto.md +++ /dev/null @@ -1 +0,0 @@ -../scala/howto.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/index-actors.md b/akka-docs/src/main/paradox/java/index-actors.md deleted file mode 120000 index 30b1c95631..0000000000 --- a/akka-docs/src/main/paradox/java/index-actors.md +++ /dev/null @@ -1 +0,0 @@ -../scala/index-actors.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/index-futures.md b/akka-docs/src/main/paradox/java/index-futures.md deleted file mode 120000 index c138740f68..0000000000 --- a/akka-docs/src/main/paradox/java/index-futures.md +++ /dev/null @@ -1 +0,0 @@ -../scala/index-futures.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/index-network.md b/akka-docs/src/main/paradox/java/index-network.md deleted file mode 120000 index 30930d6954..0000000000 --- a/akka-docs/src/main/paradox/java/index-network.md +++ /dev/null @@ -1 +0,0 @@ -../scala/index-network.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/index-utilities.md b/akka-docs/src/main/paradox/java/index-utilities.md deleted file mode 120000 index d21fb8012e..0000000000 --- a/akka-docs/src/main/paradox/java/index-utilities.md +++ /dev/null @@ -1 +0,0 @@ -../scala/index-utilities.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/index.md b/akka-docs/src/main/paradox/java/index.md deleted file mode 120000 index 21d4c5bc73..0000000000 --- a/akka-docs/src/main/paradox/java/index.md +++ /dev/null @@ -1 +0,0 @@ -../scala/index.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/io-tcp.md b/akka-docs/src/main/paradox/java/io-tcp.md deleted file mode 120000 index 35f57396a4..0000000000 --- a/akka-docs/src/main/paradox/java/io-tcp.md +++ /dev/null @@ -1 +0,0 @@ -../scala/io-tcp.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/io-udp.md b/akka-docs/src/main/paradox/java/io-udp.md deleted file mode 120000 index 540e9e8735..0000000000 --- a/akka-docs/src/main/paradox/java/io-udp.md +++ /dev/null @@ -1 +0,0 @@ -../scala/io-udp.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/io.md b/akka-docs/src/main/paradox/java/io.md deleted file mode 120000 index 5be4aa364f..0000000000 --- a/akka-docs/src/main/paradox/java/io.md +++ /dev/null @@ -1 +0,0 @@ -../scala/io.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/java8-compat.md b/akka-docs/src/main/paradox/java/java8-compat.md deleted file mode 120000 index 0cf975a27c..0000000000 --- a/akka-docs/src/main/paradox/java/java8-compat.md +++ /dev/null @@ -1 +0,0 @@ -../scala/java8-compat.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/logging.md b/akka-docs/src/main/paradox/java/logging.md deleted file mode 120000 index b8216835a7..0000000000 --- a/akka-docs/src/main/paradox/java/logging.md +++ /dev/null @@ -1 +0,0 @@ -../scala/logging.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/mailboxes.md b/akka-docs/src/main/paradox/java/mailboxes.md deleted file mode 120000 index 9050f2cda1..0000000000 --- a/akka-docs/src/main/paradox/java/mailboxes.md +++ /dev/null @@ -1 +0,0 @@ -../scala/mailboxes.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/multi-jvm-testing.md b/akka-docs/src/main/paradox/java/multi-jvm-testing.md deleted file mode 120000 index bb96ec83d6..0000000000 --- a/akka-docs/src/main/paradox/java/multi-jvm-testing.md +++ /dev/null @@ -1 +0,0 @@ -../scala/multi-jvm-testing.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/multi-node-testing.md b/akka-docs/src/main/paradox/java/multi-node-testing.md deleted file mode 120000 index 1dbe5c33e6..0000000000 --- a/akka-docs/src/main/paradox/java/multi-node-testing.md +++ /dev/null @@ -1 +0,0 @@ -../scala/multi-node-testing.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/persistence-query-leveldb.md b/akka-docs/src/main/paradox/java/persistence-query-leveldb.md deleted file mode 120000 index 2cca8793fc..0000000000 --- a/akka-docs/src/main/paradox/java/persistence-query-leveldb.md +++ /dev/null @@ -1 +0,0 @@ -../scala/persistence-query-leveldb.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/persistence-query.md b/akka-docs/src/main/paradox/java/persistence-query.md deleted file mode 120000 index b65bcfa169..0000000000 --- a/akka-docs/src/main/paradox/java/persistence-query.md +++ /dev/null @@ -1 +0,0 @@ -../scala/persistence-query.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/persistence-schema-evolution.md b/akka-docs/src/main/paradox/java/persistence-schema-evolution.md deleted file mode 120000 index fc6b6584fd..0000000000 --- a/akka-docs/src/main/paradox/java/persistence-schema-evolution.md +++ /dev/null @@ -1 +0,0 @@ -../scala/persistence-schema-evolution.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/persistence.md b/akka-docs/src/main/paradox/java/persistence.md deleted file mode 120000 index ec1da509f5..0000000000 --- a/akka-docs/src/main/paradox/java/persistence.md +++ /dev/null @@ -1 +0,0 @@ -../scala/persistence.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/project b/akka-docs/src/main/paradox/java/project deleted file mode 120000 index 029c1c15c1..0000000000 --- a/akka-docs/src/main/paradox/java/project +++ /dev/null @@ -1 +0,0 @@ -../scala/project \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/remoting-artery.md b/akka-docs/src/main/paradox/java/remoting-artery.md deleted file mode 120000 index c21485a8db..0000000000 --- a/akka-docs/src/main/paradox/java/remoting-artery.md +++ /dev/null @@ -1 +0,0 @@ -../scala/remoting-artery.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/remoting.md b/akka-docs/src/main/paradox/java/remoting.md deleted file mode 120000 index fc3af71cc3..0000000000 --- a/akka-docs/src/main/paradox/java/remoting.md +++ /dev/null @@ -1 +0,0 @@ -../scala/remoting.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/routing.md b/akka-docs/src/main/paradox/java/routing.md deleted file mode 120000 index 003f99abcc..0000000000 --- a/akka-docs/src/main/paradox/java/routing.md +++ /dev/null @@ -1 +0,0 @@ -../scala/routing.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/scheduler.md b/akka-docs/src/main/paradox/java/scheduler.md deleted file mode 120000 index 6e4e97bf17..0000000000 --- a/akka-docs/src/main/paradox/java/scheduler.md +++ /dev/null @@ -1 +0,0 @@ -../scala/scheduler.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/security b/akka-docs/src/main/paradox/java/security deleted file mode 120000 index dd5fb2ec4f..0000000000 --- a/akka-docs/src/main/paradox/java/security +++ /dev/null @@ -1 +0,0 @@ -../scala/security \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/serialization.md b/akka-docs/src/main/paradox/java/serialization.md deleted file mode 120000 index 1e1c5e319b..0000000000 --- a/akka-docs/src/main/paradox/java/serialization.md +++ /dev/null @@ -1 +0,0 @@ -../scala/serialization.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/stream/index.md b/akka-docs/src/main/paradox/java/stream/index.md deleted file mode 120000 index a22c2ea515..0000000000 --- a/akka-docs/src/main/paradox/java/stream/index.md +++ /dev/null @@ -1 +0,0 @@ -../../scala/stream/index.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/stream/stages-overview.md b/akka-docs/src/main/paradox/java/stream/stages-overview.md deleted file mode 120000 index 734e2da1ae..0000000000 --- a/akka-docs/src/main/paradox/java/stream/stages-overview.md +++ /dev/null @@ -1 +0,0 @@ -../../scala/stream/stages-overview.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/stream/stream-composition.md b/akka-docs/src/main/paradox/java/stream/stream-composition.md deleted file mode 120000 index e1817dce2e..0000000000 --- a/akka-docs/src/main/paradox/java/stream/stream-composition.md +++ /dev/null @@ -1 +0,0 @@ -../../scala/stream/stream-composition.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/stream/stream-cookbook.md b/akka-docs/src/main/paradox/java/stream/stream-cookbook.md deleted file mode 120000 index 3f4abcf620..0000000000 --- a/akka-docs/src/main/paradox/java/stream/stream-cookbook.md +++ /dev/null @@ -1 +0,0 @@ -../../scala/stream/stream-cookbook.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/stream/stream-customize.md b/akka-docs/src/main/paradox/java/stream/stream-customize.md deleted file mode 120000 index 68e4f3949a..0000000000 --- a/akka-docs/src/main/paradox/java/stream/stream-customize.md +++ /dev/null @@ -1 +0,0 @@ -../../scala/stream/stream-customize.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/stream/stream-dynamic.md b/akka-docs/src/main/paradox/java/stream/stream-dynamic.md deleted file mode 120000 index e02c507355..0000000000 --- a/akka-docs/src/main/paradox/java/stream/stream-dynamic.md +++ /dev/null @@ -1 +0,0 @@ -../../scala/stream/stream-dynamic.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/stream/stream-error.md b/akka-docs/src/main/paradox/java/stream/stream-error.md deleted file mode 120000 index f4bab4d977..0000000000 --- a/akka-docs/src/main/paradox/java/stream/stream-error.md +++ /dev/null @@ -1 +0,0 @@ -../../scala/stream/stream-error.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/stream/stream-flows-and-basics.md b/akka-docs/src/main/paradox/java/stream/stream-flows-and-basics.md deleted file mode 120000 index 77eaec108c..0000000000 --- a/akka-docs/src/main/paradox/java/stream/stream-flows-and-basics.md +++ /dev/null @@ -1 +0,0 @@ -../../scala/stream/stream-flows-and-basics.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/stream/stream-graphs.md b/akka-docs/src/main/paradox/java/stream/stream-graphs.md deleted file mode 120000 index 4a58fe91cf..0000000000 --- a/akka-docs/src/main/paradox/java/stream/stream-graphs.md +++ /dev/null @@ -1 +0,0 @@ -../../scala/stream/stream-graphs.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/stream/stream-integrations.md b/akka-docs/src/main/paradox/java/stream/stream-integrations.md deleted file mode 120000 index 41eaaa72fb..0000000000 --- a/akka-docs/src/main/paradox/java/stream/stream-integrations.md +++ /dev/null @@ -1 +0,0 @@ -../../scala/stream/stream-integrations.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/stream/stream-introduction.md b/akka-docs/src/main/paradox/java/stream/stream-introduction.md deleted file mode 120000 index 81b068deb7..0000000000 --- a/akka-docs/src/main/paradox/java/stream/stream-introduction.md +++ /dev/null @@ -1 +0,0 @@ -../../scala/stream/stream-introduction.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/stream/stream-io.md b/akka-docs/src/main/paradox/java/stream/stream-io.md deleted file mode 120000 index c485efce96..0000000000 --- a/akka-docs/src/main/paradox/java/stream/stream-io.md +++ /dev/null @@ -1 +0,0 @@ -../../scala/stream/stream-io.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/stream/stream-parallelism.md b/akka-docs/src/main/paradox/java/stream/stream-parallelism.md deleted file mode 120000 index 27397364cc..0000000000 --- a/akka-docs/src/main/paradox/java/stream/stream-parallelism.md +++ /dev/null @@ -1 +0,0 @@ -../../scala/stream/stream-parallelism.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/stream/stream-quickstart.md b/akka-docs/src/main/paradox/java/stream/stream-quickstart.md deleted file mode 120000 index 901805d014..0000000000 --- a/akka-docs/src/main/paradox/java/stream/stream-quickstart.md +++ /dev/null @@ -1 +0,0 @@ -../../scala/stream/stream-quickstart.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/stream/stream-rate.md b/akka-docs/src/main/paradox/java/stream/stream-rate.md deleted file mode 120000 index 7930abf1b1..0000000000 --- a/akka-docs/src/main/paradox/java/stream/stream-rate.md +++ /dev/null @@ -1 +0,0 @@ -../../scala/stream/stream-rate.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/stream/stream-testkit.md b/akka-docs/src/main/paradox/java/stream/stream-testkit.md deleted file mode 120000 index 12ce30367c..0000000000 --- a/akka-docs/src/main/paradox/java/stream/stream-testkit.md +++ /dev/null @@ -1 +0,0 @@ -../../scala/stream/stream-testkit.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/testing.md b/akka-docs/src/main/paradox/java/testing.md deleted file mode 120000 index 4001a13101..0000000000 --- a/akka-docs/src/main/paradox/java/testing.md +++ /dev/null @@ -1 +0,0 @@ -../scala/testing.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/typed-actors.md b/akka-docs/src/main/paradox/java/typed-actors.md deleted file mode 120000 index 12add5ae3b..0000000000 --- a/akka-docs/src/main/paradox/java/typed-actors.md +++ /dev/null @@ -1 +0,0 @@ -../scala/typed-actors.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/java/typed.md b/akka-docs/src/main/paradox/java/typed.md deleted file mode 120000 index 62300f4d39..0000000000 --- a/akka-docs/src/main/paradox/java/typed.md +++ /dev/null @@ -1 +0,0 @@ -../scala/typed.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/scala/scala-compat.md b/akka-docs/src/main/paradox/java8-compat.md similarity index 100% rename from akka-docs/src/main/paradox/scala/scala-compat.md rename to akka-docs/src/main/paradox/java8-compat.md diff --git a/akka-docs/src/main/paradox/scala/logging.md b/akka-docs/src/main/paradox/logging.md similarity index 100% rename from akka-docs/src/main/paradox/scala/logging.md rename to akka-docs/src/main/paradox/logging.md diff --git a/akka-docs/src/main/paradox/scala/mailboxes.md b/akka-docs/src/main/paradox/mailboxes.md similarity index 100% rename from akka-docs/src/main/paradox/scala/mailboxes.md rename to akka-docs/src/main/paradox/mailboxes.md diff --git a/akka-docs/src/main/paradox/scala/multi-jvm-testing.md b/akka-docs/src/main/paradox/multi-jvm-testing.md similarity index 100% rename from akka-docs/src/main/paradox/scala/multi-jvm-testing.md rename to akka-docs/src/main/paradox/multi-jvm-testing.md diff --git a/akka-docs/src/main/paradox/scala/multi-node-testing.md b/akka-docs/src/main/paradox/multi-node-testing.md similarity index 100% rename from akka-docs/src/main/paradox/scala/multi-node-testing.md rename to akka-docs/src/main/paradox/multi-node-testing.md diff --git a/akka-docs/src/main/paradox/scala/persistence-query-leveldb.md b/akka-docs/src/main/paradox/persistence-query-leveldb.md similarity index 100% rename from akka-docs/src/main/paradox/scala/persistence-query-leveldb.md rename to akka-docs/src/main/paradox/persistence-query-leveldb.md diff --git a/akka-docs/src/main/paradox/scala/persistence-query.md b/akka-docs/src/main/paradox/persistence-query.md similarity index 100% rename from akka-docs/src/main/paradox/scala/persistence-query.md rename to akka-docs/src/main/paradox/persistence-query.md diff --git a/akka-docs/src/main/paradox/scala/persistence-schema-evolution.md b/akka-docs/src/main/paradox/persistence-schema-evolution.md similarity index 100% rename from akka-docs/src/main/paradox/scala/persistence-schema-evolution.md rename to akka-docs/src/main/paradox/persistence-schema-evolution.md diff --git a/akka-docs/src/main/paradox/scala/persistence.md b/akka-docs/src/main/paradox/persistence.md similarity index 100% rename from akka-docs/src/main/paradox/scala/persistence.md rename to akka-docs/src/main/paradox/persistence.md diff --git a/akka-docs/src/main/paradox/scala/project/index.md b/akka-docs/src/main/paradox/project/index.md similarity index 100% rename from akka-docs/src/main/paradox/scala/project/index.md rename to akka-docs/src/main/paradox/project/index.md diff --git a/akka-docs/src/main/paradox/scala/project/issue-tracking.md b/akka-docs/src/main/paradox/project/issue-tracking.md similarity index 100% rename from akka-docs/src/main/paradox/scala/project/issue-tracking.md rename to akka-docs/src/main/paradox/project/issue-tracking.md diff --git a/akka-docs/src/main/paradox/scala/project/licenses.md b/akka-docs/src/main/paradox/project/licenses.md similarity index 100% rename from akka-docs/src/main/paradox/scala/project/licenses.md rename to akka-docs/src/main/paradox/project/licenses.md diff --git a/akka-docs/src/main/paradox/scala/project/links.md b/akka-docs/src/main/paradox/project/links.md similarity index 100% rename from akka-docs/src/main/paradox/scala/project/links.md rename to akka-docs/src/main/paradox/project/links.md diff --git a/akka-docs/src/main/paradox/scala/project/migration-guide-1.3.x-2.0.x.md b/akka-docs/src/main/paradox/project/migration-guide-1.3.x-2.0.x.md similarity index 100% rename from akka-docs/src/main/paradox/scala/project/migration-guide-1.3.x-2.0.x.md rename to akka-docs/src/main/paradox/project/migration-guide-1.3.x-2.0.x.md diff --git a/akka-docs/src/main/paradox/scala/project/migration-guide-2.0.x-2.1.x.md b/akka-docs/src/main/paradox/project/migration-guide-2.0.x-2.1.x.md similarity index 100% rename from akka-docs/src/main/paradox/scala/project/migration-guide-2.0.x-2.1.x.md rename to akka-docs/src/main/paradox/project/migration-guide-2.0.x-2.1.x.md diff --git a/akka-docs/src/main/paradox/scala/project/migration-guide-2.1.x-2.2.x.md b/akka-docs/src/main/paradox/project/migration-guide-2.1.x-2.2.x.md similarity index 100% rename from akka-docs/src/main/paradox/scala/project/migration-guide-2.1.x-2.2.x.md rename to akka-docs/src/main/paradox/project/migration-guide-2.1.x-2.2.x.md diff --git a/akka-docs/src/main/paradox/scala/project/migration-guide-2.2.x-2.3.x.md b/akka-docs/src/main/paradox/project/migration-guide-2.2.x-2.3.x.md similarity index 100% rename from akka-docs/src/main/paradox/scala/project/migration-guide-2.2.x-2.3.x.md rename to akka-docs/src/main/paradox/project/migration-guide-2.2.x-2.3.x.md diff --git a/akka-docs/src/main/paradox/scala/project/migration-guide-2.3.x-2.4.x.md b/akka-docs/src/main/paradox/project/migration-guide-2.3.x-2.4.x.md similarity index 100% rename from akka-docs/src/main/paradox/scala/project/migration-guide-2.3.x-2.4.x.md rename to akka-docs/src/main/paradox/project/migration-guide-2.3.x-2.4.x.md diff --git a/akka-docs/src/main/paradox/scala/project/migration-guide-2.4.x-2.5.x.md b/akka-docs/src/main/paradox/project/migration-guide-2.4.x-2.5.x.md similarity index 99% rename from akka-docs/src/main/paradox/scala/project/migration-guide-2.4.x-2.5.x.md rename to akka-docs/src/main/paradox/project/migration-guide-2.4.x-2.5.x.md index 4e6b548172..4c3499204b 100644 --- a/akka-docs/src/main/paradox/scala/project/migration-guide-2.4.x-2.5.x.md +++ b/akka-docs/src/main/paradox/project/migration-guide-2.4.x-2.5.x.md @@ -66,7 +66,7 @@ public class SomeActor extends AbstractActor { } ``` -See @ref:[Receive messages](../../java/actors.md#actors-receive) documentation for more advice about how to implement +See @ref:[Receive messages](../actors.md#receive-messages) documentation for more advice about how to implement `createReceive`. A few new methods have been added with deprecation of the old. Worth noting is `preRestart`. @@ -212,7 +212,7 @@ public class SomeActor extends AbstractActor { } ``` -See @ref:[Receive messages](../../java/actors.md#actors-receive) documentation for more advice about how to implement +See @ref:[Receive messages](../actors.md#receive-messages) documentation for more advice about how to implement `createReceive`. Similar with `UntypedActorWithStash`, `UntypedPersistentActor`, and diff --git a/akka-docs/src/main/paradox/scala/project/migration-guide-eventsourced-2.3.x.md b/akka-docs/src/main/paradox/project/migration-guide-eventsourced-2.3.x.md similarity index 100% rename from akka-docs/src/main/paradox/scala/project/migration-guide-eventsourced-2.3.x.md rename to akka-docs/src/main/paradox/project/migration-guide-eventsourced-2.3.x.md diff --git a/akka-docs/src/main/paradox/scala/project/migration-guide-persistence-experimental-2.3.x-2.4.x.md b/akka-docs/src/main/paradox/project/migration-guide-persistence-experimental-2.3.x-2.4.x.md similarity index 100% rename from akka-docs/src/main/paradox/scala/project/migration-guide-persistence-experimental-2.3.x-2.4.x.md rename to akka-docs/src/main/paradox/project/migration-guide-persistence-experimental-2.3.x-2.4.x.md diff --git a/akka-docs/src/main/paradox/scala/project/migration-guide-stream-1.0-2.x.md b/akka-docs/src/main/paradox/project/migration-guide-stream-1.0-2.x.md similarity index 100% rename from akka-docs/src/main/paradox/scala/project/migration-guide-stream-1.0-2.x.md rename to akka-docs/src/main/paradox/project/migration-guide-stream-1.0-2.x.md diff --git a/akka-docs/src/main/paradox/scala/project/migration-guide-stream-2.0-2.4.md b/akka-docs/src/main/paradox/project/migration-guide-stream-2.0-2.4.md similarity index 100% rename from akka-docs/src/main/paradox/scala/project/migration-guide-stream-2.0-2.4.md rename to akka-docs/src/main/paradox/project/migration-guide-stream-2.0-2.4.md diff --git a/akka-docs/src/main/paradox/scala/project/migration-guides.md b/akka-docs/src/main/paradox/project/migration-guides.md similarity index 100% rename from akka-docs/src/main/paradox/scala/project/migration-guides.md rename to akka-docs/src/main/paradox/project/migration-guides.md diff --git a/akka-docs/src/main/paradox/scala/remoting-artery.md b/akka-docs/src/main/paradox/remoting-artery.md similarity index 100% rename from akka-docs/src/main/paradox/scala/remoting-artery.md rename to akka-docs/src/main/paradox/remoting-artery.md diff --git a/akka-docs/src/main/paradox/scala/remoting.md b/akka-docs/src/main/paradox/remoting.md similarity index 100% rename from akka-docs/src/main/paradox/scala/remoting.md rename to akka-docs/src/main/paradox/remoting.md diff --git a/akka-docs/src/main/paradox/scala/routing.md b/akka-docs/src/main/paradox/routing.md similarity index 100% rename from akka-docs/src/main/paradox/scala/routing.md rename to akka-docs/src/main/paradox/routing.md diff --git a/akka-docs/src/main/paradox/scala/index.md b/akka-docs/src/main/paradox/scala/index.md deleted file mode 100644 index cd9fb4e1cc..0000000000 --- a/akka-docs/src/main/paradox/scala/index.md +++ /dev/null @@ -1,20 +0,0 @@ -# Akka Documentation - -@@toc { depth=2 } - -@@@ index - -* [security/index](security/index.md) -* [guide/index](guide/index.md) -* [general/index](general/index.md) -* [index-actors](index-actors.md) -* [index-network](index-network.md) -* [stream/index](stream/index.md) -* [index-futures](index-futures.md) -* [index-utilities](index-utilities.md) -* [common/other-modules](common/other-modules.md) -* [howto](howto.md) -* [project/index](project/index.md) -* [additional/index](additional/index.md) - -@@@ diff --git a/akka-docs/src/main/paradox/scala/java8-compat.md b/akka-docs/src/main/paradox/scala/java8-compat.md deleted file mode 120000 index be759c6298..0000000000 --- a/akka-docs/src/main/paradox/scala/java8-compat.md +++ /dev/null @@ -1 +0,0 @@ -../scala/scala-compat.md \ No newline at end of file diff --git a/akka-docs/src/main/paradox/scala/scheduler.md b/akka-docs/src/main/paradox/scheduler.md similarity index 100% rename from akka-docs/src/main/paradox/scala/scheduler.md rename to akka-docs/src/main/paradox/scheduler.md diff --git a/akka-docs/src/main/paradox/scala/security/2017-02-10-java-serialization.md b/akka-docs/src/main/paradox/security/2017-02-10-java-serialization.md similarity index 100% rename from akka-docs/src/main/paradox/scala/security/2017-02-10-java-serialization.md rename to akka-docs/src/main/paradox/security/2017-02-10-java-serialization.md diff --git a/akka-docs/src/main/paradox/scala/security/2017-08-09-camel.md b/akka-docs/src/main/paradox/security/2017-08-09-camel.md similarity index 100% rename from akka-docs/src/main/paradox/scala/security/2017-08-09-camel.md rename to akka-docs/src/main/paradox/security/2017-08-09-camel.md diff --git a/akka-docs/src/main/paradox/scala/security/index.md b/akka-docs/src/main/paradox/security/index.md similarity index 100% rename from akka-docs/src/main/paradox/scala/security/index.md rename to akka-docs/src/main/paradox/security/index.md diff --git a/akka-docs/src/main/paradox/scala/serialization.md b/akka-docs/src/main/paradox/serialization.md similarity index 100% rename from akka-docs/src/main/paradox/scala/serialization.md rename to akka-docs/src/main/paradox/serialization.md diff --git a/akka-docs/src/main/paradox/scala/stream/index.md b/akka-docs/src/main/paradox/stream/index.md similarity index 100% rename from akka-docs/src/main/paradox/scala/stream/index.md rename to akka-docs/src/main/paradox/stream/index.md diff --git a/akka-docs/src/main/paradox/scala/stream/stages-overview.md b/akka-docs/src/main/paradox/stream/stages-overview.md similarity index 100% rename from akka-docs/src/main/paradox/scala/stream/stages-overview.md rename to akka-docs/src/main/paradox/stream/stages-overview.md diff --git a/akka-docs/src/main/paradox/scala/stream/stream-composition.md b/akka-docs/src/main/paradox/stream/stream-composition.md similarity index 100% rename from akka-docs/src/main/paradox/scala/stream/stream-composition.md rename to akka-docs/src/main/paradox/stream/stream-composition.md diff --git a/akka-docs/src/main/paradox/scala/stream/stream-cookbook.md b/akka-docs/src/main/paradox/stream/stream-cookbook.md similarity index 100% rename from akka-docs/src/main/paradox/scala/stream/stream-cookbook.md rename to akka-docs/src/main/paradox/stream/stream-cookbook.md diff --git a/akka-docs/src/main/paradox/scala/stream/stream-customize.md b/akka-docs/src/main/paradox/stream/stream-customize.md similarity index 100% rename from akka-docs/src/main/paradox/scala/stream/stream-customize.md rename to akka-docs/src/main/paradox/stream/stream-customize.md diff --git a/akka-docs/src/main/paradox/scala/stream/stream-dynamic.md b/akka-docs/src/main/paradox/stream/stream-dynamic.md similarity index 100% rename from akka-docs/src/main/paradox/scala/stream/stream-dynamic.md rename to akka-docs/src/main/paradox/stream/stream-dynamic.md diff --git a/akka-docs/src/main/paradox/scala/stream/stream-error.md b/akka-docs/src/main/paradox/stream/stream-error.md similarity index 100% rename from akka-docs/src/main/paradox/scala/stream/stream-error.md rename to akka-docs/src/main/paradox/stream/stream-error.md diff --git a/akka-docs/src/main/paradox/scala/stream/stream-flows-and-basics.md b/akka-docs/src/main/paradox/stream/stream-flows-and-basics.md similarity index 100% rename from akka-docs/src/main/paradox/scala/stream/stream-flows-and-basics.md rename to akka-docs/src/main/paradox/stream/stream-flows-and-basics.md diff --git a/akka-docs/src/main/paradox/scala/stream/stream-graphs.md b/akka-docs/src/main/paradox/stream/stream-graphs.md similarity index 100% rename from akka-docs/src/main/paradox/scala/stream/stream-graphs.md rename to akka-docs/src/main/paradox/stream/stream-graphs.md diff --git a/akka-docs/src/main/paradox/scala/stream/stream-integrations.md b/akka-docs/src/main/paradox/stream/stream-integrations.md similarity index 100% rename from akka-docs/src/main/paradox/scala/stream/stream-integrations.md rename to akka-docs/src/main/paradox/stream/stream-integrations.md diff --git a/akka-docs/src/main/paradox/scala/stream/stream-introduction.md b/akka-docs/src/main/paradox/stream/stream-introduction.md similarity index 100% rename from akka-docs/src/main/paradox/scala/stream/stream-introduction.md rename to akka-docs/src/main/paradox/stream/stream-introduction.md diff --git a/akka-docs/src/main/paradox/scala/stream/stream-io.md b/akka-docs/src/main/paradox/stream/stream-io.md similarity index 100% rename from akka-docs/src/main/paradox/scala/stream/stream-io.md rename to akka-docs/src/main/paradox/stream/stream-io.md diff --git a/akka-docs/src/main/paradox/scala/stream/stream-parallelism.md b/akka-docs/src/main/paradox/stream/stream-parallelism.md similarity index 100% rename from akka-docs/src/main/paradox/scala/stream/stream-parallelism.md rename to akka-docs/src/main/paradox/stream/stream-parallelism.md diff --git a/akka-docs/src/main/paradox/scala/stream/stream-quickstart.md b/akka-docs/src/main/paradox/stream/stream-quickstart.md similarity index 100% rename from akka-docs/src/main/paradox/scala/stream/stream-quickstart.md rename to akka-docs/src/main/paradox/stream/stream-quickstart.md diff --git a/akka-docs/src/main/paradox/scala/stream/stream-rate.md b/akka-docs/src/main/paradox/stream/stream-rate.md similarity index 100% rename from akka-docs/src/main/paradox/scala/stream/stream-rate.md rename to akka-docs/src/main/paradox/stream/stream-rate.md diff --git a/akka-docs/src/main/paradox/scala/stream/stream-testkit.md b/akka-docs/src/main/paradox/stream/stream-testkit.md similarity index 100% rename from akka-docs/src/main/paradox/scala/stream/stream-testkit.md rename to akka-docs/src/main/paradox/stream/stream-testkit.md diff --git a/akka-docs/src/main/paradox/scala/testing.md b/akka-docs/src/main/paradox/testing.md similarity index 100% rename from akka-docs/src/main/paradox/scala/testing.md rename to akka-docs/src/main/paradox/testing.md diff --git a/akka-docs/src/main/paradox/scala/typed-actors.md b/akka-docs/src/main/paradox/typed-actors.md similarity index 100% rename from akka-docs/src/main/paradox/scala/typed-actors.md rename to akka-docs/src/main/paradox/typed-actors.md diff --git a/akka-docs/src/main/paradox/scala/typed.md b/akka-docs/src/main/paradox/typed.md similarity index 100% rename from akka-docs/src/main/paradox/scala/typed.md rename to akka-docs/src/main/paradox/typed.md diff --git a/build.sbt b/build.sbt index 1239d3fae7..4a84ef9202 100644 --- a/build.sbt +++ b/build.sbt @@ -209,10 +209,11 @@ lazy val docs = akkaModule("akka-docs") "snip.akka.base_dir" -> (baseDirectory in ThisBuild).value.getAbsolutePath, "fiddle.code.base_dir" -> (sourceDirectory in Test).value.getAbsolutePath ), - paradoxGroups := Map("Languages" -> Seq("Scala", "Java")), - resolvers += Resolver.jcenterRepo + paradoxGroups := Map("Language" -> Seq("Scala", "Java")), + resolvers += Resolver.jcenterRepo, + deployRsyncArtifact := List((paradox in Compile).value -> s"www/docs/akka/${version.value}"), ) - .enablePlugins(AkkaParadoxPlugin, NoPublish, ParadoxBrowse, ScaladocNoVerificationOfDiagrams) + .enablePlugins(AkkaParadoxPlugin, DeployRsync, NoPublish, ParadoxBrowse, ScaladocNoVerificationOfDiagrams) .disablePlugins(MimaPlugin, WhiteSourcePlugin) lazy val multiNodeTestkit = akkaModule("akka-multi-node-testkit") diff --git a/project/Publish.scala b/project/Publish.scala index 7832754e3c..69352d4c26 100644 --- a/project/Publish.scala +++ b/project/Publish.scala @@ -68,3 +68,27 @@ object NoPublish extends AutoPlugin { publishLocal := {} ) } + +object DeployRsync extends AutoPlugin { + import scala.sys.process._ + import sbt.complete.DefaultParsers._ + + override def requires = plugins.JvmPlugin + + trait Keys { + val deployRsyncArtifact = taskKey[Seq[(File, String)]]("File or directory and a path to deploy to") + val deployRsync = inputKey[Unit]("Deploy using SCP") + } + + object autoImport extends Keys + import autoImport._ + + override def projectSettings = Seq( + deployRsync := { + val (_, host) = (Space ~ StringBasic).parsed + deployRsyncArtifact.value.foreach { + case (from, to) ⇒ s"rsync -rvz $from/ $host:$to"! + } + } + ) +} diff --git a/project/plugins.sbt b/project/plugins.sbt index c52f4e9aa7..42a9e2ee83 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -18,7 +18,7 @@ addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.27") addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.2.2-RC2") addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.6.1") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.1") -addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.4") +addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.5") addSbtPlugin("com.lightbend" % "sbt-whitesource" % "0.1.6") addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3") addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.0") // for advanced PR validation features diff --git a/project/scripts/release b/project/scripts/release index c7347852cd..7f21937edb 100755 --- a/project/scripts/release +++ b/project/scripts/release @@ -362,11 +362,13 @@ fi # push the release to the server echolog "Pushing ${release_dir} to ${publish_path} ..." if [ $dry_run ]; then - echodry "Not actually pushing to server. Command:" - echodry " rsync -rlpvz --chmod=Dg+ws,Fg+w --exclude ${release_dir}/downloads ${release_dir}/ ${publish_path}/" + echodry "Not actually pushing to server. Commands:" + echodry " sbt deployRsync" + echodry " rsync -rlpvz --chmod=Dg+ws,Fg+w --exclude ${release_dir}/downloads --exclude ${release_dir}/docs ${release_dir}/ ${publish_path}/" else important ssh ${release_server} "cd ${release_path}/docs/akka; git add .; git commit -m 'before publishing version $version'; true" - important rsync -rlpvz --chmod=Dg+ws,Fg+w --exclude ${release_dir}/downloads ${release_dir}/ ${publish_path}/ + important sbt deployRsync + important rsync -rlpvz --chmod=Dg+ws,Fg+w --exclude ${release_dir}/downloads --exclude ${release_dir}/docs ${release_dir}/ ${publish_path}/ #important ssh ${release_server} cp -v ${release_path}/docs/akka/${version}/_static/warnOldDocs.js ${release_path}/docs/akka #important ssh ${release_server} ln -snvf ../../warnOldDocs.js ${release_path}/docs/akka/${version}/_static/warnOldDocs.js important ssh ${release_server} "cd ${release_path}/docs/akka; git add .; git commit -m 'publish version $version'"