Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Aligning the namespace and file names of the Hosting.Java integration #27

Merged
merged 1 commit into from
Sep 19, 2024
Merged

Aligning the namespace and file names of the Hosting.Java integration #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/dotnet-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-

Expand Down Expand Up @@ -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 }}

3 changes: 2 additions & 1 deletion .github/workflows/dotnet-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-

Expand Down Expand Up @@ -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 }}

2 changes: 1 addition & 1 deletion .github/workflows/dotnet-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-

Expand Down
10 changes: 5 additions & 5 deletions CommunityToolkit.Aspire.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

12 changes: 12 additions & 0 deletions ...nityToolkit.Aspire.Hosting.Java.ApiApp/CommunityToolkit.Aspire.Hosting.Java.ApiApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
0 .../CommunityToolkit.Aspire.Java.ApiApp.http → .../CommunityToolkit.Aspire.Java.ApiApp.http
View file
Open in desktop
File renamed without changes.
0 ...nityToolkit.Aspire.Java.ApiApp/Program.cs → ...kit.Aspire.Hosting.Java.ApiApp/Program.cs
View file
Open in desktop
File renamed without changes.
0 ...ava.ApiApp/Properties/launchSettings.json → ...ava.ApiApp/Properties/launchSettings.json
View file
Open in desktop
File renamed without changes.
0 ...olkit.Aspire.Java.ApiApp/appsettings.json → ...pire.Hosting.Java.ApiApp/appsettings.json
View file
Open in desktop
File renamed without changes.
9 changes: 3 additions & 6 deletions ...mmunityToolkit.Aspire.Java.AppHost.csproj → ...oolkit.Aspire.Hosting.Java.AppHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
6 changes: 3 additions & 3 deletions ...ityToolkit.Aspire.Java.AppHost/Program.cs → ...it.Aspire.Hosting.Java.AppHost/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
{
Expand All @@ -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",
Expand All @@ -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);
Expand Down
0 ...va.AppHost/Properties/launchSettings.json → ...va.AppHost/Properties/launchSettings.json
View file
Open in desktop
File renamed without changes.
0 ...lkit.Aspire.Java.AppHost/appsettings.json → ...ire.Hosting.Java.AppHost/appsettings.json
View file
Open in desktop
File renamed without changes.
3 changes: 0 additions & 3 deletions ...oolkit.Aspire.Java.ServiceDefaults.csproj → ...spire.Hosting.Java.ServiceDefaults.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

<PropertyGroup>
<IsAspireSharedProject>true</IsAspireSharedProject>

<AssemblyName>CommunityToolkit.Aspire.Java.ServiceDefaults</AssemblyName>
<RootNamespace>CommunityToolkit.Aspire.Java.ServiceDefaults</RootNamespace>
</PropertyGroup>

<ItemGroup>
Expand Down
0 ...Aspire.Java.ServiceDefaults/Extensions.cs → ...osting.Java.ServiceDefaults/Extensions.cs
View file
Open in desktop
File renamed without changes.
0 ...olkit.Aspire.Java.Spring.Maven/.gitignore → ...pire.Hosting.Java.Spring.Maven/.gitignore
View file
Open in desktop
File renamed without changes.
0 ...ven/.mvn/wrapper/maven-wrapper.properties → ...ven/.mvn/wrapper/maven-wrapper.properties
View file
Open in desktop
File renamed without changes.
0 ...olkit.Aspire.Java.Spring.Maven/Dockerfile → ...pire.Hosting.Java.Spring.Maven/Dockerfile
View file
Open in desktop
File renamed without changes.
0 ...nityToolkit.Aspire.Java.Spring.Maven/mvnw → ...kit.Aspire.Hosting.Java.Spring.Maven/mvnw
View file
Open in desktop
File renamed without changes.
0 ...Toolkit.Aspire.Java.Spring.Maven/mvnw.cmd → ...Aspire.Hosting.Java.Spring.Maven/mvnw.cmd
View file
Open in desktop
File renamed without changes.
0 ...yToolkit.Aspire.Java.Spring.Maven/pom.xml → ....Aspire.Hosting.Java.Spring.Maven/pom.xml
View file
Open in desktop
File renamed without changes.
0 .../spring_maven/SpringMavenApplication.java → .../spring_maven/SpringMavenApplication.java
View file
Open in desktop
File renamed without changes.
0 ...ing_maven/controllers/HomeController.java → ...ing_maven/controllers/HomeController.java
View file
Open in desktop
File renamed without changes.
0 ..._maven/controllers/WeatherController.java → ..._maven/controllers/WeatherController.java
View file
Open in desktop
File renamed without changes.
0 .../spring_maven/models/WeatherForecast.java → .../spring_maven/models/WeatherForecast.java
View file
Open in desktop
File renamed without changes.
0 ...src/main/resources/application.properties → ...src/main/resources/application.properties
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ....Aspire.Java.WebApp/Clients/IApiClient.cs → ...Hosting.Java.WebApp/Clients/IApiClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions ...re.Java.WebApp/Clients/SpringApiClient.cs → ...ng.Java.WebApp/Clients/SpringApiClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions ...spire.Java.WebApp/Clients/WebApiClient.cs → ...sting.Java.WebApp/Clients/WebApiClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
7 changes: 7 additions & 0 deletions ...nityToolkit.Aspire.Hosting.Java.WebApp/CommunityToolkit.Aspire.Hosting.Java.WebApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion ...t.Aspire.Java.WebApp/Components/App.razor → ....Hosting.Java.WebApp/Components/App.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
0 ...WebApp/Components/Layout/MainLayout.razor → ...WebApp/Components/Layout/MainLayout.razor
View file
Open in desktop
File renamed without changes.
0 ...pp/Components/Layout/MainLayout.razor.css → ...pp/Components/Layout/MainLayout.razor.css
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...va.WebApp/Components/Layout/NavMenu.razor → ...va.WebApp/Components/Layout/NavMenu.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>

Expand Down
0 ...ebApp/Components/Layout/NavMenu.razor.css → ...ebApp/Components/Layout/NavMenu.razor.css
View file
Open in desktop
File renamed without changes.
0 ...ava.WebApp/Components/Pages/Counter.razor → ...ava.WebApp/Components/Pages/Counter.razor
View file
Open in desktop
File renamed without changes.
0 ....Java.WebApp/Components/Pages/Error.razor → ....Java.WebApp/Components/Pages/Error.razor
View file
Open in desktop
File renamed without changes.
0 ...e.Java.WebApp/Components/Pages/Home.razor → ...g.Java.WebApp/Components/Pages/Home.razor
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ava.WebApp/Components/Pages/Weather.razor → ...ava.WebApp/Components/Pages/Weather.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@page "/weather"
@using CommunityToolkit.Aspire.Java.WebApp.Components.UI
@using CommunityToolkit.Aspire.Hosting.Java.WebApp.Components.UI

<PageTitle>Weather</PageTitle>

Expand Down
0 ...spire.Java.WebApp/Components/Routes.razor → ...sting.Java.WebApp/Components/Routes.razor
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...bApp/Components/UI/WeatherComponent.razor → ...bApp/Components/UI/WeatherComponent.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions ...ire.Java.WebApp/Components/_Imports.razor → ...ing.Java.WebApp/Components/_Imports.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ...ire.Java.WebApp/Models/WeatherForecast.cs → ...ing.Java.WebApp/Models/WeatherForecast.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace CommunityToolkit.Aspire.Java.WebApp.Models;
namespace CommunityToolkit.Aspire.Hosting.Java.WebApp.Models;

public class WeatherForecast
{
Expand Down
6 changes: 3 additions & 3 deletions ...nityToolkit.Aspire.Java.WebApp/Program.cs → ...kit.Aspire.Hosting.Java.WebApp/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);

Expand Down
0 ...ava.WebApp/Properties/launchSettings.json → ...ava.WebApp/Properties/launchSettings.json
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ....Java.WebApp/Services/ApiClientService.cs → ....Java.WebApp/Services/ApiClientService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
0 ...olkit.Aspire.Java.WebApp/appsettings.json → ...pire.Hosting.Java.WebApp/appsettings.json
View file
Open in desktop
File renamed without changes.
0 ...oolkit.Aspire.Java.WebApp/wwwroot/app.css → ...spire.Hosting.Java.WebApp/wwwroot/app.css
View file
Open in desktop
File renamed without changes.
0 ...ebApp/wwwroot/bootstrap/bootstrap.min.css → ...ebApp/wwwroot/bootstrap/bootstrap.min.css
View file
Open in desktop
File renamed without changes.
0 ...p/wwwroot/bootstrap/bootstrap.min.css.map → ...p/wwwroot/bootstrap/bootstrap.min.css.map
View file
Open in desktop
File renamed without changes.
0 ...it.Aspire.Java.WebApp/wwwroot/favicon.png → ...e.Hosting.Java.WebApp/wwwroot/favicon.png
View file
Open in desktop
File renamed without changes
17 changes: 0 additions & 17 deletions examples/java/CommunityToolkit.Aspire.Java.ApiApp/CommunityToolkit.Aspire.Java.ApiApp.csproj
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions examples/java/CommunityToolkit.Aspire.Java.WebApp/CommunityToolkit.Aspire.Java.WebApp.csproj
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/CommunityToolkit.Aspire.Hosting.Java/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion ....Aspire.Java.Hosting.EndToEndTests.csproj → ...yToolkit.Aspire.Hosting.Java.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
5 changes: 2 additions & 3 deletions ...ndToEndTests/JavaHostingComponentTests.cs → ...g.Java.Tests/JavaHostingComponentTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")]
Expand Down