You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/07/23 18:10:30 UTC
svn commit: r1150140 [1/3] - in
/myfaces/core/branches/refactor_shared_2_1_x/impl: ./
src/main/java/org/apache/myfaces/application/
src/main/java/org/apache/myfaces/application/jsp/
src/main/java/org/apache/myfaces/config/ src/main/java/org/apache/myfa...
Author: lu4242
Date: Sat Jul 23 16:09:56 2011
New Revision: 1150140
URL: http://svn.apache.org/viewvc?rev=1150140&view=rev
Log:
rename shared-impl to shared, configure pom.xml to use as internal module using shade plugin, and move non changeable classes to impl
Added:
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/ (with props)
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/ (with props)
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/ (with props)
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/DelegatedFacesServlet.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/FilterMapping.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/ServletMapping.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXml.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXmlParser.java
Modified:
myfaces/core/branches/refactor_shared_2_1_x/impl/pom.xml
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/DefaultResourceHandlerSupport.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/TreeStructureManager.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/jsp/ServletViewResponseWrapper.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/ConfigFilesXmlValidationUtils.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigResourceProvider.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/LogMetaInfUtils.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/Tomcat7AnnotationLifecycleProvider.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/_PackageInfo.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/ExceptionHandlerFactoryImpl.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/MyFacesExceptionHandlerWrapperImpl.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/el/VariableResolverToApplicationELResolverAdapter.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlBodyRenderer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlButtonRenderer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRenderer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGridRenderer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGroupRenderer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHeadRenderer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHiddenRenderer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlImageRenderer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLabelRenderer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLinkRenderer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlListboxRenderer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMenuRenderer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessageRenderer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessagesRenderer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRenderer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRadioRenderer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlSecretRenderer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTableRenderer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextRenderer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextareaRenderer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/FactoryFinderProviderFactory.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinderFactory.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/WebConfigProvider.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationMergerFactory.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationProviderFactory.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultServiceProviderFinder.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/SpiUtils.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateActionListener.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/GenericListenerTag.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/ParamTag.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/SelectItemTag.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/ViewTag.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/util/ContainerUtils.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementHelper.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategy.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/BodyEndElementInstruction.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/DefaultFaceletConfigResourceProvider.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCacheFactoryImpl.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCompositionContextImpl.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetaRulesetImpl.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetImpl.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorAttachedObjectTargetImpl.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResourceLibrary.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentSupport.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidatorTagHandlerDelegate.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ActionListenerHandler.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AjaxHandler.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/LoadBundleHandler.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SelectItemHandler.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/util/Classpath.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/util/ReflectionUtil.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerFactory.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/application/StateManagerImplTest.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/application/jsp/JspStateManagerImplTest.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/application/jsp/JspViewHandlerImplTest.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/context/PartialResponseWriterImplTest.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererTest.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlEscapeRendererTest.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlFormRendererTest.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRendererTest.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AbstractClientBehaviorTestCase.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlBodyClientBehaviorRendererTest.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlClientEventAttributesUtil.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlCommandButtonClientBehaviorRendererTest.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlCommandLinkClientBehaviorRendererTest.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutcomeTargetButtonClientBehaviorRendererTest.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutcomeTargetLinkClientBehaviorRendererTest.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutputLabelClientBehaviorRendererTest.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutputLinkClientBehaviorRendererTest.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/renderkits/OwnRenderkitTest.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletMultipleRequestsTestCase.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletTestCase.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/view/facelets/StateManagerWithFaceletsClientSideTest.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/view/facelets/StateManagerWithFaceletsTest.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/TagLibraryTestCase.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/view/facelets/mock/MockResourceHandlerSupport.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/ViewMetadataTestCase.java
myfaces/core/branches/refactor_shared_2_1_x/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jstl/core/CifTestCase.java
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/pom.xml?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/pom.xml (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/pom.xml Sat Jul 23 16:09:56 2011
@@ -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>
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java Sat Jul 23 16:09:56 2011
@@ -102,7 +102,7 @@ import org.apache.myfaces.el.unified.Res
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;
/**
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/DefaultResourceHandlerSupport.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/DefaultResourceHandlerSupport.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/DefaultResourceHandlerSupport.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/DefaultResourceHandlerSupport.java Sat Jul 23 16:09:56 2011
@@ -22,10 +22,10 @@ import javax.faces.application.ProjectSt
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,
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java Sat Jul 23 16:09:56 2011
@@ -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;
/**
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java Sat Jul 23 16:09:56 2011
@@ -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;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/TreeStructureManager.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/TreeStructureManager.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/TreeStructureManager.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/TreeStructureManager.java Sat Jul 23 16:09:56 2011
@@ -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;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java Sat Jul 23 16:09:56 2011
@@ -47,11 +47,11 @@ import javax.servlet.http.HttpServletRes
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;
/**
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java Sat Jul 23 16:09:56 2011
@@ -61,8 +61,8 @@ import org.apache.commons.collections.ma
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
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java Sat Jul 23 16:09:56 2011
@@ -45,11 +45,11 @@ import javax.servlet.http.HttpServletRes
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
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/jsp/ServletViewResponseWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/jsp/ServletViewResponseWrapper.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/jsp/ServletViewResponseWrapper.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/application/jsp/ServletViewResponseWrapper.java Sat Jul 23 16:09:56 2011
@@ -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;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/ConfigFilesXmlValidationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/ConfigFilesXmlValidationUtils.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/ConfigFilesXmlValidationUtils.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/ConfigFilesXmlValidationUtils.java Sat Jul 23 16:09:56 2011
@@ -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;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigResourceProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigResourceProvider.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigResourceProvider.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigResourceProvider.java Sat Jul 23 16:09:56 2011
@@ -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;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java Sat Jul 23 16:09:56 2011
@@ -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;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java Sat Jul 23 16:09:56 2011
@@ -30,7 +30,7 @@ import org.apache.myfaces.buildtools.mav
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
{
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java Sat Jul 23 16:09:56 2011
@@ -95,12 +95,12 @@ import org.apache.myfaces.el.unified.Res
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;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/LogMetaInfUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/LogMetaInfUtils.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/LogMetaInfUtils.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/LogMetaInfUtils.java Sat Jul 23 16:09:56 2011
@@ -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;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java Sat Jul 23 16:09:56 2011
@@ -29,7 +29,7 @@ import org.apache.myfaces.config.element
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;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java Sat Jul 23 16:09:56 2011
@@ -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;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java Sat Jul 23 16:09:56 2011
@@ -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;
/*
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java Sat Jul 23 16:09:56 2011
@@ -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;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java Sat Jul 23 16:09:56 2011
@@ -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
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/Tomcat7AnnotationLifecycleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/Tomcat7AnnotationLifecycleProvider.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/Tomcat7AnnotationLifecycleProvider.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/Tomcat7AnnotationLifecycleProvider.java Sat Jul 23 16:09:56 2011
@@ -28,7 +28,7 @@ import javax.faces.context.ExternalConte
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;
/**
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java Sat Jul 23 16:09:56 2011
@@ -25,7 +25,7 @@ import javax.faces.context.ExternalConte
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
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/_PackageInfo.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/_PackageInfo.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/_PackageInfo.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/annotation/_PackageInfo.java Sat Jul 23 16:09:56 2011
@@ -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
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java Sat Jul 23 16:09:56 2011
@@ -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;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java Sat Jul 23 16:09:56 2011
@@ -26,7 +26,7 @@ import org.apache.myfaces.config.FacesCo
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;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java Sat Jul 23 16:09:56 2011
@@ -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;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/ExceptionHandlerFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/ExceptionHandlerFactoryImpl.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/ExceptionHandlerFactoryImpl.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/ExceptionHandlerFactoryImpl.java Sat Jul 23 16:09:56 2011
@@ -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!
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java Sat Jul 23 16:09:56 2011
@@ -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!
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/MyFacesExceptionHandlerWrapperImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/MyFacesExceptionHandlerWrapperImpl.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/MyFacesExceptionHandlerWrapperImpl.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/MyFacesExceptionHandlerWrapperImpl.java Sat Jul 23 16:09:56 2011
@@ -38,7 +38,7 @@ import javax.faces.event.ExceptionQueued
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;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java Sat Jul 23 16:09:56 2011
@@ -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$)
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java Sat Jul 23 16:09:56 2011
@@ -46,7 +46,7 @@ import javax.faces.render.RenderKitFacto
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 {
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java Sat Jul 23 16:09:56 2011
@@ -47,7 +47,7 @@ import javax.servlet.http.HttpServletReq
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;
/**
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java Sat Jul 23 16:09:56 2011
@@ -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;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/el/VariableResolverToApplicationELResolverAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/el/VariableResolverToApplicationELResolverAdapter.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/el/VariableResolverToApplicationELResolverAdapter.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/el/VariableResolverToApplicationELResolverAdapter.java Sat Jul 23 16:09:56 2011
@@ -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.
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java Sat Jul 23 16:09:56 2011
@@ -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.
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java Sat Jul 23 16:09:56 2011
@@ -26,7 +26,7 @@ import javax.faces.el.EvaluationExceptio
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
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java Sat Jul 23 16:09:56 2011
@@ -42,9 +42,9 @@ import javax.faces.render.RenderKitFacto
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$)
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java Sat Jul 23 16:09:56 2011
@@ -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;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java Sat Jul 23 16:09:56 2011
@@ -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;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java Sat Jul 23 16:09:56 2011
@@ -45,9 +45,9 @@ import org.apache.commons.collections.ma
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>
{
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlBodyRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlBodyRenderer.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlBodyRenderer.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlBodyRenderer.java Sat Jul 23 16:09:56 2011
@@ -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
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlButtonRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlButtonRenderer.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlButtonRenderer.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlButtonRenderer.java Sat Jul 23 16:09:56 2011
@@ -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;
/**
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRenderer.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRenderer.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRenderer.java Sat Jul 23 16:09:56 2011
@@ -20,7 +20,7 @@ package org.apache.myfaces.renderkit.htm
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;
/**
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java Sat Jul 23 16:09:56 2011
@@ -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;
/**
*
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java Sat Jul 23 16:09:56 2011
@@ -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;
/**
*
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java Sat Jul 23 16:09:56 2011
@@ -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;
/**
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java Sat Jul 23 16:09:56 2011
@@ -32,11 +32,11 @@ import javax.faces.component.html.HtmlOu
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;
/**
*
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGridRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGridRenderer.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGridRenderer.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGridRenderer.java Sat Jul 23 16:09:56 2011
@@ -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;
/**
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGroupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGroupRenderer.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGroupRenderer.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGroupRenderer.java Sat Jul 23 16:09:56 2011
@@ -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;
/**