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

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

1 files changed, 14 insertions, 8 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedBKUConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedBKUConnector.java
index abed090..0e69b57 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedBKUConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedBKUConnector.java
@@ -587,13 +587,15 @@ public class DetachedBKUConnector implements Connector, LocalConnector
       String sign_request_filename = TEMPLATE_FILE_PREFIX + settings.getValueFromKey("default.bku.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);

       

       // when first load failed (the template file does'nt exist), load it from default template file

       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));

+         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 = settings.readInternalResourceAsString(sign_request_filename);

       }

             

       if (this.sign_request_template == null)

@@ -608,12 +610,14 @@ public class DetachedBKUConnector implements Connector, LocalConnector
       String verify_request_filename = TEMPLATE_FILE_PREFIX + settings.getValueFromKey("default.bku.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)

@@ -623,12 +627,14 @@ public class DetachedBKUConnector implements Connector, LocalConnector
 

       // load template key file

       String verify_filename = TEMPLATE_FILE_PREFIX + settings.getValueFromKey("default.bku.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));

+         verify_filename = getConnectorValueFromProfile(settings, profile, VERIFY_TEMPLATE_KEY);

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

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

       }

 

       if (this.verify_template == null)