From ad6298b508784414918063d67cec53cdb8fcc479 Mon Sep 17 00:00:00 2001 From: Hugi Thordarson Date: Sun, 22 Sep 2024 07:11:32 +0000 Subject: [PATCH] Granted NGProperties it's own package (preparing move to core module) --- ng-appserver/src/main/java/ng/appserver/NGApplication.java | 5 +++-- .../java/ng/appserver/{ => properties}/NGProperties.java | 3 ++- .../ng/appserver/wointegration/NGDefaultLifeBeatThread.java | 2 +- ng-control/src/main/java/ng/control/NGOverview.java | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) rename ng-appserver/src/main/java/ng/appserver/{ => properties}/NGProperties.java (99%) diff --git a/ng-appserver/src/main/java/ng/appserver/NGApplication.java b/ng-appserver/src/main/java/ng/appserver/NGApplication.java index b61a2c56..92379c36 100644 --- a/ng-appserver/src/main/java/ng/appserver/NGApplication.java +++ b/ng-appserver/src/main/java/ng/appserver/NGApplication.java @@ -21,9 +21,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ng.appserver.NGProperties.PropertiesSourceArguments; -import ng.appserver.NGProperties.PropertiesSourceResource; import ng.appserver.directactions.NGDirectActionRequestHandler; +import ng.appserver.properties.NGProperties; +import ng.appserver.properties.NGProperties.PropertiesSourceArguments; +import ng.appserver.properties.NGProperties.PropertiesSourceResource; import ng.appserver.resources.NGResource; import ng.appserver.resources.NGResourceLoader; import ng.appserver.resources.NGResourceLoader.JavaClasspathResourceSource; diff --git a/ng-appserver/src/main/java/ng/appserver/NGProperties.java b/ng-appserver/src/main/java/ng/appserver/properties/NGProperties.java similarity index 99% rename from ng-appserver/src/main/java/ng/appserver/NGProperties.java rename to ng-appserver/src/main/java/ng/appserver/properties/NGProperties.java index 76128f70..3ba3b9ed 100644 --- a/ng-appserver/src/main/java/ng/appserver/NGProperties.java +++ b/ng-appserver/src/main/java/ng/appserver/properties/NGProperties.java @@ -1,4 +1,4 @@ -package ng.appserver; +package ng.appserver.properties; import java.io.IOException; import java.io.InputStream; @@ -17,6 +17,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import ng.appserver.NGApplication; import ng.appserver.resources.NGResource; /** diff --git a/ng-appserver/src/main/java/ng/appserver/wointegration/NGDefaultLifeBeatThread.java b/ng-appserver/src/main/java/ng/appserver/wointegration/NGDefaultLifeBeatThread.java index dd03920c..f2e42706 100644 --- a/ng-appserver/src/main/java/ng/appserver/wointegration/NGDefaultLifeBeatThread.java +++ b/ng-appserver/src/main/java/ng/appserver/wointegration/NGDefaultLifeBeatThread.java @@ -4,7 +4,7 @@ import java.net.UnknownHostException; import java.util.concurrent.TimeUnit; -import ng.appserver.NGProperties; +import ng.appserver.properties.NGProperties; /** * Created as a temporary holder class for the LifeBeatThread, just to get it out of NGApplication // Hugi 2022-04-18 diff --git a/ng-control/src/main/java/ng/control/NGOverview.java b/ng-control/src/main/java/ng/control/NGOverview.java index 15db33ef..d19abe5f 100644 --- a/ng-control/src/main/java/ng/control/NGOverview.java +++ b/ng-control/src/main/java/ng/control/NGOverview.java @@ -7,8 +7,8 @@ import ng.appserver.NGActionResults; import ng.appserver.NGComponent; import ng.appserver.NGContext; -import ng.appserver.NGProperties.PropertiesSource; import ng.appserver.NGSession; +import ng.appserver.properties.NGProperties.PropertiesSource; public class NGOverview extends NGComponent {