From 6571af05b7574f6d752890301b9743b1243a05bd Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Tue, 11 Oct 2011 16:02:54 +0000
Subject: MOA-ID: * Fixed Bug #557 * Update Konfiguration: Target via Konfig
 fix konfigurierbar * Update Doku Common: * DOMUtils: Parser disabled external
 entities

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1219 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 .../src/main/java/at/gv/egovernment/moa/util/DOMUtils.java | 14 ++++++++++++--
 .../resources/schemas/MOA-ID-Configuration-1.5.1.xsd       |  3 ++-
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'common')

diff --git a/common/src/main/java/at/gv/egovernment/moa/util/DOMUtils.java b/common/src/main/java/at/gv/egovernment/moa/util/DOMUtils.java
index 5fa31336b..13c2809ac 100644
--- a/common/src/main/java/at/gv/egovernment/moa/util/DOMUtils.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/DOMUtils.java
@@ -110,6 +110,16 @@ public class DOMUtils {
    * without a namespace. */
   private static final String EXTERNAL_NO_NAMESPACE_SCHEMA_LOCATION_PROPERTY =
     "http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation";
+  
+  private static final String EXTERNAL_GENERAL_ENTITIES_FEATURE =
+  	"http://xml.org/sax/features/external-general-entities";
+  
+  private static final String EXTERNAL_PARAMETER_ENTITIES_FEATURE =
+	  "http://xml.org/sax/features/external-parameter-entities";
+  
+  
+  
+  
   /** Property URI for the Xerces grammar pool. */
   private static final String GRAMMAR_POOL =
     org.apache.xerces.impl.Constants.XERCES_PROPERTY_PREFIX
@@ -234,8 +244,8 @@ public class DOMUtils {
 	    parser.setFeature(NORMALIZED_VALUE_FEATURE, false);
 	    parser.setFeature(INCLUDE_IGNORABLE_WHITESPACE_FEATURE, true);
 	    parser.setFeature(CREATE_ENTITY_REF_NODES_FEATURE, false);
-	    //parser.setFeature("http://xml.org/sax/features/external-general-entities", false);
-	    //parser.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+	    parser.setFeature(EXTERNAL_GENERAL_ENTITIES_FEATURE, false);
+	    parser.setFeature(EXTERNAL_PARAMETER_ENTITIES_FEATURE, false);
 	
 	    if (validating) {
 	      if (externalSchemaLocations != null) {
diff --git a/common/src/main/resources/resources/schemas/MOA-ID-Configuration-1.5.1.xsd b/common/src/main/resources/resources/schemas/MOA-ID-Configuration-1.5.1.xsd
index f8c38bdd3..cc562187a 100644
--- a/common/src/main/resources/resources/schemas/MOA-ID-Configuration-1.5.1.xsd
+++ b/common/src/main/resources/resources/schemas/MOA-ID-Configuration-1.5.1.xsd
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by Klaus Stranacher (Technische Universität Graz) -->
 <xsd:schema xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.buergerkarte.at/namespaces/moaconfig#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.4.3">
 	<!-- es werden lokale Schemas referenziert für real aufgelöste Schemas bitte ersetzen: http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd -->
 	<xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
@@ -137,6 +136,8 @@
 								</xsd:attribute>
 								<xsd:attribute name="calculateHPI" type="xsd:boolean" use="optional" default="false"/>
 								<xsd:attribute name="friendlyName" type="xsd:string" use="optional"/>
+								<xsd:attribute name="target" type="xsd:string" use="optional"/>
+								<xsd:attribute name="targetFriendlyName" type="xsd:string" use="optional"/>
 							</xsd:extension>
 						</xsd:complexContent>
 					</xsd:complexType>
-- 
cgit v1.2.3