You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2019/05/14 09:48:33 UTC
[myfaces] branch master updated: removed digester
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/master by this push:
new b05a202 removed digester
b05a202 is described below
commit b05a202336e02f1e48d5064dddfebebd44705d3c
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Tue May 14 11:48:26 2019 +0200
removed digester
---
bundle/pom.xml | 5 +-
impl/pom.xml | 5 -
.../config/DefaultFacesConfigurationMerger.java | 4 +-
.../config/DefaultFacesConfigurationProvider.java | 32 +-
.../apache/myfaces/config/FacesConfigurator.java | 8 +-
.../config/annotation/AnnotationConfigurator.java | 34 +-
...nserImpl.java => FacesConfigDispenserImpl.java} | 8 +-
...rImpl.java => FacesConfigUnmarshallerImpl.java} | 79 ++--
.../DigesterFacesConfigUnmarshallerImpl.java | 469 ---------------------
.../elements/AbsoluteOrderingImpl.java | 2 +-
.../{digester => }/elements/ApplicationImpl.java | 2 +-
.../{digester => }/elements/AttributeImpl.java | 2 +-
.../impl/{digester => }/elements/BehaviorImpl.java | 2 +-
.../elements/ClientBehaviorRendererImpl.java | 2 +-
.../{digester => }/elements/ComponentImpl.java | 2 +-
.../elements/ComponentTagDeclarationImpl.java | 2 +-
.../elements/ConfigOthersSlotImpl.java | 2 +-
.../elements/ContractMappingImpl.java | 2 +-
.../{digester => }/elements/ConverterImpl.java | 2 +-
.../elements/FaceletsProcessingImpl.java | 2 +-
.../elements/FaceletsTemplateMappingImpl.java | 2 +-
.../impl/{digester => }/elements/FacesConfig.java | 2 +-
.../elements/FacesConfigExtensionImpl.java | 2 +-
.../{digester => }/elements/FacesConfigImpl.java | 2 +-
.../elements/FacesConfigNameSlotImpl.java | 2 +-
.../{digester => }/elements/FacesFlowCallImpl.java | 2 +-
.../elements/FacesFlowDefinitionImpl.java | 2 +-
.../elements/FacesFlowMethodCallImpl.java | 2 +-
.../elements/FacesFlowMethodParameterImpl.java | 2 +-
.../elements/FacesFlowParameterImpl.java | 2 +-
.../elements/FacesFlowReferenceImpl.java | 2 +-
.../elements/FacesFlowReturnImpl.java | 2 +-
.../elements/FacesFlowSwitchImpl.java | 2 +-
.../{digester => }/elements/FacesFlowViewImpl.java | 2 +-
.../impl/{digester => }/elements/FactoryImpl.java | 2 +-
.../{digester => }/elements/ListEntriesImpl.java | 2 +-
.../{digester => }/elements/LocaleConfigImpl.java | 2 +-
.../{digester => }/elements/MapEntriesImpl.java | 2 +-
.../{digester => }/elements/NamedEventImpl.java | 2 +-
.../elements/NavigationCaseImpl.java | 2 +-
.../elements/NavigationRuleImpl.java | 2 +-
.../{digester => }/elements/OrderSlotImpl.java | 2 +-
.../impl/{digester => }/elements/OrderingImpl.java | 2 +-
.../impl/{digester => }/elements/PropertyImpl.java | 2 +-
.../impl/{digester => }/elements/RedirectImpl.java | 2 +-
.../{digester => }/elements/RenderKitImpl.java | 2 +-
.../impl/{digester => }/elements/RendererImpl.java | 2 +-
.../elements/ResourceBundleImpl.java | 2 +-
.../elements/SystemEventListenerImpl.java | 2 +-
.../{digester => }/elements/ViewParamImpl.java | 2 +-
.../elements/ViewPoolMappingImpl.java | 2 +-
.../elements/ViewPoolParameterImpl.java | 2 +-
.../elements/facelets/FaceletBehaviorTagImpl.java | 2 +-
.../elements/facelets/FaceletComponentTagImpl.java | 2 +-
.../elements/facelets/FaceletConverterTagImpl.java | 2 +-
.../elements/facelets/FaceletFunctionImpl.java | 2 +-
.../elements/facelets/FaceletHandlerTagImpl.java | 2 +-
.../elements/facelets/FaceletSourceTagImpl.java | 2 +-
.../elements/facelets/FaceletTagImpl.java | 2 +-
.../elements/facelets/FaceletTagLibraryImpl.java | 2 +-
.../elements/facelets/FaceletValidatorTagImpl.java | 2 +-
.../compiler/TagLibraryConfigUnmarshallerImpl.java | 18 +-
.../application/NavigationHandlerImplTest.java | 10 +-
.../config/FacesConfigValidatorTestCase.java | 10 +-
.../myfaces/config/OrderingFacesConfigTest.java | 70 +--
...t.java => FacesConfigUnmarshallerImplTest.java} | 12 +-
.../myfaces/test/core/AbstractMyFacesTestCase.java | 2 +-
.../test/core/runner/AbstractJsfTestContainer.java | 2 +-
.../facelets/FaceletMultipleRequestsTestCase.java | 8 +-
.../myfaces/view/facelets/FaceletTestCase.java | 8 +-
.../compiler/JSPXFaceletsProcessingTestCase.java | 2 +-
.../compiler/XHTMLFaceletsProcessingTestCase.java | 2 +-
.../compiler/XMLFaceletsProcessingTestCase.java | 2 +-
parent/pom.xml | 6 -
test/pom.xml | 5 +-
75 files changed, 211 insertions(+), 694 deletions(-)
diff --git a/bundle/pom.xml b/bundle/pom.xml
index 0f581ae..08db5fa 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -59,8 +59,8 @@
org.apache.myfaces.config.annotation;version="${project.version}",
org.apache.myfaces.config.element;version="${project.version}",
org.apache.myfaces.config.element.facelets;version="${project.version}",
- org.apache.myfaces.config.impl.digester.elements;version="${project.version}",
- org.apache.myfaces.config.impl.digester.elements.facelets;version="${project.version}",
+ org.apache.myfaces.config.impl.elements;version="${project.version}",
+ org.apache.myfaces.config.impl.elements.facelets;version="${project.version}",
org.apache.myfaces.flow;version="${project.version}",
org.apache.myfaces.flow.builder;version="${project.version}",
org.apache.myfaces.flow.cdi;version="${project.version}",
@@ -98,7 +98,6 @@
javax.xml.parsers,
org.apache;resolution:=optional,
org.apache.commons.beanutils;version="[1.8.3, 2.0.0)",
- org.apache.commons.digester;version="[1.8.0, 2.0.0)",
org.apache.commons.logging;version="[1.1.1, 2.0.0)",
org.w3c.dom,
org.xml.sax,
diff --git a/impl/pom.xml b/impl/pom.xml
index 3e5f84e..a8d5463 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -696,7 +696,6 @@
javax.xml.parsers,
org.apache;resolution:=optional,
org.apache.commons.beanutils;version="[1.8.3, 2.0.0)",
- org.apache.commons.digester;version="[1.8.0, 2.0.0)",
org.apache.commons.logging;version="[1.1.1, 2.0.0)",
org.w3c.dom,
org.xml.sax,
@@ -1063,10 +1062,6 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- </dependency>
<!-- tomcat 7 support (LifecycleProvider) -->
<dependency>
diff --git a/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationMerger.java b/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationMerger.java
index 3f4cdf9..44b4da1 100644
--- a/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationMerger.java
+++ b/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationMerger.java
@@ -24,7 +24,7 @@ import org.apache.myfaces.config.element.FacesConfigData;
import org.apache.myfaces.config.element.FacesConfigNameSlot;
import org.apache.myfaces.config.element.OrderSlot;
import org.apache.myfaces.config.element.Ordering;
-import org.apache.myfaces.config.impl.digester.DigesterFacesConfigDispenserImpl;
+import org.apache.myfaces.config.impl.FacesConfigDispenserImpl;
import org.apache.myfaces.config.util.CyclicDependencyException;
import org.apache.myfaces.config.util.DirectedAcyclicGraphVerifier;
import org.apache.myfaces.config.util.Vertex;
@@ -64,7 +64,7 @@ public class DefaultFacesConfigurationMerger extends FacesConfigurationMerger
FacesConfigurationProvider facesConfigProvider = FacesConfigurationProviderFactory
.getFacesConfigurationProviderFactory(externalContext).getFacesConfigurationProvider(externalContext);
- FacesConfigDispenser dispenser = new DigesterFacesConfigDispenserImpl();
+ FacesConfigDispenser dispenser = new FacesConfigDispenserImpl();
// standard-faces-config.xml
dispenser.feed(facesConfigProvider.getStandardFacesConfig(externalContext));
diff --git a/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java b/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
index 9eda229..43e0a2f 100644
--- a/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.config;
import java.io.FileNotFoundException;
import org.apache.myfaces.config.annotation.AnnotationConfigurator;
import org.apache.myfaces.config.element.FacesConfig;
-import org.apache.myfaces.config.impl.digester.DigesterlessFacesConfigUnmarshallerImpl;
+import org.apache.myfaces.config.impl.FacesConfigUnmarshallerImpl;
import org.apache.myfaces.util.ClassUtils;
import org.apache.myfaces.spi.FacesConfigResourceProvider;
import org.apache.myfaces.spi.FacesConfigResourceProviderFactory;
@@ -63,10 +63,10 @@ import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import org.apache.myfaces.config.element.FacesFlowDefinition;
import org.apache.myfaces.config.element.facelets.FaceletTagLibrary;
-import org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl;
-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.NavigationCaseImpl;
+import org.apache.myfaces.config.impl.elements.FacesConfigImpl;
+import org.apache.myfaces.config.impl.elements.FacesFlowDefinitionImpl;
+import org.apache.myfaces.config.impl.elements.FacesFlowReturnImpl;
+import org.apache.myfaces.config.impl.elements.NavigationCaseImpl;
import org.apache.myfaces.util.FastWriter;
import org.apache.myfaces.util.WebConfigParamUtils;
import org.apache.myfaces.spi.FaceletConfigResourceProvider;
@@ -124,7 +124,7 @@ public class DefaultFacesConfigurationProvider extends FacesConfigurationProvide
{
if (_unmarshaller == null)
{
- _unmarshaller = new DigesterlessFacesConfigUnmarshallerImpl(ectx);
+ _unmarshaller = new FacesConfigUnmarshallerImpl(ectx);
}
return _unmarshaller;
}
@@ -194,10 +194,10 @@ public class DefaultFacesConfigurationProvider extends FacesConfigurationProvide
{
try
{
- 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();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl facesConfig
+ = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.elements.FactoryImpl factory
+ = new org.apache.myfaces.config.impl.elements.FactoryImpl();
facesConfig.addFactory(factory);
@@ -500,9 +500,7 @@ public class DefaultFacesConfigurationProvider extends FacesConfigurationProvide
}
// Parse document. This strategy construct the faces-config.xml in a
- // memory buffer and then loads it using commons digester.
- // TODO: Find a better way without write the DOM and read it again and without
- // rewrite commons-digester parser!.
+ // memory buffer and then loads it.
Transformer trans = null;
try
{
@@ -766,8 +764,8 @@ public class DefaultFacesConfigurationProvider extends FacesConfigurationProvide
FaceletTagLibrary tl = TagLibraryConfigUnmarshallerImpl.create(externalContext, src);
if (tl != null)
{
- org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl config =
- new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl config =
+ new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
config.addFaceletTagLibrary(tl);
facesConfigFilesList.add(config);
}
@@ -796,8 +794,8 @@ public class DefaultFacesConfigurationProvider extends FacesConfigurationProvide
FaceletTagLibrary tl = TagLibraryConfigUnmarshallerImpl.create(externalContext, url);
if (tl != null)
{
- org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl config =
- new org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl config =
+ new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
config.addFaceletTagLibrary(tl);
facesConfigFilesList.add(config);
}
diff --git a/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java b/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
index 5f840b3..7e9d9fe 100755
--- a/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
+++ b/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
@@ -95,7 +95,7 @@ import org.apache.myfaces.config.element.NavigationRule;
import org.apache.myfaces.config.element.Renderer;
import org.apache.myfaces.config.element.ResourceBundle;
import org.apache.myfaces.config.element.SystemEventListener;
-import org.apache.myfaces.config.impl.digester.DigesterFacesConfigDispenserImpl;
+import org.apache.myfaces.config.impl.FacesConfigDispenserImpl;
import org.apache.myfaces.context.ExceptionHandlerFactoryImpl;
import org.apache.myfaces.context.ExternalContextFactoryImpl;
import org.apache.myfaces.context.FacesContextFactoryImpl;
@@ -126,7 +126,7 @@ import org.apache.myfaces.component.search.SearchExpressionContextFactoryImpl;
import org.apache.myfaces.config.element.FaceletsTemplateMapping;
import org.apache.myfaces.config.element.ViewPoolMapping;
import org.apache.myfaces.config.element.facelets.FaceletTagLibrary;
-import org.apache.myfaces.config.impl.digester.DigesterlessFacesConfigUnmarshallerImpl;
+import org.apache.myfaces.config.impl.FacesConfigUnmarshallerImpl;
import org.apache.myfaces.lifecycle.LifecycleImpl;
import org.apache.myfaces.renderkit.LazyRenderKit;
import org.apache.myfaces.util.DefaultSerialFactory;
@@ -237,7 +237,7 @@ public class FacesConfigurator
{
if (_unmarshaller == null)
{
- _unmarshaller = new DigesterlessFacesConfigUnmarshallerImpl(_externalContext);
+ _unmarshaller = new FacesConfigUnmarshallerImpl(_externalContext);
}
return _unmarshaller;
@@ -259,7 +259,7 @@ public class FacesConfigurator
{
if (_dispenser == null)
{
- _dispenser = new DigesterFacesConfigDispenserImpl();
+ _dispenser = new FacesConfigDispenserImpl();
}
return _dispenser;
diff --git a/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java b/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java
index fee1750..00fc019 100644
--- a/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java
+++ b/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java
@@ -39,11 +39,11 @@ import javax.faces.render.RenderKitFactory;
import javax.faces.validator.FacesValidator;
import javax.faces.view.facelets.FaceletsResourceResolver;
-import org.apache.myfaces.config.impl.digester.elements.ApplicationImpl;
-import org.apache.myfaces.config.impl.digester.elements.BehaviorImpl;
-import org.apache.myfaces.config.impl.digester.elements.ComponentTagDeclarationImpl;
-import org.apache.myfaces.config.impl.digester.elements.ConverterImpl;
-import org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl;
+import org.apache.myfaces.config.impl.elements.ApplicationImpl;
+import org.apache.myfaces.config.impl.elements.BehaviorImpl;
+import org.apache.myfaces.config.impl.elements.ComponentTagDeclarationImpl;
+import org.apache.myfaces.config.impl.elements.ConverterImpl;
+import org.apache.myfaces.config.impl.elements.FacesConfigImpl;
import org.apache.myfaces.spi.AnnotationProvider;
import org.apache.myfaces.spi.AnnotationProviderFactory;
import org.apache.myfaces.util.LangUtils;
@@ -230,18 +230,18 @@ public class AnnotationConfigurator
+ ", " + clazz.getName() + ')');
}
- org.apache.myfaces.config.impl.digester.elements.RenderKitImpl renderKit =
- (org.apache.myfaces.config.impl.digester.elements.RenderKitImpl)
+ org.apache.myfaces.config.impl.elements.RenderKitImpl renderKit =
+ (org.apache.myfaces.config.impl.elements.RenderKitImpl)
facesConfig.getRenderKit(renderKitId);
if (renderKit == null)
{
- renderKit = new org.apache.myfaces.config.impl.digester.elements.RenderKitImpl();
+ renderKit = new org.apache.myfaces.config.impl.elements.RenderKitImpl();
renderKit.setId(renderKitId);
facesConfig.addRenderKit(renderKit);
}
- org.apache.myfaces.config.impl.digester.elements.RendererImpl renderer =
- new org.apache.myfaces.config.impl.digester.elements.RendererImpl();
+ org.apache.myfaces.config.impl.elements.RendererImpl renderer =
+ new org.apache.myfaces.config.impl.elements.RendererImpl();
renderer.setComponentFamily(rend.componentFamily());
renderer.setRendererClass(clazz.getName());
renderer.setRendererType(rend.rendererType());
@@ -300,8 +300,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.NamedEventImpl namedEventConfig =
- new org.apache.myfaces.config.impl.digester.elements.NamedEventImpl();
+ org.apache.myfaces.config.impl.elements.NamedEventImpl namedEventConfig =
+ new org.apache.myfaces.config.impl.elements.NamedEventImpl();
namedEventConfig.setEventClass(clazz.getName());
namedEventConfig.setShortName(namedEvent.shortName());
facesConfig.addNamedEvent(namedEventConfig);
@@ -364,18 +364,18 @@ public class AnnotationConfigurator
+ clazz.getName() + ')');
}
- org.apache.myfaces.config.impl.digester.elements.RenderKitImpl renderKit =
- (org.apache.myfaces.config.impl.digester.elements.RenderKitImpl)
+ org.apache.myfaces.config.impl.elements.RenderKitImpl renderKit =
+ (org.apache.myfaces.config.impl.elements.RenderKitImpl)
facesConfig.getRenderKit(renderKitId);
if (renderKit == null)
{
- renderKit = new org.apache.myfaces.config.impl.digester.elements.RenderKitImpl();
+ renderKit = new org.apache.myfaces.config.impl.elements.RenderKitImpl();
renderKit.setId(renderKitId);
facesConfig.addRenderKit(renderKit);
}
- org.apache.myfaces.config.impl.digester.elements.ClientBehaviorRendererImpl cbr =
- new org.apache.myfaces.config.impl.digester.elements.ClientBehaviorRendererImpl();
+ org.apache.myfaces.config.impl.elements.ClientBehaviorRendererImpl cbr =
+ new org.apache.myfaces.config.impl.elements.ClientBehaviorRendererImpl();
cbr.setRendererType(facesBehaviorRenderer.rendererType());
cbr.setRendererClass(clazz.getName());
renderKit.addClientBehaviorRenderer(cbr);
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigDispenserImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigDispenserImpl.java
similarity index 99%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigDispenserImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigDispenserImpl.java
index 4f1bcb0..5efbcda 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigDispenserImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigDispenserImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester;
+package org.apache.myfaces.config.impl;
import java.util.ArrayList;
import java.util.Collection;
@@ -51,16 +51,16 @@ import org.apache.myfaces.config.element.ResourceBundle;
import org.apache.myfaces.config.element.SystemEventListener;
import org.apache.myfaces.config.element.ViewPoolMapping;
import org.apache.myfaces.config.element.facelets.FaceletTagLibrary;
-import org.apache.myfaces.config.impl.digester.elements.RenderKitImpl;
+import org.apache.myfaces.config.impl.elements.RenderKitImpl;
/**
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
*/
-public class DigesterFacesConfigDispenserImpl extends FacesConfigDispenser
+public class FacesConfigDispenserImpl extends FacesConfigDispenser
{
private static final long serialVersionUID = 3550379003287939559L;
- private static final Logger log = Logger.getLogger(DigesterFacesConfigDispenserImpl.class.getName());
+ private static final Logger log = Logger.getLogger(FacesConfigDispenserImpl.class.getName());
// Factories
private List<String> applicationFactories = new ArrayList<String>();
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterlessFacesConfigUnmarshallerImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigUnmarshallerImpl.java
similarity index 90%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterlessFacesConfigUnmarshallerImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigUnmarshallerImpl.java
index f9370f0..ba2d7ff 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterlessFacesConfigUnmarshallerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigUnmarshallerImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester;
+package org.apache.myfaces.config.impl;
import java.io.ByteArrayInputStream;
@@ -29,53 +29,52 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.myfaces.config.FacesConfigUnmarshaller;
import org.apache.myfaces.config.element.FacesFlowDefinition;
-import org.apache.myfaces.config.impl.FacesConfigEntityResolver;
-import org.apache.myfaces.config.impl.digester.elements.AbsoluteOrderingImpl;
-import org.apache.myfaces.config.impl.digester.elements.ApplicationImpl;
-import org.apache.myfaces.config.impl.digester.elements.AttributeImpl;
-import org.apache.myfaces.config.impl.digester.elements.BehaviorImpl;
-import org.apache.myfaces.config.impl.digester.elements.ClientBehaviorRendererImpl;
-import org.apache.myfaces.config.impl.digester.elements.ConfigOthersSlotImpl;
-import org.apache.myfaces.config.impl.digester.elements.ContractMappingImpl;
-import org.apache.myfaces.config.impl.digester.elements.ConverterImpl;
-import org.apache.myfaces.config.impl.digester.elements.FaceletsProcessingImpl;
-import org.apache.myfaces.config.impl.digester.elements.FaceletsTemplateMappingImpl;
-import org.apache.myfaces.config.impl.digester.elements.FacesConfigExtensionImpl;
-import org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl;
-import org.apache.myfaces.config.impl.digester.elements.FacesConfigNameSlotImpl;
-import org.apache.myfaces.config.impl.digester.elements.FacesFlowCallImpl;
-import org.apache.myfaces.config.impl.digester.elements.FacesFlowDefinitionImpl;
-import org.apache.myfaces.config.impl.digester.elements.FacesFlowMethodCallImpl;
-import org.apache.myfaces.config.impl.digester.elements.FacesFlowMethodParameterImpl;
-import org.apache.myfaces.config.impl.digester.elements.FacesFlowParameterImpl;
-import org.apache.myfaces.config.impl.digester.elements.FacesFlowReferenceImpl;
-import org.apache.myfaces.config.impl.digester.elements.FacesFlowReturnImpl;
-import org.apache.myfaces.config.impl.digester.elements.FacesFlowSwitchImpl;
-import org.apache.myfaces.config.impl.digester.elements.FacesFlowViewImpl;
-import org.apache.myfaces.config.impl.digester.elements.FactoryImpl;
-import org.apache.myfaces.config.impl.digester.elements.LocaleConfigImpl;
-import org.apache.myfaces.config.impl.digester.elements.NavigationCaseImpl;
-import org.apache.myfaces.config.impl.digester.elements.NavigationRuleImpl;
-import org.apache.myfaces.config.impl.digester.elements.OrderingImpl;
-import org.apache.myfaces.config.impl.digester.elements.PropertyImpl;
-import org.apache.myfaces.config.impl.digester.elements.RedirectImpl;
-import org.apache.myfaces.config.impl.digester.elements.RenderKitImpl;
-import org.apache.myfaces.config.impl.digester.elements.RendererImpl;
-import org.apache.myfaces.config.impl.digester.elements.ResourceBundleImpl;
-import org.apache.myfaces.config.impl.digester.elements.SystemEventListenerImpl;
-import org.apache.myfaces.config.impl.digester.elements.ViewParamImpl;
-import org.apache.myfaces.config.impl.digester.elements.ViewPoolMappingImpl;
-import org.apache.myfaces.config.impl.digester.elements.ViewPoolParameterImpl;
+import org.apache.myfaces.config.impl.elements.AbsoluteOrderingImpl;
+import org.apache.myfaces.config.impl.elements.ApplicationImpl;
+import org.apache.myfaces.config.impl.elements.AttributeImpl;
+import org.apache.myfaces.config.impl.elements.BehaviorImpl;
+import org.apache.myfaces.config.impl.elements.ClientBehaviorRendererImpl;
+import org.apache.myfaces.config.impl.elements.ConfigOthersSlotImpl;
+import org.apache.myfaces.config.impl.elements.ContractMappingImpl;
+import org.apache.myfaces.config.impl.elements.ConverterImpl;
+import org.apache.myfaces.config.impl.elements.FaceletsProcessingImpl;
+import org.apache.myfaces.config.impl.elements.FaceletsTemplateMappingImpl;
+import org.apache.myfaces.config.impl.elements.FacesConfigExtensionImpl;
+import org.apache.myfaces.config.impl.elements.FacesConfigImpl;
+import org.apache.myfaces.config.impl.elements.FacesConfigNameSlotImpl;
+import org.apache.myfaces.config.impl.elements.FacesFlowCallImpl;
+import org.apache.myfaces.config.impl.elements.FacesFlowDefinitionImpl;
+import org.apache.myfaces.config.impl.elements.FacesFlowMethodCallImpl;
+import org.apache.myfaces.config.impl.elements.FacesFlowMethodParameterImpl;
+import org.apache.myfaces.config.impl.elements.FacesFlowParameterImpl;
+import org.apache.myfaces.config.impl.elements.FacesFlowReferenceImpl;
+import org.apache.myfaces.config.impl.elements.FacesFlowReturnImpl;
+import org.apache.myfaces.config.impl.elements.FacesFlowSwitchImpl;
+import org.apache.myfaces.config.impl.elements.FacesFlowViewImpl;
+import org.apache.myfaces.config.impl.elements.FactoryImpl;
+import org.apache.myfaces.config.impl.elements.LocaleConfigImpl;
+import org.apache.myfaces.config.impl.elements.NavigationCaseImpl;
+import org.apache.myfaces.config.impl.elements.NavigationRuleImpl;
+import org.apache.myfaces.config.impl.elements.OrderingImpl;
+import org.apache.myfaces.config.impl.elements.PropertyImpl;
+import org.apache.myfaces.config.impl.elements.RedirectImpl;
+import org.apache.myfaces.config.impl.elements.RenderKitImpl;
+import org.apache.myfaces.config.impl.elements.RendererImpl;
+import org.apache.myfaces.config.impl.elements.ResourceBundleImpl;
+import org.apache.myfaces.config.impl.elements.SystemEventListenerImpl;
+import org.apache.myfaces.config.impl.elements.ViewParamImpl;
+import org.apache.myfaces.config.impl.elements.ViewPoolMappingImpl;
+import org.apache.myfaces.config.impl.elements.ViewPoolParameterImpl;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.xml.sax.SAXException;
-public class DigesterlessFacesConfigUnmarshallerImpl implements FacesConfigUnmarshaller<FacesConfigImpl>
+public class FacesConfigUnmarshallerImpl implements FacesConfigUnmarshaller<FacesConfigImpl>
{
private ExternalContext externalContext;
- public DigesterlessFacesConfigUnmarshallerImpl(ExternalContext externalContext)
+ public FacesConfigUnmarshallerImpl(ExternalContext externalContext)
{
this.externalContext = externalContext;
}
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java
deleted file mode 100755
index e9b732e..0000000
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java
+++ /dev/null
@@ -1,469 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.myfaces.config.impl.digester;
-
-import java.io.ByteArrayInputStream;
-import org.apache.commons.digester.Digester;
-import org.apache.myfaces.config.FacesConfigUnmarshaller;
-import org.apache.myfaces.config.impl.FacesConfigEntityResolver;
-import org.apache.myfaces.config.impl.digester.elements.*;
-import org.apache.myfaces.util.ClassUtils;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import javax.faces.context.ExternalContext;
-import java.io.IOException;
-import java.io.InputStream;
-import org.apache.myfaces.config.element.FacesFlowDefinition;
-
-/**
- * @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
- */
-public class DigesterFacesConfigUnmarshallerImpl implements FacesConfigUnmarshaller<FacesConfigImpl>
-{
- private Digester digester;
-
- public DigesterFacesConfigUnmarshallerImpl(ExternalContext externalContext)
- {
- digester = new Digester();
- // TODO: validation set to false during implementation of 1.2
- digester.setValidating(false);
- digester.setNamespaceAware(true);
- digester.setEntityResolver(new FacesConfigEntityResolver(externalContext));
- //digester.setUseContextClassLoader(true);
- digester.setClassLoader(ClassUtils.getContextClassLoader());
-
- digester.addObjectCreate("faces-config", FacesConfigImpl.class);
- // 2.0 specific start
- digester.addSetProperties("faces-config", "metadata-complete", "metadataComplete");
- digester.addSetProperties("faces-config", "version", "version");
- // 2.0 specific end
- // 2.0 config ordering name start
-
- digester.addCallMethod("faces-config/protected-views/url-pattern", "addProtectedViewUrlPattern", 0);
-
- digester.addCallMethod("faces-config/name", "setName", 0);
- digester.addObjectCreate("faces-config/ordering", OrderingImpl.class);
- digester.addSetNext("faces-config/ordering", "setOrdering");
- 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", ConfigOthersSlotImpl.class);
- digester.addSetNext("faces-config/ordering/before/others", "addBeforeSlot");
-
- 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", ConfigOthersSlotImpl.class);
- digester.addSetNext("faces-config/ordering/after/others", "addAfterSlot");
-
- digester.addObjectCreate("faces-config/absolute-ordering", AbsoluteOrderingImpl.class);
- digester.addSetNext("faces-config/absolute-ordering", "setAbsoluteOrdering");
- 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", ConfigOthersSlotImpl.class);
- digester.addSetNext("faces-config/absolute-ordering/others", "addOrderSlot");
- // 2.0 config ordering name end
-
- 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);
- digester.addCallMethod("faces-config/application/default-validators", "setDefaultValidatorsPresent");
- digester.addCallMethod("faces-config/application/default-validators/validator-id", "addDefaultValidatorId", 0);
- digester.addCallMethod("faces-config/application/message-bundle", "addMessageBundle", 0);
- digester.addCallMethod("faces-config/application/navigation-handler", "addNavigationHandler", 0);
- digester.addCallMethod("faces-config/application/partial-traversal", "addPartialTraversal", 0);
- digester.addCallMethod("faces-config/application/view-handler", "addViewHandler", 0);
- 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", 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", 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);
- digester.addCallMethod("faces-config/application/resource-bundle/display-name", "setDisplayName", 0);
- // 1.2 specific end
-
- // 2.0 specific start
- 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);
- digester.addCallMethod("faces-config/application/system-event-listener/system-event-class",
- "setSystemEventClass",0);
- digester.addCallMethod("faces-config/application/system-event-listener/source-class", "setSourceClass",0);
- digester.addCallMethod("faces-config/application/resource-handler", "addResourceHandler", 0);
- digester.addCallMethod("faces-config/factory/exception-handler-factory", "addExceptionHandlerFactory", 0);
- digester.addCallMethod("faces-config/factory/external-context-factory", "addExternalContextFactory", 0);
- digester.addCallMethod("faces-config/factory/view-declaration-language-factory",
- "addViewDeclarationLanguageFactory", 0);
- digester.addCallMethod("faces-config/factory/partial-view-context-factory", "addPartialViewContextFactory", 0);
- digester.addCallMethod("faces-config/factory/tag-handler-delegate-factory", "addTagHandlerDelegateFactory", 0);
- digester.addCallMethod("faces-config/factory/visit-context-factory", "addVisitContextFactory", 0);
- // 2.0 specific end
- // 2.3 specific start
- digester.addCallMethod("faces-config/factory/search-expression-context-factory",
- "addSearchExpressionContextFactory", 0);
- digester.addCallMethod("faces-config/application/search-expression-handler", "addSearchExpressionHandler", 0);
- digester.addCallMethod("faces-config/application/search-keyword-resolver", "addSearchKeywordResolver", 0);
- // 2.3 specific end
- digester.addObjectCreate("faces-config/application/resource-library-contracts/contract-mapping",
- ContractMappingImpl.class);
- digester.addSetNext("faces-config/application/resource-library-contracts/contract-mapping",
- "addResourceLibraryContractMapping");
- digester.addCallMethod(
- "faces-config/application/resource-library-contracts/contract-mapping/url-pattern", "addUrlPattern", 0);
- digester.addCallMethod(
- "faces-config/application/resource-library-contracts/contract-mapping/contracts", "addContract", 0);
-
- // 2.1 specific start
- digester.addCallMethod("faces-config/factory/facelet-cache-factory", "addFaceletCacheFactory", 0);
- // 2.1 specific end
- // 2.2 specific start
- digester.addCallMethod("faces-config/factory/flash-factory", "addFlashFactory", 0);
- // Note there is no client-window-factory, this factory can be set only using SPI.
- digester.addCallMethod("faces-config/factory/flow-handler-factory", "addFlowHandlerFactory", 0);
- // 2.2 specific end
- digester.addCallMethod("faces-config/factory/client-window-factory", "addClientWindowFactory", 0);
-
- 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);
- digester.addCallMethod("faces-config/factory/lifecycle-factory", "addLifecycleFactory", 0);
- digester.addCallMethod("faces-config/factory/render-kit-factory", "addRenderkitFactory", 0);
-
- digester.addCallMethod("faces-config/component", "addComponent", 2);
- digester.addCallParam("faces-config/component/component-type", 0);
- digester.addCallParam("faces-config/component/component-class", 1);
-
- 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", 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);
- digester.addCallMethod("faces-config/converter/attribute/icon", "addIcon", 0);
- digester.addCallMethod("faces-config/converter/attribute/attribute-name", "setAttributeName", 0);
- digester.addCallMethod("faces-config/converter/attribute/attribute-class", "setAttributeClass", 0);
- 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", 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);
- digester.addCallMethod("faces-config/converter/property/icon", "addIcon", 0);
- digester.addCallMethod("faces-config/converter/property/property-name", "setPropertyName", 0);
- digester.addCallMethod("faces-config/converter/property/property-class", "setPropertyClass", 0);
- digester.addCallMethod("faces-config/converter/property/default-value", "setDefaultValue", 0);
- digester.addCallMethod("faces-config/converter/property/suggested-value", "setSuggestedValue", 0);
- digester.addCallMethod("faces-config/converter/property/property-extension", "addPropertyExtension", 0);
-
- 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", 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", 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",
- 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",
- 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",
- "setName",0);
- digester.addCallMethod("faces-config/navigation-rule/navigation-case/redirect/redirect-param/value",
- "setValue",0);
-
- 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", 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", 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);
- digester.addCallMethod("faces-config/render-kit/client-behavior-renderer/client-behavior-renderer-class",
- "setRendererClass", 0);
-
- // 2.0 behavior start
- digester.addObjectCreate("faces-config/behavior", BehaviorImpl.class);
- 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", 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);
- digester.addCallMethod("faces-config/behavior/attribute/icon", "addIcon", 0);
- digester.addCallMethod("faces-config/behavior/attribute/attribute-name", "setAttributeName", 0);
- digester.addCallMethod("faces-config/behavior/attribute/attribute-class", "setAttributeClass", 0);
- 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", 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);
- digester.addCallMethod("faces-config/behavior/property/icon", "addIcon", 0);
- digester.addCallMethod("faces-config/behavior/property/property-name", "setPropertyName", 0);
- digester.addCallMethod("faces-config/behavior/property/property-class", "setPropertyClass", 0);
- digester.addCallMethod("faces-config/behavior/property/default-value", "setDefaultValue", 0);
- digester.addCallMethod("faces-config/behavior/property/suggested-value", "setSuggestedValue", 0);
- digester.addCallMethod("faces-config/behavior/property/property-extension", "addPropertyExtension", 0);
- // 2.0 behavior end
-
- digester.addCallMethod("faces-config/lifecycle/phase-listener", "addLifecyclePhaseListener", 0);
-
- digester.addCallMethod("faces-config/validator", "addValidator", 2);
- digester.addCallParam("faces-config/validator/validator-id", 0);
- digester.addCallParam("faces-config/validator/validator-class", 1);
-
- // 2.1 facelets-processing start
- digester.addObjectCreate("faces-config/faces-config-extension", FacesConfigExtensionImpl.class);
- digester.addSetNext("faces-config/faces-config-extension", "addFacesConfigExtension");
- 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);
- digester.addCallMethod("faces-config/faces-config-extension/facelets-processing/process-as", "setProcessAs", 0);
- // 2.1 facelets-processing end
-
- //MyFaces specific facelets-processing instruction.
- digester.addCallMethod("faces-config/faces-config-extension/facelets-processing/oam-compress-spaces",
- "setOamCompressSpaces", 0);
- addFacesFlowRules(externalContext);
- }
-
- private void addNavigationRules(ExternalContext externalContext, String prefix, String method)
- {
- digester.addObjectCreate(prefix, NavigationRuleImpl.class);
- digester.addSetNext(prefix, method);
- digester.addCallMethod(prefix+"/from-view-id", "setFromViewId", 0);
- addNavigationCases(externalContext, prefix+"/navigation-case", "addNavigationCase");
- }
-
- private void addNavigationCases(ExternalContext externalContext, String prefix, String method)
- {
- 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", RedirectImpl.class);
- digester.addSetProperties(prefix+"/redirect", "include-view-params",
- "includeViewParams");
- digester.addSetNext(prefix+"/redirect", "setRedirect");
- 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", 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);
- }
-
- private void addFacesFlowRules(ExternalContext externalContext)
- {
- digester.addObjectCreate("faces-config/flow-definition", FacesFlowDefinitionImpl.class);
-
- digester.addSetNext("faces-config/flow-definition", "addFacesFlowDefinition");
- digester.addSetProperties("faces-config/flow-definition", "id", "id");
-
- digester.addCallMethod("faces-config/flow-definition/start-node", "setStartNode", 0);
- digester.addCallMethod("faces-config/flow-definition/initializer", "setInitializer", 0);
- digester.addCallMethod("faces-config/flow-definition/finalizer", "setFinalizer", 0);
-
- digester.addObjectCreate("faces-config/flow-definition/view", FacesFlowViewImpl.class);
- digester.addSetNext("faces-config/flow-definition/view", "addView");
- digester.addSetProperties("faces-config/flow-definition/view", "id", "id");
- digester.addCallMethod("faces-config/flow-definition/view/vdl-document", "setVdlDocument", 0);
-
- digester.addObjectCreate("faces-config/flow-definition/switch", FacesFlowSwitchImpl.class);
- digester.addSetNext("faces-config/flow-definition/switch", "addSwitch");
- digester.addSetProperties("faces-config/flow-definition/switch", "id", "id");
-
- digester.addObjectCreate("faces-config/flow-definition/switch/default-outcome",
- NavigationCaseImpl.class);
- digester.addSetNext("faces-config/flow-definition/switch/default-outcome",
- "setDefaultOutcome");
- digester.addCallMethod("faces-config/flow-definition/switch/default-outcome",
- "setFromOutcome", 0);
-
- addNavigationCases(externalContext, "faces-config/flow-definition/switch/case",
- "addNavigationCase");
-
- digester.addObjectCreate("faces-config/flow-definition/flow-return", FacesFlowReturnImpl.class);
- 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",
- NavigationCaseImpl.class);
- digester.addSetNext("faces-config/flow-definition/flow-return/from-outcome",
- "setNavigationCase");
- digester.addCallMethod("faces-config/flow-definition/flow-return/from-outcome",
- "setFromOutcome", 0);
-
- addNavigationRules(externalContext, "faces-config/flow-definition/navigation-rule", "addNavigationRule");
-
- digester.addObjectCreate("faces-config/flow-definition/flow-call", FacesFlowCallImpl.class);
- digester.addSetNext("faces-config/flow-definition/flow-call", "addFlowCall");
- digester.addSetProperties("faces-config/flow-definition/flow-call", "id", "id");
- digester.addObjectCreate("faces-config/flow-definition/flow-call/flow-reference", FacesFlowReferenceImpl.class);
- digester.addSetNext("faces-config/flow-definition/flow-call/flow-reference", "setFlowReference");
- digester.addCallMethod("faces-config/flow-definition/flow-call/flow-reference/flow-document-id",
- "setFlowDocumentId", 0);
- digester.addCallMethod("faces-config/flow-definition/flow-call/flow-reference/flow-id", "setFlowId", 0);
-
- digester.addObjectCreate("faces-config/flow-definition/flow-call/outbound-parameter",
- FacesFlowParameterImpl.class);
- digester.addSetNext("faces-config/flow-definition/flow-call/outbound-parameter",
- "addOutboundParameter");
- digester.addCallMethod("faces-config/flow-definition/flow-call/outbound-parameter/name", "setName", 0);
- digester.addCallMethod("faces-config/flow-definition/flow-call/outbound-parameter/value", "setValue", 0);
-
- digester.addObjectCreate("faces-config/flow-definition/method-call", FacesFlowMethodCallImpl.class);
- digester.addSetNext("faces-config/flow-definition/method-call", "addMethodCall");
- digester.addSetProperties("faces-config/flow-definition/method-call", "id", "id");
- digester.addCallMethod("faces-config/flow-definition/method-call/method", "setMethod", 0);
- digester.addCallMethod("faces-config/flow-definition/method-call/default-outcome",
- "setDefaultOutcome", 0);
- digester.addObjectCreate("faces-config/flow-definition/method-call/parameter",
- FacesFlowMethodParameterImpl.class);
- digester.addSetNext("faces-config/flow-definition/method-call/parameter", "addParameter");
- digester.addCallMethod("faces-config/flow-definition/method-call/parameter/class", "setClassName", 0);
- digester.addCallMethod("faces-config/flow-definition/method-call/parameter/value", "setValue", 0);
-
- digester.addObjectCreate("faces-config/flow-definition/inbound-parameter",
- FacesFlowParameterImpl.class);
- digester.addSetNext("faces-config/flow-definition/inbound-parameter", "addInboundParameter");
- digester.addCallMethod("faces-config/flow-definition/inbound-parameter/name", "setName", 0);
- digester.addCallMethod("faces-config/flow-definition/inbound-parameter/value", "setValue", 0);
-
- //View Pool config
- digester.addObjectCreate("faces-config/faces-config-extension/view-pool-mapping",
- ViewPoolMappingImpl.class);
- digester.addSetNext("faces-config/faces-config-extension/view-pool-mapping",
- "addViewPoolMapping");
- digester.addCallMethod(
- "faces-config/faces-config-extension/view-pool-mapping/url-pattern", "setUrlPattern", 0);
- digester.addObjectCreate("faces-config/faces-config-extension/view-pool-mapping/parameter",
- ViewPoolParameterImpl.class);
- digester.addSetNext("faces-config/faces-config-extension/view-pool-mapping/parameter", "addParameter");
- digester.addCallMethod("faces-config/faces-config-extension/view-pool-mapping/parameter/name", "setName", 0);
- digester.addCallMethod("faces-config/faces-config-extension/view-pool-mapping/parameter/value", "setValue", 0);
-
- //Facelets Template Mapping config
- digester.addObjectCreate("faces-config/faces-config-extension/facelets-template-mapping",
- FaceletsTemplateMappingImpl.class);
- digester.addSetNext("faces-config/faces-config-extension/facelets-template-mapping",
- "addFaceletsTemplateMapping");
- digester.addCallMethod(
- "faces-config/faces-config-extension/facelets-template-mapping/url-pattern",
- "setUrlPattern", 0);
- }
-
- private void postProcessFacesConfig(String systemId, FacesConfigImpl config)
- {
- for (org.apache.myfaces.config.element.Application application : config.getApplications())
- {
- for (org.apache.myfaces.config.element.LocaleConfig localeConfig : application.getLocaleConfig())
- {
- if (!localeConfig.getSupportedLocales().contains(localeConfig.getDefaultLocale()))
- {
- localeConfig.getSupportedLocales().add(localeConfig.getDefaultLocale());
- }
- }
- }
-
- for (FacesFlowDefinition facesFlowDefinition : config.getFacesFlowDefinitions())
- {
- // JSF 2.2 section 11.4.3.1 says this: "... Flows are defined using the
- // <flow-definition> element. This element must have an id attribute which uniquely
- // identifies the flow within the scope of the Application Configuration Resource
- // file in which the element appears. To enable multiple flows with the same id to
- // exist in an application, the <faces-config><name> element is taken to
- // be the definingDocumentId of the flow. If no <name> element is specified,
- // the empty string is taken as the value for definingDocumentId. ..."
- if (config.getName() != null)
- {
- ((FacesFlowDefinitionImpl)facesFlowDefinition).setDefiningDocumentId(
- config.getName());
- }
- else
- {
- ((FacesFlowDefinitionImpl)facesFlowDefinition).setDefiningDocumentId("");
- }
- }
- }
-
- @Override
- public FacesConfigImpl getFacesConfig(String s) throws IOException, SAXException
- {
- return getFacesConfig(new ByteArrayInputStream(s.getBytes()), null);
- }
-
- @Override
- 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
- FacesConfigImpl config = (FacesConfigImpl) digester.parse(is);
-
- postProcessFacesConfig(systemId, config);
-
- return config;
- }
-}
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/AbsoluteOrderingImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/AbsoluteOrderingImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/AbsoluteOrderingImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/AbsoluteOrderingImpl.java
index 1c41901..6038b80 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/AbsoluteOrderingImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/AbsoluteOrderingImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ApplicationImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ApplicationImpl.java
similarity index 99%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ApplicationImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/ApplicationImpl.java
index 8ffd648..36b8713 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ApplicationImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ApplicationImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/AttributeImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/AttributeImpl.java
similarity index 98%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/AttributeImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/AttributeImpl.java
index 6b68dcc..48f9c0a 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/AttributeImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/AttributeImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/BehaviorImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/BehaviorImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/BehaviorImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/BehaviorImpl.java
index bbc6641..d523c1b 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/BehaviorImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/BehaviorImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ClientBehaviorRendererImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ClientBehaviorRendererImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ClientBehaviorRendererImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/ClientBehaviorRendererImpl.java
index 23d4644..8de8d0d 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ClientBehaviorRendererImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ClientBehaviorRendererImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ComponentImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ComponentImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ComponentImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/ComponentImpl.java
index 2343a1c..abd8299 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ComponentImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ComponentImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ComponentTagDeclarationImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ComponentTagDeclarationImpl.java
similarity index 93%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ComponentTagDeclarationImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/ComponentTagDeclarationImpl.java
index 4f1e8bb..b38ff50 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ComponentTagDeclarationImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ComponentTagDeclarationImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
import org.apache.myfaces.config.element.ComponentTagDeclaration;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ConfigOthersSlotImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ConfigOthersSlotImpl.java
similarity index 94%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ConfigOthersSlotImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/ConfigOthersSlotImpl.java
index 2210a7f..cc3e0f6 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ConfigOthersSlotImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ConfigOthersSlotImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ContractMappingImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ContractMappingImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ContractMappingImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/ContractMappingImpl.java
index a327bb0..a1877c2 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ContractMappingImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ContractMappingImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ConverterImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ConverterImpl.java
similarity index 98%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ConverterImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/ConverterImpl.java
index 3c29e69..7ddce2c 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ConverterImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ConverterImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FaceletsProcessingImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FaceletsProcessingImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FaceletsProcessingImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/FaceletsProcessingImpl.java
index 2bdd44e..9e56c3d 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FaceletsProcessingImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FaceletsProcessingImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
/**
*
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FaceletsTemplateMappingImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FaceletsTemplateMappingImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FaceletsTemplateMappingImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/FaceletsTemplateMappingImpl.java
index ea1d1f2..aa070b6 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FaceletsTemplateMappingImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FaceletsTemplateMappingImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
import org.apache.myfaces.config.element.FaceletsTemplateMapping;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfig.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfig.java
similarity index 94%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfig.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfig.java
index 1d2589a..c1ff7ae 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfig.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfig.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
/**
* NOTE: this class is to avoid the integration code in tomee-1.6.0
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigExtensionImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfigExtensionImpl.java
similarity index 98%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigExtensionImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfigExtensionImpl.java
index 5060edc..2656a33 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigExtensionImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfigExtensionImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfigImpl.java
similarity index 99%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfigImpl.java
index 867780c..e496793 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfigImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigNameSlotImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfigNameSlotImpl.java
similarity index 95%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigNameSlotImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfigNameSlotImpl.java
index eefafb9..b74d602 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigNameSlotImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfigNameSlotImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowCallImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowCallImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowCallImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowCallImpl.java
index a975202..42cd8aa 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowCallImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowCallImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.util.ArrayList;
import java.util.List;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowDefinitionImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowDefinitionImpl.java
similarity index 98%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowDefinitionImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowDefinitionImpl.java
index 437b5c1..85f4d96 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowDefinitionImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowDefinitionImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.util.ArrayList;
import java.util.List;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowMethodCallImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowMethodCallImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowMethodCallImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowMethodCallImpl.java
index 64373b5..703c184 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowMethodCallImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowMethodCallImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.util.ArrayList;
import java.util.List;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowMethodParameterImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowMethodParameterImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowMethodParameterImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowMethodParameterImpl.java
index 09c91db..77edb7d 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowMethodParameterImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowMethodParameterImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import org.apache.myfaces.config.element.FacesFlowMethodParameter;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowParameterImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowParameterImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowParameterImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowParameterImpl.java
index ca1178f..6ec3840 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowParameterImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowParameterImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
/**
*
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowReferenceImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowReferenceImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowReferenceImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowReferenceImpl.java
index 9c7f5fb..dde3e59 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowReferenceImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowReferenceImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import org.apache.myfaces.config.element.FacesFlowReference;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowReturnImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowReturnImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowReturnImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowReturnImpl.java
index 81939a3..17ec63d 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowReturnImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowReturnImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import org.apache.myfaces.config.element.NavigationCase;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowSwitchImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowSwitchImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowSwitchImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowSwitchImpl.java
index 1ec38fc..9a55c66 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowSwitchImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowSwitchImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.util.ArrayList;
import java.util.List;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowViewImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowViewImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowViewImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowViewImpl.java
index 8361214..4844d7f 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesFlowViewImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowViewImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
/**
*
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FactoryImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FactoryImpl.java
similarity index 98%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FactoryImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/FactoryImpl.java
index 9f2d223..a1154db 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FactoryImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/FactoryImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ListEntriesImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ListEntriesImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ListEntriesImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/ListEntriesImpl.java
index 6f5598e..4667a88 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ListEntriesImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ListEntriesImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/LocaleConfigImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/LocaleConfigImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/LocaleConfigImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/LocaleConfigImpl.java
index 4c0f8fd..ef84ad3 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/LocaleConfigImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/LocaleConfigImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/MapEntriesImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/MapEntriesImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/MapEntriesImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/MapEntriesImpl.java
index 095a199..54248e0 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/MapEntriesImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/MapEntriesImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NamedEventImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/NamedEventImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NamedEventImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/NamedEventImpl.java
index c7b2640..7fdefe8 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NamedEventImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/NamedEventImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationCaseImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/NavigationCaseImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationCaseImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/NavigationCaseImpl.java
index 4957266..dc5323b 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationCaseImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/NavigationCaseImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationRuleImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/NavigationRuleImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationRuleImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/NavigationRuleImpl.java
index 45a92e9..4aa47cb 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationRuleImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/NavigationRuleImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/OrderSlotImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/OrderSlotImpl.java
similarity index 94%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/OrderSlotImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/OrderSlotImpl.java
index c683668..6fd2614 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/OrderSlotImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/OrderSlotImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/OrderingImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/OrderingImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/OrderingImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/OrderingImpl.java
index 8261b9f..7d550cb 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/OrderingImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/OrderingImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/PropertyImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/PropertyImpl.java
similarity index 98%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/PropertyImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/PropertyImpl.java
index 7e7c8cd..41fa782 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/PropertyImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/PropertyImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RedirectImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/RedirectImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RedirectImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/RedirectImpl.java
index 7165b0e..f7d771f 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RedirectImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/RedirectImpl.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RenderKitImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/RenderKitImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RenderKitImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/RenderKitImpl.java
index 37376aa..66c7e21 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RenderKitImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/RenderKitImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RendererImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/RendererImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RendererImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/RendererImpl.java
index d531c5d..09430d0 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/RendererImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/RendererImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ResourceBundleImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ResourceBundleImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ResourceBundleImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/ResourceBundleImpl.java
index 2129bf2..aadf6a8 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ResourceBundleImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ResourceBundleImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/SystemEventListenerImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/SystemEventListenerImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/SystemEventListenerImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/SystemEventListenerImpl.java
index d0b0f8c..1dbb5ac 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/SystemEventListenerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/SystemEventListenerImpl.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ViewParamImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewParamImpl.java
similarity index 95%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ViewParamImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewParamImpl.java
index a0c8a22..ddbb691 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ViewParamImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewParamImpl.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ViewPoolMappingImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewPoolMappingImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ViewPoolMappingImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewPoolMappingImpl.java
index 3c5cb25..1844960 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ViewPoolMappingImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewPoolMappingImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ViewPoolParameterImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewPoolParameterImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ViewPoolParameterImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewPoolParameterImpl.java
index c2a24ff..7c903f4 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ViewPoolParameterImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewPoolParameterImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements;
+package org.apache.myfaces.config.impl.elements;
import org.apache.myfaces.config.element.ViewPoolParameter;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletBehaviorTagImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletBehaviorTagImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletBehaviorTagImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletBehaviorTagImpl.java
index f86ead9..ad60335 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletBehaviorTagImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletBehaviorTagImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements.facelets;
+package org.apache.myfaces.config.impl.elements.facelets;
import java.io.Serializable;
import org.apache.myfaces.config.element.facelets.FaceletBehaviorTag;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletComponentTagImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletComponentTagImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletComponentTagImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletComponentTagImpl.java
index 2462588..744402a 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletComponentTagImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletComponentTagImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements.facelets;
+package org.apache.myfaces.config.impl.elements.facelets;
import java.io.Serializable;
import org.apache.myfaces.config.element.facelets.FaceletComponentTag;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletConverterTagImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletConverterTagImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletConverterTagImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletConverterTagImpl.java
index 113ed28..ac8818b 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletConverterTagImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletConverterTagImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements.facelets;
+package org.apache.myfaces.config.impl.elements.facelets;
import java.io.Serializable;
import org.apache.myfaces.config.element.facelets.FaceletConverterTag;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletFunctionImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletFunctionImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletFunctionImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletFunctionImpl.java
index 5806f79..a68a921 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletFunctionImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletFunctionImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements.facelets;
+package org.apache.myfaces.config.impl.elements.facelets;
import java.io.Serializable;
import org.apache.myfaces.config.element.facelets.FaceletFunction;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletHandlerTagImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletHandlerTagImpl.java
similarity index 95%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletHandlerTagImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletHandlerTagImpl.java
index b9b9ae7..46b795d 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletHandlerTagImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletHandlerTagImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements.facelets;
+package org.apache.myfaces.config.impl.elements.facelets;
import java.io.Serializable;
import org.apache.myfaces.config.element.facelets.FaceletHandlerTag;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletSourceTagImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletSourceTagImpl.java
similarity index 95%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletSourceTagImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletSourceTagImpl.java
index 414279f..2399daa 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletSourceTagImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletSourceTagImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements.facelets;
+package org.apache.myfaces.config.impl.elements.facelets;
import java.io.Serializable;
import org.apache.myfaces.config.element.facelets.FaceletSourceTag;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletTagImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletTagImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletTagImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletTagImpl.java
index c97dc79..fed8f8f 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletTagImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletTagImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements.facelets;
+package org.apache.myfaces.config.impl.elements.facelets;
import java.io.Serializable;
import org.apache.myfaces.config.element.facelets.FaceletTag;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletTagLibraryImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletTagLibraryImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletTagLibraryImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletTagLibraryImpl.java
index 5d54249..0faca0a 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletTagLibraryImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletTagLibraryImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements.facelets;
+package org.apache.myfaces.config.impl.elements.facelets;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletValidatorTagImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletValidatorTagImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletValidatorTagImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletValidatorTagImpl.java
index 0a4cdec..57e958b 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/facelets/FaceletValidatorTagImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletValidatorTagImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.config.impl.digester.elements.facelets;
+package org.apache.myfaces.config.impl.elements.facelets;
import java.io.Serializable;
import org.apache.myfaces.config.element.facelets.FaceletValidatorTag;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfigUnmarshallerImpl.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfigUnmarshallerImpl.java
index 12e19ef..c1e82a9 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfigUnmarshallerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfigUnmarshallerImpl.java
@@ -28,15 +28,15 @@ import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import org.apache.myfaces.config.ConfigFilesXmlValidationUtils;
import org.apache.myfaces.config.element.facelets.FaceletTagLibrary;
-import org.apache.myfaces.config.impl.digester.elements.facelets.FaceletBehaviorTagImpl;
-import org.apache.myfaces.config.impl.digester.elements.facelets.FaceletComponentTagImpl;
-import org.apache.myfaces.config.impl.digester.elements.facelets.FaceletConverterTagImpl;
-import org.apache.myfaces.config.impl.digester.elements.facelets.FaceletFunctionImpl;
-import org.apache.myfaces.config.impl.digester.elements.facelets.FaceletHandlerTagImpl;
-import org.apache.myfaces.config.impl.digester.elements.facelets.FaceletSourceTagImpl;
-import org.apache.myfaces.config.impl.digester.elements.facelets.FaceletTagImpl;
-import org.apache.myfaces.config.impl.digester.elements.facelets.FaceletTagLibraryImpl;
-import org.apache.myfaces.config.impl.digester.elements.facelets.FaceletValidatorTagImpl;
+import org.apache.myfaces.config.impl.elements.facelets.FaceletBehaviorTagImpl;
+import org.apache.myfaces.config.impl.elements.facelets.FaceletComponentTagImpl;
+import org.apache.myfaces.config.impl.elements.facelets.FaceletConverterTagImpl;
+import org.apache.myfaces.config.impl.elements.facelets.FaceletFunctionImpl;
+import org.apache.myfaces.config.impl.elements.facelets.FaceletHandlerTagImpl;
+import org.apache.myfaces.config.impl.elements.facelets.FaceletSourceTagImpl;
+import org.apache.myfaces.config.impl.elements.facelets.FaceletTagImpl;
+import org.apache.myfaces.config.impl.elements.facelets.FaceletTagLibraryImpl;
+import org.apache.myfaces.config.impl.elements.facelets.FaceletValidatorTagImpl;
import org.apache.myfaces.config.MyfacesConfig;
import org.apache.myfaces.util.ClassUtils;
import org.xml.sax.Attributes;
diff --git a/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java b/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java
index d3f04d6..2b9af75 100644
--- a/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java
@@ -36,7 +36,7 @@ import javax.faces.application.NavigationCase;
import org.apache.myfaces.config.RuntimeConfig;
import org.apache.myfaces.config.element.NavigationRule;
-import org.apache.myfaces.config.impl.digester.DigesterlessFacesConfigUnmarshallerImpl;
+import org.apache.myfaces.config.impl.FacesConfigUnmarshallerImpl;
import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.junit.Assert;
import org.junit.Test;
@@ -45,7 +45,7 @@ import org.xml.sax.SAXException;
public class NavigationHandlerImplTest extends AbstractJsfTestCase
{
- private DigesterlessFacesConfigUnmarshallerImpl _digesterFacesConfigUnmarshaller;
+ private FacesConfigUnmarshallerImpl _facesConfigUnmarshaller;
public NavigationHandlerImplTest()
{
@@ -56,7 +56,7 @@ public class NavigationHandlerImplTest extends AbstractJsfTestCase
public void setUp() throws Exception
{
super.setUp();
- _digesterFacesConfigUnmarshaller = new DigesterlessFacesConfigUnmarshallerImpl(
+ _facesConfigUnmarshaller = new FacesConfigUnmarshallerImpl(
externalContext);
}
@@ -72,7 +72,7 @@ public class NavigationHandlerImplTest extends AbstractJsfTestCase
@Override
public void tearDown() throws Exception
{
- _digesterFacesConfigUnmarshaller = null;
+ _facesConfigUnmarshaller = null;
super.tearDown();
}
@@ -82,7 +82,7 @@ public class NavigationHandlerImplTest extends AbstractJsfTestCase
RuntimeConfig runtimeConfig = RuntimeConfig
.getCurrentInstance(externalContext);
- org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl config = _digesterFacesConfigUnmarshaller
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl config = _facesConfigUnmarshaller
.getFacesConfig(getClass().getResourceAsStream(file), file);
for (NavigationRule rule : config.getNavigationRules())
diff --git a/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java b/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java
index 074864c..6996410 100644
--- a/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java
@@ -22,9 +22,9 @@ import java.util.Collection;
import java.util.List;
import org.apache.myfaces.config.element.NavigationRule;
-import org.apache.myfaces.config.impl.digester.DigesterFacesConfigDispenserImpl;
-import org.apache.myfaces.config.impl.digester.DigesterlessFacesConfigUnmarshallerImpl;
-import org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl;
+import org.apache.myfaces.config.impl.FacesConfigDispenserImpl;
+import org.apache.myfaces.config.impl.FacesConfigUnmarshallerImpl;
+import org.apache.myfaces.config.impl.elements.FacesConfigImpl;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
public class FacesConfigValidatorTestCase extends AbstractJsfTestCase
@@ -43,8 +43,8 @@ public class FacesConfigValidatorTestCase extends AbstractJsfTestCase
super.setUp();
- dispenser = new DigesterFacesConfigDispenserImpl();
- unmarshaller = new DigesterlessFacesConfigUnmarshallerImpl(externalContext);
+ dispenser = new FacesConfigDispenserImpl();
+ unmarshaller = new FacesConfigUnmarshallerImpl(externalContext);
try
{
ByteArrayInputStream bais = new ByteArrayInputStream(testFacesConfig.getBytes());
diff --git a/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java b/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java
index c03a1fe..fa20c0f 100644
--- a/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java
+++ b/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java
@@ -17,10 +17,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.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.config.impl.elements.AbsoluteOrderingImpl;
+import org.apache.myfaces.config.impl.elements.ConfigOthersSlotImpl;
+import org.apache.myfaces.config.impl.elements.FacesConfigNameSlotImpl;
+import org.apache.myfaces.config.impl.elements.OrderingImpl;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
import javax.faces.FacesException;
@@ -29,13 +29,13 @@ import java.util.Collections;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.myfaces.config.impl.digester.DigesterlessFacesConfigUnmarshallerImpl;
+import org.apache.myfaces.config.impl.FacesConfigUnmarshallerImpl;
public class OrderingFacesConfigTest extends AbstractJsfTestCase
{
private static final Logger log = Logger.getLogger(OrderingFacesConfigTest.class.getName());
- private DigesterlessFacesConfigUnmarshallerImpl _impl;
+ private FacesConfigUnmarshallerImpl _impl;
public OrderingFacesConfigTest(String name)
{
@@ -45,7 +45,7 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
protected void setUp() throws Exception
{
super.setUp();
- _impl = new DigesterlessFacesConfigUnmarshallerImpl(null);
+ _impl = new FacesConfigUnmarshallerImpl(null);
}
public void printFacesConfigList(String label, List<FacesConfig> appConfigResources)
@@ -125,11 +125,11 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
{
FacesConfig cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
"empty-config.xml"), "empty-config.xml");
- 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.elements.FacesConfigImpl cfgA = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl cfgB = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl cfgC = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl cfgD = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl cfgE = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
cfgA.setName("A");
cfgB.setName("B");
@@ -199,11 +199,11 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
*/
public void testMaxConditionsOrdering() throws Exception
{
- org.apache.myfaces.config.impl.digester.elements.FacesConfigImpl cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
"empty-config.xml"), "empty-config.xml");
- 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.elements.FacesConfigImpl cfgA = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl cfgB = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl cfgC = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
cfgA.setName("A");
cfgB.setName("B");
@@ -249,12 +249,12 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
public void testEx1()
{
- 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();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl cfgA = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl cfgB = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl cfgC = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl cfgD = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl cfgE = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl cfgF = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
cfgA.setName("A");
cfgB.setName("B");
@@ -300,12 +300,12 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
public void testEx2()
{
- 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();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl cfg = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl cfgB = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl cfgC = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl cfgD = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl cfgE = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl cfgF = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
cfgB.setName("B");
cfgC.setName("C");
@@ -346,10 +346,10 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
public void testEx3()
{
- 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.elements.FacesConfigImpl cfgA = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl cfgB = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl cfgC = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl cfgD = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
cfgA.setName("A");
cfgB.setName("B");
@@ -856,9 +856,9 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
public void testAbsoluteOrdering1() throws Exception
{
- 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();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl cfgAbs = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl cfgMK = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
+ org.apache.myfaces.config.impl.elements.FacesConfigImpl cfgOWB = new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
cfgMK.setName("cz_markoc_faces");
diff --git a/impl/src/test/java/org/apache/myfaces/config/impl/digister/DigesterFacesConfigUnmarshallerImplTest.java b/impl/src/test/java/org/apache/myfaces/config/impl/digister/FacesConfigUnmarshallerImplTest.java
similarity index 95%
rename from impl/src/test/java/org/apache/myfaces/config/impl/digister/DigesterFacesConfigUnmarshallerImplTest.java
rename to impl/src/test/java/org/apache/myfaces/config/impl/digister/FacesConfigUnmarshallerImplTest.java
index 2232e4f..26e6f65 100644
--- a/impl/src/test/java/org/apache/myfaces/config/impl/digister/DigesterFacesConfigUnmarshallerImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/config/impl/digister/FacesConfigUnmarshallerImplTest.java
@@ -19,7 +19,7 @@ import java.util.List;
import junit.framework.TestCase;
-import org.apache.myfaces.config.impl.digester.DigesterlessFacesConfigUnmarshallerImpl;
+import org.apache.myfaces.config.impl.FacesConfigUnmarshallerImpl;
import org.apache.myfaces.config.element.Application;
import org.apache.myfaces.config.element.ContractMapping;
import org.apache.myfaces.config.element.FacesConfig;
@@ -31,13 +31,13 @@ import org.apache.myfaces.config.element.OrderSlot;
* @author Mathias Broekelmann (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public class DigesterFacesConfigUnmarshallerImplTest extends TestCase
+public class FacesConfigUnmarshallerImplTest extends TestCase
{
- private DigesterlessFacesConfigUnmarshallerImpl _impl;
+ private FacesConfigUnmarshallerImpl _impl;
protected void setUp() throws Exception
{
- _impl = new DigesterlessFacesConfigUnmarshallerImpl(null);
+ _impl = new FacesConfigUnmarshallerImpl(null);
}
public void testEmptyConfig() throws Exception
@@ -119,7 +119,7 @@ public class DigesterFacesConfigUnmarshallerImplTest extends TestCase
assertEquals("b", ((FacesConfigNameSlot) orderList.get(0)).getName());
assertEquals("c", ((FacesConfigNameSlot) orderList.get(1)).getName());
assertEquals("d", ((FacesConfigNameSlot) orderList.get(2)).getName());
- assertEquals(org.apache.myfaces.config.impl.digester.elements.ConfigOthersSlotImpl.class, orderList.get(3).getClass());
+ assertEquals(org.apache.myfaces.config.impl.elements.ConfigOthersSlotImpl.class, orderList.get(3).getClass());
assertTrue(cfg.getApplications().isEmpty());
assertTrue(cfg.getComponents().isEmpty());
@@ -141,7 +141,7 @@ public class DigesterFacesConfigUnmarshallerImplTest extends TestCase
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.ConfigOthersSlotImpl.class, orderList.get(2).getClass());
+ assertEquals(org.apache.myfaces.config.impl.elements.ConfigOthersSlotImpl.class, orderList.get(2).getClass());
orderList = cfg.getOrdering().getAfterList();
assertEquals("d", ((FacesConfigNameSlot) orderList.get(0)).getName());
diff --git a/impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesTestCase.java b/impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesTestCase.java
index 25b13fd..cc2c4a5 100644
--- a/impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesTestCase.java
@@ -66,7 +66,7 @@ import org.apache.myfaces.config.DefaultFacesConfigurationProvider;
import org.apache.myfaces.config.RuntimeConfig;
import org.apache.myfaces.config.annotation.NoInjectionAnnotationLifecycleProvider;
import org.apache.myfaces.config.element.FacesConfig;
-import org.apache.myfaces.config.impl.digester.elements.FactoryImpl;
+import org.apache.myfaces.config.impl.elements.FactoryImpl;
import org.apache.myfaces.lifecycle.LifecycleImpl;
import org.apache.myfaces.lifecycle.ViewNotFoundException;
import org.apache.myfaces.test.core.annotation.DeclareFacesConfig;
diff --git a/impl/src/test/java/org/apache/myfaces/test/core/runner/AbstractJsfTestContainer.java b/impl/src/test/java/org/apache/myfaces/test/core/runner/AbstractJsfTestContainer.java
index 1beeca8..13a4e7d 100644
--- a/impl/src/test/java/org/apache/myfaces/test/core/runner/AbstractJsfTestContainer.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/runner/AbstractJsfTestContainer.java
@@ -64,7 +64,7 @@ import org.apache.myfaces.config.DefaultFacesConfigurationProvider;
import org.apache.myfaces.config.RuntimeConfig;
import org.apache.myfaces.config.annotation.NoInjectionAnnotationLifecycleProvider;
import org.apache.myfaces.config.element.FacesConfig;
-import org.apache.myfaces.config.impl.digester.elements.FactoryImpl;
+import org.apache.myfaces.config.impl.elements.FactoryImpl;
import org.apache.myfaces.lifecycle.LifecycleImpl;
import org.apache.myfaces.lifecycle.ViewNotFoundException;
import org.apache.myfaces.test.core.annotation.BeforeJSFInit;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletMultipleRequestsTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletMultipleRequestsTestCase.java
index cf5764f..4fcd076 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletMultipleRequestsTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletMultipleRequestsTestCase.java
@@ -48,8 +48,8 @@ import org.apache.myfaces.config.element.ClientBehaviorRenderer;
import org.apache.myfaces.config.element.FacesConfig;
import org.apache.myfaces.config.element.Renderer;
import org.apache.myfaces.config.element.facelets.FaceletTagLibrary;
-import org.apache.myfaces.config.impl.digester.DigesterFacesConfigDispenserImpl;
-import org.apache.myfaces.config.impl.digester.DigesterlessFacesConfigUnmarshallerImpl;
+import org.apache.myfaces.config.impl.FacesConfigDispenserImpl;
+import org.apache.myfaces.config.impl.FacesConfigUnmarshallerImpl;
import org.apache.myfaces.context.PartialViewContextFactoryImpl;
import org.apache.myfaces.application.ViewIdSupport;
import org.apache.myfaces.util.ClassUtils;
@@ -297,9 +297,9 @@ public abstract class FaceletMultipleRequestsTestCase extends AbstractJsfConfigu
{
InputStream stream = ClassUtils
.getResourceAsStream("META-INF/standard-faces-config.xml");
- FacesConfigUnmarshaller<? extends FacesConfig> unmarshaller = new DigesterlessFacesConfigUnmarshallerImpl(
+ FacesConfigUnmarshaller<? extends FacesConfig> unmarshaller = new FacesConfigUnmarshallerImpl(
externalContext);
- dispenser = new DigesterFacesConfigDispenserImpl();
+ dispenser = new FacesConfigDispenserImpl();
dispenser.feed(unmarshaller.getFacesConfig(stream,
"META-INF/standard-faces-config.xml"));
}
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletTestCase.java
index e24b6a1..98c7ad4 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletTestCase.java
@@ -49,8 +49,8 @@ import org.apache.myfaces.config.element.ClientBehaviorRenderer;
import org.apache.myfaces.config.element.FacesConfig;
import org.apache.myfaces.config.element.Renderer;
import org.apache.myfaces.config.element.facelets.FaceletTagLibrary;
-import org.apache.myfaces.config.impl.digester.DigesterFacesConfigDispenserImpl;
-import org.apache.myfaces.config.impl.digester.DigesterlessFacesConfigUnmarshallerImpl;
+import org.apache.myfaces.config.impl.FacesConfigDispenserImpl;
+import org.apache.myfaces.config.impl.FacesConfigUnmarshallerImpl;
import org.apache.myfaces.context.PartialViewContextFactoryImpl;
import org.apache.myfaces.application.ViewIdSupport;
import org.apache.myfaces.util.ClassUtils;
@@ -273,9 +273,9 @@ public abstract class FaceletTestCase extends AbstractJsfConfigurableMockTestCas
{
InputStream stream = ClassUtils
.getResourceAsStream("META-INF/standard-faces-config.xml");
- FacesConfigUnmarshaller<? extends FacesConfig> unmarshaller = new DigesterlessFacesConfigUnmarshallerImpl(
+ FacesConfigUnmarshaller<? extends FacesConfig> unmarshaller = new FacesConfigUnmarshallerImpl(
externalContext);
- dispenser = new DigesterFacesConfigDispenserImpl();
+ dispenser = new FacesConfigDispenserImpl();
dispenser.feed(unmarshaller.getFacesConfig(stream,
"META-INF/standard-faces-config.xml"));
}
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/JSPXFaceletsProcessingTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/JSPXFaceletsProcessingTestCase.java
index 3d6be5c..ee2d864 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/JSPXFaceletsProcessingTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/JSPXFaceletsProcessingTestCase.java
@@ -35,7 +35,7 @@ import javax.faces.component.html.HtmlSelectOneMenu;
import org.junit.Assert;
import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.config.impl.digester.elements.FaceletsProcessingImpl;
+import org.apache.myfaces.config.impl.elements.FaceletsProcessingImpl;
import org.apache.myfaces.renderkit.html.HtmlFormRenderer;
import org.apache.myfaces.renderkit.html.HtmlGridRenderer;
import org.apache.myfaces.renderkit.html.HtmlMenuRenderer;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/XHTMLFaceletsProcessingTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/XHTMLFaceletsProcessingTestCase.java
index b18e253..e60f822 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/XHTMLFaceletsProcessingTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/XHTMLFaceletsProcessingTestCase.java
@@ -34,7 +34,7 @@ import javax.faces.component.html.HtmlSelectOneMenu;
import org.junit.Assert;
import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.config.impl.digester.elements.FaceletsProcessingImpl;
+import org.apache.myfaces.config.impl.elements.FaceletsProcessingImpl;
import org.apache.myfaces.renderkit.html.HtmlFormRenderer;
import org.apache.myfaces.renderkit.html.HtmlGridRenderer;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/XMLFaceletsProcessingTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/XMLFaceletsProcessingTestCase.java
index 5a1f7e6..1e476e3 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/XMLFaceletsProcessingTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/XMLFaceletsProcessingTestCase.java
@@ -35,7 +35,7 @@ import javax.faces.component.html.HtmlSelectOneMenu;
import org.junit.Assert;
import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.config.impl.digester.elements.FaceletsProcessingImpl;
+import org.apache.myfaces.config.impl.elements.FaceletsProcessingImpl;
import org.apache.myfaces.renderkit.html.HtmlFormRenderer;
import org.apache.myfaces.renderkit.html.HtmlGridRenderer;
import org.apache.myfaces.renderkit.html.HtmlMenuRenderer;
diff --git a/parent/pom.xml b/parent/pom.xml
index 847aeb2..5d79d5a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -422,12 +422,6 @@
<version>1.9.3</version>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.8</version>
- <scope>compile</scope>
- </dependency>
<!-- tomcat 7 support (LifecycleProvider) -->
diff --git a/test/pom.xml b/test/pom.xml
index e64ae72..c6fcd5b 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -61,12 +61,13 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.2_spec</artifactId>
</dependency>
-
+
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
+ <version>1.8</version>
</dependency>
-
+
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>