Merge pull request #57 from JoyOfCodingPDX/issue-54/new-package-name

Continue to address #54 by using a new name for the Maven group and package name for artifacts and code.
JoyOfCodingPDX · Apr 6, 2024 · 58bea6f · 58bea6f
2 parents 727d302 + d82cc48
commit 58bea6f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -448,8 +448,8 @@ As you create Maven projects in this repository, you may encounter warnings like
 
 ```
 [WARNING] 
-[WARNING] Some problems were encountered while building the effective model for edu.pdx.cs410J.whitlock:apptbook:jar:1.0.0
-[WARNING] 'parent.relativePath' of POM edu.pdx.cs410J.whitlock:apptbook:1.0.0 (JoyOfCodingWinter2024/apptbook/pom.xml) points at edu.pdx.cs410J.whitlock:JoyOfCodingWinter2024 instead of io.github.davidwhitlock.cs410J:cs410j, please verify your project structure @ line 3, column 11
+[WARNING] Some problems were encountered while building the effective model for edu.pdx.cs.joy.whitlock:apptbook:jar:1.0.0
+[WARNING] 'parent.relativePath' of POM edu.pdx.cs.joy.whitlock:apptbook:1.0.0 (JoyOfCodingWinter2024/apptbook/pom.xml) points at edu.pdx.cs.joy.whitlock:JoyOfCodingWinter2024 instead of io.github.davidwhitlock.cs410J:cs410j, please verify your project structure @ line 3, column 11
 [WARNING] 
 [WARNING] It is highly recommended to fix these problems because they threaten the stability of your build.
 [WARNING] 
@@ -478,7 +478,7 @@ is my top-level POM) to something like:
 ```xml
   <parent>
     <artifactId>JoyOfCoding</artifactId>
-    <groupId>edu.pdx.cs410J.your-mcecs-user-id</groupId>
+    <groupId>edu.pdx.cs.joy.your-mcecs-user-id</groupId>
     <version>1.0.0</version>
   </parent>
 ```
@@ -558,7 +558,7 @@ your group:
 ```xml
   <parent>
     <artifactId>JoyOfCoding</artifactId>
-    <groupId>edu.pdx.cs410J.your-mcecs-user-id</groupId>
+    <groupId>edu.pdx.cs.joy.your-mcecs-user-id</groupId>
     <version>1.0.0</version>
   </parent>
 ```

diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@ accordingly
     <groupId>io.github.davidwhitlock.cs410J</groupId>
     <version>2024.0.1</version>
   </parent>
-  <groupId>edu.pdx.cs410J.YourUserId</groupId>
+  <groupId>edu.pdx.cs.joy.YourUserId</groupId>
   <artifactId>JoyOfCoding</artifactId>
   <version>1.0.0</version>
 

diff --git a/prerequisites.sh b/prerequisites.sh
@@ -90,9 +90,9 @@ function createProjectFromArchetype() {
 	   -DarchetypeGroupId=io.github.davidwhitlock.cs410J \
 	   -DarchetypeArtifactId=${archetypeName}-archetype \
 	   -DarchetypeVersion=2024.0.1 \
-	   -DgroupId=edu.pdx.cs410J.${loginId} \
+	   -DgroupId=edu.pdx.cs.joy.${loginId} \
 	   -DartifactId=${projectName} \
-	   -Dpackage=edu.pdx.cs410J.${loginId} \
+	   -Dpackage=edu.pdx.cs.joy.${loginId} \
 	   -Dversion=1.0.0
 
     chmod +x ${projectName}/mvnw

diff --git a/submit.sh b/submit.sh
@@ -68,7 +68,7 @@ if [ -f $pomFile ]; then
   cd -
 fi
 
-java -cp /u/whitlock/jars/grader.jar edu.pdx.cs410J.grader.${submitClass} -comment "${comment}" "${project}" "${xmlFile}" "${projectDirectory}/${srcDirectory}"
+java -cp /u/whitlock/jars/grader.jar edu.pdx.cs.joy.grader.${submitClass} -comment "${comment}" "${project}" "${xmlFile}" "${projectDirectory}/${srcDirectory}"
 
 submitTime=`date +%Y%m%dT%I%M%S`
 tag="submit-${project}-${submitTime}"

diff --git a/survey.sh b/survey.sh
@@ -16,7 +16,7 @@ fi
 
 
 
-java -cp /u/whitlock/jars/grader.jar edu.pdx.cs410J.grader.Survey
+java -cp /u/whitlock/jars/grader.jar edu.pdx.cs.joy.grader.Survey
 
 echo ""
 echo "** Thank you for filling out the survey"
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ fi @@
-    java -cp /u/whitlock/jars/grader.jar edu.pdx.cs410J.grader.Survey
+    java -cp /u/whitlock/jars/grader.jar edu.pdx.cs.joy.grader.Survey
     echo ""
     echo "** Thank you for filling out the survey"
@@ Expand Down @@