diff --git a/src/cpl/configuration/configuration.py b/src/cpl/configuration/configuration.py index 1a3472a3..e006f0a5 100644 --- a/src/cpl/configuration/configuration.py +++ b/src/cpl/configuration/configuration.py @@ -285,7 +285,7 @@ class Configuration(ConfigurationABC): exit() def add_json_file(self, name: str, optional: bool = None, output: bool = True, path: str = None): - path_root = self._application_environment.content_root_path + path_root = self._application_environment.working_directory if path is not None: path_root = path diff --git a/src/cpl/environment/application_environment.py b/src/cpl/environment/application_environment.py index d6bb09e6..c55fc406 100644 --- a/src/cpl/environment/application_environment.py +++ b/src/cpl/environment/application_environment.py @@ -9,18 +9,16 @@ from cpl.environment.environment_name_enum import EnvironmentNameEnum class ApplicationEnvironment(ApplicationEnvironmentABC): - def __init__(self, name: EnvironmentNameEnum = EnvironmentNameEnum.production, crp: str = './'): + def __init__(self, name: EnvironmentNameEnum = EnvironmentNameEnum.production): """ Represents environment of the application :param name: - :param crp: """ ApplicationEnvironmentABC.__init__(self) self._environment_name: Optional[EnvironmentNameEnum] = name self._app_name: Optional[str] = None self._customer: Optional[str] = None - self._content_root_path: Optional[str] = crp self._start_time: datetime = datetime.now() self._end_time: datetime = datetime.now() @@ -51,14 +49,6 @@ class ApplicationEnvironment(ApplicationEnvironmentABC): def customer(self, customer: str): self._customer = customer - @property - def content_root_path(self) -> str: - return self._content_root_path - - @content_root_path.setter - def content_root_path(self, content_root_path: str): - self._content_root_path = content_root_path - @property def host_name(self): return gethostname() diff --git a/src/cpl/environment/application_environment_abc.py b/src/cpl/environment/application_environment_abc.py index 7763cf2e..fef45a17 100644 --- a/src/cpl/environment/application_environment_abc.py +++ b/src/cpl/environment/application_environment_abc.py @@ -35,14 +35,6 @@ class ApplicationEnvironmentABC(ABC): @abstractmethod def customer(self, customer: str): pass - @property - @abstractmethod - def content_root_path(self) -> str: pass - - @content_root_path.setter - @abstractmethod - def content_root_path(self, content_root_path: str): pass - @property @abstractmethod def host_name(self) -> str: pass