From 58c527baf16c0fb865006258349273538d43adcd Mon Sep 17 00:00:00 2001 From: Tim Hess Date: Thu, 3 Jul 2025 11:32:18 -0500 Subject: [PATCH 1/6] Add an attic page for archived projects, remove and add redirects - affects Circuit Breaker, Messaging, Stream --- .../partials/navbar.tmpl.partial | 4 +- .../Components/Layout/SiteFooter.razor | 12 ---- .../Components/Layout/SiteHeader.razor | 5 +- src/Steeltoe.io/Components/Pages/Attic.razor | 35 ++++++++++++ .../Pages/CircuitBreakers/Index.razor | 38 ------------- .../Pages/CircuitBreakers/Redirects.razor | 11 ---- .../Components/Pages/Community.razor | 8 +-- .../Components/Pages/Event-Driven.razor | 57 ------------------- src/Steeltoe.io/Components/Pages/Home.razor | 11 ---- .../Components/Pages/Messaging/Index.razor | 33 ----------- .../Pages/Messaging/Redirects.razor | 12 ---- src/Steeltoe.io/Program.cs | 9 +++ 12 files changed, 50 insertions(+), 185 deletions(-) create mode 100644 src/Steeltoe.io/Components/Pages/Attic.razor delete mode 100644 src/Steeltoe.io/Components/Pages/CircuitBreakers/Index.razor delete mode 100644 src/Steeltoe.io/Components/Pages/CircuitBreakers/Redirects.razor delete mode 100644 src/Steeltoe.io/Components/Pages/Event-Driven.razor delete mode 100644 src/Steeltoe.io/Components/Pages/Messaging/Index.razor delete mode 100644 src/Steeltoe.io/Components/Pages/Messaging/Redirects.razor diff --git a/docs/modern-steeltoe/partials/navbar.tmpl.partial b/docs/modern-steeltoe/partials/navbar.tmpl.partial index 5b7d5cfe..47db0a6d 100644 --- a/docs/modern-steeltoe/partials/navbar.tmpl.partial +++ b/docs/modern-steeltoe/partials/navbar.tmpl.partial @@ -97,15 +97,13 @@
Steeltoe Application Configuration - Steeltoe Circuit Breakers Steeltoe Dynamic Logging Steeltoe Management - Steeltoe Messaging Steeltoe Network File Sharing Steeltoe Security Steeltoe Service Connectors Steeltoe Service Discovery - Steeltoe Stream + Archived Projects
  • diff --git a/src/Steeltoe.io/Components/Layout/SiteFooter.razor b/src/Steeltoe.io/Components/Layout/SiteFooter.razor index 7c3702f6..487dba1f 100644 --- a/src/Steeltoe.io/Components/Layout/SiteFooter.razor +++ b/src/Steeltoe.io/Components/Layout/SiteFooter.razor @@ -42,9 +42,6 @@
    Web Applications
    -
    - Event Driven -
  • @@ -98,15 +97,13 @@
    Steeltoe Application Configuration - Steeltoe Circuit Breakers Steeltoe Dynamic Logging Steeltoe Management - Steeltoe Messaging Steeltoe Network File Sharing Steeltoe Security Steeltoe Service Connectors Steeltoe Service Discovery - Steeltoe Stream + Archived Projects
    • @*
  • diff --git a/src/Steeltoe.io/Components/Pages/Attic.razor b/src/Steeltoe.io/Components/Pages/Attic.razor new file mode 100644 index 00000000..eed29eca --- /dev/null +++ b/src/Steeltoe.io/Components/Pages/Attic.razor @@ -0,0 +1,35 @@ +@page "/attic" + + diff --git a/src/Steeltoe.io/Components/Pages/CircuitBreakers/Index.razor b/src/Steeltoe.io/Components/Pages/CircuitBreakers/Index.razor deleted file mode 100644 index 944591c6..00000000 --- a/src/Steeltoe.io/Components/Pages/CircuitBreakers/Index.razor +++ /dev/null @@ -1,38 +0,0 @@ -@page "/circuit-breakers" -@page "/steeltoe-circuitbreaker" - - - This component has been discontinued from Steeltoe v4. Please click here to read more and provide feedback. - - - - -@code -{ - private readonly Feature[] _features = - [ - new() - { - Title = (MarkupString)"Based on a proven pattern", - Description = b => { b.AddMarkupContent(1, "Steeltoe support a similar design to Spring Cloud Netflix based on Hystrix, Netflix's Latency and Fault Tolerance library for distributed systems."); }, - Img = "/images/icon-spring-cloud.svg" - }, - new() - { - Title = (MarkupString)"Internal to your application", - Description = b => { b.AddMarkupContent(1, "Steeltoe Circuit Breakers is a pure .NET implementation. Meaning all your app will need is this package."); }, - Img = "/images/Icon_upload.svg" - } - ]; -} diff --git a/src/Steeltoe.io/Components/Pages/CircuitBreakers/Redirects.razor b/src/Steeltoe.io/Components/Pages/CircuitBreakers/Redirects.razor deleted file mode 100644 index 86b1a3a1..00000000 --- a/src/Steeltoe.io/Components/Pages/CircuitBreakers/Redirects.razor +++ /dev/null @@ -1,11 +0,0 @@ -@page "/circuit-breakers/get-started/breaker" -@page "/circuit-breakers/get-started" -@inject NavigationManager Navigation - -@code -{ - protected override void OnParametersSet() - { - Navigation.NavigateTo("/guides/circuit-breaker/circuit-breaker.html"); - } -} diff --git a/src/Steeltoe.io/Components/Pages/Community.razor b/src/Steeltoe.io/Components/Pages/Community.razor index 193eff3e..064ffd1b 100644 --- a/src/Steeltoe.io/Components/Pages/Community.razor +++ b/src/Steeltoe.io/Components/Pages/Community.razor @@ -10,7 +10,7 @@
    - Steeltoe Slack +  Steeltoe Slack
    Slack is the best place to get your questions answered, contribute to conversations, and find the latest information about the Steeltoe project. @@ -19,19 +19,19 @@
    - Stack Overflow +  Stack Overflow
    Ask questions and get help with problems from the global Steeltoe community of users and practitioners.
    - Steeltoe on GitHub +  Steeltoe on GitHub
    Find the code for Steeltoe projects, raise issues, suggest changes, and view milestones and releases.
    - Steeltoe on Twitter/X +  Steeltoe on Twitter/X
    Stay up to date with the latest Steeltoe releases and blog posts.
    diff --git a/src/Steeltoe.io/Components/Pages/Event-Driven.razor b/src/Steeltoe.io/Components/Pages/Event-Driven.razor deleted file mode 100644 index 2601939d..00000000 --- a/src/Steeltoe.io/Components/Pages/Event-Driven.razor +++ /dev/null @@ -1,57 +0,0 @@ -@page "/event-driven" - - - These components have been discontinued from Steeltoe v4. Please click here to read more and provide feedback. - - - - -@code -{ - private readonly Feature[] _features = - [ - new() - { - Title = (MarkupString)"Steeltoe Messaging", - Description = b => - { - b.AddMarkupContent(1, "With the Steeltoe Messaging project, you can apply core concepts to the development of RabbitMQ based messaging solutions.

    In just a few lines, implement high-level message handling abstraction and support message-driven POCOs with a \"listener container.\"

    "); - b.OpenComponent(2); - b.AddAttribute(3, "href", "/messaging"); - b.AddAttribute(4, "AsButton", true); - b.AddAttribute(5, "ChildContent", (RenderFragment)(child => { child.AddContent(6, "Learn more"); })); - b.CloseComponent(); - }, - Img = "/images/Icon_device-exchange.svg" - }, - new() - { - Title = (MarkupString)"Steeltoe Stream", - Description = b => - { - b.AddMarkupContent(1, "Steeltoe Stream improves your productivity when working with RabbitMQ, providing three key abstractions to simplify your code. "Binders" integrate with external messaging systems. "Bindings" bridge the gap between the messaging systems and your code. "Messages" provide the structure that your code uses to send and receive data.

    Steeltoe Stream also provides support for provisioning, content conversion, error handling, configuration management, consumer groups, partitioning, monitoring, and health checks.

    "); - b.OpenComponent(2); - b.AddAttribute(3, "href", "/docs/stream"); - b.AddAttribute(4, "AsButton", true); - b.AddAttribute(5, "ChildContent", (RenderFragment)(child => { child.AddContent(6, "Learn more"); })); - b.CloseComponent(); - }, - Img = "/images/Icon_data-transfer.svg" - } - ]; -} diff --git a/src/Steeltoe.io/Components/Pages/Home.razor b/src/Steeltoe.io/Components/Pages/Home.razor index 59a365b0..2cfb0425 100644 --- a/src/Steeltoe.io/Components/Pages/Home.razor +++ b/src/Steeltoe.io/Components/Pages/Home.razor @@ -80,17 +80,6 @@
    A collection of libraries used for fast, secure, and responsive web applications connected to any data store.
    -
    - -
    - Use Steeltoe for event-driven apps. -
    -
    -

    Event Driven

    -
    -
    Integrate with your enterprise. React to business events. Act on your streaming data in realtime.
    -     -
    diff --git a/src/Steeltoe.io/Components/Pages/Messaging/Index.razor b/src/Steeltoe.io/Components/Pages/Messaging/Index.razor deleted file mode 100644 index 7f1dc280..00000000 --- a/src/Steeltoe.io/Components/Pages/Messaging/Index.razor +++ /dev/null @@ -1,33 +0,0 @@ -@page "/messaging" - - - This component has been discontinued from Steeltoe v4. Please click here to read more and provide feedback. - - - - -@code -{ - private readonly Feature[] _features = - [ - new() - { - Title = (MarkupString)"RabbitMQ Message Broker", - Description = b => { b.AddMarkupContent(1, "Using the native RabbitMQ .NET client within, the Steeltoe Messaging client abstracts the complexity of messaging containers and translates them into simple configuration values."); }, - Img = "/images/rabbitmq.png" - }, - new() - { - Title = (MarkupString)"Rabbit Admin", - Description = b => { b.AddMarkupContent(1, "Simple implementation of RabbitAdmin to automatically declare queues, exchanges, and bindings."); }, - Img = "/images/Icon_keys.svg" - } - ]; -} diff --git a/src/Steeltoe.io/Components/Pages/Messaging/Redirects.razor b/src/Steeltoe.io/Components/Pages/Messaging/Redirects.razor deleted file mode 100644 index a2b482f2..00000000 --- a/src/Steeltoe.io/Components/Pages/Messaging/Redirects.razor +++ /dev/null @@ -1,12 +0,0 @@ -@page "/messaging/get-started/rabbitmq" -@page "/guides/messaging/rabbitmq.html" - -@inject NavigationManager Navigation - -@code -{ - protected override void OnParametersSet() - { - Navigation.NavigateTo("/guides/messaging/Tutorials/Tutorial1/readme.html"); - } -} diff --git a/src/Steeltoe.io/Program.cs b/src/Steeltoe.io/Program.cs index affed48b..bf8482ad 100644 --- a/src/Steeltoe.io/Program.cs +++ b/src/Steeltoe.io/Program.cs @@ -1,3 +1,4 @@ +using Microsoft.AspNetCore.Rewrite; using Steeltoe.io; using Steeltoe.io.Components; using Steeltoe.io.Models; @@ -21,6 +22,14 @@ app.UseHsts(); } +app.UseRewriter(new RewriteOptions() + .AddRedirect("^circuit-breakers.*", "attic") + .AddRedirect("^steeltoe-circuitbreaker", "attic") + .AddRedirect("^event-driven", "attic") + .AddRedirect("^messaging.*", "attic") + .AddRedirect("/guides/messaging/rabbitmq.html", "attic") + .AddRedirect("^circuit-breakers.*", "attic")); + app.UseMiddleware(builder.Configuration); app.UseHttpsRedirection(); From f94e6ba5b7555ac5335294b651fab69633936087 Mon Sep 17 00:00:00 2001 From: Tim Hess Date: Mon, 7 Jul 2025 10:08:58 -0500 Subject: [PATCH 2/6] PR feedback --- src/Steeltoe.io/Components/Pages/Attic.razor | 7 +++++++ src/Steeltoe.io/Components/Pages/Cloud.razor | 2 +- .../Components/Pages/Security/Index.razor | 10 ++-------- .../Components/Pages/ServiceConnectors/Index.razor | 12 +++--------- .../Components/Pages/Web-Applications.razor | 2 +- src/Steeltoe.io/Components/Pages/Why-Steeltoe.razor | 3 +-- 6 files changed, 15 insertions(+), 21 deletions(-) diff --git a/src/Steeltoe.io/Components/Pages/Attic.razor b/src/Steeltoe.io/Components/Pages/Attic.razor index eed29eca..e5577b31 100644 --- a/src/Steeltoe.io/Components/Pages/Attic.razor +++ b/src/Steeltoe.io/Components/Pages/Attic.razor @@ -13,6 +13,13 @@
    +
    +  Steeltoe CredHub Client +
    +
    + .NET client for interacting with CredHub. +
    +
     Steeltoe Messaging
    diff --git a/src/Steeltoe.io/Components/Pages/Cloud.razor b/src/Steeltoe.io/Components/Pages/Cloud.razor index ae701b6a..78e02ab5 100644 --- a/src/Steeltoe.io/Components/Pages/Cloud.razor +++ b/src/Steeltoe.io/Components/Pages/Cloud.razor @@ -17,7 +17,7 @@ new() { Title = (MarkupString)"Service discovery", - Description = b => { b.AddMarkupContent(1, "In the cloud, applications can't always know the exact location of other services. A service registry, such as Netflix Eureka or HashiCorp Consul, can help. Steeltoe provides clients for both as well as Spring Config, a C# implementation of circuit breakers, and many other components.

    "); }, + Description = b => { b.AddMarkupContent(1, "In the cloud, applications can't always know the exact location of other services. A service registry, such as Netflix Eureka or HashiCorp Consul, can help. Steeltoe provides clients for both as well as Spring Config and many other components.

    "); }, Img = "/images/Icon_tool.svg" }, new() diff --git a/src/Steeltoe.io/Components/Pages/Security/Index.razor b/src/Steeltoe.io/Components/Pages/Security/Index.razor index fb6ab343..5622232b 100644 --- a/src/Steeltoe.io/Components/Pages/Security/Index.razor +++ b/src/Steeltoe.io/Components/Pages/Security/Index.razor @@ -22,7 +22,7 @@ new() { Title = (MarkupString)"Single Sign-on with OpenID Connect", - Description = b => { b.AddMarkupContent(1, "Leverage existing credentials managed by an OAuth2 service for authentication and authorization in ASP.NET Core applications or with OpenID Connect in ASP.NET Framework (4.x)."); }, + Description = b => { b.AddMarkupContent(1, "Leverage existing credentials managed by an external cloud service for authentication and authorization in ASP.NET Core applications."); }, Img = "/images/Icon_computer.svg" }, new() @@ -34,14 +34,8 @@ new() { Title = (MarkupString)"Redis Key Storage Provider", - Description = b => { b.AddMarkupContent(1, "Reconfigure the Data Protection service in ASP.NET to use an external Redis instance for key ring storage."); }, + Description = b => { b.AddMarkupContent(1, "Reconfigure the Data Protection service in ASP.NET to use an external Valkey/Redis instance for key ring storage."); }, Img = "/images/Icon_down-arrow.svg" - }, - new() - { - Title = (MarkupString)"CredHub Client", - Description = b => { b.AddMarkupContent(1, "Interact directly with a CredHub secrets store in an ASP.NET application."); }, - Img = "/images/Icon_security.svg" } ]; } diff --git a/src/Steeltoe.io/Components/Pages/ServiceConnectors/Index.razor b/src/Steeltoe.io/Components/Pages/ServiceConnectors/Index.razor index 8c8cc1c6..fec070fc 100644 --- a/src/Steeltoe.io/Components/Pages/ServiceConnectors/Index.razor +++ b/src/Steeltoe.io/Components/Pages/ServiceConnectors/Index.razor @@ -4,10 +4,10 @@