[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/audit.xml idp-conf/src/main/resources/sys...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Aug 13 22:27:47 2014
New Revision: 6421

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6421&view=rev
Log:
IDP-375 - checkpoint work on audit context pop. and some built-in servlet content

Added:
    trunk/idp-conf/src/main/resources/conf/audit.xml   (with props)
    trunk/idp-conf/src/main/resources/system/conf/audit-system.xml   (with props)
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AuditExtractorFunction.java   (with props)
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/ConstantAuditExtractor.java   (with props)
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContext.java   (with props)
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/WriteAuditLog.java
      - copied, changed from r6416, trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/WriteAuditLog.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/package-info.java   (with props)
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/impl/
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContextTest.java   (with props)
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/impl/WriteAuditLogTest.java
      - copied, changed from r6416, trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/WriteAuditLogTest.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/SAMLBindingAuditExtractor.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/SAMLMessageIDAuditExtractor.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/SAMLMessageInstantAuditExtractor.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/package-info.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml
    trunk/idp-conf/src/main/resources/system/conf/utilities.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/IdPAuditFields.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/WriteAuditLog.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/WriteAuditLogTest.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/SAMLAuditFields.java

Modified: trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml?rev=6421&r1=6420&r2=6421&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml Wed Aug 13 22:27:47 2014
@@ -12,7 +12,8 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <context:property-placeholder />
+    <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
+        p:placeholderPrefix="%{" p:placeholderSuffix="}" />
 
     <!-- This BeanPostProcessor auto-sets identifiable beans with the bean name (if not already set). -->
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
@@ -28,16 +29,16 @@
 
     <bean id="shibboleth.SAML2TransientGenerator"
         class="net.shibboleth.idp.saml.nameid.impl.TransientSAML2NameIDGenerator"
-        p:transientIdGenerator-ref="${idp.transientId.generator:shibboleth.CryptoTransientIdGenerator}" />
+        p:transientIdGenerator-ref="%{idp.transientId.generator:shibboleth.CryptoTransientIdGenerator}" />
 
     <bean id="shibboleth.SAML2PersistentGenerator" lazy-init="true"
         class="net.shibboleth.idp.saml.nameid.impl.PersistentSAML2NameIDGenerator"
-        p:attributeSourceIds="#{ { ${idp.persistentId.sourceAttribute:} } }"
-        p:persistentIdGenerator-ref="${idp.persistentId.generator:shibboleth.ComputedPersistentIdGenerator}" />
+        p:attributeSourceIds="#{ { %{idp.persistentId.sourceAttribute:} } }"
+        p:persistentIdGenerator-ref="%{idp.persistentId.generator:shibboleth.ComputedPersistentIdGenerator}" />
 
     <bean id="shibboleth.SAML1TransientGenerator"
         class="net.shibboleth.idp.saml.nameid.impl.TransientSAML1NameIdentifierGenerator"

[... 390 lines stripped ...]