You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2011/04/06 00:20:33 UTC
svn commit: r1089271 - in /myfaces/extensions/cdi/trunk:
jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/
jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/
j...
Author: gpetracek
Date: Tue Apr 5 22:20:32 2011
New Revision: 1089271
URL: http://svn.apache.org/viewvc?rev=1089271&view=rev
Log:
EXTCDI-165
Modified:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/ViewConfigResolver.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigDescriptor.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigResolver.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PhasesLifecycleCallbackPhaseListener.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PreRenderViewBeanLoader.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigExtension.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewControllerActionListener.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/DefaultViewControllerStrategy.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/ViewConfigAwareNavigationHandler.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/security/SecurityAwareViewHandler.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/security/SecurityViewListener.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/JsfUtils.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/SecurityUtils.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/ViewConfigTest.java
myfaces/extensions/cdi/trunk/test-modules/cargo-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/SimplePageInteraction.java
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/ViewConfigResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/ViewConfigResolver.java?rev=1089271&r1=1089270&r2=1089271&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/ViewConfigResolver.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/ViewConfigResolver.java Tue Apr 5 22:20:32 2011
@@ -33,31 +33,31 @@ public interface ViewConfigResolver exte
* @param viewId view-id of the page
* @return view-config-descriptor which represents the given view-id, null otherwise
*/
- ViewConfigDescriptor getViewConfig(String viewId);
+ ViewConfigDescriptor getViewConfigDescriptor(String viewId);
/**
* Resolves the {@link ViewConfigDescriptor} for the given view-config-class
* @param viewDefinitionClass view-config-class of the page
* @return view-config-descriptor which represents the given view-config-class
*/
- ViewConfigDescriptor getViewConfig(Class<? extends ViewConfig> viewDefinitionClass);
+ ViewConfigDescriptor getViewConfigDescriptor(Class<? extends ViewConfig> viewDefinitionClass);
/**
* Resolves all descriptors for the known {@link ViewConfig}s
* @return all descriptors for the known view-configs
*/
- List<ViewConfigDescriptor> getViewConfigs();
+ List<ViewConfigDescriptor> getViewConfigDescriptors();
/**
* Resolves the descriptor for the default-error page
* @return descriptor for the default-error page
*/
- ViewConfigDescriptor getDefaultErrorViewConfig();
+ ViewConfigDescriptor getDefaultErrorViewConfigDescriptor();
/**
* Resolves the descriptor for the inline- (or default-) error-page
* @param viewDefinitionClass view-config class which should be inspected concerning an inline-error-page
* @return descriptor for the error page
*/
- ViewConfigDescriptor getErrorViewConfig(Class<? extends ViewConfig> viewDefinitionClass);
+ ViewConfigDescriptor getErrorViewConfigDescriptor(Class<? extends ViewConfig> viewDefinitionClass);
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigDescriptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigDescriptor.java?rev=1089271&r1=1089270&r2=1089271&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigDescriptor.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigDescriptor.java Tue Apr 5 22:20:32 2011
@@ -204,23 +204,24 @@ public class DefaultViewConfigDescriptor
}
}
- private void processCallbacks(PageBeanDescriptor beanEntry, List<Method> methodList)
+ private void processCallbacks(PageBeanDescriptor pageBeanDescriptor, List<Method> methodList)
{
- Object bean;
- if (!methodList.isEmpty())
+ if(methodList.isEmpty())
{
- //TODO provide a detailed error message in case of a missing bean
- bean = getContextualReferenceByName(getBeanManager(), beanEntry.getBeanName(), Object.class);
+ return;
+ }
- if (bean == null)
- {
- return;
- }
+ Object bean = getContextualReferenceByName(getBeanManager(), pageBeanDescriptor.getBeanName(), Object.class);
- for (Method callbackMethod : methodList)
- {
- invokeMethod(bean, callbackMethod);
- }
+ if (bean == null)
+ {
+ //TODO provide a detailed error message in case of a missing bean
+ return;
+ }
+
+ for (Method callbackMethod : methodList)
+ {
+ invokeMethod(bean, callbackMethod);
}
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigResolver.java?rev=1089271&r1=1089270&r2=1089271&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigResolver.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigResolver.java Tue Apr 5 22:20:32 2011
@@ -38,25 +38,25 @@ public class DefaultViewConfigResolver i
/**
* {@inheritDoc}
*/
- public ViewConfigDescriptor getViewConfig(String viewId)
+ public ViewConfigDescriptor getViewConfigDescriptor(String viewId)
{
- return ViewConfigCache.getViewConfig(viewId);
+ return ViewConfigCache.getViewConfigDescriptor(viewId);
}
/**
* {@inheritDoc}
*/
- public ViewConfigDescriptor getDefaultErrorViewConfig()
+ public ViewConfigDescriptor getDefaultErrorViewConfigDescriptor()
{
- return ViewConfigCache.getDefaultErrorView();
+ return ViewConfigCache.getDefaultErrorViewConfigDescriptor();
}
/**
* {@inheritDoc}
*/
- public ViewConfigDescriptor getErrorViewConfig(Class<? extends ViewConfig> viewDefinitionClass)
+ public ViewConfigDescriptor getErrorViewConfigDescriptor(Class<? extends ViewConfig> viewDefinitionClass)
{
- ViewConfigDescriptor viewConfigDescriptor = getViewConfig(viewDefinitionClass);
+ ViewConfigDescriptor viewConfigDescriptor = getViewConfigDescriptor(viewDefinitionClass);
Class<? extends ViewConfig> errorView = null;
if(viewConfigDescriptor instanceof EditableViewConfigDescriptor)
@@ -66,15 +66,15 @@ public class DefaultViewConfigResolver i
if(errorView == null)
{
- return getDefaultErrorViewConfig();
+ return getDefaultErrorViewConfigDescriptor();
}
- return getViewConfig(errorView);
+ return getViewConfigDescriptor(errorView);
}
/**
* {@inheritDoc}
*/
- public List<ViewConfigDescriptor> getViewConfigs()
+ public List<ViewConfigDescriptor> getViewConfigDescriptors()
{
return Collections
.unmodifiableList((List<? extends ViewConfigDescriptor>) ViewConfigCache.getViewConfigDescriptors());
@@ -83,8 +83,8 @@ public class DefaultViewConfigResolver i
/**
* {@inheritDoc}
*/
- public ViewConfigDescriptor getViewConfig(Class<? extends ViewConfig> viewDefinitionClass)
+ public ViewConfigDescriptor getViewConfigDescriptor(Class<? extends ViewConfig> viewDefinitionClass)
{
- return ViewConfigCache.getViewConfig(viewDefinitionClass);
+ return ViewConfigCache.getViewConfigDescriptor(viewDefinitionClass);
}
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PhasesLifecycleCallbackPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PhasesLifecycleCallbackPhaseListener.java?rev=1089271&r1=1089270&r2=1089271&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PhasesLifecycleCallbackPhaseListener.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PhasesLifecycleCallbackPhaseListener.java Tue Apr 5 22:20:32 2011
@@ -105,7 +105,7 @@ public final class PhasesLifecycleCallba
//override the view-id if we have a new view
this.windowContext.setAttribute(INITIALIZED_VIEW_ID_MARKER_KEY, viewId);
- ViewConfigDescriptor viewDefinitionEntry = ViewConfigCache.getViewConfig(viewId);
+ ViewConfigDescriptor viewDefinitionEntry = ViewConfigCache.getViewConfigDescriptor(viewId);
if (viewDefinitionEntry instanceof EditableViewConfigDescriptor)
{
@@ -131,7 +131,7 @@ public final class PhasesLifecycleCallba
private void processPreRenderView(String viewId)
{
- ViewConfigDescriptor viewDefinitionEntry = ViewConfigCache.getViewConfig(viewId);
+ ViewConfigDescriptor viewDefinitionEntry = ViewConfigCache.getViewConfigDescriptor(viewId);
if (viewDefinitionEntry instanceof EditableViewConfigDescriptor)
{
@@ -141,7 +141,7 @@ public final class PhasesLifecycleCallba
private void processPostRenderView(String viewId)
{
- ViewConfigDescriptor viewDefinitionEntry = ViewConfigCache.getViewConfig(viewId);
+ ViewConfigDescriptor viewDefinitionEntry = ViewConfigCache.getViewConfigDescriptor(viewId);
if (viewDefinitionEntry instanceof EditableViewConfigDescriptor)
{
@@ -168,7 +168,7 @@ public final class PhasesLifecycleCallba
String viewId = viewRoot.getViewId();
- ViewConfigDescriptor viewDefinitionEntry = ViewConfigCache.getViewConfig(viewId);
+ ViewConfigDescriptor viewDefinitionEntry = ViewConfigCache.getViewConfigDescriptor(viewId);
if(viewDefinitionEntry == null)
{
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PreRenderViewBeanLoader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PreRenderViewBeanLoader.java?rev=1089271&r1=1089270&r2=1089271&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PreRenderViewBeanLoader.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PreRenderViewBeanLoader.java Tue Apr 5 22:20:32 2011
@@ -41,7 +41,7 @@ public class PreRenderViewBeanLoader
{
String viewId = event.getFacesContext().getViewRoot().getViewId();
- ViewConfigDescriptor viewDefinitionEntry = ViewConfigCache.getViewConfig(viewId);
+ ViewConfigDescriptor viewDefinitionEntry = ViewConfigCache.getViewConfigDescriptor(viewId);
if(viewDefinitionEntry == null)
{
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.java?rev=1089271&r1=1089270&r2=1089271&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.java Tue Apr 5 22:20:32 2011
@@ -104,7 +104,7 @@ public class ViewConfigCache
* @param viewId view-id of the page
* @return view-config-descriptor which represents the given view-id, null otherwise
*/
- public static ViewConfigDescriptor getViewConfig(String viewId)
+ public static ViewConfigDescriptor getViewConfigDescriptor(String viewId)
{
return getViewIdToViewDefinitionEntryMapping(true).get(viewId);
}
@@ -125,7 +125,7 @@ public class ViewConfigCache
* @param viewDefinitionClass view-config-class of the page
* @return view-config-descriptor which represents the given view-config-class
*/
- public static ViewConfigDescriptor getViewConfig(Class<? extends ViewConfig> viewDefinitionClass)
+ public static ViewConfigDescriptor getViewConfigDescriptor(Class<? extends ViewConfig> viewDefinitionClass)
{
return getViewDefinitionToViewDefinitionEntryMapping(true).get(viewDefinitionClass);
}
@@ -134,7 +134,7 @@ public class ViewConfigCache
* Resolves the descriptor for the default-error page
* @return descriptor for the default-error page
*/
- public static ViewConfigDescriptor getDefaultErrorView()
+ public static ViewConfigDescriptor getDefaultErrorViewConfigDescriptor()
{
lazyInlineViewConfigCompilation();
return defaultErrorView.get(getClassloader());
@@ -262,7 +262,7 @@ public class ViewConfigCache
{
if(DefaultErrorView.class.isAssignableFrom(viewDefinitionEntry.getViewConfig()))
{
- ViewConfigDescriptor currentErrorView = getDefaultErrorView();
+ ViewConfigDescriptor currentErrorView = getDefaultErrorViewConfigDescriptor();
if(currentErrorView != null)
{
throw ambiguousDefaultErrorViewDefinitionException(viewDefinitionEntry.getViewConfig(),
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigExtension.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigExtension.java?rev=1089271&r1=1089270&r2=1089271&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigExtension.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigExtension.java Tue Apr 5 22:20:32 2011
@@ -135,7 +135,7 @@ public class ViewConfigExtension impleme
if(newEntry != null)
{
- ViewConfigDescriptor existingDescriptor = ViewConfigCache.getViewConfig(newEntry.getViewConfig());
+ ViewConfigDescriptor existingDescriptor = ViewConfigCache.getViewConfigDescriptor(newEntry.getViewConfig());
//TODO introduce an SPI with a better name
if(/*viewConfigDescriptor != null*/existingDescriptor instanceof DefaultViewConfigDescriptor
@@ -212,7 +212,7 @@ public class ViewConfigExtension impleme
for(Class<? extends ViewConfig> viewConfigClass : view.value())
{
- ViewConfigDescriptor viewConfigDescriptor = ViewConfigCache.getViewConfig(viewConfigClass);
+ ViewConfigDescriptor viewConfigDescriptor = ViewConfigCache.getViewConfigDescriptor(viewConfigClass);
if(viewConfigDescriptor == null)
{
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewControllerActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewControllerActionListener.java?rev=1089271&r1=1089270&r2=1089271&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewControllerActionListener.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewControllerActionListener.java Tue Apr 5 22:20:32 2011
@@ -57,7 +57,7 @@ public class ViewControllerActionListene
}
ViewConfigDescriptor viewConfigDescriptor =
- ViewConfigCache.getViewConfig(FacesContext.getCurrentInstance().getViewRoot().getViewId());
+ ViewConfigCache.getViewConfigDescriptor(FacesContext.getCurrentInstance().getViewRoot().getViewId());
if(viewConfigDescriptor instanceof EditableViewConfigDescriptor)
{
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/DefaultViewControllerStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/DefaultViewControllerStrategy.java?rev=1089271&r1=1089270&r2=1089271&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/DefaultViewControllerStrategy.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/DefaultViewControllerStrategy.java Tue Apr 5 22:20:32 2011
@@ -129,6 +129,6 @@ public class DefaultViewControllerStrate
private String resolveViewId(Class<? extends ViewConfig> viewDefinitionClass)
{
- return ViewConfigCache.getViewConfig(viewDefinitionClass).getViewId();
+ return ViewConfigCache.getViewConfigDescriptor(viewDefinitionClass).getViewId();
}
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/ViewConfigAwareNavigationHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/ViewConfigAwareNavigationHandler.java?rev=1089271&r1=1089270&r2=1089271&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/ViewConfigAwareNavigationHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/ViewConfigAwareNavigationHandler.java Tue Apr 5 22:20:32 2011
@@ -92,7 +92,7 @@ public class ViewConfigAwareNavigationHa
{
if(DefaultErrorView.class.getName().equals(originalOutcome))
{
- entry = ViewConfigCache.getDefaultErrorView();
+ entry = ViewConfigCache.getDefaultErrorViewConfigDescriptor();
}
}
@@ -107,7 +107,7 @@ public class ViewConfigAwareNavigationHa
else if(ViewConfig.class.isAssignableFrom((Class)loadedClass))
{
//noinspection unchecked
- entry = ViewConfigCache.getViewConfig((Class<? extends ViewConfig>) loadedClass);
+ entry = ViewConfigCache.getViewConfigDescriptor((Class<? extends ViewConfig>) loadedClass);
}
}
@@ -193,13 +193,13 @@ public class ViewConfigAwareNavigationHa
return viewConfigDescriptor;
}
- return ViewConfigCache.getViewConfig(navigateEvent.getToView());
+ return ViewConfigCache.getViewConfigDescriptor(navigateEvent.getToView());
}
private PreViewConfigNavigateEvent firePreViewConfigNavigateEvent(
String oldViewId, ViewConfigDescriptor newViewConfigDescriptor)
{
- ViewConfigDescriptor oldViewConfigDescriptor = ViewConfigCache.getViewConfig(oldViewId);
+ ViewConfigDescriptor oldViewConfigDescriptor = ViewConfigCache.getViewConfigDescriptor(oldViewId);
if(oldViewConfigDescriptor != null)
{
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/security/SecurityAwareViewHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/security/SecurityAwareViewHandler.java?rev=1089271&r1=1089270&r2=1089271&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/security/SecurityAwareViewHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/security/SecurityAwareViewHandler.java Tue Apr 5 22:20:32 2011
@@ -88,7 +88,7 @@ public class SecurityAwareViewHandler ex
try
{
- ViewConfigDescriptor entry = ViewConfigCache.getViewConfig(result.getViewId());
+ ViewConfigDescriptor entry = ViewConfigCache.getViewConfigDescriptor(result.getViewId());
if(entry != null)
{
@@ -109,7 +109,7 @@ public class SecurityAwareViewHandler ex
Class<? extends ViewConfig> errorView =
SecurityUtils.handleSecurityViolationWithoutNavigation(accessDeniedException);
- return this.wrapped.createView(context, ViewConfigCache.getViewConfig(errorView).getViewId());
+ return this.wrapped.createView(context, ViewConfigCache.getViewConfigDescriptor(errorView).getViewId());
}
finally
{
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/security/SecurityViewListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/security/SecurityViewListener.java?rev=1089271&r1=1089270&r2=1089271&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/security/SecurityViewListener.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/security/SecurityViewListener.java Tue Apr 5 22:20:32 2011
@@ -93,7 +93,7 @@ public class SecurityViewListener
private void checkPermission(BeanManager beanManager, FacesContext facesContext)
{
- ViewConfigDescriptor entry = ViewConfigCache.getViewConfig(facesContext.getViewRoot().getViewId());
+ ViewConfigDescriptor entry = ViewConfigCache.getViewConfigDescriptor(facesContext.getViewRoot().getViewId());
if(entry == null)
{
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/JsfUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/JsfUtils.java?rev=1089271&r1=1089270&r2=1089271&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/JsfUtils.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/JsfUtils.java Tue Apr 5 22:20:32 2011
@@ -241,7 +241,7 @@ public abstract class JsfUtils
return;
}
- ViewConfigDescriptor entry = ViewConfigCache.getViewConfig(oldViewId);
+ ViewConfigDescriptor entry = ViewConfigCache.getViewConfigDescriptor(oldViewId);
if(entry == null)
{
@@ -276,7 +276,7 @@ public abstract class JsfUtils
ViewConfigDescriptor entry)
{
Class<? extends ViewConfig> currentView =
- ViewConfigCache.getViewConfig(uiViewRoot.getViewId()).getViewConfig();
+ ViewConfigCache.getViewConfigDescriptor(uiViewRoot.getViewId()).getViewConfig();
if(currentView == null)
{
@@ -318,7 +318,8 @@ public abstract class JsfUtils
if(!editableWindowContext.isConversationActive(ConversationUtils.getConversationGroup(foundBean),
foundBean.getQualifiers().toArray(new Annotation[foundBean.getQualifiers().size()])))
{
- return ViewConfigCache.getViewConfig(conversationRequired.defaultEntryPoint()).getViewId();
+ return ViewConfigCache
+ .getViewConfigDescriptor(conversationRequired.defaultEntryPoint()).getViewId();
}
}
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/SecurityUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/SecurityUtils.java?rev=1089271&r1=1089270&r2=1089271&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/SecurityUtils.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/SecurityUtils.java Tue Apr 5 22:20:32 2011
@@ -92,11 +92,11 @@ public abstract class SecurityUtils
if(errorView == null)
{
- ViewConfigDescriptor errorPageEntry = ViewConfigCache.getDefaultErrorView();
+ ViewConfigDescriptor errorPageDescriptor = ViewConfigCache.getDefaultErrorViewConfigDescriptor();
- if(errorPageEntry != null)
+ if(errorPageDescriptor != null)
{
- errorView = errorPageEntry.getViewConfig();
+ errorView = errorPageDescriptor.getViewConfig();
}
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/ViewConfigTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/ViewConfigTest.java?rev=1089271&r1=1089270&r2=1089271&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/ViewConfigTest.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/ViewConfigTest.java Tue Apr 5 22:20:32 2011
@@ -56,9 +56,9 @@ public class ViewConfigTest
{
viewConfigExtension.addPageDefinition(SimpleView.class);
- assertEquals(ViewConfigCache.getViewConfig(SimpleView.class).getViewId(), "/simpleView.xhtml");
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(SimpleView.class).getViewId(), "/simpleView.xhtml");
- assertEquals(ViewConfigCache.getViewConfig(SimpleView.class).getViewConfig(),
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(SimpleView.class).getViewConfig(),
SimpleView.class);
}
@@ -67,7 +67,7 @@ public class ViewConfigTest
{
viewConfigExtension.addPageDefinition(SimpleViewWithManualName.class);
- assertEquals(ViewConfigCache.getViewConfig(SimpleViewWithManualName.class).getViewId(),
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(SimpleViewWithManualName.class).getViewId(),
"/simpleManualPage.xhtml");
}
@@ -77,9 +77,9 @@ public class ViewConfigTest
viewConfigExtension.addPageDefinition(SimpleNestedViewConfig.Page1.class);
viewConfigExtension.addPageDefinition(SimpleNestedViewConfig.Page2.class);
- assertEquals(ViewConfigCache.getViewConfig(SimpleNestedViewConfig.Page1.class).getViewId(),
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(SimpleNestedViewConfig.Page1.class).getViewId(),
"/simpleNestedViewConfig/page1.xhtml");
- assertEquals(ViewConfigCache.getViewConfig(SimpleNestedViewConfig.Page2.class).getViewId(),
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(SimpleNestedViewConfig.Page2.class).getViewId(),
"/simpleNestedViewConfig/page2.xhtml");
}
@@ -89,10 +89,10 @@ public class ViewConfigTest
viewConfigExtension.addPageDefinition(NestedViewConfigWithManualNamesAndSharedBasePath1.Page1.class);
viewConfigExtension.addPageDefinition(NestedViewConfigWithManualNamesAndSharedBasePath1.Page2.class);
- assertEquals(ViewConfigCache.getViewConfig(
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(
NestedViewConfigWithManualNamesAndSharedBasePath1.Page1.class).getViewId(),
"/manual/page1.xhtml");
- assertEquals(ViewConfigCache.getViewConfig(
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(
NestedViewConfigWithManualNamesAndSharedBasePath1.Page2.class).getViewId(),
"/manual/page2.xhtml");
}
@@ -103,10 +103,10 @@ public class ViewConfigTest
viewConfigExtension.addPageDefinition(NestedViewConfigWithManualNamesAndSharedBasePath2.Page1.class);
viewConfigExtension.addPageDefinition(NestedViewConfigWithManualNamesAndSharedBasePath2.Page2.class);
- assertEquals(ViewConfigCache.getViewConfig(
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(
NestedViewConfigWithManualNamesAndSharedBasePath2.Page1.class).getViewId(),
"/manual/page3.xhtml");
- assertEquals(ViewConfigCache.getViewConfig(
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(
NestedViewConfigWithManualNamesAndSharedBasePath2.Page2.class).getViewId(),
"/manual/page4.xhtml");
}
@@ -117,9 +117,9 @@ public class ViewConfigTest
viewConfigExtension.addPageDefinition(VirtualNesting.Page1.class);
viewConfigExtension.addPageDefinition(VirtualNesting.Page2.class);
- assertEquals(ViewConfigCache.getViewConfig(VirtualNesting.Page1.class).getViewId(),
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(VirtualNesting.Page1.class).getViewId(),
"/page1.xhtml");
- assertEquals(ViewConfigCache.getViewConfig(VirtualNesting.Page2.class).getViewId(),
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(VirtualNesting.Page2.class).getViewId(),
"/page2.xhtml");
}
@@ -129,10 +129,10 @@ public class ViewConfigTest
viewConfigExtension.addPageDefinition(MultipleSimpleNestedConfigs.Conversations.Grouped.Step1.class);
viewConfigExtension.addPageDefinition(MultipleSimpleNestedConfigs.Conversations.Grouped.Step2.class);
- assertEquals(ViewConfigCache.getViewConfig(
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(
MultipleSimpleNestedConfigs.Conversations.Grouped.Step1.class).getViewId(),
"/multipleSimpleNestedConfigs/conversations/grouped/step1.xhtml");
- assertEquals(ViewConfigCache.getViewConfig(
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(
MultipleSimpleNestedConfigs.Conversations.Grouped.Step2.class).getViewId(),
"/multipleSimpleNestedConfigs/conversations/grouped/step2.xhtml");
}
@@ -143,8 +143,8 @@ public class ViewConfigTest
viewConfigExtension.addPageDefinition(SimpleInterfaceBasedConfigs.Wizards.Registration.Step1.class);
viewConfigExtension.addPageDefinition(SimpleInterfaceBasedConfigs.Wizards.Order.Step1.class);
- ViewConfigDescriptor registrationConfigEntry = ViewConfigCache.getViewConfig(SimpleInterfaceBasedConfigs.Wizards.Registration.Step1.class);
- ViewConfigDescriptor orderConfigEntry = ViewConfigCache.getViewConfig(SimpleInterfaceBasedConfigs.Wizards.Order.Step1.class);
+ ViewConfigDescriptor registrationConfigEntry = ViewConfigCache.getViewConfigDescriptor(SimpleInterfaceBasedConfigs.Wizards.Registration.Step1.class);
+ ViewConfigDescriptor orderConfigEntry = ViewConfigCache.getViewConfigDescriptor(SimpleInterfaceBasedConfigs.Wizards.Order.Step1.class);
assertEquals(registrationConfigEntry.getViewId(),
"/pages/wizards/registration/step1.xhtml");
@@ -165,15 +165,15 @@ public class ViewConfigTest
viewConfigExtension.addPageDefinition(NavigationOverriding1.RedirectedPage1.class);
viewConfigExtension.addPageDefinition(NavigationOverriding1.ForwardedPage1.class);
- assertEquals(ViewConfigCache.getViewConfig(NavigationOverriding1.RedirectedPage1.class).getViewId(),
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(NavigationOverriding1.RedirectedPage1.class).getViewId(),
"/redirectedPage1.xhtml");
- assertEquals(ViewConfigCache.getViewConfig(NavigationOverriding1.ForwardedPage1.class).getViewId(),
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(NavigationOverriding1.ForwardedPage1.class).getViewId(),
"/forwardedPage1.xhtml");
- ViewConfigDescriptor viewConfig =ViewConfigCache.getViewConfig(NavigationOverriding1.RedirectedPage1.class);
+ ViewConfigDescriptor viewConfig =ViewConfigCache.getViewConfigDescriptor(NavigationOverriding1.RedirectedPage1.class);
assertEquals(viewConfig.getNavigationMode(), NavigationMode.REDIRECT);
- viewConfig = ViewConfigCache.getViewConfig(NavigationOverriding1.ForwardedPage1.class);
+ viewConfig = ViewConfigCache.getViewConfigDescriptor(NavigationOverriding1.ForwardedPage1.class);
assertEquals(viewConfig.getNavigationMode(), NavigationMode.FORWARD);
}
@@ -184,15 +184,15 @@ public class ViewConfigTest
viewConfigExtension.addPageDefinition(NavigationOverriding2.RedirectedPage2.class);
viewConfigExtension.addPageDefinition(NavigationOverriding2.ForwardedPage2.class);
- assertEquals(ViewConfigCache.getViewConfig(NavigationOverriding2.RedirectedPage2.class).getViewId(),
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(NavigationOverriding2.RedirectedPage2.class).getViewId(),
"/redirectedPage2.xhtml");
- assertEquals(ViewConfigCache.getViewConfig(NavigationOverriding2.ForwardedPage2.class).getViewId(),
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(NavigationOverriding2.ForwardedPage2.class).getViewId(),
"/forwardedPage2.xhtml");
- ViewConfigDescriptor viewConfig =ViewConfigCache.getViewConfig(NavigationOverriding2.RedirectedPage2.class);
+ ViewConfigDescriptor viewConfig =ViewConfigCache.getViewConfigDescriptor(NavigationOverriding2.RedirectedPage2.class);
assertEquals(viewConfig.getNavigationMode(), NavigationMode.REDIRECT);
- viewConfig = ViewConfigCache.getViewConfig(NavigationOverriding2.ForwardedPage2.class);
+ viewConfig = ViewConfigCache.getViewConfigDescriptor(NavigationOverriding2.ForwardedPage2.class);
assertEquals(viewConfig.getNavigationMode(), NavigationMode.FORWARD);
}
@@ -203,11 +203,11 @@ public class ViewConfigTest
viewConfigExtension.addPageDefinition(ViewConfigWithAccessDecisionVoters.Page1.class);
viewConfigExtension.addPageDefinition(ViewConfigWithAccessDecisionVoters.Page2.class);
- ViewConfigDescriptor viewConfig = ViewConfigCache.getViewConfig(ViewConfigWithAccessDecisionVoters.Page1.class);
+ ViewConfigDescriptor viewConfig = ViewConfigCache.getViewConfigDescriptor(ViewConfigWithAccessDecisionVoters.Page1.class);
assertEquals(viewConfig.getAccessDecisionVoters().size(), 1);
- viewConfig = ViewConfigCache.getViewConfig(ViewConfigWithAccessDecisionVoters.Page2.class);
+ viewConfig = ViewConfigCache.getViewConfigDescriptor(ViewConfigWithAccessDecisionVoters.Page2.class);
assertEquals(viewConfig.getAccessDecisionVoters().size(), 2);
@@ -232,11 +232,11 @@ public class ViewConfigTest
viewConfigExtension.addPageDefinition(ViewConfigWithSecurityErrorPages.Page1.class);
viewConfigExtension.addPageDefinition(ViewConfigWithSecurityErrorPages.Page2.class);
- ViewConfigDescriptor viewConfig = ViewConfigCache.getViewConfig(ViewConfigWithSecurityErrorPages.Page1.class);
+ ViewConfigDescriptor viewConfig = ViewConfigCache.getViewConfigDescriptor(ViewConfigWithSecurityErrorPages.Page1.class);
assertEquals(((EditableViewConfigDescriptor)viewConfig).getErrorView(), SimpleView.class);
- viewConfig = ViewConfigCache.getViewConfig(ViewConfigWithSecurityErrorPages.Page2.class);
+ viewConfig = ViewConfigCache.getViewConfigDescriptor(ViewConfigWithSecurityErrorPages.Page2.class);
assertEquals(((EditableViewConfigDescriptor)viewConfig).getErrorView(), SimpleViewWithManualName.class);
}
@@ -246,11 +246,11 @@ public class ViewConfigTest
viewConfigExtension.addPageDefinition(ViewConfigWithViewMetaData.Page1.class);
viewConfigExtension.addPageDefinition(ViewConfigWithViewMetaData.Page2.class);
- ViewConfigDescriptor viewConfig = ViewConfigCache.getViewConfig(ViewConfigWithViewMetaData.Page1.class);
+ ViewConfigDescriptor viewConfig = ViewConfigCache.getViewConfigDescriptor(ViewConfigWithViewMetaData.Page1.class);
assertEquals(viewConfig.getMetaData().size(), 2);
- viewConfig = ViewConfigCache.getViewConfig(ViewConfigWithViewMetaData.Page2.class);
+ viewConfig = ViewConfigCache.getViewConfigDescriptor(ViewConfigWithViewMetaData.Page2.class);
assertEquals(viewConfig.getMetaData().size(), 3);
}
@@ -260,13 +260,13 @@ public class ViewConfigTest
viewConfigExtension.addPageDefinition(ViewConfigWithViewController.Page1.class);
viewConfigExtension.addPageDefinition(ViewConfigWithViewController.Page2.class);
- ViewConfigDescriptor viewConfig = ViewConfigCache.getViewConfig(ViewConfigWithViewController.Page1.class);
+ ViewConfigDescriptor viewConfig = ViewConfigCache.getViewConfigDescriptor(ViewConfigWithViewController.Page1.class);
List<PageBeanDescriptor> pageBeanDescriptors = viewConfig.getPageBeanDescriptors();
assertEquals(pageBeanDescriptors.size(), 1);
assertTrue(pageBeanDescriptors.iterator().next().getBeanClass().equals(TestPageBean2.class));
- viewConfig = ViewConfigCache.getViewConfig(ViewConfigWithViewController.Page2.class);
+ viewConfig = ViewConfigCache.getViewConfigDescriptor(ViewConfigWithViewController.Page2.class);
pageBeanDescriptors = viewConfig.getPageBeanDescriptors();
assertEquals(pageBeanDescriptors.size(), 2);
@@ -287,18 +287,18 @@ public class ViewConfigTest
viewConfigExtension.finalizeConfig();
- assertEquals(ViewConfigCache.getViewConfig(
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(
OrderOverviewPage.class).getViewId(),
"/pages/order/orderOverview.xhtml");
- assertEquals(ViewConfigCache.getViewConfig(
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(
RegistrationStep01PageBean.class).getViewId(),
"/pages/registration/registrationStep01.xhtml");
- assertEquals(ViewConfigCache.getViewConfig(
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(
OrderOverviewPage.class).getAccessDecisionVoters().iterator().next().getName(),
"org.apache.myfaces.extensions.cdi.jsf.test.impl.config.view.inline.pages.order.TestAccessDecisionVoter3");
- PageBeanDescriptor pageBeanDescriptor = ViewConfigCache.getViewConfig(RegistrationStep01PageBean.class)
+ PageBeanDescriptor pageBeanDescriptor = ViewConfigCache.getViewConfigDescriptor(RegistrationStep01PageBean.class)
.getPageBeanDescriptors().iterator().next();
assertEquals(pageBeanDescriptor.getBeanClass(), RegistrationStep01PageBean.class);
@@ -314,18 +314,18 @@ public class ViewConfigTest
viewConfigExtension.finalizeConfig();
- assertEquals(ViewConfigCache.getViewConfig(
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(
OrderOverviewPage.class).getViewId(),
"/views/order/orderOverview.xhtml");
- assertEquals(ViewConfigCache.getViewConfig(
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(
RegistrationStep01PageBean.class).getViewId(),
"/views/registration/registrationStep01.xhtml");
- assertEquals(ViewConfigCache.getViewConfig(
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(
OrderOverviewPage.class).getAccessDecisionVoters().iterator().next().getName(),
"org.apache.myfaces.extensions.cdi.jsf.test.impl.config.view.inline.pages.order.TestAccessDecisionVoter3");
- PageBeanDescriptor pageBeanDescriptor = ViewConfigCache.getViewConfig(RegistrationStep01PageBean.class)
+ PageBeanDescriptor pageBeanDescriptor = ViewConfigCache.getViewConfigDescriptor(RegistrationStep01PageBean.class)
.getPageBeanDescriptors().iterator().next();
assertEquals(pageBeanDescriptor.getBeanClass(), RegistrationStep01PageBean.class);
@@ -341,18 +341,18 @@ public class ViewConfigTest
viewConfigExtension.finalizeConfig();
- assertEquals(ViewConfigCache.getViewConfig(
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(
OrderOverviewPage.class).getViewId(),
"/order/orderOverview.xhtml");
- assertEquals(ViewConfigCache.getViewConfig(
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(
RegistrationStep01PageBean.class).getViewId(),
"/registration/registrationStep01.xhtml");
- assertEquals(ViewConfigCache.getViewConfig(
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(
OrderOverviewPage.class).getAccessDecisionVoters().iterator().next().getName(),
"org.apache.myfaces.extensions.cdi.jsf.test.impl.config.view.inline.pages.order.TestAccessDecisionVoter3");
- PageBeanDescriptor pageBeanDescriptor = ViewConfigCache.getViewConfig(RegistrationStep01PageBean.class)
+ PageBeanDescriptor pageBeanDescriptor = ViewConfigCache.getViewConfigDescriptor(RegistrationStep01PageBean.class)
.getPageBeanDescriptors().iterator().next();
assertEquals(pageBeanDescriptor.getBeanClass(), RegistrationStep01PageBean.class);
@@ -375,7 +375,7 @@ public class ViewConfigTest
try
{
- assertEquals(ViewConfigCache.getViewConfig(
+ assertEquals(ViewConfigCache.getViewConfigDescriptor(
OrderOverviewPage.class).getViewId(),
"/order/orderOverview.xhtml");
}
Modified: myfaces/extensions/cdi/trunk/test-modules/cargo-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/SimplePageInteraction.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/cargo-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/SimplePageInteraction.java?rev=1089271&r1=1089270&r2=1089271&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/cargo-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/SimplePageInteraction.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/cargo-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/SimplePageInteraction.java Tue Apr 5 22:20:32 2011
@@ -237,7 +237,7 @@ public class SimplePageInteraction
protected HtmlPage getPage(Class<? extends ViewConfig> pageDefinition)
{
- return getPage(ViewConfigCache.getViewConfig(pageDefinition).getViewId());
+ return getPage(ViewConfigCache.getViewConfigDescriptor(pageDefinition).getViewId());
}
protected HtmlPage getPage(String viewId)
@@ -293,7 +293,7 @@ public class SimplePageInteraction
{
return null;
}
- return ViewConfigCache.getViewConfig(pageDefinition).getViewId();
+ return ViewConfigCache.getViewConfigDescriptor(pageDefinition).getViewId();
}
protected String url(HtmlPage htmlPage)