myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tandrasc...@apache.org
Subject [myfaces] branch master updated: refactored
Date Tue, 13 Aug 2019 13:07:39 GMT
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 397ec03  refactored
397ec03 is described below

commit 397ec0395c0643e78c9f68dfe0b511565344d15e
Author: Thomas Andraschko <tandraschko@apache.org>
AuthorDate: Tue Aug 13 15:07:31 2019 +0200

    refactored
---
 bundle/pom.xml                                     | 45 +++++---------
 .../config/DefaultFacesConfigurationProvider.java  | 24 ++++----
 .../config/annotation/AnnotationConfigurator.java  | 34 +++++-----
 .../config/impl/FacesConfigDispenserImpl.java      |  2 +-
 .../config/impl/FacesConfigUnmarshallerImpl.java   | 72 +++++++++++-----------
 .../AbsoluteOrderingImpl.java                      |  2 +-
 .../{elements => element}/ApplicationImpl.java     |  2 +-
 .../impl/{elements => element}/AttributeImpl.java  |  2 +-
 .../impl/{elements => element}/BehaviorImpl.java   |  2 +-
 .../ClientBehaviorRendererImpl.java                |  2 +-
 .../impl/{elements => element}/ComponentImpl.java  |  2 +-
 .../ComponentTagDeclarationImpl.java               |  2 +-
 .../ConfigOthersSlotImpl.java                      |  2 +-
 .../{elements => element}/ContractMappingImpl.java |  2 +-
 .../impl/{elements => element}/ConverterImpl.java  |  2 +-
 .../FaceletsProcessingImpl.java                    |  2 +-
 .../FaceletsTemplateMappingImpl.java               |  2 +-
 .../impl/{elements => element}/FacesConfig.java    |  2 +-
 .../FacesConfigExtensionImpl.java                  |  2 +-
 .../{elements => element}/FacesConfigImpl.java     |  2 +-
 .../FacesConfigNameSlotImpl.java                   |  2 +-
 .../{elements => element}/FacesFlowCallImpl.java   |  2 +-
 .../FacesFlowDefinitionImpl.java                   |  2 +-
 .../FacesFlowMethodCallImpl.java                   |  2 +-
 .../FacesFlowMethodParameterImpl.java              |  2 +-
 .../FacesFlowParameterImpl.java                    |  2 +-
 .../FacesFlowReferenceImpl.java                    |  2 +-
 .../{elements => element}/FacesFlowReturnImpl.java |  2 +-
 .../{elements => element}/FacesFlowSwitchImpl.java |  2 +-
 .../{elements => element}/FacesFlowViewImpl.java   |  2 +-
 .../impl/{elements => element}/FactoryImpl.java    |  2 +-
 .../{elements => element}/LocaleConfigImpl.java    |  2 +-
 .../impl/{elements => element}/NamedEventImpl.java |  2 +-
 .../{elements => element}/NavigationCaseImpl.java  |  2 +-
 .../{elements => element}/NavigationRuleImpl.java  |  2 +-
 .../impl/{elements => element}/OrderSlotImpl.java  |  2 +-
 .../impl/{elements => element}/OrderingImpl.java   |  2 +-
 .../impl/{elements => element}/PropertyImpl.java   |  2 +-
 .../impl/{elements => element}/RedirectImpl.java   |  2 +-
 .../impl/{elements => element}/RenderKitImpl.java  |  2 +-
 .../impl/{elements => element}/RendererImpl.java   |  2 +-
 .../{elements => element}/ResourceBundleImpl.java  |  2 +-
 .../SystemEventListenerImpl.java                   |  2 +-
 .../impl/{elements => element}/ViewParamImpl.java  |  2 +-
 .../{elements => element}/ViewPoolMappingImpl.java |  2 +-
 .../ViewPoolParameterImpl.java                     |  2 +-
 .../facelets/FaceletBehaviorTagImpl.java           |  2 +-
 .../facelets/FaceletComponentTagImpl.java          |  2 +-
 .../facelets/FaceletConverterTagImpl.java          |  2 +-
 .../facelets/FaceletFunctionImpl.java              |  2 +-
 .../facelets/FaceletHandlerTagImpl.java            |  2 +-
 .../facelets/FaceletSourceTagImpl.java             |  2 +-
 .../facelets/FaceletTagImpl.java                   |  2 +-
 .../facelets/FaceletTagLibraryImpl.java            |  2 +-
 .../facelets/FaceletValidatorTagImpl.java          |  2 +-
 .../compiler/TagLibraryConfigUnmarshallerImpl.java | 18 +++---
 .../application/NavigationHandlerImplTest.java     |  2 +-
 .../config/FacesConfigValidatorTestCase.java       |  2 +-
 .../myfaces/config/OrderingFacesConfigTest.java    | 64 +++++++++----------
 .../digister/FacesConfigUnmarshallerImplTest.java  |  4 +-
 .../myfaces/test/core/AbstractMyFacesTestCase.java |  2 +-
 .../test/core/runner/AbstractJsfTestContainer.java |  2 +-
 .../compiler/JSPXFaceletsProcessingTestCase.java   |  2 +-
 .../compiler/XHTMLFaceletsProcessingTestCase.java  |  2 +-
 .../compiler/XMLFaceletsProcessingTestCase.java    |  2 +-
 65 files changed, 182 insertions(+), 195 deletions(-)

diff --git a/bundle/pom.xml b/bundle/pom.xml
index 08db5fa..3e13584 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -46,36 +46,23 @@
                         <Implementation-Vendor-Id>${project.groupId}</Implementation-Vendor-Id>
                         <Export-Package>
                             javax.faces.*;version="${project.version}",
-                            org.apache.myfaces.application;version="${project.version}",
-                            org.apache.myfaces.application.cdi;version="${project.version}",
-                            org.apache.myfaces.application.jsp;version="${project.version}",
-                            org.apache.myfaces.application.viewstate;version="${project.version}",
-                            org.apache.myfaces.cdi.dependent;version="${project.version}",
-                            org.apache.myfaces.cdi.impl;version="${project.version}",
-                            org.apache.myfaces.cdi.util;version="${project.version}",
-                            org.apache.myfaces.cdi.view;version="${project.version}",
-                            org.apache.myfaces.component;version="${project.version}",
-                            org.apache.myfaces.component.visit;version="${project.version}",
-                            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.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}",
-                            org.apache.myfaces.flow.impl;version="${project.version}",
-                            org.apache.myfaces.shared_impl.webapp.webxml;version="${project.version}",
-                            org.apache.myfaces.shared.taglib;version="${project.version}",
-                            org.apache.myfaces.shared.taglib.core;version="${project.version}",
-                            org.apache.myfaces.spi;version="${project.version}",
+                            org.apache.myfaces.application.*;version="${project.version}",
+                            org.apache.myfaces.cdi.*;version="${project.version}",
+                            org.apache.myfaces.component.*;version="${project.version}",
+                            org.apache.myfaces.config.*;version="${project.version}",
+                            org.apache.myfaces.context.*;version="${project.version}",
+                            org.apache.myfaces.el.*;version="${project.version}",
+                            org.apache.myfaces.event.*;version="${project.version}",
+                            org.apache.myfaces.flow.*;version="${project.version}",
+                            org.apache.myfaces.lifecycle.*;version="${project.version}",
+                            org.apache.myfaces.push.*;version="${project.version}",
+                            org.apache.myfaces.renderkit.*;version="${project.version}",
+                            org.apache.myfaces.resource.*;version="${project.version}",
+                            org.apache.myfaces.spi.*;version="${project.version}",
                             org.apache.myfaces.taglib.*;version="${project.version}",
-                            org.apache.myfaces.ee;version="${project.version}",
-                            org.apache.myfaces.view;version="${project.version}",
-                            org.apache.myfaces.view.facelets.el;version="${project.version}",
-                            org.apache.myfaces.view.facelets.component;version="${project.version}",
-                            org.apache.myfaces.view.facelets.tag.jsf;version="${project.version}",
-                            org.apache.myfaces.webapp;version="${project.version}"
+                            org.apache.myfaces.util.*;version="${project.version}",
+                            org.apache.myfaces.view.*;version="${project.version}",
+                            org.apache.myfaces.webapp.*;version="${project.version}"
                         </Export-Package>
                         <Import-Package>
                             !org.apache.myfaces.*,
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 3b5ecf4..d36929f 100644
--- a/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
@@ -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.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.config.impl.element.FacesConfigImpl;
+import org.apache.myfaces.config.impl.element.FacesFlowDefinitionImpl;
+import org.apache.myfaces.config.impl.element.FacesFlowReturnImpl;
+import org.apache.myfaces.config.impl.element.NavigationCaseImpl;
 import org.apache.myfaces.util.lang.FastWriter;
 import org.apache.myfaces.util.WebConfigParamUtils;
 import org.apache.myfaces.spi.FaceletConfigResourceProvider;
@@ -194,10 +194,10 @@ public class DefaultFacesConfigurationProvider extends FacesConfigurationProvide
     {
         try
         {
-            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();
+            org.apache.myfaces.config.impl.element.FacesConfigImpl facesConfig
+                    = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
+            org.apache.myfaces.config.impl.element.FactoryImpl factory
+                    = new org.apache.myfaces.config.impl.element.FactoryImpl();
             
             facesConfig.addFactory(factory);
             
@@ -764,8 +764,8 @@ public class DefaultFacesConfigurationProvider extends FacesConfigurationProvide
                     FaceletTagLibrary tl = TagLibraryConfigUnmarshallerImpl.create(externalContext, src);
                     if (tl != null)
                     {
-                        org.apache.myfaces.config.impl.elements.FacesConfigImpl config = 
-                            new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
+                        org.apache.myfaces.config.impl.element.FacesConfigImpl config = 
+                            new org.apache.myfaces.config.impl.element.FacesConfigImpl();
                         config.addFaceletTagLibrary(tl);
                         facesConfigFilesList.add(config);
                     }
@@ -794,8 +794,8 @@ public class DefaultFacesConfigurationProvider extends FacesConfigurationProvide
                     FaceletTagLibrary tl = TagLibraryConfigUnmarshallerImpl.create(externalContext, url);
                     if (tl != null)
                     {
-                        org.apache.myfaces.config.impl.elements.FacesConfigImpl config = 
-                            new org.apache.myfaces.config.impl.elements.FacesConfigImpl();
+                        org.apache.myfaces.config.impl.element.FacesConfigImpl config = 
+                            new org.apache.myfaces.config.impl.element.FacesConfigImpl();
                         config.addFaceletTagLibrary(tl);
                         facesConfigFilesList.add(config);
                     }
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 2c9b1a3..37dd6a6 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
@@ -37,11 +37,11 @@ import javax.faces.render.RenderKitFactory;
 import javax.faces.validator.FacesValidator;
 import javax.faces.view.facelets.FaceletsResourceResolver;
 
-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.config.impl.element.ApplicationImpl;
+import org.apache.myfaces.config.impl.element.BehaviorImpl;
+import org.apache.myfaces.config.impl.element.ComponentTagDeclarationImpl;
+import org.apache.myfaces.config.impl.element.ConverterImpl;
+import org.apache.myfaces.config.impl.element.FacesConfigImpl;
 import org.apache.myfaces.spi.AnnotationProvider;
 import org.apache.myfaces.spi.AnnotationProviderFactory;
 import org.apache.myfaces.util.lang.StringUtils;
@@ -229,18 +229,18 @@ public class AnnotationConfigurator
                                 + ", " + clazz.getName() + ')');
                     }
 
-                    org.apache.myfaces.config.impl.elements.RenderKitImpl renderKit =
-                            (org.apache.myfaces.config.impl.elements.RenderKitImpl)
+                    org.apache.myfaces.config.impl.element.RenderKitImpl renderKit =
+                            (org.apache.myfaces.config.impl.element.RenderKitImpl)
                                     facesConfig.getRenderKit(renderKitId);
                     if (renderKit == null)
                     {
-                        renderKit = new org.apache.myfaces.config.impl.elements.RenderKitImpl();
+                        renderKit = new org.apache.myfaces.config.impl.element.RenderKitImpl();
                         renderKit.setId(renderKitId);
                         facesConfig.addRenderKit(renderKit);
                     }
 
-                    org.apache.myfaces.config.impl.elements.RendererImpl renderer =
-                            new org.apache.myfaces.config.impl.elements.RendererImpl();
+                    org.apache.myfaces.config.impl.element.RendererImpl renderer =
+                            new org.apache.myfaces.config.impl.element.RendererImpl();
                     renderer.setComponentFamily(rend.componentFamily());
                     renderer.setRendererClass(clazz.getName());
                     renderer.setRendererType(rend.rendererType());
@@ -297,8 +297,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.elements.NamedEventImpl namedEventConfig =
-                        new org.apache.myfaces.config.impl.elements.NamedEventImpl();
+                org.apache.myfaces.config.impl.element.NamedEventImpl namedEventConfig =
+                        new org.apache.myfaces.config.impl.element.NamedEventImpl();
                 namedEventConfig.setEventClass(clazz.getName());
                 namedEventConfig.setShortName(namedEvent.shortName());
                 facesConfig.addNamedEvent(namedEventConfig);
@@ -357,18 +357,18 @@ public class AnnotationConfigurator
                                + clazz.getName() + ')');
                 }
 
-                org.apache.myfaces.config.impl.elements.RenderKitImpl renderKit =
-                        (org.apache.myfaces.config.impl.elements.RenderKitImpl)
+                org.apache.myfaces.config.impl.element.RenderKitImpl renderKit =
+                        (org.apache.myfaces.config.impl.element.RenderKitImpl)
                                 facesConfig.getRenderKit(renderKitId);
                 if (renderKit == null)
                 {
-                    renderKit = new org.apache.myfaces.config.impl.elements.RenderKitImpl();
+                    renderKit = new org.apache.myfaces.config.impl.element.RenderKitImpl();
                     renderKit.setId(renderKitId);
                     facesConfig.addRenderKit(renderKit);
                 }
 
-                org.apache.myfaces.config.impl.elements.ClientBehaviorRendererImpl cbr =
-                        new org.apache.myfaces.config.impl.elements.ClientBehaviorRendererImpl();
+                org.apache.myfaces.config.impl.element.ClientBehaviorRendererImpl cbr =
+                        new org.apache.myfaces.config.impl.element.ClientBehaviorRendererImpl();
                 cbr.setRendererType(facesBehaviorRenderer.rendererType());
                 cbr.setRendererClass(clazz.getName());
                 renderKit.addClientBehaviorRenderer(cbr);
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigDispenserImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigDispenserImpl.java
index f89e6ff..1245795 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigDispenserImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigDispenserImpl.java
@@ -51,7 +51,7 @@ 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.elements.RenderKitImpl;
+import org.apache.myfaces.config.impl.element.RenderKitImpl;
 
 /**
  * @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigUnmarshallerImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigUnmarshallerImpl.java
index 65ffde7..7a5874a 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigUnmarshallerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigUnmarshallerImpl.java
@@ -28,42 +28,42 @@ 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.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.apache.myfaces.config.impl.element.AbsoluteOrderingImpl;
+import org.apache.myfaces.config.impl.element.ApplicationImpl;
+import org.apache.myfaces.config.impl.element.AttributeImpl;
+import org.apache.myfaces.config.impl.element.BehaviorImpl;
+import org.apache.myfaces.config.impl.element.ClientBehaviorRendererImpl;
+import org.apache.myfaces.config.impl.element.ConfigOthersSlotImpl;
+import org.apache.myfaces.config.impl.element.ContractMappingImpl;
+import org.apache.myfaces.config.impl.element.ConverterImpl;
+import org.apache.myfaces.config.impl.element.FaceletsProcessingImpl;
+import org.apache.myfaces.config.impl.element.FaceletsTemplateMappingImpl;
+import org.apache.myfaces.config.impl.element.FacesConfigExtensionImpl;
+import org.apache.myfaces.config.impl.element.FacesConfigImpl;
+import org.apache.myfaces.config.impl.element.FacesConfigNameSlotImpl;
+import org.apache.myfaces.config.impl.element.FacesFlowCallImpl;
+import org.apache.myfaces.config.impl.element.FacesFlowDefinitionImpl;
+import org.apache.myfaces.config.impl.element.FacesFlowMethodCallImpl;
+import org.apache.myfaces.config.impl.element.FacesFlowMethodParameterImpl;
+import org.apache.myfaces.config.impl.element.FacesFlowParameterImpl;
+import org.apache.myfaces.config.impl.element.FacesFlowReferenceImpl;
+import org.apache.myfaces.config.impl.element.FacesFlowReturnImpl;
+import org.apache.myfaces.config.impl.element.FacesFlowSwitchImpl;
+import org.apache.myfaces.config.impl.element.FacesFlowViewImpl;
+import org.apache.myfaces.config.impl.element.FactoryImpl;
+import org.apache.myfaces.config.impl.element.LocaleConfigImpl;
+import org.apache.myfaces.config.impl.element.NavigationCaseImpl;
+import org.apache.myfaces.config.impl.element.NavigationRuleImpl;
+import org.apache.myfaces.config.impl.element.OrderingImpl;
+import org.apache.myfaces.config.impl.element.PropertyImpl;
+import org.apache.myfaces.config.impl.element.RedirectImpl;
+import org.apache.myfaces.config.impl.element.RenderKitImpl;
+import org.apache.myfaces.config.impl.element.RendererImpl;
+import org.apache.myfaces.config.impl.element.ResourceBundleImpl;
+import org.apache.myfaces.config.impl.element.SystemEventListenerImpl;
+import org.apache.myfaces.config.impl.element.ViewParamImpl;
+import org.apache.myfaces.config.impl.element.ViewPoolMappingImpl;
+import org.apache.myfaces.config.impl.element.ViewPoolParameterImpl;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/AbsoluteOrderingImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/AbsoluteOrderingImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/AbsoluteOrderingImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/AbsoluteOrderingImpl.java
index ccd42c9..1acea3e 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/AbsoluteOrderingImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/AbsoluteOrderingImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ApplicationImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/ApplicationImpl.java
similarity index 99%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/ApplicationImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/ApplicationImpl.java
index a17d95e..a9b33cd 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ApplicationImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/ApplicationImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/AttributeImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/AttributeImpl.java
similarity index 98%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/AttributeImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/AttributeImpl.java
index dbbca0b..bf8dda1 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/AttributeImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/AttributeImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/BehaviorImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/BehaviorImpl.java
similarity index 98%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/BehaviorImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/BehaviorImpl.java
index 80fc02b..200c9a7 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/BehaviorImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/BehaviorImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ClientBehaviorRendererImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/ClientBehaviorRendererImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/ClientBehaviorRendererImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/ClientBehaviorRendererImpl.java
index 15781a0..2914413 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ClientBehaviorRendererImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/ClientBehaviorRendererImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ComponentImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/ComponentImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/ComponentImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/ComponentImpl.java
index ec1df0a..3a57a3c 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ComponentImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/ComponentImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ComponentTagDeclarationImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/ComponentTagDeclarationImpl.java
similarity index 93%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/ComponentTagDeclarationImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/ComponentTagDeclarationImpl.java
index f16be8a..d1f677e 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ComponentTagDeclarationImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/ComponentTagDeclarationImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 import org.apache.myfaces.config.element.ComponentTagDeclaration;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ConfigOthersSlotImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/ConfigOthersSlotImpl.java
similarity index 95%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/ConfigOthersSlotImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/ConfigOthersSlotImpl.java
index cc3e0f6..1f2007f 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ConfigOthersSlotImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/ConfigOthersSlotImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ContractMappingImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/ContractMappingImpl.java
similarity index 98%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/ContractMappingImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/ContractMappingImpl.java
index 35de2c1..9783047 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ContractMappingImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/ContractMappingImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ConverterImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/ConverterImpl.java
similarity index 98%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/ConverterImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/ConverterImpl.java
index a5fa309..bb4f1aa 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ConverterImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/ConverterImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FaceletsProcessingImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/FaceletsProcessingImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/FaceletsProcessingImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/FaceletsProcessingImpl.java
index 3c65860..d2ef8ac 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FaceletsProcessingImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/FaceletsProcessingImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 /**
  * 
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FaceletsTemplateMappingImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/FaceletsTemplateMappingImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/FaceletsTemplateMappingImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/FaceletsTemplateMappingImpl.java
index 998b334..186f27b 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FaceletsTemplateMappingImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/FaceletsTemplateMappingImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 import org.apache.myfaces.config.element.FaceletsTemplateMapping;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfig.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesConfig.java
similarity index 95%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfig.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/FacesConfig.java
index c1ff7ae..61851a1 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfig.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesConfig.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 /**
  * 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/elements/FacesConfigExtensionImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesConfigExtensionImpl.java
similarity index 98%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfigExtensionImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/FacesConfigExtensionImpl.java
index dd903a3..74554fb 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfigExtensionImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesConfigExtensionImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfigImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesConfigImpl.java
similarity index 99%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfigImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/FacesConfigImpl.java
index 6b97dc2..1e7ea32 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfigImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesConfigImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfigNameSlotImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesConfigNameSlotImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfigNameSlotImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/FacesConfigNameSlotImpl.java
index dde21ab..7765e7d 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesConfigNameSlotImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesConfigNameSlotImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowCallImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowCallImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowCallImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowCallImpl.java
index 949b017..98bbe9c 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowCallImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowCallImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowDefinitionImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowDefinitionImpl.java
similarity index 99%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowDefinitionImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowDefinitionImpl.java
index ea95009..151da07 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowDefinitionImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowDefinitionImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowMethodCallImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowMethodCallImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowMethodCallImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowMethodCallImpl.java
index 5d3069e..1e7a0d6 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowMethodCallImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowMethodCallImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowMethodParameterImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowMethodParameterImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowMethodParameterImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowMethodParameterImpl.java
index 6db0a1e..59fe666 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowMethodParameterImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowMethodParameterImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import org.apache.myfaces.config.element.FacesFlowMethodParameter;
 
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowParameterImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowParameterImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowParameterImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowParameterImpl.java
index ea3df95..620ef21 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowParameterImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowParameterImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 /**
  *
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowReferenceImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowReferenceImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowReferenceImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowReferenceImpl.java
index 2a65934..5458adc 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowReferenceImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowReferenceImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import org.apache.myfaces.config.element.FacesFlowReference;
 
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowReturnImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowReturnImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowReturnImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowReturnImpl.java
index 00b9445..2458659 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowReturnImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowReturnImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import org.apache.myfaces.config.element.NavigationCase;
 
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowSwitchImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowSwitchImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowSwitchImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowSwitchImpl.java
index 224cf15..3106057 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowSwitchImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowSwitchImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowViewImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowViewImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowViewImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowViewImpl.java
index c888b46..3c776fe 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FacesFlowViewImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/FacesFlowViewImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 /**
  *
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FactoryImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/FactoryImpl.java
similarity index 99%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/FactoryImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/FactoryImpl.java
index e26db96..063a570 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/FactoryImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/FactoryImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/LocaleConfigImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/LocaleConfigImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/LocaleConfigImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/LocaleConfigImpl.java
index 4e0d663..4a203d3 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/LocaleConfigImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/LocaleConfigImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/NamedEventImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/NamedEventImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/NamedEventImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/NamedEventImpl.java
index 83c024f..89754c4 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/NamedEventImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/NamedEventImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/NavigationCaseImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/NavigationCaseImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/NavigationCaseImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/NavigationCaseImpl.java
index a1b72e4..3f3d1c2 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/NavigationCaseImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/NavigationCaseImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/NavigationRuleImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/NavigationRuleImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/NavigationRuleImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/NavigationRuleImpl.java
index 4f08393..5c7367e 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/NavigationRuleImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/NavigationRuleImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/OrderSlotImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/OrderSlotImpl.java
similarity index 95%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/OrderSlotImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/OrderSlotImpl.java
index 6fd2614..a17b33a 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/OrderSlotImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/OrderSlotImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/OrderingImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/OrderingImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/OrderingImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/OrderingImpl.java
index 38fa666..48943a6 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/OrderingImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/OrderingImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/PropertyImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/PropertyImpl.java
similarity index 98%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/PropertyImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/PropertyImpl.java
index aafbb1e..600f473 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/PropertyImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/PropertyImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/RedirectImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/RedirectImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/RedirectImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/RedirectImpl.java
index b7ed5b5..a33e1c7 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/RedirectImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/RedirectImpl.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/RenderKitImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/RenderKitImpl.java
similarity index 98%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/RenderKitImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/RenderKitImpl.java
index 55a0c8c..6e32ad2 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/RenderKitImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/RenderKitImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/RendererImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/RendererImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/RendererImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/RendererImpl.java
index bb5ba34..38fcbb1 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/RendererImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/RendererImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ResourceBundleImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/ResourceBundleImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/ResourceBundleImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/ResourceBundleImpl.java
index 8d88c86..8649b46 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ResourceBundleImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/ResourceBundleImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/SystemEventListenerImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/SystemEventListenerImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/SystemEventListenerImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/SystemEventListenerImpl.java
index db8a578..b7e7f2a 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/SystemEventListenerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/SystemEventListenerImpl.java
@@ -17,7 +17,7 @@
  * under the License.
  */
  
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewParamImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/ViewParamImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewParamImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/ViewParamImpl.java
index 49e9b57..27c2a21 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewParamImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/ViewParamImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewPoolMappingImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/ViewPoolMappingImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewPoolMappingImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/ViewPoolMappingImpl.java
index 5d2b75a..77fa1c3 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewPoolMappingImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/ViewPoolMappingImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewPoolParameterImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/ViewPoolParameterImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewPoolParameterImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/ViewPoolParameterImpl.java
index ce924cf..66b4ee3 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/ViewPoolParameterImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/ViewPoolParameterImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements;
+package org.apache.myfaces.config.impl.element;
 
 import org.apache.myfaces.config.element.ViewPoolParameter;
 
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletBehaviorTagImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletBehaviorTagImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletBehaviorTagImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletBehaviorTagImpl.java
index 5d308b8..c214f87 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletBehaviorTagImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletBehaviorTagImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements.facelets;
+package org.apache.myfaces.config.impl.element.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/elements/facelets/FaceletComponentTagImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletComponentTagImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletComponentTagImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletComponentTagImpl.java
index 52c194c..3a0aa5a 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletComponentTagImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletComponentTagImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements.facelets;
+package org.apache.myfaces.config.impl.element.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/elements/facelets/FaceletConverterTagImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletConverterTagImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletConverterTagImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletConverterTagImpl.java
index c9e74aa..6e5e110 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletConverterTagImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletConverterTagImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements.facelets;
+package org.apache.myfaces.config.impl.element.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/elements/facelets/FaceletFunctionImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletFunctionImpl.java
similarity index 97%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletFunctionImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletFunctionImpl.java
index de82251..9c5b21f 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletFunctionImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletFunctionImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements.facelets;
+package org.apache.myfaces.config.impl.element.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/elements/facelets/FaceletHandlerTagImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletHandlerTagImpl.java
similarity index 95%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletHandlerTagImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletHandlerTagImpl.java
index a3f43c7..f94b5d4 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletHandlerTagImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletHandlerTagImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements.facelets;
+package org.apache.myfaces.config.impl.element.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/elements/facelets/FaceletSourceTagImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletSourceTagImpl.java
similarity index 95%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletSourceTagImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletSourceTagImpl.java
index ae2c9b7..b8ad741 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletSourceTagImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletSourceTagImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements.facelets;
+package org.apache.myfaces.config.impl.element.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/elements/facelets/FaceletTagImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletTagImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletTagImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletTagImpl.java
index d61d673..802e991 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletTagImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletTagImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements.facelets;
+package org.apache.myfaces.config.impl.element.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/elements/facelets/FaceletTagLibraryImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletTagLibraryImpl.java
similarity index 98%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletTagLibraryImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletTagLibraryImpl.java
index c2e517a..7730eb4 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletTagLibraryImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletTagLibraryImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements.facelets;
+package org.apache.myfaces.config.impl.element.facelets;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletValidatorTagImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletValidatorTagImpl.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletValidatorTagImpl.java
rename to impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletValidatorTagImpl.java
index 163790c..1a22366 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/elements/facelets/FaceletValidatorTagImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/element/facelets/FaceletValidatorTagImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.config.impl.elements.facelets;
+package org.apache.myfaces.config.impl.element.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 6491819..e570c11 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.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.impl.element.facelets.FaceletBehaviorTagImpl;
+import org.apache.myfaces.config.impl.element.facelets.FaceletComponentTagImpl;
+import org.apache.myfaces.config.impl.element.facelets.FaceletConverterTagImpl;
+import org.apache.myfaces.config.impl.element.facelets.FaceletFunctionImpl;
+import org.apache.myfaces.config.impl.element.facelets.FaceletHandlerTagImpl;
+import org.apache.myfaces.config.impl.element.facelets.FaceletSourceTagImpl;
+import org.apache.myfaces.config.impl.element.facelets.FaceletTagImpl;
+import org.apache.myfaces.config.impl.element.facelets.FaceletTagLibraryImpl;
+import org.apache.myfaces.config.impl.element.facelets.FaceletValidatorTagImpl;
 import org.apache.myfaces.config.MyfacesConfig;
 import org.apache.myfaces.util.lang.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 2b9af75..205f3ec 100644
--- a/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java
@@ -82,7 +82,7 @@ public class NavigationHandlerImplTest extends AbstractJsfTestCase
         RuntimeConfig runtimeConfig = RuntimeConfig
                 .getCurrentInstance(externalContext);
 
-        org.apache.myfaces.config.impl.elements.FacesConfigImpl config = _facesConfigUnmarshaller
+        org.apache.myfaces.config.impl.element.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 6996410..f4937de 100644
--- a/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/config/FacesConfigValidatorTestCase.java
@@ -24,7 +24,7 @@ import java.util.List;
 import org.apache.myfaces.config.element.NavigationRule;
 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.config.impl.element.FacesConfigImpl;
 import org.apache.myfaces.test.base.AbstractJsfTestCase;
 
 public class FacesConfigValidatorTestCase extends AbstractJsfTestCase
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 7cc183a..f9802a9 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.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.config.impl.element.AbsoluteOrderingImpl;
+import org.apache.myfaces.config.impl.element.ConfigOthersSlotImpl;
+import org.apache.myfaces.config.impl.element.FacesConfigNameSlotImpl;
+import org.apache.myfaces.config.impl.element.OrderingImpl;
 import org.apache.myfaces.test.base.AbstractJsfTestCase;
 
 import javax.faces.FacesException;
@@ -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.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.element.FacesConfigImpl cfgA = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
+        org.apache.myfaces.config.impl.element.FacesConfigImpl cfgB = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
+        org.apache.myfaces.config.impl.element.FacesConfigImpl cfgC = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
+        org.apache.myfaces.config.impl.element.FacesConfigImpl cfgD = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
+        org.apache.myfaces.config.impl.element.FacesConfigImpl cfgE = new org.apache.myfaces.config.impl.element.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.elements.FacesConfigImpl cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
+        org.apache.myfaces.config.impl.element.FacesConfigImpl cfg = _impl.getFacesConfig(getClass().getResourceAsStream(
         "empty-config.xml"), "empty-config.xml");        
-        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.element.FacesConfigImpl cfgA = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
+        org.apache.myfaces.config.impl.element.FacesConfigImpl cfgB = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
+        org.apache.myfaces.config.impl.element.FacesConfigImpl cfgC = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
 
         cfgA.setName("A");
         cfgB.setName("B");
@@ -248,12 +248,12 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
     
     public void testEx1()
     {      
-        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();
+        org.apache.myfaces.config.impl.element.FacesConfigImpl cfgA = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
+        org.apache.myfaces.config.impl.element.FacesConfigImpl cfgB = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
+        org.apache.myfaces.config.impl.element.FacesConfigImpl cfgC = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
+        org.apache.myfaces.config.impl.element.FacesConfigImpl cfgD = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
+        org.apache.myfaces.config.impl.element.FacesConfigImpl cfgE = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
+        org.apache.myfaces.config.impl.element.FacesConfigImpl cfgF = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
 
         cfgA.setName("A");
         cfgB.setName("B");
@@ -299,12 +299,12 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
     
     public void testEx2()
     {
-        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();
+        org.apache.myfaces.config.impl.element.FacesConfigImpl cfg = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
+        org.apache.myfaces.config.impl.element.FacesConfigImpl cfgB = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
+        org.apache.myfaces.config.impl.element.FacesConfigImpl cfgC = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
+        org.apache.myfaces.config.impl.element.FacesConfigImpl cfgD = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
+        org.apache.myfaces.config.impl.element.FacesConfigImpl cfgE = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
+        org.apache.myfaces.config.impl.element.FacesConfigImpl cfgF = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
 
         cfgB.setName("B");
         cfgC.setName("C");
@@ -345,10 +345,10 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
     
     public void testEx3()
     {
-        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.element.FacesConfigImpl cfgA = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
+        org.apache.myfaces.config.impl.element.FacesConfigImpl cfgB = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
+        org.apache.myfaces.config.impl.element.FacesConfigImpl cfgC = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
+        org.apache.myfaces.config.impl.element.FacesConfigImpl cfgD = new org.apache.myfaces.config.impl.element.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.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();
+        org.apache.myfaces.config.impl.element.FacesConfigImpl cfgAbs = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
+        org.apache.myfaces.config.impl.element.FacesConfigImpl cfgMK = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
+        org.apache.myfaces.config.impl.element.FacesConfigImpl cfgOWB = new org.apache.myfaces.config.impl.element.FacesConfigImpl();
 
         cfgMK.setName("cz_markoc_faces");
         
diff --git a/impl/src/test/java/org/apache/myfaces/config/impl/digister/FacesConfigUnmarshallerImplTest.java b/impl/src/test/java/org/apache/myfaces/config/impl/digister/FacesConfigUnmarshallerImplTest.java
index f3fb00e..5afa10c 100644
--- a/impl/src/test/java/org/apache/myfaces/config/impl/digister/FacesConfigUnmarshallerImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/config/impl/digister/FacesConfigUnmarshallerImplTest.java
@@ -26,7 +26,7 @@ import org.apache.myfaces.config.element.FacesConfig;
 import org.apache.myfaces.config.element.FacesConfigNameSlot;
 import org.apache.myfaces.config.element.LocaleConfig;
 import org.apache.myfaces.config.element.OrderSlot;
-import org.apache.myfaces.config.impl.elements.ConfigOthersSlotImpl;
+import org.apache.myfaces.config.impl.element.ConfigOthersSlotImpl;
 
 /**
  * @author Mathias Broekelmann (latest modification by $Author$)
@@ -142,7 +142,7 @@ public class FacesConfigUnmarshallerImplTest 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.elements.ConfigOthersSlotImpl.class, orderList.get(2).getClass());
+        assertEquals(org.apache.myfaces.config.impl.element.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 965f7e6..b724ebd 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.elements.FactoryImpl;
+import org.apache.myfaces.config.impl.element.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 40e0851..6a5826d 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.elements.FactoryImpl;
+import org.apache.myfaces.config.impl.element.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/compiler/JSPXFaceletsProcessingTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/JSPXFaceletsProcessingTestCase.java
index ee2d864..ea2696c 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.elements.FaceletsProcessingImpl;
+import org.apache.myfaces.config.impl.element.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 e60f822..e63b852 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.elements.FaceletsProcessingImpl;
+import org.apache.myfaces.config.impl.element.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 1e476e3..c5d724e 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.elements.FaceletsProcessingImpl;
+import org.apache.myfaces.config.impl.element.FaceletsProcessingImpl;
 import org.apache.myfaces.renderkit.html.HtmlFormRenderer;
 import org.apache.myfaces.renderkit.html.HtmlGridRenderer;
 import org.apache.myfaces.renderkit.html.HtmlMenuRenderer;


Mime
View raw message