[java-identity-provider COMMIT] in /trunk/idp-attribute-cli/src/main: java/net/shibboleth/idp/attribute/cli/OutputAtt...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Apr 11 16:09:23 2013
New Revision: 4400

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4400&view=rev
Log:
Sync up with latest changes to profile classes.

Modified:
    trunk/idp-attribute-cli/src/main/java/net/shibboleth/idp/attribute/cli/OutputAttributes.java
    trunk/idp-attribute-cli/src/main/resources/conf/cli-flow-beans.xml

Modified: trunk/idp-attribute-cli/src/main/java/net/shibboleth/idp/attribute/cli/OutputAttributes.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-cli/src/main/java/net/shibboleth/idp/attribute/cli/OutputAttributes.java?rev=4400&r1=4399&r2=4400&view=diff
==============================================================================
--- trunk/idp-attribute-cli/src/main/java/net/shibboleth/idp/attribute/cli/OutputAttributes.java (original)
+++ trunk/idp-attribute-cli/src/main/java/net/shibboleth/idp/attribute/cli/OutputAttributes.java Thu Apr 11 16:09:23 2013
@@ -88,6 +88,6 @@
             throw new ProfileException("I/O error writing attributes to output context", e);
         }
         
-        return super.doExecute(springRequestContext, profileRequestContext);
+        return ActionSupport.buildProceedEvent(this);
     }
 }

Modified: trunk/idp-attribute-cli/src/main/resources/conf/cli-flow-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-cli/src/main/resources/conf/cli-flow-beans.xml?rev=4400&r1=4399&r2=4400&view=diff
==============================================================================
--- trunk/idp-attribute-cli/src/main/resources/conf/cli-flow-beans.xml (original)
+++ trunk/idp-attribute-cli/src/main/resources/conf/cli-flow-beans.xml Thu Apr 11 16:09:23 2013
@@ -12,7 +12,7 @@
     <bean id="InitializeProfileRequestContext" class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" />
 
     <!-- Dummy resolver that can run without Spring and is adapted using the WebFlowAdaptor. -->
-    <bean id="StaticResolver" class="net.shibboleth.idp.profile.impl.WebFlowAdaptor">
+    <bean id="StaticResolver" class="net.shibboleth.idp.profile.impl.WebFlowProfileActionAdaptor">
         <constructor-arg>
             <bean id="StaticResolverBean" class="net.shibboleth.idp.attribute.cli.StaticResolver" />
         </constructor-arg>