1 files changed, 22 insertions, 1 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
index bdd0c3294..d81435f83 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
@@ -504,6 +504,8 @@ public class ConfigurationBuilder {
       oap.setPublicURLPrefix(publicURLPrefix);
       oap.setKeyBoxIdentier(oAElem.getAttribute("keyBoxIdentifier"));
       oap.setFriendlyName(oAElem.getAttribute("friendlyName"));
+      String targetConfig = oAElem.getAttribute("target"); 
+      String targetFriendlyNameConfig = oAElem.getAttribute("targetFriendlyName"); 
       
       // get the type of the online application
       String oaType = oAElem.getAttribute("type");
@@ -525,6 +527,17 @@ public class ConfigurationBuilder {
           Logger.error("Missing \"IdentificationNumber\" for OA of type \"businessService\"");
           throw new ConfigurationException("config.02", null);
         }
+
+        if (!StringUtils.isEmpty(targetConfig)) {
+        	Logger.error("Target attribute can not be set for OA of type \"businessService\"");
+        	throw new ConfigurationException("config.02", null);
+        }
+        if (!StringUtils.isEmpty(targetFriendlyNameConfig)) {
+        	Logger.error("Target friendly name attribute can not be set for OA of type \"businessService\"");
+        	throw new ConfigurationException("config.02", null);
+        }
+        
+        	
         if ("false".equalsIgnoreCase(oAElem.getAttribute("calculateHPI"))) {
          oap.setIdentityLinkDomainIdentifier(buildIdentityLinkDomainIdentifier(identificationNumberChild));
          //BZ.., setting type of IdLinkDomainIdentifier
@@ -542,11 +555,19 @@ public class ConfigurationBuilder {
         slVersion = "1.2";
         
       } else {
-        
+          
+    	  if (StringUtils.isEmpty(targetConfig) && !StringUtils.isEmpty(targetFriendlyNameConfig)) {
+    		  Logger.error("Target friendly name attribute can not be set alone for OA of type \"businessService\"");
+    		  throw new ConfigurationException("config.02", null);
+    	  }
+    	  oap.setTarget(targetConfig);
+    	  oap.setTargetFriendlyName(targetFriendlyNameConfig);
+    	  
         if (authComponent!=null) {
           slVersion = authComponent.getAttribute("slVersion");
         }
         
+        
       }
       oap.setSlVersion(slVersion);
       //Check if there is an Auth-Block to read from configuration