You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2008/07/03 23:18:39 UTC
svn commit: r673811 [3/5] - in /myfaces/core/trunk_1.2.x:
api/src/main/java-templates/javax/faces/component/
api/src/main/java/javax/faces/ api/src/main/java/javax/faces/application/
api/src/main/java/javax/faces/component/ api/src/main/java/javax/face...
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java Thu Jul 3 14:18:36 2008
@@ -353,47 +353,47 @@
RenderKitFactory renderFactory = (RenderKitFactory) FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
RenderKit renderKit = renderFactory.getRenderKit(facesContext, viewToRender.getRenderKitId());
- ResponseWriter responseWriter = facesContext.getResponseWriter();
- if (responseWriter == null)
- {
- responseWriter = renderKit.createResponseWriter(response.getWriter(), null,
- ((HttpServletRequest) externalContext.getRequest()).getCharacterEncoding());
- facesContext.setResponseWriter(responseWriter);
- }
-
- ResponseWriter oldResponseWriter = responseWriter;
- StateMarkerAwareWriter stateAwareWriter = null;
-
- StateManager stateManager = facesContext.getApplication().getStateManager();
- if (stateManager.isSavingStateInClient(facesContext))
- {
- stateAwareWriter = new StateMarkerAwareWriter();
-
- // Create a new response-writer using as an underlying writer the stateAwareWriter
- // Effectively, all output will be buffered in the stateAwareWriter so that later
- // this writer can replace the state-markers with the actual state.
- responseWriter = hookInStateAwareWriter(
- oldResponseWriter, stateAwareWriter, renderKit, externalContext);
- facesContext.setResponseWriter(responseWriter);
- }
+ ResponseWriter responseWriter = facesContext.getResponseWriter();
+ if (responseWriter == null)
+ {
+ responseWriter = renderKit.createResponseWriter(response.getWriter(), null,
+ ((HttpServletRequest) externalContext.getRequest()).getCharacterEncoding());
+ facesContext.setResponseWriter(responseWriter);
+ }
+
+ ResponseWriter oldResponseWriter = responseWriter;
+ StateMarkerAwareWriter stateAwareWriter = null;
+
+ StateManager stateManager = facesContext.getApplication().getStateManager();
+ if (stateManager.isSavingStateInClient(facesContext))
+ {
+ stateAwareWriter = new StateMarkerAwareWriter();
+
+ // Create a new response-writer using as an underlying writer the stateAwareWriter
+ // Effectively, all output will be buffered in the stateAwareWriter so that later
+ // this writer can replace the state-markers with the actual state.
+ responseWriter = hookInStateAwareWriter(
+ oldResponseWriter, stateAwareWriter, renderKit, externalContext);
+ facesContext.setResponseWriter(responseWriter);
+ }
- actuallyRenderView(facesContext, viewToRender);
+ actuallyRenderView(facesContext, viewToRender);
- facesContext.setResponseWriter(oldResponseWriter);
+ facesContext.setResponseWriter(oldResponseWriter);
- //We're done with the document - now we can write all content
+ //We're done with the document - now we can write all content
//to the response, properly replacing the state-markers on the way out
//by using the stateAwareWriter
- if (stateManager.isSavingStateInClient(facesContext))
- {
- stateAwareWriter.flushToWriter(response.getWriter());
- }
- else
- {
- stateManager.saveView(facesContext);
- }
+ if (stateManager.isSavingStateInClient(facesContext))
+ {
+ stateAwareWriter.flushToWriter(response.getWriter());
+ }
+ else
+ {
+ stateManager.saveView(facesContext);
+ }
- // Final step - we output any content in the wrappedResponse response from above to the response,
+ // Final step - we output any content in the wrappedResponse response from above to the response,
// removing the wrappedResponse response from the request, we don't need it anymore
ViewResponseWrapper afterViewTagResponse = (ViewResponseWrapper) externalContext.getRequestMap().get(
AFTER_VIEW_TAG_CONTENT_PARAM);
@@ -444,14 +444,14 @@
* @return
*/
private ResponseWriter hookInStateAwareWriter(ResponseWriter oldResponseWriter, StateMarkerAwareWriter stateAwareWriter, RenderKit renderKit, ExternalContext externalContext) {
- return oldResponseWriter.cloneWithWriter(stateAwareWriter);
- /*
+ return oldResponseWriter.cloneWithWriter(stateAwareWriter);
+ /*
ResponseWriter newResponseWriter;
if (oldResponseWriter != null)
{
newResponseWriter = oldResponseWriter.cloneWithWriter(stateAwareWriter);
}
- else
+ else
{
if (log.isTraceEnabled())
log.trace("Creating new ResponseWriter");
@@ -533,59 +533,59 @@
*/
public void writeState(FacesContext facesContext) throws IOException
{
- StateManager stateManager = facesContext.getApplication().getStateManager();
- if (stateManager.isSavingStateInClient(facesContext))
- {
+ StateManager stateManager = facesContext.getApplication().getStateManager();
+ if (stateManager.isSavingStateInClient(facesContext))
+ {
// Only write state marker if javascript view state is disabled
- ExternalContext extContext = facesContext.getExternalContext();
+ ExternalContext extContext = facesContext.getExternalContext();
if (!(JavascriptUtils.isJavascriptAllowed(extContext) && MyfacesConfig.getCurrentInstance(extContext).isViewStateJavascript())) {
- facesContext.getResponseWriter().write(FORM_STATE_MARKER);
+ facesContext.getResponseWriter().write(FORM_STATE_MARKER);
+ }
+ }
+ else
+ {
+ stateManager.writeState(facesContext, new Object[2]);
}
- }
- else
- {
- stateManager.writeState(facesContext, new Object[2]);
- }
- }
+ }
/**
* Writes the response and replaces the state marker tags with the state information for the current context
*/
private static class StateMarkerAwareWriter extends Writer
{
- private StringBuilder buf;
+ private StringBuilder buf;
- public StateMarkerAwareWriter()
- {
- this.buf = new StringBuilder();
- }
-
- @Override
- public void close() throws IOException
- {
- }
-
- @Override
- public void flush() throws IOException
- {
- }
-
- @Override
- public void write(char[] cbuf, int off, int len) throws IOException
- {
- if ((off < 0) || (off > cbuf.length) || (len < 0) ||
- ((off + len) > cbuf.length) || ((off + len) < 0)) {
- throw new IndexOutOfBoundsException();
- } else if (len == 0) {
- return;
- }
- buf.append(cbuf, off, len);
- }
-
- public StringBuilder getStringBuilder()
- {
- return buf;
- }
+ public StateMarkerAwareWriter()
+ {
+ this.buf = new StringBuilder();
+ }
+
+ @Override
+ public void close() throws IOException
+ {
+ }
+
+ @Override
+ public void flush() throws IOException
+ {
+ }
+
+ @Override
+ public void write(char[] cbuf, int off, int len) throws IOException
+ {
+ if ((off < 0) || (off > cbuf.length) || (len < 0) ||
+ ((off + len) > cbuf.length) || ((off + len) < 0)) {
+ throw new IndexOutOfBoundsException();
+ } else if (len == 0) {
+ return;
+ }
+ buf.append(cbuf, off, len);
+ }
+
+ public StringBuilder getStringBuilder()
+ {
+ return buf;
+ }
public void flushToWriter(Writer writer) throws IOException
{
@@ -606,26 +606,26 @@
ExternalContext extContext = facesContext.getExternalContext();
if (JavascriptUtils.isJavascriptAllowed(extContext) && MyfacesConfig.getCurrentInstance(extContext).isViewStateJavascript()) {
- // If javascript viewstate is enabled no state markers were written
- write(contentBuffer, 0, contentBuffer.length(), writer);
- writer.write(state);
+ // If javascript viewstate is enabled no state markers were written
+ write(contentBuffer, 0, contentBuffer.length(), writer);
+ writer.write(state);
} else {
- // If javascript viewstate is disabled state markers must be replaced
- int lastFormMarkerPos = 0;
- int formMarkerPos = 0;
- // Find all state markers and write out actual state instead
- while ((formMarkerPos = contentBuffer.indexOf(FORM_STATE_MARKER, formMarkerPos)) > -1)
- {
- // Write content before state marker
- write(contentBuffer, lastFormMarkerPos, formMarkerPos, writer);
- // Write state and move position in buffer after marker
- writer.write(state);
- formMarkerPos += FORM_STATE_MARKER_LEN;
- lastFormMarkerPos = formMarkerPos;
- }
+ // If javascript viewstate is disabled state markers must be replaced
+ int lastFormMarkerPos = 0;
+ int formMarkerPos = 0;
+ // Find all state markers and write out actual state instead
+ while ((formMarkerPos = contentBuffer.indexOf(FORM_STATE_MARKER, formMarkerPos)) > -1)
+ {
+ // Write content before state marker
+ write(contentBuffer, lastFormMarkerPos, formMarkerPos, writer);
+ // Write state and move position in buffer after marker
+ writer.write(state);
+ formMarkerPos += FORM_STATE_MARKER_LEN;
+ lastFormMarkerPos = formMarkerPos;
+ }
// Write content after last state marker
if (lastFormMarkerPos < contentBuffer.length()) {
- write(contentBuffer, lastFormMarkerPos, contentBuffer.length(), writer);
+ write(contentBuffer, lastFormMarkerPos, contentBuffer.length(), writer);
}
}
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java Thu Jul 3 14:18:36 2008
@@ -556,11 +556,11 @@
if (DEFAULT_FACES_CONFIG.equals(systemId))
{
- if(log.isWarnEnabled())
- log.warn(DEFAULT_FACES_CONFIG + " has been specified in the " +
- FacesServlet.CONFIG_FILES_ATTR + " context parameter of " +
- "the deployment descriptor. This will automatically be removed, " +
- "if we wouldn't do this, it would be loaded twice. See JSF spec 1.1, 10.3.2");
+ if(log.isWarnEnabled())
+ log.warn(DEFAULT_FACES_CONFIG + " has been specified in the " +
+ FacesServlet.CONFIG_FILES_ATTR + " context parameter of " +
+ "the deployment descriptor. This will automatically be removed, " +
+ "if we wouldn't do this, it would be loaded twice. See JSF spec 1.1, 10.3.2");
}
else
configFilesList.add(systemId);
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/convert/ConverterUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/convert/ConverterUtils.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/convert/ConverterUtils.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/convert/ConverterUtils.java Thu Jul 3 14:18:36 2008
@@ -29,51 +29,51 @@
private ConverterUtils() {}
- public static int convertToInt(Object value)
- {
- if (value instanceof Number)
- {
- return ((Number)value).intValue();
- }
- else if (value instanceof String)
- {
- try
- {
- return Integer.parseInt((String)value);
- }
- catch (NumberFormatException e)
- {
- throw new IllegalArgumentException("Cannot convert " + value.toString() + " to int");
- }
- }
- else
- {
- throw new IllegalArgumentException("Cannot convert " + value.toString() + " to int");
- }
- }
-
- public static boolean convertToBoolean(Object value)
- {
- if (value instanceof Boolean)
- {
- return ((Boolean)value).booleanValue();
- }
- else if (value instanceof String)
- {
- try
- {
- return new Boolean((String)value).booleanValue();
- }
- catch (Exception e)
- {
- throw new IllegalArgumentException("Cannot convert " + value.toString() + " to boolean");
- }
- }
- else
- {
- throw new IllegalArgumentException("Cannot convert " + value.toString() + " to boolean");
- }
- }
+ public static int convertToInt(Object value)
+ {
+ if (value instanceof Number)
+ {
+ return ((Number)value).intValue();
+ }
+ else if (value instanceof String)
+ {
+ try
+ {
+ return Integer.parseInt((String)value);
+ }
+ catch (NumberFormatException e)
+ {
+ throw new IllegalArgumentException("Cannot convert " + value.toString() + " to int");
+ }
+ }
+ else
+ {
+ throw new IllegalArgumentException("Cannot convert " + value.toString() + " to int");
+ }
+ }
+
+ public static boolean convertToBoolean(Object value)
+ {
+ if (value instanceof Boolean)
+ {
+ return ((Boolean)value).booleanValue();
+ }
+ else if (value instanceof String)
+ {
+ try
+ {
+ return new Boolean((String)value).booleanValue();
+ }
+ catch (Exception e)
+ {
+ throw new IllegalArgumentException("Cannot convert " + value.toString() + " to boolean");
+ }
+ }
+ else
+ {
+ throw new IllegalArgumentException("Cannot convert " + value.toString() + " to boolean");
+ }
+ }
public static long convertToLong(Object value)
{
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/el/convert/PropertyResolverToELResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/el/convert/PropertyResolverToELResolver.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/el/convert/PropertyResolverToELResolver.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/el/convert/PropertyResolverToELResolver.java Thu Jul 3 14:18:36 2008
@@ -195,7 +195,7 @@
// see: https://issues.apache.org/jira/browse/MYFACES-1670
context.setPropertyResolved(
- FacesContext.getCurrentInstance().getELContext().isPropertyResolved());
+ FacesContext.getCurrentInstance().getELContext().isPropertyResolved());
return value;
}
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/el/unified/resolver/GuiceResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/el/unified/resolver/GuiceResolver.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/el/unified/resolver/GuiceResolver.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/el/unified/resolver/GuiceResolver.java Thu Jul 3 14:18:36 2008
@@ -33,9 +33,9 @@
/**
* <p>Register this ELResolver in faces-config.xml.</p>
*
- * <application>
- * <el-resolver>org.apache.myfaces.el.unified.resolver.GuiceResolver</el-resolver>
- * </application>
+ * <application>
+ * <el-resolver>org.apache.myfaces.el.unified.resolver.GuiceResolver</el-resolver>
+ * </application>
*
* <p>Implement and configure a ServletContextListener in web.xml .</p>
*
@@ -48,17 +48,17 @@
*
* public class GuiceServletContextListener implements ServletContextListener {
*
- * public void contextInitialized(ServletContextEvent event) {
- * ServletContext ctx = event.getServletContext();
+ * public void contextInitialized(ServletContextEvent event) {
+ * ServletContext ctx = event.getServletContext();
* //when on Java6, use ServiceLoader.load(com.google.inject.Module.class);
- * Injector injector = Guice.createInjector(new YourModule());
- * ctx.setAttribute(GuiceResolver.KEY, injector);
- * }
+ * Injector injector = Guice.createInjector(new YourModule());
+ * ctx.setAttribute(GuiceResolver.KEY, injector);
+ * }
*
- * public void contextDestroyed(ServletContextEvent event) {
- * ServletContext ctx = event.getServletContext();
- * ctx.removeAttribute(GuiceResolver.KEY);
- * }
+ * public void contextDestroyed(ServletContextEvent event) {
+ * ServletContext ctx = event.getServletContext();
+ * ctx.removeAttribute(GuiceResolver.KEY);
+ * }
*
*}
*
@@ -67,14 +67,14 @@
public class GuiceResolver extends ManagedBeanResolver {
- public static final String KEY = "oam." + Injector.class.getName();
-
- @Override
- public Object getValue(ELContext ctx, Object base, Object property)
- throws NullPointerException, PropertyNotFoundException, ELException {
-
+ public static final String KEY = "oam." + Injector.class.getName();
+
+ @Override
+ public Object getValue(ELContext ctx, Object base, Object property)
+ throws NullPointerException, PropertyNotFoundException, ELException {
+
if (base != null || !(property instanceof String))
- return null;
+ return null;
if (property == null)
throw new PropertyNotFoundException();
@@ -82,32 +82,32 @@
FacesContext fctx = (FacesContext) ctx.getContext(FacesContext.class);
if(fctx == null)
- return null;
+ return null;
ExternalContext ectx = fctx.getExternalContext();
if (ectx == null ||
- ectx.getRequestMap().containsKey(property) ||
- ectx.getSessionMap().containsKey(property) ||
- ectx.getApplicationMap().containsKey(property) )
- return null;
+ ectx.getRequestMap().containsKey(property) ||
+ ectx.getSessionMap().containsKey(property) ||
+ ectx.getApplicationMap().containsKey(property) )
+ return null;
ManagedBean managedBean = runtimeConfig(ctx).getManagedBean((String)property);
return managedBean == null ? null : getValue(ctx, ectx, managedBean.getManagedBeanClass());
- }
+ }
- private Object getValue(ELContext ctx, ExternalContext ectx, Class managedBeanClass) {
-
+ private Object getValue(ELContext ctx, ExternalContext ectx, Class managedBeanClass) {
+
Injector injector = (Injector) ectx.getApplicationMap().get(KEY);
if(injector == null)
- throw new FacesException("Could not find an instance of " + Injector.class.getName()
- + " in application scope using key '" + KEY + "'");
+ throw new FacesException("Could not find an instance of " + Injector.class.getName()
+ + " in application scope using key '" + KEY + "'");
Object value = injector.getInstance(managedBeanClass);
ctx.setPropertyResolved(true);
return value;
- }
+ }
}
\ No newline at end of file
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolver.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolver.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolver.java Thu Jul 3 14:18:36 2008
@@ -203,27 +203,27 @@
return obj;
}
- private void putInScope(ManagedBean managedBean, ExternalContext extContext, Object obj) {
+ private void putInScope(ManagedBean managedBean, ExternalContext extContext, Object obj) {
- final String managedBeanName = managedBean.getManagedBeanName();
-
- if (obj == null) {
- if (log.isDebugEnabled())
- log.debug("Variable '" + managedBeanName + "' could not be resolved.");
- } else {
-
- String scopeKey = managedBean.getManagedBeanScope();
-
- // find the scope handler object
- Scope scope = (Scope) _scopes.get(scopeKey);
- if (scope == null) {
- log.error("Managed bean '" + managedBeanName + "' has illegal scope: " + scopeKey);
- } else {
- scope.put(extContext, managedBeanName, obj);
- }
- }
+ final String managedBeanName = managedBean.getManagedBeanName();
+
+ if (obj == null) {
+ if (log.isDebugEnabled())
+ log.debug("Variable '" + managedBeanName + "' could not be resolved.");
+ } else {
+
+ String scopeKey = managedBean.getManagedBeanScope();
+
+ // find the scope handler object
+ Scope scope = (Scope) _scopes.get(scopeKey);
+ if (scope == null) {
+ log.error("Managed bean '" + managedBeanName + "' has illegal scope: " + scopeKey);
+ } else {
+ scope.put(extContext, managedBeanName, obj);
+ }
+ }
- }
+ }
// get the FacesContext from the ELContext
private FacesContext facesContext(ELContext context) {
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/ApplyRequestValuesExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/ApplyRequestValuesExecutor.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/ApplyRequestValuesExecutor.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/ApplyRequestValuesExecutor.java Thu Jul 3 14:18:36 2008
@@ -28,12 +28,12 @@
* Apply request values phase (JSF Spec 2.2.2)
*/
class ApplyRequestValuesExecutor implements PhaseExecutor {
- public boolean execute(FacesContext facesContext) {
- facesContext.getViewRoot().processDecodes(facesContext);
- return false;
- }
+ public boolean execute(FacesContext facesContext) {
+ facesContext.getViewRoot().processDecodes(facesContext);
+ return false;
+ }
- public PhaseId getPhase() {
- return PhaseId.APPLY_REQUEST_VALUES;
- }
+ public PhaseId getPhase() {
+ return PhaseId.APPLY_REQUEST_VALUES;
+ }
}
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/InvokeApplicationExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/InvokeApplicationExecutor.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/InvokeApplicationExecutor.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/InvokeApplicationExecutor.java Thu Jul 3 14:18:36 2008
@@ -28,12 +28,12 @@
* Invoke application phase (JSF Spec 2.2.5)
*/
class InvokeApplicationExecutor implements PhaseExecutor {
- public boolean execute(FacesContext facesContext) {
- facesContext.getViewRoot().processApplication(facesContext);
- return false;
- }
+ public boolean execute(FacesContext facesContext) {
+ facesContext.getViewRoot().processApplication(facesContext);
+ return false;
+ }
- public PhaseId getPhase() {
- return PhaseId.INVOKE_APPLICATION;
- }
+ public PhaseId getPhase() {
+ return PhaseId.INVOKE_APPLICATION;
+ }
}
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java Thu Jul 3 14:18:36 2008
@@ -55,15 +55,15 @@
public LifecycleImpl() {
// hide from public access
- lifecycleExecutors = new PhaseExecutor[] {
- new RestoreViewExecutor(),
- new ApplyRequestValuesExecutor(),
- new ProcessValidationsExecutor(),
- new UpdateModelValuesExecutor(),
- new InvokeApplicationExecutor()
- };
+ lifecycleExecutors = new PhaseExecutor[] {
+ new RestoreViewExecutor(),
+ new ApplyRequestValuesExecutor(),
+ new ProcessValidationsExecutor(),
+ new UpdateModelValuesExecutor(),
+ new InvokeApplicationExecutor()
+ };
- renderExecutor = new RenderResponseExecutor();
+ renderExecutor = new RenderResponseExecutor();
}
public void execute(FacesContext facesContext) throws FacesException {
@@ -73,20 +73,20 @@
PhaseListenerManager phaseListenerMgr = new PhaseListenerManager(this, facesContext, getPhaseListeners());
for(int executorIndex = 0;executorIndex < lifecycleExecutors.length;executorIndex++) {
- if(executePhase(facesContext, lifecycleExecutors[executorIndex], phaseListenerMgr)) {
- return;
- }
+ if(executePhase(facesContext, lifecycleExecutors[executorIndex], phaseListenerMgr)) {
+ return;
+ }
}
}
private boolean executePhase(FacesContext facesContext, PhaseExecutor executor,
- PhaseListenerManager phaseListenerMgr) throws FacesException {
+ PhaseListenerManager phaseListenerMgr) throws FacesException {
boolean skipFurtherProcessing = false;
if (log.isTraceEnabled()) {
- log.trace("entering " + executor.getPhase() + " in " + LifecycleImpl.class.getName());
+ log.trace("entering " + executor.getPhase() + " in " + LifecycleImpl.class.getName());
}
try {
@@ -94,14 +94,14 @@
if(isResponseComplete(facesContext, executor.getPhase(), true)) {
// have to return right away
- return true;
+ return true;
}
if(shouldRenderResponse(facesContext, executor.getPhase(), true)) {
- skipFurtherProcessing = true;
+ skipFurtherProcessing = true;
}
if(executor.execute(facesContext)) {
- return true;
+ return true;
}
} finally {
phaseListenerMgr.informPhaseListenersAfter(executor.getPhase());
@@ -109,22 +109,22 @@
if (isResponseComplete(facesContext, executor.getPhase(), false)
- || shouldRenderResponse(facesContext, executor.getPhase(), false)) {
- // since this phase is completed we don't need to return right away even if the response is completed
- skipFurtherProcessing = true;
+ || shouldRenderResponse(facesContext, executor.getPhase(), false)) {
+ // since this phase is completed we don't need to return right away even if the response is completed
+ skipFurtherProcessing = true;
}
if (!skipFurtherProcessing && log.isTraceEnabled()) {
- log.trace("exiting " + executor.getPhase() + " in " + LifecycleImpl.class.getName());
+ log.trace("exiting " + executor.getPhase() + " in " + LifecycleImpl.class.getName());
}
return skipFurtherProcessing;
}
public void render(FacesContext facesContext) throws FacesException {
- // if the response is complete we should not be invoking the phase listeners
+ // if the response is complete we should not be invoking the phase listeners
if(isResponseComplete(facesContext, renderExecutor.getPhase(), true)) {
- return;
+ return;
}
if (log.isTraceEnabled()) log.trace("entering " + renderExecutor.getPhase() + " in " + LifecycleImpl.class.getName());
@@ -134,7 +134,7 @@
phaseListenerMgr.informPhaseListenersBefore(renderExecutor.getPhase());
// also possible that one of the listeners completed the response
if(isResponseComplete(facesContext, renderExecutor.getPhase(), true)) {
- return;
+ return;
}
renderExecutor.execute(facesContext);
@@ -148,64 +148,64 @@
}
if (log.isTraceEnabled()) {
- log.trace("exiting " + renderExecutor.getPhase() + " in " + LifecycleImpl.class.getName());
+ log.trace("exiting " + renderExecutor.getPhase() + " in " + LifecycleImpl.class.getName());
}
}
private boolean isResponseComplete(FacesContext facesContext, PhaseId phase, boolean before) {
- boolean flag = false;
- if (facesContext.getResponseComplete()) {
- if (log.isDebugEnabled()) {
- log.debug("exiting from lifecycle.execute in " + phase
- + " because getResponseComplete is true from one of the " +
- (before ? "before" : "after") + " listeners");
- }
- flag = true;
- }
- return flag;
- }
-
- private boolean shouldRenderResponse(FacesContext facesContext, PhaseId phase, boolean before) {
- boolean flag = false;
- if (facesContext.getRenderResponse()) {
- if (log.isDebugEnabled()) {
- log.debug("exiting from lifecycle.execute in " + phase
- + " because getRenderResponse is true from one of the " +
- (before ? "before" : "after") + " listeners");
- }
- flag = true;
- }
- return flag;
- }
+ boolean flag = false;
+ if (facesContext.getResponseComplete()) {
+ if (log.isDebugEnabled()) {
+ log.debug("exiting from lifecycle.execute in " + phase
+ + " because getResponseComplete is true from one of the " +
+ (before ? "before" : "after") + " listeners");
+ }
+ flag = true;
+ }
+ return flag;
+ }
+
+ private boolean shouldRenderResponse(FacesContext facesContext, PhaseId phase, boolean before) {
+ boolean flag = false;
+ if (facesContext.getRenderResponse()) {
+ if (log.isDebugEnabled()) {
+ log.debug("exiting from lifecycle.execute in " + phase
+ + " because getRenderResponse is true from one of the " +
+ (before ? "before" : "after") + " listeners");
+ }
+ flag = true;
+ }
+ return flag;
+ }
public void addPhaseListener(PhaseListener phaseListener) {
- if (phaseListener == null) {
- throw new NullPointerException("PhaseListener must not be null.");
- }
- synchronized (_phaseListenerList) {
- _phaseListenerList.add(phaseListener);
- _phaseListenerArray = null; // reset lazy cache array
- }
- }
-
- public void removePhaseListener(PhaseListener phaseListener) {
- if (phaseListener == null) {
- throw new NullPointerException("PhaseListener must not be null.");
- }
- synchronized (_phaseListenerList) {
- _phaseListenerList.remove(phaseListener);
- _phaseListenerArray = null; // reset lazy cache array
- }
- }
-
- public PhaseListener[] getPhaseListeners() {
- synchronized (_phaseListenerList) {
- // (re)build lazy cache array if necessary
- if (_phaseListenerArray == null) {
- _phaseListenerArray = _phaseListenerList.toArray(new PhaseListener[_phaseListenerList
- .size()]);
- }
- return _phaseListenerArray;
- }
- }
+ if (phaseListener == null) {
+ throw new NullPointerException("PhaseListener must not be null.");
+ }
+ synchronized (_phaseListenerList) {
+ _phaseListenerList.add(phaseListener);
+ _phaseListenerArray = null; // reset lazy cache array
+ }
+ }
+
+ public void removePhaseListener(PhaseListener phaseListener) {
+ if (phaseListener == null) {
+ throw new NullPointerException("PhaseListener must not be null.");
+ }
+ synchronized (_phaseListenerList) {
+ _phaseListenerList.remove(phaseListener);
+ _phaseListenerArray = null; // reset lazy cache array
+ }
+ }
+
+ public PhaseListener[] getPhaseListeners() {
+ synchronized (_phaseListenerList) {
+ // (re)build lazy cache array if necessary
+ if (_phaseListenerArray == null) {
+ _phaseListenerArray = _phaseListenerList.toArray(new PhaseListener[_phaseListenerList
+ .size()]);
+ }
+ return _phaseListenerArray;
+ }
+ }
}
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseExecutor.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseExecutor.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseExecutor.java Thu Jul 3 14:18:36 2008
@@ -36,8 +36,8 @@
* @param facesContext The <code>FacesContext</code> for the current request we are processing
* @return <code>true</code> if execution should be stopped
*/
- boolean execute(FacesContext facesContext);
-
+ boolean execute(FacesContext facesContext);
+
/**
* Returns the <code>PhaseId</code> for which the implemented executor is invoked
* @return
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/ProcessValidationsExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/ProcessValidationsExecutor.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/ProcessValidationsExecutor.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/ProcessValidationsExecutor.java Thu Jul 3 14:18:36 2008
@@ -28,12 +28,12 @@
* Process validations phase (JSF Spec 2.2.3)
*/
class ProcessValidationsExecutor implements PhaseExecutor {
- public boolean execute(FacesContext facesContext) {
- facesContext.getViewRoot().processValidators(facesContext);
- return false;
- }
+ public boolean execute(FacesContext facesContext) {
+ facesContext.getViewRoot().processValidators(facesContext);
+ return false;
+ }
- public PhaseId getPhase() {
- return PhaseId.PROCESS_VALIDATIONS;
- }
+ public PhaseId getPhase() {
+ return PhaseId.PROCESS_VALIDATIONS;
+ }
}
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/RenderResponseExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/RenderResponseExecutor.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/RenderResponseExecutor.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/RenderResponseExecutor.java Thu Jul 3 14:18:36 2008
@@ -33,19 +33,19 @@
* render response phase (JSF Spec 2.2.6)
*/
class RenderResponseExecutor implements PhaseExecutor {
- public boolean execute(FacesContext facesContext) {
- Application application = facesContext.getApplication();
- ViewHandler viewHandler = application.getViewHandler();
+ public boolean execute(FacesContext facesContext) {
+ Application application = facesContext.getApplication();
+ ViewHandler viewHandler = application.getViewHandler();
- try {
- viewHandler.renderView(facesContext, facesContext.getViewRoot());
- } catch (IOException e) {
- throw new FacesException(e.getMessage(), e);
- }
- return false;
- }
+ try {
+ viewHandler.renderView(facesContext, facesContext.getViewRoot());
+ } catch (IOException e) {
+ throw new FacesException(e.getMessage(), e);
+ }
+ return false;
+ }
- public PhaseId getPhase() {
- return PhaseId.RENDER_RESPONSE;
- }
+ public PhaseId getPhase() {
+ return PhaseId.RENDER_RESPONSE;
+ }
}
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/UpdateModelValuesExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/UpdateModelValuesExecutor.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/UpdateModelValuesExecutor.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/UpdateModelValuesExecutor.java Thu Jul 3 14:18:36 2008
@@ -29,12 +29,12 @@
* Update model values phase (JSF Spec 2.2.4)
*/
class UpdateModelValuesExecutor implements PhaseExecutor {
- public boolean execute(FacesContext facesContext) {
- facesContext.getViewRoot().processUpdates(facesContext);
- return false;
- }
+ public boolean execute(FacesContext facesContext) {
+ facesContext.getViewRoot().processUpdates(facesContext);
+ return false;
+ }
- public PhaseId getPhase() {
- return PhaseId.UPDATE_MODEL_VALUES;
- }
+ public PhaseId getPhase() {
+ return PhaseId.UPDATE_MODEL_VALUES;
+ }
}
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java Thu Jul 3 14:18:36 2008
@@ -38,12 +38,12 @@
extends HtmlFormRendererBase
{
//private static final Log log = LogFactory.getLog(HtmlFormRenderer.class);
-
- @Override
- protected void afterFormElementsEnd(FacesContext facesContext,
- UIComponent component) throws IOException {
- super.afterFormElementsEnd(facesContext, component);
-
+
+ @Override
+ protected void afterFormElementsEnd(FacesContext facesContext,
+ UIComponent component) throws IOException {
+ super.afterFormElementsEnd(facesContext, component);
+
ResponseWriter writer = facesContext.getResponseWriter();
ExternalContext extContext = facesContext.getExternalContext();
@@ -56,5 +56,5 @@
writer.writeAttribute(HTML.VALUE_ATTR, "", null);
writer.endElement(HTML.INPUT_ELEM);
}
- }
+ }
}
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java Thu Jul 3 14:18:36 2008
@@ -98,23 +98,23 @@
ResponseWriter responseWriter,
Object savedState) throws IOException
{
- String serializedState = StateUtils.construct(savedState,
+ String serializedState = StateUtils.construct(savedState,
facesContext.getExternalContext());
ExternalContext extContext = facesContext.getExternalContext();
MyfacesConfig myfacesConfig = MyfacesConfig.getCurrentInstance(extContext);
// Write Javascript viewstate if enabled and if javascript is allowed,
// otherwise write hidden input
if (JavascriptUtils.isJavascriptAllowed(extContext) && myfacesConfig.isViewStateJavascript()) {
- HtmlRendererUtils.renderViewStateJavascript(facesContext, STANDARD_STATE_SAVING_PARAM, serializedState);
+ HtmlRendererUtils.renderViewStateJavascript(facesContext, STANDARD_STATE_SAVING_PARAM, serializedState);
} else {
- responseWriter.startElement(HTML.INPUT_ELEM, null);
- responseWriter.writeAttribute(HTML.TYPE_ATTR, HTML.INPUT_TYPE_HIDDEN, null);
- responseWriter.writeAttribute(HTML.NAME_ATTR, STANDARD_STATE_SAVING_PARAM, null);
+ responseWriter.startElement(HTML.INPUT_ELEM, null);
+ responseWriter.writeAttribute(HTML.TYPE_ATTR, HTML.INPUT_TYPE_HIDDEN, null);
+ responseWriter.writeAttribute(HTML.NAME_ATTR, STANDARD_STATE_SAVING_PARAM, null);
if (myfacesConfig.isRenderViewStateId()) {
responseWriter.writeAttribute(HTML.ID_ATTR, STANDARD_STATE_SAVING_PARAM, null);
}
responseWriter.writeAttribute(HTML.VALUE_ATTR, serializedState, null);
- responseWriter.endElement(HTML.INPUT_ELEM);
+ responseWriter.endElement(HTML.INPUT_ELEM);
}
}
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java Thu Jul 3 14:18:36 2008
@@ -366,7 +366,7 @@
}
else if (value instanceof MethodBinding)
{
- stream.print(((MethodBinding)value).getExpressionString());
+ stream.print(((MethodBinding)value).getExpressionString());
}
else
{
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/AbstractMyFacesListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/AbstractMyFacesListener.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/AbstractMyFacesListener.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/AbstractMyFacesListener.java Thu Jul 3 14:18:36 2008
@@ -34,25 +34,25 @@
private static Log log = LogFactory.getLog(AbstractMyFacesListener.class);
protected void doPreDestroy(ServletRequestAttributeEvent event, String scope) {
- doPreDestroy(event.getValue(), event.getName(), scope);
- }
+ doPreDestroy(event.getValue(), event.getName(), scope);
+ }
- protected void doPreDestroy(HttpSessionBindingEvent event, String scope) {
- doPreDestroy(event.getValue(), event.getName(), scope);
- }
+ protected void doPreDestroy(HttpSessionBindingEvent event, String scope) {
+ doPreDestroy(event.getValue(), event.getName(), scope);
+ }
- protected void doPreDestroy(ServletContextAttributeEvent event, String scope) {
- doPreDestroy(event.getValue(), event.getName(), scope);
- }
-
- protected void doPreDestroy(Object value, String name, String scope) {
+ protected void doPreDestroy(ServletContextAttributeEvent event, String scope) {
+ doPreDestroy(event.getValue(), event.getName(), scope);
+ }
+
+ protected void doPreDestroy(Object value, String name, String scope) {
if(value != null)
- {
- //AnnotatedManagedBeanHandler handler =
- // new AnnotatedManagedBeanHandler(value, scope, name);
+ {
+ //AnnotatedManagedBeanHandler handler =
+ // new AnnotatedManagedBeanHandler(value, scope, name);
- //handler.invokePreDestroy();
+ //handler.invokePreDestroy();
try
{
@@ -65,5 +65,5 @@
log.error("", e);
}
}
- }
+ }
}
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionAttributeListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionAttributeListener.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionAttributeListener.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionAttributeListener.java Thu Jul 3 14:18:36 2008
@@ -10,17 +10,17 @@
*/
public class MyFacesHttpSessionAttributeListener extends AbstractMyFacesListener
- implements HttpSessionAttributeListener {
+ implements HttpSessionAttributeListener {
- public void attributeAdded(HttpSessionBindingEvent event) { // noop
- }
+ public void attributeAdded(HttpSessionBindingEvent event) { // noop
+ }
- public void attributeRemoved(HttpSessionBindingEvent event) {
- doPreDestroy(event, ManagedBeanBuilder.SESSION);
- }
+ public void attributeRemoved(HttpSessionBindingEvent event) {
+ doPreDestroy(event, ManagedBeanBuilder.SESSION);
+ }
- public void attributeReplaced(HttpSessionBindingEvent event) {
- doPreDestroy(event, ManagedBeanBuilder.SESSION);
- }
+ public void attributeReplaced(HttpSessionBindingEvent event) {
+ doPreDestroy(event, ManagedBeanBuilder.SESSION);
+ }
}
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionListener.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionListener.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionListener.java Thu Jul 3 14:18:36 2008
@@ -14,21 +14,21 @@
public class MyFacesHttpSessionListener extends AbstractMyFacesListener implements HttpSessionListener {
- public void sessionCreated(HttpSessionEvent event) { // noop
- }
+ public void sessionCreated(HttpSessionEvent event) { // noop
+ }
- public void sessionDestroyed(HttpSessionEvent event) {
-
- HttpSession session = event.getSession();
- Enumeration<String> attributes = session.getAttributeNames();
-
- while(attributes.hasMoreElements())
- {
- String name = attributes.nextElement();
- Object value = session.getAttribute(name);
- doPreDestroy(value, name, ManagedBeanBuilder.SESSION);
- }
-
- }
+ public void sessionDestroyed(HttpSessionEvent event) {
+
+ HttpSession session = event.getSession();
+ Enumeration<String> attributes = session.getAttributeNames();
+
+ while(attributes.hasMoreElements())
+ {
+ String name = attributes.nextElement();
+ Object value = session.getAttribute(name);
+ doPreDestroy(value, name, ManagedBeanBuilder.SESSION);
+ }
+
+ }
}
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServletContextListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServletContextListener.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServletContextListener.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServletContextListener.java Thu Jul 3 14:18:36 2008
@@ -11,15 +11,15 @@
public class MyFacesServletContextListener extends AbstractMyFacesListener implements ServletContextAttributeListener {
- public void attributeAdded(ServletContextAttributeEvent event) { // noop
- }
+ public void attributeAdded(ServletContextAttributeEvent event) { // noop
+ }
- public void attributeRemoved(ServletContextAttributeEvent event) {
- doPreDestroy(event, ManagedBeanBuilder.APPLICATION);
- }
+ public void attributeRemoved(ServletContextAttributeEvent event) {
+ doPreDestroy(event, ManagedBeanBuilder.APPLICATION);
+ }
- public void attributeReplaced(ServletContextAttributeEvent event) {
- doPreDestroy(event, ManagedBeanBuilder.APPLICATION);
- }
+ public void attributeReplaced(ServletContextAttributeEvent event) {
+ doPreDestroy(event, ManagedBeanBuilder.APPLICATION);
+ }
}
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServletRequestListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServletRequestListener.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServletRequestListener.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServletRequestListener.java Thu Jul 3 14:18:36 2008
@@ -14,21 +14,21 @@
public class MyFacesServletRequestListener extends AbstractMyFacesListener implements ServletRequestListener {
- public void requestDestroyed(ServletRequestEvent event) {
+ public void requestDestroyed(ServletRequestEvent event) {
- ServletRequest request = event.getServletRequest();
- Enumeration<String> attributes = request.getAttributeNames();
-
- while(attributes.hasMoreElements())
- {
- String name = attributes.nextElement();
- Object attribute = request.getAttribute(name);
- doPreDestroy(attribute, name, ManagedBeanBuilder.REQUEST);
- }
-
- }
-
- public void requestInitialized(ServletRequestEvent event) { // noop
- }
+ ServletRequest request = event.getServletRequest();
+ Enumeration<String> attributes = request.getAttributeNames();
+
+ while(attributes.hasMoreElements())
+ {
+ String name = attributes.nextElement();
+ Object attribute = request.getAttribute(name);
+ doPreDestroy(attribute, name, ManagedBeanBuilder.REQUEST);
+ }
+
+ }
+
+ public void requestInitialized(ServletRequestEvent event) { // noop
+ }
}
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/MyfacesServletRequestAttributeListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/MyfacesServletRequestAttributeListener.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/MyfacesServletRequestAttributeListener.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/MyfacesServletRequestAttributeListener.java Thu Jul 3 14:18:36 2008
@@ -10,17 +10,17 @@
*/
public class MyfacesServletRequestAttributeListener extends AbstractMyFacesListener
- implements ServletRequestAttributeListener {
-
- public void attributeAdded(ServletRequestAttributeEvent event) { // noop
- }
+ implements ServletRequestAttributeListener {
+
+ public void attributeAdded(ServletRequestAttributeEvent event) { // noop
+ }
- public void attributeRemoved(ServletRequestAttributeEvent event) {
- doPreDestroy(event, ManagedBeanBuilder.REQUEST);
- }
+ public void attributeRemoved(ServletRequestAttributeEvent event) {
+ doPreDestroy(event, ManagedBeanBuilder.REQUEST);
+ }
- public void attributeReplaced(ServletRequestAttributeEvent event) {
- doPreDestroy(event, ManagedBeanBuilder.REQUEST);
- }
+ public void attributeReplaced(ServletRequestAttributeEvent event) {
+ doPreDestroy(event, ManagedBeanBuilder.REQUEST);
+ }
}
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java Thu Jul 3 14:18:36 2008
@@ -49,7 +49,7 @@
* @version $Revision$ $Date$
*/
public class StartupServletContextListener extends AbstractMyFacesListener
- implements ServletContextListener
+ implements ServletContextListener
{
static final String FACES_INIT_DONE = StartupServletContextListener.class.getName() + ".FACES_INIT_DONE";
@@ -115,8 +115,8 @@
public void contextDestroyed(ServletContextEvent event)
{
- doPredestroy(event);
-
+ doPredestroy(event);
+
if (_facesInitializer != null && _servletContext != null)
{
_facesInitializer.destroyFaces(_servletContext);
@@ -126,15 +126,15 @@
}
private void doPredestroy(ServletContextEvent event) {
-
- ServletContext ctx = event.getServletContext();
- Enumeration<String> attributes = ctx.getAttributeNames();
-
- while(attributes.hasMoreElements())
- {
- String name = attributes.nextElement();
- Object value = ctx.getAttribute(name);
- doPreDestroy(value, name, ManagedBeanBuilder.APPLICATION);
- }
+
+ ServletContext ctx = event.getServletContext();
+ Enumeration<String> attributes = ctx.getAttributeNames();
+
+ while(attributes.hasMoreElements())
+ {
+ String name = attributes.nextElement();
+ Object value = ctx.getAttribute(name);
+ doPreDestroy(value, name, ManagedBeanBuilder.APPLICATION);
+ }
}
}
Modified: myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java Thu Jul 3 14:18:36 2008
@@ -237,10 +237,10 @@
*/
public void testCreateEnumConverter() throws Exception
{
- app.addConverter(Enum.class, EnumConverter.class.getName());
+ app.addConverter(Enum.class, EnumConverter.class.getName());
- Converter converter = app.createConverter(MyEnum.class);
- assertNotNull(converter);
- assertEquals(converter.getClass(), EnumConverter.class);
+ Converter converter = app.createConverter(MyEnum.class);
+ assertNotNull(converter);
+ assertEquals(converter.getClass(), EnumConverter.class);
}
}
Modified: myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/application/DefaultViewHandlerSupportTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/application/DefaultViewHandlerSupportTest.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/application/DefaultViewHandlerSupportTest.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/application/DefaultViewHandlerSupportTest.java Thu Jul 3 14:18:36 2008
@@ -59,19 +59,19 @@
}
private void assertCalculateViewId(
- String expectedViewId, String servletPath, String pathInfo,
- String contextSuffix, String viewId) throws Exception
+ String expectedViewId, String servletPath, String pathInfo,
+ String contextSuffix, String viewId) throws Exception
{
- DefaultViewHandlerSupport support = createdMockedViewHandlerSupport();
-
- expect(support.getContextSuffix(same(_facesContext))).andReturn(contextSuffix);
- expect(support.getFacesServletMapping(same(_facesContext))).andReturn(
- DefaultViewHandlerSupport.calculateFacesServletMapping(servletPath, pathInfo));
- expect(_facesContext.getExternalContext()).andReturn(_externalContext).anyTimes();
-
- _mocksControl.replay();
- assertEquals(expectedViewId, support.calculateViewId(_facesContext, viewId));
- _mocksControl.reset();
+ DefaultViewHandlerSupport support = createdMockedViewHandlerSupport();
+
+ expect(support.getContextSuffix(same(_facesContext))).andReturn(contextSuffix);
+ expect(support.getFacesServletMapping(same(_facesContext))).andReturn(
+ DefaultViewHandlerSupport.calculateFacesServletMapping(servletPath, pathInfo));
+ expect(_facesContext.getExternalContext()).andReturn(_externalContext).anyTimes();
+
+ _mocksControl.replay();
+ assertEquals(expectedViewId, support.calculateViewId(_facesContext, viewId));
+ _mocksControl.reset();
}
/**
@@ -110,20 +110,20 @@
}
private void assertActionUrl(
- String expectedActionUrl, String contextPath, String servletPath,
- String pathInfo, String viewId) throws Exception
+ String expectedActionUrl, String contextPath, String servletPath,
+ String pathInfo, String viewId) throws Exception
{
- DefaultViewHandlerSupport support = createdMockedViewHandlerSupport();
-
- expect(support.getContextSuffix(same(_facesContext))).andReturn(DEFAULT_SUFFIX);
- expect(support.getFacesServletMapping(same(_facesContext))).andReturn(
- DefaultViewHandlerSupport.calculateFacesServletMapping(servletPath, pathInfo));
- expect(_facesContext.getExternalContext()).andReturn(_externalContext).anyTimes();
- expect(_externalContext.getRequestContextPath()).andReturn(contextPath);
-
- _mocksControl.replay();
- assertEquals(expectedActionUrl, support.calculateActionURL(_facesContext, viewId));
- _mocksControl.reset();
+ DefaultViewHandlerSupport support = createdMockedViewHandlerSupport();
+
+ expect(support.getContextSuffix(same(_facesContext))).andReturn(DEFAULT_SUFFIX);
+ expect(support.getFacesServletMapping(same(_facesContext))).andReturn(
+ DefaultViewHandlerSupport.calculateFacesServletMapping(servletPath, pathInfo));
+ expect(_facesContext.getExternalContext()).andReturn(_externalContext).anyTimes();
+ expect(_externalContext.getRequestContextPath()).andReturn(contextPath);
+
+ _mocksControl.replay();
+ assertEquals(expectedActionUrl, support.calculateActionURL(_facesContext, viewId));
+ _mocksControl.reset();
}
private DefaultViewHandlerSupport createdMockedViewHandlerSupport() throws Exception
@@ -146,7 +146,7 @@
* Test method for
* {@link org.apache.myfaces.application.DefaultViewHandlerSupport#calculateFacesServletMapping(String, String)}.
*/
- public void testCalculateFacesServletMapping() throws Exception
+ public void testCalculateFacesServletMapping() throws Exception
{
assertExtensionMapping(".jsf", "/index.jsf", null);
assertExtensionMapping(".jsf", "/secure/login.jsf", null);
@@ -172,13 +172,13 @@
private void assertExtensionMapping(
String extension, String servletPath, String pathInfo)
{
- FacesServletMapping mapping =
- DefaultViewHandlerSupport.calculateFacesServletMapping(servletPath, pathInfo);
+ FacesServletMapping mapping =
+ DefaultViewHandlerSupport.calculateFacesServletMapping(servletPath, pathInfo);
assertTrue(mapping.isExtensionMapping());
assertEquals(extension, mapping.getExtension());
}
-
- /**
+
+ /**
* Convenience method that tests if the ViewHandlerSupport object knows that
* the "given request" has been handled by a FacesServlet being prefix
* mapped. Extract the path elements of a Request-URI according to the
@@ -194,11 +194,11 @@
private void assertPathBasedMapping(
String prefix, String servletPath, String pathInfo)
{
- FacesServletMapping mapping =
- DefaultViewHandlerSupport.calculateFacesServletMapping(servletPath, pathInfo);
+ FacesServletMapping mapping =
+ DefaultViewHandlerSupport.calculateFacesServletMapping(servletPath, pathInfo);
assertFalse(mapping.isExtensionMapping());
assertEquals(prefix, mapping.getPrefix());
- }
+ }
/**
* Test method for
Modified: myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java Thu Jul 3 14:18:36 2008
@@ -5,17 +5,17 @@
public class NavigationHandlerImplTest extends AbstractJsfTestCase
{
- public static void main(String[] args) {
- junit.textui.TestRunner.run(NavigationHandlerImplTest.class);
- }
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(NavigationHandlerImplTest.class);
+ }
- public NavigationHandlerImplTest(String name) {
- super(name);
- }
-
- public void testNavigationRules() throws Exception
- {
- NavigationHandlerImpl nh = new NavigationHandlerImpl();
- this.application.setNavigationHandler(nh);
- }
+ public NavigationHandlerImplTest(String name) {
+ super(name);
+ }
+
+ public void testNavigationRules() throws Exception
+ {
+ NavigationHandlerImpl nh = new NavigationHandlerImpl();
+ this.application.setNavigationHandler(nh);
+ }
}
\ No newline at end of file
Modified: myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/AbstractManagedBeanBuilderTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/AbstractManagedBeanBuilderTestCase.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/AbstractManagedBeanBuilderTestCase.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/AbstractManagedBeanBuilderTestCase.java Thu Jul 3 14:18:36 2008
@@ -21,103 +21,103 @@
public abstract class AbstractManagedBeanBuilderTestCase extends AbstractJsfTestCase {
- public AbstractManagedBeanBuilderTestCase(String name) {
- super(name);
- }
+ public AbstractManagedBeanBuilderTestCase(String name) {
+ super(name);
+ }
- protected MangedBeanExample example;
-
- // managed property values
- protected static final List MANAGED_LIST = new ArrayList();
- protected static final Map MANAGED_MAP = new HashMap();
- protected static final String INJECTED_VALUE = "tatiana";
-
- /**
- * Skips digester and manually builds and configures a managed bean.
- */
-
- protected void setUp() throws Exception
+ protected MangedBeanExample example;
+
+ // managed property values
+ protected static final List MANAGED_LIST = new ArrayList();
+ protected static final Map MANAGED_MAP = new HashMap();
+ protected static final String INJECTED_VALUE = "tatiana";
+
+ /**
+ * Skips digester and manually builds and configures a managed bean.
+ */
+
+ protected void setUp() throws Exception
{
- super.setUp();
- ManagedBeanBuilder managedBeanBuilder = new ManagedBeanBuilder();
- ManagedBean managedBean = new ManagedBean();
-
- managedBean.setBeanClass(MangedBeanExample.class.getName());
- managedBean.setName("managed");
- managedBean.setScope("request");
-
- // test methods of children will want to make sure these values come
- // out on the other end of this.
- MANAGED_LIST.add("0");
- MANAGED_LIST.add("1");
- MANAGED_LIST.add("2");
- MANAGED_MAP.put("0", "0");
- MANAGED_MAP.put("1", "1");
- MANAGED_MAP.put("2", "2");
-
- ManagedProperty managedProperty = new ManagedProperty();
- managedProperty.setPropertyName("managedProperty");
- managedProperty.setValue(INJECTED_VALUE);
-
- ManagedProperty managedList = new ManagedProperty();
- managedList.setPropertyName("managedList");
- ListEntries listEntries = makeListEntries();
- managedList.setListEntries(listEntries);
-
- ManagedProperty writeOnlyList = new ManagedProperty();
- writeOnlyList.setPropertyName("writeOnlyList");
- ListEntries writeOnlyListEntries = makeListEntries();
- writeOnlyList.setListEntries(writeOnlyListEntries);
-
- ManagedProperty managedMap = new ManagedProperty();
- managedMap.setPropertyName("managedMap");
- MapEntries mapEntries = makeMapEntries();
- managedMap.setMapEntries(mapEntries);
-
- ManagedProperty writeOnlyMap = new ManagedProperty();
- writeOnlyMap.setPropertyName("writeOnlyMap");
- MapEntries writeOnlyMapEntries = makeMapEntries();
- writeOnlyMap.setMapEntries(writeOnlyMapEntries);
-
- managedBean.addProperty(managedProperty);
- managedBean.addProperty(managedList);
- managedBean.addProperty(writeOnlyList);
- managedBean.addProperty(managedMap);
- managedBean.addProperty(writeOnlyMap);
+ super.setUp();
+ ManagedBeanBuilder managedBeanBuilder = new ManagedBeanBuilder();
+ ManagedBean managedBean = new ManagedBean();
+
+ managedBean.setBeanClass(MangedBeanExample.class.getName());
+ managedBean.setName("managed");
+ managedBean.setScope("request");
+
+ // test methods of children will want to make sure these values come
+ // out on the other end of this.
+ MANAGED_LIST.add("0");
+ MANAGED_LIST.add("1");
+ MANAGED_LIST.add("2");
+ MANAGED_MAP.put("0", "0");
+ MANAGED_MAP.put("1", "1");
+ MANAGED_MAP.put("2", "2");
+
+ ManagedProperty managedProperty = new ManagedProperty();
+ managedProperty.setPropertyName("managedProperty");
+ managedProperty.setValue(INJECTED_VALUE);
+
+ ManagedProperty managedList = new ManagedProperty();
+ managedList.setPropertyName("managedList");
+ ListEntries listEntries = makeListEntries();
+ managedList.setListEntries(listEntries);
+
+ ManagedProperty writeOnlyList = new ManagedProperty();
+ writeOnlyList.setPropertyName("writeOnlyList");
+ ListEntries writeOnlyListEntries = makeListEntries();
+ writeOnlyList.setListEntries(writeOnlyListEntries);
+
+ ManagedProperty managedMap = new ManagedProperty();
+ managedMap.setPropertyName("managedMap");
+ MapEntries mapEntries = makeMapEntries();
+ managedMap.setMapEntries(mapEntries);
+
+ ManagedProperty writeOnlyMap = new ManagedProperty();
+ writeOnlyMap.setPropertyName("writeOnlyMap");
+ MapEntries writeOnlyMapEntries = makeMapEntries();
+ writeOnlyMap.setMapEntries(writeOnlyMapEntries);
+
+ managedBean.addProperty(managedProperty);
+ managedBean.addProperty(managedList);
+ managedBean.addProperty(writeOnlyList);
+ managedBean.addProperty(managedMap);
+ managedBean.addProperty(writeOnlyMap);
- // simulate a managed bean creation
- example = (MangedBeanExample) managedBeanBuilder
- .buildManagedBean(facesContext, managedBean);
- }
-
- public void tearDown() throws Exception{
- super.tearDown();
- example = null;
- MANAGED_LIST.clear();
- MANAGED_MAP.clear();
- }
-
- private ListEntries makeListEntries(){
- ListEntries listEntries = new ListEntries();
-
- for(int i = 0; i < MANAGED_LIST.size(); i++){
- Entry entry = new Entry();
- entry.setValue((String) MANAGED_LIST.get(i));
- listEntries.addEntry(entry);
- }
- return listEntries;
- }
-
- private MapEntries makeMapEntries(){
- MapEntries mapEntries = new MapEntries();
-
- for(int i = 0 ; i < MANAGED_MAP.size(); i++){
- MapEntries.Entry mapEntry = new MapEntries.Entry();
- mapEntry.setKey((String) MANAGED_MAP.get(i + ""));
- mapEntry.setValue((String) MANAGED_MAP.get(i + ""));
- mapEntries.addEntry(mapEntry);
- }
- return mapEntries;
- }
-
+ // simulate a managed bean creation
+ example = (MangedBeanExample) managedBeanBuilder
+ .buildManagedBean(facesContext, managedBean);
+ }
+
+ public void tearDown() throws Exception{
+ super.tearDown();
+ example = null;
+ MANAGED_LIST.clear();
+ MANAGED_MAP.clear();
+ }
+
+ private ListEntries makeListEntries(){
+ ListEntries listEntries = new ListEntries();
+
+ for(int i = 0; i < MANAGED_LIST.size(); i++){
+ Entry entry = new Entry();
+ entry.setValue((String) MANAGED_LIST.get(i));
+ listEntries.addEntry(entry);
+ }
+ return listEntries;
+ }
+
+ private MapEntries makeMapEntries(){
+ MapEntries mapEntries = new MapEntries();
+
+ for(int i = 0 ; i < MANAGED_MAP.size(); i++){
+ MapEntries.Entry mapEntry = new MapEntries.Entry();
+ mapEntry.setKey((String) MANAGED_MAP.get(i + ""));
+ mapEntry.setValue((String) MANAGED_MAP.get(i + ""));
+ mapEntries.addEntry(mapEntry);
+ }
+ return mapEntries;
+ }
+
}
Modified: myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/MangedBeanExample.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/MangedBeanExample.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/MangedBeanExample.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/MangedBeanExample.java Thu Jul 3 14:18:36 2008
@@ -9,50 +9,50 @@
public class MangedBeanExample {
- private String managedProperty ;
- private List managedList;
- private List writeOnlyList;
- private Map managedMap;
- private Map writeOnlyMap;
-
- public List getManagedList() {
- return managedList;
- }
-
- public void setManagedList(List managedList) {
- this.managedList = managedList;
- }
-
- public String getManagedProperty() {
- return managedProperty;
- }
-
- public void setManagedProperty(String managedProperty) {
- this.managedProperty = managedProperty;
- }
-
- public Map getManagedMap() {
- return managedMap;
- }
-
- public void setManagedMap(Map managedMap) {
- this.managedMap = managedMap;
- }
-
- public void setWriteOnlyList(List writeOnlyList) {
- this.writeOnlyList = writeOnlyList;
- }
-
- public void setWriteOnlyMap(Map writeOnlyMap) {
- this.writeOnlyMap = writeOnlyMap;
- }
-
- public Map getHiddenWriteOnlyMap() {
- return writeOnlyMap;
- }
-
- public List getHiddenWriteOnlyList() {
- return writeOnlyList;
- }
+ private String managedProperty ;
+ private List managedList;
+ private List writeOnlyList;
+ private Map managedMap;
+ private Map writeOnlyMap;
+
+ public List getManagedList() {
+ return managedList;
+ }
+
+ public void setManagedList(List managedList) {
+ this.managedList = managedList;
+ }
+
+ public String getManagedProperty() {
+ return managedProperty;
+ }
+
+ public void setManagedProperty(String managedProperty) {
+ this.managedProperty = managedProperty;
+ }
+
+ public Map getManagedMap() {
+ return managedMap;
+ }
+
+ public void setManagedMap(Map managedMap) {
+ this.managedMap = managedMap;
+ }
+
+ public void setWriteOnlyList(List writeOnlyList) {
+ this.writeOnlyList = writeOnlyList;
+ }
+
+ public void setWriteOnlyMap(Map writeOnlyMap) {
+ this.writeOnlyMap = writeOnlyMap;
+ }
+
+ public Map getHiddenWriteOnlyMap() {
+ return writeOnlyMap;
+ }
+
+ public List getHiddenWriteOnlyList() {
+ return writeOnlyList;
+ }
}
Modified: myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/Myfaces889TestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/Myfaces889TestCase.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/Myfaces889TestCase.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/Myfaces889TestCase.java Thu Jul 3 14:18:36 2008
@@ -14,89 +14,89 @@
public class Myfaces889TestCase extends AbstractManagedBeanBuilderTestCase {
- public Myfaces889TestCase(String name) {
- super(name);
- }
+ public Myfaces889TestCase(String name) {
+ super(name);
+ }
- private static Log log = LogFactory.getLog(Myfaces889TestCase.class);
-
- public void testWriteOnlyMap(){
- assertTrue(example != null);
- log.debug("managed bean successfully created");
-
- Map writeOnlyMap = example.getHiddenWriteOnlyMap();
-
- assertTrue(writeOnlyMap != null);
- log.debug("managed map is not null");
-
- scrutinizeMap(writeOnlyMap);
- }
-
- public void testManagedMap(){
- assertTrue(example != null);
- log.debug("managed bean successfully created");
-
- Map managedMap = example.getManagedMap();
-
- assertTrue(managedMap != null);
- log.debug("managed map is not null");
-
- scrutinizeMap(managedMap);
- }
-
- private void scrutinizeMap(Map map){
- assertTrue(map.size() == 3);
- log.debug("managed map has the correct size " + map.size());
-
- for(int i = 0; i < map.size(); i++){
- String entry = (String) map.get(i + "");
- String config = (String) MANAGED_MAP.get(i + "");
- log.debug("looking @ " + config + " and " + entry);
- assertTrue(config.equals(entry));
- }
-
- }
-
- public void testManagedList(){
- assertTrue(example != null);
- log.debug("managed bean successfully created");
-
- List managedList = example.getManagedList();
-
- scrutinizeList(managedList);
- }
-
- public void testWriteOnlyList(){
- assertTrue(example != null);
- log.debug("managed bean successfully created");
-
- List writeOnlyList = example.getHiddenWriteOnlyList();
-
- scrutinizeList(writeOnlyList);
- }
-
- private void scrutinizeList(List list){
- assertTrue(list != null);
- log.debug("managed list is not null " + list.size());
- assertTrue(list.size() == 3);
- log.debug("managed list has the correct size " + list.size());
-
- for(int i = 0 ; i < list.size(); i++){
- String entry = (String) list.get(i);
- String config = (String) MANAGED_LIST.get(i);
- log.debug("looking @ " + config + " and " + entry);
- assertTrue(config.equals(entry));
- }
- }
-
- public void testManagedProperty(){
- assertTrue(example != null);
- log.debug("managed bean successfully created");
-
- String managedPropertyValue = example.getManagedProperty();
-
- assertTrue(INJECTED_VALUE.equals(managedPropertyValue));
- log.debug("managed property String has the correct value ");
- }
-
+ private static Log log = LogFactory.getLog(Myfaces889TestCase.class);
+
+ public void testWriteOnlyMap(){
+ assertTrue(example != null);
+ log.debug("managed bean successfully created");
+
+ Map writeOnlyMap = example.getHiddenWriteOnlyMap();
+
+ assertTrue(writeOnlyMap != null);
+ log.debug("managed map is not null");
+
+ scrutinizeMap(writeOnlyMap);
+ }
+
+ public void testManagedMap(){
+ assertTrue(example != null);
+ log.debug("managed bean successfully created");
+
+ Map managedMap = example.getManagedMap();
+
+ assertTrue(managedMap != null);
+ log.debug("managed map is not null");
+
+ scrutinizeMap(managedMap);
+ }
+
+ private void scrutinizeMap(Map map){
+ assertTrue(map.size() == 3);
+ log.debug("managed map has the correct size " + map.size());
+
+ for(int i = 0; i < map.size(); i++){
+ String entry = (String) map.get(i + "");
+ String config = (String) MANAGED_MAP.get(i + "");
+ log.debug("looking @ " + config + " and " + entry);
+ assertTrue(config.equals(entry));
+ }
+
+ }
+
+ public void testManagedList(){
+ assertTrue(example != null);
+ log.debug("managed bean successfully created");
+
+ List managedList = example.getManagedList();
+
+ scrutinizeList(managedList);
+ }
+
+ public void testWriteOnlyList(){
+ assertTrue(example != null);
+ log.debug("managed bean successfully created");
+
+ List writeOnlyList = example.getHiddenWriteOnlyList();
+
+ scrutinizeList(writeOnlyList);
+ }
+
+ private void scrutinizeList(List list){
+ assertTrue(list != null);
+ log.debug("managed list is not null " + list.size());
+ assertTrue(list.size() == 3);
+ log.debug("managed list has the correct size " + list.size());
+
+ for(int i = 0 ; i < list.size(); i++){
+ String entry = (String) list.get(i);
+ String config = (String) MANAGED_LIST.get(i);
+ log.debug("looking @ " + config + " and " + entry);
+ assertTrue(config.equals(entry));
+ }
+ }
+
+ public void testManagedProperty(){
+ assertTrue(example != null);
+ log.debug("managed bean successfully created");
+
+ String managedPropertyValue = example.getManagedProperty();
+
+ assertTrue(INJECTED_VALUE.equals(managedPropertyValue));
+ log.debug("managed property String has the correct value ");
+ }
+
}
Modified: myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedManagedBean.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedManagedBean.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedManagedBean.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedManagedBean.java Thu Jul 3 14:18:36 2008
@@ -9,11 +9,11 @@
class AnnotatedManagedBean {
- private boolean postConstructCalled = false; // using a stub for a mock
+ private boolean postConstructCalled = false; // using a stub for a mock
- private boolean preDestroyCalled = false; // using a stob for a mock here
+ private boolean preDestroyCalled = false; // using a stob for a mock here
- boolean throwExcetion;
+ boolean throwExcetion;
public AnnotatedManagedBean()
@@ -21,33 +21,33 @@
}
public AnnotatedManagedBean(boolean throwExcetion) {
- this.throwExcetion = throwExcetion;
- }
+ this.throwExcetion = throwExcetion;
+ }
- @PostConstruct
- public void postConstruct() {
- postConstructCalled = true;
+ @PostConstruct
+ public void postConstruct() {
+ postConstructCalled = true;
- if (throwExcetion) {
- throw new RuntimeException();
+ if (throwExcetion) {
+ throw new RuntimeException();
}
}
- @PreDestroy
- public void preDestroy() {
- preDestroyCalled = true;
+ @PreDestroy
+ public void preDestroy() {
+ preDestroyCalled = true;
- if (throwExcetion) {
- throw new RuntimeException();
+ if (throwExcetion) {
+ throw new RuntimeException();
}
- }
+ }
- boolean isPostConstructCalled() {
- return postConstructCalled;
- }
-
- boolean isPreDestroyCalled() {
- return preDestroyCalled;
- }
+ boolean isPostConstructCalled() {
+ return postConstructCalled;
+ }
+
+ boolean isPreDestroyCalled() {
+ return preDestroyCalled;
+ }
}
Modified: myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotationProcessorTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotationProcessorTestCase.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotationProcessorTestCase.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotationProcessorTestCase.java Thu Jul 3 14:18:36 2008
@@ -25,8 +25,8 @@
public class AnnotationProcessorTestCase extends AbstractJsfTestCase
{
- protected LifecycleProvider lifecycleProvider;
- protected AnnotatedManagedBean managedBean;
+ protected LifecycleProvider lifecycleProvider;
+ protected AnnotatedManagedBean managedBean;
public AnnotationProcessorTestCase(String string)
@@ -38,22 +38,22 @@
super.setUp();
lifecycleProvider = new AllAnnotationLifecycleProvider(null);
managedBean = new AnnotatedManagedBean();
- }
+ }
- public void testPostConstruct() throws IllegalAccessException, InvocationTargetException, NamingException, InstantiationException, ClassNotFoundException
+ public void testPostConstruct() throws IllegalAccessException, InvocationTargetException, NamingException, InstantiationException, ClassNotFoundException
{
- AnnotatedManagedBean managedBean = (AnnotatedManagedBean) lifecycleProvider.newInstance(AnnotatedManagedBean.class.getName());
- assertTrue(managedBean.isPostConstructCalled());
- assertFalse(managedBean.isPreDestroyCalled());
- }
+ AnnotatedManagedBean managedBean = (AnnotatedManagedBean) lifecycleProvider.newInstance(AnnotatedManagedBean.class.getName());
+ assertTrue(managedBean.isPostConstructCalled());
+ assertFalse(managedBean.isPreDestroyCalled());
+ }
- public void testPreDestroy() throws IllegalAccessException, InvocationTargetException, NamingException, InstantiationException, ClassNotFoundException
+ public void testPreDestroy() throws IllegalAccessException, InvocationTargetException, NamingException, InstantiationException, ClassNotFoundException
{
AnnotatedManagedBean managedBean = (AnnotatedManagedBean) lifecycleProvider.newInstance(AnnotatedManagedBean.class.getName());
lifecycleProvider.destroyInstance(managedBean);
assertTrue(managedBean.isPostConstructCalled());
- assertTrue(managedBean.isPreDestroyCalled());
- }
+ assertTrue(managedBean.isPreDestroyCalled());
+ }
public void testPostConstructException() throws IllegalAccessException, InvocationTargetException
{
@@ -65,5 +65,5 @@
}
assertTrue(false);
- }
+ }
}
Modified: myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/annotation/OwnAnnotationProcessorTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/annotation/OwnAnnotationProcessorTestCase.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/annotation/OwnAnnotationProcessorTestCase.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/annotation/OwnAnnotationProcessorTestCase.java Thu Jul 3 14:18:36 2008
@@ -22,8 +22,8 @@
public class OwnAnnotationProcessorTestCase extends AbstractJsfTestCase
{
- protected LifecycleProvider lifecycleProvider;
- protected AnnotatedManagedBean managedBean;
+ protected LifecycleProvider lifecycleProvider;
+ protected AnnotatedManagedBean managedBean;
private static final String TEST_LIFECYCLE_PROVIDER = "org.apache.myfaces.config.annotation.TestLifecycleProvider";
@@ -43,6 +43,6 @@
public void testOwnProcessor()
{
- assertEquals(TEST_LIFECYCLE_PROVIDER, lifecycleProvider.getClass().getName());
- }
+ assertEquals(TEST_LIFECYCLE_PROVIDER, lifecycleProvider.getClass().getName());
+ }
}
Modified: myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/el/DummyBean.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/el/DummyBean.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/el/DummyBean.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/el/DummyBean.java Thu Jul 3 14:18:36 2008
@@ -18,27 +18,27 @@
import java.util.Map;
public class DummyBean {
- private Map map;
-
- private int integerPrimitive = 0;
+ private Map map;
+
+ private int integerPrimitive = 0;
- public DummyBean(Map map) {
- this.map = map;
- }
+ public DummyBean(Map map) {
+ this.map = map;
+ }
- public Map getMap() {
- return map;
- }
+ public Map getMap() {
+ return map;
+ }
- public void setMap(Map map) {
- this.map = map;
- }
-
- public int getIntegerPrimitive(){
- return integerPrimitive;
- }
- public void setIntegerPrimitive(int integerPrimitive){
- this.integerPrimitive = integerPrimitive;
- }
+ public void setMap(Map map) {
+ this.map = map;
+ }
+
+ public int getIntegerPrimitive(){
+ return integerPrimitive;
+ }
+ public void setIntegerPrimitive(int integerPrimitive){
+ this.integerPrimitive = integerPrimitive;
+ }
}