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 [1/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...
Author: lu4242
Date: Fri Nov 1 01:55:08 2013
New Revision: 1537800
URL: http://svn.apache.org/r1537800
Log:
MYFACES-3813 Cleanup org.apache.myfaces.config.impl.digester.elements package
Added:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/AbsoluteOrderingImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/AbsoluteOrdering.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ApplicationImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Application.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/AttributeImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Attribute.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ClientBehaviorRendererImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ClientBehaviorRenderer.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ComponentImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Component.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ConfigOthersSlotImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ConfigOthersSlot.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ConverterImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Converter.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FaceletsProcessingImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FaceletsProcessing.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigImpl.java
- copied, changed from r1537798, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfig.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigNameSlotImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigNameSlot.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FactoryImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Factory.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ListEntriesImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ListEntries.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/LocaleConfigImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/LocaleConfig.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBeanImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedPropertyImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedProperty.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/MapEntriesImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/MapEntries.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NamedEventImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NamedEvent.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationCaseImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationCase.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationRuleImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationRule.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/OrderSlotImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/OrderSlot.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/OrderingImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Ordering.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/PropertyImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Property.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RedirectImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Redirect.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RenderKitImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RenderKit.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RendererImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Renderer.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ResourceBundleImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ResourceBundle.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/SystemEventListenerImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/SystemEventListener.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ViewParamImpl.java
- copied, changed from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ViewParam.java
Removed:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/AbsoluteOrdering.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Application.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Attribute.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ClientBehaviorRenderer.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Component.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ConfigOthersSlot.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Converter.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FaceletsProcessing.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfig.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigNameSlot.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Factory.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ListEntries.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/LocaleConfig.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedProperty.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/MapEntries.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NamedEvent.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationCase.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationRule.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/OrderSlot.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Ordering.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Property.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Redirect.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RenderKit.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Renderer.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ResourceBundle.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/SystemEventListener.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ViewParam.java
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigUnmarshaller.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigDispenserImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Behavior.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/AbstractManagedBeanBuilderTestCase.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/ManagedBeanBuilderTest.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/annotation/Myfaces1761TestCase.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/impl/digister/DigesterFacesConfigUnmarshallerImplTest.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/el/unified/resolver/GuiceResolverTestCase.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolverTest.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/mc/test/core/AbstractMyFacesTestCase.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/HTML5FaceletsProcessingTestCase.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/JSPXFaceletsProcessingTestCase.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/XHTMLFaceletsProcessingTestCase.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/XMLFaceletsProcessingTestCase.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java?rev=1537800&r1=1537799&r2=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java Fri Nov 1 01:55:08 2013
@@ -67,7 +67,7 @@ import org.apache.myfaces.buildtools.mav
import org.apache.myfaces.config.element.facelets.FaceletTagLibrary;
import org.apache.myfaces.config.impl.digester.elements.FacesFlowDefinitionImpl;
import org.apache.myfaces.config.impl.digester.elements.FacesFlowReturnImpl;
-import org.apache.myfaces.config.impl.digester.elements.NavigationCase;
+import org.apache.myfaces.config.impl.digester.elements.NavigationCaseImpl;
import org.apache.myfaces.shared.util.FastWriter;
import org.apache.myfaces.shared.util.WebConfigParamUtils;
import org.apache.myfaces.spi.FaceletConfigResourceProvider;
@@ -202,10 +202,10 @@ public class DefaultFacesConfigurationPr
{
try
{
- org.apache.myfaces.config.impl.digester.elements.FacesConfig facesConfig
- = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
- org.apache.myfaces.config.impl.digester.elements.Factory factory
- = new org.apache.myfaces.config.impl.digester.elements.Factory();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl facesConfig
+ = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.digester.elements.FactoryImpl factory
+ = new org.apache.myfaces.config.impl.digester.elements.FactoryImpl();
facesConfig.addFactory(factory);
@@ -682,7 +682,7 @@ public class DefaultFacesConfigurationPr
// Zero lenght, if that so the flow definition must be implicitly derived.
// See JSF 2.2 section 11.4.3.3
//
- FacesConfig facesConfig = new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
+ FacesConfig facesConfig = new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
FacesFlowDefinitionImpl flow = new FacesFlowDefinitionImpl();
String flowName = systemId.substring(systemId.lastIndexOf('/')+1, systemId.lastIndexOf("-flow.xml"));
flow.setId(flowName);
@@ -700,7 +700,7 @@ public class DefaultFacesConfigurationPr
// that by default points to an outer /[flow-name]-return outcome
FacesFlowReturnImpl returnNode = new FacesFlowReturnImpl();
returnNode.setId(flowName+"-return");
- NavigationCase returnNavCase = new NavigationCase();
+ NavigationCaseImpl returnNavCase = new NavigationCaseImpl();
returnNavCase.setFromOutcome("/"+flowName+"-return");
returnNode.setNavigationCase(returnNavCase);
flow.addReturn(returnNode);
@@ -761,8 +761,8 @@ public class DefaultFacesConfigurationPr
FaceletTagLibrary tl = TagLibraryConfigUnmarshallerImpl.create(externalContext, src);
if (tl != null)
{
- org.apache.myfaces.config.impl.digester.elements.FacesConfig config =
- new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl config =
+ new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
config.addFaceletTagLibrary(tl);
facesConfigFilesList.add(config);
}
@@ -791,8 +791,8 @@ public class DefaultFacesConfigurationPr
FaceletTagLibrary tl = TagLibraryConfigUnmarshallerImpl.create(externalContext, url);
if (tl != null)
{
- org.apache.myfaces.config.impl.digester.elements.FacesConfig config =
- new org.apache.myfaces.config.impl.digester.elements.FacesConfig();
+ org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl config =
+ new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
config.addFaceletTagLibrary(tl);
facesConfigFilesList.add(config);
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigUnmarshaller.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigUnmarshaller.java?rev=1537800&r1=1537799&r2=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigUnmarshaller.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigUnmarshaller.java Fri Nov 1 01:55:08 2013
@@ -21,7 +21,7 @@ package org.apache.myfaces.config;
import java.io.InputStream;
import java.io.IOException;
import java.io.Reader;
-import org.apache.myfaces.config.impl.digester.elements.FacesConfig;
+import org.apache.myfaces.config.element.FacesConfig;
import org.xml.sax.SAXException;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java?rev=1537800&r1=1537799&r2=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java Fri Nov 1 01:55:08 2013
@@ -46,11 +46,11 @@ import javax.faces.render.RenderKitFacto
import javax.faces.validator.FacesValidator;
import javax.faces.view.facelets.FaceletsResourceResolver;
-import org.apache.myfaces.config.impl.digester.elements.Application;
+import org.apache.myfaces.config.impl.digester.elements.ApplicationImpl;
import org.apache.myfaces.config.impl.digester.elements.Behavior;
import org.apache.myfaces.config.impl.digester.elements.ComponentTagDeclarationImpl;
-import org.apache.myfaces.config.impl.digester.elements.Converter;
-import org.apache.myfaces.config.impl.digester.elements.FacesConfig;
+import org.apache.myfaces.config.impl.digester.elements.ConverterImpl;
+import org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl;
import org.apache.myfaces.spi.AnnotationProvider;
import org.apache.myfaces.spi.AnnotationProviderFactory;
@@ -83,7 +83,7 @@ public class AnnotationConfigurator
{
}
- public FacesConfig createFacesConfig(ExternalContext externalcontext, boolean metadataComplete)
+ public FacesConfigImpl createFacesConfig(ExternalContext externalcontext, boolean metadataComplete)
{
if (!metadataComplete)
{
@@ -101,9 +101,9 @@ public class AnnotationConfigurator
* @param map
* @return
*/
- protected FacesConfig createFacesConfig(Map<Class<? extends Annotation>, Set<Class<?>>> map)
+ protected FacesConfigImpl createFacesConfig(Map<Class<? extends Annotation>, Set<Class<?>>> map)
{
- FacesConfig facesConfig = new FacesConfig();
+ FacesConfigImpl facesConfig = new FacesConfigImpl();
Set<Class<?>> classes = map.get(FacesComponent.class);
@@ -159,7 +159,7 @@ public class AnnotationConfigurator
boolean hasValue = conv.value().length() > 0;
if (hasForClass || hasValue)
{
- Converter converter = new Converter();
+ ConverterImpl converter = new ConverterImpl();
if (hasForClass)
{
converter.setForClass(conv.forClass().getName());
@@ -205,14 +205,14 @@ public class AnnotationConfigurator
facesConfig.addValidator(value, clazz.getName());
if (val.isDefault())
{
- Application app = null;
+ ApplicationImpl app = null;
if (facesConfig.getApplications().isEmpty())
{
- app = new Application();
+ app = new ApplicationImpl();
}
else
{
- app = (Application) facesConfig.getApplications().get(0);
+ app = (ApplicationImpl) facesConfig.getApplications().get(0);
}
app.addDefaultValidatorId(value);
}
@@ -241,18 +241,18 @@ public class AnnotationConfigurator
+ ", " + clazz.getName() + ")");
}
- org.apache.myfaces.config.impl.digester.elements.RenderKit renderKit =
- (org.apache.myfaces.config.impl.digester.elements.RenderKit)
+ org.apache.myfaces.config.impl.digester.elements.RenderKitImpl renderKit =
+ (org.apache.myfaces.config.impl.digester.elements.RenderKitImpl)
facesConfig.getRenderKit(renderKitId);
if (renderKit == null)
{
- renderKit = new org.apache.myfaces.config.impl.digester.elements.RenderKit();
+ renderKit = new org.apache.myfaces.config.impl.digester.elements.RenderKitImpl();
renderKit.setId(renderKitId);
facesConfig.addRenderKit(renderKit);
}
- org.apache.myfaces.config.impl.digester.elements.Renderer renderer =
- new org.apache.myfaces.config.impl.digester.elements.Renderer();
+ org.apache.myfaces.config.impl.digester.elements.RendererImpl renderer =
+ new org.apache.myfaces.config.impl.digester.elements.RendererImpl();
renderer.setComponentFamily(rend.componentFamily());
renderer.setRendererClass(clazz.getName());
renderer.setRendererType(rend.rendererType());
@@ -294,7 +294,7 @@ public class AnnotationConfigurator
return facesConfig;
}
- private void handleManagedBean(FacesConfig facesConfig, Set<Class<?>> classes)
+ private void handleManagedBean(FacesConfigImpl facesConfig, Set<Class<?>> classes)
{
for (Class<?> clazz : classes)
{
@@ -308,8 +308,8 @@ public class AnnotationConfigurator
log.fine("Class '" + clazz.getName() + "' has an @ManagedBean annotation");
}
- org.apache.myfaces.config.impl.digester.elements.ManagedBean mbc =
- new org.apache.myfaces.config.impl.digester.elements.ManagedBean();
+ org.apache.myfaces.config.impl.digester.elements.ManagedBeanImpl mbc =
+ new org.apache.myfaces.config.impl.digester.elements.ManagedBeanImpl();
String beanName = bean.name();
if ((beanName == null) || beanName.equals(""))
@@ -410,8 +410,8 @@ public class AnnotationConfigurator
log.fine(" Field '" + field.getName()
+ "' has a @ManagedProperty annotation");
}
- org.apache.myfaces.config.impl.digester.elements.ManagedProperty mpc =
- new org.apache.myfaces.config.impl.digester.elements.ManagedProperty();
+ org.apache.myfaces.config.impl.digester.elements.ManagedPropertyImpl mpc =
+ new org.apache.myfaces.config.impl.digester.elements.ManagedPropertyImpl();
String name = property.name();
if ((name == null) || "".equals(name))
{
@@ -429,7 +429,7 @@ public class AnnotationConfigurator
}
}
- private void handleNamedEvent(FacesConfig facesConfig, Set<Class<?>> classes)
+ private void handleNamedEvent(FacesConfigImpl facesConfig, Set<Class<?>> classes)
{
for (Class<?> clazz : classes)
{
@@ -452,8 +452,8 @@ public class AnnotationConfigurator
// Have to register @NamedEvent annotations with the NamedEventManager class since
// we need to get access to this info later and can't from the dispenser (it's not a
// singleton).
- org.apache.myfaces.config.impl.digester.elements.NamedEvent namedEventConfig =
- new org.apache.myfaces.config.impl.digester.elements.NamedEvent();
+ org.apache.myfaces.config.impl.digester.elements.NamedEventImpl namedEventConfig =
+ new org.apache.myfaces.config.impl.digester.elements.NamedEventImpl();
namedEventConfig.setEventClass(clazz.getName());
namedEventConfig.setShortName(namedEvent.shortName());
facesConfig.addNamedEvent(namedEventConfig);
@@ -461,7 +461,7 @@ public class AnnotationConfigurator
}
}
- private void handleFacesBehavior(FacesConfig facesConfig, Set<Class<?>> classes)
+ private void handleFacesBehavior(FacesConfigImpl facesConfig, Set<Class<?>> classes)
{
for (Class<?> clazz : classes)
{
@@ -497,7 +497,7 @@ public class AnnotationConfigurator
}
}
- private void handleFacesBehaviorRenderer(FacesConfig facesConfig, Set<Class<?>> classes)
+ private void handleFacesBehaviorRenderer(FacesConfigImpl facesConfig, Set<Class<?>> classes)
{
for (Class<?> clazz : classes)
{
@@ -516,18 +516,18 @@ public class AnnotationConfigurator
+ clazz.getName() + ")");
}
- org.apache.myfaces.config.impl.digester.elements.RenderKit renderKit =
- (org.apache.myfaces.config.impl.digester.elements.RenderKit)
+ org.apache.myfaces.config.impl.digester.elements.RenderKitImpl renderKit =
+ (org.apache.myfaces.config.impl.digester.elements.RenderKitImpl)
facesConfig.getRenderKit(renderKitId);
if (renderKit == null)
{
- renderKit = new org.apache.myfaces.config.impl.digester.elements.RenderKit();
+ renderKit = new org.apache.myfaces.config.impl.digester.elements.RenderKitImpl();
renderKit.setId(renderKitId);
facesConfig.addRenderKit(renderKit);
}
- org.apache.myfaces.config.impl.digester.elements.ClientBehaviorRenderer cbr =
- new org.apache.myfaces.config.impl.digester.elements.ClientBehaviorRenderer();
+ org.apache.myfaces.config.impl.digester.elements.ClientBehaviorRendererImpl cbr =
+ new org.apache.myfaces.config.impl.digester.elements.ClientBehaviorRendererImpl();
cbr.setRendererType(facesBehaviorRenderer.rendererType());
cbr.setRendererClass(clazz.getName());
renderKit.addClientBehaviorRenderer(cbr);
@@ -535,7 +535,7 @@ public class AnnotationConfigurator
}
}
- private void handleFaceletsResourceResolver(FacesConfig facesConfig, Set<Class<?>> classes)
+ private void handleFaceletsResourceResolver(FacesConfigImpl facesConfig, Set<Class<?>> classes)
{
for (Class<?> clazz : classes)
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigDispenserImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigDispenserImpl.java?rev=1537800&r1=1537799&r2=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigDispenserImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigDispenserImpl.java Fri Nov 1 01:55:08 2013
@@ -90,8 +90,8 @@ public class DigesterFacesConfigDispense
private Map<String, Converter> converterConfigurationByClassName = new HashMap<String, Converter>();
- private Map<String, org.apache.myfaces.config.impl.digester.elements.RenderKit> renderKits
- = new LinkedHashMap<String, org.apache.myfaces.config.impl.digester.elements.RenderKit>();
+ private Map<String, org.apache.myfaces.config.impl.digester.elements.RenderKitImpl> renderKits
+ = new LinkedHashMap<String, org.apache.myfaces.config.impl.digester.elements.RenderKitImpl>();
private List<String> actionListeners = new ArrayList<String>();
private List<String> elResolvers = new ArrayList<String>();
@@ -242,11 +242,11 @@ public class DigesterFacesConfigDispense
renderKitId = RenderKitFactory.HTML_BASIC_RENDER_KIT;
}
- org.apache.myfaces.config.impl.digester.elements.RenderKit existing = renderKits.get(renderKitId);
+ org.apache.myfaces.config.impl.digester.elements.RenderKitImpl existing = renderKits.get(renderKitId);
if (existing == null)
{
- existing = new org.apache.myfaces.config.impl.digester.elements.RenderKit();
+ existing = new org.apache.myfaces.config.impl.digester.elements.RenderKitImpl();
existing.merge(renderKit);
renderKits.put(renderKitId, existing);
//renderKits.put(renderKitId, renderKit);
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java?rev=1537800&r1=1537799&r2=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java Fri Nov 1 01:55:08 2013
@@ -35,7 +35,7 @@ import org.apache.myfaces.config.element
/**
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
*/
-public class DigesterFacesConfigUnmarshallerImpl implements FacesConfigUnmarshaller<FacesConfig>
+public class DigesterFacesConfigUnmarshallerImpl implements FacesConfigUnmarshaller<FacesConfigImpl>
{
private Digester digester;
@@ -49,7 +49,7 @@ public class DigesterFacesConfigUnmarsha
//digester.setUseContextClassLoader(true);
digester.setClassLoader(ClassUtils.getContextClassLoader());
- digester.addObjectCreate("faces-config", FacesConfig.class);
+ digester.addObjectCreate("faces-config", FacesConfigImpl.class);
// 2.0 specific start
digester.addSetProperties("faces-config", "metadata-complete", "metadataComplete");
digester.addSetProperties("faces-config", "version", "version");
@@ -59,30 +59,30 @@ public class DigesterFacesConfigUnmarsha
digester.addCallMethod("faces-config/protected-views/url-pattern", "addProtectedViewUrlPattern", 0);
digester.addCallMethod("faces-config/name", "setName", 0);
- digester.addObjectCreate("faces-config/ordering", Ordering.class);
+ digester.addObjectCreate("faces-config/ordering", OrderingImpl.class);
digester.addSetNext("faces-config/ordering", "setOrdering");
- digester.addObjectCreate("faces-config/ordering/before/name", FacesConfigNameSlot.class);
+ digester.addObjectCreate("faces-config/ordering/before/name", FacesConfigNameSlotImpl.class);
digester.addSetNext("faces-config/ordering/before/name", "addBeforeSlot");
digester.addCallMethod("faces-config/ordering/before/name", "setName",0);
- digester.addObjectCreate("faces-config/ordering/before/others", ConfigOthersSlot.class);
+ digester.addObjectCreate("faces-config/ordering/before/others", ConfigOthersSlotImpl.class);
digester.addSetNext("faces-config/ordering/before/others", "addBeforeSlot");
- digester.addObjectCreate("faces-config/ordering/after/name", FacesConfigNameSlot.class);
+ digester.addObjectCreate("faces-config/ordering/after/name", FacesConfigNameSlotImpl.class);
digester.addSetNext("faces-config/ordering/after/name", "addAfterSlot");
digester.addCallMethod("faces-config/ordering/after/name", "setName",0);
- digester.addObjectCreate("faces-config/ordering/after/others", ConfigOthersSlot.class);
+ digester.addObjectCreate("faces-config/ordering/after/others", ConfigOthersSlotImpl.class);
digester.addSetNext("faces-config/ordering/after/others", "addAfterSlot");
- digester.addObjectCreate("faces-config/absolute-ordering", AbsoluteOrdering.class);
+ digester.addObjectCreate("faces-config/absolute-ordering", AbsoluteOrderingImpl.class);
digester.addSetNext("faces-config/absolute-ordering", "setAbsoluteOrdering");
- digester.addObjectCreate("faces-config/absolute-ordering/name", FacesConfigNameSlot.class);
+ digester.addObjectCreate("faces-config/absolute-ordering/name", FacesConfigNameSlotImpl.class);
digester.addSetNext("faces-config/absolute-ordering/name", "addOrderSlot");
digester.addCallMethod("faces-config/absolute-ordering/name", "setName",0);
- digester.addObjectCreate("faces-config/absolute-ordering/others", ConfigOthersSlot.class);
+ digester.addObjectCreate("faces-config/absolute-ordering/others", ConfigOthersSlotImpl.class);
digester.addSetNext("faces-config/absolute-ordering/others", "addOrderSlot");
// 2.0 config ordering name end
- digester.addObjectCreate("faces-config/application", Application.class);
+ digester.addObjectCreate("faces-config/application", ApplicationImpl.class);
digester.addSetNext("faces-config/application", "addApplication");
digester.addCallMethod("faces-config/application/action-listener", "addActionListener", 0);
digester.addCallMethod("faces-config/application/default-render-kit-id", "addDefaultRenderkitId", 0);
@@ -95,14 +95,14 @@ public class DigesterFacesConfigUnmarsha
digester.addCallMethod("faces-config/application/state-manager", "addStateManager", 0);
digester.addCallMethod("faces-config/application/property-resolver", "addPropertyResolver", 0);
digester.addCallMethod("faces-config/application/variable-resolver", "addVariableResolver", 0);
- digester.addObjectCreate("faces-config/application/locale-config", LocaleConfig.class);
+ digester.addObjectCreate("faces-config/application/locale-config", LocaleConfigImpl.class);
digester.addSetNext("faces-config/application/locale-config", "addLocaleConfig");
digester.addCallMethod("faces-config/application/locale-config/default-locale", "setDefaultLocale", 0);
digester.addCallMethod("faces-config/application/locale-config/supported-locale", "addSupportedLocale", 0);
// 1.2 specific start
digester.addCallMethod("faces-config/application/el-resolver", "addElResolver", 0);
- digester.addObjectCreate("faces-config/application/resource-bundle", ResourceBundle.class);
+ digester.addObjectCreate("faces-config/application/resource-bundle", ResourceBundleImpl.class);
digester.addSetNext("faces-config/application/resource-bundle", "addResourceBundle");
digester.addCallMethod("faces-config/application/resource-bundle/base-name", "setBaseName", 0);
digester.addCallMethod("faces-config/application/resource-bundle/var", "setVar", 0);
@@ -110,7 +110,7 @@ public class DigesterFacesConfigUnmarsha
// 1.2 specific end
// 2.0 specific start
- digester.addObjectCreate("faces-config/application/system-event-listener", SystemEventListener.class);
+ digester.addObjectCreate("faces-config/application/system-event-listener", SystemEventListenerImpl.class);
digester.addSetNext("faces-config/application/system-event-listener", "addSystemEventListener");
digester.addCallMethod("faces-config/application/system-event-listener/system-event-listener-class",
"setSystemEventListenerClass",0);
@@ -145,7 +145,7 @@ public class DigesterFacesConfigUnmarsha
digester.addCallMethod("faces-config/factory/flow-handler-factory", "addFlowHandlerFactory", 0);
// 2.2 specific end
- digester.addObjectCreate("faces-config/factory", Factory.class);
+ digester.addObjectCreate("faces-config/factory", FactoryImpl.class);
digester.addSetNext("faces-config/factory", "addFactory");
digester.addCallMethod("faces-config/factory/application-factory", "addApplicationFactory", 0);
digester.addCallMethod("faces-config/factory/faces-context-factory", "addFacesContextFactory", 0);
@@ -156,12 +156,12 @@ public class DigesterFacesConfigUnmarsha
digester.addCallParam("faces-config/component/component-type", 0);
digester.addCallParam("faces-config/component/component-class", 1);
- digester.addObjectCreate("faces-config/converter", Converter.class);
+ digester.addObjectCreate("faces-config/converter", ConverterImpl.class);
digester.addSetNext("faces-config/converter", "addConverter");
digester.addCallMethod("faces-config/converter/converter-id", "setConverterId", 0);
digester.addCallMethod("faces-config/converter/converter-for-class", "setForClass", 0);
digester.addCallMethod("faces-config/converter/converter-class", "setConverterClass", 0);
- digester.addObjectCreate("faces-config/converter/attribute", Attribute.class);
+ digester.addObjectCreate("faces-config/converter/attribute", AttributeImpl.class);
digester.addSetNext("faces-config/converter/attribute", "addAttribute");
digester.addCallMethod("faces-config/converter/attribute/description", "addDescription", 0);
digester.addCallMethod("faces-config/converter/attribute/display-name", "addDisplayName", 0);
@@ -171,7 +171,7 @@ public class DigesterFacesConfigUnmarsha
digester.addCallMethod("faces-config/converter/attribute/default-value", "setDefaultValue", 0);
digester.addCallMethod("faces-config/converter/attribute/suggested-value", "setSuggestedValue", 0);
digester.addCallMethod("faces-config/converter/attribute/attribute-extension", "addAttributeExtension", 0);
- digester.addObjectCreate("faces-config/converter/property", Property.class);
+ digester.addObjectCreate("faces-config/converter/property", PropertyImpl.class);
digester.addSetNext("faces-config/converter/property", "addProperty");
digester.addCallMethod("faces-config/converter/property/description", "addDescription", 0);
digester.addCallMethod("faces-config/converter/property/display-name", "addDisplayName", 0);
@@ -182,82 +182,83 @@ public class DigesterFacesConfigUnmarsha
digester.addCallMethod("faces-config/converter/property/suggested-value", "setSuggestedValue", 0);
digester.addCallMethod("faces-config/converter/property/property-extension", "addPropertyExtension", 0);
- digester.addObjectCreate("faces-config/managed-bean", ManagedBean.class);
+ digester.addObjectCreate("faces-config/managed-bean", ManagedBeanImpl.class);
digester.addSetProperties("faces-config/managed-bean", "eager", "eager");
digester.addSetNext("faces-config/managed-bean", "addManagedBean");
digester.addCallMethod("faces-config/managed-bean/description", "setDescription", 0);
digester.addCallMethod("faces-config/managed-bean/managed-bean-name", "setName", 0);
digester.addCallMethod("faces-config/managed-bean/managed-bean-class", "setBeanClass", 0);
digester.addCallMethod("faces-config/managed-bean/managed-bean-scope", "setScope", 0);
- digester.addObjectCreate("faces-config/managed-bean/managed-property", ManagedProperty.class);
+ digester.addObjectCreate("faces-config/managed-bean/managed-property", ManagedPropertyImpl.class);
digester.addSetNext("faces-config/managed-bean/managed-property", "addProperty");
digester.addCallMethod("faces-config/managed-bean/managed-property/property-name", "setPropertyName", 0);
digester.addCallMethod("faces-config/managed-bean/managed-property/property-class", "setPropertyClass", 0);
digester.addCallMethod("faces-config/managed-bean/managed-property/null-value", "setNullValue");
digester.addCallMethod("faces-config/managed-bean/managed-property/value", "setValue", 0);
- digester.addObjectCreate("faces-config/managed-bean/managed-property/map-entries", MapEntries.class);
+ digester.addObjectCreate("faces-config/managed-bean/managed-property/map-entries", MapEntriesImpl.class);
digester.addSetNext("faces-config/managed-bean/managed-property/map-entries", "setMapEntries");
digester.addCallMethod("faces-config/managed-bean/managed-property/map-entries/key-class", "setKeyClass", 0);
digester.addCallMethod("faces-config/managed-bean/managed-property/map-entries/value-class",
"setValueClass", 0);
digester.addObjectCreate("faces-config/managed-bean/managed-property/map-entries/map-entry",
- MapEntries.Entry.class);
+ MapEntriesImpl.Entry.class);
digester.addSetNext("faces-config/managed-bean/managed-property/map-entries/map-entry", "addEntry");
digester.addCallMethod("faces-config/managed-bean/managed-property/map-entries/map-entry/key", "setKey", 0);
digester.addCallMethod("faces-config/managed-bean/managed-property/map-entries/map-entry/null-value",
"setNullValue");
digester.addCallMethod("faces-config/managed-bean/managed-property/map-entries/map-entry/value", "setValue", 0);
- digester.addObjectCreate("faces-config/managed-bean/managed-property/list-entries", ListEntries.class);
+ digester.addObjectCreate("faces-config/managed-bean/managed-property/list-entries", ListEntriesImpl.class);
digester.addSetNext("faces-config/managed-bean/managed-property/list-entries", "setListEntries");
digester.addCallMethod("faces-config/managed-bean/managed-property/list-entries/value-class", "setValueClass",
0);
digester.addObjectCreate("faces-config/managed-bean/managed-property/list-entries/null-value",
- ListEntries.Entry.class);
+ ListEntriesImpl.Entry.class);
digester.addSetNext("faces-config/managed-bean/managed-property/list-entries/null-value", "addEntry");
digester.addCallMethod("faces-config/managed-bean/managed-property/list-entries/null-value", "setNullValue");
digester.addObjectCreate("faces-config/managed-bean/managed-property/list-entries/value",
- ListEntries.Entry.class);
+ ListEntriesImpl.Entry.class);
digester.addSetNext("faces-config/managed-bean/managed-property/list-entries/value", "addEntry");
digester.addCallMethod("faces-config/managed-bean/managed-property/list-entries/value", "setValue", 0);
- digester.addObjectCreate("faces-config/managed-bean/map-entries", MapEntries.class);
+ digester.addObjectCreate("faces-config/managed-bean/map-entries", MapEntriesImpl.class);
digester.addSetNext("faces-config/managed-bean/map-entries", "setMapEntries");
digester.addCallMethod("faces-config/managed-bean/map-entries/key-class", "setKeyClass", 0);
digester.addCallMethod("faces-config/managed-bean/map-entries/value-class", "setValueClass", 0);
- digester.addObjectCreate("faces-config/managed-bean/map-entries/map-entry", MapEntries.Entry.class);
+ digester.addObjectCreate("faces-config/managed-bean/map-entries/map-entry", MapEntriesImpl.Entry.class);
digester.addSetNext("faces-config/managed-bean/map-entries/map-entry", "addEntry");
digester.addCallMethod("faces-config/managed-bean/map-entries/map-entry/key", "setKey", 0);
digester.addCallMethod("faces-config/managed-bean/map-entries/map-entry/null-value", "setNullValue");
digester.addCallMethod("faces-config/managed-bean/map-entries/map-entry/value", "setValue", 0);
- digester.addObjectCreate("faces-config/managed-bean/list-entries", ListEntries.class);
+ digester.addObjectCreate("faces-config/managed-bean/list-entries", ListEntriesImpl.class);
digester.addSetNext("faces-config/managed-bean/list-entries", "setListEntries");
digester.addCallMethod("faces-config/managed-bean/list-entries/value-class", "setValueClass", 0);
- digester.addObjectCreate("faces-config/managed-bean/list-entries/null-value", ListEntries.Entry.class);
+ digester.addObjectCreate("faces-config/managed-bean/list-entries/null-value", ListEntriesImpl.Entry.class);
digester.addSetNext("faces-config/managed-bean/list-entries/null-value", "addEntry");
digester.addCallMethod("faces-config/managed-bean/list-entries/null-value", "setNullValue");
- digester.addObjectCreate("faces-config/managed-bean/list-entries/value", ListEntries.Entry.class);
+ digester.addObjectCreate("faces-config/managed-bean/list-entries/value", ListEntriesImpl.Entry.class);
digester.addSetNext("faces-config/managed-bean/list-entries/value", "addEntry");
digester.addCallMethod("faces-config/managed-bean/list-entries/value", "setValue", 0);
- digester.addObjectCreate("faces-config/navigation-rule", NavigationRule.class);
+ digester.addObjectCreate("faces-config/navigation-rule", NavigationRuleImpl.class);
digester.addSetNext("faces-config/navigation-rule", "addNavigationRule");
digester.addCallMethod("faces-config/navigation-rule/from-view-id", "setFromViewId", 0);
- digester.addObjectCreate("faces-config/navigation-rule/navigation-case", NavigationCase.class);
+ digester.addObjectCreate("faces-config/navigation-rule/navigation-case", NavigationCaseImpl.class);
digester.addSetNext("faces-config/navigation-rule/navigation-case", "addNavigationCase");
digester.addCallMethod("faces-config/navigation-rule/navigation-case/from-action", "setFromAction", 0);
digester.addCallMethod("faces-config/navigation-rule/navigation-case/from-outcome", "setFromOutcome", 0);
digester.addCallMethod("faces-config/navigation-rule/navigation-case/if", "setIf", 0);
digester.addCallMethod("faces-config/navigation-rule/navigation-case/to-view-id", "setToViewId", 0);
- digester.addObjectCreate("faces-config/navigation-rule/navigation-case/redirect", Redirect.class);
+ digester.addObjectCreate("faces-config/navigation-rule/navigation-case/redirect", RedirectImpl.class);
digester.addSetProperties("faces-config/navigation-rule/navigation-case/redirect", "include-view-params",
"includeViewParams");
digester.addSetNext("faces-config/navigation-rule/navigation-case/redirect", "setRedirect");
- digester.addObjectCreate("faces-config/navigation-rule/navigation-case/redirect/view-param", ViewParam.class);
+ digester.addObjectCreate("faces-config/navigation-rule/navigation-case/redirect/view-param",
+ ViewParamImpl.class);
digester.addSetNext("faces-config/navigation-rule/navigation-case/redirect/view-param", "addViewParam");
digester.addCallMethod("faces-config/navigation-rule/navigation-case/redirect/view-param/name", "setName",0);
digester.addCallMethod("faces-config/navigation-rule/navigation-case/redirect/view-param/value", "setValue",0);
digester.addObjectCreate("faces-config/navigation-rule/navigation-case/redirect/redirect-param",
- ViewParam.class);
+ ViewParamImpl.class);
digester.addSetNext("faces-config/navigation-rule/navigation-case/redirect/redirect-param",
"addViewParam");
digester.addCallMethod("faces-config/navigation-rule/navigation-case/redirect/redirect-param/name",
@@ -265,17 +266,17 @@ public class DigesterFacesConfigUnmarsha
digester.addCallMethod("faces-config/navigation-rule/navigation-case/redirect/redirect-param/value",
"setValue",0);
- digester.addObjectCreate("faces-config/render-kit", RenderKit.class);
+ digester.addObjectCreate("faces-config/render-kit", RenderKitImpl.class);
digester.addSetNext("faces-config/render-kit", "addRenderKit");
digester.addCallMethod("faces-config/render-kit/render-kit-id", "setId", 0);
//digester.addCallMethod("faces-config/render-kit/render-kit-class", "setRenderKitClass", 0);
digester.addCallMethod("faces-config/render-kit/render-kit-class", "addRenderKitClass", 0);
- digester.addObjectCreate("faces-config/render-kit/renderer", Renderer.class);
+ digester.addObjectCreate("faces-config/render-kit/renderer", RendererImpl.class);
digester.addSetNext("faces-config/render-kit/renderer", "addRenderer");
digester.addCallMethod("faces-config/render-kit/renderer/component-family", "setComponentFamily", 0);
digester.addCallMethod("faces-config/render-kit/renderer/renderer-type", "setRendererType", 0);
digester.addCallMethod("faces-config/render-kit/renderer/renderer-class", "setRendererClass", 0);
- digester.addObjectCreate("faces-config/render-kit/client-behavior-renderer", ClientBehaviorRenderer.class);
+ digester.addObjectCreate("faces-config/render-kit/client-behavior-renderer", ClientBehaviorRendererImpl.class);
digester.addSetNext("faces-config/render-kit/client-behavior-renderer", "addClientBehaviorRenderer");
digester.addCallMethod("faces-config/render-kit/client-behavior-renderer/client-behavior-renderer-type",
"setRendererType", 0);
@@ -287,7 +288,7 @@ public class DigesterFacesConfigUnmarsha
digester.addSetNext("faces-config/behavior", "addBehavior");
digester.addCallMethod("faces-config/behavior/behavior-id", "setBehaviorId", 0);
digester.addCallMethod("faces-config/behavior/behavior-class", "setBehaviorClass", 0);
- digester.addObjectCreate("faces-config/behavior/attribute", Attribute.class);
+ digester.addObjectCreate("faces-config/behavior/attribute", AttributeImpl.class);
digester.addSetNext("faces-config/behavior/attribute", "addAttribute");
digester.addCallMethod("faces-config/behavior/attribute/description", "addDescription", 0);
digester.addCallMethod("faces-config/behavior/attribute/display-name", "addDisplayName", 0);
@@ -297,7 +298,7 @@ public class DigesterFacesConfigUnmarsha
digester.addCallMethod("faces-config/behavior/attribute/default-value", "setDefaultValue", 0);
digester.addCallMethod("faces-config/behavior/attribute/suggested-value", "setSuggestedValue", 0);
digester.addCallMethod("faces-config/behavior/attribute/attribute-extension", "addAttributeExtension", 0);
- digester.addObjectCreate("faces-config/behavior/property", Property.class);
+ digester.addObjectCreate("faces-config/behavior/property", PropertyImpl.class);
digester.addSetNext("faces-config/behavior/property", "addProperty");
digester.addCallMethod("faces-config/behavior/property/description", "addDescription", 0);
digester.addCallMethod("faces-config/behavior/property/display-name", "addDisplayName", 0);
@@ -318,7 +319,8 @@ public class DigesterFacesConfigUnmarsha
// 2.1 facelets-processing start
digester.addObjectCreate("faces-config/faces-config-extension", FacesConfigExtension.class);
digester.addSetNext("faces-config/faces-config-extension", "addFacesConfigExtension");
- digester.addObjectCreate("faces-config/faces-config-extension/facelets-processing", FaceletsProcessing.class);
+ digester.addObjectCreate("faces-config/faces-config-extension/facelets-processing",
+ FaceletsProcessingImpl.class);
digester.addSetNext("faces-config/faces-config-extension/facelets-processing", "addFaceletsProcessing");
digester.addCallMethod("faces-config/faces-config-extension/facelets-processing/file-extension",
"setFileExtension", 0);
@@ -337,7 +339,7 @@ public class DigesterFacesConfigUnmarsha
private void addNavigationRules(ExternalContext externalContext, String prefix, String method)
{
- digester.addObjectCreate(prefix, NavigationRule.class);
+ digester.addObjectCreate(prefix, NavigationRuleImpl.class);
digester.addSetNext(prefix, method);
digester.addCallMethod(prefix+"/from-view-id", "setFromViewId", 0);
addNavigationCases(externalContext, prefix+"/navigation-case", "addNavigationCase");
@@ -345,22 +347,22 @@ public class DigesterFacesConfigUnmarsha
private void addNavigationCases(ExternalContext externalContext, String prefix, String method)
{
- digester.addObjectCreate(prefix, NavigationCase.class);
+ digester.addObjectCreate(prefix, NavigationCaseImpl.class);
digester.addSetNext(prefix, method);
digester.addCallMethod(prefix+"/from-action", "setFromAction", 0);
digester.addCallMethod(prefix+"/from-outcome", "setFromOutcome", 0);
digester.addCallMethod(prefix+"/if", "setIf", 0);
digester.addCallMethod(prefix+"/to-view-id", "setToViewId", 0);
- digester.addObjectCreate(prefix+"/redirect", Redirect.class);
+ digester.addObjectCreate(prefix+"/redirect", RedirectImpl.class);
digester.addSetProperties(prefix+"/redirect", "include-view-params",
"includeViewParams");
digester.addSetNext(prefix+"/redirect", "setRedirect");
- digester.addObjectCreate(prefix+"/redirect/view-param", ViewParam.class);
+ digester.addObjectCreate(prefix+"/redirect/view-param", ViewParamImpl.class);
digester.addSetNext(prefix+"/redirect/view-param", "addViewParam");
digester.addCallMethod(prefix+"/redirect/view-param/name", "setName",0);
digester.addCallMethod(prefix+"/redirect/view-param/value", "setValue",0);
- digester.addObjectCreate(prefix+"/redirect/redirect-param", ViewParam.class);
+ digester.addObjectCreate(prefix+"/redirect/redirect-param", ViewParamImpl.class);
digester.addSetNext(prefix+"/redirect/redirect-param", "addViewParam");
digester.addCallMethod(prefix+"/redirect/redirect-param/name", "setName",0);
digester.addCallMethod(prefix+"/redirect/redirect-param/value", "setValue",0);
@@ -387,7 +389,7 @@ public class DigesterFacesConfigUnmarsha
digester.addSetProperties("faces-config/flow-definition/switch", "id", "id");
digester.addObjectCreate("faces-config/flow-definition/switch/default-outcome",
- NavigationCase.class);
+ NavigationCaseImpl.class);
digester.addSetNext("faces-config/flow-definition/switch/default-outcome",
"setDefaultOutcome");
digester.addCallMethod("faces-config/flow-definition/switch/default-outcome",
@@ -400,7 +402,7 @@ public class DigesterFacesConfigUnmarsha
digester.addSetNext("faces-config/flow-definition/flow-return", "addReturn");
digester.addSetProperties("faces-config/flow-definition/flow-return", "id", "id");
digester.addObjectCreate("faces-config/flow-definition/flow-return/from-outcome",
- NavigationCase.class);
+ NavigationCaseImpl.class);
digester.addSetNext("faces-config/flow-definition/flow-return/from-outcome",
"setNavigationCase");
digester.addCallMethod("faces-config/flow-definition/flow-return/from-outcome",
@@ -443,7 +445,7 @@ public class DigesterFacesConfigUnmarsha
digester.addCallMethod("faces-config/flow-definition/inbound-parameter/value", "setValue", 0);
}
- private void postProcessFacesConfig(String systemId, FacesConfig config)
+ private void postProcessFacesConfig(String systemId, FacesConfigImpl config)
{
for (org.apache.myfaces.config.element.Application application : config.getApplications())
{
@@ -477,26 +479,26 @@ public class DigesterFacesConfigUnmarsha
}
}
- public FacesConfig getFacesConfig(InputStream in, String systemId) throws IOException, SAXException
+ public FacesConfigImpl getFacesConfig(InputStream in, String systemId) throws IOException, SAXException
{
InputSource is = new InputSource(in);
is.setSystemId(systemId);
// Fix for http://issues.apache.org/jira/browse/MYFACES-236
- FacesConfig config = (FacesConfig) digester.parse(is);
+ FacesConfigImpl config = (FacesConfigImpl) digester.parse(is);
postProcessFacesConfig(systemId, config);
return config;
}
- public FacesConfig getFacesConfig(Reader r) throws IOException, SAXException
+ public FacesConfigImpl getFacesConfig(Reader r) throws IOException, SAXException
{
//InputSource is = new InputSource(in);
//is.setSystemId(systemId);
// Fix for http://issues.apache.org/jira/browse/MYFACES-236
- FacesConfig config = (FacesConfig) digester.parse(r);
+ FacesConfigImpl config = (FacesConfigImpl) digester.parse(r);
postProcessFacesConfig(null, config);
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/AbsoluteOrderingImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/AbsoluteOrdering.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/AbsoluteOrderingImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/AbsoluteOrderingImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/AbsoluteOrdering.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/AbsoluteOrdering.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/AbsoluteOrderingImpl.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 AbsoluteOrdering extends org.apache.myfaces.config.element.AbsoluteOrdering implements Serializable
+public class AbsoluteOrderingImpl extends org.apache.myfaces.config.element.AbsoluteOrdering implements Serializable
{
private List<org.apache.myfaces.config.element.OrderSlot> orderList =
new ArrayList<org.apache.myfaces.config.element.OrderSlot>();
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ApplicationImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Application.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ApplicationImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ApplicationImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Application.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Application.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ApplicationImpl.java Fri Nov 1 01:55:08 2013
@@ -26,7 +26,7 @@ import org.apache.myfaces.config.element
/**
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
*/
-public class Application extends org.apache.myfaces.config.element.Application implements Serializable
+public class ApplicationImpl extends org.apache.myfaces.config.element.Application implements Serializable
{
private final List<String> actionListener = new ArrayList<String>();
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/AttributeImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Attribute.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/AttributeImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/AttributeImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Attribute.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Attribute.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/AttributeImpl.java Fri Nov 1 01:55:08 2013
@@ -39,7 +39,7 @@ attribute-class, default-value?, suggest
* <p/>
*/
-public class Attribute extends org.apache.myfaces.config.element.Attribute implements Serializable
+public class AttributeImpl extends org.apache.myfaces.config.element.Attribute implements Serializable
{
private List<String> _description;
private List<String> _displayName;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Behavior.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Behavior.java?rev=1537800&r1=1537799&r2=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Behavior.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Behavior.java Fri Nov 1 01:55:08 2013
@@ -31,8 +31,8 @@ public class Behavior extends org.apache
private String behaviorClass;
private String behaviorId;
- private List<Attribute> attributes = new ArrayList<Attribute>();
- private List<Property> properties = new ArrayList<Property>();
+ private List<AttributeImpl> attributes = new ArrayList<AttributeImpl>();
+ private List<PropertyImpl> properties = new ArrayList<PropertyImpl>();
// TODO: what about extensions and descriptionGroup elems? Not addressed in other
// config objects either.
@@ -56,22 +56,22 @@ public class Behavior extends org.apache
this.behaviorId = behaviorId;
}
- public Collection<Attribute> getAttributes ()
+ public Collection<AttributeImpl> getAttributes ()
{
return attributes;
}
- public void addAttribute (Attribute attribute)
+ public void addAttribute (AttributeImpl attribute)
{
attributes.add (attribute);
}
- public Collection<Property> getProperties ()
+ public Collection<PropertyImpl> getProperties ()
{
return properties;
}
- public void addProperty (Property property)
+ public void addProperty (PropertyImpl property)
{
properties.add (property);
}
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ClientBehaviorRendererImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ClientBehaviorRenderer.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ClientBehaviorRendererImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ClientBehaviorRendererImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ClientBehaviorRenderer.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ClientBehaviorRenderer.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ClientBehaviorRendererImpl.java Fri Nov 1 01:55:08 2013
@@ -24,7 +24,7 @@ import java.io.Serializable;
* Config holder for <client-behavior-renderer> element.
*/
-public class ClientBehaviorRenderer
+public class ClientBehaviorRendererImpl
extends org.apache.myfaces.config.element.ClientBehaviorRenderer
implements Serializable
{
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ComponentImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Component.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ComponentImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ComponentImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Component.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Component.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ComponentImpl.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 Component extends org.apache.myfaces.config.element.Component implements Serializable
+public class ComponentImpl extends org.apache.myfaces.config.element.Component implements Serializable
{
private String componentType;
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ConfigOthersSlotImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ConfigOthersSlot.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ConfigOthersSlotImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ConfigOthersSlotImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ConfigOthersSlot.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ConfigOthersSlot.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ConfigOthersSlotImpl.java Fri Nov 1 01:55:08 2013
@@ -20,7 +20,7 @@ package org.apache.myfaces.config.impl.d
import java.io.Serializable;
-public class ConfigOthersSlot extends org.apache.myfaces.config.element.ConfigOthersSlot implements Serializable
+public class ConfigOthersSlotImpl extends org.apache.myfaces.config.element.ConfigOthersSlot implements Serializable
{
}
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ConverterImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Converter.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ConverterImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ConverterImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Converter.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Converter.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ConverterImpl.java Fri Nov 1 01:55:08 2013
@@ -28,7 +28,7 @@ import java.util.List;
/**
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
*/
-public class Converter extends org.apache.myfaces.config.element.Converter implements Serializable
+public class ConverterImpl extends org.apache.myfaces.config.element.Converter implements Serializable
{
private String converterId;
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FaceletsProcessingImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FaceletsProcessing.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FaceletsProcessingImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FaceletsProcessingImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FaceletsProcessing.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FaceletsProcessing.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FaceletsProcessingImpl.java Fri Nov 1 01:55:08 2013
@@ -23,7 +23,7 @@ package org.apache.myfaces.config.impl.d
* @author Leonardo Uribe
* @since 2.1.0
*/
-public class FaceletsProcessing extends org.apache.myfaces.config.element.FaceletsProcessing
+public class FaceletsProcessingImpl extends org.apache.myfaces.config.element.FaceletsProcessing
{
/**
*
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigImpl.java (from r1537798, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfig.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfig.java&r1=1537798&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfig.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigImpl.java Fri Nov 1 01:55:08 2013
@@ -31,7 +31,7 @@ import org.apache.myfaces.config.element
/**
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
*/
-public class FacesConfig extends org.apache.myfaces.config.element.FacesConfig implements Serializable
+public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConfig implements Serializable
{
private List<org.apache.myfaces.config.element.Application> applications
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigNameSlotImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigNameSlot.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigNameSlotImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigNameSlotImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigNameSlot.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigNameSlot.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigNameSlotImpl.java Fri Nov 1 01:55:08 2013
@@ -20,7 +20,8 @@ package org.apache.myfaces.config.impl.d
import java.io.Serializable;
-public class FacesConfigNameSlot extends org.apache.myfaces.config.element.FacesConfigNameSlot implements Serializable
+public class FacesConfigNameSlotImpl extends org.apache.myfaces.config.element.FacesConfigNameSlot
+ implements Serializable
{
private String name;
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FactoryImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Factory.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FactoryImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FactoryImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Factory.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Factory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FactoryImpl.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 Factory extends org.apache.myfaces.config.element.Factory implements Serializable
+public class FactoryImpl extends org.apache.myfaces.config.element.Factory implements Serializable
{
private List<String> applicationFactories = new ArrayList<String>();
private List<String> exceptionHandlerFactories = new ArrayList<String>();
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ListEntriesImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ListEntries.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ListEntriesImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ListEntriesImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ListEntries.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ListEntries.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ListEntriesImpl.java Fri Nov 1 01:55:08 2013
@@ -27,7 +27,7 @@ import java.util.Iterator;
/**
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
*/
-public class ListEntries extends org.apache.myfaces.config.element.ListEntries implements Serializable
+public class ListEntriesImpl extends org.apache.myfaces.config.element.ListEntries implements Serializable
{
private String valueClass;
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/LocaleConfigImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/LocaleConfig.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/LocaleConfigImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/LocaleConfigImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/LocaleConfig.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/LocaleConfig.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/LocaleConfigImpl.java Fri Nov 1 01:55:08 2013
@@ -26,7 +26,7 @@ import java.util.List;
/**
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
*/
-public class LocaleConfig extends org.apache.myfaces.config.element.LocaleConfig implements Serializable
+public class LocaleConfigImpl extends org.apache.myfaces.config.element.LocaleConfig implements Serializable
{
private String defaultLocale;
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBeanImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBeanImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBeanImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBeanImpl.java Fri Nov 1 01:55:08 2013
@@ -33,7 +33,7 @@ import org.apache.myfaces.view.facelets.
/**
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
*/
-public class ManagedBean extends org.apache.myfaces.config.element.ManagedBean implements Serializable
+public class ManagedBeanImpl extends org.apache.myfaces.config.element.ManagedBean implements Serializable
{
private String description;
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedPropertyImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedProperty.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedPropertyImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedPropertyImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedProperty.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedProperty.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedPropertyImpl.java Fri Nov 1 01:55:08 2013
@@ -32,7 +32,7 @@ import org.apache.myfaces.util.Container
*
* @version $Revision$ $Date$
*/
-public class ManagedProperty extends org.apache.myfaces.config.element.ManagedProperty implements Serializable
+public class ManagedPropertyImpl extends org.apache.myfaces.config.element.ManagedProperty implements Serializable
{
private static final ValueBinding DUMMY_VB = new DummyValueBinding();
@@ -65,7 +65,7 @@ public class ManagedProperty extends org
return _listEntries;
}
- public void setListEntries(ListEntries listEntries)
+ public void setListEntries(ListEntriesImpl listEntries)
{
_listEntries = listEntries;
_type = TYPE_LIST;
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/MapEntriesImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/MapEntries.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/MapEntriesImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/MapEntriesImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/MapEntries.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/MapEntries.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/MapEntriesImpl.java Fri Nov 1 01:55:08 2013
@@ -27,7 +27,7 @@ import java.util.Iterator;
/**
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
*/
-public class MapEntries extends org.apache.myfaces.config.element.MapEntries implements Serializable
+public class MapEntriesImpl extends org.apache.myfaces.config.element.MapEntries implements Serializable
{
private String keyClass;
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NamedEventImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NamedEvent.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NamedEventImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NamedEventImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NamedEvent.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NamedEvent.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NamedEventImpl.java Fri Nov 1 01:55:08 2013
@@ -20,12 +20,12 @@ package org.apache.myfaces.config.impl.d
import java.io.Serializable;
-public class NamedEvent extends org.apache.myfaces.config.element.NamedEvent implements Serializable
+public class NamedEventImpl extends org.apache.myfaces.config.element.NamedEvent implements Serializable
{
private String shortName;
private String eventClass;
- public NamedEvent()
+ public NamedEventImpl()
{
super();
}
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationCaseImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationCase.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationCaseImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationCaseImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationCase.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationCase.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationCaseImpl.java Fri Nov 1 01:55:08 2013
@@ -27,7 +27,7 @@ import java.io.Serializable;
/**
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
*/
-public class NavigationCase extends org.apache.myfaces.config.element.NavigationCase implements Serializable
+public class NavigationCaseImpl extends org.apache.myfaces.config.element.NavigationCase implements Serializable
{
private String fromAction;
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationRuleImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationRule.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationRuleImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationRuleImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationRule.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationRule.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationRuleImpl.java Fri Nov 1 01:55:08 2013
@@ -26,7 +26,7 @@ import java.util.List;
/**
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
*/
-public class NavigationRule extends org.apache.myfaces.config.element.NavigationRule implements Serializable
+public class NavigationRuleImpl extends org.apache.myfaces.config.element.NavigationRule implements Serializable
{
private String fromViewId;
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/OrderSlotImpl.java (from r1536002, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/OrderSlot.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/OrderSlotImpl.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/OrderSlotImpl.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/OrderSlot.java&r1=1536002&r2=1537800&rev=1537800&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/OrderSlot.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/OrderSlotImpl.java Fri Nov 1 01:55:08 2013
@@ -20,7 +20,7 @@ package org.apache.myfaces.config.impl.d
import java.io.Serializable;
-public class OrderSlot extends org.apache.myfaces.config.element.OrderSlot implements Serializable
+public class OrderSlotImpl extends org.apache.myfaces.config.element.OrderSlot implements Serializable
{
}