Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cmpt-370-group-project-group26
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Eyan Cunningham (esc568)
cmpt-370-group-project-group26
Commits
989a6306
Commit
989a6306
authored
2 years ago
by
Mitch Cumpstone (cmc408)
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/main' into main
parents
bf566025
ad7bdde3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
ScheduleServer.bat
+2
-0
2 additions, 0 deletions
ScheduleServer.bat
SchedulerApp.bat
+2
-0
2 additions, 0 deletions
SchedulerApp.bat
SchedulerApp/src/main/java/com/example/scheduler_server/ScheduleServer.java
+0
-1
0 additions, 1 deletion
...ain/java/com/example/scheduler_server/ScheduleServer.java
with
4 additions
and
1 deletion
ScheduleServer.bat
0 → 100644
+
2
−
0
View file @
989a6306
@echo
off
java
-jar
ScheduleServer
.jar
\ No newline at end of file
This diff is collapsed.
Click to expand it.
SchedulerApp.bat
0 → 100644
+
2
−
0
View file @
989a6306
@echo
off
java
--module-path
PATH
-TO-JAVAFX-LIB
\lib
--add-modules
javafx
.controls
,
javafx
.fxml
,
javafx
.graphics
,
javafx
.web
-jar
SchedulerApp
.jar
This diff is collapsed.
Click to expand it.
SchedulerApp/src/main/java/com/example/scheduler_server/ScheduleServer.java
+
0
−
1
View file @
989a6306
...
@@ -79,7 +79,6 @@ public class ScheduleServer {
...
@@ -79,7 +79,6 @@ public class ScheduleServer {
}
}
public
static
void
main
(
String
[]
args
)
throws
IOException
{
public
static
void
main
(
String
[]
args
)
throws
IOException
{
//Set "localhost" is working locally. Razer-Blade lan address (NOT static) is "172.16.1.99"
Properties
serverProp
=
new
Properties
();
Properties
serverProp
=
new
Properties
();
FileInputStream
in
=
new
FileInputStream
(
"./src/main/java/com/example/scheduler_server/server.properties"
);
FileInputStream
in
=
new
FileInputStream
(
"./src/main/java/com/example/scheduler_server/server.properties"
);
serverProp
.
load
(
in
);
serverProp
.
load
(
in
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment