polish

spring-faces/src/main/java/org/springframework/faces/config/FacesConfigNamespaceHandler.java

@@ -1,11 +1,28 @@
+/*
+ * Copyright 2004-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.faces.config;
 
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
+/**
+ * Namespace handler for the faces namespace.
+ * @author Jeremy Grelle
+ */
 public class FacesConfigNamespaceHandler extends NamespaceHandlerSupport {
-
 	public void init() {
 		registerBeanDefinitionParser("flow-builder-services", new FacesFlowBuilderServicesBeanDefinitionParser());
 	}
-
 }

spring-faces/src/main/java/org/springframework/faces/config/FacesFlowBuilderServicesBeanDefinitionParser.java

@@ -1,8 +1,24 @@
+/*
+ * Copyright 2004-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.faces.config;
 
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;
+import org.springframework.binding.expression.el.DefaultExpressionFactoryUtils;
 import org.springframework.faces.expression.LegacyJSFELExpressionParser;
 import org.springframework.faces.model.converter.FacesConversionService;
 import org.springframework.faces.webflow.JsfViewFactoryCreator;
@@ -11,6 +27,9 @@ import org.springframework.webflow.engine.builder.support.FlowBuilderServices;
 import org.springframework.webflow.expression.el.WebFlowELExpressionParser;
 import org.w3c.dom.Element;
 
+/**
+ * Parser for the flow-builder-services tag.
+ */
 public class FacesFlowBuilderServicesBeanDefinitionParser extends AbstractSingleBeanDefinitionParser implements
 		BeanDefinitionParser {
 
@@ -34,7 +53,10 @@ public class FacesFlowBuilderServicesBeanDefinitionParser extends AbstractSingle
 
 	protected void doParse(Element element, BeanDefinitionBuilder definitionBuilder) {
 		boolean enableManagedBeans = parseEnableManagedBeans(element, definitionBuilder);
-		if (!enableManagedBeans) {
+		if (enableManagedBeans) {
+			definitionBuilder.addPropertyValue(EXPRESSION_PARSER_PROPERTY, new LegacyJSFELExpressionParser(
+					DefaultExpressionFactoryUtils.createExpressionFactory()));
+		} else {
 			parseExpressionParser(element, definitionBuilder);
 		}
 		parseViewFactoryCreator(element, definitionBuilder);
@@ -44,13 +66,10 @@ public class FacesFlowBuilderServicesBeanDefinitionParser extends AbstractSingle
 	private boolean parseEnableManagedBeans(Element element, BeanDefinitionBuilder definitionBuilder) {
 		String enableManagedBeans = element.getAttribute(ENABLE_MANAGED_BEANS_ATTRIBUTE);
 		if (StringUtils.hasText(enableManagedBeans)) {
-			boolean enabled = Boolean.parseBoolean(enableManagedBeans);
-			if (enabled) {
-				definitionBuilder.addPropertyValue(EXPRESSION_PARSER_PROPERTY, new LegacyJSFELExpressionParser());
-			}
-			return enabled;
+			return Boolean.valueOf(enableManagedBeans).booleanValue();
+		} else {
+			return false;
 		}
-		return false;
 	}
 
 	private void parseConversionService(Element element, BeanDefinitionBuilder definitionBuilder) {
@@ -76,7 +95,8 @@ public class FacesFlowBuilderServicesBeanDefinitionParser extends AbstractSingle
 		if (StringUtils.hasText(expressionParser)) {
 			definitionBuilder.addPropertyReference(EXPRESSION_PARSER_PROPERTY, expressionParser);
 		} else {
-			definitionBuilder.addPropertyValue(EXPRESSION_PARSER_PROPERTY, new WebFlowELExpressionParser());
+			definitionBuilder.addPropertyValue(EXPRESSION_PARSER_PROPERTY, new WebFlowELExpressionParser(
+					DefaultExpressionFactoryUtils.createExpressionFactory()));
 		}
 	}
 }

spring-faces/src/main/java/org/springframework/faces/expression/CompositeFlowPropertyResolver.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2004-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.faces.expression;
 
 import javax.el.CompositeELResolver;

spring-faces/src/main/java/org/springframework/faces/expression/CompositeFlowVariableResolver.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2004-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.faces.expression;
 
 import javax.el.CompositeELResolver;

spring-faces/src/main/java/org/springframework/faces/expression/ELDelegatingPropertyResolver.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2004-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.faces.expression;
 
 import javax.el.ELContext;

spring-faces/src/main/java/org/springframework/faces/expression/ELDelegatingVariableResolver.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2004-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.faces.expression;
 
 import javax.el.ELContext;

spring-faces/src/main/java/org/springframework/faces/expression/LegacyJSFBeanResolver.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2004-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.faces.expression;
 
 import java.util.Iterator;

spring-faces/src/main/java/org/springframework/faces/expression/LegacyJSFELExpressionParser.java

@@ -1,21 +1,33 @@
+/*
+ * Copyright 2004-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.faces.expression;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.el.ELContext;
-import javax.el.ELException;
 import javax.el.ELResolver;
 import javax.el.ExpressionFactory;
 import javax.el.FunctionMapper;
 import javax.el.VariableMapper;
 
-import org.springframework.beans.BeanUtils;
 import org.springframework.binding.expression.el.DefaultELResolver;
 import org.springframework.binding.expression.el.ELContextFactory;
 import org.springframework.binding.expression.el.ELExpressionParser;
 import org.springframework.util.ClassUtils;
-import org.springframework.util.ReflectionUtils;
 import org.springframework.webflow.core.collection.MutableAttributeMap;
 import org.springframework.webflow.execution.RequestContext;
 import org.springframework.webflow.expression.el.ActionMethodELResolver;
@@ -33,46 +45,24 @@ import org.springframework.webflow.expression.el.SpringSecurityELResolver;
  */
 public class LegacyJSFELExpressionParser extends ELExpressionParser {
 
-	private static final String EXPRESSION_FACTORY_PROPERTY = "javax.el.ExpressionFactory";
-
-	private static final String DEFAULT_EXPRESSION_FACTORY = "org.jboss.el.ExpressionFactoryImpl";
-
 	public LegacyJSFELExpressionParser(ExpressionFactory expressionFactory) {
 		super(expressionFactory);
 		putContextFactory(RequestContext.class, new RequestContextELContextFactory());
 		putContextFactory(MutableAttributeMap.class, new AttributeMapELContextFactory());
 	}
 
-	public LegacyJSFELExpressionParser() {
-		this(getDefaultExpressionFactory());
-	}
-
-	private static ExpressionFactory getDefaultExpressionFactory() {
-		if (!System.getProperties().containsKey(EXPRESSION_FACTORY_PROPERTY)) {
-			System.setProperty(EXPRESSION_FACTORY_PROPERTY, DEFAULT_EXPRESSION_FACTORY);
-		}
-		if (ReflectionUtils.findMethod(ExpressionFactory.class, "newInstance") != null) {
-			return ExpressionFactory.newInstance();
-		} else { // Fallback in case using an older version of el-api
-			try {
-				return (ExpressionFactory) BeanUtils.instantiateClass(Class.forName(DEFAULT_EXPRESSION_FACTORY));
-			} catch (Exception e) {
-				throw new ELException("Could not create the default ExpressionFactory", e);
-			}
-		}
-	}
-
 	private static class RequestContextELContextFactory implements ELContextFactory {
 		public ELContext getELContext(Object target) {
+			RequestContext context = (RequestContext) target;
 			List customResolvers = new ArrayList();
-			customResolvers.add(new RequestContextELResolver());
+			customResolvers.add(new RequestContextELResolver(context));
+			customResolvers.add(new ImplicitFlowVariableELResolver(context));
+			customResolvers.add(new ScopeSearchingELResolver(context));
+			customResolvers.add(new ActionMethodELResolver());
 			if (ClassUtils.isPresent("org.springframework.security.context.SecurityContextHolder")) {
 				customResolvers.add(new SpringSecurityELResolver());
 			}
-			customResolvers.add(new ImplicitFlowVariableELResolver());
-			customResolvers.add(new SpringBeanWebFlowELResolver());
-			customResolvers.add(new ActionMethodELResolver());
-			customResolvers.add(new ScopeSearchingELResolver());
+			customResolvers.add(new SpringBeanWebFlowELResolver(context));
 			customResolvers.add(new LegacyJSFBeanResolver());
 			ELResolver resolver = new DefaultELResolver(target, customResolvers);
 			return new WebFlowELContext(resolver);

spring-faces/src/main/java/org/springframework/faces/expression/SimpleELContext.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2004-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.faces.expression;
 
 import javax.el.ELContext;

spring-faces/src/main/java/org/springframework/faces/model/ManySelectionTrackingListDataModel.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2004-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.faces.model;
 
 import java.util.ArrayList;

spring-faces/src/main/java/org/springframework/faces/model/OneSelectionTrackingListDataModel.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2004-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.faces.model;
 
 import java.util.ArrayList;

spring-faces/src/main/java/org/springframework/faces/model/SelectionAware.java

@@ -1,6 +1,22 @@
+/*
+ * Copyright 2004-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.faces.model;
 
 import java.util.List;
+
 import javax.faces.model.DataModel;
 
 /**

spring-faces/src/main/java/org/springframework/faces/model/SelectionTrackingActionListener.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2004-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.faces.model;
 
 import javax.faces.component.UIComponent;

spring-faces/src/main/java/org/springframework/faces/model/SerializableListDataModel.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2004-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.faces.model;
 
 import java.io.Serializable;

spring-faces/src/main/java/org/springframework/faces/model/converter/DataModelConverter.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2004-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.faces.model.converter;
 
 import java.lang.reflect.Constructor;

spring-faces/src/main/java/org/springframework/faces/model/converter/FacesConversionService.java

@@ -1,3 +1,15 @@
+/*
+ * Copyright 2004-2008 the original author or authimport org.springframework.binding.convert.ConversionService;
+import org.springframework.binding.convert.support.DefaultConversionService;
+import org.springframework.faces.model.OneSelectionTrackingListDataModel;
+e.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.faces.model.converter;
 
 import org.springframework.binding.convert.ConversionService;

spring-faces/src/main/java/org/springframework/faces/mvc/JsfView.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2004-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.faces.mvc;
 
 import java.io.IOException;

spring-faces/src/main/java/org/springframework/faces/support/RequestLoggingPhaseListener.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2004-2008 the original authorimport javax.faces.event.PhaseEvent;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.faces.support;
 
 import javax.faces.event.PhaseEvent;

spring-faces/src/main/java/org/springframework/faces/ui/resource/FlowResourceHelper.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2004-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.faces.ui.resource;
 
 import java.io.IOException;

spring-faces/src/main/java/org/springframework/faces/ui/resource/ResourceServlet.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2004-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.faces.ui.resource;
 
 import java.io.IOException;

spring-faces/src/main/java/org/springframework/faces/webflow/FlowActionListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2007 the original author or authors.
+ * Copyright 2004-2008 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2007 the original author or authors.
+ * Copyright 2004-2008 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-faces/src/main/java/org/springframework/faces/webflow/FlowLifecycle.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2007 the original author or authors.
+ * Copyright 2004-2008 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-faces/src/main/java/org/springframework/faces/webflow/FlowViewHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2007 the original author or authors.
+ * Copyright 2004-2008 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-faces/src/main/java/org/springframework/faces/webflow/FlowViewStateManager.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2004-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.faces.webflow;
 
 import java.io.IOException;

spring-faces/src/main/java/org/springframework/faces/webflow/JsfFinalResponseAction.java

@@ -1,49 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.faces.webflow;
-
-import javax.faces.component.UIViewRoot;
-
-import org.springframework.webflow.engine.EndState;
-import org.springframework.webflow.execution.Action;
-import org.springframework.webflow.execution.Event;
-import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.View;
-
-/**
- * Specialized {@link Action} implementation for rendering the JSF view in an {@link EndState}.
- * <p>
- * Before the final view is rendered, the {@link UIViewRoot} will be marked transient in order to bypass the JSF state
- * saving process.
- * 
- * @author Jeremy Grelle
- */
-public class JsfFinalResponseAction implements Action {
-
-	private JsfViewFactory viewFactory;
-
-	public JsfFinalResponseAction(JsfViewFactory viewFactory) {
-		this.viewFactory = viewFactory;
-	}
-
-	public Event execute(RequestContext context) throws Exception {
-		View view = viewFactory.getView(context);
-		((JsfView) view).getViewRoot().setTransient(true);
-		view.render();
-		return new Event(this, "success");
-	}
-
-}

spring-faces/src/main/java/org/springframework/faces/webflow/JsfUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2007 the original author or authors.
+ * Copyright 2004-2008 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-faces/src/main/java/org/springframework/faces/webflow/JsfView.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2007 the original author or authors.
+ * Copyright 2004-2008 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2007 the original author or authors.
+ * Copyright 2004-2008 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactoryCreator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2007 the original author or authors.
+ * Copyright 2004-2008 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.