Merge branch 'main' of https://github.com/eclipse-aaspe/package-explorer

To rebase my forked repository.
eclipse-aaspe · Aug 13, 2024 · 942f779 · 942f779
2 parents b7f59e6 + f6427f2
commit 942f779
Show file tree

Hide file tree

Showing 21 changed files with 2,492 additions and 216 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -96,11 +96,14 @@ tbd:
 
 Mechanics of how to actually contribute (e.g., merge/pull requests) are described in [AASX Project Explorer Devdoc](https://admin-shell-io.github.io/aasx-package-explorer/devdoc/getting-started/intro.html).
 
-To help you familiarize with the concept of Asset Administration Shell we provide the screencasts (both in English and German) at: https://admin-shell-io.com/screencasts/.
+To help you familiarize with the concept of Asset Administration Shell, we provide screencasts (both in English and German) at: https://admin-shell-io.com/screencasts/.
 
 For further information about the Asset Administration Shell, see the publication Details of the Asset Administration Shell by Plattform Industrie 4.0.
 
-We provide a couple of sample admin shells (packaged as .aasx) for you to test and play with the software at: http://www.admin-shell-io.com/samples/
+We provide a couple of sample admin shells (packaged as .aasx) for you to test and play with the software at: http://www.admin-shell-io.com/samples/.
+
+For a complete list of all contributing individuals and companies, please visit our [CONTRIBUTORS](CONTRIBUTORS.md) page.
+
 
 ### Terms of Use
 

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -0,0 +1,66 @@
+# Contributors
+
+Thanks to all the companies and individuals who generously dedicate their time to making this project better. We're grateful for everyone who supports and
+contributes to this project.
+
+## Contributing Companies
+
+> NOTE: The names of contributing companies and individuals are sorted alphabetically solely for improved readability and do not reflect any value or hierarchy.
+
+Our heartfelt thanks go to the following companies and institutes, whose support and collaboration have been invaluable to the success of this project. Their
+contributions matter greatly and are deeply appreciated:
+
+| Company                                                                       | Logo                                                                                                                                                                             |
+|-------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| [Festo Vertrieb GmbH & Co. KG](https://www.festo.com)                         | <img src="https://www.festo.com/media/fox/frontend/img/svg/logo_blue.svg" alt="Festo Logo" style="max-width:250px;">                                                             |
+| [Das Fraunhofer IOSB-INA](https://www.iosb-ina.fraunhofer.de/)                | <img src="https://www.iosb-ina.fraunhofer.de/content/dam/iosb/iosb-ina/images/Logo%20IOSB-INA.png" alt="Fraunhofer IOSB-INA Logo" style="max-width:250px;">                      |
+| [Industrial Digital Twin Association e.V. (IDTA)](https://www.idtwin.org/)    | <img src="https://industrialdigitaltwin.org/wp-content/themes/idta/vendor/images/idta-logo.png" alt="IDTWIN Logo" style="max-width:250px;">                                      |
+| [Otto Von Guericke University](https://www.ovgu.de)                           | <img src="https://www.ovgu.de/pub/theme/ovgu_min_theme/skin/img/logo_std.png" alt="OVGU Logo" style="max-width:250px;">                                                          |
+| [metaphacts GmbH](https://metaphacts.com)                                     | <img src="https://metaphacts.com/templates/jt_starter/images/logo.svg" alt="Microsoft Logo" style="max-width:250px;">                                                            |
+| [Microsoft Corporation](https://www.microsoft.com/de-de/)                     | <img src="https://img-prod-cms-rt-microsoft-com.akamaized.net/cms/api/am/imageFileData/RE1Mu3b?ver=5c31" alt="Microsoft Logo" style="max-width:250px;">                          |
+| [Phoenix Contact GmbH & Co. KG](https://www.phoenixcontact.com/)              | <img src="https://static.phoenixcontact.com/common/assets/images/signal-chain.svg" alt="Phoenix Contact Logo" style="max-width:250px;">                                          |
+| [Robert Bosch GmbH](https://www.bosch.de)                                     | <img src="https://upload.wikimedia.org/wikipedia/de/thumb/3/31/Bosch-logotype.svg/512px-Bosch-logotype.svg.png?20190123165734" alt="Robert Bosch Logo" style="max-width:250px;"> |
+| [Schneider Electric SE](https://www.se.com)                                   | <img src="https://www.se.com/ww/en/assets/wiztopic/615aeb0184d20b323d58575e/Schneider-Electric-logo-jpg-_original.jpg" alt="SICK AG Logo" style="max-width:250px;">              |
+| [SICK AG](https://www.sick.com)                                               | <img src="https://upload.wikimedia.org/wikipedia/commons/thumb/f/f1/Logo_SICK_AG_2009.svg/800px-Logo_SICK_AG_2009.svg.png" alt="SICK AG Logo" style="max-width:250px;">          |
+| [TUD Dresden University of Technology](https://tu-dresden.de/)                | <img src="https://tu-dresden.de/++theme++tud.theme.webcms2/img/tud-logo.svg" alt="TU Dresden Logo" style="max-width:250px;">                                                     |
+| [ZHAW Zürcher Hochschule für Angewandte Wissenschaften](https://www.zhaw.ch/) | <img src="https://upload.wikimedia.org/wikipedia/commons/thumb/e/e6/ZHAW_Logo.svg/514px-ZHAW_Logo.svg.png" alt="ZHAW Logo" style="max-width:250px;">                             |
+
+## Contributing People
+
+We are profoundly grateful to the following individuals for their time, effort, and dedication. Their contributions have been instrumental in the development
+and success of this project:
+
+* [AlexanderWollbrink](https://github.com/AlexanderWollbrink) ([Fraunhofer IOSB-INA](https://www.iosb-ina.fraunhofer.de/))
+* [Andreas Orzelski](https://github.com/aorzelskiGH) ([Phoenix Contact](https://www.phoenixcontact.com/))
+* [Andreas Textor](https://github.com/atextor)
+* [Bastian Roessl](mailto:bastian.roessl@iosb-ina.fraunhofer.de) ([Fraunhofer IOSB-INA](https://www.iosb-ina.fraunhofer.de/))
+* [Birgit Boss](https://github.com/BirgitBoss) ([Robert Bosch GmbH](https://www.bosch-connected-industry.com/))
+* [bischof-keb](https://github.com/bischof-keb)
+* [Erich Barnstedt](https://github.com/barnstee) ([Microsoft Corporation](https://www.microsoft.com/de-de/))
+* [Harish Itian](https://github.com/harishpakala) ([Otto Von Guericke University](https://www.ovgu.de))
+* [Hossein Rimaz](https://github.com/mhrimaz) ([metaphacts GmbH](https://metaphacts.com))
+* [heidese-sick](https://github.com/heidese-sick) ([SICK AG](https://www.sick.com/de/en/))
+* [Jan Roger Rossebø](https://github.com/rosseboe)
+* [jjtikekar](https://github.com/jjtikekar) ([Fraunhofer IOSB-INA](https://www.iosb-ina.fraunhofer.de/))
+* [Juilee Tikekar](https://github.com/juileetikekar) ([Industrial Digital Twin Association e.V. (IDTA)](https://www.idtwin.org/))
+* [Kazeem Oladipupo](https://github.com/Kaz040) ([Otto Von Guericke University](https://www.ovgu.de))
+* [krahlro-sick](https://github.com/krahlro-sick) ([SICK AG](https://www.sick.com/de/en/))
+* [Marko Ristin](https://github.com/mristin) ([ZHAW Zürcher Hochschule für Angewandte Wissenschaften](https://www.zhaw.ch/))
+* [Marta Fullen](https://github.com/martafullen) ([Fraunhofer IOSB-INA](https://www.iosb-ina.fraunhofer.de/))
+* [Michael Hoffmeister](https://github.com/MichaelHoffmeisterFesto) ([Festo](https://www.festo.com))
+* [Moritz Marseu](https://github.com/mmarseu) ([Festo](https://www.festo.com))
+* [Mubariz Hajimuradov](https://github.com/muba00)
+* [Nico Braunisch](mailto:nico.braunisch@tu-dresden.de) ([TU Dresden](https://tu-dresden.de/))
+* [Oliver Fries](https://github.com/Freezor) ([Fraunhofer IOSB-INA](https://www.iosb-ina.fraunhofer.de/))
+* [Pascal Neuperger](https://github.com/logmanoriginal)
+* [Sebastian Wagner](https://github.com/SWagnerSE) ([Schneider Electric Automation GmbH](https://www.se.com/ww/en/))
+
+## You would like to join this list? How can you help the project?
+
+If you would like to contribute to this project and see your name on this list, we are currently looking for contributions in the following areas:
+
+- [X] Bug fixes
+- [X] Documentation improvements
+- [ ] Feature enhancements
+
+For more information, please refer to our [CONTRIBUTING](CONTRIBUTING.md) guide.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 > [!WARNING]
 > Transfer of the primary content (incl. the issues) from admin-shell-io/aasx-package-explorer is finished!  
-> Admin-shell-io/aasx-package-explorer will be archived. (date TBA)
-> If there is content remaining in admin-shell-io/aasx-package-explore branches that you want our assistance with transferring,
+> The admin-shell-io/aasx-package-explorer has been archived.
+> If there is any content remaining in admin-shell-io/aasx-package-explore branches that you want our assistance with transferring,
 > please start an issue here.
 
 > [!NOTE]
@@ -14,40 +14,19 @@
 
 # Eclipse AASX Package Explorer™
 
-![Build-test-inspect](
-https://github.com/admin-shell-io/aasx-package-explorer/actions/workflows/build-test-inspect.yml/badge.svg
-) ![Check-style](
-https://github.com/admin-shell-io/aasx-package-explorer/actions/workflows/check-style.yml/badge.svg
-) ![Check-commit-messages](
-https://github.com/admin-shell-io/aasx-package-explorer/actions/workflows/check-commit-messages.yml/badge.svg
-) ![Generate-docdev](
-https://github.com/admin-shell-io/aasx-package-explorer/workflows/Generate-docdev/badge.svg
-) [![Coverage Status](
-https://coveralls.io/repos/github/admin-shell-io/aasx-package-explorer/badge.svg?branch=master
-)](
-https://coveralls.io/github/admin-shell-io/aasx-package-explorer?branch=master
-)
-
-[![TODOs](
-https://admin-shell-io.github.io/aasx-package-explorer/todos/badges/TODOs.svg
-)](
-https://github.com/admin-shell-io/aasx-package-explorer/blob/gh-pages/todos/task-list/task-list-by-file.md
-) [![BUGs](
-https://admin-shell-io.github.io/aasx-package-explorer/todos/badges/BUGs.svg
-)](
-https://github.com/admin-shell-io/aasx-package-explorer/blob/gh-pages/todos/task-list/task-list-by-file.md
-) [![HACKs](
-https://admin-shell-io.github.io/aasx-package-explorer/todos/badges/HACKs.svg
-)](
-https://github.com/admin-shell-io/aasx-package-explorer/blob/gh-pages/todos/task-list/task-list-by-file.md
-)
+![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/eclipse-aaspe/package-explorer/total)
+[![Contributors](https://img.shields.io/github/contributors/eclipse-aaspe/package-explorer)](https://github.com/badges/eclipse-aaspe/package-explorer/contributors)
+[![Forks](https://img.shields.io/github/forks/eclipse-aaspe/package-explorer?style=flat)]()
+[![Tag](https://img.shields.io/github/v/tag/eclipse-aaspe/package-explorer)]()
+[![Commit](https://img.shields.io/github/last-commit/eclipse-aaspe/package-explorer)]()
+
+[![Release](https://img.shields.io/github/v/release/eclipse-aaspe/package-explorer?include_prereleases)](https://github.com/eclipse-aaspe/package-explorer/releases)
+[![Status](https://img.shields.io/github/checks-status/eclipse-aaspe/package-explorer/v2024-05-08.alpha)]()
 
 Eclipse AASX Package Explorer™ is a C# based viewer and editor for the 
 Asset Administration Shell.
 
-![screenshot](
-https://github.com/admin-shell-io/aasx-package-explorer/raw/master/screenshot.png
-)
+![screenshot](screenshot.png)
 
 To help you familiarize with the concept of Asset Administration Shell and editing an Asset Administration Shell with the AASX Package Explorer
 we provide screencasts (both in English and German) for V2.0 at: 
@@ -56,38 +35,36 @@ https://admin-shell-io.com/screencasts/.
 For V3.0 (including changes to V2.0) please have a look at the tutorials for the Specifications itself at the [Youtube Channel Industrial Digital Twin](https://www.youtube.com/playlist?list=PLCO0zeX96Ia1hsToD9lRPDMI4P-kbt_CT) 
 
 The basis for the implementatzion are the [Specifications of the Asset Administration Shell](https://industrialdigitaltwin.org/en/content-hub/aasspecifications
-) by [IDTA]A(https://industrialdigitaltwin.org).
+) by [IDTA](https://industrialdigitaltwin.org).
 
 We provide a couple of sample admin shells (packaged as .aasx) for you to 
 test and play with the software at (V2.0):
 http://www.admin-shell-io.com/samples/
 
 ## Installation
 
-We provide the binaries for Windows 10 in [the releases](
-https://github.com/admin-shell-io/aasx-package-explorer/releases). 
+We provide the binaries for Windows 10+ in [the releases](https://github.com/eclipse-aaspe/package-explorer/releases). 
 
 (Remark: In special cases you may like to use a current build.
 Please click on a green check mark and select "Check-release" details.)
 
 ## Issues
 
 If you want to request new features or report bugs, please 
-[create an issue](
-https://github.com/admin-shell-io/aasx-package-explorer/issues/new/choose). 
+[create an issue](https://github.com/eclipse-aaspe/package-explorer/issues). 
 
 ## Contributing
 
-Please see [CONTRIBUTING](CONTRIBUTING.md) for instructions on joining the development and general contribution guidelines.
+Please see [CONTRIBUTING](CONTRIBUTING.md) for instructions on joining the development and general contribution guidelines. 
+For a complete list of all contributing individuals and companies, please visit our [CONTRIBUTORS](CONTRIBUTORS.md) page.
+
+## Documentation
 
 The documentation for developers is still available at [admin-shell-io](
 https://admin-shell-io.github.io/aasx-package-explorer/devdoc/
 ) and will be migrated to eclipse-aaspe in the near future. 
 
-## Documentation
-
-You may find additional documentation in sub-folders, e.g. for
-- [BAMM Import](https://github.com/admin-shell-io/aasx-package-explorer/tree/main/src/AasxBammRdfImExport)
+You may find additional documentation in sub-projects, e.g. for [BAMM Import](src/AasxBammRdfImExport/README.md).
 
 ## Other Open Source Implementations of AAS
 
@@ -122,6 +99,14 @@ was created. See sub-projects for more projects featuring digital twins and the
 
 The AASX Package Explorer also includes an internal REST server and OPC UA
 server for the loaded .AASX. Based on this a separate AASX Server is
-available (https://github.com/admin-shell-io/aasx-server) which can host
+available (https://github.com/eclipse-aaspe/server) which can host
 several .AASX simultaneously (see example https://example.admin-shell-io.com).
 
+---
+
+![build-and-package-release](https://github.com/eclipse-aaspe/package-explorer/actions/workflows/build-and-package-release.yml/badge.svg)
+![build-test-inspect](https://github.com/eclipse-aaspe/package-explorer/actions/workflows/build-test-inspect.yml/badge.svg)
+![check-commit-messages](https://github.com/eclipse-aaspe/package-explorer/actions/workflows/check-commit-messages.yml/badge.svg)
+![check-release](https://github.com/eclipse-aaspe/package-explorer/actions/workflows/check-release.yml/badge.svg)
+![check-style](https://github.com/eclipse-aaspe/package-explorer/actions/workflows/check-style.yml/badge.svg)
+![generate-doc](https://github.com/eclipse-aaspe/package-explorer/actions/workflows/generate-doc.yml/badge.svg)
diff --git a/contributors.txt b/contributors.txt
@@ -0,0 +1,34 @@
+104775915+SWagnerSE@users.noreply.github.com
+48956800+aorzelskiGH@users.noreply.github.com
+49699333+dependabot[bot]@users.noreply.github.com
+59824205+BirgitBoss@users.noreply.github.com
+65590855+MichaelHoffmeisterFesto@users.noreply.github.com
+66416464+krahlro-sick@users.noreply.github.com
+67549739+Kaz040@users.noreply.github.com
+68860592+AlexanderWollbrink@users.noreply.github.com
+70897399+br-iosb@users.noreply.github.com
+80957411+heidese-sick@users.noreply.github.com
+81680290+bischof-keb@users.noreply.github.com
+84308731+martafullen@users.noreply.github.com
+93717810+SAidta@users.noreply.github.com
+99317579+juileetikekar@users.noreply.github.com
+LogMANOriginal@users.noreply.github.com
+alexander.wollbrink@iosb-ina.fraunhofer.de
+aorzelski@phoenixcontact.com
+bastianroessl@gmx.de
+erichb@microsoft.com
+harishitian@gmail.com
+juilee.tikekar@idtwin.org
+juilee.tikekar@iosb-ina.fraunhofer.de
+marko.ristin@gmail.com
+marta.fullen@iosb-ina.fraunhofer.de
+mhrimaz@yahoo.com
+michael.hoffmeister@festo.com
+michahofft2@googlemail.com
+miho@de.festo.com
+miho@festo.net
+moritz.marseu@festo.com
+mubarizhajimuradov@gmail.com
+nico.braunisch@tu-dresden.de
+rosseboe@gmail.com
+textor.andreas@googlemail.com
diff --git a/src/AasxCsharpLibrary/AdminShellPackageEnv.cs b/src/AasxCsharpLibrary/AdminShellPackageEnv.cs
@@ -256,7 +256,7 @@ public class AdminShellPackageEnv : IDisposable
 
         private string _tempFn = null;
 
-        private AasCore.Aas3_0.Environment _aasEnv = new AasCore.Aas3_0.Environment(new List<IAssetAdministrationShell>(), new List<ISubmodel>(), new List<IConceptDescription>());
+        private AasCore.Aas3_0.Environment _aasEnv = new AasCore.Aas3_0.Environment();
         private Package _openPackage = null;
         private readonly ListOfAasSupplementaryFile _pendingFilesToAdd = new ListOfAasSupplementaryFile();
         private readonly ListOfAasSupplementaryFile _pendingFilesToDelete = new ListOfAasSupplementaryFile();
@@ -303,6 +303,11 @@ public AasCore.Aas3_0.Environment AasEnv
             }
         }
 
+        public void SetEnvironment(AasCore.Aas3_0.Environment environment)
+        {
+            _aasEnv = environment; 
+        }
+
         private static AasCore.Aas3_0.Environment LoadXml(string fn)
         {
             try
@@ -1535,8 +1540,9 @@ public ListOfAasSupplementaryFile GetListOfSupplementaryFiles()
 
                 // get the origin from the package
                 PackagePart originPart = null;
-                xs = _openPackage.GetRelationshipsByType(
-                    "http://admin-shell.io/aasx/relationships/aasx-origin");
+                xs = _openPackage.GetRelationshipsByType("http://admin-shell.io/aasx/relationships/aasx-origin");
+                var test = xs.Count();
+                if(xs.Count() <= 0) xs = _openPackage.GetRelationshipsByType("http://www.admin-shell.io/aasx/relationships/aasx-origin");
                 foreach (var x in xs)
                     if (x.SourceUri.ToString() == "/")
                     {
@@ -1553,7 +1559,8 @@ public ListOfAasSupplementaryFile GetListOfSupplementaryFiles()
                 {
                     // get the specs from the origin
                     PackagePart specPart = null;
-                    xs = originPart.GetRelationshipsByType("http://www.admin-shell.io/aasx/relationships/aas-spec");
+                    xs = originPart.GetRelationshipsByType("http://admin-shell.io/aasx/relationships/aas-spec");
+                    if(xs.Count() <= 0) xs = originPart.GetRelationshipsByType("http://www.admin-shell.io/aasx/relationships/aas-spec");
                     foreach (var x in xs)
                     {
                         //specPart = _openPackage.GetPart(x.TargetUri);
@@ -1568,8 +1575,8 @@ public ListOfAasSupplementaryFile GetListOfSupplementaryFiles()
                     if (specPart != null)
                     {
                         // get the supplementaries from the package, derived from spec
-                        xs = specPart.GetRelationshipsByType("http://www.admin-shell.io/aasx/relationships/aas-suppl");
-                        if(xs == null) xs = specPart.GetRelationshipsByType("http://www.admin-shell.io/aasx/relationships/aas-suppl");
+                        xs = specPart.GetRelationshipsByType("http://admin-shell.io/aasx/relationships/aas-suppl");
+                        if(xs.Count() <= 0) xs = specPart.GetRelationshipsByType("http://www.admin-shell.io/aasx/relationships/aas-suppl");
                         foreach (var x in xs)
                         {
                             result.Add(