configuration extension: internal vs. (old)external config file

read templates from internal

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@452 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c

1 files changed, 12 insertions, 6 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/DetachedLocRefMOAConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/DetachedLocRefMOAConnector.java
index 0eba51b..0d5597f 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/DetachedLocRefMOAConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/DetachedLocRefMOAConnector.java
@@ -427,12 +427,14 @@ public class DetachedLocRefMOAConnector implements Connector
       String sign_request_filename = TEMPLATE_FILE_PREFIX + settings.getValueFromKey("default.moa.algorithm.id") + SIGN_TEMPLATE_FILE_SUFIX;

 

       // try to load template from file

-      this.sign_request_template = FileHelper.readFromFile(SettingsReader.relocateFile(sign_request_filename));

+      //this.sign_request_template = FileHelper.readFromFile(SettingsReader.relocateFile(sign_request_filename));

+      this.sign_request_template = settings.readInternalResourceAsString(sign_request_filename);

 

       if (this.sign_request_template == null)

       {

         sign_request_filename = getConnectorValueFromProfile(settings, profile, SIGN_REQUEST_TEMPLATE_KEY);

-        this.sign_request_template = FileHelper.readFromFile(SettingsReader.relocateFile(sign_request_filename));

+        //this.sign_request_template = FileHelper.readFromFile(SettingsReader.relocateFile(sign_request_filename));

+        this.sign_request_template = settings.readInternalResourceAsString(sign_request_filename);

       }

 

       //this.sign_request_template = FileHelper.readFromFile(SettingsReader.relocateFile(sign_request_filename));

@@ -446,12 +448,14 @@ public class DetachedLocRefMOAConnector implements Connector
       String verify_request_filename = TEMPLATE_FILE_PREFIX + settings.getValueFromKey("default.moa.algorithm.id") + VERIFY_REQUEST_TEMPLATE_FILE_SUFIX;

 

       // try to load template file for verifing

-      this.verify_request_template = FileHelper.readFromFile(SettingsReader.relocateFile(verify_request_filename));

+      //this.verify_request_template = FileHelper.readFromFile(SettingsReader.relocateFile(verify_request_filename));

+      this.verify_request_template = settings.readInternalResourceAsString(verify_request_filename);

 

       if (this.verify_request_template == null)

       {

         verify_request_filename = getConnectorValueFromProfile(settings, profile, VERIFY_REQUEST_TEMPLATE_KEY);

-        this.verify_request_template = FileHelper.readFromFile(SettingsReader.relocateFile(verify_request_filename));

+        //this.verify_request_template = FileHelper.readFromFile(SettingsReader.relocateFile(verify_request_filename));

+        this.verify_request_template = settings.readInternalResourceAsString(verify_request_filename);

       }

 

       if (this.verify_request_template == null)

@@ -461,12 +465,14 @@ public class DetachedLocRefMOAConnector implements Connector
 

       // load template key file

       String verify_filename = TEMPLATE_FILE_PREFIX + settings.getValueFromKey("default.moa.algorithm.id") + VERIFY_TEMPLATE_SUFIX;

-      this.verify_template = FileHelper.readFromFile(SettingsReader.relocateFile(verify_filename));

+      //this.verify_template = FileHelper.readFromFile(SettingsReader.relocateFile(verify_filename));

+      this.verify_template = settings.readInternalResourceAsString(verify_filename);

 

       if (this.verify_template == null)

       {

         verify_filename = getConnectorValueFromProfile(settings, profile, VERIFY_TEMPLATE_KEY);

-        this.verify_template = FileHelper.readFromFile(SettingsReader.relocateFile(verify_filename));

+        //this.verify_template = FileHelper.readFromFile(SettingsReader.relocateFile(verify_filename));

+        this.verify_template = settings.readInternalResourceAsString(verify_filename);

       }

 

       if (this.verify_template == null)