Skip to content

Commit

Permalink
Folder rename from java to jvm (masesgroup#257)
Browse files Browse the repository at this point in the history
* Folder rename from java to jvm

* Fix CONTRIBUTING.md

* Update site menu
  • Loading branch information
masesdevelopers authored Nov 6, 2023
1 parent 7aae6da commit fc3cb1f
Show file tree
Hide file tree
Showing 235 changed files with 30 additions and 21 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ jobs:
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase

- name: Install local file to be used within Javadoc plugin of generated POM
run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -Dfile=../../../bin/net6.0/JCOBridge.jar -f ./src/java/jnet/pom.xml
run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -Dfile=../../../bin/net6.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
shell: bash

- name: Create Jars
run: mvn --file ./src/java/jnet/pom.xml --no-transfer-progress package
run: mvn --file ./src/jvm/jnet/pom.xml --no-transfer-progress package
env:
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
Expand Down Expand Up @@ -136,11 +136,11 @@ jobs:
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase

- name: Install local file to be used within Javadoc plugin of generated POM
run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -Dfile=../../../bin/net6.0/JCOBridge.jar -f ./src/java/jnet/pom.xml
run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -Dfile=../../../bin/net6.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
shell: bash

- name: Create Jars
run: mvn --file ./src/java/jnet/pom.xml --no-transfer-progress package
run: mvn --file ./src/jvm/jnet/pom.xml --no-transfer-progress package
env:
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@ jobs:

- name: Maven preparation (step 2)
if: matrix.language == 'java'
run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -Dfile=../../../bin/net6.0/JCOBridge.jar -f ./src/java/jnet/pom.xml
run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -Dfile=../../../bin/net6.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
shell: bash

- if: matrix.language == 'java'
run: mvn --file ./src/java/jnet/pom.xml --no-transfer-progress package
run: mvn --file ./src/jvm/jnet/pom.xml --no-transfer-progress package

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
8 changes: 4 additions & 4 deletions .github/workflows/pullrequest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ jobs:
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase

- name: Install local file to be used within Javadoc plugin of generated POM
run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -Dfile=../../../bin/net6.0/JCOBridge.jar -f ./src/java/jnet/pom.xml
run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -Dfile=../../../bin/net6.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
shell: bash

- name: Create Jars
run: mvn --file ./src/java/jnet/pom.xml --no-transfer-progress package
run: mvn --file ./src/jvm/jnet/pom.xml --no-transfer-progress package
env:
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
Expand Down Expand Up @@ -117,11 +117,11 @@ jobs:
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase

- name: Install local file to be used within Javadoc plugin of generated POM
run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -Dfile=../../../bin/net6.0/JCOBridge.jar -f ./src/java/jnet/pom.xml
run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -Dfile=../../../bin/net6.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
shell: bash

- name: Create Jars
run: mvn --file ./src/java/jnet/pom.xml --no-transfer-progress package
run: mvn --file ./src/jvm/jnet/pom.xml --no-transfer-progress package
env:
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ jobs:
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase

- name: Install local file to be used within Javadoc plugin of generated POM
run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -Dfile=../../../bin/net6.0/JCOBridge.jar -f ./src/java/jnet/pom.xml
run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -Dfile=../../../bin/net6.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
shell: bash

- name: Create Jars
run: mvn --file ./src/java/jnet/pom.xml --no-transfer-progress package
run: mvn --file ./src/jvm/jnet/pom.xml --no-transfer-progress package
env:
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
Expand Down Expand Up @@ -102,11 +102,11 @@ jobs:
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase

- name: Install local file to be used within Javadoc plugin of generated POM
run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -Dfile=../../../bin/net6.0/JCOBridge.jar -f ./src/java/jnet/pom.xml
run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.8 -Dpackaging=jar -Dfile=../../../bin/net6.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
shell: bash

- name: Create Jars
run: mvn --file ./src/java/jnet/pom.xml --no-transfer-progress package
run: mvn --file ./src/jvm/jnet/pom.xml --no-transfer-progress package
env:
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
Expand Down
11 changes: 7 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The project is organized in this folder structure:

* **docs** (website)
* **src**
* **java**
* **jvm**
* **jnet**: contains the JVM side implementation of some classes managed from .NET side; it is structured as a complete Maven project
* **net**
* **JNet**: The folder containing the source and project of the files ported on .NET
Expand All @@ -24,9 +24,12 @@ The project is organized in this folder structure:
* **JNetReflector**: The folder containing the source and project of the JVM class reflector, the tool to generate .NET classes to interact with JVM counterpart
* **templates**: The folder containing the source and project to generate the NuGet template package
* **tests**
* **JNetTest**: The folder containing the source and project of the JNet test
* **JNetWinFormsTest**: The folder containing the source and project of the JNet test for WinForms
* **JNetWPFTest**: The folder containing the source and project of the JNet test for WPF
* **jvm**
* **testclass**: contains a JVM test project
* **net**
* **JNetTest**: The folder containing the source and project of the JNet test
* **JNetWinFormsTest**: The folder containing the source and project of the JNet test for WinForms
* **JNetWPFTest**: The folder containing the source and project of the JNet test for WPF

# How Can I Contribute?

Expand Down
2 changes: 1 addition & 1 deletion src/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ The configuration is:
```json
{
"RelativeDestinationCSharpClassPath": "net\\JNet\\Generated",
"RelativeDestinationJavaListenerPath": "java\\jnet\\src\\main\\java",
"RelativeDestinationJavaListenerPath": "jvm\\jnet\\src\\main\\java",
"JavaListenerBasePackage": "org.mases.jnet.generated",
"OnlyPropertiesForGetterSetter": true,
"ModulesToParse": [
Expand Down
2 changes: 1 addition & 1 deletion src/configuration.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"RelativeDestinationCSharpClassPath": "net\\JNet\\Generated",
"RelativeDestinationJavaListenerPath": "java\\jnet\\src\\main\\java",
"RelativeDestinationJavaListenerPath": "jvm\\jnet\\src\\main\\java",
"JavaListenerBasePackage": "org.mases.jnet.generated",
"OnlyPropertiesForGetterSetter": true,
"ModulesToParse": [
Expand Down
2 changes: 1 addition & 1 deletion src/documentation/articles/usageReflector.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ The options used are:
```json
{
"RelativeDestinationCSharpClassPath": "net\\JNet\\Generated",
"RelativeDestinationJavaListenerPath": "java\\jnet\\src\\main\\java",
"RelativeDestinationJavaListenerPath": "jvm\\jnet\\src\\main\\java",
"JavaListenerBasePackage": "org.mases.jnet.generated",
"OnlyPropertiesForGetterSetter": true,
"ModulesToParse": [
Expand Down
6 changes: 6 additions & 0 deletions src/documentation/toc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
- name: .NET API Documentation
href: api/
homepage: api/index.md
- name: Browse repository
href: https://github.com/masesgroup/JNet
- name: Releases
href: https://github.com/masesgroup/JNet/releases/
- name: Issues
href: https://github.com/masesgroup/JNet/issues/
- name: Open source projects
dropdown: true
href: https://masesgroup.github.io/
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit fc3cb1f

Please sign in to comment.