diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 00000000..c3e23fb1 --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,36 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +# GitHub recommends pinning actions to a commit SHA. +# To get a newer version, you will need to update the SHA. +# You can also reference a tag or branch, but the action may change without warning. + +name: Publish package to GitHub Packages +on: + release: + types: [created] +jobs: + publish: + runs-on: ubuntu-latest + defaults: + run: + working-directory: ./Java + permissions: + contents: read + packages: write + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + java-version: '11' + distribution: 'temurin' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + + - name: Publish package + run: ./gradlew publish + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + diff --git a/.gitignore b/.gitignore index 8c184fe9..5ae5e11e 100644 --- a/.gitignore +++ b/.gitignore @@ -41,6 +41,22 @@ Thumbs.db *.rc *.idb +# Gradle Files # +################ +.gradle +**/build/ +!src/**/build/ +gradle-app.setting +!gradle-wrapper.jar +!gradle-wrapper.properties +.gradletasknamecache +# Eclipse Gradle plugin generated files +.project +.classpath +# IntelliJ Gradle generated files +/**/.idea/**/gradle.xml +/**/.idea/**/libraries + # VS Files # ################# bin/ @@ -74,9 +90,19 @@ xcshareddata # IntelliJ Files # ################## -/**/.idea/workspace.xml -/**/.idea/tasks.xml -/**/.idea/dictionaries/ +/**/.idea/**/workspace.xml +/**/.idea/**/tasks.xml +/**/.idea/**/dictionaries +/**/.idea/**/usage.statistics.xml +/**/.idea/**/shelf +/**/.idea/**/contentModel.xml +/**/.idea/**/dataSources/ +/**/.idea/**/dataSources.ids +/**/.idea/**/dataSources.local.xml +/**/.idea/**/sqlDataSources.xml +/**/.idea/**/dynamic.xml +/**/.idea/**/uiDesigner.xml +/**/.idea/**/dbnavigator.xml out/ # MATLAB backup files # diff --git a/Java/.idea/.name b/Java/.idea/.name index 885cc23c..bf6bd367 100644 --- a/Java/.idea/.name +++ b/Java/.idea/.name @@ -1 +1 @@ -XPlaneConnect \ No newline at end of file +xpc \ No newline at end of file diff --git a/Java/.idea/compiler.xml b/Java/.idea/compiler.xml index 96cc43ef..61a9130c 100644 --- a/Java/.idea/compiler.xml +++ b/Java/.idea/compiler.xml @@ -1,22 +1,6 @@ - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/Java/.idea/encodings.xml b/Java/.idea/encodings.xml new file mode 100644 index 00000000..174a0839 --- /dev/null +++ b/Java/.idea/encodings.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Java/.idea/jarRepositories.xml b/Java/.idea/jarRepositories.xml new file mode 100644 index 00000000..85421ecb --- /dev/null +++ b/Java/.idea/jarRepositories.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Java/.idea/kotlinc.xml b/Java/.idea/kotlinc.xml new file mode 100644 index 00000000..8491b65f --- /dev/null +++ b/Java/.idea/kotlinc.xml @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file diff --git a/Java/.idea/libraries/junit_4_11.xml b/Java/.idea/libraries/junit_4_11.xml deleted file mode 100644 index 0a24ba15..00000000 --- a/Java/.idea/libraries/junit_4_11.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/Java/.idea/misc.xml b/Java/.idea/misc.xml index b7148e8f..75ea28c3 100644 --- a/Java/.idea/misc.xml +++ b/Java/.idea/misc.xml @@ -1,6 +1,33 @@ - + + + + + + + + + + \ No newline at end of file diff --git a/Java/.idea/modules.xml b/Java/.idea/modules.xml index bc73bac4..80f0ffac 100644 --- a/Java/.idea/modules.xml +++ b/Java/.idea/modules.xml @@ -2,8 +2,7 @@ - - + \ No newline at end of file diff --git a/Java/.project b/Java/.project deleted file mode 100644 index e18da484..00000000 --- a/Java/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - xpc-parent - - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - - diff --git a/Java/Examples/.project b/Java/Examples/.project deleted file mode 100644 index 589dd0ab..00000000 --- a/Java/Examples/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - xpc-examples - - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - - diff --git a/Java/Examples/Playback/.classpath b/Java/Examples/Playback/.classpath deleted file mode 100644 index 5e8a55fe..00000000 --- a/Java/Examples/Playback/.classpath +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Java/Examples/Playback/.idea/libraries/XPlaneConnect.xml b/Java/Examples/Playback/.idea/libraries/XPlaneConnect.xml deleted file mode 100644 index f0cda694..00000000 --- a/Java/Examples/Playback/.idea/libraries/XPlaneConnect.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Java/Examples/Playback/.project b/Java/Examples/Playback/.project deleted file mode 100644 index 1f830e84..00000000 --- a/Java/Examples/Playback/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - playback-example - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/Java/Examples/basic-operation/.classpath b/Java/Examples/basic-operation/.classpath deleted file mode 100644 index 5e8a55fe..00000000 --- a/Java/Examples/basic-operation/.classpath +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Java/Examples/basic-operation/.idea/libraries/Java.xml b/Java/Examples/basic-operation/.idea/libraries/Java.xml deleted file mode 100644 index 154988b2..00000000 --- a/Java/Examples/basic-operation/.idea/libraries/Java.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Java/Examples/basic-operation/.project b/Java/Examples/basic-operation/.project deleted file mode 100644 index ac3ce072..00000000 --- a/Java/Examples/basic-operation/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - basic-operation - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/Java/Examples/continuous-operation/.classpath b/Java/Examples/continuous-operation/.classpath deleted file mode 100644 index 5e8a55fe..00000000 --- a/Java/Examples/continuous-operation/.classpath +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Java/Examples/continuous-operation/.idea/libraries/XPlaneConnect.xml b/Java/Examples/continuous-operation/.idea/libraries/XPlaneConnect.xml deleted file mode 100644 index da48fd95..00000000 --- a/Java/Examples/continuous-operation/.idea/libraries/XPlaneConnect.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Java/Examples/continuous-operation/.project b/Java/Examples/continuous-operation/.project deleted file mode 100644 index b74f80f5..00000000 --- a/Java/Examples/continuous-operation/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - continuous-operation - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/Java/Examples/discovery/.classpath b/Java/Examples/discovery/.classpath deleted file mode 100644 index 5e8a55fe..00000000 --- a/Java/Examples/discovery/.classpath +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Java/Examples/discovery/.project b/Java/Examples/discovery/.project deleted file mode 100644 index fb76ee0d..00000000 --- a/Java/Examples/discovery/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - discovery-example - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/Java/XPlaneConnect.iml b/Java/XPlaneConnect.iml deleted file mode 100644 index 8acc69f4..00000000 --- a/Java/XPlaneConnect.iml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Java/buildSrc/build.gradle.kts b/Java/buildSrc/build.gradle.kts new file mode 100644 index 00000000..01878478 --- /dev/null +++ b/Java/buildSrc/build.gradle.kts @@ -0,0 +1,13 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + // Support convention plugins written in Kotlin. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build. + `kotlin-dsl` +} + +repositories { + // Use the plugin portal to apply community plugins in convention plugins. + gradlePluginPortal() +} diff --git a/Java/buildSrc/src/main/kotlin/buildlogic.java-conventions.gradle.kts b/Java/buildSrc/src/main/kotlin/buildlogic.java-conventions.gradle.kts new file mode 100644 index 00000000..9acfd40e --- /dev/null +++ b/Java/buildSrc/src/main/kotlin/buildlogic.java-conventions.gradle.kts @@ -0,0 +1,52 @@ +plugins { + `java-library` + `maven-publish` +} + +repositories { + mavenLocal() + maven { + url = uri("https://oss.sonatype.org/content/repositories/snapshots") + } + + maven { + url = uri("https://repo.maven.apache.org/maven2/") + } +} + +group = "gov.nasa.xpc" +version = "1.4.0-SNAPSHOT" +java.sourceCompatibility = JavaVersion.VERSION_1_8 + +publishing { + repositories { + maven { + name = "GitHubPackages" + url = uri("https://maven.pkg.github.com/nasa/XPlaneConnect") + credentials { + username = project.findProperty("gpr.user") as String? ?: + System.getenv("GITHUB_ACTOR") + password = project.findProperty("gpr.key") as String? ?: + System.getenv("GITHUB_TOKEN") + } + } + } + + publications { + register("gpr") { + from(components["java"]) + } + } + +// publications.create("maven") { +// from(components["java"]) +// } +} + +tasks.withType() { + options.encoding = "UTF-8" +} + +tasks.withType() { + options.encoding = "UTF-8" +} diff --git a/Java/Examples/.settings/org.eclipse.core.resources.prefs b/Java/examples/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from Java/Examples/.settings/org.eclipse.core.resources.prefs rename to Java/examples/.settings/org.eclipse.core.resources.prefs diff --git a/Java/Examples/.settings/org.eclipse.m2e.core.prefs b/Java/examples/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from Java/Examples/.settings/org.eclipse.m2e.core.prefs rename to Java/examples/.settings/org.eclipse.m2e.core.prefs diff --git a/Java/Examples/Playback/.gitignore b/Java/examples/basic-operation/.gitignore similarity index 100% rename from Java/Examples/Playback/.gitignore rename to Java/examples/basic-operation/.gitignore diff --git a/Java/Examples/Playback/.idea/compiler.xml b/Java/examples/basic-operation/.idea/compiler.xml similarity index 100% rename from Java/Examples/Playback/.idea/compiler.xml rename to Java/examples/basic-operation/.idea/compiler.xml diff --git a/Java/Examples/Playback/.idea/copyright/profiles_settings.xml b/Java/examples/basic-operation/.idea/copyright/profiles_settings.xml similarity index 100% rename from Java/Examples/Playback/.idea/copyright/profiles_settings.xml rename to Java/examples/basic-operation/.idea/copyright/profiles_settings.xml diff --git a/Java/Examples/Playback/.idea/misc.xml b/Java/examples/basic-operation/.idea/misc.xml similarity index 100% rename from Java/Examples/Playback/.idea/misc.xml rename to Java/examples/basic-operation/.idea/misc.xml diff --git a/Java/Examples/basic-operation/.idea/modules.xml b/Java/examples/basic-operation/.idea/modules.xml similarity index 100% rename from Java/Examples/basic-operation/.idea/modules.xml rename to Java/examples/basic-operation/.idea/modules.xml diff --git a/Java/Examples/Playback/.idea/vcs.xml b/Java/examples/basic-operation/.idea/vcs.xml similarity index 100% rename from Java/Examples/Playback/.idea/vcs.xml rename to Java/examples/basic-operation/.idea/vcs.xml diff --git a/Java/Examples/Playback/.settings/org.eclipse.core.resources.prefs b/Java/examples/basic-operation/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from Java/Examples/Playback/.settings/org.eclipse.core.resources.prefs rename to Java/examples/basic-operation/.settings/org.eclipse.core.resources.prefs diff --git a/Java/Examples/Playback/.settings/org.eclipse.jdt.core.prefs b/Java/examples/basic-operation/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from Java/Examples/Playback/.settings/org.eclipse.jdt.core.prefs rename to Java/examples/basic-operation/.settings/org.eclipse.jdt.core.prefs diff --git a/Java/Examples/Playback/.settings/org.eclipse.m2e.core.prefs b/Java/examples/basic-operation/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from Java/Examples/Playback/.settings/org.eclipse.m2e.core.prefs rename to Java/examples/basic-operation/.settings/org.eclipse.m2e.core.prefs diff --git a/Java/Examples/basic-operation/BasicOperation.iml b/Java/examples/basic-operation/BasicOperation.iml similarity index 100% rename from Java/Examples/basic-operation/BasicOperation.iml rename to Java/examples/basic-operation/BasicOperation.iml diff --git a/Java/examples/basic-operation/build.gradle.kts b/Java/examples/basic-operation/build.gradle.kts new file mode 100644 index 00000000..8e1231e2 --- /dev/null +++ b/Java/examples/basic-operation/build.gradle.kts @@ -0,0 +1,12 @@ +plugins { + id("buildlogic.java-conventions") + application +} + +group = "gov.nasa.xpc.examples" + +description = "XPC Example Basic Operation" + +dependencies { + implementation(project(":xpc")) +} diff --git a/Java/Examples/basic-operation/pom.xml b/Java/examples/basic-operation/pom.xml similarity index 100% rename from Java/Examples/basic-operation/pom.xml rename to Java/examples/basic-operation/pom.xml diff --git a/Java/Examples/basic-operation/src/main/java/gov/nasa/xpc/ex/Main.java b/Java/examples/basic-operation/src/main/java/gov/nasa/xpc/ex/Main.java similarity index 100% rename from Java/Examples/basic-operation/src/main/java/gov/nasa/xpc/ex/Main.java rename to Java/examples/basic-operation/src/main/java/gov/nasa/xpc/ex/Main.java diff --git a/Java/Examples/basic-operation/.gitignore b/Java/examples/continuous-operation/.gitignore similarity index 100% rename from Java/Examples/basic-operation/.gitignore rename to Java/examples/continuous-operation/.gitignore diff --git a/Java/Examples/continuous-operation/.idea/.name b/Java/examples/continuous-operation/.idea/.name similarity index 100% rename from Java/Examples/continuous-operation/.idea/.name rename to Java/examples/continuous-operation/.idea/.name diff --git a/Java/Examples/basic-operation/.idea/compiler.xml b/Java/examples/continuous-operation/.idea/compiler.xml similarity index 100% rename from Java/Examples/basic-operation/.idea/compiler.xml rename to Java/examples/continuous-operation/.idea/compiler.xml diff --git a/Java/Examples/basic-operation/.idea/copyright/profiles_settings.xml b/Java/examples/continuous-operation/.idea/copyright/profiles_settings.xml similarity index 100% rename from Java/Examples/basic-operation/.idea/copyright/profiles_settings.xml rename to Java/examples/continuous-operation/.idea/copyright/profiles_settings.xml diff --git a/Java/Examples/continuous-operation/.idea/misc.xml b/Java/examples/continuous-operation/.idea/misc.xml similarity index 100% rename from Java/Examples/continuous-operation/.idea/misc.xml rename to Java/examples/continuous-operation/.idea/misc.xml diff --git a/Java/Examples/continuous-operation/.idea/modules.xml b/Java/examples/continuous-operation/.idea/modules.xml similarity index 100% rename from Java/Examples/continuous-operation/.idea/modules.xml rename to Java/examples/continuous-operation/.idea/modules.xml diff --git a/Java/Examples/basic-operation/.idea/vcs.xml b/Java/examples/continuous-operation/.idea/vcs.xml similarity index 100% rename from Java/Examples/basic-operation/.idea/vcs.xml rename to Java/examples/continuous-operation/.idea/vcs.xml diff --git a/Java/Examples/basic-operation/.settings/org.eclipse.core.resources.prefs b/Java/examples/continuous-operation/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from Java/Examples/basic-operation/.settings/org.eclipse.core.resources.prefs rename to Java/examples/continuous-operation/.settings/org.eclipse.core.resources.prefs diff --git a/Java/Examples/basic-operation/.settings/org.eclipse.jdt.core.prefs b/Java/examples/continuous-operation/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from Java/Examples/basic-operation/.settings/org.eclipse.jdt.core.prefs rename to Java/examples/continuous-operation/.settings/org.eclipse.jdt.core.prefs diff --git a/Java/Examples/basic-operation/.settings/org.eclipse.m2e.core.prefs b/Java/examples/continuous-operation/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from Java/Examples/basic-operation/.settings/org.eclipse.m2e.core.prefs rename to Java/examples/continuous-operation/.settings/org.eclipse.m2e.core.prefs diff --git a/Java/Examples/continuous-operation/ContinuousOperation.iml b/Java/examples/continuous-operation/ContinuousOperation.iml similarity index 100% rename from Java/Examples/continuous-operation/ContinuousOperation.iml rename to Java/examples/continuous-operation/ContinuousOperation.iml diff --git a/Java/examples/continuous-operation/build.gradle.kts b/Java/examples/continuous-operation/build.gradle.kts new file mode 100644 index 00000000..94541ab5 --- /dev/null +++ b/Java/examples/continuous-operation/build.gradle.kts @@ -0,0 +1,12 @@ +plugins { + id("buildlogic.java-conventions") + application +} + +group = "gov.nasa.xpc.examples" + +description = "XPC Example Continuous Operation" + +dependencies { + implementation(project(":xpc")) +} diff --git a/Java/Examples/continuous-operation/pom.xml b/Java/examples/continuous-operation/pom.xml similarity index 100% rename from Java/Examples/continuous-operation/pom.xml rename to Java/examples/continuous-operation/pom.xml diff --git a/Java/Examples/continuous-operation/src/main/java/gov/nasa/xpc/ex/Main.java b/Java/examples/continuous-operation/src/main/java/gov/nasa/xpc/ex/Main.java similarity index 100% rename from Java/Examples/continuous-operation/src/main/java/gov/nasa/xpc/ex/Main.java rename to Java/examples/continuous-operation/src/main/java/gov/nasa/xpc/ex/Main.java diff --git a/Java/Examples/continuous-operation/.gitignore b/Java/examples/discovery/.gitignore similarity index 100% rename from Java/Examples/continuous-operation/.gitignore rename to Java/examples/discovery/.gitignore diff --git a/Java/Examples/continuous-operation/.settings/org.eclipse.core.resources.prefs b/Java/examples/discovery/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from Java/Examples/continuous-operation/.settings/org.eclipse.core.resources.prefs rename to Java/examples/discovery/.settings/org.eclipse.core.resources.prefs diff --git a/Java/Examples/continuous-operation/.settings/org.eclipse.jdt.core.prefs b/Java/examples/discovery/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from Java/Examples/continuous-operation/.settings/org.eclipse.jdt.core.prefs rename to Java/examples/discovery/.settings/org.eclipse.jdt.core.prefs diff --git a/Java/Examples/continuous-operation/.settings/org.eclipse.m2e.core.prefs b/Java/examples/discovery/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from Java/Examples/continuous-operation/.settings/org.eclipse.m2e.core.prefs rename to Java/examples/discovery/.settings/org.eclipse.m2e.core.prefs diff --git a/Java/Examples/discovery/DiscoveryExample.iml b/Java/examples/discovery/DiscoveryExample.iml similarity index 100% rename from Java/Examples/discovery/DiscoveryExample.iml rename to Java/examples/discovery/DiscoveryExample.iml diff --git a/Java/examples/discovery/build.gradle.kts b/Java/examples/discovery/build.gradle.kts new file mode 100644 index 00000000..1f3e9c39 --- /dev/null +++ b/Java/examples/discovery/build.gradle.kts @@ -0,0 +1,12 @@ +plugins { + id("buildlogic.java-conventions") + application +} + +group = "gov.nasa.xpc.examples" + +description = "XPC Discovery Example" + +dependencies { + implementation(project(":xpc")) +} diff --git a/Java/Examples/discovery/pom.xml b/Java/examples/discovery/pom.xml similarity index 100% rename from Java/Examples/discovery/pom.xml rename to Java/examples/discovery/pom.xml diff --git a/Java/Examples/discovery/src/main/java/gov/nasa/xpc/ex/DiscoveryConnectionExample.java b/Java/examples/discovery/src/main/java/gov/nasa/xpc/ex/DiscoveryConnectionExample.java similarity index 100% rename from Java/Examples/discovery/src/main/java/gov/nasa/xpc/ex/DiscoveryConnectionExample.java rename to Java/examples/discovery/src/main/java/gov/nasa/xpc/ex/DiscoveryConnectionExample.java diff --git a/Java/Examples/discovery/src/main/java/gov/nasa/xpc/ex/SimpleDiscoveryExample.java b/Java/examples/discovery/src/main/java/gov/nasa/xpc/ex/SimpleDiscoveryExample.java similarity index 100% rename from Java/Examples/discovery/src/main/java/gov/nasa/xpc/ex/SimpleDiscoveryExample.java rename to Java/examples/discovery/src/main/java/gov/nasa/xpc/ex/SimpleDiscoveryExample.java diff --git a/Java/Examples/discovery/.gitignore b/Java/examples/playback/.gitignore similarity index 100% rename from Java/Examples/discovery/.gitignore rename to Java/examples/playback/.gitignore diff --git a/Java/Examples/continuous-operation/.idea/compiler.xml b/Java/examples/playback/.idea/compiler.xml similarity index 100% rename from Java/Examples/continuous-operation/.idea/compiler.xml rename to Java/examples/playback/.idea/compiler.xml diff --git a/Java/Examples/continuous-operation/.idea/copyright/profiles_settings.xml b/Java/examples/playback/.idea/copyright/profiles_settings.xml similarity index 100% rename from Java/Examples/continuous-operation/.idea/copyright/profiles_settings.xml rename to Java/examples/playback/.idea/copyright/profiles_settings.xml diff --git a/Java/Examples/Playback/.idea/description.html b/Java/examples/playback/.idea/description.html similarity index 100% rename from Java/Examples/Playback/.idea/description.html rename to Java/examples/playback/.idea/description.html diff --git a/Java/Examples/basic-operation/.idea/misc.xml b/Java/examples/playback/.idea/misc.xml similarity index 100% rename from Java/Examples/basic-operation/.idea/misc.xml rename to Java/examples/playback/.idea/misc.xml diff --git a/Java/Examples/Playback/.idea/modules.xml b/Java/examples/playback/.idea/modules.xml similarity index 100% rename from Java/Examples/Playback/.idea/modules.xml rename to Java/examples/playback/.idea/modules.xml diff --git a/Java/Examples/Playback/.idea/project-template.xml b/Java/examples/playback/.idea/project-template.xml similarity index 100% rename from Java/Examples/Playback/.idea/project-template.xml rename to Java/examples/playback/.idea/project-template.xml diff --git a/Java/Examples/continuous-operation/.idea/vcs.xml b/Java/examples/playback/.idea/vcs.xml similarity index 100% rename from Java/Examples/continuous-operation/.idea/vcs.xml rename to Java/examples/playback/.idea/vcs.xml diff --git a/Java/Examples/discovery/.settings/org.eclipse.core.resources.prefs b/Java/examples/playback/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from Java/Examples/discovery/.settings/org.eclipse.core.resources.prefs rename to Java/examples/playback/.settings/org.eclipse.core.resources.prefs diff --git a/Java/Examples/discovery/.settings/org.eclipse.jdt.core.prefs b/Java/examples/playback/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from Java/Examples/discovery/.settings/org.eclipse.jdt.core.prefs rename to Java/examples/playback/.settings/org.eclipse.jdt.core.prefs diff --git a/Java/Examples/discovery/.settings/org.eclipse.m2e.core.prefs b/Java/examples/playback/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from Java/Examples/discovery/.settings/org.eclipse.m2e.core.prefs rename to Java/examples/playback/.settings/org.eclipse.m2e.core.prefs diff --git a/Java/Examples/Playback/Playback.iml b/Java/examples/playback/Playback.iml similarity index 100% rename from Java/Examples/Playback/Playback.iml rename to Java/examples/playback/Playback.iml diff --git a/Java/examples/playback/build.gradle.kts b/Java/examples/playback/build.gradle.kts new file mode 100644 index 00000000..f114418f --- /dev/null +++ b/Java/examples/playback/build.gradle.kts @@ -0,0 +1,25 @@ +plugins { + id("buildlogic.java-conventions") + id("org.openjfx.javafxplugin") version "0.1.0" + id("org.javamodularity.moduleplugin") version "1.8.12" + application +} + +group = "gov.nasa.xpc.examples" + +description = "XPC Example Playback" + + +dependencies { + implementation(project(":xpc")) +} + +java { + modularity.inferModulePath.set(false) +} + +javafx { + version = "11" + modules("javafx.graphics") + configuration = "implementation" +} diff --git a/Java/Examples/Playback/pom.xml b/Java/examples/playback/pom.xml similarity index 100% rename from Java/Examples/Playback/pom.xml rename to Java/examples/playback/pom.xml diff --git a/Java/Examples/Playback/src/main/java/gov/nasa/xpc/ex/Main.java b/Java/examples/playback/src/main/java/gov/nasa/xpc/ex/Main.java similarity index 100% rename from Java/Examples/Playback/src/main/java/gov/nasa/xpc/ex/Main.java rename to Java/examples/playback/src/main/java/gov/nasa/xpc/ex/Main.java diff --git a/Java/Examples/pom.xml b/Java/examples/pom.xml similarity index 100% rename from Java/Examples/pom.xml rename to Java/examples/pom.xml diff --git a/Java/gradle/libs.versions.toml b/Java/gradle/libs.versions.toml new file mode 100644 index 00000000..4ac3234a --- /dev/null +++ b/Java/gradle/libs.versions.toml @@ -0,0 +1,2 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format diff --git a/Java/gradle/wrapper/gradle-wrapper.jar b/Java/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..e6441136 Binary files /dev/null and b/Java/gradle/wrapper/gradle-wrapper.jar differ diff --git a/Java/gradle/wrapper/gradle-wrapper.properties b/Java/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..b82aa23a --- /dev/null +++ b/Java/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/Java/gradlew b/Java/gradlew new file mode 100755 index 00000000..1aa94a42 --- /dev/null +++ b/Java/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/Java/gradlew.bat b/Java/gradlew.bat new file mode 100644 index 00000000..7101f8e4 --- /dev/null +++ b/Java/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/Java/lib/hamcrest-core-1.3.jar b/Java/lib/hamcrest-core-1.3.jar deleted file mode 100644 index 9d5fe16e..00000000 Binary files a/Java/lib/hamcrest-core-1.3.jar and /dev/null differ diff --git a/Java/lib/junit-4.12.jar b/Java/lib/junit-4.12.jar deleted file mode 100644 index 3a7fc266..00000000 Binary files a/Java/lib/junit-4.12.jar and /dev/null differ diff --git a/Java/pom.xml b/Java/pom.xml index c1516944..fc4e4835 100644 --- a/Java/pom.xml +++ b/Java/pom.xml @@ -49,12 +49,12 @@ - + @@ -72,7 +72,7 @@ -