[java-shib-common COMMIT] in /branches/REL_1/src: main/java/edu/internet2/middleware/shibboleth/common/attribute/reso...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Mar 13 11:36:41 2013
New Revision: 1061

URL: http://svn.shibboleth.net/view/java-shib-common?rev=1061&view=rev
Log:
JOST-169: add adaptor between Velocity string loader and access to its static repo

Added:
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/util/VelocityStringResourceRepositoryAdaptor.java   (with props)
Modified:
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/TemplateAttributeDefinition.java
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/TemplateEngine.java
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/util/StringResourceLoader.java
    branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/base-config.xml

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/TemplateAttributeDefinition.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/TemplateAttributeDefinition.java?rev=1061&r1=1060&r2=1061&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/TemplateAttributeDefinition.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/TemplateAttributeDefinition.java Wed Mar 13 11:36:41 2013
@@ -28,6 +28,7 @@
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.exception.VelocityException;
 import org.apache.velocity.runtime.resource.util.StringResourceRepository;
 import org.opensaml.xml.util.DatatypeHelper;
 import org.slf4j.Logger;
@@ -38,6 +39,7 @@
 import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
 import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
 import edu.internet2.middleware.shibboleth.common.util.StringResourceLoader;
+import edu.internet2.middleware.shibboleth.common.util.VelocityStringResourceRepositoryAdaptor;
 
 /**
  * An {@link AttributeDefinition} that constructs its values based on the values of its dependencies using the Velocity
@@ -51,7 +53,7 @@
     private final Logger log = LoggerFactory.getLogger(TemplateAttributeDefinition.class);
 
     /** Velocity engine to use to render attribute values. */
-    private VelocityEngine velocity;
+    private final VelocityEngine velocity;
 
     /** Name the attribute template is registered under within the template engine. */
     private String templateName;
@@ -144,9 +146,13 @@
      * Registers the template with template engine.
      */
     protected void registerTemplate() {
-        StringResourceRepository repository = StringResourceLoader.getRepository();
-        templateName = "shibboleth.resolver.ad." + getId();
-        repository.putStringResource(templateName, attributeTemplate.trim());
+        try {
+            StringResourceRepository repository = VelocityStringResourceRepositoryAdaptor.getRepository(velocity);
+            templateName = "shibboleth.resolver.ad." + getId();
+            repository.putStringResource(templateName, attributeTemplate.trim());
+        } catch (VelocityException e) {
+            log.error("Unable to register template into Velocity string repository", e);
+        }
     }
 
     /** {@inheritDoc} */

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/TemplateEngine.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/TemplateEngine.java?rev=1061&r1=1060&r2=1061&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/TemplateEngine.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/TemplateEngine.java Wed Mar 13 11:36:41 2013
@@ -25,6 +25,7 @@
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.exception.VelocityException;
 import org.apache.velocity.runtime.resource.util.StringResourceRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,7 +35,7 @@
 import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ResolutionPlugIn;

[... 205 lines stripped ...]