[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/idp.properties system/conf/global-system.xml

[noreply at shibboleth.net]

Author: scantor
Date: Mon Oct  6 10:35:06 2014
New Revision: 6635

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6635&view=rev
Log:
Move Xerces property out of user's line of sight.

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=6635&r1=6634&r2=6635&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Mon Oct  6 10:35:06 2014
@@ -1,7 +1,3 @@
-# Use the XML Parser SecurityManager appropriate for the chosen parser
-# Sun/Oracle is the default, for Xerces, set to org.apache.xerces.util.SecurityManager
-#idp.xml.securityManager = com.sun.org.apache.xerces.internal.util.SecurityManager
-
 # Set the entityID of the IdP
 idp.entityID = https://idp.example.org
 

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=6635&r1=6634&r2=6635&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml Mon Oct  6 10:35:06 2014
@@ -90,6 +90,7 @@
             p:namespaceAware="true">
         <property name="builderAttributes">
             <map>
+                <!-- Sun/Oracle is the default, for Xerces, set property to org.apache.xerces.util.SecurityManager -->            
                 <entry key="http://apache.org/xml/properties/security-manager">
                     <bean class="%{idp.xml.securityManager:com.sun.org.apache.xerces.internal.util.SecurityManager}" />
                 </entry>