Merge pull request #27 from CommunityToolkit/java-project-names

Aligning the namespace and file names of the Hosting.Java integration
CommunityToolkit · Sep 19, 2024 · 9f9e493 · 9f9e493
2 parents db67da9 + 9c54420
commit 9f9e493
Show file tree

Hide file tree

Showing 57 changed files with 64 additions and 78 deletions.
diff --git a/.github/workflows/dotnet-ci.yml b/.github/workflows/dotnet-ci.yml
@@ -47,7 +47,7 @@ jobs:
         name: Cache Java Docker images
         with:
           path: /var/lib/docker/image
-          key: ${{ runner.os }}-docker-${{ hashFiles('examples/java/CommunityToolkit.Aspire.Java.Spring.Maven/Dockerfile') }}
+          key: ${{ runner.os }}-docker-${{ hashFiles('examples/java/CommunityToolkit.Aspire.Hosting.Java.Spring.Maven/Dockerfile') }}
           restore-keys: |
             ${{ runner.os }}-docker-
 
@@ -122,3 +122,4 @@ jobs:
 
       - name: Publish to GitHub packages
         run: dotnet nuget push ./*.nupkg --source "https://nuget.pkg.github.com/communitytoolkit/index.json" --api-key ${{ secrets.GITHUB_TOKEN }}
+
diff --git a/.github/workflows/dotnet-main.yml b/.github/workflows/dotnet-main.yml
@@ -47,7 +47,7 @@ jobs:
         name: Cache Java Docker images
         with:
           path: /var/lib/docker/image
-          key: ${{ runner.os }}-docker-${{ hashFiles('examples/java/CommunityToolkit.Aspire.Java.Spring.Maven/Dockerfile') }}
+          key: ${{ runner.os }}-docker-${{ hashFiles('examples/java/CommunityToolkit.Aspire.Hosting.Java.Spring.Maven/Dockerfile') }}
           restore-keys: |
             ${{ runner.os }}-docker-
 
@@ -136,3 +136,4 @@ jobs:
 
       - name: Publish to GitHub packages
         run: dotnet nuget push ./*.nupkg --source "https://nuget.pkg.github.com/communitytoolkit/index.json" --api-key ${{ secrets.GITHUB_TOKEN }}
+
diff --git a/.github/workflows/dotnet-release.yml b/.github/workflows/dotnet-release.yml
@@ -48,7 +48,7 @@ jobs:
         name: Cache Java Docker images
         with:
           path: /var/lib/docker/image
-          key: ${{ runner.os }}-docker-${{ hashFiles('examples/java/CommunityToolkit.Aspire.Java.Spring.Maven/Dockerfile') }}
+          key: ${{ runner.os }}-docker-${{ hashFiles('examples/java/CommunityToolkit.Aspire.Hosting.Java.Spring.Maven/Dockerfile') }}
           restore-keys: |
             ${{ runner.os }}-docker-
 

diff --git a/CommunityToolkit.Aspire.sln b/CommunityToolkit.Aspire.sln
@@ -13,17 +13,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{85
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "java", "java", "{F120E99A-FB2A-4C3B-B588-9B7ED1CD4E8A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Aspire.Java.WebApp", "examples\java\CommunityToolkit.Aspire.Java.WebApp\CommunityToolkit.Aspire.Java.WebApp.csproj", "{3D767C8C-7E04-4264-B4E9-13600650D2B1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Aspire.Hosting.Java.WebApp", "examples\java\CommunityToolkit.Aspire.Hosting.Java.WebApp\CommunityToolkit.Aspire.Hosting.Java.WebApp.csproj", "{3D767C8C-7E04-4264-B4E9-13600650D2B1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Aspire.Java.ApiApp", "examples\java\CommunityToolkit.Aspire.Java.ApiApp\CommunityToolkit.Aspire.Java.ApiApp.csproj", "{34602A2D-24B2-47C0-9678-F1F7CD6C8C6D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Aspire.Hosting.Java.ApiApp", "examples\java\CommunityToolkit.Aspire.Hosting.Java.ApiApp\CommunityToolkit.Aspire.Hosting.Java.ApiApp.csproj", "{34602A2D-24B2-47C0-9678-F1F7CD6C8C6D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Aspire.Java.AppHost", "examples\java\CommunityToolkit.Aspire.Java.AppHost\CommunityToolkit.Aspire.Java.AppHost.csproj", "{55AC8E7E-DA0A-489D-8059-4E7190C9EEBF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Aspire.Hosting.Java.AppHost", "examples\java\CommunityToolkit.Aspire.Hosting.Java.AppHost\CommunityToolkit.Aspire.Hosting.Java.AppHost.csproj", "{55AC8E7E-DA0A-489D-8059-4E7190C9EEBF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Aspire.Java.ServiceDefaults", "examples\java\CommunityToolkit.Aspire.Java.ServiceDefaults\CommunityToolkit.Aspire.Java.ServiceDefaults.csproj", "{BBAFA814-1026-4A39-AA28-BCAE3951A224}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Aspire.Hosting.Java.ServiceDefaults", "examples\java\CommunityToolkit.Aspire.Hosting.Java.ServiceDefaults\CommunityToolkit.Aspire.Hosting.Java.ServiceDefaults.csproj", "{BBAFA814-1026-4A39-AA28-BCAE3951A224}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{899F0713-7FC6-4750-BAFC-AC650B35B453}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Aspire.Java.Hosting.EndToEndTests", "tests\CommunityToolkit.Aspire.Java.Hosting.EndToEndTests\CommunityToolkit.Aspire.Java.Hosting.EndToEndTests.csproj", "{E2905A71-E25D-46FC-A128-D6A366D4D751}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Aspire.Hosting.Java.Tests", "tests\CommunityToolkit.Aspire.Hosting.Java.Tests\CommunityToolkit.Aspire.Hosting.Java.Tests.csproj", "{E2905A71-E25D-46FC-A128-D6A366D4D751}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps.Tests", "tests\CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps.Tests\CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps.Tests.csproj", "{1B55E682-B518-4E59-8972-07C82ED5A677}"
 EndProject

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ This repository contains the source code for the .NET Aspire Community Toolkit,
 | Package                                                    | Latest stable                                                                        | Latest Preview                                                                                               | Description                                                                                                                                                                                                                    |
 | ---------------------------------------------------------- | ------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
 | [`Hosting.Azure.StaticWebApps`][swa-integration-docs]      | [![CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps][swa-shields]][swa-nuget]     | [![CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps][swa-shields-preview]][swa-nuget-preview]             | A hosting integration for the [Azure Static Web Apps emulator](https://learn.microsoft.com/azure/static-web-apps/static-web-apps-cli-overview) (Note: this does not support deployment of a project to Azure Static Web Apps). |
-| [`Hosting.Java`][java-integration-docs]                    | [![CommunityToolkit.Aspire.Java][java-shields]][java-nuget]                          | [![CommunityToolkit.Aspire.Hosting.Java][java-shields-preview]][java-nuget-preview]                          | A integration for running Java code in .NET Aspire either using the local JDK or using a container.                                                                                                                            |
+| [`Hosting.Java`][java-integration-docs]                    | [![CommunityToolkit.Aspire.Hosting.Java][java-shields]][java-nuget]                  | [![CommunityToolkit.Aspire.Hosting.Java][java-shields-preview]][java-nuget-preview]                          | A integration for running Java code in .NET Aspire either using the local JDK or using a container.                                                                                                                            |
 | [`Hosting.NodeJS.Extensions`][nodejs-ext-integration-docs] | [![CommunityToolkit.Aspire.NodeJS.Extensions][nodejs-ext-shields]][nodejs-ext-nuget] | [![CommunityToolkit.Aspire.Hosting.NodeJS.Extensions][nodejs-ext-shields-preview]][nodejs-ext-nuget-preview] | An integration that contains some additional extensions for running Node.js applications                                                                                                                                       |
 
 ## 🙌 Getting Started
@@ -51,3 +51,4 @@ Made with [contrib.rocks](https://contrib.rocks).
 [nodejs-ext-nuget]: https://nuget.org/packages/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions/
 [nodejs-ext-shields-preview]: https://img.shields.io/nuget/v/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions?label=nuget%20(preview)
 [nodejs-ext-nuget-preview]: https://nuget.org/packages/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions/absoluteLatest
+
diff --git a/...nityToolkit.Aspire.Hosting.Java.ApiApp/CommunityToolkit.Aspire.Hosting.Java.ApiApp.csproj b/...nityToolkit.Aspire.Hosting.Java.ApiApp/CommunityToolkit.Aspire.Hosting.Java.ApiApp.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" />
+    <PackageReference Include="Swashbuckle.AspNetCore" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../CommunityToolkit.Aspire.Hosting.Java.ServiceDefaults/CommunityToolkit.Aspire.Hosting.Java.ServiceDefaults.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/.../CommunityToolkit.Aspire.Java.ApiApp.http → .../CommunityToolkit.Aspire.Java.ApiApp.http b/.../CommunityToolkit.Aspire.Java.ApiApp.http → .../CommunityToolkit.Aspire.Java.ApiApp.http
diff --git a/...nityToolkit.Aspire.Java.ApiApp/Program.cs → ...kit.Aspire.Hosting.Java.ApiApp/Program.cs b/...nityToolkit.Aspire.Java.ApiApp/Program.cs → ...kit.Aspire.Hosting.Java.ApiApp/Program.cs
diff --git a/...ava.ApiApp/Properties/launchSettings.json → ...ava.ApiApp/Properties/launchSettings.json b/...ava.ApiApp/Properties/launchSettings.json → ...ava.ApiApp/Properties/launchSettings.json
diff --git a/...olkit.Aspire.Java.ApiApp/appsettings.json → ...pire.Hosting.Java.ApiApp/appsettings.json b/...olkit.Aspire.Java.ApiApp/appsettings.json → ...pire.Hosting.Java.ApiApp/appsettings.json
diff --git a/...mmunityToolkit.Aspire.Java.AppHost.csproj → ...oolkit.Aspire.Hosting.Java.AppHost.csproj b/...mmunityToolkit.Aspire.Java.AppHost.csproj → ...oolkit.Aspire.Hosting.Java.AppHost.csproj
@@ -6,20 +6,17 @@
 
     <UserSecretsId>8b981031-6978-4b8e-b276-711918308102</UserSecretsId>
 
-    <AssemblyName>CommunityToolkit.Aspire.Java.AppHost</AssemblyName>
-    <RootNamespace>CommunityToolkit.Aspire.Java.AppHost</RootNamespace>
-
-    <JavaAppRoot>$(MSBuildProjectDirectory)/../CommunityToolkit.Aspire.Java.Spring.Maven</JavaAppRoot>
+    <JavaAppRoot>$(MSBuildProjectDirectory)/../CommunityToolkit.Aspire.Hosting.Java.Spring.Maven</JavaAppRoot>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Aspire.Hosting.AppHost" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="../CommunityToolkit.Aspire.Hosting.Java.ApiApp/CommunityToolkit.Aspire.Hosting.Java.ApiApp.csproj" />
+    <ProjectReference Include="../CommunityToolkit.Aspire.Hosting.Java.WebApp/CommunityToolkit.Aspire.Hosting.Java.WebApp.csproj" />
     <ProjectReference Include="..\..\..\src\CommunityToolkit.Aspire.Hosting.Java\CommunityToolkit.Aspire.Hosting.Java.csproj" IsAspireProjectResource="false" />
-    <ProjectReference Include="..\CommunityToolkit.Aspire.Java.ApiApp\CommunityToolkit.Aspire.Java.ApiApp.csproj" />
-    <ProjectReference Include="..\CommunityToolkit.Aspire.Java.WebApp\CommunityToolkit.Aspire.Java.WebApp.csproj" />
   </ItemGroup>
 
   <Target Name="PublishRunWebpack" AfterTargets="Build">

diff --git a/...ityToolkit.Aspire.Java.AppHost/Program.cs → ...it.Aspire.Hosting.Java.AppHost/Program.cs b/...ityToolkit.Aspire.Java.AppHost/Program.cs → ...it.Aspire.Hosting.Java.AppHost/Program.cs
@@ -1,6 +1,6 @@
 var builder = DistributedApplication.CreateBuilder(args);
 
-var apiapp = builder.AddProject<Projects.CommunityToolkit_Aspire_Java_ApiApp>("apiapp");
+var apiapp = builder.AddProject<Projects.CommunityToolkit_Aspire_Hosting_Java_ApiApp>("apiapp");
 var containerapp = builder.AddSpringApp("containerapp",
                                      new JavaAppContainerResourceOptions()
                                      {
@@ -12,7 +12,7 @@
 if (builder.ExecutionContext.IsPublishMode == false)
 {
     executableapp = builder.AddSpringApp("executableapp",
-                                         workingDirectory: "../CommunityToolkit.Aspire.Java.Spring.Maven",
+                                         workingDirectory: "../CommunityToolkit.Aspire.Hosting.Java.Spring.Maven",
                                          new JavaAppExecutableResourceOptions()
                                          {
                                              ApplicationName = "target/spring-maven-0.0.1-SNAPSHOT.jar",
@@ -21,7 +21,7 @@
                                          });
 }
 
-var webapp = builder.AddProject<Projects.CommunityToolkit_Aspire_Java_WebApp>("webapp")
+var webapp = builder.AddProject<Projects.CommunityToolkit_Aspire_Hosting_Java_WebApp>("webapp")
                     .WithExternalHttpEndpoints()
                     .WithReference(containerapp)
                     .WithReference(apiapp);

diff --git a/...va.AppHost/Properties/launchSettings.json → ...va.AppHost/Properties/launchSettings.json b/...va.AppHost/Properties/launchSettings.json → ...va.AppHost/Properties/launchSettings.json
diff --git a/...lkit.Aspire.Java.AppHost/appsettings.json → ...ire.Hosting.Java.AppHost/appsettings.json b/...lkit.Aspire.Java.AppHost/appsettings.json → ...ire.Hosting.Java.AppHost/appsettings.json
diff --git a/...oolkit.Aspire.Java.ServiceDefaults.csproj → ...spire.Hosting.Java.ServiceDefaults.csproj b/...oolkit.Aspire.Java.ServiceDefaults.csproj → ...spire.Hosting.Java.ServiceDefaults.csproj
@@ -2,9 +2,6 @@
 
   <PropertyGroup>
     <IsAspireSharedProject>true</IsAspireSharedProject>
-
-    <AssemblyName>CommunityToolkit.Aspire.Java.ServiceDefaults</AssemblyName>
-    <RootNamespace>CommunityToolkit.Aspire.Java.ServiceDefaults</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...Aspire.Java.ServiceDefaults/Extensions.cs → ...osting.Java.ServiceDefaults/Extensions.cs b/...Aspire.Java.ServiceDefaults/Extensions.cs → ...osting.Java.ServiceDefaults/Extensions.cs
diff --git a/...olkit.Aspire.Java.Spring.Maven/.gitignore → ...pire.Hosting.Java.Spring.Maven/.gitignore b/...olkit.Aspire.Java.Spring.Maven/.gitignore → ...pire.Hosting.Java.Spring.Maven/.gitignore
diff --git a/...ven/.mvn/wrapper/maven-wrapper.properties → ...ven/.mvn/wrapper/maven-wrapper.properties b/...ven/.mvn/wrapper/maven-wrapper.properties → ...ven/.mvn/wrapper/maven-wrapper.properties
diff --git a/...olkit.Aspire.Java.Spring.Maven/Dockerfile → ...pire.Hosting.Java.Spring.Maven/Dockerfile b/...olkit.Aspire.Java.Spring.Maven/Dockerfile → ...pire.Hosting.Java.Spring.Maven/Dockerfile
diff --git a/...nityToolkit.Aspire.Java.Spring.Maven/mvnw → ...kit.Aspire.Hosting.Java.Spring.Maven/mvnw b/...nityToolkit.Aspire.Java.Spring.Maven/mvnw → ...kit.Aspire.Hosting.Java.Spring.Maven/mvnw
diff --git a/...Toolkit.Aspire.Java.Spring.Maven/mvnw.cmd → ...Aspire.Hosting.Java.Spring.Maven/mvnw.cmd b/...Toolkit.Aspire.Java.Spring.Maven/mvnw.cmd → ...Aspire.Hosting.Java.Spring.Maven/mvnw.cmd
diff --git a/...yToolkit.Aspire.Java.Spring.Maven/pom.xml → ....Aspire.Hosting.Java.Spring.Maven/pom.xml b/...yToolkit.Aspire.Java.Spring.Maven/pom.xml → ....Aspire.Hosting.Java.Spring.Maven/pom.xml
diff --git a/.../spring_maven/SpringMavenApplication.java → .../spring_maven/SpringMavenApplication.java b/.../spring_maven/SpringMavenApplication.java → .../spring_maven/SpringMavenApplication.java
diff --git a/...ing_maven/controllers/HomeController.java → ...ing_maven/controllers/HomeController.java b/...ing_maven/controllers/HomeController.java → ...ing_maven/controllers/HomeController.java
diff --git a/..._maven/controllers/WeatherController.java → ..._maven/controllers/WeatherController.java b/..._maven/controllers/WeatherController.java → ..._maven/controllers/WeatherController.java
diff --git a/.../spring_maven/models/WeatherForecast.java → .../spring_maven/models/WeatherForecast.java b/.../spring_maven/models/WeatherForecast.java → .../spring_maven/models/WeatherForecast.java
diff --git a/...src/main/resources/application.properties → ...src/main/resources/application.properties b/...src/main/resources/application.properties → ...src/main/resources/application.properties
diff --git a/....Aspire.Java.WebApp/Clients/IApiClient.cs → ...Hosting.Java.WebApp/Clients/IApiClient.cs b/....Aspire.Java.WebApp/Clients/IApiClient.cs → ...Hosting.Java.WebApp/Clients/IApiClient.cs
@@ -1,6 +1,6 @@
-using CommunityToolkit.Aspire.Java.WebApp.Models;
+using CommunityToolkit.Aspire.Hosting.Java.WebApp.Models;
 
-namespace CommunityToolkit.Aspire.Java.WebApp.Clients;
+namespace CommunityToolkit.Aspire.Hosting.Java.WebApp.Clients;
 
 public interface IApiClient
 {

diff --git a/...re.Java.WebApp/Clients/SpringApiClient.cs → ...ng.Java.WebApp/Clients/SpringApiClient.cs b/...re.Java.WebApp/Clients/SpringApiClient.cs → ...ng.Java.WebApp/Clients/SpringApiClient.cs
@@ -1,6 +1,6 @@
-using CommunityToolkit.Aspire.Java.WebApp.Models;
+using CommunityToolkit.Aspire.Hosting.Java.WebApp.Models;
 
-namespace CommunityToolkit.Aspire.Java.WebApp.Clients;
+namespace CommunityToolkit.Aspire.Hosting.Java.WebApp.Clients;
 
 public class SpringContainerClient(HttpClient http) : IApiClient
 {

diff --git a/...spire.Java.WebApp/Clients/WebApiClient.cs → ...sting.Java.WebApp/Clients/WebApiClient.cs b/...spire.Java.WebApp/Clients/WebApiClient.cs → ...sting.Java.WebApp/Clients/WebApiClient.cs
@@ -1,6 +1,6 @@
-using CommunityToolkit.Aspire.Java.WebApp.Models;
+using CommunityToolkit.Aspire.Hosting.Java.WebApp.Models;
 
-namespace CommunityToolkit.Aspire.Java.WebApp.Clients;
+namespace CommunityToolkit.Aspire.Hosting.Java.WebApp.Clients;
 
 public class WebApiClient(HttpClient http) : IApiClient
 {

diff --git a/...nityToolkit.Aspire.Hosting.Java.WebApp/CommunityToolkit.Aspire.Hosting.Java.WebApp.csproj b/...nityToolkit.Aspire.Hosting.Java.WebApp/CommunityToolkit.Aspire.Hosting.Java.WebApp.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <ItemGroup>
+    <ProjectReference Include="../CommunityToolkit.Aspire.Hosting.Java.ServiceDefaults/CommunityToolkit.Aspire.Hosting.Java.ServiceDefaults.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/...t.Aspire.Java.WebApp/Components/App.razor → ....Hosting.Java.WebApp/Components/App.razor b/...t.Aspire.Java.WebApp/Components/App.razor → ....Hosting.Java.WebApp/Components/App.razor
@@ -7,7 +7,7 @@
     <base href="/" />
     <link rel="stylesheet" href="bootstrap/bootstrap.min.css" />
     <link rel="stylesheet" href="app.css" />
-    <link rel="stylesheet" href="CommunityToolkit.Aspire.Java.WebApp.styles.css" />
+    <link rel="stylesheet" href="CommunityToolkit.Aspire.Hosting.Java.WebApp.styles.css" />
     <link rel="icon" type="image/png" href="favicon.png" />
     <HeadOutlet />
 </head>

diff --git a/...WebApp/Components/Layout/MainLayout.razor → ...WebApp/Components/Layout/MainLayout.razor b/...WebApp/Components/Layout/MainLayout.razor → ...WebApp/Components/Layout/MainLayout.razor
diff --git a/...pp/Components/Layout/MainLayout.razor.css → ...pp/Components/Layout/MainLayout.razor.css b/...pp/Components/Layout/MainLayout.razor.css → ...pp/Components/Layout/MainLayout.razor.css
diff --git a/...va.WebApp/Components/Layout/NavMenu.razor → ...va.WebApp/Components/Layout/NavMenu.razor b/...va.WebApp/Components/Layout/NavMenu.razor → ...va.WebApp/Components/Layout/NavMenu.razor
@@ -1,6 +1,6 @@
 <div class="top-row ps-3 navbar navbar-dark">
     <div class="container-fluid">
-        <a class="navbar-brand" href="">CommunityToolkit.Aspire.Java.WebApp</a>
+        <a class="navbar-brand" href="">CommunityToolkit.Aspire.Hosting.Java.WebApp</a>
     </div>
 </div>
 

diff --git a/...ebApp/Components/Layout/NavMenu.razor.css → ...ebApp/Components/Layout/NavMenu.razor.css b/...ebApp/Components/Layout/NavMenu.razor.css → ...ebApp/Components/Layout/NavMenu.razor.css
diff --git a/...ava.WebApp/Components/Pages/Counter.razor → ...ava.WebApp/Components/Pages/Counter.razor b/...ava.WebApp/Components/Pages/Counter.razor → ...ava.WebApp/Components/Pages/Counter.razor
diff --git a/....Java.WebApp/Components/Pages/Error.razor → ....Java.WebApp/Components/Pages/Error.razor b/....Java.WebApp/Components/Pages/Error.razor → ....Java.WebApp/Components/Pages/Error.razor
diff --git a/...e.Java.WebApp/Components/Pages/Home.razor → ...g.Java.WebApp/Components/Pages/Home.razor b/...e.Java.WebApp/Components/Pages/Home.razor → ...g.Java.WebApp/Components/Pages/Home.razor
diff --git a/...ava.WebApp/Components/Pages/Weather.razor → ...ava.WebApp/Components/Pages/Weather.razor b/...ava.WebApp/Components/Pages/Weather.razor → ...ava.WebApp/Components/Pages/Weather.razor
@@ -1,5 +1,5 @@
 @page "/weather"
-@using CommunityToolkit.Aspire.Java.WebApp.Components.UI
+@using CommunityToolkit.Aspire.Hosting.Java.WebApp.Components.UI
 
 <PageTitle>Weather</PageTitle>
 

diff --git a/...spire.Java.WebApp/Components/Routes.razor → ...sting.Java.WebApp/Components/Routes.razor b/...spire.Java.WebApp/Components/Routes.razor → ...sting.Java.WebApp/Components/Routes.razor
diff --git a/...bApp/Components/UI/WeatherComponent.razor → ...bApp/Components/UI/WeatherComponent.razor b/...bApp/Components/UI/WeatherComponent.razor → ...bApp/Components/UI/WeatherComponent.razor
@@ -1,6 +1,6 @@
-@using CommunityToolkit.Aspire.Java.WebApp.Clients
-@using CommunityToolkit.Aspire.Java.WebApp.Models
-@using CommunityToolkit.Aspire.Java.WebApp.Services
+@using CommunityToolkit.Aspire.Hosting.Java.WebApp.Clients
+@using CommunityToolkit.Aspire.Hosting.Java.WebApp.Models
+@using CommunityToolkit.Aspire.Hosting.Java.WebApp.Services
 @attribute [StreamRendering]
 @inject IApiClientService Api
 

diff --git a/...ire.Java.WebApp/Components/_Imports.razor → ...ing.Java.WebApp/Components/_Imports.razor b/...ire.Java.WebApp/Components/_Imports.razor → ...ing.Java.WebApp/Components/_Imports.razor
@@ -6,5 +6,5 @@
 @using static Microsoft.AspNetCore.Components.Web.RenderMode
 @using Microsoft.AspNetCore.Components.Web.Virtualization
 @using Microsoft.JSInterop
-@using CommunityToolkit.Aspire.Java.WebApp
-@using CommunityToolkit.Aspire.Java.WebApp.Components
+@using CommunityToolkit.Aspire.Hosting.Java.WebApp
+@using CommunityToolkit.Aspire.Hosting.Java.WebApp.Components
diff --git a/...ire.Java.WebApp/Models/WeatherForecast.cs → ...ing.Java.WebApp/Models/WeatherForecast.cs b/...ire.Java.WebApp/Models/WeatherForecast.cs → ...ing.Java.WebApp/Models/WeatherForecast.cs
@@ -1,4 +1,4 @@
-namespace CommunityToolkit.Aspire.Java.WebApp.Models;
+namespace CommunityToolkit.Aspire.Hosting.Java.WebApp.Models;
 
 public class WeatherForecast
 {

diff --git a/...nityToolkit.Aspire.Java.WebApp/Program.cs → ...kit.Aspire.Hosting.Java.WebApp/Program.cs b/...nityToolkit.Aspire.Java.WebApp/Program.cs → ...kit.Aspire.Hosting.Java.WebApp/Program.cs
@@ -1,6 +1,6 @@
-using CommunityToolkit.Aspire.Java.WebApp.Clients;
-using CommunityToolkit.Aspire.Java.WebApp.Services;
-using CommunityToolkit.Aspire.Java.WebApp.Components;
+using CommunityToolkit.Aspire.Hosting.Java.WebApp.Clients;
+using CommunityToolkit.Aspire.Hosting.Java.WebApp.Services;
+using CommunityToolkit.Aspire.Hosting.Java.WebApp.Components;
 
 var builder = WebApplication.CreateBuilder(args);
 

diff --git a/...ava.WebApp/Properties/launchSettings.json → ...ava.WebApp/Properties/launchSettings.json b/...ava.WebApp/Properties/launchSettings.json → ...ava.WebApp/Properties/launchSettings.json
diff --git a/....Java.WebApp/Services/ApiClientService.cs → ....Java.WebApp/Services/ApiClientService.cs b/....Java.WebApp/Services/ApiClientService.cs → ....Java.WebApp/Services/ApiClientService.cs
@@ -1,7 +1,7 @@
-using CommunityToolkit.Aspire.Java.WebApp.Clients;
-using CommunityToolkit.Aspire.Java.WebApp.Models;
+using CommunityToolkit.Aspire.Hosting.Java.WebApp.Clients;
+using CommunityToolkit.Aspire.Hosting.Java.WebApp.Models;
 
-namespace CommunityToolkit.Aspire.Java.WebApp.Services;
+namespace CommunityToolkit.Aspire.Hosting.Java.WebApp.Services;
 
 public interface IApiClientService
 {

diff --git a/...olkit.Aspire.Java.WebApp/appsettings.json → ...pire.Hosting.Java.WebApp/appsettings.json b/...olkit.Aspire.Java.WebApp/appsettings.json → ...pire.Hosting.Java.WebApp/appsettings.json
diff --git a/...oolkit.Aspire.Java.WebApp/wwwroot/app.css → ...spire.Hosting.Java.WebApp/wwwroot/app.css b/...oolkit.Aspire.Java.WebApp/wwwroot/app.css → ...spire.Hosting.Java.WebApp/wwwroot/app.css
diff --git a/...ebApp/wwwroot/bootstrap/bootstrap.min.css → ...ebApp/wwwroot/bootstrap/bootstrap.min.css b/...ebApp/wwwroot/bootstrap/bootstrap.min.css → ...ebApp/wwwroot/bootstrap/bootstrap.min.css
diff --git a/...p/wwwroot/bootstrap/bootstrap.min.css.map → ...p/wwwroot/bootstrap/bootstrap.min.css.map b/...p/wwwroot/bootstrap/bootstrap.min.css.map → ...p/wwwroot/bootstrap/bootstrap.min.css.map
diff --git a/...it.Aspire.Java.WebApp/wwwroot/favicon.png → ...e.Hosting.Java.WebApp/wwwroot/favicon.png b/...it.Aspire.Java.WebApp/wwwroot/favicon.png → ...e.Hosting.Java.WebApp/wwwroot/favicon.png
diff --git a/examples/java/CommunityToolkit.Aspire.Java.ApiApp/CommunityToolkit.Aspire.Java.ApiApp.csproj b/examples/java/CommunityToolkit.Aspire.Java.ApiApp/CommunityToolkit.Aspire.Java.ApiApp.csproj
diff --git a/examples/java/CommunityToolkit.Aspire.Java.WebApp/CommunityToolkit.Aspire.Java.WebApp.csproj b/examples/java/CommunityToolkit.Aspire.Java.WebApp/CommunityToolkit.Aspire.Java.WebApp.csproj
diff --git a/src/CommunityToolkit.Aspire.Hosting.Java/README.md b/src/CommunityToolkit.Aspire.Hosting.Java/README.md
@@ -14,7 +14,7 @@ This enables either containerised or executable Java app to be integrated with .
 1. Run .NET Aspire dashboard:
 
     ```bash
-    dotnet watch run --project ./examples/java/CommunityToolkit.Aspire.Java.AppHost
+    dotnet watch run --project ./examples/java/CommunityToolkit.Aspire.Hosting.Java.AppHost
     ```
 
 ## More detailed steps (Optional)
@@ -37,7 +37,7 @@ This enables either containerised or executable Java app to be integrated with .
 1. Build the Spring app with Maven:
 
     ```bash
-    pushd ./examples/java/CommunityToolkit.Aspire.Java.Spring.Maven
+    pushd ./examples/java/CommunityToolkit.Aspire.Hosting.Java.Spring.Maven
 
     ./mvnw clean package
 
@@ -47,7 +47,7 @@ This enables either containerised or executable Java app to be integrated with .
 1. Build a container image for the Spring app:
 
     ```bash
-    pushd ./examples/java/CommunityToolkit.Aspire.Java.Spring.Maven
+    pushd ./examples/java/CommunityToolkit.Aspire.Hosting.Java.Spring.Maven
 
     docker build . -t aspire-spring-maven-sample:latest
 

diff --git a/....Aspire.Java.Hosting.EndToEndTests.csproj → ...yToolkit.Aspire.Hosting.Java.Tests.csproj b/....Aspire.Java.Hosting.EndToEndTests.csproj → ...yToolkit.Aspire.Hosting.Java.Tests.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\examples\java\CommunityToolkit.Aspire.Java.AppHost\CommunityToolkit.Aspire.Java.AppHost.csproj" />
+    <ProjectReference Include="../../examples/java/CommunityToolkit.Aspire.Hosting.Java.AppHost/CommunityToolkit.Aspire.Hosting.Java.AppHost.csproj" />
     <ProjectReference Include="..\CommunityToolkit.Aspire.Testing\CommunityToolkit.Aspire.Testing.csproj" />
   </ItemGroup>
 

diff --git a/...ndToEndTests/JavaHostingComponentTests.cs → ...g.Java.Tests/JavaHostingComponentTests.cs b/...ndToEndTests/JavaHostingComponentTests.cs → ...g.Java.Tests/JavaHostingComponentTests.cs
@@ -1,11 +1,10 @@
-using System.Net;
 using CommunityToolkit.Aspire.Testing;
 using FluentAssertions;
 
-namespace CommunityToolkit.Aspire.Java.Hosting.EndToEndTests;
+namespace CommunityToolkit.Aspire.Hosting.Java.Tests;
 
 #pragma warning disable CTASPIRE001
-public class JavaHostingComponentTests(AspireIntegrationTestFixture<Projects.CommunityToolkit_Aspire_Java_AppHost> fixture) : IClassFixture<AspireIntegrationTestFixture<Projects.CommunityToolkit_Aspire_Java_AppHost>>
+public class JavaHostingComponentTests(AspireIntegrationTestFixture<Projects.CommunityToolkit_Aspire_Hosting_Java_AppHost> fixture) : IClassFixture<AspireIntegrationTestFixture<Projects.CommunityToolkit_Aspire_Hosting_Java_AppHost>>
 {
     [Theory]
     [InlineData("containerapp")]