From 8f4b401992960229aa8e0e5d1ec07ae3da5325da Mon Sep 17 00:00:00 2001 From: Theresa Kamerman Date: Mon, 18 Nov 2024 15:58:48 -0800 Subject: [PATCH 1/2] Rename 'foo-procedures' to 'banana-procedures' These procedures use the Bananation mission model, not the Foo mission model --- .../{foo-procedures => banana-procedures}/README.md | 4 ++-- .../{foo-procedures => banana-procedures}/build.gradle | 0 .../procedural/examples/bananaprocedures}/Helper.java | 2 +- .../bananaprocedures}/constraints/ConstFruit.java | 2 +- .../examples/bananaprocedures/constraints/Hello.java | 9 +++++++++ .../examples/bananaprocedures}/package-info.java | 2 +- .../bananaprocedures}/procedures/SampleProcedure.java | 2 +- .../bananaprocedures}/procedures/SimulationDemo.java | 2 +- .../bananaprocedures}/procedures/StayWellFed.java | 2 +- .../bananaprocedures}/constraints/ProcedureLoader.java | 2 +- .../examples/fooprocedures/constraints/Hello.java | 9 --------- settings.gradle | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) rename procedural/examples/{foo-procedures => banana-procedures}/README.md (66%) rename procedural/examples/{foo-procedures => banana-procedures}/build.gradle (100%) rename procedural/examples/{foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures => banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures}/Helper.java (58%) rename procedural/examples/{foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures => banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures}/constraints/ConstFruit.java (89%) create mode 100644 procedural/examples/banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/constraints/Hello.java rename procedural/examples/{foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures => banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures}/package-info.java (73%) rename procedural/examples/{foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures => banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures}/procedures/SampleProcedure.java (93%) rename procedural/examples/{foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures => banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures}/procedures/SimulationDemo.java (95%) rename procedural/examples/{foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures => banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures}/procedures/StayWellFed.java (98%) rename procedural/examples/{foo-procedures/src/test/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures => banana-procedures/src/test/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures}/constraints/ProcedureLoader.java (96%) delete mode 100644 procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/constraints/Hello.java diff --git a/procedural/examples/foo-procedures/README.md b/procedural/examples/banana-procedures/README.md similarity index 66% rename from procedural/examples/foo-procedures/README.md rename to procedural/examples/banana-procedures/README.md index e24db049f1..ae4a26c29c 100644 --- a/procedural/examples/foo-procedures/README.md +++ b/procedural/examples/banana-procedures/README.md @@ -1,4 +1,4 @@ -# foo-procedures +# banana-procedures This is a project for test examples. It does provide valid examples of goals and constraints, but they aren't particularly helpful for users. @@ -9,5 +9,5 @@ At repo top level: ```bash ./gradlew build -./gradlew :procedural:examples:foo-procedures:buildAllSchedulingProcedureJars +./gradlew :procedural:examples:banana-procedures:buildAllSchedulingProcedureJars ``` diff --git a/procedural/examples/foo-procedures/build.gradle b/procedural/examples/banana-procedures/build.gradle similarity index 100% rename from procedural/examples/foo-procedures/build.gradle rename to procedural/examples/banana-procedures/build.gradle diff --git a/procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/Helper.java b/procedural/examples/banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/Helper.java similarity index 58% rename from procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/Helper.java rename to procedural/examples/banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/Helper.java index 0308d22dd5..f4a1e085f1 100644 --- a/procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/Helper.java +++ b/procedural/examples/banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/Helper.java @@ -1,4 +1,4 @@ -package gov.nasa.ammos.aerie.procedural.examples.fooprocedures; +package gov.nasa.ammos.aerie.procedural.examples.bananaprocedures; public class Helper { public static String greeting() { diff --git a/procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/constraints/ConstFruit.java b/procedural/examples/banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/constraints/ConstFruit.java similarity index 89% rename from procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/constraints/ConstFruit.java rename to procedural/examples/banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/constraints/ConstFruit.java index 762cc9f1fd..7a89fc9af9 100644 --- a/procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/constraints/ConstFruit.java +++ b/procedural/examples/banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/constraints/ConstFruit.java @@ -1,4 +1,4 @@ -package gov.nasa.ammos.aerie.procedural.examples.fooprocedures.constraints; +package gov.nasa.ammos.aerie.procedural.examples.bananaprocedures.constraints; import gov.nasa.ammos.aerie.procedural.constraints.GeneratorConstraint; import gov.nasa.ammos.aerie.procedural.constraints.Violations; diff --git a/procedural/examples/banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/constraints/Hello.java b/procedural/examples/banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/constraints/Hello.java new file mode 100644 index 0000000000..1d38231fca --- /dev/null +++ b/procedural/examples/banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/constraints/Hello.java @@ -0,0 +1,9 @@ +package gov.nasa.ammos.aerie.procedural.examples.bananaprocedures.constraints; + +import gov.nasa.ammos.aerie.procedural.examples.bananaprocedures.Helper; + +class Hello { + public static void main(String[] args) { + System.out.println(Helper.greeting()); + } +} diff --git a/procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/package-info.java b/procedural/examples/banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/package-info.java similarity index 73% rename from procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/package-info.java rename to procedural/examples/banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/package-info.java index ab7662c4d2..63a14ebac4 100644 --- a/procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/package-info.java +++ b/procedural/examples/banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/package-info.java @@ -1,5 +1,5 @@ @WithMappers(BasicValueMappers.class) -package gov.nasa.ammos.aerie.procedural.examples.fooprocedures; +package gov.nasa.ammos.aerie.procedural.examples.bananaprocedures; import gov.nasa.jpl.aerie.contrib.serialization.rulesets.BasicValueMappers; import gov.nasa.ammos.aerie.procedural.scheduling.annotations.WithMappers; diff --git a/procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/procedures/SampleProcedure.java b/procedural/examples/banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/procedures/SampleProcedure.java similarity index 93% rename from procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/procedures/SampleProcedure.java rename to procedural/examples/banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/procedures/SampleProcedure.java index 9a2f1cd290..4598a23393 100644 --- a/procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/procedures/SampleProcedure.java +++ b/procedural/examples/banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/procedures/SampleProcedure.java @@ -1,4 +1,4 @@ -package gov.nasa.ammos.aerie.procedural.examples.fooprocedures.procedures; +package gov.nasa.ammos.aerie.procedural.examples.bananaprocedures.procedures; import gov.nasa.ammos.aerie.procedural.scheduling.plan.EditablePlan; import gov.nasa.ammos.aerie.procedural.scheduling.Goal; diff --git a/procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/procedures/SimulationDemo.java b/procedural/examples/banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/procedures/SimulationDemo.java similarity index 95% rename from procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/procedures/SimulationDemo.java rename to procedural/examples/banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/procedures/SimulationDemo.java index 5ca804d72a..d620755d07 100644 --- a/procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/procedures/SimulationDemo.java +++ b/procedural/examples/banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/procedures/SimulationDemo.java @@ -1,4 +1,4 @@ -package gov.nasa.ammos.aerie.procedural.examples.fooprocedures.procedures; +package gov.nasa.ammos.aerie.procedural.examples.bananaprocedures.procedures; import gov.nasa.jpl.aerie.merlin.protocol.types.Duration; import gov.nasa.jpl.aerie.merlin.protocol.types.SerializedValue; diff --git a/procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/procedures/StayWellFed.java b/procedural/examples/banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/procedures/StayWellFed.java similarity index 98% rename from procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/procedures/StayWellFed.java rename to procedural/examples/banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/procedures/StayWellFed.java index c51d303948..560c62721a 100644 --- a/procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/procedures/StayWellFed.java +++ b/procedural/examples/banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/procedures/StayWellFed.java @@ -1,4 +1,4 @@ -package gov.nasa.ammos.aerie.procedural.examples.fooprocedures.procedures; +package gov.nasa.ammos.aerie.procedural.examples.bananaprocedures.procedures; import gov.nasa.ammos.aerie.procedural.scheduling.Goal; import gov.nasa.ammos.aerie.procedural.scheduling.annotations.SchedulingProcedure; diff --git a/procedural/examples/foo-procedures/src/test/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/constraints/ProcedureLoader.java b/procedural/examples/banana-procedures/src/test/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/constraints/ProcedureLoader.java similarity index 96% rename from procedural/examples/foo-procedures/src/test/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/constraints/ProcedureLoader.java rename to procedural/examples/banana-procedures/src/test/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/constraints/ProcedureLoader.java index 4a60866c2b..3b200e0c61 100644 --- a/procedural/examples/foo-procedures/src/test/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/constraints/ProcedureLoader.java +++ b/procedural/examples/banana-procedures/src/test/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/constraints/ProcedureLoader.java @@ -1,4 +1,4 @@ -package gov.nasa.ammos.aerie.procedural.examples.fooprocedures.constraints; +package gov.nasa.ammos.aerie.procedural.examples.bananaprocedures.constraints; import gov.nasa.jpl.aerie.merlin.protocol.model.MerlinPlugin; import gov.nasa.ammos.aerie.procedural.constraints.Constraint; diff --git a/procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/constraints/Hello.java b/procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/constraints/Hello.java deleted file mode 100644 index 1e36a1d2c1..0000000000 --- a/procedural/examples/foo-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/fooprocedures/constraints/Hello.java +++ /dev/null @@ -1,9 +0,0 @@ -package gov.nasa.ammos.aerie.procedural.examples.fooprocedures.constraints; - -import gov.nasa.ammos.aerie.procedural.examples.fooprocedures.Helper; - -class Hello { - public static void main(String[] args) { - System.out.println(Helper.greeting()); - } -} diff --git a/settings.gradle b/settings.gradle index 1240589c6b..3e8fce4fee 100644 --- a/settings.gradle +++ b/settings.gradle @@ -20,7 +20,7 @@ include 'procedural:scheduling' include 'procedural:remote' // Procedural examples -include 'procedural:examples:foo-procedures' +include 'procedural:examples:banana-procedures' // Services for deployment within the Aerie infrastructure include 'merlin-server' From 760c8a0dca3ccdfe84a186fc6b8cefcd1dbd6bee Mon Sep 17 00:00:00 2001 From: Theresa Kamerman Date: Mon, 18 Nov 2024 16:15:31 -0800 Subject: [PATCH 2/2] Remove Hello.java Was used as an early test of Jar building before there were goal classes, but is not needed anymore. --- .../examples/bananaprocedures/constraints/Hello.java | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 procedural/examples/banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/constraints/Hello.java diff --git a/procedural/examples/banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/constraints/Hello.java b/procedural/examples/banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/constraints/Hello.java deleted file mode 100644 index 1d38231fca..0000000000 --- a/procedural/examples/banana-procedures/src/main/java/gov/nasa/ammos/aerie/procedural/examples/bananaprocedures/constraints/Hello.java +++ /dev/null @@ -1,9 +0,0 @@ -package gov.nasa.ammos.aerie.procedural.examples.bananaprocedures.constraints; - -import gov.nasa.ammos.aerie.procedural.examples.bananaprocedures.Helper; - -class Hello { - public static void main(String[] args) { - System.out.println(Helper.greeting()); - } -}