From c71074abbe205ae5f5944a6487620e8bc2299fd3 Mon Sep 17 00:00:00 2001 From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com> Date: Sat, 19 Mar 2022 01:00:51 +0100 Subject: [PATCH 1/2] Rename from JavaBridge to JNet --- .github/workflows/build.yaml | 14 +++---- .github/workflows/codeql-analysis.yml | 4 +- .github/workflows/pullrequest.yaml | 12 +++--- .github/workflows/release.yaml | 10 ++--- CONTRIBUTING.md | 36 +++++++++--------- README.md | 20 +++++----- src/java/{javabridge => jnet}/pom.xml | 15 ++++---- src/net/Common/{JavaBridge.snk => JNet.snk} | Bin .../articles/API_extensibility.md | 2 +- src/net/Documentation/articles/actualstate.md | 2 +- src/net/Documentation/articles/intro.md | 4 +- .../Documentation/articles/jvm_callbacks.md | 16 ++++---- src/net/Documentation/articles/roadmap.md | 2 +- src/net/Documentation/articles/usage.md | 4 +- src/net/Documentation/docfx.json | 2 +- src/net/Documentation/index.md | 14 +++---- src/net/{JavaBridge.sln => JNet.sln} | 10 ++--- src/net/{JavaBridge => JNet}/InternalConst.cs | 2 +- .../JavaBridge.csproj => JNet/JNet.csproj} | 24 ++++++------ .../JavaBridgeCore.cs => JNet/JNetCore.cs} | 10 ++--- src/net/{JavaBridge => JNet}/Java/Io/File.cs | 0 .../Java/Math/BigDecimal.cs | 0 .../Java/Nio/ByteBuffer.cs | 0 .../Java/Time/Duration.cs | 0 .../{JavaBridge => JNet}/Java/Time/Instant.cs | 0 .../Java/Util/AbstractMap.cs | 0 .../Java/Util/ArrayList.cs | 0 .../Java/Util/Collection.cs | 0 .../Java/Util/Collections.cs | 0 .../Util/Concurrent/ExecutionException.cs | 0 .../Java/Util/Concurrent/Future.cs | 0 .../Java/Util/Concurrent/TimeUnit.cs | 0 .../{JavaBridge => JNet}/Java/Util/Date.cs | 0 .../Java/Util/Dictionary.cs | 0 .../{JavaBridge => JNet}/Java/Util/HashMap.cs | 0 .../Java/Util/Hashtable.cs | 0 .../Java/Util/Iterator.cs | 0 .../{JavaBridge => JNet}/Java/Util/List.cs | 0 src/net/{JavaBridge => JNet}/Java/Util/Map.cs | 0 .../Java/Util/Optional.cs | 0 .../Java/Util/OptionalDouble.cs | 0 .../Java/Util/OptionalInt.cs | 0 .../Java/Util/OptionalLong.cs | 0 .../Java/Util/Properties.cs | 0 .../Java/Util/RegEx/Duration.cs | 0 src/net/{JavaBridge => JNet}/Java/Util/Set.cs | 0 .../{JavaBridge => JNet}/Java/Util/TreeMap.cs | 0 .../{JavaBridge => JNet}/Java/Util/UUID.cs | 0 .../mases.jnet.targets} | 0 src/net/JNetTemplates.sln | 31 +++++++++++++++ src/net/JavaBridgeTemplates.sln | 31 --------------- src/net/templates/templatepack.csproj | 20 +++++----- .../.template.config/template.json | 6 +-- .../{javabridgeApp => jnetApp}/Program.cs | 6 +-- .../jnetApp.csproj} | 8 ++-- tests/JNetTest.sln | 31 +++++++++++++++ .../JNetTest.csproj} | 10 ++--- tests/{JavaBridgeTest => JNetTest}/Program.cs | 4 +- tests/JavaBridgeTest.sln | 31 --------------- 59 files changed, 190 insertions(+), 191 deletions(-) rename src/java/{javabridge => jnet}/pom.xml (95%) rename src/net/Common/{JavaBridge.snk => JNet.snk} (100%) rename src/net/{JavaBridge.sln => JNet.sln} (75%) rename src/net/{JavaBridge => JNet}/InternalConst.cs (96%) rename src/net/{JavaBridge/JavaBridge.csproj => JNet/JNet.csproj} (74%) rename src/net/{JavaBridge/JavaBridgeCore.cs => JNet/JNetCore.cs} (95%) rename src/net/{JavaBridge => JNet}/Java/Io/File.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Math/BigDecimal.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Nio/ByteBuffer.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Time/Duration.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Time/Instant.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Util/AbstractMap.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Util/ArrayList.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Util/Collection.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Util/Collections.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Util/Concurrent/ExecutionException.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Util/Concurrent/Future.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Util/Concurrent/TimeUnit.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Util/Date.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Util/Dictionary.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Util/HashMap.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Util/Hashtable.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Util/Iterator.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Util/List.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Util/Map.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Util/Optional.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Util/OptionalDouble.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Util/OptionalInt.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Util/OptionalLong.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Util/Properties.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Util/RegEx/Duration.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Util/Set.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Util/TreeMap.cs (100%) rename src/net/{JavaBridge => JNet}/Java/Util/UUID.cs (100%) rename src/net/{JavaBridge/mases.javabridge.targets => JNet/mases.jnet.targets} (100%) create mode 100644 src/net/JNetTemplates.sln delete mode 100644 src/net/JavaBridgeTemplates.sln rename src/net/templates/templates/{javabridgeApp => jnetApp}/.template.config/template.json (58%) rename src/net/templates/templates/{javabridgeApp => jnetApp}/Program.cs (67%) rename src/net/templates/templates/{javabridgeApp/javabridgeApp.csproj => jnetApp/jnetApp.csproj} (56%) create mode 100644 tests/JNetTest.sln rename tests/{JavaBridgeTest/JavaBridgeTest.csproj => JNetTest/JNetTest.csproj} (64%) rename tests/{JavaBridgeTest => JNetTest}/Program.cs (88%) delete mode 100644 tests/JavaBridgeTest.sln diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c8c35dd575..1db11460fa 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -67,10 +67,10 @@ jobs: ${{ runner.os }}-maven- - name: Pre compile templates - run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\net\JavaBridgeTemplates.sln + run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\net\JNetTemplates.sln - name: Pre compile - run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\net\JavaBridge\JavaBridge.csproj + run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\net\JNet\JNet.csproj - name: Set up Apache Maven Central uses: actions/setup-java@v1 @@ -87,23 +87,23 @@ jobs: shell: bash - name: Create Jars - run: mvn --file ./src/java/javabridge/pom.xml --no-transfer-progress package + run: mvn --file ./src/java/jnet/pom.xml --no-transfer-progress package env: MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} # - name: Compile command line - # run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\net\JavaBridgeCLI\JavaBridgeCLI.csproj + # run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\net\JNetCLI\JNetCLI.csproj # # - uses: nuget/setup-nuget@v1 # with: # nuget-version: '5.x' # - # - run: nuget pack src\net\JavaBridgeCLI\JavaBridgeCLI.nuspec -OutputDirectory .\bin + # - run: nuget pack src\net\JNetCLI\JNetCLI.nuspec -OutputDirectory .\bin - name: Recompile to create nuget packages - run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\net\JavaBridge.sln + run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\net\JNet.sln - name: Clear documentation folder run: Remove-Item .\docs\* -Recurse -Force -Exclude _config.yml @@ -116,7 +116,7 @@ jobs: - uses: actions/upload-artifact@v2 with: - name: JavaBridge + name: JNet path: .\bin\*nupkg - name: Extract commit SHA diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index bcd03b5887..784fae5fd4 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -83,14 +83,14 @@ jobs: - name: Maven preparation (step 1) if: matrix.language == 'java' - run: dotnet build --no-incremental --configuration Release --framework net5.0 /p:Platform="Any CPU" ./src/net/JavaBridge.sln + run: dotnet build --no-incremental --configuration Release --framework net5.0 /p:Platform="Any CPU" ./src/net/JNet.sln - name: Maven preparation (step 2) if: matrix.language == 'java' run: mvn "install:install-file" "-DgroupId=JCOBridge" "-DartifactId=JCOBridge" "-Dversion=2.4.7" "-Dpackaging=jar" "-Dfile=./bin/net5.0/JCOBridge.jar" - if: matrix.language == 'java' - run: mvn --file ./src/java/javabridge/pom.xml --no-transfer-progress package + run: mvn --file ./src/java/jnet/pom.xml --no-transfer-progress package - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v1 diff --git a/.github/workflows/pullrequest.yaml b/.github/workflows/pullrequest.yaml index c038949e8a..47829f6d96 100644 --- a/.github/workflows/pullrequest.yaml +++ b/.github/workflows/pullrequest.yaml @@ -35,10 +35,10 @@ jobs: ${{ runner.os }}-maven- - name: Pre compile templates - run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\net\JavaBridgeTemplates.sln + run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\net\JNetTemplates.sln - name: Pre compile - run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\net\JavaBridge\JavaBridge.csproj + run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\net\JNet\JNet.csproj - name: Set up Apache Maven Central uses: actions/setup-java@v1 @@ -55,23 +55,23 @@ jobs: shell: bash - name: Create Jars - run: mvn --file ./src/java/javabridge/pom.xml --no-transfer-progress package + run: mvn --file ./src/java/jnet/pom.xml --no-transfer-progress package env: MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} # - name: Compile command line - # run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\net\JavaBridgeCLI\JavaBridgeCLI.csproj + # run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\net\JNetCLI\JNetCLI.csproj # # - uses: nuget/setup-nuget@v1 # with: # nuget-version: '5.x' # - # - run: nuget pack src\net\JavaBridgeCLI\JavaBridgeCLI.nuspec -OutputDirectory .\bin + # - run: nuget pack src\net\JNetCLI\JNetCLI.nuspec -OutputDirectory .\bin - name: Recompile to create nuget packages - run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\net\JavaBridge.sln + run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\net\JNet.sln - name: Clear documentation folder run: Remove-Item .\docs\* -Recurse -Force -Exclude _config.yml diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b7208d1b8e..660cdf89d9 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -29,7 +29,7 @@ jobs: submodules: 'true' - name: Pre compile - run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\net\JavaBridge\JavaBridge.csproj + run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\net\JNet\JNet.csproj - name: Set up Apache Maven Central uses: actions/setup-java@v1 @@ -46,23 +46,23 @@ jobs: shell: bash - name: Create Jars - run: mvn --file ./src/java/javabridge/pom.xml --no-transfer-progress package + run: mvn --file ./src/java/jnet/pom.xml --no-transfer-progress package env: MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} # - name: Compile command line - # run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\net\JavaBridgeCLI\JavaBridgeCLI.csproj + # run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\net\JNetCLI\JNetCLI.csproj # # - uses: nuget/setup-nuget@v1 # with: # nuget-version: '5.x' # - # - run: nuget pack src\net\JavaBridgeCLI\JavaBridgeCLI.nuspec -OutputDirectory .\bin + # - run: nuget pack src\net\JNetCLI\JNetCLI.nuspec -OutputDirectory .\bin - name: Recompile to create nuget packages - run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\net\JavaBridge.sln + run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\net\JNet.sln - name: Publish to NuGet run: | diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 73ad653b2e..57be4050d3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,12 +1,12 @@ -# Contributing to JavaBridge +# Contributing to JNet First off, thanks for taking the time to contribute! -The following is a set of guidelines for contributing to JavaBridge, which are hosted in the [MASES Group Organization](https://github.com/masesgroup) on GitHub. Feel free to propose changes to this document in a pull request. We are trying to have a common idea between all partecipant. +The following is a set of guidelines for contributing to JNet, which are hosted in the [MASES Group Organization](https://github.com/masesgroup) on GitHub. Feel free to propose changes to this document in a pull request. We are trying to have a common idea between all partecipant. ## Code of Conduct -This project and everyone participating in it is governed by the [JavaBridge 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](mailto:coc_reporting@masesgroup.com). +This project and everyone participating in it is governed by the [JNet 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](mailto:coc_reporting@masesgroup.com). # Project organization @@ -15,12 +15,12 @@ The project is organized in this folder structure: * **docs** (website) * **src** * **java** - * **JavaBridge**: contains the JVM side implementation of some classes managed from .NET side; it is structured as a complete Maven project + * **JNet**: contains the JVM side implementation of some classes managed from .NET side; it is structured as a complete Maven project * **net** - * **JavaBridge**: The folder containing the source and project of the files ported on .NET + * **JNet**: The folder containing the source and project of the files ported on .NET * **templates**: The folder containing the source and project to generate the NuGet template package * **tests** - * **JavaBridgeTest**: The folder containing the source and project of the JavaBridge tests + * **JNetTest**: The folder containing the source and project of the JNet tests # How Can I Contribute? @@ -34,7 +34,7 @@ If you are a developer and want to contribute you are welcome. ## Suggesting Enhancements -This section guides you through submitting an enhancement suggestion for JavaBridge, including completely new features and minor improvements to existing functionality. Following these guidelines helps maintainers and the community understand your suggestion and find related suggestions. +This section guides you through submitting an enhancement suggestion for JNet, including completely new features and minor improvements to existing functionality. Following these guidelines helps maintainers and the community understand your suggestion and find related suggestions. Before creating enhancement suggestions, please check this list as you might find out that you don't need to create one. When you are creating an enhancement suggestion, please include as many details as possible. Fill in [the template](PULL_REQUEST_TEMPLATE.md), including the steps that you imagine you would take if the feature you're requesting existed. @@ -46,14 +46,14 @@ Enhancement suggestions are tracked as GitHub issues. Create an issue on that re * Provide a step-by-step description of the suggested enhancement in as many details as possible. * Provide specific examples to demonstrate the steps. Include copy/pasteable snippets which you use in those examples, as Markdown code blocks. * Describe the current behavior and explain which behavior you expected to see instead and why. -* Include screenshots and animated GIFs which help you demonstrate the steps or point out the part of JavaBridge which the suggestion is related to. -* Explain why this enhancement would be useful to most JavaBridge users. -* Specify which version of JavaBridge you're using. +* Include screenshots and animated GIFs which help you demonstrate the steps or point out the part of JNet which the suggestion is related to. +* Explain why this enhancement would be useful to most JNet users. +* Specify which version of JNet you're using. * Specify the name and version of the OS you're using. ## Reporting Bugs -This section guides you through submitting a bug report for JavaBridge. Following these guidelines helps maintainers and the community understand your report, reproduce the behavior, and find related reports. +This section guides you through submitting a bug report for JNet. Following these guidelines helps maintainers and the community understand your report, reproduce the behavior, and find related reports. Before creating bug reports, please check this list as you might find out that you don't need to create one. When you are creating a bug report, please include as many details as possible. @@ -66,28 +66,28 @@ Bugs are tracked as [GitHub issues](https://guides.github.com/features/issues/). Explain the problem and include additional details to help maintainers reproduce the problem: * Use a clear and descriptive title for the issue to identify the problem. -* Describe the exact steps which reproduce the problem in as many details as possible. For example, start by explaining how you started JavaBridge, e.g. which command exactly you used in the terminal, or how you started JavaBridge otherwise. When listing steps, don't just say what you did, but explain how you did it. For example, if you moved the cursor to the end of a line, explain if you used the mouse, or a keyboard shortcut or an JavaBridge command, and if so which one? +* Describe the exact steps which reproduce the problem in as many details as possible. For example, start by explaining how you started JNet, e.g. which command exactly you used in the terminal, or how you started JNet otherwise. When listing steps, don't just say what you did, but explain how you did it. For example, if you moved the cursor to the end of a line, explain if you used the mouse, or a keyboard shortcut or an JNet command, and if so which one? * Provide specific examples to demonstrate the steps. Include links to files or GitHub projects, or copy/pasteable snippets, which you use in those examples. If you're providing snippets in the issue, use Markdown code blocks. * Describe the behavior you observed after following the steps and point out what exactly is the problem with that behavior. * Explain which behavior you expected to see instead and why. * Include screenshots and animated GIFs which show you following the described steps and clearly demonstrate the problem. If you use the keyboard while following the steps, record the GIF with the Keybinding Resolver shown. -* If you're reporting that JavaBridge crashed, include a crash report with a stack trace from the operating system. On macOS, the crash report will be available in Console.app under "Diagnostic and usage information" > "User diagnostic reports". Include the crash report in the issue in a code block, a file attachment, or put it in a gist and provide link to that gist. +* If you're reporting that JNet crashed, include a crash report with a stack trace from the operating system. On macOS, the crash report will be available in Console.app under "Diagnostic and usage information" > "User diagnostic reports". Include the crash report in the issue in a code block, a file attachment, or put it in a gist and provide link to that gist. * If the problem is related to performance or memory, include a CPU profile capture with your report. * If the problem wasn't triggered by a specific action, describe what you were doing before the problem happened and share more information using the guidelines below. Provide more context by answering these questions: * Can you reproduce the problem in safe mode? -* Did the problem start happening recently (e.g. after updating to a new version of JavaBridge) or was this always a problem? -* If the problem started happening recently, can you reproduce the problem in an older version of JavaBridge? What's the most recent version in which the problem doesn't happen? You can download older versions of JavaBridge from the releases page. +* Did the problem start happening recently (e.g. after updating to a new version of JNet) or was this always a problem? +* If the problem started happening recently, can you reproduce the problem in an older version of JNet? What's the most recent version in which the problem doesn't happen? You can download older versions of JNet from the releases page. * Can you reliably reproduce the issue? If not, provide details about how often the problem happens and under which conditions it normally happens. * If the problem is related to working with files (e.g. opening and editing files), does the problem happen for all files and projects or only some? Does the problem happen only when working with local or remote files (e.g. on network drives), with files of a specific type (e.g. only JavaScript or Python files), with large files or files with very long lines, or with files in a specific encoding? Is there anything else special about the files you are using? Include details about your configuration and environment: -* Which version of JavaBridge are you using? +* Which version of JNet are you using? * What's the name and version of the OS you're using? -* Are you running JavaBridge in a virtual machine? If so, which VM software are you using and which operating systems and versions are used for the host and the guest? -* Are you using JavaBridge with multiple monitors? If so, can you reproduce the problem when you use a single monitor? +* Are you running JNet in a virtual machine? If so, which VM software are you using and which operating systems and versions are used for the host and the guest? +* Are you using JNet with multiple monitors? If so, can you reproduce the problem when you use a single monitor? * Which keyboard layout are you using? Are you using a US layout or some other layout? diff --git a/README.md b/README.md index 40c3b3edf5..391c1ced28 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# JavaBridge: the Java .NET implementation +# JNet: the Java .NET implementation -[![CI_BUILD](https://github.com/masesgroup/JavaBridge/actions/workflows/build.yaml/badge.svg)](https://github.com/masesgroup/JavaBridge/actions/workflows/build.yaml) [![CI_RELEASE](https://github.com/masesgroup/JavaBridge/actions/workflows/release.yaml/badge.svg)](https://github.com/masesgroup/JavaBridge/actions/workflows/release.yaml) +[![CI_BUILD](https://github.com/masesgroup/JNet/actions/workflows/build.yaml/badge.svg)](https://github.com/masesgroup/JNet/actions/workflows/build.yaml) [![CI_RELEASE](https://github.com/masesgroup/JNet/actions/workflows/release.yaml/badge.svg)](https://github.com/masesgroup/JNet/actions/workflows/release.yaml) -|JavaBridge | JavaBridge.Templates | +|JNet | JNet.Templates | |--- |--- | -|[![JavaBridge nuget](https://img.shields.io/nuget/v/MASES.JavaBridge)](https://www.nuget.org/packages/MASES.JavaBridge) [![downloads](https://img.shields.io/nuget/dt/MASES.JavaBridge)](https://www.nuget.org/packages/MASES.JavaBridge) | [![JavaBridge.Templates nuget](https://img.shields.io/nuget/v/MASES.JavaBridge.Templates)](https://www.nuget.org/packages/MASES.JavaBridge.Templates) [![downloads](https://img.shields.io/nuget/dt/MASES.JavaBridge.Templates)](https://www.nuget.org/packages/MASES.JavaBridge.Templates)| +|[![JNet nuget](https://img.shields.io/nuget/v/MASES.JNet)](https://www.nuget.org/packages/MASES.JNet) [![downloads](https://img.shields.io/nuget/dt/MASES.JNet)](https://www.nuget.org/packages/MASES.JNet) | [![JNet.Templates nuget](https://img.shields.io/nuget/v/MASES.JNet.Templates)](https://www.nuget.org/packages/MASES.JNet.Templates) [![downloads](https://img.shields.io/nuget/dt/MASES.JNet.Templates)](https://www.nuget.org/packages/MASES.JNet.Templates)| -JavaBridge is a .NET mirror of Java APIs. +JNet is a .NET mirror of Java APIs. 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. @@ -15,13 +15,13 @@ This project adheres to the Contributor [Covenant code of conduct](CODE_OF_CONDU This project aims to create a library to direct access, from .NET, all the features available in the Java Platform, this is the counterpart of [JCOReflector](https://github.com/masesgroup/JCOReflector). There are many client libraries written to manage communication with Java. Conversely, this project use directly the Java packages giving more than one benefit: -* all implemented features are availables at no extra implementation costs, see [JavaBridge usage](src/net/Documentation/articles/usage.md); +* all implemented features are availables at no extra implementation costs, see [JNet usage](src/net/Documentation/articles/usage.md); * avoids any third party communication protocol implementation; * access all features made available from Java platform. ## Runtime engine -JavaBridge uses [JCOBridge](https://www.jcobridge.com), and its [features](https://www.jcobridge.com/features/), to obtain many benefits: +JNet uses [JCOBridge](https://www.jcobridge.com), and its [features](https://www.jcobridge.com/features/), to obtain many benefits: * **Cyber-security**: * [JVM](https://en.wikipedia.org/wiki/Java_virtual_machine) and [CLR, or CoreCLR,](https://en.wikipedia.org/wiki/Common_Language_Runtime) runs in the same process, but are insulated from each other; * JCOBridge does not make any code injection into JVM; @@ -32,7 +32,7 @@ JavaBridge uses [JCOBridge](https://www.jcobridge.com), and its [features](https * No need to learn new APIs: we try to expose the same APIs in C# style; * No extra validation cycle on protocol and functionality: bug fix, improvements, new features are immediately available; * Documentation is shared; -* **Dynamic code**: it helps to write a Java/Scala/Kotlin/etc seamless language code directly inside a standard .NET application written in C#/VB.NET: look at this [simple example](https://www.jcobridge.com/net-examples/dotnet-examples/) and [JavaBridge APIs extensibility](src/net/Documentation/articles/API_extensibility.md). +* **Dynamic code**: it helps to write a Java/Scala/Kotlin/etc seamless language code directly inside a standard .NET application written in C#/VB.NET: look at this [simple example](https://www.jcobridge.com/net-examples/dotnet-examples/) and [JNet APIs extensibility](src/net/Documentation/articles/API_extensibility.md). Have a look at the following resources: - [Release notes](https://www.jcobridge.com/release-notes/) @@ -44,7 +44,7 @@ Have a look at the following resources: * [Roadmap](src/net/Documentation/articles/roadmap.md) * [Actual state](src/net/Documentation/articles/actualstate.md) -* [JavaBridge usage](src/net/Documentation/articles/usage.md) -* [JavaBridge APIs extensibility](src/net/Documentation/articles/API_extensibility.md) +* [JNet usage](src/net/Documentation/articles/usage.md) +* [JNet APIs extensibility](src/net/Documentation/articles/API_extensibility.md) --- diff --git a/src/java/javabridge/pom.xml b/src/java/jnet/pom.xml similarity index 95% rename from src/java/javabridge/pom.xml rename to src/java/jnet/pom.xml index 017e413bc1..cca30dcc60 100644 --- a/src/java/javabridge/pom.xml +++ b/src/java/jnet/pom.xml @@ -5,10 +5,10 @@ 4.0.0 com.masesgroup - javabridge - mases.javabridge + jnet + mases.jnet Java interface bridging implementation - https://github.com/masesgroup/JavaBridge + https://github.com/masesgroup/JNet 1.1.12.0 @@ -20,13 +20,13 @@ - https://github.com/masesgroup/JavaBridge/issues + https://github.com/masesgroup/JNet/issues GitHub Issues - https://github.com/masesgroup/JavaBridge - scm:git:git://github.com/masesgroup/JavaBridge.git - scm:git:git@github.com:masesgroup/JavaBridge.git + https://github.com/masesgroup/JNet + scm:git:git://github.com/masesgroup/JNet.git + scm:git:git@github.com:masesgroup/JNet.git @@ -40,7 +40,6 @@ 8 8 ${basedir}/classpathfile.classpath - 3.1.0 diff --git a/src/net/Common/JavaBridge.snk b/src/net/Common/JNet.snk similarity index 100% rename from src/net/Common/JavaBridge.snk rename to src/net/Common/JNet.snk diff --git a/src/net/Documentation/articles/API_extensibility.md b/src/net/Documentation/articles/API_extensibility.md index 522f721c87..712f493be9 100644 --- a/src/net/Documentation/articles/API_extensibility.md +++ b/src/net/Documentation/articles/API_extensibility.md @@ -1,4 +1,4 @@ -# JavaBridge: APIs extendibility +# JNet: APIs extendibility What to do if an API was not yet implemented? The simplest answer is: help us to make this product reacher :-) Anyway there is another answer which is not available with other products: Dynamic code and programmatically API access. diff --git a/src/net/Documentation/articles/actualstate.md b/src/net/Documentation/articles/actualstate.md index badd0a5258..a1a755c5e0 100644 --- a/src/net/Documentation/articles/actualstate.md +++ b/src/net/Documentation/articles/actualstate.md @@ -1,4 +1,4 @@ -# JavaBridge development state +# JNet development state This release comes with some ready made classes: diff --git a/src/net/Documentation/articles/intro.md b/src/net/Documentation/articles/intro.md index 20e25efa4e..4fecfc5a43 100644 --- a/src/net/Documentation/articles/intro.md +++ b/src/net/Documentation/articles/intro.md @@ -1,5 +1,5 @@ -# JavaBridge: the Java.NET implementation +# JNet: the Java.NET implementation -JavaBridge is a .NET mirror of Java APIs. +JNet is a .NET mirror of Java APIs. 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. diff --git a/src/net/Documentation/articles/jvm_callbacks.md b/src/net/Documentation/articles/jvm_callbacks.md index 99fa2d730c..cee6cb76ce 100644 --- a/src/net/Documentation/articles/jvm_callbacks.md +++ b/src/net/Documentation/articles/jvm_callbacks.md @@ -1,15 +1,15 @@ -# JavaBridge: JVM callbacks +# JNet: JVM callbacks -One of the features of [JCOBridge](https://www.jcobridge.com/), used in JavaBridge, is the callback management from JVM. +One of the features of [JCOBridge](https://www.jcobridge.com/), used in JNet, is the callback management from JVM. Many applications use the callback mechanism to be informed about events which happens during execution. Apache Kakfa exposes many API which have callbacks in the parameters. -The Java code of a callback can be written with lambda expressions, but JavaBridge cannot, it needs an object. +The Java code of a callback can be written with lambda expressions, but JNet cannot, it needs an object. -## JavaBridge Callback internals +## JNet Callback internals -JavaBridge is based on [JCOBridge](https://www.jcobridge.com/). JCOBridge as per its name is a bridge between the CLR (CoreCLR) and the JVM. +JNet is based on [JCOBridge](https://www.jcobridge.com/). JCOBridge as per its name is a bridge between the CLR (CoreCLR) and the JVM. Events, generally are expressed as interfaces in Java, and a lambda expression is translated into an object at compile time. Otherwise the developer can implement a Java class which **implements** the interface: with JCOBridge the developer needs to follow a seamless approach. -In JavaBridge some callbacks are ready made. In this tutorial the **Callback** interface (org.apache.kafka.clients.producer.Callback) will be taken as an example. +In JNet some callbacks are ready made. In this tutorial the **Callback** interface (org.apache.kafka.clients.producer.Callback) will be taken as an example. The concrete class implementing the interface is the following one: ```java @@ -38,7 +38,7 @@ Going on to the CLR side a possible concrete class in C# is as the following one ```c# public class Callback : CLRListener { - public sealed override string JniClass => "org.mases.JavaBridge.clients.producer.CallbackImpl"; + public sealed override string JniClass => "org.mases.JNet.clients.producer.CallbackImpl"; readonly Action executionFunction = null; public virtual Action Execute { get { return executionFunction; } } @@ -80,7 +80,7 @@ The structure follows the guidelines of JCOBridge: * Creating a new class extending `Callback` class, the method `OnCompletion` can be overridden; * Otherwise to the property `Execute` can be associated to an handler; -## JavaBridge Callback lifecycle +## JNet Callback lifecycle The lifecycle of the callback managed from JCOBridge is slightly different from the standard one. A `CLRListener` to be able to live without to be recovered from the Garbage Collector shall be registered. `CLRListener` do this automatically within the initialization (this behavior can be avoided with the property `AutoInit`). diff --git a/src/net/Documentation/articles/roadmap.md b/src/net/Documentation/articles/roadmap.md index 7b04356fcf..88b1fdaccd 100644 --- a/src/net/Documentation/articles/roadmap.md +++ b/src/net/Documentation/articles/roadmap.md @@ -1,4 +1,4 @@ -# JavaBridge roadmap +# JNet roadmap The roadmap can be synthetized in the following points: diff --git a/src/net/Documentation/articles/usage.md b/src/net/Documentation/articles/usage.md index a6a1a1c7b4..2a209b4884 100644 --- a/src/net/Documentation/articles/usage.md +++ b/src/net/Documentation/articles/usage.md @@ -1,4 +1,4 @@ -# JavaBridge usage +# JNet usage -To use JavaBridge classes the developer can write code in .NET using the same classes available in the official Java packages. +To use JNet classes the developer can write code in .NET using the same classes available in the official Java packages. If classes or methods are not available yet it is possible to use the approach synthetized in [What to do if an API was not yet implemented](API_extensibility.md) diff --git a/src/net/Documentation/docfx.json b/src/net/Documentation/docfx.json index bb90f7dfaa..7a66c3643e 100644 --- a/src/net/Documentation/docfx.json +++ b/src/net/Documentation/docfx.json @@ -54,7 +54,7 @@ "postProcessors": [ "ExtractSearchIndex" ], "globalMetadata": { "_appLogoPath": "images/logo.png", - "_appTitle": "Java Bridge website", + "_appTitle": "JNet website", "_appFooter": "Copyright © 2022 MASES s.r.l..
Generated by DocFX", "_gitContribute": { diff --git a/src/net/Documentation/index.md b/src/net/Documentation/index.md index 2915522e3c..66281ab661 100644 --- a/src/net/Documentation/index.md +++ b/src/net/Documentation/index.md @@ -1,6 +1,6 @@ -# JavaBridge: the Java .NET implementation +# JNet: the Java .NET implementation -JavaBridge is a .NET mirror of Java APIs. +JNet is a .NET mirror of Java APIs. 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. @@ -9,13 +9,13 @@ This project adheres to the Contributor [Covenant code of conduct](CODE_OF_CONDU This project aims to create a library to direct access, from .NET, all the features available in the Java Platform, this is the counterpart of [JCOReflector](https://github.com/masesgroup/JCOReflector) There are many client libraries written to manage communication with Java. Conversely, this project use directly the Java packages giving more than one benefit: -* all implemented features are availables at no extra implementation costs, see [JavaBridge usage](src/net/Documentation/articles/usage.md); +* all implemented features are availables at no extra implementation costs, see [JNet usage](src/net/Documentation/articles/usage.md); * avoids any third party communication protocol implementation; * access all features made available from Java platform. ## Runtime engine -JavaBridge uses [JCOBridge](https://www.jcobridge.com), and its [features](https://www.jcobridge.com/features/), to obtain many benefits: +JNet uses [JCOBridge](https://www.jcobridge.com), and its [features](https://www.jcobridge.com/features/), to obtain many benefits: * **Cyber-security**: * [JVM](https://en.wikipedia.org/wiki/Java_virtual_machine) and [CLR, or CoreCLR,](https://en.wikipedia.org/wiki/Common_Language_Runtime) runs in the same process, but are insulated from each other; * JCOBridge does not make any code injection into JVM; @@ -26,7 +26,7 @@ JavaBridge uses [JCOBridge](https://www.jcobridge.com), and its [features](https * No need to learn new APIs: we try to expose the same APIs in C# style; * No extra validation cycle on protocol and functionality: bug fix, improvements, new features are immediately available; * Documentation is shared; -* **Dynamic code**: it helps to write a Java/Scala/Kotlin/etc seamless language code directly inside a standard .NET application written in C#/VB.NET: look at this [simple example](https://www.jcobridge.com/net-examples/dotnet-examples/) and [JavaBridge APIs extensibility](articles/API_extensibility.md). +* **Dynamic code**: it helps to write a Java/Scala/Kotlin/etc seamless language code directly inside a standard .NET application written in C#/VB.NET: look at this [simple example](https://www.jcobridge.com/net-examples/dotnet-examples/) and [JNet APIs extensibility](articles/API_extensibility.md). Have a look at the following resources: - [Release notes](https://www.jcobridge.com/release-notes/) @@ -38,7 +38,7 @@ Have a look at the following resources: * [Roadmap](articles/roadmap.md) * [Actual state](articles/actualstate.md) -* [JavaBridge usage](articles/usage.md) -* [JavaBridge APIs extensibility](articles/API_extensibility.md) +* [JNet usage](articles/usage.md) +* [JNet APIs extensibility](articles/API_extensibility.md) --- diff --git a/src/net/JavaBridge.sln b/src/net/JNet.sln similarity index 75% rename from src/net/JavaBridge.sln rename to src/net/JNet.sln index e4effce90e..0830e1496b 100644 --- a/src/net/JavaBridge.sln +++ b/src/net/JNet.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "templatepack", "templates\templatepack.csproj", "{8778C196-4145-4140-8E91-9C2475DEB121}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaBridge", "JavaBridge\JavaBridge.csproj", "{7BB826C1-C900-4A40-8236-2DAC9D3A2201}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JNet", "JNet\JNet.csproj", "{4F5B925E-7E21-4971-AE00-9D0C5DBC25E8}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -17,10 +17,10 @@ Global {8778C196-4145-4140-8E91-9C2475DEB121}.Debug|Any CPU.Build.0 = Debug|Any CPU {8778C196-4145-4140-8E91-9C2475DEB121}.Release|Any CPU.ActiveCfg = Release|Any CPU {8778C196-4145-4140-8E91-9C2475DEB121}.Release|Any CPU.Build.0 = Release|Any CPU - {7BB826C1-C900-4A40-8236-2DAC9D3A2201}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7BB826C1-C900-4A40-8236-2DAC9D3A2201}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7BB826C1-C900-4A40-8236-2DAC9D3A2201}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7BB826C1-C900-4A40-8236-2DAC9D3A2201}.Release|Any CPU.Build.0 = Release|Any CPU + {4F5B925E-7E21-4971-AE00-9D0C5DBC25E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4F5B925E-7E21-4971-AE00-9D0C5DBC25E8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4F5B925E-7E21-4971-AE00-9D0C5DBC25E8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4F5B925E-7E21-4971-AE00-9D0C5DBC25E8}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/net/JavaBridge/InternalConst.cs b/src/net/JNet/InternalConst.cs similarity index 96% rename from src/net/JavaBridge/InternalConst.cs rename to src/net/JNet/InternalConst.cs index be4f15293d..46655fde3e 100644 --- a/src/net/JavaBridge/InternalConst.cs +++ b/src/net/JNet/InternalConst.cs @@ -16,7 +16,7 @@ * Refer to LICENSE for more information. */ -namespace MASES.JavaBridge +namespace MASES.JNet { class CLIParam { diff --git a/src/net/JavaBridge/JavaBridge.csproj b/src/net/JNet/JNet.csproj similarity index 74% rename from src/net/JavaBridge/JavaBridge.csproj rename to src/net/JNet/JNet.csproj index 6fe194b416..d3416f9a95 100644 --- a/src/net/JavaBridge/JavaBridge.csproj +++ b/src/net/JNet/JNet.csproj @@ -1,33 +1,33 @@ latest - MASES.JavaBridge - MASES.JavaBridge - JavaBridge - the Java .NET implementation - JavaBridge - the Java .NET implementation + MASES.JNet + MASES.JNet + JNet - the Java .NET implementation + JNet - the Java .NET implementation Copyright © MASES s.r.l. 2022 MASES s.r.l. MASES s.r.l. MASES s.r.l. 1.0.0.0 - JavaBridge + JNet true net461;netcoreapp3.1;net5.0;net6.0 ..\..\..\bin\ true true - https://github.com/masesgroup/JavaBridge/ - https://github.com/masesgroup/JavaBridge - https://github.com/masesgroup/JavaBridge/releases + https://github.com/masesgroup/JNet/ + https://github.com/masesgroup/JNet + https://github.com/masesgroup/JNet/releases LICENSE JCOB128x128.png - javabridge dotnet clr netcore net5 net6 java - MASES.JavaBridge + jnet dotnet clr netcore net5 net6 java bridge + MASES.JNet true snupkg true true - ..\Common\JavaBridge.snk + ..\Common\JNet.snk usage.md @@ -47,7 +47,7 @@ - + diff --git a/src/net/JavaBridge/JavaBridgeCore.cs b/src/net/JNet/JNetCore.cs similarity index 95% rename from src/net/JavaBridge/JavaBridgeCore.cs rename to src/net/JNet/JNetCore.cs index 8b70afae87..a8ca4d93ce 100644 --- a/src/net/JavaBridge/JavaBridgeCore.cs +++ b/src/net/JNet/JNetCore.cs @@ -23,12 +23,12 @@ using System.IO; using System.Linq; -namespace MASES.JavaBridge +namespace MASES.JNet { /// - /// Public entry point of + /// Public entry point of /// - public class JavaBridgeCore : SetupJVMWrapper where T : JavaBridgeCore + public class JNetCore : SetupJVMWrapper where T : JNetCore { static readonly object lockInstance = new(); static T _instance = null; @@ -89,7 +89,7 @@ public static void CreateGlobalInstance() /// /// Public ctor /// - public JavaBridgeCore() + public JNetCore() { Parser.Add(CommandLineArguments); _parsedArgs = Parser.Parse(FilteredArgs); @@ -175,7 +175,7 @@ string buildClassPath() } } - public class JavaBridgeCore : JavaBridgeCore + public class JNetCore : JNetCore { } diff --git a/src/net/JavaBridge/Java/Io/File.cs b/src/net/JNet/Java/Io/File.cs similarity index 100% rename from src/net/JavaBridge/Java/Io/File.cs rename to src/net/JNet/Java/Io/File.cs diff --git a/src/net/JavaBridge/Java/Math/BigDecimal.cs b/src/net/JNet/Java/Math/BigDecimal.cs similarity index 100% rename from src/net/JavaBridge/Java/Math/BigDecimal.cs rename to src/net/JNet/Java/Math/BigDecimal.cs diff --git a/src/net/JavaBridge/Java/Nio/ByteBuffer.cs b/src/net/JNet/Java/Nio/ByteBuffer.cs similarity index 100% rename from src/net/JavaBridge/Java/Nio/ByteBuffer.cs rename to src/net/JNet/Java/Nio/ByteBuffer.cs diff --git a/src/net/JavaBridge/Java/Time/Duration.cs b/src/net/JNet/Java/Time/Duration.cs similarity index 100% rename from src/net/JavaBridge/Java/Time/Duration.cs rename to src/net/JNet/Java/Time/Duration.cs diff --git a/src/net/JavaBridge/Java/Time/Instant.cs b/src/net/JNet/Java/Time/Instant.cs similarity index 100% rename from src/net/JavaBridge/Java/Time/Instant.cs rename to src/net/JNet/Java/Time/Instant.cs diff --git a/src/net/JavaBridge/Java/Util/AbstractMap.cs b/src/net/JNet/Java/Util/AbstractMap.cs similarity index 100% rename from src/net/JavaBridge/Java/Util/AbstractMap.cs rename to src/net/JNet/Java/Util/AbstractMap.cs diff --git a/src/net/JavaBridge/Java/Util/ArrayList.cs b/src/net/JNet/Java/Util/ArrayList.cs similarity index 100% rename from src/net/JavaBridge/Java/Util/ArrayList.cs rename to src/net/JNet/Java/Util/ArrayList.cs diff --git a/src/net/JavaBridge/Java/Util/Collection.cs b/src/net/JNet/Java/Util/Collection.cs similarity index 100% rename from src/net/JavaBridge/Java/Util/Collection.cs rename to src/net/JNet/Java/Util/Collection.cs diff --git a/src/net/JavaBridge/Java/Util/Collections.cs b/src/net/JNet/Java/Util/Collections.cs similarity index 100% rename from src/net/JavaBridge/Java/Util/Collections.cs rename to src/net/JNet/Java/Util/Collections.cs diff --git a/src/net/JavaBridge/Java/Util/Concurrent/ExecutionException.cs b/src/net/JNet/Java/Util/Concurrent/ExecutionException.cs similarity index 100% rename from src/net/JavaBridge/Java/Util/Concurrent/ExecutionException.cs rename to src/net/JNet/Java/Util/Concurrent/ExecutionException.cs diff --git a/src/net/JavaBridge/Java/Util/Concurrent/Future.cs b/src/net/JNet/Java/Util/Concurrent/Future.cs similarity index 100% rename from src/net/JavaBridge/Java/Util/Concurrent/Future.cs rename to src/net/JNet/Java/Util/Concurrent/Future.cs diff --git a/src/net/JavaBridge/Java/Util/Concurrent/TimeUnit.cs b/src/net/JNet/Java/Util/Concurrent/TimeUnit.cs similarity index 100% rename from src/net/JavaBridge/Java/Util/Concurrent/TimeUnit.cs rename to src/net/JNet/Java/Util/Concurrent/TimeUnit.cs diff --git a/src/net/JavaBridge/Java/Util/Date.cs b/src/net/JNet/Java/Util/Date.cs similarity index 100% rename from src/net/JavaBridge/Java/Util/Date.cs rename to src/net/JNet/Java/Util/Date.cs diff --git a/src/net/JavaBridge/Java/Util/Dictionary.cs b/src/net/JNet/Java/Util/Dictionary.cs similarity index 100% rename from src/net/JavaBridge/Java/Util/Dictionary.cs rename to src/net/JNet/Java/Util/Dictionary.cs diff --git a/src/net/JavaBridge/Java/Util/HashMap.cs b/src/net/JNet/Java/Util/HashMap.cs similarity index 100% rename from src/net/JavaBridge/Java/Util/HashMap.cs rename to src/net/JNet/Java/Util/HashMap.cs diff --git a/src/net/JavaBridge/Java/Util/Hashtable.cs b/src/net/JNet/Java/Util/Hashtable.cs similarity index 100% rename from src/net/JavaBridge/Java/Util/Hashtable.cs rename to src/net/JNet/Java/Util/Hashtable.cs diff --git a/src/net/JavaBridge/Java/Util/Iterator.cs b/src/net/JNet/Java/Util/Iterator.cs similarity index 100% rename from src/net/JavaBridge/Java/Util/Iterator.cs rename to src/net/JNet/Java/Util/Iterator.cs diff --git a/src/net/JavaBridge/Java/Util/List.cs b/src/net/JNet/Java/Util/List.cs similarity index 100% rename from src/net/JavaBridge/Java/Util/List.cs rename to src/net/JNet/Java/Util/List.cs diff --git a/src/net/JavaBridge/Java/Util/Map.cs b/src/net/JNet/Java/Util/Map.cs similarity index 100% rename from src/net/JavaBridge/Java/Util/Map.cs rename to src/net/JNet/Java/Util/Map.cs diff --git a/src/net/JavaBridge/Java/Util/Optional.cs b/src/net/JNet/Java/Util/Optional.cs similarity index 100% rename from src/net/JavaBridge/Java/Util/Optional.cs rename to src/net/JNet/Java/Util/Optional.cs diff --git a/src/net/JavaBridge/Java/Util/OptionalDouble.cs b/src/net/JNet/Java/Util/OptionalDouble.cs similarity index 100% rename from src/net/JavaBridge/Java/Util/OptionalDouble.cs rename to src/net/JNet/Java/Util/OptionalDouble.cs diff --git a/src/net/JavaBridge/Java/Util/OptionalInt.cs b/src/net/JNet/Java/Util/OptionalInt.cs similarity index 100% rename from src/net/JavaBridge/Java/Util/OptionalInt.cs rename to src/net/JNet/Java/Util/OptionalInt.cs diff --git a/src/net/JavaBridge/Java/Util/OptionalLong.cs b/src/net/JNet/Java/Util/OptionalLong.cs similarity index 100% rename from src/net/JavaBridge/Java/Util/OptionalLong.cs rename to src/net/JNet/Java/Util/OptionalLong.cs diff --git a/src/net/JavaBridge/Java/Util/Properties.cs b/src/net/JNet/Java/Util/Properties.cs similarity index 100% rename from src/net/JavaBridge/Java/Util/Properties.cs rename to src/net/JNet/Java/Util/Properties.cs diff --git a/src/net/JavaBridge/Java/Util/RegEx/Duration.cs b/src/net/JNet/Java/Util/RegEx/Duration.cs similarity index 100% rename from src/net/JavaBridge/Java/Util/RegEx/Duration.cs rename to src/net/JNet/Java/Util/RegEx/Duration.cs diff --git a/src/net/JavaBridge/Java/Util/Set.cs b/src/net/JNet/Java/Util/Set.cs similarity index 100% rename from src/net/JavaBridge/Java/Util/Set.cs rename to src/net/JNet/Java/Util/Set.cs diff --git a/src/net/JavaBridge/Java/Util/TreeMap.cs b/src/net/JNet/Java/Util/TreeMap.cs similarity index 100% rename from src/net/JavaBridge/Java/Util/TreeMap.cs rename to src/net/JNet/Java/Util/TreeMap.cs diff --git a/src/net/JavaBridge/Java/Util/UUID.cs b/src/net/JNet/Java/Util/UUID.cs similarity index 100% rename from src/net/JavaBridge/Java/Util/UUID.cs rename to src/net/JNet/Java/Util/UUID.cs diff --git a/src/net/JavaBridge/mases.javabridge.targets b/src/net/JNet/mases.jnet.targets similarity index 100% rename from src/net/JavaBridge/mases.javabridge.targets rename to src/net/JNet/mases.jnet.targets diff --git a/src/net/JNetTemplates.sln b/src/net/JNetTemplates.sln new file mode 100644 index 0000000000..b497063ff3 --- /dev/null +++ b/src/net/JNetTemplates.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32014.148 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JNet", "JNet\JNet.csproj", "{E3614C53-869D-4E9E-B03B-231E270BD782}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jnetApp", "templates\templates\jnetApp\jnetApp.csproj", "{72B4B72F-87E2-41D5-81A4-F694DD94DA6F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E3614C53-869D-4E9E-B03B-231E270BD782}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E3614C53-869D-4E9E-B03B-231E270BD782}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E3614C53-869D-4E9E-B03B-231E270BD782}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E3614C53-869D-4E9E-B03B-231E270BD782}.Release|Any CPU.Build.0 = Release|Any CPU + {72B4B72F-87E2-41D5-81A4-F694DD94DA6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {72B4B72F-87E2-41D5-81A4-F694DD94DA6F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {72B4B72F-87E2-41D5-81A4-F694DD94DA6F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {72B4B72F-87E2-41D5-81A4-F694DD94DA6F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {337100A8-DBCD-4838-B9C7-74EC0DE78755} + EndGlobalSection +EndGlobal diff --git a/src/net/JavaBridgeTemplates.sln b/src/net/JavaBridgeTemplates.sln deleted file mode 100644 index 1fb5b9b0e2..0000000000 --- a/src/net/JavaBridgeTemplates.sln +++ /dev/null @@ -1,31 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32014.148 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaBridge", "JavaBridge\JavaBridge.csproj", "{E7C8F876-71A0-4EE0-A4E9-58939954A1CC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "javabridgeApp", "templates\templates\javabridgeApp\javabridgeApp.csproj", "{C47B3A03-793E-4102-A872-4A39C6E03575}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E7C8F876-71A0-4EE0-A4E9-58939954A1CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7C8F876-71A0-4EE0-A4E9-58939954A1CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7C8F876-71A0-4EE0-A4E9-58939954A1CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7C8F876-71A0-4EE0-A4E9-58939954A1CC}.Release|Any CPU.Build.0 = Release|Any CPU - {C47B3A03-793E-4102-A872-4A39C6E03575}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C47B3A03-793E-4102-A872-4A39C6E03575}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C47B3A03-793E-4102-A872-4A39C6E03575}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C47B3A03-793E-4102-A872-4A39C6E03575}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {337100A8-DBCD-4838-B9C7-74EC0DE78755} - EndGlobalSection -EndGlobal diff --git a/src/net/templates/templatepack.csproj b/src/net/templates/templatepack.csproj index 89179a298c..66c53cf142 100644 --- a/src/net/templates/templatepack.csproj +++ b/src/net/templates/templatepack.csproj @@ -2,29 +2,29 @@ Template 1.0.0.0 - MASES.JavaBridge.Templates - JavaBridge Templates - Templates to use the JavaBridge + MASES.JNet.Templates + JNet Templates - Templates to use the JNet MASES s.r.l. MASES s.r.l. MASES s.r.l. Copyright © MASES s.r.l. 2022 - Ready made templates to create applications based on JavaBridge - Ready made templates to create applications based on JavaBridge. The templates are ready made starting points, all information and APIs are available in the official website https://masesgroup.github.io/JavaBridge + Ready made templates to create applications based on JNet + Ready made templates to create applications based on JNet. The templates are ready made starting points, all information and APIs are available in the official website https://masesgroup.github.io/JNet net6.0;net5.0;netcoreapp3.1;net461 ..\..\..\bin\ true true - https://github.com/masesgroup/JavaBridge/ - https://github.com/masesgroup/JavaBridge - https://github.com/masesgroup/JavaBridge/releases + https://github.com/masesgroup/JNet/ + https://github.com/masesgroup/JNet + https://github.com/masesgroup/JNet/releases LICENSE JCOB128x128.png javabridge java dotnet clr netcore net5 net6 template 8.0 - JavaBridge Templates + JNet Templates true true - ..\Common\JavaBridge.snk + ..\Common\JNet.snk true false content @@ -44,7 +44,7 @@ - + diff --git a/src/net/templates/templates/javabridgeApp/.template.config/template.json b/src/net/templates/templates/jnetApp/.template.config/template.json similarity index 58% rename from src/net/templates/templates/javabridgeApp/.template.config/template.json rename to src/net/templates/templates/jnetApp/.template.config/template.json index 8e43947533..004b3d64e4 100644 --- a/src/net/templates/templates/javabridgeApp/.template.config/template.json +++ b/src/net/templates/templates/jnetApp/.template.config/template.json @@ -2,9 +2,9 @@ "$schema": "http://json.schemastore.org/template", "author": "MASES s.r.l.", "classifications": [ "Common", "Console", "C#8" ], - "identity": "MASES.JavaBridgeTemplate.JavaBridgeApp", - "name": "Console templates: Java Bridge project", - "shortName": "javabridgeApp", + "identity": "MASES.JNetTemplate.JNetApp", + "name": "Console templates: JNet project", + "shortName": "jnetApp", "tags": { "language": "C#", "type": "project" diff --git a/src/net/templates/templates/javabridgeApp/Program.cs b/src/net/templates/templates/jnetApp/Program.cs similarity index 67% rename from src/net/templates/templates/javabridgeApp/Program.cs rename to src/net/templates/templates/jnetApp/Program.cs index 7e35d0d96e..c2cbdaf7c1 100644 --- a/src/net/templates/templates/javabridgeApp/Program.cs +++ b/src/net/templates/templates/jnetApp/Program.cs @@ -1,14 +1,14 @@ using Java.Util; -using MASES.JavaBridge; +using MASES.JNet; using System; -namespace MASES.JavaBridgeTemplate.JavaBridgeApp +namespace MASES.JNetTemplate.JNetApp { class Program { static void Main(string[] args) { - var appArgs = JavaBridgeCore.GlobalInstance.ApplicationArgs; + var appArgs = JNetCore.GlobalInstance.ApplicationArgs; if (args.Length != 0) { var set = Collections.Singleton(appArgs[0]); diff --git a/src/net/templates/templates/javabridgeApp/javabridgeApp.csproj b/src/net/templates/templates/jnetApp/jnetApp.csproj similarity index 56% rename from src/net/templates/templates/javabridgeApp/javabridgeApp.csproj rename to src/net/templates/templates/jnetApp/jnetApp.csproj index c2910029f4..5fba960dec 100644 --- a/src/net/templates/templates/javabridgeApp/javabridgeApp.csproj +++ b/src/net/templates/templates/jnetApp/jnetApp.csproj @@ -6,12 +6,12 @@ - + - + - + - + diff --git a/tests/JNetTest.sln b/tests/JNetTest.sln new file mode 100644 index 0000000000..e88ecae04b --- /dev/null +++ b/tests/JNetTest.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32014.148 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JNet", "..\src\net\JNet\JNet.csproj", "{067E5A2E-168E-4CD5-855F-672A0FE86DA1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JNetTest", "JNetTest\JNetTest.csproj", "{F3A53651-9728-427B-A429-7B3F1B6C8DA0}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {067E5A2E-168E-4CD5-855F-672A0FE86DA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {067E5A2E-168E-4CD5-855F-672A0FE86DA1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {067E5A2E-168E-4CD5-855F-672A0FE86DA1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {067E5A2E-168E-4CD5-855F-672A0FE86DA1}.Release|Any CPU.Build.0 = Release|Any CPU + {F3A53651-9728-427B-A429-7B3F1B6C8DA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F3A53651-9728-427B-A429-7B3F1B6C8DA0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F3A53651-9728-427B-A429-7B3F1B6C8DA0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F3A53651-9728-427B-A429-7B3F1B6C8DA0}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {0A7C16DC-1BAA-44BC-AA1C-D40B7B61878E} + EndGlobalSection +EndGlobal diff --git a/tests/JavaBridgeTest/JavaBridgeTest.csproj b/tests/JNetTest/JNetTest.csproj similarity index 64% rename from tests/JavaBridgeTest/JavaBridgeTest.csproj rename to tests/JNetTest/JNetTest.csproj index c59cceb109..fde95de3a5 100644 --- a/tests/JavaBridgeTest/JavaBridgeTest.csproj +++ b/tests/JNetTest/JNetTest.csproj @@ -1,10 +1,10 @@ - KafkaBridgeTest + JnetTest Exe - MASES.KafkaBridgeTest - JavaBridgeTest - a test tool for JavaBridge - KafkaBridgeTest - a test tool for JavaBridge + MASES.JNetTest + JnetTest - a test tool for Jnet + JnetTest - a test tool for Jnet Copyright © MASES s.r.l. 2022 MASES s.r.l. MASES s.r.l. @@ -17,6 +17,6 @@ - + diff --git a/tests/JavaBridgeTest/Program.cs b/tests/JNetTest/Program.cs similarity index 88% rename from tests/JavaBridgeTest/Program.cs rename to tests/JNetTest/Program.cs index 3ea83a34c4..20b0af51bb 100644 --- a/tests/JavaBridgeTest/Program.cs +++ b/tests/JNetTest/Program.cs @@ -20,13 +20,13 @@ using MASES.JavaBridge; using System; -namespace MASES.JavaBridgeTemplate.JavaBridgeApp +namespace MASES.JNetTest { class Program { static void Main(string[] args) { - var appArgs = JavaBridgeCore.GlobalInstance.ApplicationArgs; + var appArgs = JNetCore.GlobalInstance.ApplicationArgs; if (args.Length != 0) { var set = Collections.Singleton(appArgs[0]); diff --git a/tests/JavaBridgeTest.sln b/tests/JavaBridgeTest.sln deleted file mode 100644 index f0696f5184..0000000000 --- a/tests/JavaBridgeTest.sln +++ /dev/null @@ -1,31 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32014.148 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaBridge", "..\src\net\JavaBridge\JavaBridge.csproj", "{07A62D28-DDB1-489A-844F-49B5B0C30CAE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaBridgeTest", "JavaBridgeTest\JavaBridgeTest.csproj", "{DCB70ACA-DDF3-4821-93D6-9063618C421C}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {07A62D28-DDB1-489A-844F-49B5B0C30CAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07A62D28-DDB1-489A-844F-49B5B0C30CAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07A62D28-DDB1-489A-844F-49B5B0C30CAE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07A62D28-DDB1-489A-844F-49B5B0C30CAE}.Release|Any CPU.Build.0 = Release|Any CPU - {DCB70ACA-DDF3-4821-93D6-9063618C421C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DCB70ACA-DDF3-4821-93D6-9063618C421C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DCB70ACA-DDF3-4821-93D6-9063618C421C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DCB70ACA-DDF3-4821-93D6-9063618C421C}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {0A7C16DC-1BAA-44BC-AA1C-D40B7B61878E} - EndGlobalSection -EndGlobal From 382f803aee7d5bdc647f84e63999b944871d718f Mon Sep 17 00:00:00 2001 From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com> Date: Sat, 19 Mar 2022 01:17:39 +0100 Subject: [PATCH 2/2] Compilation fix --- tests/JNetTest/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/JNetTest/Program.cs b/tests/JNetTest/Program.cs index 20b0af51bb..3a7abd4f5e 100644 --- a/tests/JNetTest/Program.cs +++ b/tests/JNetTest/Program.cs @@ -17,7 +17,7 @@ */ using Java.Util; -using MASES.JavaBridge; +using MASES.JNet; using System; namespace MASES.JNetTest