Freezor/remove code based on meeting (#264)

### Removed - **Removed all references to OPC UA** (@Freezor) - Removed files: - `AasEntityBuilder.cs` - `AasNodeManager.cs` - `AasUaEntities.cs` - `AasUaEntities.cs.bak` - `AasUaEntityFileType.cs` - `AasUaNodeHelper.cs` - `AasUaUtils.cs` - `AasxUaServerOptions.cs` - `DataChangeMonitoredItem.cs` - `MonitoredItemQueue.cs` - `MonitoredNode.cs` - `Opc.Ua.SampleClient.Config.xml` - `SampleNodeManager.cs` - `SampleServer.SampleModel.cs` - `SampleServer.UserAuthentication.cs` - **Paths**: `src/AasxServerStandardBib/` - **Removed unused and incomplete attribute class** (@Freezor) - Removed file: - `src/AasxServerStandardBib/` - **Removed EnergyModel references (demo showcase)** (@Freezor) - Removed files: - `EnergyModel.cs` - `EnergyModel_SourceSystem_Azure.cs` - `PrefEnergyModel10.cs` - **Path**: `src/AasxServerStandardBib/` - **Removed remaining references to GrapeVineLogger** (@Freezor) - Removed file: - `GrapevineLoggerConsumers.cs` - **Path**: `src/AasxServerStandardBib/` - **Removed I40Message Broker (test implementation)** (@Freezor) - Removed file: - `I40Message.cs` - **Path**: `src/AasxServerStandardBib/` - **Removed MQTT Client/Server (not fully implemented)** (@Freezor) - Removed files: - `MqttClient.cs` - `MqttServer.cs` - **Path**: `src/AasxServerStandardBib/` - **Removed other unused files** (@Freezor) - `MultiTupleDictionary.cs` - `NodeStateCollection.cs` - `Program.cs` - **Path**: `src/AasxServerStandardBib/`
eclipse-aaspe · Jun 7, 2024 · 56a04af · 56a04af
1 parent 382783a
commit 56a04af
Show file tree

Hide file tree

Showing 116 changed files with 4,037 additions and 20,061 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,20 +1,21 @@
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-##
+## Ignore Visual Studio temporary files, build results, and files generated by popular Visual Studio add-ons.
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
-# Artefacts
+# Artefacts and build directories
 artefacts/
 out/
+artifacts/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
 
 # User-specific files
 *.rsuser
 *.suo
 *.user
 *.userosscache
 *.sln.docstates
-
-# User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
 # Build results
@@ -26,17 +27,9 @@ x64/
 x86/
 [Aa][Rr][Mm]/
 [Aa][Rr][Mm]64/
-bld/
-[Bb]in/
-[Oo]bj/
-[Ll]og/
 
-# Visual Studio 2015/2017 cache/options directory
+# Visual Studio cache/options directory
 .vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
-
-# Visual Studio 2017 auto generated files
 Generated\ Files/
 
 # MSTest test Results
@@ -58,7 +51,6 @@ BenchmarkDotNet.Artifacts/
 # .NET Core
 project.lock.json
 project.fragment.lock.json
-artifacts/
 
 # StyleCop
 StyleCopReport.xml
@@ -174,25 +166,18 @@ publish/
 # Publish Web Output
 *.[Pp]ublish.xml
 *.azurePubxml
-# Note: Comment the next line if you want to checkin your web deploy settings,
-# but database connection strings (with potential passwords) will be unencrypted
 *.pubxml
 *.publishproj
 
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
+# Microsoft Azure Web App publish settings
 PublishScripts/
 
 # NuGet Packages
 *.nupkg
-# The packages folder can be ignored because of Package Restore
 **/[Pp]ackages/*
-# except build/, which is used as an MSBuild target.
 !**/[Pp]ackages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/[Pp]ackages/repositories.config
-# NuGet v3's project.json files produces more ignorable files
+
+# NuGet v3's project.json files
 *.nuget.props
 *.nuget.targets
 
@@ -212,9 +197,7 @@ _pkginfo.txt
 *.appx
 
 # Visual Studio cache files
-# files ending in .cache can be ignored
 *.[Cc]ache
-# but keep track of directories ending in .cache
 !?*.[Cc]ache/
 
 # Others
@@ -229,19 +212,12 @@ ClientBin/
 orleans.codegen.cs
 
 # Including strong name files can present a security risk
-# (https://github.com/github/gitignore/pull/2483#issue-259490424)
-#*.snk
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
+# *.snk
 
 # RIA/Silverlight projects
 Generated_Code/
 
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
+# Backup & report files from project upgrades
 _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
@@ -277,7 +253,7 @@ node_modules/
 # Visual Studio 6 workspace options file
 *.opt
 
-# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+# Visual Studio 6 auto-generated workspace file
 *.vbw
 
 # Visual Studio LightSwitch build output
@@ -306,7 +282,7 @@ paket-files/
 __pycache__/
 *.pyc
 
-# Cake - Uncomment if you are using it
+# Cake
 # tools/**
 # !tools/packages.config
 
@@ -342,50 +318,10 @@ ASALocalRun/
 
 # BeatPulse healthcheck temp database
 healthchecksdb
-/Grapevine/Client/PathParams.cs
-/Grapevine/Client/QueryString.cs
-/Grapevine/Client/RestClient.cs
-/Grapevine/Client/RestRequest.cs
-/Grapevine/Client/RestResponse.cs
-/Grapevine/Exceptions/Client/ClientStateException.cs
-/Grapevine/Exceptions/Server/DynamicValueNotFoundException.cs
-/Grapevine/Exceptions/Server/InvalidRouteMethodException.cs
-/Grapevine/Exceptions/Server/NotFoundException.cs
-/Grapevine/Exceptions/Server/ServerStateException.cs
-/Grapevine/Exceptions/Server/UnableToStartHostException.cs
-/Grapevine/Exceptions/Server/UnableToStopHostException.cs
-/Grapevine/Grapevine.csproj
-/Grapevine/Interfaces/Server/HttpContext.cs
-/Grapevine/Interfaces/Server/HttpRequest.cs
-/Grapevine/Interfaces/Server/HttpResponse.cs
-/Grapevine/Interfaces/Server/IHttpListener.cs
-/Grapevine/Interfaces/Server/IHttpListenerContext.cs
-/Grapevine/Interfaces/Shared/IGrapevineLogger.cs
-/Grapevine/Server/Attributes/RestResource.cs
-/Grapevine/Server/Attributes/RestRoute.cs
-/Grapevine/Server/HttpResponseExtensions.cs
-/Grapevine/Server/PublicFolder.cs
-/Grapevine/Server/RestCluster.cs
-/Grapevine/Server/RestServer.cs
-/Grapevine/Server/Route.cs
-/Grapevine/Server/RouteScanner.cs
-/Grapevine/Server/Router.cs
-/Grapevine/Server/ServerSettings.cs
-/Grapevine/Shared/ContentType.cs
-/Grapevine/Shared/DynamicProperties.cs
-/Grapevine/Shared/HttpMethod.cs
-/Grapevine/Shared/HttpStatusCode.cs
-/Grapevine/Shared/InternalExtensions.cs
-/Grapevine/Shared/Loggers/ConsoleLogger.cs
-/Grapevine/Shared/Loggers/InMemoryLogger.cs
-/Grapevine/Shared/Loggers/LoggerExtensions.cs
-/Grapevine/Shared/Loggers/NullLogger.cs
-/Grapevine/Shared/NameValueCollectionExtensions.cs
-/Grapevine/Shared/ParamParser.cs
-/Grapevine/Shared/PortFinder.cs
-/Grapevine/Shared/StreamExtensions.cs
-/Grapevine/Shared/UriScheme.cs
-/Grapevine/Shared/UriSchemeExtensions.cs
+
+# Grapevine content
+Grapevine/*
+
+# Custom ignores
 /src/AasxServerStandardBib/AdminShell.cs.old
-/src/AasxServerBlazor/temp.aasx
-/src/AasxServerBlazor/Properties/launchSettings.json
+/src/AasxServerBlazor/temp.aasx
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,16 +7,64 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Renamed Program1.cs to BlazorServerStarter for better readability and to avoid misunderstandings, as there already is a Program class. (@Freezor)
+- Cleaned BlazorServerStarter in general to have an easier understanding on the process (@Freezor)
+- Extracted dependency registration into DependencyRegistry.cs and server configuration into ServerConfiguration.cs from Startup.cs (@Freezor)
+- Refactored ServerConfiguration.cs into smaller parts and applying Clean code and SOLID principles. (@Freezor)
+
 ### Updated
 
-- Microsoft.IdentityModel.Tokens from **6.13.1** to **7.5.0** because of a package vulnerability.
+- Microsoft.IdentityModel.Tokens from **6.13.1** to **6.35.0** because of a package vulnerability. (@Freezor)
 
-### Changed
+### Removed
 
-- Renamed Program1.cs to BlazorServerStarter for better readability and to avoid misunderstandings, as there already is a Program class.
-- Cleaned BlazorServerStarter in general to have an easier understanding on the process
-- Extracted dependency registration into DependencyRegistry.cs and server configuration into ServerConfiguration.cs from Startup.cs
-- Refactored ServerConfiguration.cs into smaller parts and applying Clean code and SOLID principles.
+- **Removed all references to OPC UA** (@Freezor)
+    - Removed files:
+        - `AasEntityBuilder.cs`
+        - `AasNodeManager.cs`
+        - `AasUaEntities.cs`
+        - `AasUaEntities.cs.bak`
+        - `AasUaEntityFileType.cs`
+        - `AasUaNodeHelper.cs`
+        - `AasUaUtils.cs`
+        - `AasxUaServerOptions.cs`
+        - `DataChangeMonitoredItem.cs`
+        - `MonitoredItemQueue.cs`
+        - `MonitoredNode.cs`
+        - `Opc.Ua.SampleClient.Config.xml`
+        - `SampleNodeManager.cs`
+        - `SampleServer.SampleModel.cs`
+        - `SampleServer.UserAuthentication.cs`
+    - **Paths**: `src/AasxServerStandardBib/`
+- **Removed unused and incomplete attribute class** (@Freezor)
+    - Removed file:
+        - `src/AasxServerStandardBib/`
+- **Removed EnergyModel references (demo showcase)** (@Freezor)
+    - Removed files:
+        - `EnergyModel.cs`
+        - `EnergyModel_SourceSystem_Azure.cs`
+        - `PrefEnergyModel10.cs`
+    - **Path**: `src/AasxServerStandardBib/`
+- **Removed remaining references to GrapeVineLogger** (@Freezor)
+    - Removed file:
+        - `GrapevineLoggerConsumers.cs`
+    - **Path**: `src/AasxServerStandardBib/`
+- **Removed I40Message Broker (test implementation)** (@Freezor)
+    - Removed file:
+        - `I40Message.cs`
+    - **Path**: `src/AasxServerStandardBib/`
+- **Removed MQTT Client/Server (not fully implemented)** (@Freezor)
+    - Removed files:
+        - `MqttClient.cs`
+        - `MqttServer.cs`
+    - **Path**: `src/AasxServerStandardBib/`
+- **Removed other unused files** (@Freezor)
+    - `MultiTupleDictionary.cs`
+    - `NodeStateCollection.cs`
+    - `Program.cs`
+    - **Path**: `src/AasxServerStandardBib/`
 
 ## [Released]
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -61,11 +61,24 @@ Run the checks with:
 
 ### Branching
 
-**If you are part of the `Eclipse AASX Package Explorer and Server`GitHub organization:**
-Create a branch prefixed with your GitHub username using dashes to describe the change (e.g., `mristin/Add-a-shiny-new-feature-B`).
-
-**Otherwise:** If you are not a member of the organization, you need to fork the repository and create your feature branch on the fork. 
-See the [GitHub documentation about forking][github-fork].
+#### For `Eclipse AASX Package Explorer and Server` Committers
+
+1. **Integration Branch:**
+    - Create a new integration branch in the main repository (e.g., "integration/freezor").
+        - All your unique PRs will be collected there and, upon consultation, merged to the 'main' branch.
+        - Keep this branch up to date with the main regularly and resolve merge conflicts.
+2. **Feature Branch:**
+    - Create a branch prefixed with your GitHub username using dashes to describe the change (e.g., `mristin/Add-a-shiny-new-feature-B`).
+        - This branch can reside in the repository or your own fork.
+        - When naming branches, refer to [Tilburg Science Hub](https://tilburgsciencehub.com/topics/automation/version-control/advanced-git/naming-git-branches/).
+
+#### For Community Contributors
+
+1. **Forking Repository:**
+    - If you are not a member of the organization, you need to fork the repository and create your feature branch on the fork.
+        - See the [GitHub documentation about forking][github-fork].
+2. **Naming Convention:**
+    - Ensure good naming practices for your branches. Refer to [Tilburg Science Hub](https://tilburgsciencehub.com/topics/automation/version-control/advanced-git/naming-git-branches/) for guidelines on branch names.
 
 [github-fork]: https://docs.github.com/en/github/getting-started-with-github/fork-a-repo
 

diff --git a/src/.gitignore b/src/.gitignore
diff --git a/src/AasCore.Aas3_0/AasCore.Aas3_0.csproj b/src/AasCore.Aas3_0/AasCore.Aas3_0.csproj
@@ -1,25 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <Configurations>Debug;Release;DebugSlow</Configurations>
-    <Platforms>AnyCPU</Platforms>
-    <LangVersion>8</LangVersion>
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <Nullable>enable</Nullable>
+        <Configurations>Debug;Release;DebugSlow</Configurations>
+        <Platforms>AnyCPU</Platforms>
+        <LangVersion>8</LangVersion>
 
-    <PackageId>AasCore.Aas3_0</PackageId>
-    <Version>1.0.0-rc1</Version>
-    <Authors>Marko Ristin</Authors>
-    <Description>
-        An SDK for manipulating, verifying and de/serializing Asset Administration Shells.
-    </Description>
-    <RepositoryUrl>https://github.com/aas-core-works/aas-core3.0-csharp.git</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <Copyright>Copyright (c) 2023 Marko Ristin</Copyright>
-    <PackageLicenseUrl>https://raw.githubusercontent.com/aas-core-works/aas-core3.0-csharp/main/LICENSE</PackageLicenseUrl>
-    <PackageProjectUrl>https://github.com/aas-core-works/aas-core3.0-csharp</PackageProjectUrl>
-    <PackageTags>aas;asset administration shell;iiot;industry internet of things;industrie 4.0;i4.0</PackageTags>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-  </ItemGroup>
+        <PackageId>AasCore.Aas3_0</PackageId>
+        <Version>1.0.0-rc1</Version>
+        <Authors>Marko Ristin</Authors>
+        <Description>
+            An SDK for manipulating, verifying and de/serializing Asset Administration Shells.
+        </Description>
+        <RepositoryUrl>https://github.com/aas-core-works/aas-core3.0-csharp.git</RepositoryUrl>
+        <RepositoryType>git</RepositoryType>
+        <Copyright>Copyright (c) 2023 Marko Ristin</Copyright>
+        <PackageLicenseUrl>https://raw.githubusercontent.com/aas-core-works/aas-core3.0-csharp/main/LICENSE</PackageLicenseUrl>
+        <PackageProjectUrl>https://github.com/aas-core-works/aas-core3.0-csharp</PackageProjectUrl>
+        <PackageTags>aas;asset administration shell;iiot;industry internet of things;industrie 4.0;i4.0</PackageTags>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
+    </ItemGroup>
 </Project>