You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2010/10/23 17:46:54 UTC
svn commit: r1026631 [1/3] - in
/myfaces/core/branches/2_0_3_snapshot_shade_test/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/...
Author: jakobk
Date: Sat Oct 23 15:46:51 2010
New Revision: 1026631
URL: http://svn.apache.org/viewvc?rev=1026631&view=rev
Log:
use maven-shade-plugin to include myfaces-shared-core and myfaces-impl-ee6 in myfaces-impl
Modified:
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/pom.xml
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/DefaultResourceHandlerSupport.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/TreeStructureManager.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/jsp/ServletViewResponseWrapper.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/ConfigFilesXmlValidationUtils.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigResourceProvider.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/Tomcat7AnnotationLifecycleProvider.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/_PackageInfo.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/ExceptionHandlerFactoryImpl.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/el/VariableResolverToApplicationELResolverAdapter.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlBodyRenderer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlButtonRenderer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRenderer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGridRenderer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGroupRenderer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHeadRenderer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHiddenRenderer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlImageRenderer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLabelRenderer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLinkRenderer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlListboxRenderer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMenuRenderer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessageRenderer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessagesRenderer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRenderer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRadioRenderer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlSecretRenderer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTableRenderer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextRenderer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextareaRenderer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateActionListener.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/taglib/core/GenericListenerTag.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/taglib/core/ParamTag.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/taglib/core/SelectItemTag.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/taglib/core/ViewTag.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/util/ContainerUtils.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementHelper.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategy.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/BodyEndElementInstruction.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/DefaultFaceletConfigResourceProvider.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetImpl.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorAttachedObjectTargetImpl.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentSupport.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidatorTagHandlerDelegate.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ActionListenerHandler.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AjaxHandler.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/LoadBundleHandler.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/view/facelets/util/Classpath.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/view/facelets/util/ReflectionUtil.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerFactory.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServlet.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/test/java/org/apache/myfaces/application/jsp/JspStateManagerImplTest.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/test/java/org/apache/myfaces/application/jsp/JspViewHandlerImplTest.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/test/java/org/apache/myfaces/context/PartialResponseWriterImplTest.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererTest.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlEscapeRendererTest.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlFormRendererTest.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRendererTest.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AbstractClientBehaviorTestCase.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlBodyClientBehaviorRendererTest.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlClientEventAttributesUtil.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlCommandButtonClientBehaviorRendererTest.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlCommandLinkClientBehaviorRendererTest.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutcomeTargetButtonClientBehaviorRendererTest.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutcomeTargetLinkClientBehaviorRendererTest.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutputLabelClientBehaviorRendererTest.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutputLinkClientBehaviorRendererTest.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/test/java/org/apache/myfaces/renderkits/OwnRenderkitTest.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletTestCase.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/TagLibraryTestCase.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/test/java/org/apache/myfaces/view/facelets/mock/MockResourceHandlerSupport.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/ViewMetadataTestCase.java
myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jstl/core/CifTestCase.java
Modified: myfaces/core/branches/2_0_3_snapshot_shade_test/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/pom.xml?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/pom.xml (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/pom.xml Sat Oct 23 15:46:51 2010
@@ -419,204 +419,44 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <!-- The shade plugin includes myfaces-shared-core and myfaces-impl-ee6 directly in the build -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+ <createSourcesJar>true</createSourcesJar>
+ <artifactSet>
+ <includes>
+ <include>org.apache.myfaces.shared:myfaces-shared-core</include>
+ <include>org.apache.myfaces.core:myfaces-impl-ee6</include>
+ </includes>
+ </artifactSet>
+ <relocations>
+ <relocation>
+ <pattern>org.apache.myfaces.shared</pattern>
+ <shadedPattern>org.apache.myfaces</shadedPattern> <!-- this used to be o.a.m.shared_impl -->
+ </relocation>
+ </relocations>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ </transformers>
+ </configuration>
+ </plugin>
</plugins>
</build>
<profiles>
<profile>
- <!-- 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 -->
- <id>add-shared-dependency</id>
- <activation>
- <property>
- <name>dev</name>
- <value>true</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-impl</artifactId>
- <version>${myfaces-shared.version}</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>unpack-shared-implee6</id>
- <activation>
- <property>
- <name>!dev</name>
- </property>
- </activation>
- <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.
- -->
- <!--
- - The implee6 project contains classes which need Java EE 6 dependencies.
- - The result is a jar 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>
- <executions>
- <execution>
- <id>unpack-shared-impl</id>
- <phase>process-classes</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <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>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>unpack-shared-impl-sources</id>
- <phase>process-sources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-impl</artifactId>
- <version>${myfaces-shared.version}</version>
- <classifier>sources</classifier>
- <excludes>META-INF/**</excludes>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/shared_sources</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>unpack-impl-ee6</id>
- <phase>process-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl-ee6</artifactId>
- <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>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>unpack-impl-ee6-sources</id>
- <phase>process-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl-ee6</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </artifactItem>
- </artifactItems>
- <!-- Just include the .java files in org/** and the META-INF/services directory -->
- <includes>org/**,META-INF/services/**</includes>
- <outputDirectory>${project.build.directory}/implee6_sources</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </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.
- -->
- <!--
- - Add the unpacked implee6 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.
- - This has to happen after the "real" sources have been compiled, otherwise the compilation
- - would fail because of wrong dependencies.
- -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>add-source-shared</id>
- <phase>process-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/shared_sources</source>
- <source>${project.build.directory}/implee6_sources</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <!-- USAGE: mvn eclipse:eclipse -Ddev=eclipse -->
- <id>eclipse-with-unpacked-shared</id>
- <activation>
- <property>
- <name>dev</name>
- <value>eclipse</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>add-source-shared</id>
- <phase>process-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/shared_sources</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<!--
- Whenever the full website is generated, the command
- mvn -Pgenerate-site -Pgenerate-tlddoc site
@@ -882,18 +722,33 @@
</profile>
</profiles>
<dependencies>
+
+ <!-- API dependency -->
+
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <!-- SHADED IMPL DEPENDENCIES -->
+
<dependency>
- <!-- this dependency will be packed together with the main artifact of this pom -->
<groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-impl</artifactId>
+ <artifactId>myfaces-shared-core</artifactId>
<version>${myfaces-shared.version}</version>
- <scope>provided</scope>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl-ee6</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
</dependency>
+
+ <!-- NORMAL DEPENDENCIES -->
+
<dependency>
<!-- el-api 2.1 is included in jsp-api, so this one has to be on top of it -->
<groupId>javax.el</groupId>
Modified: myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java Sat Oct 23 15:46:51 2010
@@ -35,7 +35,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;
import javax.el.CompositeELResolver;
Modified: myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/DefaultResourceHandlerSupport.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/DefaultResourceHandlerSupport.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/DefaultResourceHandlerSupport.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/DefaultResourceHandlerSupport.java Sat Oct 23 15:46:51 2010
@@ -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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java Sat Oct 23 15:46:51 2010
@@ -44,8 +44,8 @@ import javax.faces.context.PartialViewCo
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.HashMapUtils;
+import org.apache.myfaces.shared.util.StringUtils;
/**
* @author Thomas Spiegl (latest modification by $Author$)
Modified: myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java Sat Oct 23 15:46:51 2010
@@ -35,15 +35,15 @@ import javax.faces.context.FacesContext;
import javax.servlet.http.HttpServletResponse;
import org.apache.myfaces.renderkit.ErrorPageWriter;
-import org.apache.myfaces.shared_impl.resource.ResourceHandlerCache;
-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.resource.ResourceHandlerCache.ResourceValue;
-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.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.resource.ResourceHandlerCache.ResourceValue;
+import org.apache.myfaces.shared.util.ClassUtils;
+import org.apache.myfaces.shared.util.ExternalContextUtils;
+import org.apache.myfaces.shared.util.StringUtils;
/**
* DOCUMENT ME!
Modified: myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/TreeStructureManager.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/TreeStructureManager.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/TreeStructureManager.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/TreeStructureManager.java Sat Oct 23 15:46:51 2010
@@ -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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java Sat Oct 23 15:46:51 2010
@@ -46,11 +46,11 @@ import javax.faces.view.ViewMetadata;
import javax.servlet.http.HttpServletResponse;
import org.apache.myfaces.application.jsp.JspStateManagerImpl;
-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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java Sat Oct 23 15:46:51 2010
@@ -50,8 +50,8 @@ import org.apache.myfaces.application.My
import org.apache.myfaces.application.TreeStructureManager;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
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;
import javax.faces.FactoryFinder;
import javax.faces.component.NamingContainer;
@@ -70,8 +70,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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java Sat Oct 23 15:46:51 2010
@@ -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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/jsp/ServletViewResponseWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/jsp/ServletViewResponseWrapper.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/jsp/ServletViewResponseWrapper.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/application/jsp/ServletViewResponseWrapper.java Sat Oct 23 15:46:51 2010
@@ -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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/ConfigFilesXmlValidationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/ConfigFilesXmlValidationUtils.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/ConfigFilesXmlValidationUtils.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/ConfigFilesXmlValidationUtils.java Sat Oct 23 15:46:51 2010
@@ -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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigResourceProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigResourceProvider.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigResourceProvider.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigResourceProvider.java Sat Oct 23 15:46:51 2010
@@ -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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java Sat Oct 23 15:46:51 2010
@@ -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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java Sat Oct 23 15:46:51 2010
@@ -108,12 +108,12 @@ import org.apache.myfaces.el.VariableRes
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.config.MyfacesConfig;
+import org.apache.myfaces.shared.util.ClassUtils;
+import org.apache.myfaces.shared.util.LocaleUtils;
+import org.apache.myfaces.shared.util.StateUtils;
+import org.apache.myfaces.shared.util.serial.DefaultSerialFactory;
+import org.apache.myfaces.shared.util.serial.SerialFactory;
import org.apache.myfaces.spi.FacesConfigResourceProvider;
import org.apache.myfaces.spi.FacesConfigResourceProviderFactory;
import org.apache.myfaces.util.ContainerUtils;
Modified: myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java Sat Oct 23 15:46:51 2010
@@ -51,7 +51,7 @@ import org.apache.myfaces.config.element
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.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.util.ContainerUtils;
Modified: myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java Sat Oct 23 15:46:51 2010
@@ -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.view.facelets.util.Classpath;
Modified: myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java Sat Oct 23 15:46:51 2010
@@ -22,7 +22,7 @@ import org.apache.commons.discovery.Reso
import org.apache.commons.discovery.resource.ClassLoaders;
import org.apache.commons.discovery.resource.names.DiscoverServiceNames;
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 javax.faces.FacesException;
import javax.faces.context.ExternalContext;
Modified: myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java Sat Oct 23 15:46:51 2010
@@ -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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java Sat Oct 23 15:46:51 2010
@@ -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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/Tomcat7AnnotationLifecycleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/Tomcat7AnnotationLifecycleProvider.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/Tomcat7AnnotationLifecycleProvider.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/Tomcat7AnnotationLifecycleProvider.java Sat Oct 23 15:46:51 2010
@@ -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 org.apache.tomcat.InstanceManager;
import javax.faces.context.ExternalContext;
Modified: myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java Sat Oct 23 15:46:51 2010
@@ -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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/_PackageInfo.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/_PackageInfo.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/_PackageInfo.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/annotation/_PackageInfo.java Sat Oct 23 15:46:51 2010
@@ -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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java Sat Oct 23 15:46:51 2010
@@ -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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java Sat Oct 23 15:46:51 2010
@@ -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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java Sat Oct 23 15:46:51 2010
@@ -25,7 +25,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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/ExceptionHandlerFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/ExceptionHandlerFactoryImpl.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/ExceptionHandlerFactoryImpl.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/ExceptionHandlerFactoryImpl.java Sat Oct 23 15:46:51 2010
@@ -21,7 +21,7 @@ package org.apache.myfaces.context;
import javax.faces.context.ExceptionHandler;
import javax.faces.context.ExceptionHandlerFactory;
-import org.apache.myfaces.shared_impl.context.ExceptionHandlerImpl;
+import org.apache.myfaces.shared.context.ExceptionHandlerImpl;
/**
* DOCUMENT ME!
Modified: myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java Sat Oct 23 15:46:51 2010
@@ -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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java Sat Oct 23 15:46:51 2010
@@ -41,7 +41,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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java Sat Oct 23 15:46:51 2010
@@ -43,7 +43,7 @@ import javax.faces.event.PhaseId;
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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java Sat Oct 23 15:46:51 2010
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.context.servlet;
-import org.apache.myfaces.shared_impl.context.flash.FlashImpl;
+import org.apache.myfaces.shared.context.flash.FlashImpl;
import org.apache.myfaces.util.EnumerationIterator;
import javax.faces.FacesException;
Modified: myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java Sat Oct 23 15:46:51 2010
@@ -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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/el/VariableResolverToApplicationELResolverAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/el/VariableResolverToApplicationELResolverAdapter.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/el/VariableResolverToApplicationELResolverAdapter.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/el/VariableResolverToApplicationELResolverAdapter.java Sat Oct 23 15:46:51 2010
@@ -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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java Sat Oct 23 15:46:51 2010
@@ -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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java Sat Oct 23 15:46:51 2010
@@ -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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java Sat Oct 23 15:46:51 2010
@@ -35,7 +35,7 @@ import org.apache.myfaces.buildtools.mav
import org.apache.myfaces.config.RuntimeConfig;
import org.apache.myfaces.el.convert.PropertyResolverToELResolver;
import org.apache.myfaces.el.convert.VariableResolverToELResolver;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
/**
* @author Mathias Broekelmann (latest modification by $Author$)
Modified: myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java Sat Oct 23 15:46:51 2010
@@ -38,10 +38,10 @@ import javax.faces.event.PostRestoreStat
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.renderkit.RendererUtils;
-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.renderkit.RendererUtils;
+import org.apache.myfaces.shared.util.Assert;
/**
* @author Mathias Broekelmann (latest modification by $Author$)
Modified: myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java Sat Oct 23 15:46:51 2010
@@ -35,8 +35,8 @@ 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_impl.webapp.webxml.WebXml;
+import org.apache.myfaces.shared.util.ClassUtils;
+import org.apache.myfaces.shared.webapp.webxml.WebXml;
import org.apache.myfaces.util.DebugUtils;
/**
Modified: myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java Sat Oct 23 15:46:51 2010
@@ -69,10 +69,10 @@ 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_impl.webapp.webxml.WebXml;
+import org.apache.myfaces.shared.renderkit.html.HtmlResponseWriterImpl;
+import org.apache.myfaces.shared.util.ClassUtils;
+import org.apache.myfaces.shared.util.StateUtils;
+import org.apache.myfaces.shared.webapp.webxml.WebXml;
import org.apache.myfaces.view.facelets.component.UIRepeat;
/**
Modified: myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlBodyRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlBodyRenderer.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlBodyRenderer.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlBodyRenderer.java Sat Oct 23 15:46:51 2010
@@ -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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlButtonRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlButtonRenderer.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlButtonRenderer.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlButtonRenderer.java Sat Oct 23 15:46:51 2010
@@ -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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRenderer.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRenderer.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRenderer.java Sat Oct 23 15:46:51 2010
@@ -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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java Sat Oct 23 15:46:51 2010
@@ -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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java Sat Oct 23 15:46:51 2010
@@ -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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java Sat Oct 23 15:46:51 2010
@@ -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.config.MyfacesConfig;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlFormRendererBase;
+import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
/**
Modified: myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java Sat Oct 23 15:46:51 2010
@@ -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.JSFAttr;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlTextRendererBase;
/**
*
Modified: myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGridRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGridRenderer.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGridRenderer.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGridRenderer.java Sat Oct 23 15:46:51 2010
@@ -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/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGroupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGroupRenderer.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGroupRenderer.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGroupRenderer.java Sat Oct 23 15:46:51 2010
@@ -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;
/**
Modified: myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHeadRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHeadRenderer.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHeadRenderer.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHeadRenderer.java Sat Oct 23 15:46:51 2010
@@ -27,8 +27,8 @@ import javax.faces.context.ResponseWrite
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.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
/**
* Renderer used by h:head component
Modified: myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHiddenRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHiddenRenderer.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHiddenRenderer.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHiddenRenderer.java Sat Oct 23 15:46:51 2010
@@ -28,11 +28,11 @@ import javax.faces.context.ResponseWrite
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.JSFAttr;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
/**
*
Modified: myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlImageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlImageRenderer.java?rev=1026631&r1=1026630&r2=1026631&view=diff
==============================================================================
--- myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlImageRenderer.java (original)
+++ myfaces/core/branches/2_0_3_snapshot_shade_test/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlImageRenderer.java Sat Oct 23 15:46:51 2010
@@ -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;
/**