You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2013/11/01 02:55:10 UTC
svn commit: r1537800 [2/2] - in /myfaces/core/trunk/impl/src:
main/java/org/apache/myfaces/config/
main/java/org/apache/myfaces/config/annotation/
main/java/org/apache/myfaces/config/impl/digester/
main/java/org/apache/myfaces/config/impl/digester/elem...
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/OrderingImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Ordering.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/OrderingImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/OrderingImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Ordering.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Ordering.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/OrderingImpl.java Fri Nov 1 01:55:08 2013
@@ -22,7 +22,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-public class Ordering extends org.apache.myfaces.config.element.Ordering implements Serializable
+public class OrderingImpl extends org.apache.myfaces.config.element.Ordering implements Serializable
{
private List<org.apache.myfaces.config.element.OrderSlot> beforeList
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/PropertyImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Property.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/PropertyImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/PropertyImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Property.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Property.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/PropertyImpl.java Fri Nov 1 01:55:08 2013
@@ -41,7 +41,7 @@ import java.util.List;
*
* <p/>
*/
-public class Property extends org.apache.myfaces.config.element.Property implements Serializable
+public class PropertyImpl extends org.apache.myfaces.config.element.Property implements Serializable
{
private List<String> _description;
private List<String> _displayName;
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RedirectImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Redirect.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RedirectImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RedirectImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Redirect.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Redirect.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RedirectImpl.java Fri Nov 1 01:55:08 2013
@@ -26,12 +26,12 @@ import java.util.List;
import java.util.Map;
-public class Redirect extends org.apache.myfaces.config.element.Redirect implements Serializable
+public class RedirectImpl extends org.apache.myfaces.config.element.Redirect implements Serializable
{
private Map<String,List<String>> viewParams = new HashMap<String,List<String>>();
private String includeViewParams;
- public void addViewParam(ViewParam viewParam)
+ public void addViewParam(ViewParamImpl viewParam)
{
List<String> params = viewParams.get(viewParam.getName());
if(params == null)
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RenderKitImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RenderKit.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RenderKitImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RenderKitImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RenderKit.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RenderKit.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RenderKitImpl.java Fri Nov 1 01:55:08 2013
@@ -25,7 +25,7 @@ import java.util.List;
/**
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
*/
-public class RenderKit extends org.apache.myfaces.config.element.RenderKit implements Serializable
+public class RenderKitImpl extends org.apache.myfaces.config.element.RenderKit implements Serializable
{
private String id;
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RendererImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Renderer.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RendererImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RendererImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Renderer.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Renderer.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RendererImpl.java Fri Nov 1 01:55:08 2013
@@ -24,7 +24,7 @@ import java.io.Serializable;
/**
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
*/
-public class Renderer extends org.apache.myfaces.config.element.Renderer implements Serializable
+public class RendererImpl extends org.apache.myfaces.config.element.Renderer implements Serializable
{
private String componentFamily;
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ResourceBundleImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ResourceBundle.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ResourceBundleImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ResourceBundleImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ResourceBundle.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ResourceBundle.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ResourceBundleImpl.java Fri Nov 1 01:55:08 2013
@@ -24,7 +24,7 @@ import java.io.Serializable;
* @author Mathias Broekelmann (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public class ResourceBundle extends org.apache.myfaces.config.element.ResourceBundle implements Serializable
+public class ResourceBundleImpl extends org.apache.myfaces.config.element.ResourceBundle implements Serializable
{
private String baseName;
private String var;
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/SystemEventListenerImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/SystemEventListener.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/SystemEventListenerImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/SystemEventListenerImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/SystemEventListener.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/SystemEventListener.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/SystemEventListenerImpl.java Fri Nov 1 01:55:08 2013
@@ -21,7 +21,8 @@ package org.apache.myfaces.config.impl.d
import java.io.Serializable;
-public class SystemEventListener extends org.apache.myfaces.config.element.SystemEventListener implements Serializable
+public class SystemEventListenerImpl extends org.apache.myfaces.config.element.SystemEventListener
+ implements Serializable
{
private String systemEventListenerClass;
private String systemEventClass;
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ViewParamImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ViewParam.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ViewParamImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ViewParamImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ViewParam.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ViewParam.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ViewParamImpl.java Fri Nov 1 01:55:08 2013
@@ -21,7 +21,7 @@ package org.apache.myfaces.config.impl.d
import java.io.Serializable;
-public class ViewParam extends org.apache.myfaces.config.element.ViewParam implements Serializable
+public class ViewParamImpl extends org.apache.myfaces.config.element.ViewParam implements Serializable
{
private String name;
private String value;
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java?rev=1537800&r1=1537799&r2=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java Fri Nov 1 01:55:08 2013
@@ -82,7 +82,7 @@ public class NavigationHandlerImplTest e
RuntimeConfig runtimeConfig = RuntimeConfig
.getCurrentInstance(externalContext);
- org.apache.myfaces.config.impl.digester.elements.FacesConfig config = _digesterFacesConfigUnmarshaller
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl config = _digesterFacesConfigUnmarshaller
.getFacesConfig(getClass().getResourceAsStream(file), file);
for (NavigationRule rule : config.getNavigationRules())
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/AbstractManagedBeanBuilderTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/AbstractManagedBeanBuilderTestCase.java?rev=1537800&r1=1537799&r2=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/AbstractManagedBeanBuilderTestCase.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/AbstractManagedBeanBuilderTestCase.java Fri Nov 1 01:55:08 2013
@@ -30,11 +30,11 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.myfaces.config.impl.digester.elements.ListEntries;
-import org.apache.myfaces.config.impl.digester.elements.ManagedBean;
-import org.apache.myfaces.config.impl.digester.elements.ManagedProperty;
-import org.apache.myfaces.config.impl.digester.elements.MapEntries;
-import org.apache.myfaces.config.impl.digester.elements.ListEntries.Entry;
+import org.apache.myfaces.config.impl.digester.elements.ListEntriesImpl;
+import org.apache.myfaces.config.impl.digester.elements.ManagedBeanImpl;
+import org.apache.myfaces.config.impl.digester.elements.ManagedPropertyImpl;
+import org.apache.myfaces.config.impl.digester.elements.MapEntriesImpl;
+import org.apache.myfaces.config.impl.digester.elements.ListEntriesImpl.Entry;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
public abstract class AbstractManagedBeanBuilderTestCase extends AbstractJsfTestCase {
@@ -58,7 +58,7 @@ public abstract class AbstractManagedBea
{
super.setUp();
ManagedBeanBuilder managedBeanBuilder = new ManagedBeanBuilder();
- ManagedBean managedBean = new ManagedBean();
+ ManagedBeanImpl managedBean = new ManagedBeanImpl();
managedBean.setBeanClass(MangedBeanExample.class.getName());
managedBean.setName("managed");
@@ -73,28 +73,28 @@ public abstract class AbstractManagedBea
MANAGED_MAP.put("1", "1");
MANAGED_MAP.put("2", "2");
- ManagedProperty managedProperty = new ManagedProperty();
+ ManagedPropertyImpl managedProperty = new ManagedPropertyImpl();
managedProperty.setPropertyName("managedProperty");
managedProperty.setValue(INJECTED_VALUE);
- ManagedProperty managedList = new ManagedProperty();
+ ManagedPropertyImpl managedList = new ManagedPropertyImpl();
managedList.setPropertyName("managedList");
- ListEntries listEntries = makeListEntries();
+ ListEntriesImpl listEntries = makeListEntries();
managedList.setListEntries(listEntries);
- ManagedProperty writeOnlyList = new ManagedProperty();
+ ManagedPropertyImpl writeOnlyList = new ManagedPropertyImpl();
writeOnlyList.setPropertyName("writeOnlyList");
- ListEntries writeOnlyListEntries = makeListEntries();
+ ListEntriesImpl writeOnlyListEntries = makeListEntries();
writeOnlyList.setListEntries(writeOnlyListEntries);
- ManagedProperty managedMap = new ManagedProperty();
+ ManagedPropertyImpl managedMap = new ManagedPropertyImpl();
managedMap.setPropertyName("managedMap");
- MapEntries mapEntries = makeMapEntries();
+ MapEntriesImpl mapEntries = makeMapEntries();
managedMap.setMapEntries(mapEntries);
- ManagedProperty writeOnlyMap = new ManagedProperty();
+ ManagedPropertyImpl writeOnlyMap = new ManagedPropertyImpl();
writeOnlyMap.setPropertyName("writeOnlyMap");
- MapEntries writeOnlyMapEntries = makeMapEntries();
+ MapEntriesImpl writeOnlyMapEntries = makeMapEntries();
writeOnlyMap.setMapEntries(writeOnlyMapEntries);
managedBean.addProperty(managedProperty);
@@ -115,8 +115,8 @@ public abstract class AbstractManagedBea
MANAGED_MAP.clear();
}
- private ListEntries makeListEntries(){
- ListEntries listEntries = new ListEntries();
+ private ListEntriesImpl makeListEntries(){
+ ListEntriesImpl listEntries = new ListEntriesImpl();
for(int i = 0; i < MANAGED_LIST.size(); i++){
Entry entry = new Entry();
@@ -126,11 +126,11 @@ public abstract class AbstractManagedBea
return listEntries;
}
- private MapEntries makeMapEntries(){
- MapEntries mapEntries = new MapEntries();
+ private MapEntriesImpl makeMapEntries(){
+ MapEntriesImpl mapEntries = new MapEntriesImpl();
for(int i = 0 ; i < MANAGED_MAP.size(); i++){
- MapEntries.Entry mapEntry = new MapEntries.Entry();
+ MapEntriesImpl.Entry mapEntry = new MapEntriesImpl.Entry();
mapEntry.setKey((String) MANAGED_MAP.get(i + ""));
mapEntry.setValue((String) MANAGED_MAP.get(i + ""));
mapEntries.addEntry(mapEntry);
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java?rev=1537800&r1=1537799&r2=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java Fri Nov 1 01:55:08 2013
@@ -25,14 +25,14 @@ import org.apache.myfaces.config.element
import org.apache.myfaces.config.element.NavigationRule;
import org.apache.myfaces.config.impl.digester.DigesterFacesConfigDispenserImpl;
import org.apache.myfaces.config.impl.digester.DigesterFacesConfigUnmarshallerImpl;
-import org.apache.myfaces.config.impl.digester.elements.FacesConfig;
+import org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
public class FacesConfigValidatorTestCase extends AbstractJsfTestCase
{
private FacesConfigDispenser dispenser;
- private FacesConfigUnmarshaller<FacesConfig> unmarshaller;
+ private FacesConfigUnmarshaller<FacesConfigImpl> unmarshaller;
public FacesConfigValidatorTestCase(String name)
{
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/ManagedBeanBuilderTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/ManagedBeanBuilderTest.java?rev=1537800&r1=1537799&r2=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/ManagedBeanBuilderTest.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/ManagedBeanBuilderTest.java Fri Nov 1 01:55:08 2013
@@ -24,8 +24,8 @@ import java.util.Map;
import javax.faces.FacesException;
import javax.faces.application.ProjectStage;
-import org.apache.myfaces.config.impl.digester.elements.ManagedBean;
-import org.apache.myfaces.config.impl.digester.elements.ManagedProperty;
+import org.apache.myfaces.config.impl.digester.elements.ManagedBeanImpl;
+import org.apache.myfaces.config.impl.digester.elements.ManagedPropertyImpl;
import org.apache.myfaces.el.unified.resolver.ManagedBeanResolver;
import org.apache.myfaces.test.mock.MockApplication20;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
@@ -121,18 +121,18 @@ public class ManagedBeanBuilderTest exte
public void testIsInValidScope()
{
// create sessionBean referencing requestBean
- ManagedBean sessionBean = new ManagedBean();
+ ManagedBeanImpl sessionBean = new ManagedBeanImpl();
sessionBean.setBeanClass(TestBean.class.getName());
sessionBean.setName("sessionBean");
sessionBean.setScope("session");
- ManagedProperty anotherBeanProperty = new ManagedProperty();
+ ManagedPropertyImpl anotherBeanProperty = new ManagedPropertyImpl();
anotherBeanProperty.setPropertyName("anotherBean");
anotherBeanProperty.setValue("#{requestBean}");
sessionBean.addProperty(anotherBeanProperty);
runtimeConfig.addManagedBean("sessionBean", sessionBean);
// create requestBean
- ManagedBean requestBean = new ManagedBean();
+ ManagedBeanImpl requestBean = new ManagedBeanImpl();
requestBean.setBeanClass(TestBean.class.getName());
requestBean.setName("requestBean");
requestBean.setScope("request");
@@ -160,25 +160,25 @@ public class ManagedBeanBuilderTest exte
public void testIsInValidScopeWithCustomScopes()
{
// create scopeBean
- ManagedBean scopeBean = new ManagedBean();
+ ManagedBeanImpl scopeBean = new ManagedBeanImpl();
scopeBean.setBeanClass(TestBean.class.getName());
scopeBean.setName("scopeBean");
scopeBean.setScope("session");
runtimeConfig.addManagedBean("scopeBean", scopeBean);
// create sessionBean referencing requestBean
- ManagedBean sessionBean = new ManagedBean();
+ ManagedBeanImpl sessionBean = new ManagedBeanImpl();
sessionBean.setBeanClass(TestBean.class.getName());
sessionBean.setName("sessionBean");
sessionBean.setScope("#{scopeBean.scope}");
- ManagedProperty anotherBeanProperty = new ManagedProperty();
+ ManagedPropertyImpl anotherBeanProperty = new ManagedPropertyImpl();
anotherBeanProperty.setPropertyName("anotherBean");
anotherBeanProperty.setValue("#{requestBean}");
sessionBean.addProperty(anotherBeanProperty);
runtimeConfig.addManagedBean("sessionBean", sessionBean);
// create requestBean
- ManagedBean requestBean = new ManagedBean();
+ ManagedBeanImpl requestBean = new ManagedBeanImpl();
requestBean.setBeanClass(TestBean.class.getName());
requestBean.setName("requestBean");
requestBean.setScope("request");
@@ -206,18 +206,18 @@ public class ManagedBeanBuilderTest exte
public void testIsInValidScopeViewScope()
{
// create viewBean referencing requestBean
- ManagedBean viewBean = new ManagedBean();
+ ManagedBeanImpl viewBean = new ManagedBeanImpl();
viewBean.setBeanClass(TestBean.class.getName());
viewBean.setName("viewBean");
viewBean.setScope("view");
- ManagedProperty anotherBeanProperty = new ManagedProperty();
+ ManagedPropertyImpl anotherBeanProperty = new ManagedPropertyImpl();
anotherBeanProperty.setPropertyName("anotherBean");
anotherBeanProperty.setValue("#{requestBean}");
viewBean.addProperty(anotherBeanProperty);
runtimeConfig.addManagedBean("viewBean", viewBean);
// create requestBean
- ManagedBean requestBean = new ManagedBean();
+ ManagedBeanImpl requestBean = new ManagedBeanImpl();
requestBean.setBeanClass(TestBean.class.getName());
requestBean.setName("requestBean");
requestBean.setScope("request");
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java?rev=1537800&r1=1537799&r2=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java Fri Nov 1 01:55:08 2013
@@ -18,10 +18,10 @@ package org.apache.myfaces.config;
import org.apache.myfaces.config.element.FacesConfig;
import org.apache.myfaces.config.element.OrderSlot;
import org.apache.myfaces.config.impl.digester.DigesterFacesConfigUnmarshallerImpl;
-import org.apache.myfaces.config.impl.digester.elements.AbsoluteOrdering;
-import org.apache.myfaces.config.impl.digester.elements.ConfigOthersSlot;
-import org.apache.myfaces.config.impl.digester.elements.FacesConfigNameSlot;
-import org.apache.myfaces.config.impl.digester.elements.Ordering;
+import org.apache.myfaces.config.impl.digester.elements.AbsoluteOrderingImpl;
+import org.apache.myfaces.config.impl.digester.elements.ConfigOthersSlotImpl;
+import org.apache.myfaces.config.impl.digester.elements.FacesConfigNameSlotImpl;
+import org.apache.myfaces.config.impl.digester.elements.OrderingImpl;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
import javax.faces.FacesException;
@@ -125,11 +125,11 @@ public class OrderingFacesConfigTest ext
{
FacesConfig cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
"empty-config.xml"), "empty-config.xml");
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfgA = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfgB = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfgC = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfgD = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfgE = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfgA = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfgB = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfgC = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfgD = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfgE = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
cfgA.setName("A");
cfgB.setName("B");
@@ -137,35 +137,35 @@ public class OrderingFacesConfigTest ext
cfgD.setName("D");
cfgE.setName("E");
- cfgC.setOrdering(new Ordering());
- FacesConfigNameSlot temp = new FacesConfigNameSlot();
+ cfgC.setOrdering(new OrderingImpl());
+ FacesConfigNameSlotImpl temp = new FacesConfigNameSlotImpl();
temp.setName("D");
cfgC.getOrdering().getBeforeList().add(temp);
- temp = new FacesConfigNameSlot();
+ temp = new FacesConfigNameSlotImpl();
temp.setName("E");
cfgC.getOrdering().getBeforeList().add(temp);
- temp = new FacesConfigNameSlot();
+ temp = new FacesConfigNameSlotImpl();
temp.setName("A");
cfgC.getOrdering().getAfterList().add(temp);
- temp = new FacesConfigNameSlot();
+ temp = new FacesConfigNameSlotImpl();
temp.setName("B");
cfgC.getOrdering().getAfterList().add(temp);
- cfgA.setOrdering(new Ordering());
- temp = new FacesConfigNameSlot();
+ cfgA.setOrdering(new OrderingImpl());
+ temp = new FacesConfigNameSlotImpl();
temp.setName("B");
cfgA.getOrdering().getBeforeList().add(temp);
- temp = new FacesConfigNameSlot();
+ temp = new FacesConfigNameSlotImpl();
temp.setName("E");
cfgA.getOrdering().getBeforeList().add(temp);
- cfgE.setOrdering(new Ordering());
- temp = new FacesConfigNameSlot();
+ cfgE.setOrdering(new OrderingImpl());
+ temp = new FacesConfigNameSlotImpl();
temp.setName("D");
cfgE.getOrdering().getAfterList().add(temp);
- cfgD.setOrdering(new Ordering());
- cfgD.getOrdering().getBeforeList().add(new ConfigOthersSlot());
+ cfgD.setOrdering(new OrderingImpl());
+ cfgD.getOrdering().getBeforeList().add(new ConfigOthersSlotImpl());
List<FacesConfig> appConfigResources = new ArrayList<FacesConfig>();
appConfigResources.add(cfgA);
@@ -199,37 +199,37 @@ public class OrderingFacesConfigTest ext
*/
public void testMaxConditionsOrdering() throws Exception
{
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
"empty-config.xml"), "empty-config.xml");
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfgA = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfgB = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfgC = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfgA = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfgB = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfgC = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
cfgA.setName("A");
cfgB.setName("B");
cfgC.setName("C");
- cfgA.setOrdering(new Ordering());
- FacesConfigNameSlot temp = new FacesConfigNameSlot();
+ cfgA.setOrdering(new OrderingImpl());
+ FacesConfigNameSlotImpl temp = new FacesConfigNameSlotImpl();
temp.setName("B");
cfgA.getOrdering().getBeforeList().add(temp);
- temp = new FacesConfigNameSlot();
+ temp = new FacesConfigNameSlotImpl();
temp.setName("C");
cfgA.getOrdering().getBeforeList().add(temp);
- cfgB.setOrdering(new Ordering());
- temp = new FacesConfigNameSlot();
+ cfgB.setOrdering(new OrderingImpl());
+ temp = new FacesConfigNameSlotImpl();
temp.setName("A");
cfgB.getOrdering().getAfterList().add(temp);
- temp = new FacesConfigNameSlot();
+ temp = new FacesConfigNameSlotImpl();
temp.setName("C");
cfgB.getOrdering().getBeforeList().add(temp);
- cfgC.setOrdering(new Ordering());
- temp = new FacesConfigNameSlot();
+ cfgC.setOrdering(new OrderingImpl());
+ temp = new FacesConfigNameSlotImpl();
temp.setName("A");
cfgC.getOrdering().getAfterList().add(temp);
- temp = new FacesConfigNameSlot();
+ temp = new FacesConfigNameSlotImpl();
temp.setName("B");
cfgC.getOrdering().getAfterList().add(temp);
//cfgC.getOrdering().getBeforeList().add(new ConfigOthersSlot());
@@ -249,12 +249,12 @@ public class OrderingFacesConfigTest ext
public void testEx1()
{
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfgA = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfgB = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfgC = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfgD = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfgE = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfgF = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfgA = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfgB = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfgC = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfgD = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfgE = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfgF = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
cfgA.setName("A");
cfgB.setName("B");
@@ -263,21 +263,21 @@ public class OrderingFacesConfigTest ext
cfgE.setName("E");
cfgF.setName("F");
- cfgA.setOrdering(new Ordering());
- cfgA.getOrdering().getAfterList().add(new ConfigOthersSlot());
- FacesConfigNameSlot temp = new FacesConfigNameSlot();
+ cfgA.setOrdering(new OrderingImpl());
+ cfgA.getOrdering().getAfterList().add(new ConfigOthersSlotImpl());
+ FacesConfigNameSlotImpl temp = new FacesConfigNameSlotImpl();
temp.setName("C");
cfgA.getOrdering().getAfterList().add(temp);
- cfgB.setOrdering(new Ordering());
- cfgB.getOrdering().getBeforeList().add(new ConfigOthersSlot());
+ cfgB.setOrdering(new OrderingImpl());
+ cfgB.getOrdering().getBeforeList().add(new ConfigOthersSlotImpl());
- cfgC.setOrdering(new Ordering());
- cfgC.getOrdering().getAfterList().add(new ConfigOthersSlot());
+ cfgC.setOrdering(new OrderingImpl());
+ cfgC.getOrdering().getAfterList().add(new ConfigOthersSlotImpl());
- cfgF.setOrdering(new Ordering());
- cfgF.getOrdering().getBeforeList().add(new ConfigOthersSlot());
- temp = new FacesConfigNameSlot();
+ cfgF.setOrdering(new OrderingImpl());
+ cfgF.getOrdering().getBeforeList().add(new ConfigOthersSlotImpl());
+ temp = new FacesConfigNameSlotImpl();
temp.setName("B");
cfgF.getOrdering().getBeforeList().add(temp);
@@ -300,12 +300,12 @@ public class OrderingFacesConfigTest ext
public void testEx2()
{
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfg = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfgB = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfgC = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfgD = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfgE = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfgF = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfg = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfgB = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfgC = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfgD = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfgE = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfgF = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
cfgB.setName("B");
cfgC.setName("C");
@@ -313,20 +313,20 @@ public class OrderingFacesConfigTest ext
cfgE.setName("E");
cfgF.setName("F");
- cfg.setOrdering(new Ordering());
- cfg.getOrdering().getAfterList().add(new ConfigOthersSlot());
- FacesConfigNameSlot temp = new FacesConfigNameSlot();
+ cfg.setOrdering(new OrderingImpl());
+ cfg.getOrdering().getAfterList().add(new ConfigOthersSlotImpl());
+ FacesConfigNameSlotImpl temp = new FacesConfigNameSlotImpl();
temp.setName("C");
cfg.getOrdering().getBeforeList().add(temp);
- cfgB.setOrdering(new Ordering());
- cfgB.getOrdering().getBeforeList().add(new ConfigOthersSlot());
+ cfgB.setOrdering(new OrderingImpl());
+ cfgB.getOrdering().getBeforeList().add(new ConfigOthersSlotImpl());
- cfgD.setOrdering(new Ordering());
- cfgD.getOrdering().getAfterList().add(new ConfigOthersSlot());
+ cfgD.setOrdering(new OrderingImpl());
+ cfgD.getOrdering().getAfterList().add(new ConfigOthersSlotImpl());
- cfgE.setOrdering(new Ordering());
- cfgE.getOrdering().getBeforeList().add(new ConfigOthersSlot());
+ cfgE.setOrdering(new OrderingImpl());
+ cfgE.getOrdering().getBeforeList().add(new ConfigOthersSlotImpl());
List<FacesConfig> appConfigResources = new ArrayList<FacesConfig>();
appConfigResources.add(cfg);
@@ -346,23 +346,23 @@ public class OrderingFacesConfigTest ext
public void testEx3()
{
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfgA = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfgB = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfgC = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfgD = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfgA = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfgB = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfgC = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfgD = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
cfgA.setName("A");
cfgB.setName("B");
cfgC.setName("C");
cfgD.setName("D");
- cfgA.setOrdering(new Ordering());
- FacesConfigNameSlot temp = new FacesConfigNameSlot();
+ cfgA.setOrdering(new OrderingImpl());
+ FacesConfigNameSlotImpl temp = new FacesConfigNameSlotImpl();
temp.setName("B");
cfgA.getOrdering().getAfterList().add(temp);
- cfgC.setOrdering(new Ordering());
- cfgC.getOrdering().getBeforeList().add(new ConfigOthersSlot());
+ cfgC.setOrdering(new OrderingImpl());
+ cfgC.getOrdering().getBeforeList().add(new ConfigOthersSlotImpl());
List<FacesConfig> appConfigResources = new ArrayList<FacesConfig>();
appConfigResources.add(cfgA);
@@ -691,17 +691,17 @@ public class OrderingFacesConfigTest ext
public void testAbsoluteOrdering1() throws Exception
{
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfgAbs = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfgMK = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
- org.apache.myfaces.config.impl.digester.elements.FacesConfig cfgOWB = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfgAbs = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfgMK = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfgOWB = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
cfgMK.setName("cz_markoc_faces");
- AbsoluteOrdering ao = new AbsoluteOrdering();
- FacesConfigNameSlot temp = new FacesConfigNameSlot();
+ AbsoluteOrderingImpl ao = new AbsoluteOrderingImpl();
+ FacesConfigNameSlotImpl temp = new FacesConfigNameSlotImpl();
temp.setName("cz_markoc_faces");
ao.addOrderSlot(temp);
- ao.addOrderSlot(new ConfigOthersSlot());
+ ao.addOrderSlot(new ConfigOthersSlotImpl());
cfgAbs.setAbsoluteOrdering(ao);
@@ -769,7 +769,7 @@ public class OrderingFacesConfigTest ext
//2. Scan slot by slot and merge information according
for (OrderSlot slot : webAppConfig.getAbsoluteOrdering().getOrderList())
{
- if (slot instanceof ConfigOthersSlot)
+ if (slot instanceof ConfigOthersSlotImpl)
{
//Add all mentioned in othersResources
for (FacesConfig resource : othersResources)
@@ -780,7 +780,7 @@ public class OrderingFacesConfigTest ext
else
{
//Add it to the sorted list
- FacesConfigNameSlot nameSlot = (FacesConfigNameSlot) slot;
+ FacesConfigNameSlotImpl nameSlot = (FacesConfigNameSlotImpl) slot;
sortedResources.add(getFacesConfig(appConfigResources, nameSlot.getName()));
}
}
@@ -807,9 +807,9 @@ public class OrderingFacesConfigTest ext
{
for (OrderSlot slot: slots)
{
- if (slot instanceof FacesConfigNameSlot)
+ if (slot instanceof FacesConfigNameSlotImpl)
{
- FacesConfigNameSlot nameSlot = (FacesConfigNameSlot) slot;
+ FacesConfigNameSlotImpl nameSlot = (FacesConfigNameSlotImpl) slot;
if (name.equals(nameSlot.getName()))
{
return true;
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/annotation/Myfaces1761TestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/annotation/Myfaces1761TestCase.java?rev=1537800&r1=1537799&r2=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/annotation/Myfaces1761TestCase.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/annotation/Myfaces1761TestCase.java Fri Nov 1 01:55:08 2013
@@ -17,8 +17,8 @@
package org.apache.myfaces.config.annotation;
import org.apache.myfaces.config.ManagedBeanBuilder;
-import org.apache.myfaces.config.impl.digester.elements.ManagedBean;
-import org.apache.myfaces.config.impl.digester.elements.ManagedProperty;
+import org.apache.myfaces.config.impl.digester.elements.ManagedBeanImpl;
+import org.apache.myfaces.config.impl.digester.elements.ManagedPropertyImpl;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
/**
@@ -32,7 +32,7 @@ public class Myfaces1761TestCase extends
protected ManagedBeanBuilder managedBeanBuilder;
protected LifecycleProvider2 lifecycleProvider;
- protected ManagedBean beanConfiguration;
+ protected ManagedBeanImpl beanConfiguration;
private static final String TEST_LIFECYCLE_PROVIDER = MockLifecycleProvider2.class.getName();
@@ -48,12 +48,12 @@ public class Myfaces1761TestCase extends
super.setUp();
managedBeanBuilder = new ManagedBeanBuilder();
- beanConfiguration = new ManagedBean();
+ beanConfiguration = new ManagedBeanImpl();
beanConfiguration.setBeanClass(AnnotatedManagedBean2.class.getName());
beanConfiguration.setName("managed");
beanConfiguration.setScope("request");
- ManagedProperty managedProperty = new ManagedProperty();
+ ManagedPropertyImpl managedProperty = new ManagedPropertyImpl();
managedProperty.setPropertyName("managedProperty");
managedProperty.setValue(INJECTED_VALUE);
beanConfiguration.addProperty(managedProperty);
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/impl/digister/DigesterFacesConfigUnmarshallerImplTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/impl/digister/DigesterFacesConfigUnmarshallerImplTest.java?rev=1537800&r1=1537799&r2=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/impl/digister/DigesterFacesConfigUnmarshallerImplTest.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/impl/digister/DigesterFacesConfigUnmarshallerImplTest.java Fri Nov 1 01:55:08 2013
@@ -128,7 +128,7 @@ public class DigesterFacesConfigUnmarsha
assertEquals("b", ((FacesConfigNameSlot) orderList.get(0)).getName());
assertEquals("c", ((FacesConfigNameSlot) orderList.get(1)).getName());
- assertEquals(org.apache.myfaces.config.impl.digester.elements.ConfigOthersSlot.class, orderList.get(2).getClass());
+ assertEquals(org.apache.myfaces.config.impl.digester.elements.ConfigOthersSlotImpl.class, orderList.get(2).getClass());
assertEquals("d", ((FacesConfigNameSlot) orderList.get(3)).getName());
assertTrue(cfg.getApplications().isEmpty());
@@ -152,7 +152,7 @@ public class DigesterFacesConfigUnmarsha
List<OrderSlot> orderList = cfg.getOrdering().getBeforeList();
assertEquals("b", ((FacesConfigNameSlot) orderList.get(0)).getName());
assertEquals("c", ((FacesConfigNameSlot) orderList.get(1)).getName());
- assertEquals(org.apache.myfaces.config.impl.digester.elements.ConfigOthersSlot.class, orderList.get(2).getClass());
+ assertEquals(org.apache.myfaces.config.impl.digester.elements.ConfigOthersSlotImpl.class, orderList.get(2).getClass());
orderList = cfg.getOrdering().getAfterList();
assertEquals("d", ((FacesConfigNameSlot) orderList.get(0)).getName());
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/el/unified/resolver/GuiceResolverTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/el/unified/resolver/GuiceResolverTestCase.java?rev=1537800&r1=1537799&r2=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/el/unified/resolver/GuiceResolverTestCase.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/el/unified/resolver/GuiceResolverTestCase.java Fri Nov 1 01:55:08 2013
@@ -22,7 +22,7 @@ package org.apache.myfaces.el.unified.re
import javax.el.ELResolver;
import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.config.impl.digester.elements.ManagedBean;
+import org.apache.myfaces.config.impl.digester.elements.ManagedBeanImpl;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
import com.google.inject.Guice;
@@ -45,7 +45,7 @@ public class GuiceResolverTestCase exten
// simulate Myfaces starting up
RuntimeConfig rc = RuntimeConfig.getCurrentInstance(externalContext);
- ManagedBean bean = new ManagedBean();
+ ManagedBeanImpl bean = new ManagedBeanImpl();
bean.setBeanClass(ShoppingCart.class.getName());
bean.setScope("request");
rc.addManagedBean("shoppingCart", bean);
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolverTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolverTest.java?rev=1537800&r1=1537799&r2=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolverTest.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolverTest.java Fri Nov 1 01:55:08 2013
@@ -28,7 +28,7 @@ import javax.faces.FacesException;
import javax.faces.application.ProjectStage;
import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.config.impl.digester.elements.ManagedBean;
+import org.apache.myfaces.config.impl.digester.elements.ManagedBeanImpl;
import org.apache.myfaces.test.mock.MockApplication20;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
import org.apache.myfaces.test.el.MockValueExpression;
@@ -109,14 +109,14 @@ public class ManagedBeanResolverTest ext
public void testCustomScope()
{
// create the custom scope
- ManagedBean scopeBean = new ManagedBean();
+ ManagedBeanImpl scopeBean = new ManagedBeanImpl();
scopeBean.setBeanClass(HashMap.class.getName());
scopeBean.setName("scopeBean");
scopeBean.setScope("application");
runtimeConfig.addManagedBean("scopeBean", scopeBean);
// create the managed bean
- ManagedBean beanInCustomScope = new ManagedBean();
+ ManagedBeanImpl beanInCustomScope = new ManagedBeanImpl();
beanInCustomScope.setBeanClass(ArrayList.class.getName());
beanInCustomScope.setName("beanInCustomScope");
beanInCustomScope.setScope("#{scopeBean}");
@@ -145,7 +145,7 @@ public class ManagedBeanResolverTest ext
public void testCustomScopeNoMap()
{
// create the custom scope
- ManagedBean scopeBean = new ManagedBean();
+ ManagedBeanImpl scopeBean = new ManagedBeanImpl();
// Scope is ArrayList instead of HashMap
scopeBean.setBeanClass(ArrayList.class.getName());
scopeBean.setName("scopeBean");
@@ -153,7 +153,7 @@ public class ManagedBeanResolverTest ext
runtimeConfig.addManagedBean("scopeBean", scopeBean);
// create the managed bean
- ManagedBean beanInCustomScope = new ManagedBean();
+ ManagedBeanImpl beanInCustomScope = new ManagedBeanImpl();
beanInCustomScope.setBeanClass(ArrayList.class.getName());
beanInCustomScope.setName("beanInCustomScope");
beanInCustomScope.setScope("#{scopeBean}");
@@ -190,14 +190,14 @@ public class ManagedBeanResolverTest ext
public void testCustomScopeCyclicReferences()
{
// create m1
- ManagedBean m1 = new ManagedBean();
+ ManagedBeanImpl m1 = new ManagedBeanImpl();
m1.setBeanClass(TestBean.class.getName());
m1.setName("m1");
m1.setScope("#{m2.scope}");
runtimeConfig.addManagedBean("m1", m1);
// create m2
- ManagedBean m2 = new ManagedBean();
+ ManagedBeanImpl m2 = new ManagedBeanImpl();
m2.setBeanClass(TestBean.class.getName());
m2.setName("m2");
m2.setScope("#{m1.scope}");
@@ -222,7 +222,7 @@ public class ManagedBeanResolverTest ext
public void testViewScope()
{
// create the managed bean
- ManagedBean beanInViewScope = new ManagedBean();
+ ManagedBeanImpl beanInViewScope = new ManagedBeanImpl();
beanInViewScope.setBeanClass(ArrayList.class.getName());
beanInViewScope.setName("beanInViewScope");
beanInViewScope.setScope("view");
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/mc/test/core/AbstractMyFacesTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/mc/test/core/AbstractMyFacesTestCase.java?rev=1537800&r1=1537799&r2=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/mc/test/core/AbstractMyFacesTestCase.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/mc/test/core/AbstractMyFacesTestCase.java Fri Nov 1 01:55:08 2013
@@ -61,7 +61,7 @@ import org.apache.myfaces.config.Default
import org.apache.myfaces.config.RuntimeConfig;
import org.apache.myfaces.config.annotation.NoAnnotationLifecyleProvider;
import org.apache.myfaces.config.element.FacesConfig;
-import org.apache.myfaces.config.impl.digester.elements.Factory;
+import org.apache.myfaces.config.impl.digester.elements.FactoryImpl;
import org.apache.myfaces.lifecycle.LifecycleImpl;
import org.apache.myfaces.lifecycle.ViewNotFoundException;
import org.apache.myfaces.mc.test.core.annotation.DeclareFacesConfig;
@@ -994,7 +994,7 @@ public abstract class AbstractMyFacesTes
if (standardFacesConfig == null)
{
FacesConfig sfc = super.getStandardFacesConfig(ectx);
- Factory factory = (Factory) sfc.getFactories().get(0);
+ FactoryImpl factory = (FactoryImpl) sfc.getFactories().get(0);
// Override the default vdl factory with a mock one that only load
// facelet views
factory.getViewDeclarationLanguageFactory().set(0, MockMyFacesViewDeclarationLanguageFactory.class.getName());
@@ -1018,18 +1018,18 @@ public abstract class AbstractMyFacesTes
{
if (facesConfig == null)
{
- facesConfig = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
+ facesConfig = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
}
for (PageBean annoPageBean : annoManagedBeans.values())
{
- org.apache.myfaces.config.impl.digester.elements.ManagedBean bean = new
- org.apache.myfaces.config.impl.digester.elements.ManagedBean();
+ org.apache.myfaces.config.impl.digester.elements.ManagedBeanImpl bean = new
+ org.apache.myfaces.config.impl.digester.elements.ManagedBeanImpl();
bean.setBeanClass(annoPageBean.clazz().getName());
bean.setName(annoPageBean.name() == null ? annoPageBean.clazz().getName() : annoPageBean.name());
bean.setScope(annoPageBean.scope() == null ? "request" : annoPageBean.scope());
bean.setEager(Boolean.toString(annoPageBean.eager()));
- ((org.apache.myfaces.config.impl.digester.elements.FacesConfig)facesConfig).addManagedBean(bean);
+ ((org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl)facesConfig).addManagedBean(bean);
}
}
@@ -1038,16 +1038,16 @@ public abstract class AbstractMyFacesTes
{
if (facesConfig == null)
{
- facesConfig = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
+ facesConfig = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
}
- org.apache.myfaces.config.impl.digester.elements.ManagedBean bean = new
- org.apache.myfaces.config.impl.digester.elements.ManagedBean();
+ org.apache.myfaces.config.impl.digester.elements.ManagedBeanImpl bean = new
+ org.apache.myfaces.config.impl.digester.elements.ManagedBeanImpl();
bean.setBeanClass(annoPageBean.clazz().getName());
bean.setName(annoPageBean.name() == null ? annoPageBean.clazz().getName() : annoPageBean.name());
bean.setScope(annoPageBean.scope() == null ? "request" : annoPageBean.scope());
bean.setEager(Boolean.toString(annoPageBean.eager()));
- ((org.apache.myfaces.config.impl.digester.elements.FacesConfig)facesConfig).addManagedBean(bean);
+ ((org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl)facesConfig).addManagedBean(bean);
}
return facesConfig;
}
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/HTML5FaceletsProcessingTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/HTML5FaceletsProcessingTestCase.java?rev=1537800&r1=1537799&r2=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/HTML5FaceletsProcessingTestCase.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/HTML5FaceletsProcessingTestCase.java Fri Nov 1 01:55:08 2013
@@ -34,7 +34,7 @@ import javax.faces.component.html.HtmlSe
import junit.framework.Assert;
import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.config.impl.digester.elements.FaceletsProcessing;
+import org.apache.myfaces.config.impl.digester.elements.FaceletsProcessingImpl;
import org.apache.myfaces.renderkit.html.HtmlFormRenderer;
import org.apache.myfaces.renderkit.html.HtmlGridRenderer;
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/JSPXFaceletsProcessingTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/JSPXFaceletsProcessingTestCase.java?rev=1537800&r1=1537799&r2=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/JSPXFaceletsProcessingTestCase.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/JSPXFaceletsProcessingTestCase.java Fri Nov 1 01:55:08 2013
@@ -35,7 +35,7 @@ import javax.faces.component.html.HtmlSe
import junit.framework.Assert;
import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.config.impl.digester.elements.FaceletsProcessing;
+import org.apache.myfaces.config.impl.digester.elements.FaceletsProcessingImpl;
import org.apache.myfaces.renderkit.html.HtmlFormRenderer;
import org.apache.myfaces.renderkit.html.HtmlGridRenderer;
import org.apache.myfaces.renderkit.html.HtmlMenuRenderer;
@@ -84,10 +84,10 @@ public class JSPXFaceletsProcessingTestC
{
super.setUpExternalContext();
- FaceletsProcessing item = new FaceletsProcessing();
+ FaceletsProcessingImpl item = new FaceletsProcessingImpl();
item.setFileExtension(".jspx");
- item.setProcessAs(FaceletsProcessing.PROCESS_AS_JSPX);
- RuntimeConfig.getCurrentInstance(externalContext).addFaceletProcessingConfiguration(FaceletsProcessing.PROCESS_AS_JSPX, item);
+ item.setProcessAs(FaceletsProcessingImpl.PROCESS_AS_JSPX);
+ RuntimeConfig.getCurrentInstance(externalContext).addFaceletProcessingConfiguration(FaceletsProcessingImpl.PROCESS_AS_JSPX, item);
}
@Test
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/XHTMLFaceletsProcessingTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/XHTMLFaceletsProcessingTestCase.java?rev=1537800&r1=1537799&r2=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/XHTMLFaceletsProcessingTestCase.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/XHTMLFaceletsProcessingTestCase.java Fri Nov 1 01:55:08 2013
@@ -34,7 +34,7 @@ import javax.faces.component.html.HtmlSe
import junit.framework.Assert;
import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.config.impl.digester.elements.FaceletsProcessing;
+import org.apache.myfaces.config.impl.digester.elements.FaceletsProcessingImpl;
import org.apache.myfaces.renderkit.html.HtmlFormRenderer;
import org.apache.myfaces.renderkit.html.HtmlGridRenderer;
@@ -84,11 +84,11 @@ public class XHTMLFaceletsProcessingTest
{
super.setUpExternalContext();
- FaceletsProcessing item = new FaceletsProcessing();
+ FaceletsProcessingImpl item = new FaceletsProcessingImpl();
item.setFileExtension(".xhtml");
- item.setProcessAs(FaceletsProcessing.PROCESS_AS_XHTML);
+ item.setProcessAs(FaceletsProcessingImpl.PROCESS_AS_XHTML);
RuntimeConfig.getCurrentInstance(externalContext).addFaceletProcessingConfiguration(
- FaceletsProcessing.PROCESS_AS_XHTML, item);
+ FaceletsProcessingImpl.PROCESS_AS_XHTML, item);
}
@Test
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/XMLFaceletsProcessingTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/XMLFaceletsProcessingTestCase.java?rev=1537800&r1=1537799&r2=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/XMLFaceletsProcessingTestCase.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/XMLFaceletsProcessingTestCase.java Fri Nov 1 01:55:08 2013
@@ -35,7 +35,7 @@ import javax.faces.component.html.HtmlSe
import junit.framework.Assert;
import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.config.impl.digester.elements.FaceletsProcessing;
+import org.apache.myfaces.config.impl.digester.elements.FaceletsProcessingImpl;
import org.apache.myfaces.renderkit.html.HtmlFormRenderer;
import org.apache.myfaces.renderkit.html.HtmlGridRenderer;
import org.apache.myfaces.renderkit.html.HtmlMenuRenderer;
@@ -84,10 +84,10 @@ public class XMLFaceletsProcessingTestCa
{
super.setUpExternalContext();
- FaceletsProcessing item = new FaceletsProcessing();
+ FaceletsProcessingImpl item = new FaceletsProcessingImpl();
item.setFileExtension(".view.xml");
- item.setProcessAs(FaceletsProcessing.PROCESS_AS_XML);
- RuntimeConfig.getCurrentInstance(externalContext).addFaceletProcessingConfiguration(FaceletsProcessing.PROCESS_AS_XML, item);
+ item.setProcessAs(FaceletsProcessingImpl.PROCESS_AS_XML);
+ RuntimeConfig.getCurrentInstance(externalContext).addFaceletProcessingConfiguration(FaceletsProcessingImpl.PROCESS_AS_XML, item);
}
@Test