You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by de...@apache.org on 2018/05/08 12:48:12 UTC
[myfaces] 05/05: rename shared-impl to shared,
configure pom.xml to use as internal module using shade plugin,
and move non changeable classes to impl
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch refactor_shared_2_1_x
in repository https://gitbox.apache.org/repos/asf/myfaces.git
commit 9d564d58c199c821fae60e4ee722e4eec3c71713
Author: Leonardo Uribe <lu...@apache.org>
AuthorDate: Sat Jul 23 16:09:56 2011 +0000
rename shared-impl to shared, configure pom.xml to use as internal module using shade plugin, and move non changeable classes to impl
---
impl/pom.xml | 52 ++-
.../myfaces/application/ApplicationImpl.java | 2 +-
.../application/DefaultResourceHandlerSupport.java | 8 +-
.../myfaces/application/NavigationHandlerImpl.java | 4 +-
.../myfaces/application/ResourceHandlerImpl.java | 18 +-
.../myfaces/application/TreeStructureManager.java | 2 +-
.../myfaces/application/ViewHandlerImpl.java | 10 +-
.../application/jsp/JspStateManagerImpl.java | 4 +-
.../application/jsp/JspViewHandlerImpl.java | 10 +-
.../jsp/ServletViewResponseWrapper.java | 2 +-
.../config/ConfigFilesXmlValidationUtils.java | 2 +-
.../config/DefaultFacesConfigResourceProvider.java | 2 +-
.../config/DefaultFacesConfigurationProvider.java | 4 +-
.../myfaces/config/FacesConfigValidator.java | 2 +-
.../apache/myfaces/config/FacesConfigurator.java | 12 +-
.../org/apache/myfaces/config/LogMetaInfUtils.java | 2 +-
.../apache/myfaces/config/ManagedBeanBuilder.java | 2 +-
.../annotation/DefaultAnnotationProvider.java | 2 +-
.../DefaultLifecycleProviderFactory.java | 2 +-
.../annotation/NoAnnotationLifecyleProvider.java | 2 +-
.../NoInjectionAnnotationLifecycleProvider.java | 2 +-
.../Tomcat7AnnotationLifecycleProvider.java | 2 +-
.../TomcatAnnotationLifecycleProvider.java | 2 +-
.../myfaces/config/annotation/_PackageInfo.java | 2 +-
.../config/impl/FacesConfigEntityResolver.java | 2 +-
.../DigesterFacesConfigUnmarshallerImpl.java | 2 +-
.../config/impl/digester/elements/ManagedBean.java | 2 +-
.../context/ExceptionHandlerFactoryImpl.java | 6 +-
.../myfaces/context/FacesContextFactoryImpl.java | 2 +-
.../MyFacesExceptionHandlerWrapperImpl.java | 2 +-
.../myfaces/context/servlet/FacesContextImpl.java | 2 +-
.../context/servlet/PartialViewContextImpl.java | 2 +-
.../servlet/ServletExternalContextImpl.java | 2 +-
.../apache/myfaces/context/servlet/SessionMap.java | 2 +-
...ableResolverToApplicationELResolverAdapter.java | 2 +-
.../el/convert/ValueBindingToValueExpression.java | 2 +-
.../el/convert/ValueExpressionToValueBinding.java | 2 +-
.../lifecycle/DefaultRestoreViewSupport.java | 6 +-
.../apache/myfaces/lifecycle/LifecycleImpl.java | 2 +-
.../apache/myfaces/renderkit/ErrorPageWriter.java | 6 +-
.../renderkit/ServerSideStateCacheImpl.java | 6 +-
.../myfaces/renderkit/html/HtmlBodyRenderer.java | 2 +-
.../myfaces/renderkit/html/HtmlButtonRenderer.java | 2 +-
.../renderkit/html/HtmlCheckboxRenderer.java | 2 +-
.../html/HtmlCompositeComponentRenderer.java | 2 +-
.../renderkit/html/HtmlCompositeFacetRenderer.java | 2 +-
.../myfaces/renderkit/html/HtmlFormRenderer.java | 8 +-
.../myfaces/renderkit/html/HtmlFormatRenderer.java | 10 +-
.../myfaces/renderkit/html/HtmlGridRenderer.java | 2 +-
.../myfaces/renderkit/html/HtmlGroupRenderer.java | 2 +-
.../myfaces/renderkit/html/HtmlHeadRenderer.java | 4 +-
.../myfaces/renderkit/html/HtmlHiddenRenderer.java | 10 +-
.../myfaces/renderkit/html/HtmlImageRenderer.java | 2 +-
.../myfaces/renderkit/html/HtmlLabelRenderer.java | 20 +-
.../myfaces/renderkit/html/HtmlLinkRenderer.java | 2 +-
.../renderkit/html/HtmlListboxRenderer.java | 2 +-
.../myfaces/renderkit/html/HtmlMenuRenderer.java | 2 +-
.../renderkit/html/HtmlMessageRenderer.java | 4 +-
.../renderkit/html/HtmlMessagesRenderer.java | 4 +-
.../html/HtmlOutcomeTargetButtonRenderer.java | 2 +-
.../myfaces/renderkit/html/HtmlRadioRenderer.java | 2 +-
.../myfaces/renderkit/html/HtmlRenderKitImpl.java | 6 +-
.../renderkit/html/HtmlResponseStateManager.java | 12 +-
.../myfaces/renderkit/html/HtmlScriptRenderer.java | 8 +-
.../myfaces/renderkit/html/HtmlSecretRenderer.java | 2 +-
.../renderkit/html/HtmlStylesheetRenderer.java | 8 +-
.../myfaces/renderkit/html/HtmlTableRenderer.java | 2 +-
.../myfaces/renderkit/html/HtmlTextRenderer.java | 2 +-
.../renderkit/html/HtmlTextareaRenderer.java | 2 +-
.../InternalClassLoaderResourceLoader.java | 24 +-
.../webapp/webxml/DelegatedFacesServlet.java} | 55 ++-
.../shared_impl/webapp/webxml/FilterMapping.java | 67 ++++
.../shared_impl/webapp/webxml/ServletMapping.java | 87 +++++
.../myfaces/shared_impl/webapp/webxml/WebXml.java | 282 ++++++++++++++++
.../shared_impl/webapp/webxml/WebXmlParser.java | 373 +++++++++++++++++++++
.../myfaces/spi/FactoryFinderProviderFactory.java | 2 +-
.../myfaces/spi/ServiceProviderFinderFactory.java | 2 +-
.../org/apache/myfaces/spi/WebConfigProvider.java | 2 +-
.../spi/impl/DefaultAnnotationProviderFactory.java | 2 +-
...efaultFaceletConfigResourceProviderFactory.java | 2 +-
.../DefaultFacesConfigResourceProviderFactory.java | 2 +-
.../DefaultFacesConfigurationMergerFactory.java | 2 +-
.../DefaultFacesConfigurationProviderFactory.java | 2 +-
.../spi/impl/DefaultServiceProviderFinder.java | 2 +-
.../spi/impl/DefaultWebConfigProviderFactory.java | 2 +-
.../java/org/apache/myfaces/spi/impl/SpiUtils.java | 2 +-
.../myfaces/taglib/core/ConvertDateTimeTag.java | 4 +-
.../myfaces/taglib/core/ConvertNumberTag.java | 2 +-
.../taglib/core/DelegateActionListener.java | 2 +-
.../myfaces/taglib/core/GenericListenerTag.java | 2 +-
.../apache/myfaces/taglib/core/LoadBundleTag.java | 2 +-
.../org/apache/myfaces/taglib/core/ParamTag.java | 2 +-
.../myfaces/taglib/core/PhaseListenerTag.java | 2 +-
.../apache/myfaces/taglib/core/SelectItemTag.java | 2 +-
.../apache/myfaces/taglib/core/VerbatimTag.java | 4 +-
.../org/apache/myfaces/taglib/core/ViewTag.java | 2 +-
.../org/apache/myfaces/util/ContainerUtils.java | 2 +-
.../DefaultFaceletsStateManagementHelper.java | 4 +-
.../DefaultFaceletsStateManagementStrategy.java | 6 +-
.../facelets/FaceletViewDeclarationLanguage.java | 14 +-
.../compiler/BodyEndElementInstruction.java | 2 +-
.../DefaultFaceletConfigResourceProvider.java | 2 +-
.../view/facelets/compiler/SAXCompiler.java | 2 +-
.../view/facelets/compiler/TagLibraryConfig.java | 4 +-
.../myfaces/view/facelets/compiler/TextUnit.java | 2 +-
.../facelets/impl/FaceletCacheFactoryImpl.java | 2 +-
.../impl/FaceletCompositionContextImpl.java | 2 +-
.../myfaces/view/facelets/tag/MetaRulesetImpl.java | 2 +-
.../tag/composite/AttachedObjectTargetImpl.java | 4 +-
.../ClientBehaviorAttachedObjectTargetImpl.java | 4 +-
.../tag/composite/CompositeResourceLibrary.java | 6 +-
.../view/facelets/tag/jsf/ComponentSupport.java | 2 +-
.../tag/jsf/ValidatorTagHandlerDelegate.java | 2 +-
.../tag/jsf/core/ActionListenerHandler.java | 2 +-
.../view/facelets/tag/jsf/core/AjaxHandler.java | 4 +-
.../facelets/tag/jsf/core/LoadBundleHandler.java | 2 +-
.../facelets/tag/jsf/core/SelectItemHandler.java | 2 +-
.../view/facelets/tag/ui/IncludeHandler.java | 2 +-
.../myfaces/view/facelets/util/Classpath.java | 2 +-
.../myfaces/view/facelets/util/ReflectionUtil.java | 4 +-
.../view/jsp/JspViewDeclarationLanguage.java | 2 +-
.../myfaces/webapp/AbstractFacesInitializer.java | 6 +-
.../myfaces/webapp/FacesInitializerFactory.java | 2 +-
.../webapp/StartupServletContextListener.java | 2 +-
.../myfaces/application/StateManagerImplTest.java | 4 +-
.../application/jsp/JspStateManagerImplTest.java | 2 +-
.../application/jsp/JspViewHandlerImplTest.java | 4 +-
.../context/PartialResponseWriterImplTest.java | 2 +-
.../renderkit/html/HtmlButtonRendererTest.java | 2 +-
.../renderkit/html/HtmlEscapeRendererTest.java | 2 +-
.../renderkit/html/HtmlFormRendererTest.java | 2 +-
.../renderkit/html/HtmlLinkRendererTest.java | 2 +-
.../html/HtmlOutcomeTargetButtonRendererTest.java | 4 +-
.../behavior/AbstractClientBehaviorTestCase.java | 4 +-
.../HtmlBodyClientBehaviorRendererTest.java | 6 +-
.../behavior/HtmlClientEventAttributesUtil.java | 6 +-
...tmlCommandButtonClientBehaviorRendererTest.java | 6 +-
.../HtmlCommandLinkClientBehaviorRendererTest.java | 6 +-
...comeTargetButtonClientBehaviorRendererTest.java | 6 +-
...utcomeTargetLinkClientBehaviorRendererTest.java | 6 +-
.../HtmlOutputLabelClientBehaviorRendererTest.java | 6 +-
.../HtmlOutputLinkClientBehaviorRendererTest.java | 6 +-
.../myfaces/renderkits/OwnRenderkitTest.java | 2 +-
.../myfaces/test/AbstractClassElementTestCase.java | 2 +-
.../facelets/FaceletMultipleRequestsTestCase.java | 4 +-
.../myfaces/view/facelets/FaceletTestCase.java | 4 +-
.../StateManagerWithFaceletsClientSideTest.java | 4 +-
.../facelets/StateManagerWithFaceletsTest.java | 4 +-
.../view/facelets/compiler/TagLibraryTestCase.java | 2 +-
.../facelets/mock/MockResourceHandlerSupport.java | 4 +-
.../tag/jsf/core/ViewMetadataTestCase.java | 4 +-
.../view/facelets/tag/jstl/core/CifTestCase.java | 2 +-
152 files changed, 1131 insertions(+), 333 deletions(-)
diff --git a/impl/pom.xml b/impl/pom.xml
index 4b5d74f..db7abc0 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -80,6 +80,7 @@
<modelIds>
<modelId>myfaces-api</modelId>
<modelId>myfaces-impl</modelId>
+ <modelId>myfaces-impl-shared</modelId>
</modelIds>
</configuration>
<goals>
@@ -112,6 +113,7 @@
<modelIds>
<modelId>myfaces-api</modelId>
<modelId>myfaces-impl</modelId>
+ <modelId>myfaces-impl-shared</modelId>
</modelIds>
<params>
<shortname>f</shortname>
@@ -162,6 +164,7 @@
<modelIds>
<modelId>myfaces-api</modelId>
<modelId>myfaces-impl</modelId>
+ <modelId>myfaces-impl-shared</modelId>
</modelIds>
<params>
<shortname>f</shortname>
@@ -185,6 +188,7 @@
<modelIds>
<modelId>myfaces-api</modelId>
<modelId>myfaces-impl</modelId>
+ <modelId>myfaces-impl-shared</modelId>
</modelIds>
<params>
<shortname>h</shortname>
@@ -208,6 +212,7 @@
<modelIds>
<modelId>myfaces-api</modelId>
<modelId>myfaces-impl</modelId>
+ <modelId>myfaces-impl-shared</modelId>
</modelIds>
<params>
<shortname>c</shortname>
@@ -231,6 +236,7 @@
<modelIds>
<modelId>myfaces-api</modelId>
<modelId>myfaces-impl</modelId>
+ <modelId>myfaces-impl-shared</modelId>
</modelIds>
<params>
<shortname>ui</shortname>
@@ -254,6 +260,7 @@
<modelIds>
<modelId>myfaces-api</modelId>
<modelId>myfaces-impl</modelId>
+ <modelId>myfaces-impl-shared</modelId>
</modelIds>
<params>
<shortname>composite</shortname>
@@ -277,6 +284,7 @@
<modelIds>
<modelId>myfaces-api</modelId>
<modelId>myfaces-impl</modelId>
+ <modelId>myfaces-impl-shared</modelId>
</modelIds>
<params>
<shortname>f</shortname>
@@ -299,6 +307,7 @@
<modelIds>
<modelId>myfaces-api</modelId>
<modelId>myfaces-impl</modelId>
+ <modelId>myfaces-impl-shared</modelId>
</modelIds>
<params>
<shortname>h</shortname>
@@ -320,6 +329,7 @@
<modelIds>
<modelId>myfaces-api</modelId>
<modelId>myfaces-impl</modelId>
+ <modelId>myfaces-impl-shared</modelId>
</modelIds>
<params>
<shortname>c</shortname>
@@ -341,6 +351,7 @@
<modelIds>
<modelId>myfaces-api</modelId>
<modelId>myfaces-impl</modelId>
+ <modelId>myfaces-impl-shared</modelId>
</modelIds>
<params>
<shortname>ui</shortname>
@@ -362,6 +373,7 @@
<modelIds>
<modelId>myfaces-api</modelId>
<modelId>myfaces-impl</modelId>
+ <modelId>myfaces-impl-shared</modelId>
</modelIds>
<params>
<shortname>composite</shortname>
@@ -485,6 +497,7 @@
<artifactSet>
<includes>
<include>org.apache.myfaces.core.internal:myfaces-impl-ee6</include>
+ <include>org.apache.myfaces.core.internal:myfaces-impl-shared</include>
</includes>
</artifactSet>
<filters>
@@ -575,16 +588,7 @@
<profiles>
-
- <!--
- This profile use a shared dependency rather than unpack the
- code directly. The ideal is that this profile is active when the
- version of this library is snapshot, but unfortunately there is
- no way to activate it (see http://jira.codehaus.org/browse/MNG-3826).
- Existing problems on maven 2.0.x architecture makes impossible do it.
- For now the solution is trigger it manually using the property
- -Ddev=true
- -->
+ <!--
<profile>
<id>add-shared-dependency</id>
<activation>
@@ -597,12 +601,11 @@
<dependency>
<groupId>org.apache.myfaces.shared</groupId>
<artifactId>myfaces-shared-impl</artifactId>
- <scope>compile</scope> <!-- otherwise it is scope=provided -->
+ <scope>compile</scope>
</dependency>
</dependencies>
</profile>
- <!-- standard unpacking of shared-impl -->
<profile>
<id>unpack-shared</id>
<activation>
@@ -613,11 +616,6 @@
<build>
<plugins>
<plugin>
- <!--
- - The shared-impl project generates a modified version of the "shared" module
- - source and classes. The result is a jar full of files in the "shared_impl"
- - package that we can merge into the jar for this project.
- -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.0</version>
@@ -635,7 +633,6 @@
<groupId>org.apache.myfaces.shared</groupId>
<artifactId>myfaces-shared-impl</artifactId>
<version>${myfaces-shared.version}</version>
- <!-- we need to include META-INF/resources and META-INF/internal-resources -->
<excludes>META-INF/DEPENDENCIES,META-INF/LICENSE,META-INF/NOTICE,META-INF/MANIFEST.MF</excludes>
</artifactItem>
</artifactItems>
@@ -677,10 +674,6 @@
<version>${project.version}</version>
</artifactItem>
</artifactItems>
- <!-- Just include the .class files in org/** and the META-INF/services directory -->
- <!-- <includes>org/**,META-INF/services/**</includes> -->
- <!-- Only need copy .class, because maven shade plugin will do it at package
- and maven-bundle-plugin requires it to include this entry on the manifest -->
<includes>org/**</includes>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
</configuration>
@@ -690,11 +683,6 @@
</plugin>
<plugin>
- <!--
- Add the unpacked shared sources directory as source directory into the pom datastructure,
- so that the -source jar includes them too; every .class file in the jar should have its
- source in the -source jar.
- -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.0</version>
@@ -717,6 +705,7 @@
</plugins>
</build>
</profile>
+ -->
<!--
- Whenever the full website is generated, the command
@@ -742,6 +731,7 @@
<modelIds>
<modelId>myfaces-api</modelId>
<modelId>myfaces-impl</modelId>
+ <modelId>myfaces-impl-shared</modelId>
</modelIds>
<taglibs>
<f>http://java.sun.com/jsf/core</f>
@@ -762,6 +752,7 @@
<modelIds>
<modelId>myfaces-api</modelId>
<modelId>myfaces-impl</modelId>
+ <modelId>myfaces-impl-shared</modelId>
</modelIds>
</configuration>
<goals>
@@ -837,6 +828,7 @@
<modelIds>
<modelId>myfaces-api</modelId>
<modelId>myfaces-impl</modelId>
+ <modelId>myfaces-impl-shared</modelId>
</modelIds>
<taglibs>
<f>http://java.sun.com/jsf/core</f>
@@ -1036,10 +1028,16 @@
</dependency>
<!-- this dependency will be packed together with the main artifact of this pom -->
+ <!--
<dependency>
<groupId>org.apache.myfaces.shared</groupId>
<artifactId>myfaces-shared-impl</artifactId>
</dependency>
+ -->
+ <dependency>
+ <groupId>org.apache.myfaces.core.internal</groupId>
+ <artifactId>myfaces-impl-shared</artifactId>
+ </dependency>
<!-- maven-shade-plugin will exclude this dependency automatically -->
<dependency>
diff --git a/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java b/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
index 5f48602..1c77899 100755
--- a/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
@@ -102,7 +102,7 @@ import org.apache.myfaces.el.unified.ResolverBuilderForFaces;
import org.apache.myfaces.el.unified.resolver.FacesCompositeELResolver;
import org.apache.myfaces.el.unified.resolver.FacesCompositeELResolver.Scope;
import org.apache.myfaces.lifecycle.LifecycleImpl;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.view.facelets.el.ELText;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/application/DefaultResourceHandlerSupport.java b/impl/src/main/java/org/apache/myfaces/application/DefaultResourceHandlerSupport.java
index d871d86..b37dadb 100644
--- a/impl/src/main/java/org/apache/myfaces/application/DefaultResourceHandlerSupport.java
+++ b/impl/src/main/java/org/apache/myfaces/application/DefaultResourceHandlerSupport.java
@@ -22,10 +22,10 @@ import javax.faces.application.ProjectStage;
import javax.faces.context.FacesContext;
import org.apache.myfaces.resource.InternalClassLoaderResourceLoader;
-import org.apache.myfaces.shared_impl.resource.BaseResourceHandlerSupport;
-import org.apache.myfaces.shared_impl.resource.ClassLoaderResourceLoader;
-import org.apache.myfaces.shared_impl.resource.ExternalContextResourceLoader;
-import org.apache.myfaces.shared_impl.resource.ResourceLoader;
+import org.apache.myfaces.shared.resource.BaseResourceHandlerSupport;
+import org.apache.myfaces.shared.resource.ClassLoaderResourceLoader;
+import org.apache.myfaces.shared.resource.ExternalContextResourceLoader;
+import org.apache.myfaces.shared.resource.ResourceLoader;
/**
* A ResourceHandlerSupport implementation for use with standard Java Servlet engines,
diff --git a/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java b/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
index 508ee02..d5b9f0d 100755
--- a/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
@@ -51,8 +51,8 @@ import javax.faces.view.ViewMetadata;
import org.apache.myfaces.config.RuntimeConfig;
import org.apache.myfaces.config.element.NavigationRule;
-import org.apache.myfaces.shared_impl.util.HashMapUtils;
-import org.apache.myfaces.shared_impl.util.StringUtils;
+import org.apache.myfaces.shared.util.StringUtils;
+import org.apache.myfaces.shared.util.HashMapUtils;
import org.apache.myfaces.view.facelets.tag.jsf.PreDisposeViewEvent;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java b/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
index c17726a..3aeba66 100644
--- a/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
@@ -19,15 +19,15 @@
package org.apache.myfaces.application;
import org.apache.myfaces.renderkit.ErrorPageWriter;
-import org.apache.myfaces.shared_impl.resource.ResourceHandlerCache;
-import org.apache.myfaces.shared_impl.resource.ResourceHandlerCache.ResourceValue;
-import org.apache.myfaces.shared_impl.resource.ResourceHandlerSupport;
-import org.apache.myfaces.shared_impl.resource.ResourceImpl;
-import org.apache.myfaces.shared_impl.resource.ResourceLoader;
-import org.apache.myfaces.shared_impl.resource.ResourceMeta;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
-import org.apache.myfaces.shared_impl.util.ExternalContextUtils;
-import org.apache.myfaces.shared_impl.util.StringUtils;
+import org.apache.myfaces.shared.resource.ResourceHandlerCache;
+import org.apache.myfaces.shared.resource.ResourceHandlerCache.ResourceValue;
+import org.apache.myfaces.shared.util.ExternalContextUtils;
+import org.apache.myfaces.shared.util.StringUtils;
+import org.apache.myfaces.shared.resource.ResourceHandlerSupport;
+import org.apache.myfaces.shared.resource.ResourceImpl;
+import org.apache.myfaces.shared.resource.ResourceLoader;
+import org.apache.myfaces.shared.resource.ResourceMeta;
+import org.apache.myfaces.shared.util.ClassUtils;
import javax.faces.application.Resource;
import javax.faces.application.ResourceHandler;
diff --git a/impl/src/main/java/org/apache/myfaces/application/TreeStructureManager.java b/impl/src/main/java/org/apache/myfaces/application/TreeStructureManager.java
index f1f95ab..ede1f57 100755
--- a/impl/src/main/java/org/apache/myfaces/application/TreeStructureManager.java
+++ b/impl/src/main/java/org/apache/myfaces/application/TreeStructureManager.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.application;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import javax.faces.component.UIComponent;
import javax.faces.component.UIViewRoot;
diff --git a/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java b/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java
index 1c006d6..8ad8ae4 100644
--- a/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java
@@ -47,11 +47,11 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.myfaces.renderkit.MyfacesResponseStateManager;
import org.apache.myfaces.renderkit.StateCacheUtils;
-import org.apache.myfaces.shared_impl.application.DefaultViewHandlerSupport;
-import org.apache.myfaces.shared_impl.application.InvalidViewIdException;
-import org.apache.myfaces.shared_impl.application.ViewHandlerSupport;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
-import org.apache.myfaces.shared_impl.renderkit.html.util.JavascriptUtils;
+import org.apache.myfaces.shared.application.DefaultViewHandlerSupport;
+import org.apache.myfaces.shared.application.InvalidViewIdException;
+import org.apache.myfaces.shared.application.ViewHandlerSupport;
+import org.apache.myfaces.shared.config.MyfacesConfig;
+import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
import org.apache.myfaces.view.facelets.StateWriter;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java b/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
index 88d7248..d064f4e 100755
--- a/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
@@ -61,8 +61,8 @@ import org.apache.commons.collections.map.ReferenceMap;
import org.apache.myfaces.application.MyfacesStateManager;
import org.apache.myfaces.application.TreeStructureManager;
import org.apache.myfaces.renderkit.MyfacesResponseStateManager;
-import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
-import org.apache.myfaces.shared_impl.util.MyFacesObjectInputStream;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.util.MyFacesObjectInputStream;
/**
* Default StateManager implementation for use when views are defined
diff --git a/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java b/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java
index 1cdc6d4..c91c7cf 100755
--- a/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java
@@ -45,11 +45,11 @@ import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import javax.servlet.jsp.jstl.core.Config;
-import org.apache.myfaces.shared_impl.application.DefaultViewHandlerSupport;
-import org.apache.myfaces.shared_impl.application.InvalidViewIdException;
-import org.apache.myfaces.shared_impl.application.ViewHandlerSupport;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
-import org.apache.myfaces.shared_impl.renderkit.html.util.JavascriptUtils;
+import org.apache.myfaces.shared.application.DefaultViewHandlerSupport;
+import org.apache.myfaces.shared.application.InvalidViewIdException;
+import org.apache.myfaces.shared.application.ViewHandlerSupport;
+import org.apache.myfaces.shared.config.MyfacesConfig;
+import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
/**
* Implementation of the ViewHandler interface that knows how to use JSP pages
diff --git a/impl/src/main/java/org/apache/myfaces/application/jsp/ServletViewResponseWrapper.java b/impl/src/main/java/org/apache/myfaces/application/jsp/ServletViewResponseWrapper.java
index 857ca0e..70140bb 100644
--- a/impl/src/main/java/org/apache/myfaces/application/jsp/ServletViewResponseWrapper.java
+++ b/impl/src/main/java/org/apache/myfaces/application/jsp/ServletViewResponseWrapper.java
@@ -22,7 +22,7 @@ import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
-import org.apache.myfaces.shared_impl.view.ViewResponseWrapper;
+import org.apache.myfaces.shared.view.ViewResponseWrapper;
import java.io.*;
import java.nio.ByteBuffer;
diff --git a/impl/src/main/java/org/apache/myfaces/config/ConfigFilesXmlValidationUtils.java b/impl/src/main/java/org/apache/myfaces/config/ConfigFilesXmlValidationUtils.java
index 5600c48..67caac3 100644
--- a/impl/src/main/java/org/apache/myfaces/config/ConfigFilesXmlValidationUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/config/ConfigFilesXmlValidationUtils.java
@@ -37,7 +37,7 @@ import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
import javax.xml.validation.Validator;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.w3c.dom.ls.LSInput;
import org.w3c.dom.ls.LSResourceResolver;
import org.xml.sax.Attributes;
diff --git a/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigResourceProvider.java b/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigResourceProvider.java
index 7bb4325..ef14989 100644
--- a/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigResourceProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigResourceProvider.java
@@ -27,7 +27,7 @@ import java.util.List;
import javax.faces.context.ExternalContext;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.FacesConfigResourceProvider;
import org.apache.myfaces.view.facelets.util.Classpath;
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 66053f9..4bffce6 100644
--- a/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.config;
import org.apache.myfaces.config.annotation.AnnotationConfigurator;
import org.apache.myfaces.config.element.FacesConfig;
import org.apache.myfaces.config.impl.digester.DigesterFacesConfigUnmarshallerImpl;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.config.MyfacesConfig;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.FacesConfigResourceProvider;
import org.apache.myfaces.spi.FacesConfigResourceProviderFactory;
import org.apache.myfaces.spi.FacesConfigurationProvider;
diff --git a/impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java b/impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java
index c7ee8d2..0413a2b 100644
--- a/impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java
+++ b/impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java
@@ -30,7 +30,7 @@ import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConf
import org.apache.myfaces.config.element.ManagedBean;
import org.apache.myfaces.config.element.NavigationCase;
import org.apache.myfaces.config.element.NavigationRule;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
public class FacesConfigValidator
{
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 1d7e5fc..ee5c6b8 100755
--- a/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
+++ b/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
@@ -95,12 +95,12 @@ import org.apache.myfaces.el.unified.ResolverBuilderBase;
import org.apache.myfaces.lifecycle.LifecycleFactoryImpl;
import org.apache.myfaces.renderkit.RenderKitFactoryImpl;
import org.apache.myfaces.renderkit.html.HtmlRenderKitImpl;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
-import org.apache.myfaces.shared_impl.util.LocaleUtils;
-import org.apache.myfaces.shared_impl.util.StateUtils;
-import org.apache.myfaces.shared_impl.util.serial.DefaultSerialFactory;
-import org.apache.myfaces.shared_impl.util.serial.SerialFactory;
+import org.apache.myfaces.shared.util.StateUtils;
+import org.apache.myfaces.shared.config.MyfacesConfig;
+import org.apache.myfaces.shared.util.ClassUtils;
+import org.apache.myfaces.shared.util.LocaleUtils;
+import org.apache.myfaces.shared.util.serial.DefaultSerialFactory;
+import org.apache.myfaces.shared.util.serial.SerialFactory;
import org.apache.myfaces.spi.FacesConfigurationMerger;
import org.apache.myfaces.spi.FacesConfigurationMergerFactory;
import org.apache.myfaces.util.ContainerUtils;
diff --git a/impl/src/main/java/org/apache/myfaces/config/LogMetaInfUtils.java b/impl/src/main/java/org/apache/myfaces/config/LogMetaInfUtils.java
index aa6f4ce..543f9de 100644
--- a/impl/src/main/java/org/apache/myfaces/config/LogMetaInfUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/config/LogMetaInfUtils.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.config;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import javax.faces.FacesException;
import java.net.URL;
diff --git a/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java b/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java
index 04b315f..da791a7 100755
--- a/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java
+++ b/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java
@@ -29,7 +29,7 @@ import org.apache.myfaces.config.element.ManagedProperty;
import org.apache.myfaces.config.element.MapEntries;
import org.apache.myfaces.config.element.MapEntry;
import org.apache.myfaces.context.servlet.StartupServletExternalContextImpl;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.util.ContainerUtils;
import javax.el.ELContext;
diff --git a/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java b/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java
index 1c0f193..3655a97 100644
--- a/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java
@@ -50,7 +50,7 @@ import javax.faces.render.FacesRenderer;
import javax.faces.validator.FacesValidator;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.AnnotationProvider;
import org.apache.myfaces.spi.AnnotationProviderFactory;
import org.apache.myfaces.view.facelets.util.Classpath;
diff --git a/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java b/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
index ef2a3c3..9fd83ba 100644
--- a/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
@@ -34,7 +34,7 @@ import javax.naming.InitialContext;
import javax.naming.NamingException;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.ServiceProviderFinderFactory;
/*
diff --git a/impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java b/impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java
index 04e18ae..32fb53b 100644
--- a/impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.config.annotation;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import java.lang.reflect.InvocationTargetException;
diff --git a/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java b/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java
index 30e2c4f..f1c2b93 100644
--- a/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java
@@ -26,7 +26,7 @@ import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.naming.NamingException;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
/**
* See SRV.14.5 Servlet Specification Version 2.5 JSR 154
diff --git a/impl/src/main/java/org/apache/myfaces/config/annotation/Tomcat7AnnotationLifecycleProvider.java b/impl/src/main/java/org/apache/myfaces/config/annotation/Tomcat7AnnotationLifecycleProvider.java
index 3fdcfe9..ec29367 100644
--- a/impl/src/main/java/org/apache/myfaces/config/annotation/Tomcat7AnnotationLifecycleProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/config/annotation/Tomcat7AnnotationLifecycleProvider.java
@@ -28,7 +28,7 @@ import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.naming.NamingException;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.tomcat.InstanceManager;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java b/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java
index d5900d7..a535e2e 100644
--- a/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java
@@ -25,7 +25,7 @@ import javax.faces.context.ExternalContext;
import javax.naming.NamingException;
import javax.servlet.ServletContext;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
public class TomcatAnnotationLifecycleProvider implements
DiscoverableLifecycleProvider, LifecycleProvider2
diff --git a/impl/src/main/java/org/apache/myfaces/config/annotation/_PackageInfo.java b/impl/src/main/java/org/apache/myfaces/config/annotation/_PackageInfo.java
index d72eac1..5bc8fed 100644
--- a/impl/src/main/java/org/apache/myfaces/config/annotation/_PackageInfo.java
+++ b/impl/src/main/java/org/apache/myfaces/config/annotation/_PackageInfo.java
@@ -32,7 +32,7 @@ import java.util.jar.JarFile;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
/**
* Copied from org.apache.shale.tiger.view.faces.PackageInfo
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java b/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java
index ba07b75..67814e4 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java
@@ -27,7 +27,7 @@ import java.util.logging.Logger;
import javax.faces.context.ExternalContext;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
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
index d86338e..010f41d 100755
--- 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
@@ -26,7 +26,7 @@ import org.apache.myfaces.config.FacesConfigUnmarshaller;
import org.apache.myfaces.config.impl.digester.elements.*;
import org.apache.myfaces.config.impl.FacesConfigEntityResolver;
import org.apache.commons.digester.Digester;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java b/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java
index 274ab55..f9250d8 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java
@@ -26,7 +26,7 @@ import java.util.List;
import javax.el.ValueExpression;
import javax.faces.context.FacesContext;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.view.facelets.el.ELText;
diff --git a/impl/src/main/java/org/apache/myfaces/context/ExceptionHandlerFactoryImpl.java b/impl/src/main/java/org/apache/myfaces/context/ExceptionHandlerFactoryImpl.java
index 42c27d7..f367e08 100644
--- a/impl/src/main/java/org/apache/myfaces/context/ExceptionHandlerFactoryImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/ExceptionHandlerFactoryImpl.java
@@ -21,9 +21,9 @@ package org.apache.myfaces.context;
import javax.faces.context.ExceptionHandler;
import javax.faces.context.ExceptionHandlerFactory;
-import org.apache.myfaces.shared_impl.context.AjaxExceptionHandlerImpl;
-import org.apache.myfaces.shared_impl.context.ExceptionHandlerImpl;
-import org.apache.myfaces.shared_impl.context.SwitchAjaxExceptionHandlerWrapperImpl;
+import org.apache.myfaces.shared.context.AjaxExceptionHandlerImpl;
+import org.apache.myfaces.shared.context.ExceptionHandlerImpl;
+import org.apache.myfaces.shared.context.SwitchAjaxExceptionHandlerWrapperImpl;
/**
* DOCUMENT ME!
diff --git a/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java b/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java
index e3a55bd..19e52d0 100755
--- a/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java
@@ -33,7 +33,7 @@ import javax.faces.lifecycle.Lifecycle;
import javax.servlet.ServletContext;
import org.apache.myfaces.context.servlet.FacesContextImpl;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
/**
* DOCUMENT ME!
diff --git a/impl/src/main/java/org/apache/myfaces/context/MyFacesExceptionHandlerWrapperImpl.java b/impl/src/main/java/org/apache/myfaces/context/MyFacesExceptionHandlerWrapperImpl.java
index b60a0c0..103d493 100644
--- a/impl/src/main/java/org/apache/myfaces/context/MyFacesExceptionHandlerWrapperImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/MyFacesExceptionHandlerWrapperImpl.java
@@ -38,7 +38,7 @@ import javax.faces.event.ExceptionQueuedEventContext;
import javax.faces.event.SystemEvent;
import org.apache.myfaces.renderkit.ErrorPageWriter;
-import org.apache.myfaces.shared_impl.util.WebConfigParamUtils;
+import org.apache.myfaces.shared.util.WebConfigParamUtils;
import org.apache.myfaces.spi.WebConfigProvider;
import org.apache.myfaces.spi.WebConfigProviderFactory;
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java b/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
index c54f74d..0f4efff 100755
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
@@ -42,7 +42,7 @@ import javax.servlet.ServletResponse;
import org.apache.myfaces.context.ReleaseableExternalContext;
import org.apache.myfaces.context.ReleaseableFacesContextFactory;
-import org.apache.myfaces.shared_impl.util.NullIterator;
+import org.apache.myfaces.shared.util.NullIterator;
/**
* @author Manfred Geiler (latest modification by $Author$)
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java b/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
index bfde96b..3133c3f 100644
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
@@ -46,7 +46,7 @@ import javax.faces.render.RenderKitFactory;
import javax.faces.view.ViewMetadata;
import org.apache.myfaces.context.PartialResponseWriterImpl;
-import org.apache.myfaces.shared_impl.util.StringUtils;
+import org.apache.myfaces.shared.util.StringUtils;
public class PartialViewContextImpl extends PartialViewContext {
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java b/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
index 02d9ceb..381c035 100755
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
@@ -47,7 +47,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.myfaces.shared_impl.context.flash.FlashImpl;
+import org.apache.myfaces.shared.context.flash.FlashImpl;
import org.apache.myfaces.util.EnumerationIterator;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java b/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java
index 7b654fb..9d97d4a 100755
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java
@@ -24,7 +24,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import org.apache.myfaces.shared_impl.util.NullEnumeration;
+import org.apache.myfaces.shared.util.NullEnumeration;
import org.apache.myfaces.util.AbstractThreadSafeAttributeMap;
diff --git a/impl/src/main/java/org/apache/myfaces/el/VariableResolverToApplicationELResolverAdapter.java b/impl/src/main/java/org/apache/myfaces/el/VariableResolverToApplicationELResolverAdapter.java
index f833fb4..efa7db0 100644
--- a/impl/src/main/java/org/apache/myfaces/el/VariableResolverToApplicationELResolverAdapter.java
+++ b/impl/src/main/java/org/apache/myfaces/el/VariableResolverToApplicationELResolverAdapter.java
@@ -23,7 +23,7 @@ import javax.faces.context.FacesContext;
import javax.faces.el.EvaluationException;
import javax.faces.el.VariableResolver;
-import org.apache.myfaces.shared_impl.util.Assert;
+import org.apache.myfaces.shared.util.Assert;
/**
* This class is used to delegate {@link #resolveVariable(FacesContext, String)} to the el resolver of the application.
diff --git a/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java b/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java
index db83210..dbe87e6 100644
--- a/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java
+++ b/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java
@@ -31,7 +31,7 @@ import javax.faces.context.FacesContext;
import javax.faces.el.EvaluationException;
import javax.faces.el.ValueBinding;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
/**
* Wraps a ValueBinding inside a ValueExpression. Also allows access to the original ValueBinding object.
diff --git a/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java b/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java
index e8533c9..372b5b0 100644
--- a/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java
+++ b/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java
@@ -26,7 +26,7 @@ import javax.faces.el.EvaluationException;
import javax.faces.el.PropertyNotFoundException;
import javax.faces.el.ValueBinding;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
/**
* Converter for legacy ValueBinding objects. See JSF 1.2 section 5.8.3
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java b/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java
index 5a7ea4f..32e43f0 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java
@@ -42,9 +42,9 @@ import javax.faces.render.RenderKitFactory;
import javax.faces.render.ResponseStateManager;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
-import org.apache.myfaces.shared_impl.application.FacesServletMapping;
-import org.apache.myfaces.shared_impl.application.InvalidViewIdException;
-import org.apache.myfaces.shared_impl.util.Assert;
+import org.apache.myfaces.shared.application.FacesServletMapping;
+import org.apache.myfaces.shared.application.InvalidViewIdException;
+import org.apache.myfaces.shared.util.Assert;
/**
* @author Mathias Broekelmann (latest modification by $Author$)
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java b/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
index 416ccce..9959b2f 100755
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
@@ -35,7 +35,7 @@ import javax.faces.lifecycle.Lifecycle;
import org.apache.myfaces.config.FacesConfigurator;
import org.apache.myfaces.renderkit.ErrorPageWriter;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.shared_impl.webapp.webxml.WebXml;
import org.apache.myfaces.util.DebugUtils;
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java b/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
index 3620207..022ef7b 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
@@ -69,9 +69,9 @@ import javax.faces.view.Location;
import javax.servlet.http.HttpServletResponse;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlResponseWriterImpl;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
-import org.apache.myfaces.shared_impl.util.StateUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlResponseWriterImpl;
+import org.apache.myfaces.shared.util.StateUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.WebConfigProvider;
import org.apache.myfaces.spi.WebConfigProviderFactory;
import org.apache.myfaces.view.facelets.component.UIRepeat;
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java b/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java
index 538de64..22e23e8 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java
@@ -45,9 +45,9 @@ import org.apache.commons.collections.map.AbstractReferenceMap;
import org.apache.commons.collections.map.ReferenceMap;
import org.apache.myfaces.application.StateCache;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
-import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
-import org.apache.myfaces.shared_impl.util.MyFacesObjectInputStream;
-import org.apache.myfaces.shared_impl.util.WebConfigParamUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.util.MyFacesObjectInputStream;
+import org.apache.myfaces.shared.util.WebConfigParamUtils;
class ServerSideStateCacheImpl extends StateCache<Object, Object>
{
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlBodyRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlBodyRenderer.java
index bba3b49..5b553bc 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlBodyRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlBodyRenderer.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.renderkit.html;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlBodyRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlBodyRendererBase;
/**
* Renderer used by h:body component
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlButtonRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlButtonRenderer.java
index ada471d..07b807a 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlButtonRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlButtonRenderer.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.renderkit.html;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlButtonRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlButtonRendererBase;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRenderer.java
index 7a2faa5..db2d059 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRenderer.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.renderkit.html;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderers;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlCheckboxRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlCheckboxRendererBase;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java
index 45ab913..cb8a82f 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java
@@ -26,7 +26,7 @@ import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRenderer;
+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
/**
*
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java
index 026c4c3..cb59b8f 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java
@@ -25,7 +25,7 @@ import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRenderer;
+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
/**
*
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java
index 76d56aa..e00b597 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java
@@ -26,10 +26,10 @@ import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlFormRendererBase;
-import org.apache.myfaces.shared_impl.renderkit.html.util.JavascriptUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlFormRendererBase;
+import org.apache.myfaces.shared.config.MyfacesConfig;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java
index b60b98d..cf99bf8 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java
@@ -32,11 +32,11 @@ import javax.faces.component.html.HtmlOutputFormat;
import javax.faces.context.FacesContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
-import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlTextRendererBase;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlTextRendererBase;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
/**
*
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGridRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGridRenderer.java
index 725206a..e8b715c 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGridRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGridRenderer.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.renderkit.html;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlGridRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlGridRendererBase;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGroupRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGroupRenderer.java
index 9330be4..dc1e61f 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGroupRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGroupRenderer.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.renderkit.html;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlGroupRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlGroupRendererBase;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHeadRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHeadRenderer.java
index 9b2e9fc..62d47c1 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHeadRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHeadRenderer.java
@@ -27,8 +27,8 @@ import javax.faces.context.ResponseWriter;
import javax.faces.render.Renderer;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
/**
* Renderer used by h:head component
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHiddenRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHiddenRenderer.java
index 9a6bfaf..85276b3 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHiddenRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHiddenRenderer.java
@@ -28,11 +28,11 @@ import javax.faces.context.ResponseWriter;
import javax.faces.convert.ConverterException;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
-import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
/**
*
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlImageRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlImageRenderer.java
index ca127a4..184f81b 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlImageRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlImageRenderer.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.renderkit.html;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlImageRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlImageRendererBase;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLabelRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLabelRenderer.java
index 411dc50..beea2d8 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLabelRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLabelRenderer.java
@@ -33,14 +33,14 @@ import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.component.EscapeCapable;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
-import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.util.JavascriptUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
+import org.apache.myfaces.shared.component.EscapeCapable;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
+import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
/**
*
@@ -133,12 +133,12 @@ public class HtmlLabelRenderer extends HtmlRenderer
}
else
{
- escape = RendererUtils.getBooleanAttribute(uiComponent, org.apache.myfaces.shared_impl.renderkit.JSFAttr.ESCAPE_ATTR,
+ escape = RendererUtils.getBooleanAttribute(uiComponent, org.apache.myfaces.shared.renderkit.JSFAttr.ESCAPE_ATTR,
true); //default is to escape
}
if (escape)
{
- writer.writeText(text, org.apache.myfaces.shared_impl.renderkit.JSFAttr.VALUE_ATTR);
+ writer.writeText(text, org.apache.myfaces.shared.renderkit.JSFAttr.VALUE_ATTR);
}
else
{
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLinkRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLinkRenderer.java
index 3c8da08..78fae83 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLinkRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLinkRenderer.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.renderkit.html;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderers;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlLinkRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlLinkRendererBase;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlListboxRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlListboxRenderer.java
index e965da6..aee042f 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlListboxRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlListboxRenderer.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.renderkit.html;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderers;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlListboxRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlListboxRendererBase;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMenuRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMenuRenderer.java
index bab26d2..a62b06e 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMenuRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMenuRenderer.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.renderkit.html;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderers;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlMenuRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlMenuRendererBase;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessageRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessageRenderer.java
index b598e8c..1498a7b 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessageRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessageRenderer.java
@@ -29,8 +29,8 @@ import javax.faces.component.behavior.ClientBehaviorHolder;
import javax.faces.context.FacesContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlMessageRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlMessageRendererBase;
+import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
/**
*
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessagesRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessagesRenderer.java
index 39349df..968df6b 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessagesRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessagesRenderer.java
@@ -29,8 +29,8 @@ import javax.faces.component.behavior.ClientBehaviorHolder;
import javax.faces.context.FacesContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlMessagesRendererBase;
-import org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlMessagesRendererBase;
+import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
/**
*
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRenderer.java
index c99e227..f67cf8b 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRenderer.java
@@ -24,7 +24,7 @@ import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlOutcomeTargetButtonRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlOutcomeTargetButtonRendererBase;
/**
* @since 2.0
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRadioRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRadioRenderer.java
index e4fee13..d01548f3 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRadioRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRadioRenderer.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.renderkit.html;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRadioRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlRadioRendererBase;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
index 60bc1e6..90429bb 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
@@ -39,9 +39,9 @@ import javax.faces.render.Renderer;
import javax.faces.render.ResponseStateManager;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderKit;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlResponseWriterImpl;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlResponseWriterImpl;
+import org.apache.myfaces.shared.config.MyfacesConfig;
/**
* @author Manfred Geiler (latest modification by $Author$)
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
index 55bab32..698d3b9 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
@@ -33,12 +33,12 @@ import org.apache.myfaces.application.StateCacheFactory;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
import org.apache.myfaces.renderkit.MyfacesResponseStateManager;
import org.apache.myfaces.renderkit.StateCacheFactoryImpl;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.util.JavascriptUtils;
-import org.apache.myfaces.shared_impl.util.StateUtils;
-import org.apache.myfaces.shared_impl.util.WebConfigParamUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.util.StateUtils;
+import org.apache.myfaces.shared.config.MyfacesConfig;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
+import org.apache.myfaces.shared.util.WebConfigParamUtils;
/**
* @author Manfred Geiler (latest modification by $Author$)
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java
index 547ed75..d7cb688 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java
@@ -34,10 +34,10 @@ import javax.faces.event.*;
import javax.faces.render.Renderer;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
-import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.html.HTML;
import org.apache.myfaces.view.facelets.PostBuildComponentTreeOnRestoreViewEvent;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlSecretRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlSecretRenderer.java
index ab81e6f..407bfe2 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlSecretRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlSecretRenderer.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.renderkit.html;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlSecretRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlSecretRendererBase;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java
index 5baf21f..f1b5d40 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java
@@ -41,10 +41,10 @@ import javax.faces.event.PostAddToViewEvent;
import javax.faces.render.Renderer;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
-import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.html.HTML;
import org.apache.myfaces.view.facelets.PostBuildComponentTreeOnRestoreViewEvent;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTableRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTableRenderer.java
index 87d6ea9..842f814 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTableRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTableRenderer.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.renderkit.html;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlTableRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlTableRendererBase;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextRenderer.java
index 99191ac..5d92dee 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextRenderer.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.renderkit.html;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderers;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlTextRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlTextRendererBase;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextareaRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextareaRenderer.java
index 72cb506..d5350e3 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextareaRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextareaRenderer.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.renderkit.html;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlTextareaRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlTextareaRendererBase;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java b/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java
index 5328b96..a6f7f97 100644
--- a/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java
+++ b/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java
@@ -24,12 +24,12 @@ import java.net.URL;
import javax.faces.context.FacesContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
-import org.apache.myfaces.shared_impl.resource.AliasResourceMetaImpl;
-import org.apache.myfaces.shared_impl.resource.ResourceLoader;
-import org.apache.myfaces.shared_impl.resource.ResourceMeta;
-import org.apache.myfaces.shared_impl.resource.ResourceMetaImpl;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
-import org.apache.myfaces.shared_impl.util.WebConfigParamUtils;
+import org.apache.myfaces.shared.resource.AliasResourceMetaImpl;
+import org.apache.myfaces.shared.resource.ResourceLoader;
+import org.apache.myfaces.shared.resource.ResourceMeta;
+import org.apache.myfaces.shared.resource.ResourceMetaImpl;
+import org.apache.myfaces.shared.util.ClassUtils;
+import org.apache.myfaces.shared.util.WebConfigParamUtils;
/**
* A resource loader implementation which loads resources from the thread ClassLoader.
@@ -124,13 +124,13 @@ public class InternalClassLoaderResourceLoader extends ResourceLoader
{
//handle jsf.js
if (libraryName != null &&
- org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils.JAVAX_FACES_LIBRARY_NAME.equals(libraryName) &&
- org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils.JSF_JS_RESOURCE_NAME.equals(resourceName))
+ org.apache.myfaces.shared.renderkit.html.util.ResourceUtils.JAVAX_FACES_LIBRARY_NAME.equals(libraryName) &&
+ org.apache.myfaces.shared.renderkit.html.util.ResourceUtils.JSF_JS_RESOURCE_NAME.equals(resourceName))
{
if (_useMultipleJsFilesForJsfUncompressedJs)
{
return new AliasResourceMetaImpl(prefix, libraryName, libraryVersion,
- resourceName, resourceVersion, org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils.JSF_UNCOMPRESSED_JS_RESOURCE_NAME, true);
+ resourceName, resourceVersion, org.apache.myfaces.shared.renderkit.html.util.ResourceUtils.JSF_UNCOMPRESSED_JS_RESOURCE_NAME, true);
}
else
{
@@ -139,11 +139,11 @@ public class InternalClassLoaderResourceLoader extends ResourceLoader
}
//handle the oamSubmit.js
else if (libraryName != null &&
- org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils.MYFACES_LIBRARY_NAME.equals(libraryName) &&
- org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils.MYFACES_JS_RESOURCE_NAME.equals(resourceName))
+ org.apache.myfaces.shared.renderkit.html.util.ResourceUtils.MYFACES_LIBRARY_NAME.equals(libraryName) &&
+ org.apache.myfaces.shared.renderkit.html.util.ResourceUtils.MYFACES_JS_RESOURCE_NAME.equals(resourceName))
{
return new AliasResourceMetaImpl(prefix, libraryName, libraryVersion,
- resourceName, resourceVersion, org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils.MYFACES_JS_RESOURCE_NAME_UNCOMPRESSED, true);
+ resourceName, resourceVersion, org.apache.myfaces.shared.renderkit.html.util.ResourceUtils.MYFACES_JS_RESOURCE_NAME_UNCOMPRESSED, true);
} else if (libraryName != null && libraryName.startsWith("org.apache.myfaces.core"))
{
return new ResourceMetaImpl(prefix, libraryName, libraryVersion, resourceName, resourceVersion);
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/SelectItemTag.java b/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/DelegatedFacesServlet.java
old mode 100755
new mode 100644
similarity index 70%
copy from impl/src/main/java/org/apache/myfaces/taglib/core/SelectItemTag.java
copy to impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/DelegatedFacesServlet.java
index 6dd779e..5b825b3
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/SelectItemTag.java
+++ b/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/DelegatedFacesServlet.java
@@ -1,32 +1,23 @@
-/*
- * 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.taglib.core;
-
-import org.apache.myfaces.shared_impl.taglib.core.SelectItemTagBase;
-
-
-/**
- * @author Manfred Geiler (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-public class SelectItemTag
- extends SelectItemTagBase
-{
- //private static final Log log = LogFactory.getLog(SelectItemTag.class);
-}
+/*
+ * 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.shared_impl.webapp.webxml;
+
+public interface DelegatedFacesServlet
+{
+}
diff --git a/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/FilterMapping.java b/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/FilterMapping.java
new file mode 100644
index 0000000..2afd9fc
--- /dev/null
+++ b/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/FilterMapping.java
@@ -0,0 +1,67 @@
+/*
+ * 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.shared_impl.webapp.webxml;
+
+/**
+ * @author Mario Ivankovits (latest modification by $Author: matzew $)
+ * @version $Revision: 557350 $ $Date: 2007-07-18 13:19:50 -0500 (Mié, 18 Jul 2007) $
+ */
+public class FilterMapping
+{
+ private String _filterName;
+ private Class _filterClass;
+ private String _urlPattern;
+ private boolean _isExtensionMapping = false;
+
+ public FilterMapping(String filterName,
+ Class filterClass,
+ String urlPattern)
+ {
+ _filterName = filterName;
+ _filterClass = filterClass;
+ _urlPattern = urlPattern;
+ if (_urlPattern != null)
+ {
+ if (_urlPattern.startsWith("*."))
+ {
+ _isExtensionMapping = true;
+ }
+ }
+ }
+
+ public boolean isExtensionMapping()
+ {
+ return _isExtensionMapping;
+ }
+
+ public String getFilterName()
+ {
+ return _filterName;
+ }
+
+ public Class getFilterClass()
+ {
+ return _filterClass;
+ }
+
+ public String getUrlPattern()
+ {
+ return _urlPattern;
+ }
+}
diff --git a/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/ServletMapping.java b/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/ServletMapping.java
new file mode 100644
index 0000000..13d83c0
--- /dev/null
+++ b/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/ServletMapping.java
@@ -0,0 +1,87 @@
+/*
+ * 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.shared_impl.webapp.webxml;
+
+/**
+ * @author Manfred Geiler (latest modification by $Author: matzew $)
+ * @version $Revision: 557350 $ $Date: 2007-07-18 13:19:50 -0500 (Mié, 18 Jul 2007) $
+ */
+public class ServletMapping
+{
+ private final String _servletName;
+ private final Class _servletClass;
+ private final String _urlPattern;
+ private final String _extension;
+ private final String _prefix;
+
+ public ServletMapping(String servletName, Class servletClass, String urlPattern)
+ {
+ _servletName = servletName;
+ _servletClass = servletClass;
+ _urlPattern = urlPattern;
+ _extension = _urlPattern != null && _urlPattern.startsWith("*.") ? _urlPattern.substring(_urlPattern
+ .indexOf('.')) : null;
+ if (_extension == null)
+ {
+ int index = _urlPattern.indexOf("/*");
+ if (index != -1)
+ {
+ _prefix = _urlPattern.substring(0, _urlPattern.indexOf("/*"));
+ }
+ else
+ {
+ _prefix = _urlPattern;
+ }
+ }
+ else
+ {
+ _prefix = null;
+ }
+ }
+
+ public boolean isExtensionMapping()
+ {
+ return _extension != null;
+ }
+
+ public String getExtension()
+ {
+ return _extension;
+ }
+
+ public String getPrefix()
+ {
+ return _prefix;
+ }
+
+ public String getServletName()
+ {
+ return _servletName;
+ }
+
+ public Class getServletClass()
+ {
+ return _servletClass;
+ }
+
+ public String getUrlPattern()
+ {
+ return _urlPattern;
+ }
+}
diff --git a/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXml.java b/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXml.java
new file mode 100644
index 0000000..3fc98c6
--- /dev/null
+++ b/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXml.java
@@ -0,0 +1,282 @@
+/*
+ * 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.shared_impl.webapp.webxml;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.faces.context.ExternalContext;
+import javax.faces.webapp.FacesServlet;
+
+import org.apache.myfaces.shared.config.MyfacesConfig;
+
+/**
+ * @author Manfred Geiler (latest modification by $Author: lu4242 $)
+ * @version $Revision: 1031726 $ $Date: 2010-11-05 14:15:42 -0500 (Vie, 05 Nov 2010) $
+ */
+public class WebXml
+{
+ //private static final Log log = LogFactory.getLog(WebXml.class);
+ private static final Logger log = Logger.getLogger(WebXml.class.getName());
+
+
+ private static long refreshPeriod;
+ private long parsingTime;
+
+ private Map _servlets = new HashMap();
+ private Map _servletMappings = new HashMap();
+ private Map _filters = new HashMap();
+ private Map _filterMappings = new HashMap();
+
+ private volatile List _facesServletMappings = null;
+ private volatile List _facesExtensionsFilterMappings = null;
+
+ private String _delegateFacesServlet = null;
+ private boolean errorPagePresent = false;
+
+ void addServlet(String servletName, String servletClass)
+ {
+ if (_servlets.get(servletName) != null)
+ {
+ log.warning("Servlet " + servletName + " defined more than once, first definition will be used.");
+ }
+ else
+ {
+ _servlets.put(servletName, servletClass);
+ }
+ }
+
+ void addFilter(String filterName, String filterClass)
+ {
+ if (_filters.get(filterName) != null)
+ {
+ log.warning("Filter " + filterName + " defined more than once, first definition will be used.");
+ }
+ else
+ {
+ _filters.put(filterName, filterClass);
+ }
+ }
+
+ boolean containsServlet(String servletName)
+ {
+ return _servlets.containsKey(servletName);
+ }
+
+ boolean containsFilter(String filterName)
+ {
+ return _filters.containsKey(filterName);
+ }
+
+ void addServletMapping(String servletName, String urlPattern)
+ {
+ List mappings = (List)_servletMappings.get(servletName);
+ if (mappings == null)
+ {
+ mappings = new ArrayList();
+ _servletMappings.put(servletName, mappings);
+ }
+ mappings.add(urlPattern);
+ }
+
+ void addFilterMapping(String filterName, String urlPattern)
+ {
+ List mappings = (List)_filterMappings.get(filterName);
+ if (mappings == null)
+ {
+ mappings = new ArrayList();
+ _filterMappings.put(filterName, mappings);
+ }
+ mappings.add(urlPattern);
+ }
+
+ public List getFacesServletMappings()
+ {
+ if (_facesServletMappings != null) return _facesServletMappings;
+
+ List tempFacesServletMappings = new ArrayList();
+ for (Iterator it = _servlets.entrySet().iterator(); it.hasNext(); )
+ {
+ Map.Entry entry = (Map.Entry)it.next();
+ String servletName = (String)entry.getKey();
+ if (null == entry.getValue())
+ {
+ // the value is null in the case of jsp files listed as servlets
+ // in cactus
+ // <servlet>
+ // <servlet-name>JspRedirector</servlet-name>
+ // <jsp-file>/jspRedirector.jsp</jsp-file>
+ // </servlet>
+ continue;
+ }
+ Class servletClass = org.apache.myfaces.shared.util.ClassUtils.simpleClassForName((String)entry.getValue());
+ if (FacesServlet.class.isAssignableFrom(servletClass) ||
+ DelegatedFacesServlet.class.isAssignableFrom(servletClass) ||
+ servletClass.getName().equals(_delegateFacesServlet))
+ {
+ List urlPatterns = (List)_servletMappings.get(servletName);
+ if( urlPatterns != null )
+ {
+ for (Iterator it2 = urlPatterns.iterator(); it2.hasNext(); )
+ {
+ String urlpattern = (String)it2.next();
+ tempFacesServletMappings.add(new org.apache.myfaces.shared_impl.webapp.webxml.ServletMapping(servletName,
+ servletClass,
+ urlpattern));
+ if (log.isLoggable(Level.FINEST))
+ log.finest("adding mapping for servlet + " + servletName + " urlpattern = " + urlpattern);
+ }
+ }
+ }
+ else
+ {
+ if (log.isLoggable(Level.FINEST)) log.finest("ignoring servlet + " + servletName + " " + servletClass + " (no FacesServlet)");
+ }
+ }
+
+ //Expose to all threads
+ _facesServletMappings = tempFacesServletMappings;
+
+ return _facesServletMappings;
+ }
+
+ /**
+ * returns a list of {@see #org.apache.myfaces.shared.webapp.webxml.FilterMapping}s representing a
+ * extensions filter entry
+ */
+ public List getFacesExtensionsFilterMappings()
+ {
+ if (_facesExtensionsFilterMappings != null) return _facesExtensionsFilterMappings;
+
+ List tempExtensionsFilterMappings = new ArrayList();
+ for (Iterator it = _filters.entrySet().iterator(); it.hasNext(); )
+ {
+ Map.Entry entry = (Map.Entry)it.next();
+ String filterName = (String)entry.getKey();
+ String filterClassName = (String)entry.getValue();
+
+ if (!"org.apache.myfaces.component.html.util.ExtensionsFilter".equals(filterClassName) &&
+ !"org.apache.myfaces.webapp.filter.ExtensionsFilter".equals(filterClassName))
+ {
+ // not an extensions filter
+ continue;
+ }
+
+ Class filterClass = org.apache.myfaces.shared.util.ClassUtils.simpleClassForName(filterClassName);
+ List urlPatterns = (List)_filterMappings.get(filterName);
+ if( urlPatterns != null )
+ {
+ for (Iterator it2 = urlPatterns.iterator(); it2.hasNext(); )
+ {
+ String urlpattern = (String)it2.next();
+ tempExtensionsFilterMappings.add(new org.apache.myfaces.shared_impl.webapp.webxml.FilterMapping(
+ filterName, filterClass, urlpattern));
+ if (log.isLoggable(Level.FINEST))
+ log.finest("adding mapping for filter + " + filterName + " urlpattern = " + urlpattern);
+ }
+ }
+ }
+
+ //Expose to all threads
+ _facesExtensionsFilterMappings = tempExtensionsFilterMappings;
+
+ return _facesExtensionsFilterMappings;
+ }
+
+ protected void setParsingTime(long parsingTime)
+ {
+ this.parsingTime = parsingTime;
+ }
+
+ private void setDelegateFacesServlet(String delegateFacesServlet)
+ {
+ this._delegateFacesServlet = delegateFacesServlet;
+ }
+
+ /**
+ * Sets if, the web.xml contains an error-page entry
+ * @param errorPagePresent
+ */
+ public void setErrorPagePresent(boolean errorPagePresent)
+ {
+ this.errorPagePresent = errorPagePresent;
+ }
+
+ /**
+ * Determines, if the web.xml contains an error-page entry
+ * @return
+ */
+ public boolean isErrorPagePresent()
+ {
+ return errorPagePresent;
+ }
+
+ protected boolean isOld(ExternalContext context)
+ {
+ if (refreshPeriod > 0) {
+ long ttl = this.parsingTime + refreshPeriod;
+ if (System.currentTimeMillis() > ttl) {
+ long lastModified = WebXmlParser.getWebXmlLastModified(context);
+ return lastModified == 0 || lastModified > ttl;
+ }
+ }
+ return false;
+ }
+
+ private static final String WEB_XML_ATTR = WebXml.class.getName();
+ public static WebXml getWebXml(ExternalContext context)
+ {
+ WebXml webXml = (WebXml)context.getApplicationMap().get(WEB_XML_ATTR);
+ if (webXml == null)
+ {
+ init(context);
+ webXml = (WebXml)context.getApplicationMap().get(WEB_XML_ATTR);
+ }
+ return webXml;
+ }
+
+ /**
+ * should be called when initialising Servlet
+ * @param context
+ */
+ public static void init(ExternalContext context)
+ {
+ WebXmlParser parser = new WebXmlParser(context);
+ WebXml webXml = parser.parse();
+ context.getApplicationMap().put(WEB_XML_ATTR, webXml);
+ MyfacesConfig mfconfig = MyfacesConfig.getCurrentInstance(context);
+ long configRefreshPeriod = mfconfig.getConfigRefreshPeriod();
+ webXml.setParsingTime(System.currentTimeMillis());
+ webXml.setDelegateFacesServlet(mfconfig.getDelegateFacesServlet());
+ refreshPeriod = (configRefreshPeriod * 1000);
+ }
+
+ public static void update(ExternalContext context)
+ {
+ if (getWebXml(context).isOld(context)){
+ WebXml.init(context);
+ }
+ }
+
+}
diff --git a/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXmlParser.java b/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXmlParser.java
new file mode 100644
index 0000000..7cf645f
--- /dev/null
+++ b/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXmlParser.java
@@ -0,0 +1,373 @@
+/*
+ * 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.shared_impl.webapp.webxml;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.faces.FacesException;
+import javax.faces.context.ExternalContext;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.apache.myfaces.shared.util.ClassUtils;
+import org.apache.myfaces.shared.util.xml.MyFacesErrorHandler;
+import org.apache.myfaces.shared.util.xml.XmlUtils;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+
+/**
+ * @author Manfred Geiler (latest modification by $Author: lu4242 $)
+ * @version $Revision: 1041085 $ $Date: 2010-12-01 12:15:31 -0500 (Mié, 01 Dic 2010) $
+ */
+public class WebXmlParser
+{
+ //private static final Log log = LogFactory.getLog(WebXmlParser.class);
+ private static final Logger log = Logger.getLogger(WebXmlParser.class.getName());
+
+ /*
+ private static final String JAXP_SCHEMA_LANGUAGE =
+ "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
+ private static final String W3C_XML_SCHEMA =
+ "http://www.w3.org/2001/XMLSchema";
+ */
+
+ private static final String WEB_XML_PATH = "/WEB-INF/web.xml";
+
+ private static final String WEB_APP_2_2_J2EE_SYSTEM_ID = "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd";
+ private static final String WEB_APP_2_2_SYSTEM_ID = "http://java.sun.com/dtd/web-app_2_2.dtd";
+ private static final String WEB_APP_2_2_RESOURCE = "javax/servlet/resources/web-app_2_2.dtd";
+
+ private static final String WEB_APP_2_3_SYSTEM_ID = "http://java.sun.com/dtd/web-app_2_3.dtd";
+ private static final String WEB_APP_2_3_RESOURCE = "javax/servlet/resources/web-app_2_3.dtd";
+
+ private ExternalContext _context;
+ private org.apache.myfaces.shared_impl.webapp.webxml.WebXml _webXml;
+
+ public WebXmlParser(ExternalContext context)
+ {
+ _context = context;
+ }
+
+ public WebXml parse()
+ {
+ _webXml = new WebXml();
+
+ try
+ {
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ dbf.setIgnoringElementContentWhitespace(true);
+ dbf.setIgnoringComments(true);
+ dbf.setNamespaceAware(true);
+ dbf.setValidating(false);
+// dbf.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
+
+ DocumentBuilder db = dbf.newDocumentBuilder();
+ db.setEntityResolver(new _EntityResolver());
+ db.setErrorHandler(new MyFacesErrorHandler(log));
+
+ InputSource is = createContextInputSource(null, WEB_XML_PATH);
+
+ if(is==null)
+ {
+ URL url = _context.getResource(WEB_XML_PATH);
+ log.fine("No web-xml found at : "+(url==null?" null ":url.toString()));
+ return _webXml;
+ }
+
+ Document document = db.parse(is);
+
+ Element webAppElem = document.getDocumentElement();
+ if (webAppElem == null ||
+ !webAppElem.getNodeName().equals("web-app"))
+ {
+ throw new FacesException("No valid web-app root element found!");
+ }
+
+ readWebApp(webAppElem);
+
+ return _webXml;
+ }
+ catch (Exception e)
+ {
+ log.log(Level.SEVERE, "Unable to parse web.xml", e);
+ throw new FacesException(e);
+ }
+ }
+
+ public static long getWebXmlLastModified(ExternalContext context)
+ {
+ try {
+ URL url = context.getResource(WEB_XML_PATH);
+ if (url != null)
+ return url.openConnection().getLastModified();
+ } catch (IOException e) {
+ log.log(Level.SEVERE, "Could not find web.xml in path " + WEB_XML_PATH);
+ }
+ return 0L;
+ }
+
+
+ private InputSource createContextInputSource(String publicId, String systemId)
+ {
+ InputStream inStream = _context.getResourceAsStream(systemId);
+ if (inStream == null)
+ {
+ // there is no such entity
+ return null;
+ }
+ InputSource is = new InputSource(inStream);
+ is.setPublicId(publicId);
+ is.setSystemId(systemId);
+ //the next line was removed - encoding should be determined automatically out of the inputStream
+ //DEFAULT_ENCODING was ISO-8859-1
+ //is.setEncoding(DEFAULT_ENCODING);
+ return is;
+ }
+
+ private InputSource createClassloaderInputSource(String publicId, String systemId)
+ {
+ InputStream inStream = ClassUtils.getResourceAsStream(systemId);
+ if (inStream == null)
+ {
+ // there is no such entity
+ return null;
+ }
+ InputSource is = new InputSource(inStream);
+ is.setPublicId(publicId);
+ is.setSystemId(systemId);
+ //the next line was removed - encoding should be determined automatically out of the inputStream
+ //encoding should be determined automatically out of the inputStream
+ //DEFAULT_ENCODING was ISO-8859-1
+ //is.setEncoding(DEFAULT_ENCODING);
+ return is;
+ }
+
+ private class _EntityResolver implements EntityResolver
+ {
+ public InputSource resolveEntity(String publicId, String systemId) throws IOException
+ {
+ if (systemId == null)
+ {
+ throw new UnsupportedOperationException("systemId must not be null");
+ }
+
+ if (systemId.equals(WebXmlParser.WEB_APP_2_2_SYSTEM_ID) ||
+ systemId.equals(WebXmlParser.WEB_APP_2_2_J2EE_SYSTEM_ID))
+ {
+ //Load DTD from servlet.jar
+ return createClassloaderInputSource(publicId, WebXmlParser.WEB_APP_2_2_RESOURCE);
+ }
+ else if (systemId.equals(WebXmlParser.WEB_APP_2_3_SYSTEM_ID))
+ {
+ //Load DTD from servlet.jar
+ return createClassloaderInputSource(publicId, WebXmlParser.WEB_APP_2_3_RESOURCE);
+ }
+ else
+ {
+ //Load additional entities from web context
+ return createContextInputSource(publicId, systemId);
+ }
+ }
+
+ }
+
+
+ private void readWebApp(Element webAppElem)
+ {
+ NodeList nodeList = webAppElem.getChildNodes();
+ for (int i = 0, len = nodeList.getLength(); i < len; i++)
+ {
+ Node n = nodeList.item(i);
+ if (n.getNodeType() == Node.ELEMENT_NODE)
+ {
+ if (n.getNodeName().equals("servlet"))
+ {
+ readServlet((Element)n);
+ }
+ if (n.getNodeName().equals("servlet-mapping"))
+ {
+ readServletMapping((Element)n);
+ }
+ if (n.getNodeName().equals("filter"))
+ {
+ readFilter((Element)n);
+ }
+ if (n.getNodeName().equals("filter-mapping"))
+ {
+ readFilterMapping((Element)n);
+ }
+ if (n.getNodeName().equals("error-page"))
+ {
+ _webXml.setErrorPagePresent(true);
+ }
+ }
+ else
+ {
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
+ }
+ }
+ }
+
+ private void readServlet(Element servletElem)
+ {
+ String servletName = null;
+ String servletClass = null;
+ NodeList nodeList = servletElem.getChildNodes();
+ for (int i = 0, len = nodeList.getLength(); i < len; i++)
+ {
+ Node n = nodeList.item(i);
+ if (n.getNodeType() == Node.ELEMENT_NODE)
+ {
+ if (n.getNodeName().equals("servlet-name"))
+ {
+ servletName = XmlUtils.getElementText((Element)n);
+ }
+ else if (n.getNodeName().equals("servlet-class"))
+ {
+ servletClass = org.apache.myfaces.shared.util.xml.XmlUtils.getElementText((Element)n).trim();
+ }
+ else if (n.getNodeName().equals("description") || n.getNodeName().equals("load-on-startup") || n.getNodeName().equals("init-param"))
+ {
+ //ignore
+ }
+ else
+ {
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored element '" + n.getNodeName() + "' as child of '" + servletElem.getNodeName() + "'.");
+ }
+ }
+ else
+ {
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
+ }
+ }
+ _webXml.addServlet(servletName, servletClass);
+ }
+
+
+ private void readServletMapping(Element servletMappingElem)
+ {
+ String servletName = null;
+ String urlPattern = null;
+ NodeList nodeList = servletMappingElem.getChildNodes();
+ for (int i = 0, len = nodeList.getLength(); i < len; i++)
+ {
+ Node n = nodeList.item(i);
+ if (n.getNodeType() == Node.ELEMENT_NODE)
+ {
+ if (n.getNodeName().equals("servlet-name"))
+ {
+ servletName = org.apache.myfaces.shared.util.xml.XmlUtils.getElementText((Element)n);
+ }
+ else if (n.getNodeName().equals("url-pattern"))
+ {
+ urlPattern = org.apache.myfaces.shared.util.xml.XmlUtils.getElementText((Element)n).trim();
+ }
+ else
+ {
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored element '" + n.getNodeName() + "' as child of '" + servletMappingElem.getNodeName() + "'.");
+ }
+ }
+ else
+ {
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
+ }
+ }
+ urlPattern = urlPattern.trim();
+ _webXml.addServletMapping(servletName, urlPattern);
+ }
+
+ private void readFilter(Element filterElem)
+ {
+ String filterName = null;
+ String filterClass = null;
+ NodeList nodeList = filterElem.getChildNodes();
+ for (int i = 0, len = nodeList.getLength(); i < len; i++)
+ {
+ Node n = nodeList.item(i);
+ if (n.getNodeType() == Node.ELEMENT_NODE)
+ {
+ if (n.getNodeName().equals("filter-name"))
+ {
+ filterName = XmlUtils.getElementText((Element)n).trim();
+ }
+ else if (n.getNodeName().equals("filter-class"))
+ {
+ filterClass = org.apache.myfaces.shared.util.xml.XmlUtils.getElementText((Element)n).trim();
+ }
+ else if (n.getNodeName().equals("description") || n.getNodeName().equals("init-param"))
+ {
+ //ignore
+ }
+ else
+ {
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored element '" + n.getNodeName() + "' as child of '" + filterElem.getNodeName() + "'.");
+ }
+ }
+ else
+ {
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
+ }
+ }
+ _webXml.addFilter(filterName, filterClass);
+ }
+
+
+ private void readFilterMapping(Element filterMappingElem)
+ {
+ String filterName = null;
+ String urlPattern = null;
+ NodeList nodeList = filterMappingElem.getChildNodes();
+ for (int i = 0, len = nodeList.getLength(); i < len; i++)
+ {
+ Node n = nodeList.item(i);
+ if (n.getNodeType() == Node.ELEMENT_NODE)
+ {
+ if (n.getNodeName().equals("filter-name"))
+ {
+ filterName = org.apache.myfaces.shared.util.xml.XmlUtils.getElementText((Element)n).trim();
+ }
+ else if (n.getNodeName().equals("url-pattern"))
+ {
+ urlPattern = org.apache.myfaces.shared.util.xml.XmlUtils.getElementText((Element)n).trim();
+ }
+ else if (n.getNodeName().equals("servlet-name"))
+ {
+ // we are not interested in servlet-name based mapping - for now
+ }
+ else
+ {
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored element '" + n.getNodeName() + "' as child of '" + filterMappingElem.getNodeName() + "'.");
+ }
+ }
+ else
+ {
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
+ }
+ }
+ _webXml.addFilterMapping(filterName, urlPattern);
+ }
+}
diff --git a/impl/src/main/java/org/apache/myfaces/spi/FactoryFinderProviderFactory.java b/impl/src/main/java/org/apache/myfaces/spi/FactoryFinderProviderFactory.java
index ecacfe8..f2ce065 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/FactoryFinderProviderFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/FactoryFinderProviderFactory.java
@@ -22,7 +22,7 @@ import java.lang.reflect.Field;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
/**
* <p>{@link javax.faces.FactoryFinder} is a class with three methods:</p>
diff --git a/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinderFactory.java b/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinderFactory.java
index 24c7665..d104cbd 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinderFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinderFactory.java
@@ -23,7 +23,7 @@ import javax.faces.context.ExternalContext;
import javax.servlet.ServletContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.impl.DefaultServiceProviderFinder;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/spi/WebConfigProvider.java b/impl/src/main/java/org/apache/myfaces/spi/WebConfigProvider.java
index 21af8c6..b4a90cd 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/WebConfigProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/WebConfigProvider.java
@@ -38,7 +38,7 @@ public abstract class WebConfigProvider
* </p>
* <ol>
* <li>Mappings related to registered servlet class javax.faces.webapp.FacesServlet.</li>
- * <li>Mappings related to registered servlet class implementing org.apache.myfaces.shared_impl.webapp.webxml.DelegatedFacesServlet interface.</li>
+ * <li>Mappings related to registered servlet class implementing org.apache.myfaces.shared.webapp.webxml.DelegatedFacesServlet interface.</li>
* <li>Mappings related to registered servlet class registered using org.apache.myfaces.DELEGATE_FACES_SERVLET web config param.</li>
* </ol>
*
diff --git a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java
index 424f450..85ce481 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.spi.impl;
import org.apache.myfaces.config.annotation.DefaultAnnotationProvider;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.AnnotationProvider;
import org.apache.myfaces.spi.AnnotationProviderFactory;
import org.apache.myfaces.spi.ServiceProviderFinderFactory;
diff --git a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java
index f89f37c..4497250 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.spi.impl;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.FaceletConfigResourceProvider;
import org.apache.myfaces.spi.FaceletConfigResourceProviderFactory;
import org.apache.myfaces.spi.ServiceProviderFinderFactory;
diff --git a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java
index 3a9be3f..01358cf 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.spi.impl;
import org.apache.myfaces.config.DefaultFacesConfigResourceProvider;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.FacesConfigResourceProvider;
import org.apache.myfaces.spi.FacesConfigResourceProviderFactory;
import org.apache.myfaces.spi.ServiceProviderFinderFactory;
diff --git a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationMergerFactory.java b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationMergerFactory.java
index d5278e3..792aaa5 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationMergerFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationMergerFactory.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.spi.impl;
import org.apache.myfaces.config.DefaultFacesConfigurationMerger;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.FacesConfigurationMerger;
import org.apache.myfaces.spi.FacesConfigurationMergerFactory;
import org.apache.myfaces.spi.ServiceProviderFinderFactory;
diff --git a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationProviderFactory.java b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationProviderFactory.java
index 661bc24..7895ecc 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationProviderFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationProviderFactory.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.spi.impl;
import org.apache.myfaces.config.DefaultFacesConfigurationProvider;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.FacesConfigurationProvider;
import org.apache.myfaces.spi.FacesConfigurationProviderFactory;
import org.apache.myfaces.spi.ServiceProviderFinderFactory;
diff --git a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultServiceProviderFinder.java b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultServiceProviderFinder.java
index 75e80c3..d0ae445 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultServiceProviderFinder.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultServiceProviderFinder.java
@@ -31,7 +31,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.ServiceProviderFinder;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java
index 39cc023..d09fc91 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
import javax.faces.FacesException;
import javax.faces.context.ExternalContext;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.ServiceProviderFinderFactory;
import org.apache.myfaces.spi.WebConfigProvider;
import org.apache.myfaces.spi.WebConfigProviderFactory;
diff --git a/impl/src/main/java/org/apache/myfaces/spi/impl/SpiUtils.java b/impl/src/main/java/org/apache/myfaces/spi/impl/SpiUtils.java
index d97a3d2..640a41e 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/impl/SpiUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/impl/SpiUtils.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
import javax.faces.context.ExternalContext;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.ServiceProviderFinderFactory;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java
index 426072a..2ec60ad 100755
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.taglib.core;
-import org.apache.myfaces.shared_impl.taglib.UIComponentELTagUtils;
-import org.apache.myfaces.shared_impl.util.LocaleUtils;
+import org.apache.myfaces.shared.taglib.UIComponentELTagUtils;
+import org.apache.myfaces.shared.util.LocaleUtils;
import javax.el.ELContext;
import javax.el.ValueExpression;
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java
index a80e7bd..8bb1276 100755
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.taglib.core;
-import org.apache.myfaces.shared_impl.taglib.UIComponentELTagUtils;
+import org.apache.myfaces.shared.taglib.UIComponentELTagUtils;
import javax.el.ELContext;
import javax.el.ValueExpression;
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateActionListener.java b/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateActionListener.java
index 282dfd8..bdd7b73 100644
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateActionListener.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateActionListener.java
@@ -27,7 +27,7 @@ import javax.faces.event.AbortProcessingException;
import javax.faces.event.ActionEvent;
import javax.faces.event.ActionListener;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/GenericListenerTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/GenericListenerTag.java
index e5e3fe2..0389705 100644
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/GenericListenerTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/GenericListenerTag.java
@@ -28,7 +28,7 @@ import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.Tag;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
/**
* @author Andreas Berger (latest modification by $Author$)
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java
index 86faa7b..3f9e4e7 100755
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java
@@ -38,7 +38,7 @@ import javax.el.ValueExpression;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspAttribute;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspTag;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
/**
* Loads a resource bundle and saves it as a variable in the request scope.
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/ParamTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/ParamTag.java
index f8e8eff..e2c5f6b 100755
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/ParamTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/ParamTag.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.taglib.core;
-import org.apache.myfaces.shared_impl.taglib.UIComponentELTagBase;
+import org.apache.myfaces.shared.taglib.UIComponentELTagBase;
import javax.faces.component.UIComponent;
import javax.el.ValueExpression;
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java
index a87f6c8..02d24f2 100644
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java
@@ -36,7 +36,7 @@ import javax.servlet.jsp.tagext.TagSupport;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspAttribute;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspTag;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
/**
* Register a PhaseListener instance
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/SelectItemTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/SelectItemTag.java
index 6dd779e..e50ee5c 100755
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/SelectItemTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/SelectItemTag.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.taglib.core;
-import org.apache.myfaces.shared_impl.taglib.core.SelectItemTagBase;
+import org.apache.myfaces.shared.taglib.core.SelectItemTagBase;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java
index ae47235..ae1f1ea 100755
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java
@@ -20,8 +20,8 @@ package org.apache.myfaces.taglib.core;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspAttribute;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspTag;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
-import org.apache.myfaces.shared_impl.taglib.UIComponentELTagBase;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.taglib.UIComponentELTagBase;
import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/ViewTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/ViewTag.java
index d7ae7d3..08963b6 100755
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/ViewTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/ViewTag.java
@@ -36,7 +36,7 @@ import javax.servlet.jsp.JspException;
import javax.servlet.jsp.jstl.core.Config;
import org.apache.myfaces.application.jsp.ServletViewResponseWrapper;
-import org.apache.myfaces.shared_impl.util.LocaleUtils;
+import org.apache.myfaces.shared.util.LocaleUtils;
/**
* @author Manfred Geiler (latest modification by $Author$)
diff --git a/impl/src/main/java/org/apache/myfaces/util/ContainerUtils.java b/impl/src/main/java/org/apache/myfaces/util/ContainerUtils.java
index 2cf2780..f842512 100644
--- a/impl/src/main/java/org/apache/myfaces/util/ContainerUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/util/ContainerUtils.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.util;
import javax.faces.context.ExternalContext;
import javax.servlet.ServletContext;
-import org.apache.myfaces.shared_impl.util.ExternalContextUtils;
+import org.apache.myfaces.shared.util.ExternalContextUtils;
/**
* Utilities for determining the current container and for the unified
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementHelper.java b/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementHelper.java
index 8434720..16e92ab 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementHelper.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementHelper.java
@@ -43,8 +43,8 @@ import javax.faces.context.FacesContext;
import org.apache.commons.collections.map.AbstractReferenceMap;
import org.apache.commons.collections.map.ReferenceMap;
-import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
-import org.apache.myfaces.shared_impl.util.MyFacesObjectInputStream;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.util.MyFacesObjectInputStream;
/**
* This helper class contains methods used by DefaultFaceletsStateManagementStrategy that comes
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategy.java b/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategy.java
index fbfe680..1394fb1 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategy.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategy.java
@@ -49,9 +49,9 @@ import javax.faces.view.ViewDeclarationLanguageFactory;
import javax.faces.view.ViewMetadata;
import org.apache.myfaces.application.StateManagerImpl;
-import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
-import org.apache.myfaces.shared_impl.util.HashMapUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
+import org.apache.myfaces.shared.util.HashMapUtils;
/**
* This class implements partial state saving feature when facelets
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java b/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
index b31813d..80bfd2e 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
@@ -85,13 +85,13 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.shared_impl.application.DefaultViewHandlerSupport;
-import org.apache.myfaces.shared_impl.application.ViewHandlerSupport;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
-import org.apache.myfaces.shared_impl.util.StringUtils;
-import org.apache.myfaces.shared_impl.util.WebConfigParamUtils;
-import org.apache.myfaces.shared_impl.view.ViewDeclarationLanguageBase;
+import org.apache.myfaces.shared.application.DefaultViewHandlerSupport;
+import org.apache.myfaces.shared.util.StringUtils;
+import org.apache.myfaces.shared.view.ViewDeclarationLanguageBase;
+import org.apache.myfaces.shared.application.ViewHandlerSupport;
+import org.apache.myfaces.shared.config.MyfacesConfig;
+import org.apache.myfaces.shared.util.ClassUtils;
+import org.apache.myfaces.shared.util.WebConfigParamUtils;
import org.apache.myfaces.view.ViewDeclarationLanguageStrategy;
import org.apache.myfaces.view.ViewMetadataBase;
import org.apache.myfaces.view.facelets.FaceletViewHandler.NullWriter;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/BodyEndElementInstruction.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/BodyEndElementInstruction.java
index 3e47563..035df1d 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/BodyEndElementInstruction.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/BodyEndElementInstruction.java
@@ -25,7 +25,7 @@ import javax.el.ExpressionFactory;
import javax.faces.application.ProjectStage;
import javax.faces.context.FacesContext;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
final class BodyEndElementInstruction implements Instruction
{
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/DefaultFaceletConfigResourceProvider.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/DefaultFaceletConfigResourceProvider.java
index 0b0f682..716856c 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/DefaultFaceletConfigResourceProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/DefaultFaceletConfigResourceProvider.java
@@ -26,7 +26,7 @@ import java.util.List;
import javax.faces.context.ExternalContext;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.FaceletConfigResourceProvider;
import org.apache.myfaces.view.facelets.util.Classpath;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java
index 952a9fc..209dcc0 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java
@@ -41,7 +41,7 @@ import javax.xml.parsers.SAXParserFactory;
import org.apache.myfaces.config.RuntimeConfig;
import org.apache.myfaces.config.element.FaceletsProcessing;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.view.facelets.tag.TagAttributeImpl;
import org.apache.myfaces.view.facelets.tag.TagAttributesImpl;
import org.apache.myfaces.view.facelets.tag.composite.CompositeLibrary;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java
index f3a01bd..263479c 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java
@@ -42,8 +42,8 @@ import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import org.apache.myfaces.config.ConfigFilesXmlValidationUtils;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.config.MyfacesConfig;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.FaceletConfigResourceProvider;
import org.apache.myfaces.spi.FaceletConfigResourceProviderFactory;
import org.apache.myfaces.view.facelets.tag.AbstractTagLibrary;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
index dd86d4c..8971efc 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
@@ -31,7 +31,7 @@ import javax.faces.view.facelets.Tag;
import javax.faces.view.facelets.TagAttribute;
import javax.faces.view.facelets.TagException;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HTML;
import org.apache.myfaces.view.facelets.el.ELText;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCacheFactoryImpl.java b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCacheFactoryImpl.java
index 10fa203..25170a4 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCacheFactoryImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCacheFactoryImpl.java
@@ -24,7 +24,7 @@ import javax.faces.context.FacesContext;
import javax.faces.view.facelets.FaceletCache;
import javax.faces.view.facelets.FaceletCacheFactory;
-import org.apache.myfaces.shared_impl.util.WebConfigParamUtils;
+import org.apache.myfaces.shared.util.WebConfigParamUtils;
import org.apache.myfaces.view.facelets.FaceletViewDeclarationLanguage;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCompositionContextImpl.java b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCompositionContextImpl.java
index 5cc11c9..bcb13aa 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCompositionContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCompositionContextImpl.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.view.facelets.impl;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
-import org.apache.myfaces.shared_impl.util.WebConfigParamUtils;
+import org.apache.myfaces.shared.util.WebConfigParamUtils;
import org.apache.myfaces.view.facelets.ELExpressionCacheMode;
import org.apache.myfaces.view.facelets.FaceletCompositionContext;
import org.apache.myfaces.view.facelets.FaceletFactory;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetaRulesetImpl.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetaRulesetImpl.java
index 8b6b79e..d8f56de 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetaRulesetImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetaRulesetImpl.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.view.facelets.tag;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.view.facelets.util.ParameterCheck;
import javax.faces.view.facelets.FaceletContext;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetImpl.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetImpl.java
index 3846d1a..5d2ed43 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetImpl.java
@@ -28,7 +28,7 @@ import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.view.AttachedObjectTarget;
-import org.apache.myfaces.shared_impl.util.StringUtils;
+import org.apache.myfaces.shared.util.StringUtils;
/**
*
@@ -105,7 +105,7 @@ public class AttachedObjectTargetImpl implements AttachedObjectTarget, Serializa
{
return StringUtils.splitShortString((String) _targets.getValue(context.getELContext()), ' ');
}
- return org.apache.myfaces.shared_impl.util.ArrayUtils.EMPTY_STRING_ARRAY;
+ return org.apache.myfaces.shared.util.ArrayUtils.EMPTY_STRING_ARRAY;
}
public void setName(ValueExpression ve)
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorAttachedObjectTargetImpl.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorAttachedObjectTargetImpl.java
index af998d5..ae75fef 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorAttachedObjectTargetImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorAttachedObjectTargetImpl.java
@@ -29,7 +29,7 @@ import javax.faces.component.UIComponent;
import javax.faces.component.behavior.ClientBehaviorHolder;
import javax.faces.context.FacesContext;
-import org.apache.myfaces.shared_impl.util.StringUtils;
+import org.apache.myfaces.shared.util.StringUtils;
/**
* @author Leonardo Uribe (latest modification by $Author: lu4242 $)
@@ -125,7 +125,7 @@ public class ClientBehaviorAttachedObjectTargetImpl
{
return StringUtils.splitShortString((String) _targets.getValue(context.getELContext()), ' ');
}
- return org.apache.myfaces.shared_impl.util.ArrayUtils.EMPTY_STRING_ARRAY;
+ return org.apache.myfaces.shared.util.ArrayUtils.EMPTY_STRING_ARRAY;
}
public void setName(ValueExpression name)
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResourceLibrary.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResourceLibrary.java
index 15afe4a..a1cf027 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResourceLibrary.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResourceLibrary.java
@@ -34,9 +34,9 @@ import javax.faces.view.facelets.Tag;
import javax.faces.view.facelets.TagConfig;
import javax.faces.view.facelets.TagHandler;
-import org.apache.myfaces.shared_impl.util.ArrayUtils;
-import org.apache.myfaces.shared_impl.util.StringUtils;
-import org.apache.myfaces.shared_impl.util.WebConfigParamUtils;
+import org.apache.myfaces.shared.util.StringUtils;
+import org.apache.myfaces.shared.util.ArrayUtils;
+import org.apache.myfaces.shared.util.WebConfigParamUtils;
import org.apache.myfaces.view.facelets.tag.TagLibrary;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentSupport.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentSupport.java
index fba7621..769ab12 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentSupport.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentSupport.java
@@ -33,7 +33,7 @@ import javax.faces.view.facelets.FaceletContext;
import javax.faces.view.facelets.TagAttribute;
import javax.faces.view.facelets.TagAttributeException;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
+import org.apache.myfaces.shared.config.MyfacesConfig;
import org.apache.myfaces.view.facelets.ComponentState;
import org.apache.myfaces.view.facelets.DefaultFaceletsStateManagementStrategy;
import org.apache.myfaces.view.facelets.FaceletViewDeclarationLanguage;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidatorTagHandlerDelegate.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidatorTagHandlerDelegate.java
index aa4b760..be4a231 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidatorTagHandlerDelegate.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidatorTagHandlerDelegate.java
@@ -37,7 +37,7 @@ import javax.faces.view.facelets.TagException;
import javax.faces.view.facelets.TagHandlerDelegate;
import javax.faces.view.facelets.ValidatorHandler;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
import org.apache.myfaces.view.facelets.FaceletCompositionContext;
import org.apache.myfaces.view.facelets.compiler.FaceletsCompilerUtils;
import org.apache.myfaces.view.facelets.tag.MetaRulesetImpl;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ActionListenerHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ActionListenerHandler.java
index 523867f..b0b26fe 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ActionListenerHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ActionListenerHandler.java
@@ -42,7 +42,7 @@ import javax.faces.view.facelets.TagHandler;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletAttribute;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletTag;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
import org.apache.myfaces.view.facelets.FaceletCompositionContext;
import org.apache.myfaces.view.facelets.util.ReflectionUtil;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AjaxHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AjaxHandler.java
index c0c78ae..a852546 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AjaxHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AjaxHandler.java
@@ -46,8 +46,8 @@ import javax.faces.view.facelets.TagHandler;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletAttribute;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletTag;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
-import org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils;
+import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
import org.apache.myfaces.view.facelets.AbstractFaceletContext;
import org.apache.myfaces.view.facelets.FaceletCompositionContext;
import org.apache.myfaces.view.facelets.tag.TagHandlerUtils;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/LoadBundleHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/LoadBundleHandler.java
index de868ee..e7c54d3 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/LoadBundleHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/LoadBundleHandler.java
@@ -41,7 +41,7 @@ import javax.faces.view.facelets.TagConfig;
import javax.faces.view.facelets.TagHandler;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletTag;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.view.facelets.tag.jsf.ComponentSupport;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SelectItemHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SelectItemHandler.java
index c740d48..8a08db1 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SelectItemHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SelectItemHandler.java
@@ -22,7 +22,7 @@ import javax.faces.view.facelets.ComponentConfig;
import javax.faces.view.facelets.ComponentHandler;
import javax.faces.view.facelets.MetaRuleset;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
public class SelectItemHandler extends ComponentHandler
{
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java
index d20dc19..3f4aecd 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java
@@ -36,7 +36,7 @@ import javax.faces.view.facelets.TagHandler;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletAttribute;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletTag;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.view.facelets.AbstractFaceletContext;
import org.apache.myfaces.view.facelets.FaceletCompositionContext;
import org.apache.myfaces.view.facelets.el.VariableMapperWrapper;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/util/Classpath.java b/impl/src/main/java/org/apache/myfaces/view/facelets/util/Classpath.java
index 2be55b6..790e924 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/util/Classpath.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/util/Classpath.java
@@ -33,7 +33,7 @@ import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/util/ReflectionUtil.java b/impl/src/main/java/org/apache/myfaces/view/facelets/util/ReflectionUtil.java
index c6057ce..9288e0e 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/util/ReflectionUtil.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/util/ReflectionUtil.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.view.facelets.util;
import java.lang.reflect.Array;
import java.util.Arrays;
-import org.apache.myfaces.shared_impl.util.ClassLoaderUtils;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassLoaderUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
public class ReflectionUtil
{
diff --git a/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java b/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java
index 8422ef4..a7f27fb 100644
--- a/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java
+++ b/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java
@@ -35,7 +35,7 @@ import javax.servlet.jsp.jstl.core.Config;
import org.apache.myfaces.application.jsp.ServletViewResponseWrapper;
import org.apache.myfaces.renderkit.StateCacheUtils;
-import org.apache.myfaces.shared_impl.view.JspViewDeclarationLanguageBase;
+import org.apache.myfaces.shared.view.JspViewDeclarationLanguageBase;
import org.apache.myfaces.view.facelets.tag.composite.CompositeLibrary;
import org.apache.myfaces.view.facelets.tag.jsf.core.CoreLibrary;
import org.apache.myfaces.view.facelets.tag.jsf.html.HtmlLibrary;
diff --git a/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java b/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
index 108d634..5cb2054 100644
--- a/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
+++ b/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
@@ -27,9 +27,9 @@ import org.apache.myfaces.config.element.ManagedBean;
import org.apache.myfaces.context.ReleaseableExternalContext;
import org.apache.myfaces.context.servlet.StartupFacesContextImpl;
import org.apache.myfaces.context.servlet.StartupServletExternalContextImpl;
-import org.apache.myfaces.shared_impl.context.ExceptionHandlerImpl;
-import org.apache.myfaces.shared_impl.util.StateUtils;
-import org.apache.myfaces.shared_impl.util.WebConfigParamUtils;
+import org.apache.myfaces.shared.util.StateUtils;
+import org.apache.myfaces.shared.context.ExceptionHandlerImpl;
+import org.apache.myfaces.shared.util.WebConfigParamUtils;
import org.apache.myfaces.spi.WebConfigProvider;
import org.apache.myfaces.spi.WebConfigProviderFactory;
import org.apache.myfaces.view.facelets.tag.MetaRulesetImpl;
diff --git a/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerFactory.java b/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerFactory.java
index fcddb8b..2b5e42f 100644
--- a/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerFactory.java
@@ -22,7 +22,7 @@ import javax.faces.FacesException;
import javax.servlet.ServletContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.util.ContainerUtils;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java b/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java
index 96411ed..031b959 100755
--- a/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java
+++ b/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.webapp;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
import org.apache.myfaces.config.annotation.LifecycleProviderFactory;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import javax.faces.FactoryFinder;
import javax.faces.context.ExternalContext;
diff --git a/impl/src/test/java/org/apache/myfaces/application/StateManagerImplTest.java b/impl/src/test/java/org/apache/myfaces/application/StateManagerImplTest.java
index 6c57da0..f93f64d 100644
--- a/impl/src/test/java/org/apache/myfaces/application/StateManagerImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/StateManagerImplTest.java
@@ -28,8 +28,8 @@ import javax.faces.render.RenderKitFactory;
import javax.faces.render.ResponseStateManager;
import org.apache.myfaces.renderkit.html.HtmlResponseStateManager;
-import org.apache.myfaces.shared_impl.util.StateUtils;
-import org.apache.myfaces.shared_impl.util.serial.DefaultSerialFactory;
+import org.apache.myfaces.shared.util.StateUtils;
+import org.apache.myfaces.shared.util.serial.DefaultSerialFactory;
import org.apache.myfaces.test.base.junit4.AbstractJsfConfigurableMultipleRequestsTestCase;
import org.apache.myfaces.test.mock.MockRenderKit;
import org.apache.myfaces.test.mock.MockResponseWriter;
diff --git a/impl/src/test/java/org/apache/myfaces/application/jsp/JspStateManagerImplTest.java b/impl/src/test/java/org/apache/myfaces/application/jsp/JspStateManagerImplTest.java
index deb6654..3e24bf4 100644
--- a/impl/src/test/java/org/apache/myfaces/application/jsp/JspStateManagerImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/jsp/JspStateManagerImplTest.java
@@ -16,7 +16,7 @@
package org.apache.myfaces.application.jsp;
-//import org.apache.myfaces.shared_impl.config.MyfacesConfig;
+//import org.apache.myfaces.shared.config.MyfacesConfig;
import java.io.BufferedWriter;
import java.io.CharArrayWriter;
diff --git a/impl/src/test/java/org/apache/myfaces/application/jsp/JspViewHandlerImplTest.java b/impl/src/test/java/org/apache/myfaces/application/jsp/JspViewHandlerImplTest.java
index f5615c2..d6e44d7 100644
--- a/impl/src/test/java/org/apache/myfaces/application/jsp/JspViewHandlerImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/jsp/JspViewHandlerImplTest.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.application.jsp;
import static org.apache.myfaces.Assert.assertException;
import org.apache.myfaces.FacesTestCase;
import org.apache.myfaces.TestRunner;
-import org.apache.myfaces.shared_impl.application.InvalidViewIdException;
-import org.apache.myfaces.shared_impl.application.ViewHandlerSupport;
+import org.apache.myfaces.shared.application.InvalidViewIdException;
+import org.apache.myfaces.shared.application.ViewHandlerSupport;
import static org.easymock.EasyMock.*;
import org.easymock.IAnswer;
diff --git a/impl/src/test/java/org/apache/myfaces/context/PartialResponseWriterImplTest.java b/impl/src/test/java/org/apache/myfaces/context/PartialResponseWriterImplTest.java
index 5890e10..fd2d1a9 100644
--- a/impl/src/test/java/org/apache/myfaces/context/PartialResponseWriterImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/context/PartialResponseWriterImplTest.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.context;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlResponseWriterImpl;
+import org.apache.myfaces.shared.renderkit.html.HtmlResponseWriterImpl;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
import javax.faces.context.PartialResponseWriter;
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererTest.java
index 8f996d4..3c8ce9d 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererTest.java
@@ -28,7 +28,7 @@ import javax.faces.component.html.HtmlForm;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
+import org.apache.myfaces.shared.config.MyfacesConfig;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockExternalContext;
import org.apache.myfaces.test.mock.MockHttpServletRequest;
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlEscapeRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlEscapeRendererTest.java
index daa3764..00cab73 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlEscapeRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlEscapeRendererTest.java
@@ -35,7 +35,7 @@ import javax.faces.model.SelectItem;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlResponseWriterImpl;
+import org.apache.myfaces.shared.renderkit.html.HtmlResponseWriterImpl;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlFormRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlFormRendererTest.java
index b79b286..60fd1ed 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlFormRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlFormRendererTest.java
@@ -27,7 +27,7 @@ import javax.faces.component.html.HtmlForm;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HTML;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java
index 3129561..149aa8f 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java
@@ -31,7 +31,7 @@ import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.myfaces.application.NavigationHandlerImpl;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
+import org.apache.myfaces.shared.config.MyfacesConfig;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockExternalContext;
import org.apache.myfaces.test.mock.MockHttpServletRequest;
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRendererTest.java
index bbc94c5..524523c 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRendererTest.java
@@ -29,8 +29,8 @@ import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.myfaces.application.NavigationHandlerImpl;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.html.HTML;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.test.mock.MockResponseWriter;
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AbstractClientBehaviorTestCase.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AbstractClientBehaviorTestCase.java
index e28196e..c456b1f 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AbstractClientBehaviorTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AbstractClientBehaviorTestCase.java
@@ -23,8 +23,8 @@ import javax.faces.component.behavior.AjaxBehavior;
import javax.faces.component.behavior.ClientBehaviorHolder;
import javax.faces.context.ResponseWriter;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlResponseWriterImpl;
-import org.apache.myfaces.shared_impl.util.FastWriter;
+import org.apache.myfaces.shared.renderkit.html.HtmlResponseWriterImpl;
+import org.apache.myfaces.shared.util.FastWriter;
import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
import org.apache.myfaces.test.config.ConfigParser;
import org.junit.Assert;
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlBodyClientBehaviorRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlBodyClientBehaviorRendererTest.java
index 45fd75f..26fb1b9 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlBodyClientBehaviorRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlBodyClientBehaviorRendererTest.java
@@ -23,8 +23,8 @@ import javax.faces.component.behavior.AjaxBehavior;
import javax.faces.component.behavior.ClientBehaviorHolder;
import javax.faces.component.html.HtmlBody;
-import org.apache.myfaces.shared_impl.renderkit.ClientBehaviorEvents;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.ClientBehaviorEvents;
+import org.apache.myfaces.shared.renderkit.html.HTML;
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.junit.Assert;
@@ -41,7 +41,7 @@ public class HtmlBodyClientBehaviorRendererTest extends AbstractClientBehaviorTe
{
super.setUp();
attrs = (HtmlRenderedClientEventAttr[])
- org.apache.myfaces.shared_impl.util.ArrayUtils.concat(
+ org.apache.myfaces.shared.util.ArrayUtils.concat(
HtmlClientEventAttributesUtil.generateClientBehaviorEventAttrs(),
new HtmlRenderedClientEventAttr[]{
new HtmlRenderedClientEventAttr(HTML.ONLOAD_ATTR, ClientBehaviorEvents.LOAD),
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlClientEventAttributesUtil.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlClientEventAttributesUtil.java
index 38f77a9..fe30047 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlClientEventAttributesUtil.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlClientEventAttributesUtil.java
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.renderkit.html.behavior;
-import org.apache.myfaces.shared_impl.renderkit.ClientBehaviorEvents;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.ClientBehaviorEvents;
+import org.apache.myfaces.shared.renderkit.html.HTML;
/**
* @author Leonardo Uribe (latest modification by $Author: jankeesvanandel $)
@@ -48,7 +48,7 @@ public class HtmlClientEventAttributesUtil
public static HtmlRenderedClientEventAttr[] generateClientBehaviorInputEventAttrs()
{
return (HtmlRenderedClientEventAttr[])
- org.apache.myfaces.shared_impl.util.ArrayUtils.concat(
+ org.apache.myfaces.shared.util.ArrayUtils.concat(
generateClientBehaviorEventAttrs(),
new HtmlRenderedClientEventAttr[]{
new HtmlRenderedClientEventAttr(HTML.ONBLUR_ATTR, ClientBehaviorEvents.BLUR),
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlCommandButtonClientBehaviorRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlCommandButtonClientBehaviorRendererTest.java
index 7d95c5a..acc190b 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlCommandButtonClientBehaviorRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlCommandButtonClientBehaviorRendererTest.java
@@ -23,9 +23,9 @@ import javax.faces.component.html.HtmlCommandButton;
import javax.faces.component.html.HtmlOutcomeTargetButton;
import org.apache.myfaces.application.NavigationHandlerImpl;
-import org.apache.myfaces.shared_impl.renderkit.ClientBehaviorEvents;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.util.ArrayUtils;
+import org.apache.myfaces.shared.renderkit.ClientBehaviorEvents;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.util.ArrayUtils;
/**
* @author Leonardo Uribe (latest modification by $Author: jankeesvanandel $)
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlCommandLinkClientBehaviorRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlCommandLinkClientBehaviorRendererTest.java
index e9fb088..d8f4902 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlCommandLinkClientBehaviorRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlCommandLinkClientBehaviorRendererTest.java
@@ -23,9 +23,9 @@ import javax.faces.component.html.HtmlCommandLink;
import javax.faces.component.html.HtmlForm;
import org.apache.myfaces.application.NavigationHandlerImpl;
-import org.apache.myfaces.shared_impl.renderkit.ClientBehaviorEvents;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.util.ArrayUtils;
+import org.apache.myfaces.shared.renderkit.ClientBehaviorEvents;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.util.ArrayUtils;
/**
* @author Leonardo Uribe (latest modification by $Author: jankeesvanandel $)
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutcomeTargetButtonClientBehaviorRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutcomeTargetButtonClientBehaviorRendererTest.java
index da0c970..9c51bcf 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutcomeTargetButtonClientBehaviorRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutcomeTargetButtonClientBehaviorRendererTest.java
@@ -22,9 +22,9 @@ import javax.faces.component.UIComponent;
import javax.faces.component.html.HtmlOutcomeTargetButton;
import org.apache.myfaces.application.NavigationHandlerImpl;
-import org.apache.myfaces.shared_impl.renderkit.ClientBehaviorEvents;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.util.ArrayUtils;
+import org.apache.myfaces.shared.renderkit.ClientBehaviorEvents;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.util.ArrayUtils;
/**
* @author Leonardo Uribe (latest modification by $Author: jankeesvanandel $)
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutcomeTargetLinkClientBehaviorRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutcomeTargetLinkClientBehaviorRendererTest.java
index e614fa6..1f1e288 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutcomeTargetLinkClientBehaviorRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutcomeTargetLinkClientBehaviorRendererTest.java
@@ -23,9 +23,9 @@ import javax.faces.component.html.HtmlOutcomeTargetLink;
import javax.faces.component.html.HtmlOutputLink;
import org.apache.myfaces.application.NavigationHandlerImpl;
-import org.apache.myfaces.shared_impl.renderkit.ClientBehaviorEvents;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.util.ArrayUtils;
+import org.apache.myfaces.shared.renderkit.ClientBehaviorEvents;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.util.ArrayUtils;
/**
* @author Leonardo Uribe (latest modification by $Author: jankeesvanandel $)
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutputLabelClientBehaviorRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutputLabelClientBehaviorRendererTest.java
index 9c95d81..dee1b9b 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutputLabelClientBehaviorRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutputLabelClientBehaviorRendererTest.java
@@ -22,9 +22,9 @@ import javax.faces.component.UIComponent;
import javax.faces.component.html.HtmlOutputLabel;
import javax.faces.component.html.HtmlPanelGrid;
-import org.apache.myfaces.shared_impl.renderkit.ClientBehaviorEvents;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.util.ArrayUtils;
+import org.apache.myfaces.shared.renderkit.ClientBehaviorEvents;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.util.ArrayUtils;
/**
* @author Leonardo Uribe (latest modification by $Author: jankeesvanandel $)
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutputLinkClientBehaviorRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutputLinkClientBehaviorRendererTest.java
index 4cea62e..fb3178f 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutputLinkClientBehaviorRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutputLinkClientBehaviorRendererTest.java
@@ -21,9 +21,9 @@ package org.apache.myfaces.renderkit.html.behavior;
import javax.faces.component.UIComponent;
import javax.faces.component.html.HtmlOutputLink;
-import org.apache.myfaces.shared_impl.renderkit.ClientBehaviorEvents;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.util.ArrayUtils;
+import org.apache.myfaces.shared.renderkit.ClientBehaviorEvents;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.util.ArrayUtils;
/**
* @author Leonardo Uribe (latest modification by $Author: jankeesvanandel $)
diff --git a/impl/src/test/java/org/apache/myfaces/renderkits/OwnRenderkitTest.java b/impl/src/test/java/org/apache/myfaces/renderkits/OwnRenderkitTest.java
index ba36d24..d2591f1 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkits/OwnRenderkitTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkits/OwnRenderkitTest.java
@@ -26,7 +26,7 @@ import javax.faces.render.RenderKit;
import javax.faces.render.RenderKitFactory;
import org.apache.myfaces.renderkit.html.HtmlTextRenderer;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.test.base.AbstractJsfTestCase;
import org.apache.myfaces.test.mock.MockFacesContext12;
import org.apache.myfaces.test.mock.MockResponseWriter;
diff --git a/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java b/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java
index c65ec09..05e8298 100644
--- a/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java
@@ -26,7 +26,7 @@ import javax.xml.parsers.SAXParserFactory;
import junit.framework.TestCase;
-import org.apache.myfaces.shared_impl.test.ClassElementHandler;
+import org.apache.myfaces.shared.test.ClassElementHandler;
/**
* This test makes sure all of our components, tags, renderers, validators, converters, action listeners, phase
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 4cbd140..ea8e7b0 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.Renderer;
import org.apache.myfaces.config.impl.digester.DigesterFacesConfigDispenserImpl;
import org.apache.myfaces.config.impl.digester.DigesterFacesConfigUnmarshallerImpl;
import org.apache.myfaces.context.PartialViewContextFactoryImpl;
-import org.apache.myfaces.shared_impl.application.ViewHandlerSupport;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.application.ViewHandlerSupport;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.test.base.junit4.AbstractJsfConfigurableMultipleRequestsTestCase;
import org.apache.myfaces.test.el.MockExpressionFactory;
import org.apache.myfaces.test.mock.MockExternalContext;
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 4ade5e8..6660bba 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
@@ -48,8 +48,8 @@ import org.apache.myfaces.config.element.Renderer;
import org.apache.myfaces.config.impl.digester.DigesterFacesConfigDispenserImpl;
import org.apache.myfaces.config.impl.digester.DigesterFacesConfigUnmarshallerImpl;
import org.apache.myfaces.context.PartialViewContextFactoryImpl;
-import org.apache.myfaces.shared_impl.application.ViewHandlerSupport;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.application.ViewHandlerSupport;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.test.base.junit4.AbstractJsfConfigurableMockTestCase;
import org.apache.myfaces.test.el.MockExpressionFactory;
import org.apache.myfaces.test.mock.MockPropertyResolver;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/StateManagerWithFaceletsClientSideTest.java b/impl/src/test/java/org/apache/myfaces/view/facelets/StateManagerWithFaceletsClientSideTest.java
index cfb99ba..88453ef 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/StateManagerWithFaceletsClientSideTest.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/StateManagerWithFaceletsClientSideTest.java
@@ -25,8 +25,8 @@ import javax.faces.render.ResponseStateManager;
import org.apache.myfaces.application.StateManagerImpl;
import org.apache.myfaces.renderkit.html.HtmlResponseStateManager;
-import org.apache.myfaces.shared_impl.util.StateUtils;
-import org.apache.myfaces.shared_impl.util.serial.DefaultSerialFactory;
+import org.apache.myfaces.shared.util.StateUtils;
+import org.apache.myfaces.shared.util.serial.DefaultSerialFactory;
import org.apache.myfaces.test.mock.MockRenderKit;
import org.junit.Test;
import org.testng.Assert;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/StateManagerWithFaceletsTest.java b/impl/src/test/java/org/apache/myfaces/view/facelets/StateManagerWithFaceletsTest.java
index 7dee917..21aac6f 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/StateManagerWithFaceletsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/StateManagerWithFaceletsTest.java
@@ -25,8 +25,8 @@ import javax.faces.render.ResponseStateManager;
import org.apache.myfaces.application.StateManagerImpl;
import org.apache.myfaces.renderkit.html.HtmlResponseStateManager;
-import org.apache.myfaces.shared_impl.util.StateUtils;
-import org.apache.myfaces.shared_impl.util.serial.DefaultSerialFactory;
+import org.apache.myfaces.shared.util.StateUtils;
+import org.apache.myfaces.shared.util.serial.DefaultSerialFactory;
import org.apache.myfaces.test.mock.MockRenderKit;
import org.junit.Test;
import org.testng.Assert;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/TagLibraryTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/TagLibraryTestCase.java
index 5a2db86..6f97daa 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/TagLibraryTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/TagLibraryTestCase.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.view.facelets.compiler;
import java.io.File;
import java.net.URL;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
+import org.apache.myfaces.shared.config.MyfacesConfig;
import org.apache.myfaces.view.facelets.FaceletTestCase;
import org.apache.myfaces.view.facelets.tag.TagLibrary;
import org.junit.Assert;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/mock/MockResourceHandlerSupport.java b/impl/src/test/java/org/apache/myfaces/view/facelets/mock/MockResourceHandlerSupport.java
index 0d76831..4b13064 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/mock/MockResourceHandlerSupport.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/mock/MockResourceHandlerSupport.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.view.facelets.mock;
import org.apache.myfaces.application.DefaultResourceHandlerSupport;
-import org.apache.myfaces.shared_impl.resource.ClassLoaderResourceLoader;
-import org.apache.myfaces.shared_impl.resource.ResourceLoader;
+import org.apache.myfaces.shared.resource.ClassLoaderResourceLoader;
+import org.apache.myfaces.shared.resource.ResourceLoader;
/**
* Redirect resource request to the directory where the test class is,
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/ViewMetadataTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/ViewMetadataTestCase.java
index a96aa4f..c59f502 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/ViewMetadataTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/ViewMetadataTestCase.java
@@ -34,8 +34,8 @@ import javax.faces.context.ResponseWriter;
import javax.faces.view.ViewMetadata;
import org.apache.myfaces.application.ViewHandlerImpl;
-import org.apache.myfaces.shared_impl.application.ViewHandlerSupport;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlResponseWriterImpl;
+import org.apache.myfaces.shared.renderkit.html.HtmlResponseWriterImpl;
+import org.apache.myfaces.shared.application.ViewHandlerSupport;
import org.apache.myfaces.view.facelets.FaceletTestCase;
import org.apache.myfaces.view.facelets.bean.HelloWorld;
import org.junit.Assert;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jstl/core/CifTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jstl/core/CifTestCase.java
index 79c687f..606022b 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jstl/core/CifTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jstl/core/CifTestCase.java
@@ -24,7 +24,7 @@ import javax.faces.application.StateManager;
import javax.faces.component.UIComponent;
import javax.faces.component.UIViewRoot;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
+import org.apache.myfaces.shared.config.MyfacesConfig;
import org.apache.myfaces.view.facelets.FaceletTestCase;
import org.apache.myfaces.view.facelets.bean.Employee;
import org.junit.Assert;
--
To stop receiving notification emails like this one, please contact
deki@apache.org.