diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 340eb7f7..73eeb825 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,12 +9,7 @@ updates: directory: "/src/DataDistributionManagerNet" # Location of package manifests schedule: interval: "weekly" - - - package-ecosystem: "gitsubmodule" - directory: "/" - schedule: - interval: weekly - + - package-ecosystem: "github-actions" directory: "/" schedule: diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3ab25d6a..3b38faa3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -8,6 +8,13 @@ on: push: # only trigger on branches, not on tags branches: '**' + paths-ignore: + - 'docs/**' + workflow_dispatch: + +concurrency: + group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}' + cancel-in-progress: true # This workflow contains two jobs called "check_opendds", "build_opendds_windows", "check_changes", "build_ddm_windows" jobs: @@ -27,7 +34,7 @@ jobs: lookup-only: true enableCrossOsArchive: true path: ./OutputOpenDDS/ - key: OpenDDS_3.25 + key: OpenDDS_3.29.1 - name: If failed we need to rebuild artifact id: check_existsOpenDDS @@ -59,97 +66,97 @@ jobs: - name: Configure OpenDDS shell: cmd run: | - cd third_party\OpenDDS + cd src\3rdparty\OpenDDS configure - name: Build OpenDDS x64 shell: cmd run: | - cd third_party\OpenDDS + cd src\3rdparty\OpenDDS call setenv.cmd msbuild -p:Configuration=Release,Platform=x64 -m DDS_TAOv2.sln - name: Move OpenDDS x64 binaries shell: cmd run: | - cd third_party\OpenDDS - xcopy .\lib\*.dll ..\..\Output\x64\ - xcopy .\lib\*.lib ..\..\Output\lib64\ - xcopy .\bin\*.exe ..\..\Output\bin64\ - xcopy .\ACE_wrappers\lib\*.dll ..\..\Output\x64\ - xcopy .\ACE_wrappers\lib\*.lib ..\..\Output\lib64\ - xcopy .\ACE_wrappers\bin\*.exe ..\..\Output\bin64\ + cd src\3rdparty\OpenDDS + xcopy .\lib\*.dll ..\..\..\Output\x64\ + xcopy .\lib\*.lib ..\..\..\Output\lib64\ + xcopy .\bin\*.exe ..\..\..\Output\bin64\ + xcopy .\ACE_wrappers\lib\*.dll ..\..\..\Output\x64\ + xcopy .\ACE_wrappers\lib\*.lib ..\..\..\Output\lib64\ + xcopy .\ACE_wrappers\bin\*.exe ..\..\..\Output\bin64\ - name: Move OpenDDS x64 PDB shell: cmd run: | - cd third_party\OpenDDS + cd src\3rdparty\OpenDDS mkdir ..\..\OutputPdb - xcopy .\lib\*.pdb ..\..\OutputPdb\pdb64\ - xcopy .\bin\*.pdb ..\..\OutputPdb\pdb64\ - xcopy .\ACE_wrappers\lib\*.pdb ..\..\OutputPdb\pdb64\ - xcopy .\ACE_wrappers\bin\*.pdb ..\..\OutputPdb\pdb64\ + xcopy .\lib\*.pdb ..\..\..\OutputPdb\pdb64\ + xcopy .\bin\*.pdb ..\..\..\OutputPdb\pdb64\ + xcopy .\ACE_wrappers\lib\*.pdb ..\..\..\OutputPdb\pdb64\ + xcopy .\ACE_wrappers\bin\*.pdb ..\..\..\OutputPdb\pdb64\ - name: Build OpenDDS x86 shell: cmd run: | - cd third_party\OpenDDS + cd src\3rdparty\OpenDDS call setenv.cmd msbuild -p:Configuration=Release,Platform=Win32 -m DDS_TAOv2.sln - name: Move OpenDDS x86 binaries shell: cmd run: | - cd third_party\OpenDDS - xcopy .\lib\*.dll ..\..\Output\x86\ - xcopy .\lib\*.lib ..\..\Output\lib32\ - xcopy .\bin\*.exe ..\..\Output\bin32\ - xcopy .\ACE_wrappers\lib\*.dll ..\..\Output\x86\ - xcopy .\ACE_wrappers\lib\*.lib ..\..\Output\lib32\ - xcopy .\ACE_wrappers\bin\*.exe ..\..\Output\bin32\ + cd src\3rdparty\OpenDDS + xcopy .\lib\*.dll ..\..\..\Output\x86\ + xcopy .\lib\*.lib ..\..\..\Output\lib32\ + xcopy .\bin\*.exe ..\..\..\Output\bin32\ + xcopy .\ACE_wrappers\lib\*.dll ..\..\..\Output\x86\ + xcopy .\ACE_wrappers\lib\*.lib ..\..\..\Output\lib32\ + xcopy .\ACE_wrappers\bin\*.exe ..\..\..\Output\bin32\ - name: Move OpenDDS x86 PDB shell: cmd run: | - cd third_party\OpenDDS - xcopy .\lib\*.pdb ..\..\OutputPdb\pdb32\ - xcopy .\bin\*.pdb ..\..\OutputPdb\pdb32\ - xcopy .\ACE_wrappers\lib\*.pdb ..\..\OutputPdb\pdb32\ - xcopy .\ACE_wrappers\bin\*.pdb ..\..\OutputPdb\pdb32\ + cd src\3rdparty\OpenDDS + xcopy .\lib\*.pdb ..\..\..\OutputPdb\pdb32\ + xcopy .\bin\*.pdb ..\..\..\OutputPdb\pdb32\ + xcopy .\ACE_wrappers\lib\*.pdb ..\..\..\OutputPdb\pdb32\ + xcopy .\ACE_wrappers\bin\*.pdb ..\..\..\OutputPdb\pdb32\ - name: Move setenv.cmd shell: cmd run: | - cd third_party\OpenDDS - xcopy setenv.cmd ..\..\Output\ + cd src\3rdparty\OpenDDS + xcopy setenv.cmd ..\..\..\Output\ - name: Prepare for packaging OpenDDS Binaries and PDB run: | New-Item -Path .\OutputOpenDDS -ItemType directory - Compress-Archive -Path .\Output\* -DestinationPath .\OutputOpenDDS\OpenDDS_Build_3.25.zip - Compress-Archive -Path .\OutputPdb\* -DestinationPath .\OutputOpenDDS\OpenDDS_PDB_Build_3.25.zip + Compress-Archive -Path .\Output\* -DestinationPath .\OutputOpenDDS\OpenDDS_Build_3.29.1.zip + Compress-Archive -Path .\OutputPdb\* -DestinationPath .\OutputOpenDDS\OpenDDS_PDB_Build_3.29.1.zip - name: Prepare for packaging OpenDDS Headers shell: cmd run: | - 7z a .\OutputOpenDDS\OpenDDS_Headers_3.25.zip .\third_party\OpenDDS\*.h -r - 7z u .\OutputOpenDDS\OpenDDS_Headers_3.25.zip .\third_party\OpenDDS\*.inl -r + 7z a .\OutputOpenDDS\OpenDDS_Headers_3.29.1.zip .\src\3rdparty\OpenDDS\*.h -r + 7z u .\OutputOpenDDS\OpenDDS_Headers_3.29.1.zip .\src\3rdparty\OpenDDS\*.inl -r - name: Save OpenDDS in cache uses: actions/cache/save@v4 with: enableCrossOsArchive: true path: ./OutputOpenDDS/ - key: OpenDDS_3.25 + key: OpenDDS_3.29.1 - name: Upload OpenDDS if: ${{ github.repository_owner == 'masesgroup'}} # do not upload any artifact outside main repo continue-on-error: true shell: cmd run: | - python %GITHUB_WORKSPACE%\third_party\CommonTools\scripts\utilsftp.py -c upload -s ${{ secrets.FTP_STORE_SITE }} -u ${{ secrets.FTP_STORE_USER }} -p ${{ secrets.FTP_STORE_PASSWORD }} -r OpenDDS_Build_3.25.zip -l %GITHUB_WORKSPACE%\OutputOpenDDS\OpenDDS_Build_3.25.zip - python %GITHUB_WORKSPACE%\third_party\CommonTools\scripts\utilsftp.py -c upload -s ${{ secrets.FTP_STORE_SITE }} -u ${{ secrets.FTP_STORE_USER }} -p ${{ secrets.FTP_STORE_PASSWORD }} -r OpenDDS_PDB_Build_3.25.zip -l %GITHUB_WORKSPACE%\OutputOpenDDS\OpenDDS_PDB_Build_3.25.zip - python %GITHUB_WORKSPACE%\third_party\CommonTools\scripts\utilsftp.py -c upload -s ${{ secrets.FTP_STORE_SITE }} -u ${{ secrets.FTP_STORE_USER }} -p ${{ secrets.FTP_STORE_PASSWORD }} -r OpenDDS_Headers_3.25.zip -l %GITHUB_WORKSPACE%\OutputOpenDDS\OpenDDS_Headers_3.25.zip + python %GITHUB_WORKSPACE%\src\3rdparty\CommonTools\scripts\utilsftp.py -c upload -s ${{ secrets.FTP_STORE_SITE }} -u ${{ secrets.FTP_STORE_USER }} -p ${{ secrets.FTP_STORE_PASSWORD }} -r OpenDDS_Build_3.29.1.zip -l %GITHUB_WORKSPACE%\OutputOpenDDS\OpenDDS_Build_3.29.1.zip + python %GITHUB_WORKSPACE%\src\3rdparty\CommonTools\scripts\utilsftp.py -c upload -s ${{ secrets.FTP_STORE_SITE }} -u ${{ secrets.FTP_STORE_USER }} -p ${{ secrets.FTP_STORE_PASSWORD }} -r OpenDDS_PDB_Build_3.29.1.zip -l %GITHUB_WORKSPACE%\OutputOpenDDS\OpenDDS_PDB_Build_3.29.1.zip + python %GITHUB_WORKSPACE%\src\3rdparty\CommonTools\scripts\utilsftp.py -c upload -s ${{ secrets.FTP_STORE_SITE }} -u ${{ secrets.FTP_STORE_USER }} -p ${{ secrets.FTP_STORE_PASSWORD }} -r OpenDDS_Headers_3.29.1.zip -l %GITHUB_WORKSPACE%\OutputOpenDDS\OpenDDS_Headers_3.29.1.zip env: GITHUB_WORKSPACE: $GITHUB_WORKSPACE @@ -226,7 +233,7 @@ jobs: - name: Build Common Tools shell: cmd run: | - cd third_party\CommonTools + cd src\3rdparty\CommonTools msbuild -p:Configuration=Release,Platform="Any CPU" -m CommonTools.sln - name: Extract commit SHA @@ -237,7 +244,7 @@ jobs: - name: Prepare version shell: cmd run: | - cd third_party\CommonTools\Output + cd src\3rdparty\CommonTools\Output VersionGenerator %GITHUB_WORKSPACE%\src\ProductInformation\Version.cs %GITHUB_WORKSPACE%\src\ProductInformation ${{ env.GITHUB_COMMIT_MESSAGE }} env: GITHUB_WORKSPACE: $GITHUB_WORKSPACE @@ -245,8 +252,8 @@ jobs: - name: Prepare packaging versioning shell: cmd run: | - third_party\CommonTools\Output\PlaceHolderReplacer.exe .\src\ProductInformation\Version.cs .\packaging\nuget\datadistributionmanager.nuspec >> .\nuget_version.txt - third_party\CommonTools\Output\PlaceHolderReplacer.exe .\src\ProductInformation\Version.cs .\packaging\maven\pom.xml "-SNAPSHOT" + src\3rdparty\CommonTools\Output\PlaceHolderReplacer.exe .\src\ProductInformation\Version.cs .\src\packaging\nuget\datadistributionmanager.nuspec >> .\nuget_version.txt + src\3rdparty\CommonTools\Output\PlaceHolderReplacer.exe .\src\ProductInformation\Version.cs .\src\packaging\maven\pom.xml "-SNAPSHOT" - name: Store version run: | @@ -255,14 +262,14 @@ jobs: - name: Verify Nuget version in file run: | - type .\packaging\nuget\datadistributionmanager.nuspec + type .\src\packaging\nuget\datadistributionmanager.nuspec echo ${{ env.NUGET_PACKAGE_VERSION }} shell: cmd - name: Configure OpenDDS to download ACE/TAO shell: cmd run: | - cd third_party\OpenDDS + cd src\3rdparty\OpenDDS configure - name: Restore OpenDDS from cache @@ -271,32 +278,32 @@ jobs: fail-on-cache-miss: true enableCrossOsArchive: true path: ./OutputOpenDDS/ - key: OpenDDS_3.25 + key: OpenDDS_3.29.1 - name: Prepare OpenDDS Binaries run: | - Expand-Archive -LiteralPath '.\OutputOpenDDS\OpenDDS_Build_3.25.zip' -DestinationPath .\Output -Force + Expand-Archive -LiteralPath '.\OutputOpenDDS\OpenDDS_Build_3.29.1.zip' -DestinationPath .\Output -Force - name: Prepare OpenDDS Headers run: | - Expand-Archive -LiteralPath '.\OutputOpenDDS\OpenDDS_Headers_3.25.zip' -DestinationPath .\third_party\OpenDDS -Force + Expand-Archive -LiteralPath '.\OutputOpenDDS\OpenDDS_Headers_3.29.1.zip' -DestinationPath .\src\3rdparty\OpenDDS -Force - name: Move OpenDDS x64 shell: cmd run: | - xcopy .\Output\bin32\*.* .\third_party\OpenDDS\bin\ - xcopy .\Output\x86\*.dll .\third_party\OpenDDS\lib\ - xcopy .\Output\bin32\*.* .\third_party\OpenDDS\ACE_wrappers\bin\ - xcopy .\Output\x86\*.dll .\third_party\OpenDDS\ACE_wrappers\lib\ + xcopy .\Output\bin32\*.* .\src\3rdparty\OpenDDS\bin\ + xcopy .\Output\x86\*.dll .\src\3rdparty\OpenDDS\lib\ + xcopy .\Output\bin32\*.* .\src\3rdparty\OpenDDS\ACE_wrappers\bin\ + xcopy .\Output\x86\*.dll .\src\3rdparty\OpenDDS\ACE_wrappers\lib\ - name: Generate OpenDDS projects shell: cmd run: | - call .\third_party\OpenDDS\setenv.cmd - cd src\DataDistributionManagerOpenDDS + call .\src\3rdparty\OpenDDS\setenv.cmd + cd src\native\DataDistributionManagerOpenDDS perl %ACE_ROOT%\bin\generate_export_file.pl DataDistributionSchemaCommon > DataDistributionSchemaCommon_Export.h perl %ACE_ROOT%\bin\mwc.pl -type vs2022 DataDistributionManagerOpenDDS.mwc - cd ..\.. + cd ..\..\.. - uses: nuget/setup-nuget@v2.0.0 with: @@ -306,7 +313,7 @@ jobs: - name: Build DataDistributionManager x64 shell: cmd run: | - call .\third_party\OpenDDS\setenv.cmd + call .\src\3rdparty\OpenDDS\setenv.cmd set JDK_ROOT_FOLDER=%JAVA_HOME_11_X64% cd src msbuild /m -p:Configuration=Release,Platform=x64 DataDistributionManager.sln @@ -314,16 +321,16 @@ jobs: - name: Build DataDistributionManager x86 shell: cmd run: | - call .\third_party\OpenDDS\setenv.cmd + call .\src\3rdparty\OpenDDS\setenv.cmd set JDK_ROOT_FOLDER=%JAVA_HOME_11_X64% cd src msbuild /m -p:Configuration=Release,Platform=Win32 DataDistributionManager.sln - - name: Build DataDistributionManager net462, net6.0 and net7.0 + - name: Build DataDistributionManager net462, net6.0 and net8.0 run: | - dotnet build --no-incremental --configuration Release --framework net462 -o Output src\DataDistributionManagerNet\DataDistributionManagerNet.csproj - dotnet build --no-incremental --configuration Release --framework net6.0 -o Outputnet6.0 src\DataDistributionManagerNet\DataDistributionManagerNet.csproj - dotnet build --no-incremental --configuration Release --framework net7.0 -o Outputnet7.0 src\DataDistributionManagerNet\DataDistributionManagerNet.csproj + dotnet build --no-incremental --configuration Release --framework net462 -o Output src\net\DataDistributionManagerNet\DataDistributionManagerNet.csproj + dotnet build --no-incremental --configuration Release --framework net6.0 -o Outputnet6.0 src\net\DataDistributionManagerNet\DataDistributionManagerNet.csproj + dotnet build --no-incremental --configuration Release --framework net8.0 -o Outputnet8.0 src\net\DataDistributionManagerNet\DataDistributionManagerNet.csproj - name: Prepare for packaging run: | @@ -339,10 +346,10 @@ jobs: New-Item -Path .\OutputPackage\pdb\x64 -ItemType directory New-Item -Path .\OutputPackage\include -ItemType directory New-Item -Path .\OutputPackage\licenses -ItemType directory - Copy-Item .\src\DataDistributionManager\DataDistributionManagerEnums.h .\OutputPackage\include\DataDistributionManagerEnums.h - Copy-Item .\src\DataDistributionManager\DataDistributionManagerTypes.h .\OutputPackage\include\DataDistributionManagerTypes.h - Copy-Item .\src\DataDistributionManager\DataDistributionManager.h .\OutputPackage\include\DataDistributionManager.h - Copy-Item .\src\DataDistributionManager\SmartDataDistributionManager.h .\OutputPackage\include\SmartDataDistributionManager.h + Copy-Item .\src\native\DataDistributionManager\DataDistributionManagerEnums.h .\OutputPackage\include\DataDistributionManagerEnums.h + Copy-Item .\src\native\DataDistributionManager\DataDistributionManagerTypes.h .\OutputPackage\include\DataDistributionManagerTypes.h + Copy-Item .\src\native\DataDistributionManager\DataDistributionManager.h .\OutputPackage\include\DataDistributionManager.h + Copy-Item .\src\native\DataDistributionManager\SmartDataDistributionManager.h .\OutputPackage\include\SmartDataDistributionManager.h Copy-Item .\Output\x86\DataDistributionManager.lib .\OutputPackage\lib\x86\DataDistributionManager.lib -Force Copy-Item .\Output\x64\DataDistributionManager.lib .\OutputPackage\lib\x64\DataDistributionManager.lib -Force Copy-Item .\Output\*.dll .\OutputPackage\runtime\ -Force @@ -359,8 +366,8 @@ jobs: Copy-Item .\Output\x64\*.pdb .\OutputPackage\pdb\x64\ -Force Copy-Item .\Output\pdb64\*.pdb .\OutputPackage\pdb\x64\ -Force Copy-Item .\LICENSE .\OutputPackage\licenses\LICENSE.datadistributionmanager -Force - Copy-Item .\src\packages\librdkafka.redist.2.2.0\LICENSES.txt .\OutputPackage\licenses\LICENSE.librdkafka -Force - Copy-Item .\third_party\OpenDDS\LICENSE .\OutputPackage\licenses\LICENSE.opendds -Force + Copy-Item .\src\packages\librdkafka.redist.2.5.3\LICENSES.txt .\OutputPackage\licenses\LICENSE.librdkafka -Force + Copy-Item .\src\3rdparty\OpenDDS\LICENSE .\OutputPackage\licenses\LICENSE.opendds -Force Compress-Archive -Path .\OutputPackage\* -DestinationPath .\OutputPackage\DataDistributionManager.zip - name: Prepare for Java packaging @@ -387,7 +394,7 @@ jobs: id: publishOnMaven continue-on-error: true shell: bash - run: mvn --file ./packaging/maven/pom.xml --no-transfer-progress --batch-mode -Dgpg.passphrase=${{ secrets.MAVEN_GPG_PASSPHRASE }} deploy + run: mvn --file ./src/packaging/maven/pom.xml --no-transfer-progress --batch-mode -Dgpg.passphrase=${{ secrets.MAVEN_GPG_PASSPHRASE }} deploy env: MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }} @@ -397,7 +404,7 @@ jobs: if: ${{ github.repository_owner != 'masesgroup' || (github.repository_owner == 'masesgroup' && steps.publishOnMaven.outcome == 'success') }} shell: cmd run: | - cd src\DataDistributionManagerJava + cd src\jvm set JDK_ROOT_FOLDER=%JAVA_HOME_11_X64% CreateJar.bat cd ..\.. @@ -406,10 +413,10 @@ jobs: run: Remove-Item .\docs\* -Recurse -Force -Exclude _config.yml,CNAME - name: Download Doxygen tool - run: C:\msys64\usr\bin\wget.exe https://www.doxygen.nl/files/doxygen-1.9.7.windows.x64.bin.zip + run: C:\msys64\usr\bin\wget.exe https://www.doxygen.nl/files/doxygen-1.12.0.windows.x64.bin.zip - name: Expand Doxygen package - run: Expand-Archive -LiteralPath '.\doxygen-1.9.7.windows.x64.bin.zip' -DestinationPath .\src\Documentation -Force + run: Expand-Archive -LiteralPath '.\doxygen-1.12.0.windows.x64.bin.zip' -DestinationPath .\src\Documentation -Force - name: Create C/C++ documentation shell: cmd @@ -427,7 +434,7 @@ jobs: - uses: nuget/setup-nuget@v2.0.0 with: nuget-version: '5.x' - - run: nuget pack packaging\nuget\datadistributionmanager.nuspec + - run: nuget pack src\packaging\nuget\datadistributionmanager.nuspec - uses: actions/upload-artifact@v4 with: @@ -437,7 +444,7 @@ jobs: - uses: actions/upload-artifact@v4 with: name: MavenDeploy - path: .\packaging\maven\target\*.jar + path: .\src\packaging\maven\target\*.jar - uses: actions/upload-artifact@v4 with: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f82fb918..ce049e0a 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,12 +13,22 @@ name: "CodeQL" on: push: - branches: [ "master" ] + branches: + - master + - release/** + paths-ignore: + - 'docs/**' pull_request: # The branches below must be a subset of the branches above - branches: [ "master" ] - schedule: - - cron: '32 19 * * 1' + branches: + - master + - release/** + paths-ignore: + - 'docs/**' + +concurrency: + group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}' + cancel-in-progress: true jobs: analyze: diff --git a/.github/workflows/pullrequest.yaml b/.github/workflows/pullrequest.yaml index 39f92a35..439ccafa 100644 --- a/.github/workflows/pullrequest.yaml +++ b/.github/workflows/pullrequest.yaml @@ -6,8 +6,16 @@ name: CI_PULLREQUEST # events but only for the master branch on: pull_request: - branches: [ master ] - + branches: + - master + - release/** + paths-ignore: + - 'docs/**' + +concurrency: + group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}' + cancel-in-progress: true + jobs: # Verify if a build is needed check_opendds: @@ -25,7 +33,7 @@ jobs: lookup-only: true enableCrossOsArchive: true path: ./OutputOpenDDS/ - key: OpenDDS_3.25 + key: OpenDDS_3.29.1 - name: If failed we need to rebuild artifact id: check_existsOpenDDS @@ -57,88 +65,88 @@ jobs: - name: Configure OpenDDS shell: cmd run: | - cd third_party\OpenDDS + cd src\3rdparty\OpenDDS configure - name: Build OpenDDS x64 shell: cmd run: | - cd third_party\OpenDDS + cd src\3rdparty\OpenDDS call setenv.cmd msbuild -p:Configuration=Release,Platform=x64 -m DDS_TAOv2.sln - name: Move OpenDDS x64 binaries shell: cmd run: | - cd third_party\OpenDDS - xcopy .\lib\*.dll ..\..\Output\x64\ - xcopy .\lib\*.lib ..\..\Output\lib64\ - xcopy .\bin\*.exe ..\..\Output\bin64\ - xcopy .\ACE_wrappers\lib\*.dll ..\..\Output\x64\ - xcopy .\ACE_wrappers\lib\*.lib ..\..\Output\lib64\ - xcopy .\ACE_wrappers\bin\*.exe ..\..\Output\bin64\ + cd src\3rdparty\OpenDDS + xcopy .\lib\*.dll ..\..\..\Output\x64\ + xcopy .\lib\*.lib ..\..\..\Output\lib64\ + xcopy .\bin\*.exe ..\..\..\Output\bin64\ + xcopy .\ACE_wrappers\lib\*.dll ..\..\..\Output\x64\ + xcopy .\ACE_wrappers\lib\*.lib ..\..\..\Output\lib64\ + xcopy .\ACE_wrappers\bin\*.exe ..\..\..\Output\bin64\ - name: Move OpenDDS x64 PDB shell: cmd run: | - cd third_party\OpenDDS + cd src\3rdparty\OpenDDS mkdir ..\..\OutputPdb - xcopy .\lib\*.pdb ..\..\OutputPdb\pdb64\ - xcopy .\bin\*.pdb ..\..\OutputPdb\pdb64\ - xcopy .\ACE_wrappers\lib\*.pdb ..\..\OutputPdb\pdb64\ - xcopy .\ACE_wrappers\bin\*.pdb ..\..\OutputPdb\pdb64\ + xcopy .\lib\*.pdb ..\..\..\OutputPdb\pdb64\ + xcopy .\bin\*.pdb ..\..\..\OutputPdb\pdb64\ + xcopy .\ACE_wrappers\lib\*.pdb ..\..\..\OutputPdb\pdb64\ + xcopy .\ACE_wrappers\bin\*.pdb ..\..\..\OutputPdb\pdb64\ - name: Build OpenDDS x86 shell: cmd run: | - cd third_party\OpenDDS + cd src\3rdparty\OpenDDS call setenv.cmd msbuild -p:Configuration=Release,Platform=Win32 -m DDS_TAOv2.sln - name: Move OpenDDS x86 binaries shell: cmd run: | - cd third_party\OpenDDS - xcopy .\lib\*.dll ..\..\Output\x86\ - xcopy .\lib\*.lib ..\..\Output\lib32\ - xcopy .\bin\*.exe ..\..\Output\bin32\ - xcopy .\ACE_wrappers\lib\*.dll ..\..\Output\x86\ - xcopy .\ACE_wrappers\lib\*.lib ..\..\Output\lib32\ - xcopy .\ACE_wrappers\bin\*.exe ..\..\Output\bin32\ + cd src\3rdparty\OpenDDS + xcopy .\lib\*.dll ..\..\..\Output\x86\ + xcopy .\lib\*.lib ..\..\..\Output\lib32\ + xcopy .\bin\*.exe ..\..\..\Output\bin32\ + xcopy .\ACE_wrappers\lib\*.dll ..\..\..\Output\x86\ + xcopy .\ACE_wrappers\lib\*.lib ..\..\..\Output\lib32\ + xcopy .\ACE_wrappers\bin\*.exe ..\..\..\Output\bin32\ - name: Move OpenDDS x86 PDB shell: cmd run: | - cd third_party\OpenDDS - xcopy .\lib\*.pdb ..\..\OutputPdb\pdb32\ - xcopy .\bin\*.pdb ..\..\OutputPdb\pdb32\ - xcopy .\ACE_wrappers\lib\*.pdb ..\..\OutputPdb\pdb32\ - xcopy .\ACE_wrappers\bin\*.pdb ..\..\OutputPdb\pdb32\ + cd src\3rdparty\OpenDDS + xcopy .\lib\*.pdb ..\..\..\OutputPdb\pdb32\ + xcopy .\bin\*.pdb ..\..\..\OutputPdb\pdb32\ + xcopy .\ACE_wrappers\lib\*.pdb ..\..\..\OutputPdb\pdb32\ + xcopy .\ACE_wrappers\bin\*.pdb ..\..\..\OutputPdb\pdb32\ - name: Move setenv.cmd shell: cmd run: | - cd third_party\OpenDDS - xcopy setenv.cmd ..\..\Output\ + cd src\3rdparty\OpenDDS + xcopy setenv.cmd ..\..\..\Output\ - name: Prepare for packaging OpenDDS Binaries and PDB run: | New-Item -Path .\OutputOpenDDS -ItemType directory - Compress-Archive -Path .\Output\* -DestinationPath .\OutputOpenDDS\OpenDDS_Build_3.25.zip - Compress-Archive -Path .\OutputPdb\* -DestinationPath .\OutputOpenDDS\OpenDDS_PDB_Build_3.25.zip + Compress-Archive -Path .\Output\* -DestinationPath .\OutputOpenDDS\OpenDDS_Build_3.29.1.zip + Compress-Archive -Path .\OutputPdb\* -DestinationPath .\OutputOpenDDS\OpenDDS_PDB_Build_3.29.1.zip - name: Prepare for packaging OpenDDS Headers shell: cmd run: | - 7z a .\OutputOpenDDS\OpenDDS_Headers_3.25.zip .\third_party\OpenDDS\*.h -r - 7z u .\OutputOpenDDS\OpenDDS_Headers_3.25.zip .\third_party\OpenDDS\*.inl -r + 7z a .\OutputOpenDDS\OpenDDS_Headers_3.29.1.zip .\src\3rdparty\OpenDDS\*.h -r + 7z u .\OutputOpenDDS\OpenDDS_Headers_3.29.1.zip .\src\3rdparty\OpenDDS\*.inl -r - name: Save OpenDDS in cache uses: actions/cache/save@v4 with: enableCrossOsArchive: true path: ./OutputOpenDDS/ - key: OpenDDS_3.25 + key: OpenDDS_3.29.1 # This workflow contains a single job called "build_release" build_pullrequest: @@ -164,7 +172,7 @@ jobs: - name: Build Common Tools shell: cmd run: | - cd third_party\CommonTools + cd src\3rdparty\CommonTools msbuild -p:Configuration=Release,Platform="Any CPU" -m CommonTools.sln - name: Extract commit SHA @@ -175,7 +183,7 @@ jobs: - name: Prepare version shell: cmd run: | - cd third_party\CommonTools\Output + cd src\3rdparty\CommonTools\Output VersionGenerator %GITHUB_WORKSPACE%\src\ProductInformation\Version.cs %GITHUB_WORKSPACE%\src\ProductInformation ${{ env.GITHUB_COMMIT_MESSAGE }} env: GITHUB_WORKSPACE: $GITHUB_WORKSPACE @@ -183,7 +191,7 @@ jobs: - name: Prepare nuget shell: cmd run: | - third_party\CommonTools\Output\PlaceHolderReplacer.exe .\src\ProductInformation\Version.cs .\packaging\nuget\datadistributionmanager.nuspec >> .\nuget_version.txt + src\3rdparty\CommonTools\Output\PlaceHolderReplacer.exe .\src\ProductInformation\Version.cs .\src\packaging\nuget\datadistributionmanager.nuspec >> .\nuget_version.txt - name: Store version run: | @@ -192,14 +200,14 @@ jobs: - name: Verify Nuget version in file run: | - type .\packaging\nuget\datadistributionmanager.nuspec + type .\src\packaging\nuget\datadistributionmanager.nuspec echo ${{ env.NUGET_PACKAGE_VERSION }} shell: cmd - name: Configure OpenDDS shell: cmd run: | - cd third_party\OpenDDS + cd src\3rdparty\OpenDDS configure - name: Restore OpenDDS from cache @@ -208,32 +216,32 @@ jobs: fail-on-cache-miss: true enableCrossOsArchive: true path: ./OutputOpenDDS/ - key: OpenDDS_3.25 + key: OpenDDS_3.29.1 - name: Prepare OpenDDS Binaries run: | - Expand-Archive -LiteralPath '.\OutputOpenDDS\OpenDDS_Build_3.25.zip' -DestinationPath .\Output -Force + Expand-Archive -LiteralPath '.\OutputOpenDDS\OpenDDS_Build_3.29.1.zip' -DestinationPath .\Output -Force - name: Prepare OpenDDS Headers run: | - Expand-Archive -LiteralPath '.\OutputOpenDDS\OpenDDS_Headers_3.25.zip' -DestinationPath .\third_party\OpenDDS -Force + Expand-Archive -LiteralPath '.\OutputOpenDDS\OpenDDS_Headers_3.29.1.zip' -DestinationPath .\src\3rdparty\OpenDDS -Force - name: Move OpenDDS x64 shell: cmd run: | - xcopy .\Output\bin32\*.* .\third_party\OpenDDS\bin\ - xcopy .\Output\x86\*.dll .\third_party\OpenDDS\lib\ - xcopy .\Output\bin32\*.* .\third_party\OpenDDS\ACE_wrappers\bin\ - xcopy .\Output\x86\*.dll .\third_party\OpenDDS\ACE_wrappers\lib\ + xcopy .\Output\bin32\*.* .\src\3rdparty\OpenDDS\bin\ + xcopy .\Output\x86\*.dll .\src\3rdparty\OpenDDS\lib\ + xcopy .\Output\bin32\*.* .\src\3rdparty\OpenDDS\ACE_wrappers\bin\ + xcopy .\Output\x86\*.dll .\src\3rdparty\OpenDDS\ACE_wrappers\lib\ - name: Generate OpenDDS projects shell: cmd run: | - call .\third_party\OpenDDS\setenv.cmd - cd src\DataDistributionManagerOpenDDS + call .\src\3rdparty\OpenDDS\setenv.cmd + cd src\native\DataDistributionManagerOpenDDS perl %ACE_ROOT%\bin\generate_export_file.pl DataDistributionSchemaCommon > DataDistributionSchemaCommon_Export.h perl %ACE_ROOT%\bin\mwc.pl -type vs2022 DataDistributionManagerOpenDDS.mwc - cd ..\.. + cd ..\..\.. - uses: nuget/setup-nuget@v2.0.0 with: @@ -243,7 +251,7 @@ jobs: - name: Build DataDistributionManager x64 shell: cmd run: | - call .\third_party\OpenDDS\setenv.cmd + call .\src\3rdparty\OpenDDS\setenv.cmd set JDK_ROOT_FOLDER=%JAVA_HOME_11_X64% cd src msbuild /m -p:Configuration=Release,Platform=x64 DataDistributionManager.sln @@ -251,16 +259,16 @@ jobs: - name: Build DataDistributionManager x86 shell: cmd run: | - call .\third_party\OpenDDS\setenv.cmd + call .\src\3rdparty\OpenDDS\setenv.cmd set JDK_ROOT_FOLDER=%JAVA_HOME_11_X64% cd src msbuild /m -p:Configuration=Release,Platform=Win32 DataDistributionManager.sln - - name: Build DataDistributionManager net462, net6.0 and net7.0 + - name: Build DataDistributionManager net462, net6.0 and net8.0 run: | - dotnet build --no-incremental --configuration Release --framework net462 -o Output src\DataDistributionManagerNet\DataDistributionManagerNet.csproj - dotnet build --no-incremental --configuration Release --framework net6.0 -o Outputnet6.0 src\DataDistributionManagerNet\DataDistributionManagerNet.csproj - dotnet build --no-incremental --configuration Release --framework net7.0 -o Outputnet7.0 src\DataDistributionManagerNet\DataDistributionManagerNet.csproj + dotnet build --no-incremental --configuration Release --framework net462 -o Output src\net\DataDistributionManagerNet\DataDistributionManagerNet.csproj + dotnet build --no-incremental --configuration Release --framework net6.0 -o Outputnet6.0 src\net\DataDistributionManagerNet\DataDistributionManagerNet.csproj + dotnet build --no-incremental --configuration Release --framework net8.0 -o Outputnet8.0 src\net\DataDistributionManagerNet\DataDistributionManagerNet.csproj - name: Prepare for packaging run: | @@ -276,10 +284,10 @@ jobs: New-Item -Path .\OutputPackage\pdb\x64 -ItemType directory New-Item -Path .\OutputPackage\include -ItemType directory New-Item -Path .\OutputPackage\licenses -ItemType directory - Copy-Item .\src\DataDistributionManager\DataDistributionManagerEnums.h .\OutputPackage\include\DataDistributionManagerEnums.h - Copy-Item .\src\DataDistributionManager\DataDistributionManagerTypes.h .\OutputPackage\include\DataDistributionManagerTypes.h - Copy-Item .\src\DataDistributionManager\DataDistributionManager.h .\OutputPackage\include\DataDistributionManager.h - Copy-Item .\src\DataDistributionManager\SmartDataDistributionManager.h .\OutputPackage\include\SmartDataDistributionManager.h + Copy-Item .\src\native\DataDistributionManager\DataDistributionManagerEnums.h .\OutputPackage\include\DataDistributionManagerEnums.h + Copy-Item .\src\native\DataDistributionManager\DataDistributionManagerTypes.h .\OutputPackage\include\DataDistributionManagerTypes.h + Copy-Item .\src\native\DataDistributionManager\DataDistributionManager.h .\OutputPackage\include\DataDistributionManager.h + Copy-Item .\src\native\DataDistributionManager\SmartDataDistributionManager.h .\OutputPackage\include\SmartDataDistributionManager.h Copy-Item .\Output\x86\DataDistributionManager.lib .\OutputPackage\lib\x86\DataDistributionManager.lib -Force Copy-Item .\Output\x64\DataDistributionManager.lib .\OutputPackage\lib\x64\DataDistributionManager.lib -Force Copy-Item .\Output\*.dll .\OutputPackage\runtime\ -Force @@ -296,8 +304,8 @@ jobs: Copy-Item .\Output\x64\*.pdb .\OutputPackage\pdb\x64\ -Force Copy-Item .\Output\pdb64\*.pdb .\OutputPackage\pdb\x64\ -Force Copy-Item .\LICENSE .\OutputPackage\licenses\LICENSE.datadistributionmanager -Force - Copy-Item .\src\packages\librdkafka.redist.2.2.0\LICENSES.txt .\OutputPackage\licenses\LICENSE.librdkafka -Force - Copy-Item .\third_party\OpenDDS\LICENSE .\OutputPackage\licenses\LICENSE.opendds -Force + Copy-Item .\src\packages\librdkafka.redist.2.5.3\LICENSES.txt .\OutputPackage\licenses\LICENSE.librdkafka -Force + Copy-Item .\src\3rdparty\OpenDDS\LICENSE .\OutputPackage\licenses\LICENSE.opendds -Force Compress-Archive -Path .\OutputPackage\* -DestinationPath .\OutputPackage\DataDistributionManager.zip - name: Prepare for Java packaging @@ -311,7 +319,7 @@ jobs: - name: Build Java Binder shell: cmd run: | - cd src\DataDistributionManagerJava + cd src\jvm set JDK_ROOT_FOLDER=%JAVA_HOME_11_X64% CreateJar.bat cd ..\.. @@ -319,4 +327,4 @@ jobs: - uses: nuget/setup-nuget@v2.0.0 with: nuget-version: '5.x' - - run: nuget pack packaging\nuget\datadistributionmanager.nuspec + - run: nuget pack src\packaging\nuget\datadistributionmanager.nuspec diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 889a119b..3f30a359 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -8,7 +8,6 @@ on: release: types: - published - - edited jobs: # Verify if a build is needed @@ -27,7 +26,7 @@ jobs: lookup-only: true enableCrossOsArchive: true path: ./OutputOpenDDS/ - key: OpenDDS_3.25 + key: OpenDDS_3.29.1 - name: If failed we need to rebuild artifact id: check_existsOpenDDS @@ -59,88 +58,88 @@ jobs: - name: Configure OpenDDS shell: cmd run: | - cd third_party\OpenDDS + cd src\3rdparty\OpenDDS configure - name: Build OpenDDS x64 shell: cmd run: | - cd third_party\OpenDDS + cd src\3rdparty\OpenDDS call setenv.cmd msbuild -p:Configuration=Release,Platform=x64 -m DDS_TAOv2.sln - name: Move OpenDDS x64 binaries shell: cmd run: | - cd third_party\OpenDDS - xcopy .\lib\*.dll ..\..\Output\x64\ - xcopy .\lib\*.lib ..\..\Output\lib64\ - xcopy .\bin\*.exe ..\..\Output\bin64\ - xcopy .\ACE_wrappers\lib\*.dll ..\..\Output\x64\ - xcopy .\ACE_wrappers\lib\*.lib ..\..\Output\lib64\ - xcopy .\ACE_wrappers\bin\*.exe ..\..\Output\bin64\ + cd src\3rdparty\OpenDDS + xcopy .\lib\*.dll ..\..\..\Output\x64\ + xcopy .\lib\*.lib ..\..\..\Output\lib64\ + xcopy .\bin\*.exe ..\..\..\Output\bin64\ + xcopy .\ACE_wrappers\lib\*.dll ..\..\..\Output\x64\ + xcopy .\ACE_wrappers\lib\*.lib ..\..\..\Output\lib64\ + xcopy .\ACE_wrappers\bin\*.exe ..\..\..\Output\bin64\ - name: Move OpenDDS x64 PDB shell: cmd run: | - cd third_party\OpenDDS + cd src\3rdparty\OpenDDS mkdir ..\..\OutputPdb - xcopy .\lib\*.pdb ..\..\OutputPdb\pdb64\ - xcopy .\bin\*.pdb ..\..\OutputPdb\pdb64\ - xcopy .\ACE_wrappers\lib\*.pdb ..\..\OutputPdb\pdb64\ - xcopy .\ACE_wrappers\bin\*.pdb ..\..\OutputPdb\pdb64\ + xcopy .\lib\*.pdb ..\..\..\OutputPdb\pdb64\ + xcopy .\bin\*.pdb ..\..\..\OutputPdb\pdb64\ + xcopy .\ACE_wrappers\lib\*.pdb ..\..\..\OutputPdb\pdb64\ + xcopy .\ACE_wrappers\bin\*.pdb ..\..\..\OutputPdb\pdb64\ - name: Build OpenDDS x86 shell: cmd run: | - cd third_party\OpenDDS + cd src\3rdparty\OpenDDS call setenv.cmd msbuild -p:Configuration=Release,Platform=Win32 -m DDS_TAOv2.sln - name: Move OpenDDS x86 binaries shell: cmd run: | - cd third_party\OpenDDS - xcopy .\lib\*.dll ..\..\Output\x86\ - xcopy .\lib\*.lib ..\..\Output\lib32\ - xcopy .\bin\*.exe ..\..\Output\bin32\ - xcopy .\ACE_wrappers\lib\*.dll ..\..\Output\x86\ - xcopy .\ACE_wrappers\lib\*.lib ..\..\Output\lib32\ - xcopy .\ACE_wrappers\bin\*.exe ..\..\Output\bin32\ + cd src\3rdparty\OpenDDS + xcopy .\lib\*.dll ..\..\..\Output\x86\ + xcopy .\lib\*.lib ..\..\..\Output\lib32\ + xcopy .\bin\*.exe ..\..\..\Output\bin32\ + xcopy .\ACE_wrappers\lib\*.dll ..\..\..\Output\x86\ + xcopy .\ACE_wrappers\lib\*.lib ..\..\..\Output\lib32\ + xcopy .\ACE_wrappers\bin\*.exe ..\..\..\Output\bin32\ - name: Move OpenDDS x86 PDB shell: cmd run: | - cd third_party\OpenDDS - xcopy .\lib\*.pdb ..\..\OutputPdb\pdb32\ - xcopy .\bin\*.pdb ..\..\OutputPdb\pdb32\ - xcopy .\ACE_wrappers\lib\*.pdb ..\..\OutputPdb\pdb32\ - xcopy .\ACE_wrappers\bin\*.pdb ..\..\OutputPdb\pdb32\ + cd src\3rdparty\OpenDDS + xcopy .\lib\*.pdb ..\..\..\OutputPdb\pdb32\ + xcopy .\bin\*.pdb ..\..\..\OutputPdb\pdb32\ + xcopy .\ACE_wrappers\lib\*.pdb ..\..\..\OutputPdb\pdb32\ + xcopy .\ACE_wrappers\bin\*.pdb ..\..\..\OutputPdb\pdb32\ - name: Move setenv.cmd shell: cmd run: | - cd third_party\OpenDDS - xcopy setenv.cmd ..\..\Output\ + cd src\3rdparty\OpenDDS + xcopy setenv.cmd ..\..\..\Output\ - name: Prepare for packaging OpenDDS Binaries and PDB run: | New-Item -Path .\OutputOpenDDS -ItemType directory - Compress-Archive -Path .\Output\* -DestinationPath .\OutputOpenDDS\OpenDDS_Build_3.25.zip - Compress-Archive -Path .\OutputPdb\* -DestinationPath .\OutputOpenDDS\OpenDDS_PDB_Build_3.25.zip + Compress-Archive -Path .\Output\* -DestinationPath .\OutputOpenDDS\OpenDDS_Build_3.29.1.zip + Compress-Archive -Path .\OutputPdb\* -DestinationPath .\OutputOpenDDS\OpenDDS_PDB_Build_3.29.1.zip - name: Prepare for packaging OpenDDS Headers shell: cmd run: | - 7z a .\OutputOpenDDS\OpenDDS_Headers_3.25.zip .\third_party\OpenDDS\*.h -r - 7z u .\OutputOpenDDS\OpenDDS_Headers_3.25.zip .\third_party\OpenDDS\*.inl -r + 7z a .\OutputOpenDDS\OpenDDS_Headers_3.29.1.zip .\src\3rdparty\OpenDDS\*.h -r + 7z u .\OutputOpenDDS\OpenDDS_Headers_3.29.1.zip .\src\3rdparty\OpenDDS\*.inl -r - name: Save OpenDDS in cache uses: actions/cache/save@v4 with: enableCrossOsArchive: true path: ./OutputOpenDDS/ - key: OpenDDS_3.25 + key: OpenDDS_3.29.1 # This workflow contains a single job called "build_release" build_release: @@ -180,7 +179,7 @@ jobs: - name: Build Common Tools shell: cmd run: | - cd third_party\CommonTools + cd src\3rdparty\CommonTools msbuild -p:Configuration=Release,Platform="Any CPU" -m CommonTools.sln - name: Extract commit SHA @@ -191,7 +190,7 @@ jobs: - name: Prepare version shell: cmd run: | - cd third_party\CommonTools\Output + cd src\3rdparty\CommonTools\Output VersionGenerator %GITHUB_WORKSPACE%\src\ProductInformation\Version.cs %GITHUB_WORKSPACE%\src\ProductInformation ${{ env.GITHUB_COMMIT_MESSAGE }} env: GITHUB_WORKSPACE: $GITHUB_WORKSPACE @@ -199,8 +198,8 @@ jobs: - name: Prepare packaging versioning shell: cmd run: | - third_party\CommonTools\Output\PlaceHolderReplacer.exe .\src\ProductInformation\Version.cs .\packaging\nuget\datadistributionmanager.nuspec >> .\nuget_version.txt - third_party\CommonTools\Output\PlaceHolderReplacer.exe .\src\ProductInformation\Version.cs .\packaging\maven\pom.xml + src\3rdparty\CommonTools\Output\PlaceHolderReplacer.exe .\src\ProductInformation\Version.cs .\src\packaging\nuget\datadistributionmanager.nuspec >> .\nuget_version.txt + src\3rdparty\CommonTools\Output\PlaceHolderReplacer.exe .\src\ProductInformation\Version.cs .\src\packaging\maven\pom.xml - name: Store version run: | @@ -209,14 +208,14 @@ jobs: - name: Verify Nuget version in file run: | - type .\packaging\nuget\datadistributionmanager.nuspec + type .\src\packaging\nuget\datadistributionmanager.nuspec echo ${{ env.NUGET_PACKAGE_VERSION }} shell: cmd - name: Configure OpenDDS shell: cmd run: | - cd third_party\OpenDDS + cd src\3rdparty\OpenDDS configure - name: Restore OpenDDS from cache @@ -225,32 +224,32 @@ jobs: fail-on-cache-miss: true enableCrossOsArchive: true path: ./OutputOpenDDS/ - key: OpenDDS_3.25 + key: OpenDDS_3.29.1 - name: Prepare OpenDDS Binaries run: | - Expand-Archive -LiteralPath '.\OutputOpenDDS\OpenDDS_Build_3.25.zip' -DestinationPath .\Output -Force + Expand-Archive -LiteralPath '.\OutputOpenDDS\OpenDDS_Build_3.29.1.zip' -DestinationPath .\Output -Force - name: Prepare OpenDDS Headers run: | - Expand-Archive -LiteralPath '.\OutputOpenDDS\OpenDDS_Headers_3.25.zip' -DestinationPath .\third_party\OpenDDS -Force + Expand-Archive -LiteralPath '.\OutputOpenDDS\OpenDDS_Headers_3.29.1.zip' -DestinationPath .\src\3rdparty\OpenDDS -Force - name: Move OpenDDS x64 shell: cmd run: | - xcopy .\Output\bin32\*.* .\third_party\OpenDDS\bin\ - xcopy .\Output\x86\*.dll .\third_party\OpenDDS\lib\ - xcopy .\Output\bin32\*.* .\third_party\OpenDDS\ACE_wrappers\bin\ - xcopy .\Output\x86\*.dll .\third_party\OpenDDS\ACE_wrappers\lib\ + xcopy .\Output\bin32\*.* .\src\3rdparty\OpenDDS\bin\ + xcopy .\Output\x86\*.dll .\src\3rdparty\OpenDDS\lib\ + xcopy .\Output\bin32\*.* .\src\3rdparty\OpenDDS\ACE_wrappers\bin\ + xcopy .\Output\x86\*.dll .\src\3rdparty\OpenDDS\ACE_wrappers\lib\ - name: Generate OpenDDS projects shell: cmd run: | - call .\third_party\OpenDDS\setenv.cmd - cd src\DataDistributionManagerOpenDDS + call .\src\3rdparty\OpenDDS\setenv.cmd + cd src\native\DataDistributionManagerOpenDDS perl %ACE_ROOT%\bin\generate_export_file.pl DataDistributionSchemaCommon > DataDistributionSchemaCommon_Export.h perl %ACE_ROOT%\bin\mwc.pl -type vs2022 DataDistributionManagerOpenDDS.mwc - cd ..\.. + cd ..\..\.. - uses: nuget/setup-nuget@v2.0.0 with: @@ -260,7 +259,7 @@ jobs: - name: Build DataDistributionManager x64 shell: cmd run: | - call .\third_party\OpenDDS\setenv.cmd + call .\src\3rdparty\OpenDDS\setenv.cmd set JDK_ROOT_FOLDER=%JAVA_HOME_11_X64% cd src msbuild /m -p:Configuration=Release,Platform=x64 DataDistributionManager.sln @@ -268,16 +267,16 @@ jobs: - name: Build DataDistributionManager x86 shell: cmd run: | - call .\third_party\OpenDDS\setenv.cmd + call .\src\3rdparty\OpenDDS\setenv.cmd set JDK_ROOT_FOLDER=%JAVA_HOME_11_X64% cd src msbuild /m -p:Configuration=Release,Platform=Win32 DataDistributionManager.sln - - name: Build DataDistributionManager net462, net6.0 and net7.0 + - name: Build DataDistributionManager net462, net6.0 and net8.0 run: | - dotnet build --no-incremental --configuration Release --framework net462 -o Output src\DataDistributionManagerNet\DataDistributionManagerNet.csproj - dotnet build --no-incremental --configuration Release --framework net6.0 -o Outputnet6.0 src\DataDistributionManagerNet\DataDistributionManagerNet.csproj - dotnet build --no-incremental --configuration Release --framework net7.0 -o Outputnet7.0 src\DataDistributionManagerNet\DataDistributionManagerNet.csproj + dotnet build --no-incremental --configuration Release --framework net462 -o Output src\net\DataDistributionManagerNet\DataDistributionManagerNet.csproj + dotnet build --no-incremental --configuration Release --framework net6.0 -o Outputnet6.0 src\net\DataDistributionManagerNet\DataDistributionManagerNet.csproj + dotnet build --no-incremental --configuration Release --framework net8.0 -o Outputnet8.0 src\net\DataDistributionManagerNet\DataDistributionManagerNet.csproj - name: Prepare for packaging run: | @@ -293,10 +292,10 @@ jobs: New-Item -Path .\OutputPackage\pdb\x64 -ItemType directory New-Item -Path .\OutputPackage\include -ItemType directory New-Item -Path .\OutputPackage\licenses -ItemType directory - Copy-Item .\src\DataDistributionManager\DataDistributionManagerEnums.h .\OutputPackage\include\DataDistributionManagerEnums.h - Copy-Item .\src\DataDistributionManager\DataDistributionManagerTypes.h .\OutputPackage\include\DataDistributionManagerTypes.h - Copy-Item .\src\DataDistributionManager\DataDistributionManager.h .\OutputPackage\include\DataDistributionManager.h - Copy-Item .\src\DataDistributionManager\SmartDataDistributionManager.h .\OutputPackage\include\SmartDataDistributionManager.h + Copy-Item .\src\native\DataDistributionManager\DataDistributionManagerEnums.h .\OutputPackage\include\DataDistributionManagerEnums.h + Copy-Item .\src\native\DataDistributionManager\DataDistributionManagerTypes.h .\OutputPackage\include\DataDistributionManagerTypes.h + Copy-Item .\src\native\DataDistributionManager\DataDistributionManager.h .\OutputPackage\include\DataDistributionManager.h + Copy-Item .\src\native\DataDistributionManager\SmartDataDistributionManager.h .\OutputPackage\include\SmartDataDistributionManager.h Copy-Item .\Output\x86\DataDistributionManager.lib .\OutputPackage\lib\x86\DataDistributionManager.lib -Force Copy-Item .\Output\x64\DataDistributionManager.lib .\OutputPackage\lib\x64\DataDistributionManager.lib -Force Copy-Item .\Output\*.dll .\OutputPackage\runtime\ -Force @@ -313,8 +312,8 @@ jobs: Copy-Item .\Output\x64\*.pdb .\OutputPackage\pdb\x64\ -Force Copy-Item .\Output\pdb64\*.pdb .\OutputPackage\pdb\x64\ -Force Copy-Item .\LICENSE .\OutputPackage\licenses\LICENSE.datadistributionmanager -Force - Copy-Item .\src\packages\librdkafka.redist.2.2.0\LICENSES.txt .\OutputPackage\licenses\LICENSE.librdkafka -Force - Copy-Item .\third_party\OpenDDS\LICENSE .\OutputPackage\licenses\LICENSE.opendds -Force + Copy-Item .\src\packages\librdkafka.redist.2.5.3\LICENSES.txt .\OutputPackage\licenses\LICENSE.librdkafka -Force + Copy-Item .\src\3rdparty\OpenDDS\LICENSE .\OutputPackage\licenses\LICENSE.opendds -Force Compress-Archive -Path .\OutputPackage\* -DestinationPath .\OutputPackage\DataDistributionManager.zip - name: Prepare for Java packaging @@ -339,7 +338,7 @@ jobs: - name: Publish to Apache Maven Central shell: bash - run: mvn --file ./packaging/maven/pom.xml --no-transfer-progress --batch-mode -Dgpg.passphrase=${{ secrets.MAVEN_GPG_PASSPHRASE }} deploy + run: mvn --file ./src/packaging/maven/pom.xml --no-transfer-progress --batch-mode -Dgpg.passphrase=${{ secrets.MAVEN_GPG_PASSPHRASE }} deploy env: MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }} @@ -348,7 +347,7 @@ jobs: - name: Build Java Binder shell: cmd run: | - cd src\DataDistributionManagerJava + cd src\jvm set JDK_ROOT_FOLDER=%JAVA_HOME_11_X64% CreateJar.bat cd ..\.. @@ -359,7 +358,7 @@ jobs: - uses: nuget/setup-nuget@v2.0.0 with: nuget-version: '5.x' - - run: nuget pack packaging\nuget\datadistributionmanager.nuspec + - run: nuget pack .\src\packaging\nuget\datadistributionmanager.nuspec - name: Upload DataDistributionManager NuGet to release uses: svenstaro/upload-release-action@v2 diff --git a/.gitmodules b/.gitmodules index 46e133dc..9dcdabc5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ -[submodule "third_party/OpenDDS"] - path = third_party/OpenDDS +[submodule "OpenDDS"] + path = src/3rdparty/OpenDDS url = https://github.com/objectcomputing/OpenDDS.git -[submodule "third_party/CommonTools"] - path = third_party/CommonTools +[submodule "CommonTools"] + path = src/3rdparty/CommonTools url = https://github.com/masesgroup/CommonTools.git diff --git a/README.md b/README.md index 91e977d1..45fc1706 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,45 @@ # Data Distribution Manager -[![CI_BUILD](https://github.com/masesgroup/DataDistributionManager/actions/workflows/build.yaml/badge.svg)](https://github.com/masesgroup/DataDistributionManager/actions/workflows/build.yaml) [![CI_RELEASE](https://github.com/masesgroup/DataDistributionManager/actions/workflows/release.yaml/badge.svg)](https://github.com/masesgroup/DataDistributionManager/actions/workflows/release.yaml) +A reliable subsystem able to distribute data across multiple datacenters using multiple technologies. +It is the core of [Sinapse](https://www.sinapsesystem.com) High Avalailablity, now we made it available for everyone. + +Current implementation can use [Apache Kafka](https://kafka.apache.org/) or [OpenDDS](https://opendds.org/) as back-end. + +### Libraries and Tools |Maven | Nuget | |--- |--- | |[![Maven Central](https://img.shields.io/maven-central/v/com.masesgroup/datadistributionmanager.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.masesgroup%22%20AND%20a:%22datadistributionmanager%22)| [![latest version](https://img.shields.io/nuget/v/MASES.DataDistributionManager)](https://www.nuget.org/packages/MASES.DataDistributionManager) [![downloads](https://img.shields.io/nuget/dt/MASES.DataDistributionManager)](https://www.nuget.org/packages/MASES.DataDistributionManager)| -A reliable subsystem able to distribute data across multiple datacenters using multiple technologies. -It is the core of [Sinapse](https://www.sinapsesystem.com) High Avalailablity, now we made it available for everyone. +### Pipelines -This project adheres to the Contributor [Covenant code of conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to coc_reporting@masesgroup.com. +[![CI_BUILD](https://github.com/masesgroup/DataDistributionManager/actions/workflows/build.yaml/badge.svg)](https://github.com/masesgroup/DataDistributionManager/actions/workflows/build.yaml) [![CI_RELEASE](https://github.com/masesgroup/DataDistributionManager/actions/workflows/release.yaml/badge.svg)](https://github.com/masesgroup/DataDistributionManager/actions/workflows/release.yaml) + +### Project disclaimer -Actual implementation can use [Apache Kafka](https://kafka.apache.org/) or [OpenDDS](https://opendds.org/) as back-end. +Data Distribution Manager is a project, curated by MASES Group, can be supported by the open-source community. + +Its primary scope is to support other, public or internal, MASES Group projects: open-source community and commercial entities can use it for their needs and support this project, moreover there are dedicated community and commercial subscription plans. + +The repository code and releases may contain bugs, the release cycle depends from critical discovered issues and/or enhancement requested from this or other projects. + +Looking for the help of Apache Kafka, OpenDDS experts? MASES Group can help you design, build, deploy, and manage this kind of applications. + +--- ## Scope of the project This project aims to create a library set, exposing a simple interface, to manage data distribution across multiple processes over multiple datacenters. +### Community and Contribution + +Do you want to help us? +- put a :star: on this project +- open [issues](https://github.com/masesgroup/DataDistributionManager/issues) to request features or report bugs :bug: +- improves the project with Pull Requests + +This project adheres to the Contributor [Covenant code of conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to coc_reporting@masesgroup.com. + --- ## Summary diff --git a/src/3rdparty/CommonTools b/src/3rdparty/CommonTools new file mode 160000 index 00000000..54bb0a4e --- /dev/null +++ b/src/3rdparty/CommonTools @@ -0,0 +1 @@ +Subproject commit 54bb0a4e6eef23976b984ae222046076eb56f0ba diff --git a/src/3rdparty/OpenDDS b/src/3rdparty/OpenDDS new file mode 160000 index 00000000..53414662 --- /dev/null +++ b/src/3rdparty/OpenDDS @@ -0,0 +1 @@ +Subproject commit 53414662d60f5e222aad9ca4383da0d856a577df diff --git a/src/DataDistributionManager.sln b/src/DataDistributionManager.sln index 9a118197..2f900076 100644 --- a/src/DataDistributionManager.sln +++ b/src/DataDistributionManager.sln @@ -5,26 +5,26 @@ VisualStudioVersion = 17.6.33723.286 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{AA70DB07-B2B0-4304-9EF8-2391CC0FA0B0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DataDistributionManager", "DataDistributionManager\DataDistributionManager.vcxproj", "{8F228993-29BF-4DAD-95AB-A553C1C23EF0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DataDistributionManager", "native\DataDistributionManager\DataDistributionManager.vcxproj", "{8F228993-29BF-4DAD-95AB-A553C1C23EF0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DataDistributionManagerKafka", "DataDistributionManagerKafka\DataDistributionManagerKafka.vcxproj", "{83C34AD7-B6C6-41FE-986F-BFB7E4773689}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DataDistributionManagerKafka", "native\DataDistributionManagerKafka\DataDistributionManagerKafka.vcxproj", "{83C34AD7-B6C6-41FE-986F-BFB7E4773689}" ProjectSection(ProjectDependencies) = postProject {8F228993-29BF-4DAD-95AB-A553C1C23EF0} = {8F228993-29BF-4DAD-95AB-A553C1C23EF0} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DataDistributionMastershipManager", "DataDistributionMastershipManager\DataDistributionMastershipManager.vcxproj", "{B885E87A-AC84-4EE6-8486-9BA16B465CB3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DataDistributionMastershipManager", "native\DataDistributionMastershipManager\DataDistributionMastershipManager.vcxproj", "{B885E87A-AC84-4EE6-8486-9BA16B465CB3}" ProjectSection(ProjectDependencies) = postProject {8F228993-29BF-4DAD-95AB-A553C1C23EF0} = {8F228993-29BF-4DAD-95AB-A553C1C23EF0} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DataDistributionManagerOpenDDS_Common", "DataDistributionManagerOpenDDS\DataDistributionManagerOpenDDS_Common.vcxproj", "{40B63857-FECA-1BAD-5002-3FDE0000002E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DataDistributionManagerOpenDDS_Common", "native\DataDistributionManagerOpenDDS\DataDistributionManagerOpenDDS_Common.vcxproj", "{40B63857-FECA-1BAD-5002-3FDE0000002E}" ProjectSection(ProjectDependencies) = postProject {8F228993-29BF-4DAD-95AB-A553C1C23EF0} = {8F228993-29BF-4DAD-95AB-A553C1C23EF0} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Binders", "Binders", "{5625263C-E307-4AA5-9747-E008CA6DA579}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataDistributionManagerNet", "DataDistributionManagerNet\DataDistributionManagerNet.csproj", "{0C767E4D-8A2D-402D-AABF-59B04DD9260C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataDistributionManagerNet", "net\DataDistributionManagerNet\DataDistributionManagerNet.csproj", "{03CA4379-2B3B-4D62-9239-BDB12819F2E0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -130,30 +130,30 @@ Global {40B63857-FECA-1BAD-5002-3FDE0000002E}.Unicode Release|Win32.Build.0 = Release|Win32 {40B63857-FECA-1BAD-5002-3FDE0000002E}.Unicode Release|x64.ActiveCfg = Release|x64 {40B63857-FECA-1BAD-5002-3FDE0000002E}.Unicode Release|x64.Build.0 = Release|x64 - {0C767E4D-8A2D-402D-AABF-59B04DD9260C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C767E4D-8A2D-402D-AABF-59B04DD9260C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C767E4D-8A2D-402D-AABF-59B04DD9260C}.Debug|Win32.ActiveCfg = Debug|Any CPU - {0C767E4D-8A2D-402D-AABF-59B04DD9260C}.Debug|Win32.Build.0 = Debug|Any CPU - {0C767E4D-8A2D-402D-AABF-59B04DD9260C}.Debug|x64.ActiveCfg = Debug|Any CPU - {0C767E4D-8A2D-402D-AABF-59B04DD9260C}.Debug|x64.Build.0 = Debug|Any CPU - {0C767E4D-8A2D-402D-AABF-59B04DD9260C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C767E4D-8A2D-402D-AABF-59B04DD9260C}.Release|Any CPU.Build.0 = Release|Any CPU - {0C767E4D-8A2D-402D-AABF-59B04DD9260C}.Release|Win32.ActiveCfg = Release|Any CPU - {0C767E4D-8A2D-402D-AABF-59B04DD9260C}.Release|Win32.Build.0 = Release|Any CPU - {0C767E4D-8A2D-402D-AABF-59B04DD9260C}.Release|x64.ActiveCfg = Release|Any CPU - {0C767E4D-8A2D-402D-AABF-59B04DD9260C}.Release|x64.Build.0 = Release|Any CPU - {0C767E4D-8A2D-402D-AABF-59B04DD9260C}.Unicode Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C767E4D-8A2D-402D-AABF-59B04DD9260C}.Unicode Debug|Any CPU.Build.0 = Debug|Any CPU - {0C767E4D-8A2D-402D-AABF-59B04DD9260C}.Unicode Debug|Win32.ActiveCfg = Debug|Any CPU - {0C767E4D-8A2D-402D-AABF-59B04DD9260C}.Unicode Debug|Win32.Build.0 = Debug|Any CPU - {0C767E4D-8A2D-402D-AABF-59B04DD9260C}.Unicode Debug|x64.ActiveCfg = Debug|Any CPU - {0C767E4D-8A2D-402D-AABF-59B04DD9260C}.Unicode Debug|x64.Build.0 = Debug|Any CPU - {0C767E4D-8A2D-402D-AABF-59B04DD9260C}.Unicode Release|Any CPU.ActiveCfg = Release|Any CPU - {0C767E4D-8A2D-402D-AABF-59B04DD9260C}.Unicode Release|Any CPU.Build.0 = Release|Any CPU - {0C767E4D-8A2D-402D-AABF-59B04DD9260C}.Unicode Release|Win32.ActiveCfg = Release|Any CPU - {0C767E4D-8A2D-402D-AABF-59B04DD9260C}.Unicode Release|Win32.Build.0 = Release|Any CPU - {0C767E4D-8A2D-402D-AABF-59B04DD9260C}.Unicode Release|x64.ActiveCfg = Release|Any CPU - {0C767E4D-8A2D-402D-AABF-59B04DD9260C}.Unicode Release|x64.Build.0 = Release|Any CPU + {03CA4379-2B3B-4D62-9239-BDB12819F2E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {03CA4379-2B3B-4D62-9239-BDB12819F2E0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {03CA4379-2B3B-4D62-9239-BDB12819F2E0}.Debug|Win32.ActiveCfg = Debug|Any CPU + {03CA4379-2B3B-4D62-9239-BDB12819F2E0}.Debug|Win32.Build.0 = Debug|Any CPU + {03CA4379-2B3B-4D62-9239-BDB12819F2E0}.Debug|x64.ActiveCfg = Debug|Any CPU + {03CA4379-2B3B-4D62-9239-BDB12819F2E0}.Debug|x64.Build.0 = Debug|Any CPU + {03CA4379-2B3B-4D62-9239-BDB12819F2E0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {03CA4379-2B3B-4D62-9239-BDB12819F2E0}.Release|Any CPU.Build.0 = Release|Any CPU + {03CA4379-2B3B-4D62-9239-BDB12819F2E0}.Release|Win32.ActiveCfg = Release|Any CPU + {03CA4379-2B3B-4D62-9239-BDB12819F2E0}.Release|Win32.Build.0 = Release|Any CPU + {03CA4379-2B3B-4D62-9239-BDB12819F2E0}.Release|x64.ActiveCfg = Release|Any CPU + {03CA4379-2B3B-4D62-9239-BDB12819F2E0}.Release|x64.Build.0 = Release|Any CPU + {03CA4379-2B3B-4D62-9239-BDB12819F2E0}.Unicode Debug|Any CPU.ActiveCfg = Debug|Any CPU + {03CA4379-2B3B-4D62-9239-BDB12819F2E0}.Unicode Debug|Any CPU.Build.0 = Debug|Any CPU + {03CA4379-2B3B-4D62-9239-BDB12819F2E0}.Unicode Debug|Win32.ActiveCfg = Debug|Any CPU + {03CA4379-2B3B-4D62-9239-BDB12819F2E0}.Unicode Debug|Win32.Build.0 = Debug|Any CPU + {03CA4379-2B3B-4D62-9239-BDB12819F2E0}.Unicode Debug|x64.ActiveCfg = Debug|Any CPU + {03CA4379-2B3B-4D62-9239-BDB12819F2E0}.Unicode Debug|x64.Build.0 = Debug|Any CPU + {03CA4379-2B3B-4D62-9239-BDB12819F2E0}.Unicode Release|Any CPU.ActiveCfg = Release|Any CPU + {03CA4379-2B3B-4D62-9239-BDB12819F2E0}.Unicode Release|Any CPU.Build.0 = Release|Any CPU + {03CA4379-2B3B-4D62-9239-BDB12819F2E0}.Unicode Release|Win32.ActiveCfg = Release|Any CPU + {03CA4379-2B3B-4D62-9239-BDB12819F2E0}.Unicode Release|Win32.Build.0 = Release|Any CPU + {03CA4379-2B3B-4D62-9239-BDB12819F2E0}.Unicode Release|x64.ActiveCfg = Release|Any CPU + {03CA4379-2B3B-4D62-9239-BDB12819F2E0}.Unicode Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -163,7 +163,7 @@ Global {83C34AD7-B6C6-41FE-986F-BFB7E4773689} = {AA70DB07-B2B0-4304-9EF8-2391CC0FA0B0} {B885E87A-AC84-4EE6-8486-9BA16B465CB3} = {AA70DB07-B2B0-4304-9EF8-2391CC0FA0B0} {40B63857-FECA-1BAD-5002-3FDE0000002E} = {AA70DB07-B2B0-4304-9EF8-2391CC0FA0B0} - {0C767E4D-8A2D-402D-AABF-59B04DD9260C} = {5625263C-E307-4AA5-9747-E008CA6DA579} + {03CA4379-2B3B-4D62-9239-BDB12819F2E0} = {5625263C-E307-4AA5-9747-E008CA6DA579} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A246ADC8-3843-4C70-B468-B650A5CADD33} diff --git a/src/Configuration/KafkaManager.conf b/src/configuration/KafkaManager.conf similarity index 100% rename from src/Configuration/KafkaManager.conf rename to src/configuration/KafkaManager.conf diff --git a/src/Configuration/OpenDDSManager.conf b/src/configuration/OpenDDSManager.conf similarity index 100% rename from src/Configuration/OpenDDSManager.conf rename to src/configuration/OpenDDSManager.conf diff --git a/src/Configuration/README.md b/src/configuration/README.md similarity index 100% rename from src/Configuration/README.md rename to src/configuration/README.md diff --git a/src/Configuration/dds_tcp_conf.ini b/src/configuration/dds_tcp_conf.ini similarity index 100% rename from src/Configuration/dds_tcp_conf.ini rename to src/configuration/dds_tcp_conf.ini diff --git a/src/Configuration/dds_udp_conf.ini b/src/configuration/dds_udp_conf.ini similarity index 100% rename from src/Configuration/dds_udp_conf.ini rename to src/configuration/dds_udp_conf.ini diff --git a/src/Documentation/.gitignore b/src/documentation/.gitignore similarity index 100% rename from src/Documentation/.gitignore rename to src/documentation/.gitignore diff --git a/src/Documentation/Doxyfile b/src/documentation/Doxyfile similarity index 100% rename from src/Documentation/Doxyfile rename to src/documentation/Doxyfile diff --git a/src/Documentation/api/.gitignore b/src/documentation/api/.gitignore similarity index 100% rename from src/Documentation/api/.gitignore rename to src/documentation/api/.gitignore diff --git a/src/Documentation/api/index.md b/src/documentation/api/index.md similarity index 100% rename from src/Documentation/api/index.md rename to src/documentation/api/index.md diff --git a/src/Documentation/apidoc/.gitignore b/src/documentation/apidoc/.gitignore similarity index 100% rename from src/Documentation/apidoc/.gitignore rename to src/documentation/apidoc/.gitignore diff --git a/src/Documentation/articles/actual_state.md b/src/documentation/articles/actual_state.md similarity index 83% rename from src/Documentation/articles/actual_state.md rename to src/documentation/articles/actual_state.md index 2233aaa0..7a7c9197 100644 --- a/src/Documentation/articles/actual_state.md +++ b/src/documentation/articles/actual_state.md @@ -1,3 +1,8 @@ +--- +title: Current development state of Data Distribution Manager +_description: Describes current development state of Data Distribution Manager +--- + # Development Status * The project supports, at this stage of implementation, these communication subsystems: diff --git a/src/Documentation/articles/ddmchat.md b/src/documentation/articles/ddmchat.md similarity index 65% rename from src/Documentation/articles/ddmchat.md rename to src/documentation/articles/ddmchat.md index 89476fba..a8ec81ae 100644 --- a/src/Documentation/articles/ddmchat.md +++ b/src/documentation/articles/ddmchat.md @@ -1,3 +1,8 @@ +--- +title: Reference to DDM Chat based on Data Distribution Manager +_description: Describes DDM Chat based on Data Distribution Manager +--- + # DDMChat - DataDistributionManager Kafka and OpenDDS chat An encrypted, BBS like, chat based on [DataDistributionManager](https://github.com/masesgroup/DataDistributionManager) project. For more information see [DDMChat](https://masesgroup.github.io/DDMChat/) diff --git a/src/Documentation/articles/examples.md b/src/documentation/articles/examples.md similarity index 94% rename from src/Documentation/articles/examples.md rename to src/documentation/articles/examples.md index 4184065e..4dea6e0c 100644 --- a/src/Documentation/articles/examples.md +++ b/src/documentation/articles/examples.md @@ -1,3 +1,8 @@ +--- +title: Examples of Data Distribution Manager +_description: Describes some example usage of Data Distribution Manager +--- + # DataDistributionManager example > diff --git a/src/Documentation/articles/intro.md b/src/documentation/articles/intro.md similarity index 85% rename from src/Documentation/articles/intro.md rename to src/documentation/articles/intro.md index efed03ba..c8707a69 100644 --- a/src/Documentation/articles/intro.md +++ b/src/documentation/articles/intro.md @@ -1,3 +1,8 @@ +--- +title: Intro on Data Distribution Manager +_description: Describes and introduces Data Distribution Manager +--- + # Welcome to **Data Distribution Manager** A reliable subsystem to distribute data across datacenters using multiple technologies in a transparent manner. diff --git a/src/Documentation/articles/legacy_application_revamp.md b/src/documentation/articles/legacy_application_revamp.md similarity index 96% rename from src/Documentation/articles/legacy_application_revamp.md rename to src/documentation/articles/legacy_application_revamp.md index 89906d78..7700a80d 100644 --- a/src/Documentation/articles/legacy_application_revamp.md +++ b/src/documentation/articles/legacy_application_revamp.md @@ -1,3 +1,8 @@ +--- +title: Legacy COM Application revamping based on Data Distribution Manager +_description: Describes how revamp Legacy COM Application using Data Distribution Manager +--- + # Legacy COM Application revamping For many years Microsoft based its products on COM (Component Object Model) and its network extension DCOM (Distributed COM). Many customer built their infrastructure and products over COM technology. diff --git a/src/Documentation/articles/manual_build.md b/src/documentation/articles/manual_build.md similarity index 95% rename from src/Documentation/articles/manual_build.md rename to src/documentation/articles/manual_build.md index 8de221c0..03e2898b 100644 --- a/src/Documentation/articles/manual_build.md +++ b/src/documentation/articles/manual_build.md @@ -1,3 +1,8 @@ +--- +title: Manual build of Data Distribution Manager +_description: Describes how manually build Data Distribution Manager +--- + # How to build Build the DataDistributionManager is often not needed as the users can use the released Jar files and/or NuGet packages. Anyway the following steps are needed to build Data Distribution Manager manually: diff --git a/src/Documentation/articles/sinapse.md b/src/documentation/articles/sinapse.md similarity index 95% rename from src/Documentation/articles/sinapse.md rename to src/documentation/articles/sinapse.md index 1ad7f3b3..c063d41d 100644 --- a/src/Documentation/articles/sinapse.md +++ b/src/documentation/articles/sinapse.md @@ -1,3 +1,8 @@ +--- +title: Sinapse distributed is based on Data Distribution Manager +_description: Describes how Sinapse distributed is based on Data Distribution Manager +--- + # Sinapse platform: the definitive solution for Agile development We use **Data Distribution Manager** as the core of [Sinapse](https://www.sinapsesystem.com) High Avalailablity. diff --git a/src/Documentation/articles/toc.yml b/src/documentation/articles/toc.yml similarity index 100% rename from src/Documentation/articles/toc.yml rename to src/documentation/articles/toc.yml diff --git a/src/Documentation/articles/usage.md b/src/documentation/articles/usage.md similarity index 69% rename from src/Documentation/articles/usage.md rename to src/documentation/articles/usage.md index 8057f4c7..e99d4c28 100644 --- a/src/Documentation/articles/usage.md +++ b/src/documentation/articles/usage.md @@ -1,3 +1,8 @@ +--- +title: Usage of Data Distribution Manager +_description: Describes the usage of Data Distribution Manager +--- + # **Data Distribution Manager** usages Some examples of usages made with **Data Distribution Manager** are in the following articles: diff --git a/src/Documentation/cpp_footer.html b/src/documentation/cpp_footer.html similarity index 100% rename from src/Documentation/cpp_footer.html rename to src/documentation/cpp_footer.html diff --git a/src/Documentation/cpp_header.html b/src/documentation/cpp_header.html similarity index 100% rename from src/Documentation/cpp_header.html rename to src/documentation/cpp_header.html diff --git a/src/Documentation/cpp_stylesheet.css b/src/documentation/cpp_stylesheet.css similarity index 100% rename from src/Documentation/cpp_stylesheet.css rename to src/documentation/cpp_stylesheet.css diff --git a/src/Documentation/cppdoc/.gitignore b/src/documentation/cppdoc/.gitignore similarity index 100% rename from src/Documentation/cppdoc/.gitignore rename to src/documentation/cppdoc/.gitignore diff --git a/src/Documentation/cppdoc/root.md b/src/documentation/cppdoc/root.md similarity index 100% rename from src/Documentation/cppdoc/root.md rename to src/documentation/cppdoc/root.md diff --git a/src/Documentation/docfx.json b/src/documentation/docfx.json similarity index 96% rename from src/Documentation/docfx.json rename to src/documentation/docfx.json index dfb054c9..11caaf6c 100644 --- a/src/Documentation/docfx.json +++ b/src/documentation/docfx.json @@ -70,7 +70,7 @@ "_appLogoPath": "images/logo.png", "_appFaviconPath": "images/favicon.ico", "_appTitle": "MASES Group website - Data Distribution Manager", - "_appFooter": "
Copyright © 2023 MASES s.r.l.. | Via San Cesidio 16 - San Valentino in A.C. - PE | P.I. 01932310681
", + "_appFooter": "
Copyright © 2024 MASES s.r.l.. | Via San Cesidio 16 - San Valentino in A.C. - PE | P.I. 01932310681
", "_gitContribute": { } diff --git a/src/Documentation/images/COM_Cloud.png b/src/documentation/images/COM_Cloud.png similarity index 100% rename from src/Documentation/images/COM_Cloud.png rename to src/documentation/images/COM_Cloud.png diff --git a/src/Documentation/images/DCOM_evoluted.png b/src/documentation/images/DCOM_evoluted.png similarity index 100% rename from src/Documentation/images/DCOM_evoluted.png rename to src/documentation/images/DCOM_evoluted.png diff --git a/src/Documentation/images/DCOMarchitect.png b/src/documentation/images/DCOMarchitect.png similarity index 100% rename from src/Documentation/images/DCOMarchitect.png rename to src/documentation/images/DCOMarchitect.png diff --git a/src/Documentation/images/favicon.ico b/src/documentation/images/favicon.ico similarity index 100% rename from src/Documentation/images/favicon.ico rename to src/documentation/images/favicon.ico diff --git a/src/Documentation/images/logo.png b/src/documentation/images/logo.png similarity index 100% rename from src/Documentation/images/logo.png rename to src/documentation/images/logo.png diff --git a/src/Documentation/images/message_overview.png b/src/documentation/images/message_overview.png similarity index 100% rename from src/Documentation/images/message_overview.png rename to src/documentation/images/message_overview.png diff --git a/src/Documentation/images/module_engine.png b/src/documentation/images/module_engine.png similarity index 100% rename from src/Documentation/images/module_engine.png rename to src/documentation/images/module_engine.png diff --git a/src/Documentation/images/sinapse_ft_lb.png b/src/documentation/images/sinapse_ft_lb.png similarity index 100% rename from src/Documentation/images/sinapse_ft_lb.png rename to src/documentation/images/sinapse_ft_lb.png diff --git a/src/Documentation/images/sinapse_multiple_workflow.png b/src/documentation/images/sinapse_multiple_workflow.png similarity index 100% rename from src/Documentation/images/sinapse_multiple_workflow.png rename to src/documentation/images/sinapse_multiple_workflow.png diff --git a/src/Documentation/images/sinapse_overview.png b/src/documentation/images/sinapse_overview.png similarity index 100% rename from src/Documentation/images/sinapse_overview.png rename to src/documentation/images/sinapse_overview.png diff --git a/src/Documentation/images/sinapse_sidebyside.png b/src/documentation/images/sinapse_sidebyside.png similarity index 100% rename from src/Documentation/images/sinapse_sidebyside.png rename to src/documentation/images/sinapse_sidebyside.png diff --git a/src/Documentation/images/sinapse_workflow.png b/src/documentation/images/sinapse_workflow.png similarity index 100% rename from src/Documentation/images/sinapse_workflow.png rename to src/documentation/images/sinapse_workflow.png diff --git a/src/Documentation/index.md b/src/documentation/index.md similarity index 90% rename from src/Documentation/index.md rename to src/documentation/index.md index 2394c52b..9db816c5 100644 --- a/src/Documentation/index.md +++ b/src/documentation/index.md @@ -1,3 +1,8 @@ +--- +title: Main page of Data Distribution Manager +_description: Describes Data Distribution Manager +--- + # Welcome to **Data Distribution Manager** A reliable subsystem able to distribute data across multiple datacenters using multiple technologies. diff --git a/src/Documentation/javadoc/.gitignore b/src/documentation/javadoc/.gitignore similarity index 100% rename from src/Documentation/javadoc/.gitignore rename to src/documentation/javadoc/.gitignore diff --git a/src/Documentation/javadoc/root.md b/src/documentation/javadoc/root.md similarity index 100% rename from src/Documentation/javadoc/root.md rename to src/documentation/javadoc/root.md diff --git a/src/Documentation/toc.yml b/src/documentation/toc.yml similarity index 100% rename from src/Documentation/toc.yml rename to src/documentation/toc.yml diff --git a/jni/README.md b/src/jni/README.md similarity index 100% rename from jni/README.md rename to src/jni/README.md diff --git a/jni/include/jawt.h b/src/jni/include/jawt.h similarity index 100% rename from jni/include/jawt.h rename to src/jni/include/jawt.h diff --git a/jni/include/jni.h b/src/jni/include/jni.h similarity index 100% rename from jni/include/jni.h rename to src/jni/include/jni.h diff --git a/jni/include/unix/jni_md.h b/src/jni/include/unix/jni_md.h similarity index 100% rename from jni/include/unix/jni_md.h rename to src/jni/include/unix/jni_md.h diff --git a/jni/include/win32/jawt_md.h b/src/jni/include/win32/jawt_md.h similarity index 100% rename from jni/include/win32/jawt_md.h rename to src/jni/include/win32/jawt_md.h diff --git a/jni/include/win32/jni_md.h b/src/jni/include/win32/jni_md.h similarity index 100% rename from jni/include/win32/jni_md.h rename to src/jni/include/win32/jni_md.h diff --git a/src/DataDistributionManagerJava/.classpath b/src/jvm/.classpath similarity index 100% rename from src/DataDistributionManagerJava/.classpath rename to src/jvm/.classpath diff --git a/src/DataDistributionManagerJava/.gitignore b/src/jvm/.gitignore similarity index 100% rename from src/DataDistributionManagerJava/.gitignore rename to src/jvm/.gitignore diff --git a/src/DataDistributionManagerJava/.project b/src/jvm/.project similarity index 100% rename from src/DataDistributionManagerJava/.project rename to src/jvm/.project diff --git a/src/DataDistributionManagerJava/Compile.bat b/src/jvm/Compile.bat similarity index 100% rename from src/DataDistributionManagerJava/Compile.bat rename to src/jvm/Compile.bat diff --git a/src/DataDistributionManagerJava/CreateJar.bat b/src/jvm/CreateJar.bat similarity index 100% rename from src/DataDistributionManagerJava/CreateJar.bat rename to src/jvm/CreateJar.bat diff --git a/src/DataDistributionManagerJava/DataDistributionManagerJava.iml b/src/jvm/DataDistributionManagerJava.iml similarity index 100% rename from src/DataDistributionManagerJava/DataDistributionManagerJava.iml rename to src/jvm/DataDistributionManagerJava.iml diff --git a/src/DataDistributionManagerJava/README.md b/src/jvm/README.md similarity index 100% rename from src/DataDistributionManagerJava/README.md rename to src/jvm/README.md diff --git a/src/DataDistributionManagerJava/datadistributionmanagerManifest.txt b/src/jvm/datadistributionmanagerManifest.txt similarity index 100% rename from src/DataDistributionManagerJava/datadistributionmanagerManifest.txt rename to src/jvm/datadistributionmanagerManifest.txt diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/BaseConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/BaseConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/BaseConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/BaseConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/ChangedStateListener.java b/src/jvm/src/org/mases/datadistributionmanager/ChangedStateListener.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/ChangedStateListener.java rename to src/jvm/src/org/mases/datadistributionmanager/ChangedStateListener.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/ChangingStateListener.java b/src/jvm/src/org/mases/datadistributionmanager/ChangingStateListener.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/ChangingStateListener.java rename to src/jvm/src/org/mases/datadistributionmanager/ChangingStateListener.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/ClusterHealthElement.java b/src/jvm/src/org/mases/datadistributionmanager/ClusterHealthElement.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/ClusterHealthElement.java rename to src/jvm/src/org/mases/datadistributionmanager/ClusterHealthElement.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/ClusterStateChangeListener.java b/src/jvm/src/org/mases/datadistributionmanager/ClusterStateChangeListener.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/ClusterStateChangeListener.java rename to src/jvm/src/org/mases/datadistributionmanager/ClusterStateChangeListener.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/CommonConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/CommonConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/CommonConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/CommonConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/CompletelyDisconnectedListener.java b/src/jvm/src/org/mases/datadistributionmanager/CompletelyDisconnectedListener.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/CompletelyDisconnectedListener.java rename to src/jvm/src/org/mases/datadistributionmanager/CompletelyDisconnectedListener.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/ConditionOrErrorListener.java b/src/jvm/src/org/mases/datadistributionmanager/ConditionOrErrorListener.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/ConditionOrErrorListener.java rename to src/jvm/src/org/mases/datadistributionmanager/ConditionOrErrorListener.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/ConfigurationListener.java b/src/jvm/src/org/mases/datadistributionmanager/ConfigurationListener.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/ConfigurationListener.java rename to src/jvm/src/org/mases/datadistributionmanager/ConfigurationListener.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/DDM_CHANNEL_DIRECTION.java b/src/jvm/src/org/mases/datadistributionmanager/DDM_CHANNEL_DIRECTION.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/DDM_CHANNEL_DIRECTION.java rename to src/jvm/src/org/mases/datadistributionmanager/DDM_CHANNEL_DIRECTION.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/DDM_CLUSTEREVENT.java b/src/jvm/src/org/mases/datadistributionmanager/DDM_CLUSTEREVENT.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/DDM_CLUSTEREVENT.java rename to src/jvm/src/org/mases/datadistributionmanager/DDM_CLUSTEREVENT.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/DDM_GENERAL_PARAMETER.java b/src/jvm/src/org/mases/datadistributionmanager/DDM_GENERAL_PARAMETER.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/DDM_GENERAL_PARAMETER.java rename to src/jvm/src/org/mases/datadistributionmanager/DDM_GENERAL_PARAMETER.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/DDM_INSTANCE_STATE.java b/src/jvm/src/org/mases/datadistributionmanager/DDM_INSTANCE_STATE.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/DDM_INSTANCE_STATE.java rename to src/jvm/src/org/mases/datadistributionmanager/DDM_INSTANCE_STATE.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/DDM_LOG_LEVEL.java b/src/jvm/src/org/mases/datadistributionmanager/DDM_LOG_LEVEL.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/DDM_LOG_LEVEL.java rename to src/jvm/src/org/mases/datadistributionmanager/DDM_LOG_LEVEL.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/DDM_SEEKCONTEXT.java b/src/jvm/src/org/mases/datadistributionmanager/DDM_SEEKCONTEXT.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/DDM_SEEKCONTEXT.java rename to src/jvm/src/org/mases/datadistributionmanager/DDM_SEEKCONTEXT.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/DDM_SEEKKIND.java b/src/jvm/src/org/mases/datadistributionmanager/DDM_SEEKKIND.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/DDM_SEEKKIND.java rename to src/jvm/src/org/mases/datadistributionmanager/DDM_SEEKKIND.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/DataAvailableListener.java b/src/jvm/src/org/mases/datadistributionmanager/DataAvailableListener.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/DataAvailableListener.java rename to src/jvm/src/org/mases/datadistributionmanager/DataAvailableListener.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/FirstStateChangeListener.java b/src/jvm/src/org/mases/datadistributionmanager/FirstStateChangeListener.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/FirstStateChangeListener.java rename to src/jvm/src/org/mases/datadistributionmanager/FirstStateChangeListener.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/GlobalConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/GlobalConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/GlobalConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/GlobalConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IChangedStateListener.java b/src/jvm/src/org/mases/datadistributionmanager/IChangedStateListener.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IChangedStateListener.java rename to src/jvm/src/org/mases/datadistributionmanager/IChangedStateListener.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IChangingStateListener.java b/src/jvm/src/org/mases/datadistributionmanager/IChangingStateListener.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IChangingStateListener.java rename to src/jvm/src/org/mases/datadistributionmanager/IChangingStateListener.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IClusterStateChangeListener.java b/src/jvm/src/org/mases/datadistributionmanager/IClusterStateChangeListener.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IClusterStateChangeListener.java rename to src/jvm/src/org/mases/datadistributionmanager/IClusterStateChangeListener.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/ICompletelyDisconnectedListener.java b/src/jvm/src/org/mases/datadistributionmanager/ICompletelyDisconnectedListener.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/ICompletelyDisconnectedListener.java rename to src/jvm/src/org/mases/datadistributionmanager/ICompletelyDisconnectedListener.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IConditionOrErrorListener.java b/src/jvm/src/org/mases/datadistributionmanager/IConditionOrErrorListener.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IConditionOrErrorListener.java rename to src/jvm/src/org/mases/datadistributionmanager/IConditionOrErrorListener.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/IConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/IConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IConfigurationListener.java b/src/jvm/src/org/mases/datadistributionmanager/IConfigurationListener.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IConfigurationListener.java rename to src/jvm/src/org/mases/datadistributionmanager/IConfigurationListener.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IDataAvailableListener.java b/src/jvm/src/org/mases/datadistributionmanager/IDataAvailableListener.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IDataAvailableListener.java rename to src/jvm/src/org/mases/datadistributionmanager/IDataAvailableListener.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IDataDistributionCallbackLow.java b/src/jvm/src/org/mases/datadistributionmanager/IDataDistributionCallbackLow.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IDataDistributionCallbackLow.java rename to src/jvm/src/org/mases/datadistributionmanager/IDataDistributionCallbackLow.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IDataDistributionChannelCallbackLow.java b/src/jvm/src/org/mases/datadistributionmanager/IDataDistributionChannelCallbackLow.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IDataDistributionChannelCallbackLow.java rename to src/jvm/src/org/mases/datadistributionmanager/IDataDistributionChannelCallbackLow.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IDataDistributionMastershipCallbackLow.java b/src/jvm/src/org/mases/datadistributionmanager/IDataDistributionMastershipCallbackLow.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IDataDistributionMastershipCallbackLow.java rename to src/jvm/src/org/mases/datadistributionmanager/IDataDistributionMastershipCallbackLow.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IFirstStateChangeListener.java b/src/jvm/src/org/mases/datadistributionmanager/IFirstStateChangeListener.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IFirstStateChangeListener.java rename to src/jvm/src/org/mases/datadistributionmanager/IFirstStateChangeListener.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/ILoggingListener.java b/src/jvm/src/org/mases/datadistributionmanager/ILoggingListener.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/ILoggingListener.java rename to src/jvm/src/org/mases/datadistributionmanager/ILoggingListener.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IMultiplePrimaryListener.java b/src/jvm/src/org/mases/datadistributionmanager/IMultiplePrimaryListener.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IMultiplePrimaryListener.java rename to src/jvm/src/org/mases/datadistributionmanager/IMultiplePrimaryListener.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IRequestedStateListener.java b/src/jvm/src/org/mases/datadistributionmanager/IRequestedStateListener.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IRequestedStateListener.java rename to src/jvm/src/org/mases/datadistributionmanager/IRequestedStateListener.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/ISmartDataDistribution.java b/src/jvm/src/org/mases/datadistributionmanager/ISmartDataDistribution.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/ISmartDataDistribution.java rename to src/jvm/src/org/mases/datadistributionmanager/ISmartDataDistribution.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/ISmartDataDistributionChannel.java b/src/jvm/src/org/mases/datadistributionmanager/ISmartDataDistributionChannel.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/ISmartDataDistributionChannel.java rename to src/jvm/src/org/mases/datadistributionmanager/ISmartDataDistributionChannel.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/ISmartDataDistributionChannelInfo.java b/src/jvm/src/org/mases/datadistributionmanager/ISmartDataDistributionChannelInfo.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/ISmartDataDistributionChannelInfo.java rename to src/jvm/src/org/mases/datadistributionmanager/ISmartDataDistributionChannelInfo.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/ISmartDataDistributionMastership.java b/src/jvm/src/org/mases/datadistributionmanager/ISmartDataDistributionMastership.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/ISmartDataDistributionMastership.java rename to src/jvm/src/org/mases/datadistributionmanager/ISmartDataDistributionMastership.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IStateChangeListener.java b/src/jvm/src/org/mases/datadistributionmanager/IStateChangeListener.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IStateChangeListener.java rename to src/jvm/src/org/mases/datadistributionmanager/IStateChangeListener.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IStateReadyListener.java b/src/jvm/src/org/mases/datadistributionmanager/IStateReadyListener.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IStateReadyListener.java rename to src/jvm/src/org/mases/datadistributionmanager/IStateReadyListener.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IUnderlyingPointerLow.java b/src/jvm/src/org/mases/datadistributionmanager/IUnderlyingPointerLow.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/IUnderlyingPointerLow.java rename to src/jvm/src/org/mases/datadistributionmanager/IUnderlyingPointerLow.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/LoggingListener.java b/src/jvm/src/org/mases/datadistributionmanager/LoggingListener.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/LoggingListener.java rename to src/jvm/src/org/mases/datadistributionmanager/LoggingListener.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/MultiplePrimaryListener.java b/src/jvm/src/org/mases/datadistributionmanager/MultiplePrimaryListener.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/MultiplePrimaryListener.java rename to src/jvm/src/org/mases/datadistributionmanager/MultiplePrimaryListener.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/NativeCallbackManager.java b/src/jvm/src/org/mases/datadistributionmanager/NativeCallbackManager.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/NativeCallbackManager.java rename to src/jvm/src/org/mases/datadistributionmanager/NativeCallbackManager.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/NativeInterface.java b/src/jvm/src/org/mases/datadistributionmanager/NativeInterface.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/NativeInterface.java rename to src/jvm/src/org/mases/datadistributionmanager/NativeInterface.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/OPERATION_RESULT.java b/src/jvm/src/org/mases/datadistributionmanager/OPERATION_RESULT.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/OPERATION_RESULT.java rename to src/jvm/src/org/mases/datadistributionmanager/OPERATION_RESULT.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/RequestedStateListener.java b/src/jvm/src/org/mases/datadistributionmanager/RequestedStateListener.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/RequestedStateListener.java rename to src/jvm/src/org/mases/datadistributionmanager/RequestedStateListener.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/SmartDataDistribution.java b/src/jvm/src/org/mases/datadistributionmanager/SmartDataDistribution.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/SmartDataDistribution.java rename to src/jvm/src/org/mases/datadistributionmanager/SmartDataDistribution.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/SmartDataDistributionChannel.java b/src/jvm/src/org/mases/datadistributionmanager/SmartDataDistributionChannel.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/SmartDataDistributionChannel.java rename to src/jvm/src/org/mases/datadistributionmanager/SmartDataDistributionChannel.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/SmartDataDistributionMastership.java b/src/jvm/src/org/mases/datadistributionmanager/SmartDataDistributionMastership.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/SmartDataDistributionMastership.java rename to src/jvm/src/org/mases/datadistributionmanager/SmartDataDistributionMastership.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/StateChangeListener.java b/src/jvm/src/org/mases/datadistributionmanager/StateChangeListener.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/StateChangeListener.java rename to src/jvm/src/org/mases/datadistributionmanager/StateChangeListener.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/StateReadyListener.java b/src/jvm/src/org/mases/datadistributionmanager/StateReadyListener.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/StateReadyListener.java rename to src/jvm/src/org/mases/datadistributionmanager/StateReadyListener.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/SynchronizedEventsManager.java b/src/jvm/src/org/mases/datadistributionmanager/SynchronizedEventsManager.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/SynchronizedEventsManager.java rename to src/jvm/src/org/mases/datadistributionmanager/SynchronizedEventsManager.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/UnderlyingEvent.java b/src/jvm/src/org/mases/datadistributionmanager/UnderlyingEvent.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/UnderlyingEvent.java rename to src/jvm/src/org/mases/datadistributionmanager/UnderlyingEvent.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/DataReaderQosConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/DataReaderQosConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/DataReaderQosConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/DataReaderQosConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/DataWriterQosConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/DataWriterQosConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/DataWriterQosConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/DataWriterQosConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/DeadlineQosPolicyConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/DeadlineQosPolicyConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/DeadlineQosPolicyConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/DeadlineQosPolicyConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/DestinationOrderQosPolicyConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/DestinationOrderQosPolicyConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/DestinationOrderQosPolicyConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/DestinationOrderQosPolicyConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/DestinationOrderQosPolicyKind.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/DestinationOrderQosPolicyKind.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/DestinationOrderQosPolicyKind.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/DestinationOrderQosPolicyKind.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/DomainParticipantQosConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/DomainParticipantQosConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/DomainParticipantQosConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/DomainParticipantQosConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/DurabilityQosPolicyConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/DurabilityQosPolicyConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/DurabilityQosPolicyConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/DurabilityQosPolicyConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/DurabilityQosPolicyKind.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/DurabilityQosPolicyKind.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/DurabilityQosPolicyKind.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/DurabilityQosPolicyKind.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/DurabilityServiceQosPolicyConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/DurabilityServiceQosPolicyConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/DurabilityServiceQosPolicyConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/DurabilityServiceQosPolicyConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/EntityFactoryQosPolicyConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/EntityFactoryQosPolicyConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/EntityFactoryQosPolicyConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/EntityFactoryQosPolicyConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/GroupDataQosPolicyConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/GroupDataQosPolicyConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/GroupDataQosPolicyConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/GroupDataQosPolicyConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/HistoryQosPolicyConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/HistoryQosPolicyConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/HistoryQosPolicyConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/HistoryQosPolicyConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/HistoryQosPolicyKind.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/HistoryQosPolicyKind.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/HistoryQosPolicyKind.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/HistoryQosPolicyKind.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/KafkaChannelConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/KafkaChannelConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/KafkaChannelConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/KafkaChannelConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/KafkaConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/KafkaConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/KafkaConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/KafkaConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/LatencyBudgetQosPolicyConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/LatencyBudgetQosPolicyConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/LatencyBudgetQosPolicyConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/LatencyBudgetQosPolicyConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/LifespanQosPolicyConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/LifespanQosPolicyConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/LifespanQosPolicyConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/LifespanQosPolicyConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/LivelinessQosPolicyConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/LivelinessQosPolicyConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/LivelinessQosPolicyConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/LivelinessQosPolicyConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/LivelinessQosPolicyKind.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/LivelinessQosPolicyKind.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/LivelinessQosPolicyKind.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/LivelinessQosPolicyKind.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/MastershipConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/MastershipConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/MastershipConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/MastershipConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/OpenDDSChannelConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/OpenDDSChannelConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/OpenDDSChannelConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/OpenDDSChannelConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/OpenDDSConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/OpenDDSConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/OpenDDSConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/OpenDDSConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/OwnershipQosPolicyConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/OwnershipQosPolicyConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/OwnershipQosPolicyConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/OwnershipQosPolicyConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/OwnershipQosPolicyKind.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/OwnershipQosPolicyKind.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/OwnershipQosPolicyKind.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/OwnershipQosPolicyKind.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/OwnershipStrengthQosPolicyConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/OwnershipStrengthQosPolicyConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/OwnershipStrengthQosPolicyConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/OwnershipStrengthQosPolicyConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/PartitionQosPolicyConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/PartitionQosPolicyConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/PartitionQosPolicyConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/PartitionQosPolicyConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/PresentationQosPolicyAccessScopeKind.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/PresentationQosPolicyAccessScopeKind.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/PresentationQosPolicyAccessScopeKind.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/PresentationQosPolicyAccessScopeKind.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/PresentationQosPolicyConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/PresentationQosPolicyConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/PresentationQosPolicyConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/PresentationQosPolicyConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/PropertyQosPolicyConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/PropertyQosPolicyConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/PropertyQosPolicyConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/PropertyQosPolicyConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/PublisherQosConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/PublisherQosConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/PublisherQosConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/PublisherQosConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/ReaderDataLifecycleQosPolicyConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/ReaderDataLifecycleQosPolicyConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/ReaderDataLifecycleQosPolicyConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/ReaderDataLifecycleQosPolicyConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/ReliabilityQosPolicyConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/ReliabilityQosPolicyConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/ReliabilityQosPolicyConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/ReliabilityQosPolicyConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/ReliabilityQosPolicyKind.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/ReliabilityQosPolicyKind.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/ReliabilityQosPolicyKind.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/ReliabilityQosPolicyKind.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/ResourceLimitsQosPolicyConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/ResourceLimitsQosPolicyConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/ResourceLimitsQosPolicyConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/ResourceLimitsQosPolicyConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/SubscriberQosConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/SubscriberQosConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/SubscriberQosConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/SubscriberQosConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/TimeBasedFilterQosPolicyConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/TimeBasedFilterQosPolicyConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/TimeBasedFilterQosPolicyConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/TimeBasedFilterQosPolicyConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/TopicDataQosPolicyConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/TopicDataQosPolicyConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/TopicDataQosPolicyConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/TopicDataQosPolicyConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/TopicQosConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/TopicQosConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/TopicQosConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/TopicQosConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/TransportPriorityQosPolicyConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/TransportPriorityQosPolicyConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/TransportPriorityQosPolicyConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/TransportPriorityQosPolicyConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/UserDataQosPolicyConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/UserDataQosPolicyConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/UserDataQosPolicyConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/UserDataQosPolicyConfiguration.java diff --git a/src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/WriterDataLifecycleQosPolicyConfiguration.java b/src/jvm/src/org/mases/datadistributionmanager/configuration/WriterDataLifecycleQosPolicyConfiguration.java similarity index 100% rename from src/DataDistributionManagerJava/src/org/mases/datadistributionmanager/configuration/WriterDataLifecycleQosPolicyConfiguration.java rename to src/jvm/src/org/mases/datadistributionmanager/configuration/WriterDataLifecycleQosPolicyConfiguration.java diff --git a/src/DataDistributionManager/DataDistributionManager.cpp b/src/native/DataDistributionManager/DataDistributionManager.cpp similarity index 100% rename from src/DataDistributionManager/DataDistributionManager.cpp rename to src/native/DataDistributionManager/DataDistributionManager.cpp diff --git a/src/DataDistributionManager/DataDistributionManager.def b/src/native/DataDistributionManager/DataDistributionManager.def similarity index 100% rename from src/DataDistributionManager/DataDistributionManager.def rename to src/native/DataDistributionManager/DataDistributionManager.def diff --git a/src/DataDistributionManager/DataDistributionManager.h b/src/native/DataDistributionManager/DataDistributionManager.h similarity index 100% rename from src/DataDistributionManager/DataDistributionManager.h rename to src/native/DataDistributionManager/DataDistributionManager.h diff --git a/src/DataDistributionManager/DataDistributionManager.vcxproj b/src/native/DataDistributionManager/DataDistributionManager.vcxproj similarity index 96% rename from src/DataDistributionManager/DataDistributionManager.vcxproj rename to src/native/DataDistributionManager/DataDistributionManager.vcxproj index bdf033b1..34db7cbf 100644 --- a/src/DataDistributionManager/DataDistributionManager.vcxproj +++ b/src/native/DataDistributionManager/DataDistributionManager.vcxproj @@ -72,24 +72,24 @@ true - ..\..\Output\x86\ + ..\..\..\Output\x86\ x86\ $(ProjectName)d true - ..\..\Output\x64\ + ..\..\..\Output\x64\ x64\ $(ProjectName)d false - ..\..\Output\x86\ + ..\..\..\Output\x86\ x86\ false - ..\..\Output\x64\ + ..\..\..\Output\x64\ x64\ @@ -116,7 +116,7 @@ $(OutDir)..\pdb32\$(TargetName).pdb - ..\ProductInformation + ..\..\ProductInformation @@ -148,7 +148,7 @@ $(OutDir)..\pdb64\$(TargetName).pdb - ..\ProductInformation + ..\..\ProductInformation @@ -184,7 +184,7 @@ $(OutDir)..\pdb32\$(TargetName).pdb - ..\ProductInformation + ..\..\ProductInformation @@ -220,7 +220,7 @@ $(OutDir)..\pdb64\$(TargetName).pdb - ..\ProductInformation + ..\..\ProductInformation diff --git a/src/DataDistributionManager/DataDistributionManager.vcxproj.filters b/src/native/DataDistributionManager/DataDistributionManager.vcxproj.filters similarity index 100% rename from src/DataDistributionManager/DataDistributionManager.vcxproj.filters rename to src/native/DataDistributionManager/DataDistributionManager.vcxproj.filters diff --git a/src/DataDistributionManager/DataDistributionManagerCommon.cpp b/src/native/DataDistributionManager/DataDistributionManagerCommon.cpp similarity index 100% rename from src/DataDistributionManager/DataDistributionManagerCommon.cpp rename to src/native/DataDistributionManager/DataDistributionManagerCommon.cpp diff --git a/src/DataDistributionManager/DataDistributionManagerCommon.h b/src/native/DataDistributionManager/DataDistributionManagerCommon.h similarity index 100% rename from src/DataDistributionManager/DataDistributionManagerCommon.h rename to src/native/DataDistributionManager/DataDistributionManagerCommon.h diff --git a/src/DataDistributionManager/DataDistributionManagerEnums.h b/src/native/DataDistributionManager/DataDistributionManagerEnums.h similarity index 100% rename from src/DataDistributionManager/DataDistributionManagerEnums.h rename to src/native/DataDistributionManager/DataDistributionManagerEnums.h diff --git a/src/DataDistributionManager/DataDistributionManagerLog.cpp b/src/native/DataDistributionManager/DataDistributionManagerLog.cpp similarity index 100% rename from src/DataDistributionManager/DataDistributionManagerLog.cpp rename to src/native/DataDistributionManager/DataDistributionManagerLog.cpp diff --git a/src/DataDistributionManager/DataDistributionManagerLog.h b/src/native/DataDistributionManager/DataDistributionManagerLog.h similarity index 100% rename from src/DataDistributionManager/DataDistributionManagerLog.h rename to src/native/DataDistributionManager/DataDistributionManagerLog.h diff --git a/src/DataDistributionManager/DataDistributionManagerSupport.h b/src/native/DataDistributionManager/DataDistributionManagerSupport.h similarity index 100% rename from src/DataDistributionManager/DataDistributionManagerSupport.h rename to src/native/DataDistributionManager/DataDistributionManagerSupport.h diff --git a/src/DataDistributionManager/DataDistributionManagerSupportWindows.cpp b/src/native/DataDistributionManager/DataDistributionManagerSupportWindows.cpp similarity index 100% rename from src/DataDistributionManager/DataDistributionManagerSupportWindows.cpp rename to src/native/DataDistributionManager/DataDistributionManagerSupportWindows.cpp diff --git a/src/DataDistributionManager/DataDistributionManagerTypes.h b/src/native/DataDistributionManager/DataDistributionManagerTypes.h similarity index 100% rename from src/DataDistributionManager/DataDistributionManagerTypes.h rename to src/native/DataDistributionManager/DataDistributionManagerTypes.h diff --git a/src/DataDistributionManager/DataDistributionManager_Internal.h b/src/native/DataDistributionManager/DataDistributionManager_Internal.h similarity index 100% rename from src/DataDistributionManager/DataDistributionManager_Internal.h rename to src/native/DataDistributionManager/DataDistributionManager_Internal.h diff --git a/src/DataDistributionManager/DataDistributionManager_c.cpp b/src/native/DataDistributionManager/DataDistributionManager_c.cpp similarity index 100% rename from src/DataDistributionManager/DataDistributionManager_c.cpp rename to src/native/DataDistributionManager/DataDistributionManager_c.cpp diff --git a/src/DataDistributionManager/DataDistributionManager_c.h b/src/native/DataDistributionManager/DataDistributionManager_c.h similarity index 100% rename from src/DataDistributionManager/DataDistributionManager_c.h rename to src/native/DataDistributionManager/DataDistributionManager_c.h diff --git a/src/DataDistributionManager/DataDistributionManagerd.def b/src/native/DataDistributionManager/DataDistributionManagerd.def similarity index 100% rename from src/DataDistributionManager/DataDistributionManagerd.def rename to src/native/DataDistributionManager/DataDistributionManagerd.def diff --git a/src/DataDistributionManager/DataDistributionMastershipCommon.cpp b/src/native/DataDistributionManager/DataDistributionMastershipCommon.cpp similarity index 100% rename from src/DataDistributionManager/DataDistributionMastershipCommon.cpp rename to src/native/DataDistributionManager/DataDistributionMastershipCommon.cpp diff --git a/src/DataDistributionManager/DataDistributionMastershipCommon.h b/src/native/DataDistributionManager/DataDistributionMastershipCommon.h similarity index 100% rename from src/DataDistributionManager/DataDistributionMastershipCommon.h rename to src/native/DataDistributionManager/DataDistributionMastershipCommon.h diff --git a/src/DataDistributionManager/DataDistributionMastershipManagerBase.cpp b/src/native/DataDistributionManager/DataDistributionMastershipManagerBase.cpp similarity index 100% rename from src/DataDistributionManager/DataDistributionMastershipManagerBase.cpp rename to src/native/DataDistributionManager/DataDistributionMastershipManagerBase.cpp diff --git a/src/DataDistributionManager/DataDistributionMastershipManagerBase.h b/src/native/DataDistributionManager/DataDistributionMastershipManagerBase.h similarity index 100% rename from src/DataDistributionManager/DataDistributionMastershipManagerBase.h rename to src/native/DataDistributionManager/DataDistributionMastershipManagerBase.h diff --git a/src/DataDistributionManager/ReadMe.txt b/src/native/DataDistributionManager/ReadMe.txt similarity index 100% rename from src/DataDistributionManager/ReadMe.txt rename to src/native/DataDistributionManager/ReadMe.txt diff --git a/src/DataDistributionManager/Resource.rc b/src/native/DataDistributionManager/Resource.rc similarity index 100% rename from src/DataDistributionManager/Resource.rc rename to src/native/DataDistributionManager/Resource.rc diff --git a/src/DataDistributionManager/SmartDataDistributionManager.cpp b/src/native/DataDistributionManager/SmartDataDistributionManager.cpp similarity index 100% rename from src/DataDistributionManager/SmartDataDistributionManager.cpp rename to src/native/DataDistributionManager/SmartDataDistributionManager.cpp diff --git a/src/DataDistributionManager/SmartDataDistributionManager.h b/src/native/DataDistributionManager/SmartDataDistributionManager.h similarity index 100% rename from src/DataDistributionManager/SmartDataDistributionManager.h rename to src/native/DataDistributionManager/SmartDataDistributionManager.h diff --git a/src/DataDistributionManager/dllmain.cpp b/src/native/DataDistributionManager/dllmain.cpp similarity index 100% rename from src/DataDistributionManager/dllmain.cpp rename to src/native/DataDistributionManager/dllmain.cpp diff --git a/src/DataDistributionManager/org_mases_datadistributionmanager_NativeInterface.cpp b/src/native/DataDistributionManager/org_mases_datadistributionmanager_NativeInterface.cpp similarity index 100% rename from src/DataDistributionManager/org_mases_datadistributionmanager_NativeInterface.cpp rename to src/native/DataDistributionManager/org_mases_datadistributionmanager_NativeInterface.cpp diff --git a/src/DataDistributionManager/org_mases_datadistributionmanager_NativeInterface.h b/src/native/DataDistributionManager/org_mases_datadistributionmanager_NativeInterface.h similarity index 100% rename from src/DataDistributionManager/org_mases_datadistributionmanager_NativeInterface.h rename to src/native/DataDistributionManager/org_mases_datadistributionmanager_NativeInterface.h diff --git a/src/DataDistributionManager/resource.h b/src/native/DataDistributionManager/resource.h similarity index 100% rename from src/DataDistributionManager/resource.h rename to src/native/DataDistributionManager/resource.h diff --git a/src/DataDistributionManager/stdafx.cpp b/src/native/DataDistributionManager/stdafx.cpp similarity index 100% rename from src/DataDistributionManager/stdafx.cpp rename to src/native/DataDistributionManager/stdafx.cpp diff --git a/src/DataDistributionManager/stdafx.h b/src/native/DataDistributionManager/stdafx.h similarity index 100% rename from src/DataDistributionManager/stdafx.h rename to src/native/DataDistributionManager/stdafx.h diff --git a/src/DataDistributionManager/targetver.h b/src/native/DataDistributionManager/targetver.h similarity index 100% rename from src/DataDistributionManager/targetver.h rename to src/native/DataDistributionManager/targetver.h diff --git a/src/DataDistributionManagerKafka/DataDistributionManagerKafka.cpp b/src/native/DataDistributionManagerKafka/DataDistributionManagerKafka.cpp similarity index 100% rename from src/DataDistributionManagerKafka/DataDistributionManagerKafka.cpp rename to src/native/DataDistributionManagerKafka/DataDistributionManagerKafka.cpp diff --git a/src/DataDistributionManagerKafka/DataDistributionManagerKafka.h b/src/native/DataDistributionManagerKafka/DataDistributionManagerKafka.h similarity index 100% rename from src/DataDistributionManagerKafka/DataDistributionManagerKafka.h rename to src/native/DataDistributionManagerKafka/DataDistributionManagerKafka.h diff --git a/src/DataDistributionManagerKafka/DataDistributionManagerKafka.vcxproj b/src/native/DataDistributionManagerKafka/DataDistributionManagerKafka.vcxproj similarity index 89% rename from src/DataDistributionManagerKafka/DataDistributionManagerKafka.vcxproj rename to src/native/DataDistributionManagerKafka/DataDistributionManagerKafka.vcxproj index 922033d0..ecc27d27 100644 --- a/src/DataDistributionManagerKafka/DataDistributionManagerKafka.vcxproj +++ b/src/native/DataDistributionManagerKafka/DataDistributionManagerKafka.vcxproj @@ -72,24 +72,24 @@ true - ..\..\Output\x86\ + ..\..\..\Output\x86\ x86\ $(ProjectName)d true - ..\..\Output\x64\ + ..\..\..\Output\x64\ x64\ $(ProjectName)d false - ..\..\Output\x86\ + ..\..\..\Output\x86\ x86\ false - ..\..\Output\x64\ + ..\..\..\Output\x64\ x64\ @@ -108,7 +108,7 @@ true Ws2_32.lib;librdkafkacpp.lib;DataDistributionManagerd.lib;%(AdditionalDependencies) true - ..\..\Output\x86; + ..\..\..\Output\x86; $(OutDir)..\pdb32\$(TargetName).pdb @@ -120,7 +120,7 @@ - ..\ProductInformation + ..\..\ProductInformation @@ -136,7 +136,7 @@ Windows true Ws2_32.lib;librdkafkacpp.lib;DataDistributionManagerd.lib;%(AdditionalDependencies) - ..\..\Output\x64; + ..\..\..\Output\x64; $(OutDir)..\pdb64\$(TargetName).pdb @@ -148,7 +148,7 @@ - ..\ProductInformation + ..\..\ProductInformation @@ -168,7 +168,7 @@ true true Ws2_32.lib;librdkafkacpp.lib;DataDistributionManager.lib;%(AdditionalDependencies) - ..\..\Output\x86; + ..\..\..\Output\x86; $(OutDir)..\pdb32\$(TargetName).pdb @@ -180,7 +180,7 @@ - ..\ProductInformation + ..\..\ProductInformation @@ -200,7 +200,7 @@ true true Ws2_32.lib;librdkafkacpp.lib;DataDistributionManager.lib;%(AdditionalDependencies) - ..\..\Output\x64; + ..\..\..\Output\x64; $(OutDir)..\pdb64\$(TargetName).pdb @@ -212,7 +212,7 @@ - ..\ProductInformation + ..\..\ProductInformation @@ -250,12 +250,12 @@ - + Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}. - + \ No newline at end of file diff --git a/src/DataDistributionManagerKafka/DataDistributionManagerKafka.vcxproj.filters b/src/native/DataDistributionManagerKafka/DataDistributionManagerKafka.vcxproj.filters similarity index 100% rename from src/DataDistributionManagerKafka/DataDistributionManagerKafka.vcxproj.filters rename to src/native/DataDistributionManagerKafka/DataDistributionManagerKafka.vcxproj.filters diff --git a/src/DataDistributionManagerKafka/ReadMe.txt b/src/native/DataDistributionManagerKafka/ReadMe.txt similarity index 100% rename from src/DataDistributionManagerKafka/ReadMe.txt rename to src/native/DataDistributionManagerKafka/ReadMe.txt diff --git a/src/DataDistributionManagerKafka/Resource.rc b/src/native/DataDistributionManagerKafka/Resource.rc similarity index 100% rename from src/DataDistributionManagerKafka/Resource.rc rename to src/native/DataDistributionManagerKafka/Resource.rc diff --git a/src/DataDistributionManagerKafka/dllmain.cpp b/src/native/DataDistributionManagerKafka/dllmain.cpp similarity index 100% rename from src/DataDistributionManagerKafka/dllmain.cpp rename to src/native/DataDistributionManagerKafka/dllmain.cpp diff --git a/src/DataDistributionManagerKafka/packages.config b/src/native/DataDistributionManagerKafka/packages.config similarity index 54% rename from src/DataDistributionManagerKafka/packages.config rename to src/native/DataDistributionManagerKafka/packages.config index 74019a46..c9e3275b 100644 --- a/src/DataDistributionManagerKafka/packages.config +++ b/src/native/DataDistributionManagerKafka/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/DataDistributionManagerKafka/resource.h b/src/native/DataDistributionManagerKafka/resource.h similarity index 100% rename from src/DataDistributionManagerKafka/resource.h rename to src/native/DataDistributionManagerKafka/resource.h diff --git a/src/DataDistributionManagerKafka/stdafx.cpp b/src/native/DataDistributionManagerKafka/stdafx.cpp similarity index 100% rename from src/DataDistributionManagerKafka/stdafx.cpp rename to src/native/DataDistributionManagerKafka/stdafx.cpp diff --git a/src/DataDistributionManagerKafka/stdafx.h b/src/native/DataDistributionManagerKafka/stdafx.h similarity index 100% rename from src/DataDistributionManagerKafka/stdafx.h rename to src/native/DataDistributionManagerKafka/stdafx.h diff --git a/src/DataDistributionManagerKafka/targetver.h b/src/native/DataDistributionManagerKafka/targetver.h similarity index 100% rename from src/DataDistributionManagerKafka/targetver.h rename to src/native/DataDistributionManagerKafka/targetver.h diff --git a/src/DataDistributionManagerOpenDDS/CommonDataReaderListenerImpl.cpp b/src/native/DataDistributionManagerOpenDDS/CommonDataReaderListenerImpl.cpp similarity index 100% rename from src/DataDistributionManagerOpenDDS/CommonDataReaderListenerImpl.cpp rename to src/native/DataDistributionManagerOpenDDS/CommonDataReaderListenerImpl.cpp diff --git a/src/DataDistributionManagerOpenDDS/CommonDataReaderListenerImpl.h b/src/native/DataDistributionManagerOpenDDS/CommonDataReaderListenerImpl.h similarity index 100% rename from src/DataDistributionManagerOpenDDS/CommonDataReaderListenerImpl.h rename to src/native/DataDistributionManagerOpenDDS/CommonDataReaderListenerImpl.h diff --git a/src/DataDistributionManagerOpenDDS/DataDistributionManagerOpenDDS.cpp b/src/native/DataDistributionManagerOpenDDS/DataDistributionManagerOpenDDS.cpp similarity index 100% rename from src/DataDistributionManagerOpenDDS/DataDistributionManagerOpenDDS.cpp rename to src/native/DataDistributionManagerOpenDDS/DataDistributionManagerOpenDDS.cpp diff --git a/src/DataDistributionManagerOpenDDS/DataDistributionManagerOpenDDS.h b/src/native/DataDistributionManagerOpenDDS/DataDistributionManagerOpenDDS.h similarity index 100% rename from src/DataDistributionManagerOpenDDS/DataDistributionManagerOpenDDS.h rename to src/native/DataDistributionManagerOpenDDS/DataDistributionManagerOpenDDS.h diff --git a/src/DataDistributionManagerOpenDDS/DataDistributionManagerOpenDDS.mpc b/src/native/DataDistributionManagerOpenDDS/DataDistributionManagerOpenDDS.mpc similarity index 70% rename from src/DataDistributionManagerOpenDDS/DataDistributionManagerOpenDDS.mpc rename to src/native/DataDistributionManagerOpenDDS/DataDistributionManagerOpenDDS.mpc index d29d8a43..153d48d4 100644 --- a/src/DataDistributionManagerOpenDDS/DataDistributionManagerOpenDDS.mpc +++ b/src/native/DataDistributionManagerOpenDDS/DataDistributionManagerOpenDDS.mpc @@ -1,5 +1,5 @@ // -// Copyright 2022 MASES s.r.l. +// Copyright 2023 MASES s.r.l. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,12 +21,12 @@ project(*Common) : dcps, svc_utils { dynamicflags = DDM_EXPORTS;_WINSOCK_DEPRECATED_NO_WARNINGS;NOGDI;DATADISTRIBUTIONSCHEMACOMMON_BUILD_DLL specific { - Win32::libout = ..\..\Output\x86 - Win32::libs += ..\..\Output\x86\DataDistributionManager - Win32::libpaths = ..\..\Output\lib32 - x64::libout = ..\..\Output\x64 - x64::libs += ..\..\Output\x64\DataDistributionManager - x64::libpaths = ..\..\Output\lib64 + Win32::libout = ..\..\..\output\x86 + Win32::libs += ..\..\..\output\x86\DataDistributionManager + Win32::libpaths = ..\..\..\output\lib32 + x64::libout = ..\..\..\output\x64 + x64::libs += ..\..\..\output\x64\DataDistributionManager + x64::libpaths = ..\..\..\output\lib64 } requires += tao_orbsvcs @@ -65,14 +65,14 @@ project(*Publisher) : dcpsexe, dcps_tcp, svc_utils { after += *Common exename = publisher specific { - Win32::exeout = ..\..\Output\x86 - Win32::libs += ..\..\Output\x86\DataDistributionManager - Win32::libs += ..\..\Output\x86\DataDistributionManagerOpenDDS - Win32::libpaths = ..\..\Output\lib32 - x64::exeout = ..\..\Output\x64 - x64::libs += ..\..\Output\x64\DataDistributionManagerOpenDDS - x64::libs += ..\..\Output\x64\DataDistributionManager - x64::libpaths = ..\..\Output\lib64 + Win32::exeout = ..\..\..\output\x86 + Win32::libs += ..\..\..\output\x86\DataDistributionManager + Win32::libs += ..\..\..\output\x86\DataDistributionManagerOpenDDS + Win32::libpaths = ..\..\..\output\lib32 + x64::exeout = ..\..\..\output\x64 + x64::libs += ..\..\..\output\x64\DataDistributionManagerOpenDDS + x64::libs += ..\..\..\output\x64\DataDistributionManager + x64::libpaths = ..\..\..\output\lib64 } requires += tao_orbsvcs requires += no_opendds_safety_profile @@ -105,12 +105,12 @@ project(*Subscriber) : dcpsexe, dcps_tcp { after += *Common exename = subscriber specific { - Win32::exeout = ..\..\Output\x86 - Win32::libs += ..\..\Output\x86\DataDistributionManager;..\Output\x86\DataDistributionManagerOpenDDS - Win32::libpaths = ..\..\Output\lib32 - x64::exeout = ..\..\Output\x64 - x64::libs += ..\..\Output\x64\DataDistributionManagerOpenDDS;..\Output\x64\DataDistributionManager - x64::libpaths = ..\..\Output\lib64 + Win32::exeout = ..\..\..\output\x86 + Win32::libs += ..\..\..\output\x86\DataDistributionManager;..\output\x86\DataDistributionManagerOpenDDS + Win32::libpaths = ..\..\..\output\lib32 + x64::exeout = ..\..\..\output\x64 + x64::libs += ..\..\..\output\x64\DataDistributionManagerOpenDDS;..\output\x64\DataDistributionManager + x64::libpaths = ..\..\..\output\lib64 } requires += tao_orbsvcs requires += no_opendds_safety_profile diff --git a/src/DataDistributionManagerOpenDDS/DataDistributionManagerOpenDDS.mwc b/src/native/DataDistributionManagerOpenDDS/DataDistributionManagerOpenDDS.mwc similarity index 100% rename from src/DataDistributionManagerOpenDDS/DataDistributionManagerOpenDDS.mwc rename to src/native/DataDistributionManagerOpenDDS/DataDistributionManagerOpenDDS.mwc diff --git a/src/DataDistributionManagerOpenDDS/DataDistributionSchema.idl b/src/native/DataDistributionManagerOpenDDS/DataDistributionSchema.idl similarity index 100% rename from src/DataDistributionManagerOpenDDS/DataDistributionSchema.idl rename to src/native/DataDistributionManagerOpenDDS/DataDistributionSchema.idl diff --git a/src/DataDistributionManagerOpenDDS/GenerateFile.cmd b/src/native/DataDistributionManagerOpenDDS/GenerateFile.cmd similarity index 100% rename from src/DataDistributionManagerOpenDDS/GenerateFile.cmd rename to src/native/DataDistributionManagerOpenDDS/GenerateFile.cmd diff --git a/src/DataDistributionManagerOpenDDS/OpenDDSManager.conf b/src/native/DataDistributionManagerOpenDDS/OpenDDSManager.conf similarity index 100% rename from src/DataDistributionManagerOpenDDS/OpenDDSManager.conf rename to src/native/DataDistributionManagerOpenDDS/OpenDDSManager.conf diff --git a/src/DataDistributionManagerOpenDDS/dds_tcp_conf.ini b/src/native/DataDistributionManagerOpenDDS/dds_tcp_conf.ini similarity index 100% rename from src/DataDistributionManagerOpenDDS/dds_tcp_conf.ini rename to src/native/DataDistributionManagerOpenDDS/dds_tcp_conf.ini diff --git a/src/DataDistributionManagerOpenDDS/dds_udp_conf.ini b/src/native/DataDistributionManagerOpenDDS/dds_udp_conf.ini similarity index 100% rename from src/DataDistributionManagerOpenDDS/dds_udp_conf.ini rename to src/native/DataDistributionManagerOpenDDS/dds_udp_conf.ini diff --git a/src/DataDistributionManagerOpenDDS/publisher.cpp b/src/native/DataDistributionManagerOpenDDS/publisher.cpp similarity index 100% rename from src/DataDistributionManagerOpenDDS/publisher.cpp rename to src/native/DataDistributionManagerOpenDDS/publisher.cpp diff --git a/src/DataDistributionManagerOpenDDS/subscriber.cpp b/src/native/DataDistributionManagerOpenDDS/subscriber.cpp similarity index 100% rename from src/DataDistributionManagerOpenDDS/subscriber.cpp rename to src/native/DataDistributionManagerOpenDDS/subscriber.cpp diff --git a/src/DataDistributionMastershipManager/DataDistributionMastershipManager.cpp b/src/native/DataDistributionMastershipManager/DataDistributionMastershipManager.cpp similarity index 100% rename from src/DataDistributionMastershipManager/DataDistributionMastershipManager.cpp rename to src/native/DataDistributionMastershipManager/DataDistributionMastershipManager.cpp diff --git a/src/DataDistributionMastershipManager/DataDistributionMastershipManager.h b/src/native/DataDistributionMastershipManager/DataDistributionMastershipManager.h similarity index 100% rename from src/DataDistributionMastershipManager/DataDistributionMastershipManager.h rename to src/native/DataDistributionMastershipManager/DataDistributionMastershipManager.h diff --git a/src/DataDistributionMastershipManager/DataDistributionMastershipManager.vcxproj b/src/native/DataDistributionMastershipManager/DataDistributionMastershipManager.vcxproj similarity index 92% rename from src/DataDistributionMastershipManager/DataDistributionMastershipManager.vcxproj rename to src/native/DataDistributionMastershipManager/DataDistributionMastershipManager.vcxproj index 6b3cf176..68fa72da 100644 --- a/src/DataDistributionMastershipManager/DataDistributionMastershipManager.vcxproj +++ b/src/native/DataDistributionMastershipManager/DataDistributionMastershipManager.vcxproj @@ -72,24 +72,24 @@ true - ..\..\Output\x86\ + ..\..\..\Output\x86\ x86\ $(ProjectName)d true - ..\..\Output\x64\ + ..\..\..\Output\x64\ x64\ $(ProjectName)d false - ..\..\Output\x86\ + ..\..\..\Output\x86\ x86\ false - ..\..\Output\x64\ + ..\..\..\Output\x64\ x64\ @@ -108,11 +108,11 @@ true Ws2_32.lib;DataDistributionManagerd.lib;%(AdditionalDependencies) true - ..\..\Output\x86; + ..\..\..\Output\x86; $(OutDir)..\pdb32\$(TargetName).pdb - ..\ProductInformation + ..\..\ProductInformation @@ -128,11 +128,11 @@ Windows true Ws2_32.lib;DataDistributionManagerd.lib;%(AdditionalDependencies) - ..\..\Output\x64; + ..\..\..\Output\x64; $(OutDir)..\pdb64\$(TargetName).pdb - ..\ProductInformation + ..\..\ProductInformation @@ -152,11 +152,11 @@ true true Ws2_32.lib;DataDistributionManager.lib;%(AdditionalDependencies) - ..\..\Output\x86; + ..\..\..\Output\x86; $(OutDir)..\pdb32\$(TargetName).pdb - ..\ProductInformation + ..\..\ProductInformation @@ -176,11 +176,11 @@ true true Ws2_32.lib;DataDistributionManager.lib;%(AdditionalDependencies) - ..\..\Output\x64; + ..\..\..\Output\x64; $(OutDir)..\pdb64\$(TargetName).pdb - ..\ProductInformation + ..\..\ProductInformation diff --git a/src/DataDistributionMastershipManager/DataDistributionMastershipManager.vcxproj.filters b/src/native/DataDistributionMastershipManager/DataDistributionMastershipManager.vcxproj.filters similarity index 100% rename from src/DataDistributionMastershipManager/DataDistributionMastershipManager.vcxproj.filters rename to src/native/DataDistributionMastershipManager/DataDistributionMastershipManager.vcxproj.filters diff --git a/src/DataDistributionMastershipManager/ReadMe.txt b/src/native/DataDistributionMastershipManager/ReadMe.txt similarity index 100% rename from src/DataDistributionMastershipManager/ReadMe.txt rename to src/native/DataDistributionMastershipManager/ReadMe.txt diff --git a/src/DataDistributionMastershipManager/Resource.rc b/src/native/DataDistributionMastershipManager/Resource.rc similarity index 100% rename from src/DataDistributionMastershipManager/Resource.rc rename to src/native/DataDistributionMastershipManager/Resource.rc diff --git a/src/DataDistributionMastershipManager/dllmain.cpp b/src/native/DataDistributionMastershipManager/dllmain.cpp similarity index 100% rename from src/DataDistributionMastershipManager/dllmain.cpp rename to src/native/DataDistributionMastershipManager/dllmain.cpp diff --git a/src/DataDistributionMastershipManager/resource.h b/src/native/DataDistributionMastershipManager/resource.h similarity index 100% rename from src/DataDistributionMastershipManager/resource.h rename to src/native/DataDistributionMastershipManager/resource.h diff --git a/src/DataDistributionMastershipManager/stdafx.cpp b/src/native/DataDistributionMastershipManager/stdafx.cpp similarity index 100% rename from src/DataDistributionMastershipManager/stdafx.cpp rename to src/native/DataDistributionMastershipManager/stdafx.cpp diff --git a/src/DataDistributionMastershipManager/stdafx.h b/src/native/DataDistributionMastershipManager/stdafx.h similarity index 100% rename from src/DataDistributionMastershipManager/stdafx.h rename to src/native/DataDistributionMastershipManager/stdafx.h diff --git a/src/DataDistributionMastershipManager/targetver.h b/src/native/DataDistributionMastershipManager/targetver.h similarity index 100% rename from src/DataDistributionMastershipManager/targetver.h rename to src/native/DataDistributionMastershipManager/targetver.h diff --git a/src/DataDistributionManagerNet/BaseConfiguration.cs b/src/net/DataDistributionManagerNet/BaseConfiguration.cs similarity index 100% rename from src/DataDistributionManagerNet/BaseConfiguration.cs rename to src/net/DataDistributionManagerNet/BaseConfiguration.cs diff --git a/src/DataDistributionManagerNet/CommonConfiguration.cs b/src/net/DataDistributionManagerNet/CommonConfiguration.cs similarity index 100% rename from src/DataDistributionManagerNet/CommonConfiguration.cs rename to src/net/DataDistributionManagerNet/CommonConfiguration.cs diff --git a/src/DataDistributionManagerNet/Configuration/KafkaChannelConfiguration.cs b/src/net/DataDistributionManagerNet/Configuration/KafkaChannelConfiguration.cs similarity index 100% rename from src/DataDistributionManagerNet/Configuration/KafkaChannelConfiguration.cs rename to src/net/DataDistributionManagerNet/Configuration/KafkaChannelConfiguration.cs diff --git a/src/DataDistributionManagerNet/Configuration/KafkaConfiguration.cs b/src/net/DataDistributionManagerNet/Configuration/KafkaConfiguration.cs similarity index 100% rename from src/DataDistributionManagerNet/Configuration/KafkaConfiguration.cs rename to src/net/DataDistributionManagerNet/Configuration/KafkaConfiguration.cs diff --git a/src/DataDistributionManagerNet/Configuration/MastershipConfiguration.cs b/src/net/DataDistributionManagerNet/Configuration/MastershipConfiguration.cs similarity index 100% rename from src/DataDistributionManagerNet/Configuration/MastershipConfiguration.cs rename to src/net/DataDistributionManagerNet/Configuration/MastershipConfiguration.cs diff --git a/src/DataDistributionManagerNet/Configuration/OpenDDSChannelConfiguration.cs b/src/net/DataDistributionManagerNet/Configuration/OpenDDSChannelConfiguration.cs similarity index 100% rename from src/DataDistributionManagerNet/Configuration/OpenDDSChannelConfiguration.cs rename to src/net/DataDistributionManagerNet/Configuration/OpenDDSChannelConfiguration.cs diff --git a/src/DataDistributionManagerNet/Configuration/OpenDDSConfiguration.cs b/src/net/DataDistributionManagerNet/Configuration/OpenDDSConfiguration.cs similarity index 100% rename from src/DataDistributionManagerNet/Configuration/OpenDDSConfiguration.cs rename to src/net/DataDistributionManagerNet/Configuration/OpenDDSConfiguration.cs diff --git a/src/DataDistributionManagerNet/DataDistributionManagerNet.csproj b/src/net/DataDistributionManagerNet/DataDistributionManagerNet.csproj similarity index 83% rename from src/DataDistributionManagerNet/DataDistributionManagerNet.csproj rename to src/net/DataDistributionManagerNet/DataDistributionManagerNet.csproj index 3b1a752b..0e7291ac 100644 --- a/src/DataDistributionManagerNet/DataDistributionManagerNet.csproj +++ b/src/net/DataDistributionManagerNet/DataDistributionManagerNet.csproj @@ -3,7 +3,7 @@ false true false - net6.0;net7.0;net462 + net462;net6.0;net8.0 MASES.DataDistributionManager.Bindings latest DataDistributionManagerNet @@ -13,16 +13,12 @@ true - - $(DefineConstants);NET_STANDARD - - - + Properties\Version.cs - - Properties\ComponentVersion.c + + Properties\ComponentVersion.cs diff --git a/src/DataDistributionManagerNet/DataDistributionManagerNet.snk b/src/net/DataDistributionManagerNet/DataDistributionManagerNet.snk similarity index 100% rename from src/DataDistributionManagerNet/DataDistributionManagerNet.snk rename to src/net/DataDistributionManagerNet/DataDistributionManagerNet.snk diff --git a/src/DataDistributionManagerNet/GlobalConfiguration.cs b/src/net/DataDistributionManagerNet/GlobalConfiguration.cs similarity index 100% rename from src/DataDistributionManagerNet/GlobalConfiguration.cs rename to src/net/DataDistributionManagerNet/GlobalConfiguration.cs diff --git a/src/DataDistributionManagerNet/HelperClass.cs b/src/net/DataDistributionManagerNet/HelperClass.cs similarity index 100% rename from src/DataDistributionManagerNet/HelperClass.cs rename to src/net/DataDistributionManagerNet/HelperClass.cs diff --git a/src/DataDistributionManagerNet/IConfiguration.cs b/src/net/DataDistributionManagerNet/IConfiguration.cs similarity index 100% rename from src/DataDistributionManagerNet/IConfiguration.cs rename to src/net/DataDistributionManagerNet/IConfiguration.cs diff --git a/src/DataDistributionManagerNet/ISmartDataDistributionMastership.cs b/src/net/DataDistributionManagerNet/ISmartDataDistributionMastership.cs similarity index 100% rename from src/DataDistributionManagerNet/ISmartDataDistributionMastership.cs rename to src/net/DataDistributionManagerNet/ISmartDataDistributionMastership.cs diff --git a/src/DataDistributionManagerNet/Interop/Bindings.cs b/src/net/DataDistributionManagerNet/Interop/Bindings.cs similarity index 100% rename from src/DataDistributionManagerNet/Interop/Bindings.cs rename to src/net/DataDistributionManagerNet/Interop/Bindings.cs diff --git a/src/DataDistributionManagerNet/Interop/ClusterHealthElement.cs b/src/net/DataDistributionManagerNet/Interop/ClusterHealthElement.cs similarity index 100% rename from src/DataDistributionManagerNet/Interop/ClusterHealthElement.cs rename to src/net/DataDistributionManagerNet/Interop/ClusterHealthElement.cs diff --git a/src/DataDistributionManagerNet/Interop/DataDistributionEnv.cs b/src/net/DataDistributionManagerNet/Interop/DataDistributionEnv.cs similarity index 100% rename from src/DataDistributionManagerNet/Interop/DataDistributionEnv.cs rename to src/net/DataDistributionManagerNet/Interop/DataDistributionEnv.cs diff --git a/src/DataDistributionManagerNet/Interop/DataDistributionInvokeWrapper.cs b/src/net/DataDistributionManagerNet/Interop/DataDistributionInvokeWrapper.cs similarity index 87% rename from src/DataDistributionManagerNet/Interop/DataDistributionInvokeWrapper.cs rename to src/net/DataDistributionManagerNet/Interop/DataDistributionInvokeWrapper.cs index eebf8bd3..f60f5b7b 100644 --- a/src/DataDistributionManagerNet/Interop/DataDistributionInvokeWrapper.cs +++ b/src/net/DataDistributionManagerNet/Interop/DataDistributionInvokeWrapper.cs @@ -19,15 +19,45 @@ using System; using System.ComponentModel; using System.IO; +using System.Reflection; using System.Runtime.InteropServices; namespace MASES.DataDistributionManager.Bindings.Interop { static class DataDistributionManagerInvokeWrapper { + static bool? _isNetFramework = null; + static bool IsNetFramework + { + get + { +#if NET462_OR_GREATER + return true; +#else + if (_isNetFramework == null) + { + var str = RuntimeInformation.FrameworkDescription; + if (str.StartsWith(".NET Framework")) _isNetFramework = true; + else if (str.StartsWith(".NET Native")) throw new InvalidOperationException($"{str} is not managed."); + else _isNetFramework = false; + } + return _isNetFramework.GetValueOrDefault(true); +#endif + } + } + #region native invokes -#if !NET_STANDARD + static Type _nativeLibrary = null; + static Type NativeLibrary + { + get + { + if (_nativeLibrary == null) _nativeLibrary = Type.GetType("System.Runtime.InteropServices.NativeLibrary", true); + return _nativeLibrary; + } + } + [DllImport("kernel32.dll", EntryPoint = "LoadLibraryW")] static extern IntPtr LoadLibrary([MarshalAs(UnmanagedType.LPWStr)] string name); @@ -39,48 +69,33 @@ static class DataDistributionManagerInvokeWrapper [DllImport("kernel32.dll", EntryPoint = "GetProcAddress")] static extern IntPtr GetProcAddress(IntPtr hModule, [MarshalAs(UnmanagedType.LPStr)] string name); -#else - [DllImport("coredll.dll", EntryPoint="GetModuleHandleW", SetLastError=true)] - public static extern IntPtr GetModuleHandle(string moduleName); -#endif + + [DllImport("coredll.dll", EntryPoint = "GetModuleHandleW", SetLastError = true)] + public static extern IntPtr GetModuleHandleCore([MarshalAs(UnmanagedType.LPWStr)] string moduleName); internal static IntPtr WrapperLoadLibrary(string name) { -#if !NET_STANDARD - return LoadLibrary(name); -#else - return System.Runtime.InteropServices.NativeLibrary.Load(name); -#endif + return IsNetFramework ? LoadLibrary(name) : (IntPtr)NativeLibrary.InvokeMember("Load", BindingFlags.Static | BindingFlags.Public, null, null, [name]); } internal static bool WrapperFreeLibrary(IntPtr hModule) { -#if !NET_STANDARD - return FreeLibrary(hModule); -#else - System.Runtime.InteropServices.NativeLibrary.Free(hModule); - return true; -#endif + if (IsNetFramework) return FreeLibrary(hModule); + else + { + NativeLibrary.InvokeMember("Free", BindingFlags.Static | BindingFlags.Public, null, null, [hModule]); + return true; + } } internal static IntPtr WrapperGetModuleHandle(string name) { -#if !NET_STANDARD - return GetModuleHandle(name); -#else return GetModuleHandle(name); -#endif } internal static IntPtr WrapperGetProcAddress(IntPtr hModule, string name) { - IntPtr result = IntPtr.Zero; -#if !NET_STANDARD - result = GetProcAddress(hModule, name); -#else - result = System.Runtime.InteropServices.NativeLibrary.GetExport(hModule, name); -#endif - return result; + return IsNetFramework ? GetProcAddress(hModule, name) : (IntPtr)NativeLibrary.InvokeMember("GetExport", BindingFlags.Static | BindingFlags.Public, null, null, [hModule, name]); } #endregion @@ -260,6 +275,6 @@ public delegate bool IDataDistributionSubsystem_WriteOnChannel(IntPtr IDataDistr IntPtr param, IntPtr dataLen, bool waitAll = false, Int64 timestamp = SmartDataDistributionChannel.DDM_NO_TIMESTAMP); public delegate bool IDataDistributionSubsystem_ReadFromChannel(IntPtr IDataDistributionSubsystem_instance, IntPtr channelHandle, - [In, Out] IntPtr param, [In, Out]IntPtr dataLen, long offset); + [In, Out] IntPtr param, [In, Out] IntPtr dataLen, long offset); } } diff --git a/src/DataDistributionManagerNet/Interop/Delegates.cs b/src/net/DataDistributionManagerNet/Interop/Delegates.cs similarity index 100% rename from src/DataDistributionManagerNet/Interop/Delegates.cs rename to src/net/DataDistributionManagerNet/Interop/Delegates.cs diff --git a/src/DataDistributionManagerNet/Interop/Enums.cs b/src/net/DataDistributionManagerNet/Interop/Enums.cs similarity index 100% rename from src/DataDistributionManagerNet/Interop/Enums.cs rename to src/net/DataDistributionManagerNet/Interop/Enums.cs diff --git a/src/DataDistributionManagerNet/Interop/HRESULTType.cs b/src/net/DataDistributionManagerNet/Interop/HRESULTType.cs similarity index 100% rename from src/DataDistributionManagerNet/Interop/HRESULTType.cs rename to src/net/DataDistributionManagerNet/Interop/HRESULTType.cs diff --git a/src/DataDistributionManagerNet/Interop/UnderlyingEvent.cs b/src/net/DataDistributionManagerNet/Interop/UnderlyingEvent.cs similarity index 100% rename from src/DataDistributionManagerNet/Interop/UnderlyingEvent.cs rename to src/net/DataDistributionManagerNet/Interop/UnderlyingEvent.cs diff --git a/src/DataDistributionManagerNet/Properties/AssemblyInfo.cs b/src/net/DataDistributionManagerNet/Properties/AssemblyInfo.cs similarity index 100% rename from src/DataDistributionManagerNet/Properties/AssemblyInfo.cs rename to src/net/DataDistributionManagerNet/Properties/AssemblyInfo.cs diff --git a/src/DataDistributionManagerNet/SmartDataDistribution.cs b/src/net/DataDistributionManagerNet/SmartDataDistribution.cs similarity index 100% rename from src/DataDistributionManagerNet/SmartDataDistribution.cs rename to src/net/DataDistributionManagerNet/SmartDataDistribution.cs diff --git a/src/DataDistributionManagerNet/SmartDataDistributionChannel.cs b/src/net/DataDistributionManagerNet/SmartDataDistributionChannel.cs similarity index 100% rename from src/DataDistributionManagerNet/SmartDataDistributionChannel.cs rename to src/net/DataDistributionManagerNet/SmartDataDistributionChannel.cs diff --git a/Output/README.md b/src/output/README.md similarity index 100% rename from Output/README.md rename to src/output/README.md diff --git a/packaging/maven/.idea/.gitignore b/src/packaging/maven/.idea/.gitignore similarity index 100% rename from packaging/maven/.idea/.gitignore rename to src/packaging/maven/.idea/.gitignore diff --git a/packaging/maven/.idea/.name b/src/packaging/maven/.idea/.name similarity index 100% rename from packaging/maven/.idea/.name rename to src/packaging/maven/.idea/.name diff --git a/packaging/maven/.idea/codeStyles/Project.xml b/src/packaging/maven/.idea/codeStyles/Project.xml similarity index 100% rename from packaging/maven/.idea/codeStyles/Project.xml rename to src/packaging/maven/.idea/codeStyles/Project.xml diff --git a/packaging/maven/.idea/codeStyles/codeStyleConfig.xml b/src/packaging/maven/.idea/codeStyles/codeStyleConfig.xml similarity index 100% rename from packaging/maven/.idea/codeStyles/codeStyleConfig.xml rename to src/packaging/maven/.idea/codeStyles/codeStyleConfig.xml diff --git a/packaging/maven/.idea/compiler.xml b/src/packaging/maven/.idea/compiler.xml similarity index 100% rename from packaging/maven/.idea/compiler.xml rename to src/packaging/maven/.idea/compiler.xml diff --git a/packaging/maven/.idea/jarRepositories.xml b/src/packaging/maven/.idea/jarRepositories.xml similarity index 100% rename from packaging/maven/.idea/jarRepositories.xml rename to src/packaging/maven/.idea/jarRepositories.xml diff --git a/packaging/maven/.idea/misc.xml b/src/packaging/maven/.idea/misc.xml similarity index 100% rename from packaging/maven/.idea/misc.xml rename to src/packaging/maven/.idea/misc.xml diff --git a/packaging/maven/.idea/modules.xml b/src/packaging/maven/.idea/modules.xml similarity index 100% rename from packaging/maven/.idea/modules.xml rename to src/packaging/maven/.idea/modules.xml diff --git a/packaging/maven/.idea/vcs.xml b/src/packaging/maven/.idea/vcs.xml similarity index 100% rename from packaging/maven/.idea/vcs.xml rename to src/packaging/maven/.idea/vcs.xml diff --git a/packaging/maven/datadistributionmanager.iml b/src/packaging/maven/datadistributionmanager.iml similarity index 100% rename from packaging/maven/datadistributionmanager.iml rename to src/packaging/maven/datadistributionmanager.iml diff --git a/packaging/maven/pom.xml b/src/packaging/maven/pom.xml similarity index 100% rename from packaging/maven/pom.xml rename to src/packaging/maven/pom.xml diff --git a/packaging/nuget/datadistributionmanager.nuspec b/src/packaging/nuget/datadistributionmanager.nuspec similarity index 57% rename from packaging/nuget/datadistributionmanager.nuspec rename to src/packaging/nuget/datadistributionmanager.nuspec index aea82f37..f780ff65 100644 --- a/packaging/nuget/datadistributionmanager.nuspec +++ b/src/packaging/nuget/datadistributionmanager.nuspec @@ -14,28 +14,28 @@ https://github.com/masesgroup/DataDistributionManager/releases availability reliability durability business-solutions opendds apachekafka businesscontinuity dotnet java jvm scala kotlin p2p true - Copyright © MASES s.r.l. 2023 + Copyright © MASES s.r.l. 2024 README.md - - + + - - - + + + - - - + + + - - - - + + + + - + diff --git a/packaging/nuget/dotnet/mases.datadistributionmanager.targets b/src/packaging/nuget/dotnet/mases.datadistributionmanager.targets similarity index 100% rename from packaging/nuget/dotnet/mases.datadistributionmanager.targets rename to src/packaging/nuget/dotnet/mases.datadistributionmanager.targets diff --git a/packaging/nuget/native/mases.datadistributionmanager.targets b/src/packaging/nuget/native/mases.datadistributionmanager.targets similarity index 100% rename from packaging/nuget/native/mases.datadistributionmanager.targets rename to src/packaging/nuget/native/mases.datadistributionmanager.targets diff --git a/third_party/CommonTools b/third_party/CommonTools deleted file mode 160000 index 92de84fb..00000000 --- a/third_party/CommonTools +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 92de84fbc67fc647ea2bdc3246091cd6a742d861 diff --git a/third_party/OpenDDS b/third_party/OpenDDS deleted file mode 160000 index 2038b660..00000000 --- a/third_party/OpenDDS +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2038b660f2037fb0758dbf106005d77f3b2d52f8