1 files changed, 13 insertions, 7 deletions
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/MOASoapWithAttachmentConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/MOASoapWithAttachmentConnector.java
index 2415435..9cd8ccc 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/MOASoapWithAttachmentConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/moa/MOASoapWithAttachmentConnector.java
@@ -481,12 +481,14 @@ public class MOASoapWithAttachmentConnector 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 = settings.readInternalResourceAsString(sign_request_filename);
+        //this.sign_request_template = FileHelper.readFromFile(SettingsReader.relocateFile(sign_request_filename));
       }
 
       //this.sign_request_template = FileHelper.readFromFile(SettingsReader.relocateFile(sign_request_filename));
@@ -500,12 +502,14 @@ public class MOASoapWithAttachmentConnector 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));
+        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 = settings.readInternalResourceAsString(verify_request_filename);
       }
 
       if (this.verify_request_template == null)
@@ -515,12 +519,14 @@ public class MOASoapWithAttachmentConnector 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)