Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

use maven-shade-plugin to include myfaces-shared-core and myfaces-imp…

…l-ee6 in myfaces-impl

git-svn-id: https://svn.apache.org/repos/asf/myfaces/core/branches/2_0_3_snapshot_shade_test@1026631 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit 1cf3b5ebb842ab44637e331b0c50e9dafda97d4d 1 parent e4524cb
Jakob Korherr authored

Showing 128 changed files with 301 additions and 446 deletions. Show diff stats Hide diff stats

  1. +52 197 impl/pom.xml
  2. +1 1  impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
  3. +4 4 impl/src/main/java/org/apache/myfaces/application/DefaultResourceHandlerSupport.java
  4. +2 2 impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
  5. +9 9 impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
  6. +1 1  impl/src/main/java/org/apache/myfaces/application/TreeStructureManager.java
  7. +5 5 impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java
  8. +4 4 impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
  9. +5 5 impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java
  10. +1 1  impl/src/main/java/org/apache/myfaces/application/jsp/ServletViewResponseWrapper.java
  11. +1 1  impl/src/main/java/org/apache/myfaces/config/ConfigFilesXmlValidationUtils.java
  12. +1 1  impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigResourceProvider.java
  13. +1 1  impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java
  14. +6 6 impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
  15. +1 1  impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java
  16. +1 1  impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java
  17. +1 1  impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
  18. +1 1  impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java
  19. +1 1  impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java
  20. +1 1  impl/src/main/java/org/apache/myfaces/config/annotation/Tomcat7AnnotationLifecycleProvider.java
  21. +1 1  impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java
  22. +1 1  impl/src/main/java/org/apache/myfaces/config/annotation/_PackageInfo.java
  23. +1 1  impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java
  24. +1 1  impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java
  25. +1 1  impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java
  26. +1 1  impl/src/main/java/org/apache/myfaces/context/ExceptionHandlerFactoryImpl.java
  27. +1 1  impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java
  28. +1 1  impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
  29. +1 1  impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
  30. +1 1  impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
  31. +1 1  impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java
  32. +1 1  impl/src/main/java/org/apache/myfaces/el/VariableResolverToApplicationELResolverAdapter.java
  33. +1 1  impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java
  34. +1 1  impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java
  35. +1 1  impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java
  36. +4 4 impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java
  37. +2 2 impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
  38. +4 4 impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
  39. +1 1  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlBodyRenderer.java
  40. +1 1  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlButtonRenderer.java
  41. +1 1  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRenderer.java
  42. +1 1  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java
  43. +1 1  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java
  44. +4 4 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java
  45. +5 5 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java
  46. +1 1  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGridRenderer.java
  47. +1 1  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGroupRenderer.java
  48. +2 2 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHeadRenderer.java
  49. +5 5 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHiddenRenderer.java
  50. +1 1  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlImageRenderer.java
  51. +10 10 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLabelRenderer.java
  52. +1 1  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLinkRenderer.java
  53. +1 1  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlListboxRenderer.java
  54. +1 1  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMenuRenderer.java
  55. +2 2 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessageRenderer.java
  56. +2 2 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessagesRenderer.java
  57. +1 1  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRenderer.java
  58. +1 1  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRadioRenderer.java
  59. +3 3 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
  60. +5 5 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
  61. +4 4 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java
  62. +1 1  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlSecretRenderer.java
  63. +4 4 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java
  64. +1 1  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTableRenderer.java
  65. +1 1  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextRenderer.java
  66. +1 1  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextareaRenderer.java
  67. +12 12 impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java
  68. +1 1  impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java
  69. +1 1  impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java
  70. +1 1  impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java
  71. +2 2 impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java
  72. +1 1  impl/src/main/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java
  73. +1 1  impl/src/main/java/org/apache/myfaces/taglib/core/DelegateActionListener.java
  74. +1 1  impl/src/main/java/org/apache/myfaces/taglib/core/GenericListenerTag.java
  75. +1 1  impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java
  76. +1 1  impl/src/main/java/org/apache/myfaces/taglib/core/ParamTag.java
  77. +1 1  impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java
  78. +1 1  impl/src/main/java/org/apache/myfaces/taglib/core/SelectItemTag.java
  79. +2 2 impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java
  80. +1 1  impl/src/main/java/org/apache/myfaces/taglib/core/ViewTag.java
  81. +1 1  impl/src/main/java/org/apache/myfaces/util/ContainerUtils.java
  82. +2 2 impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementHelper.java
  83. +3 3 impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategy.java
  84. +7 7 impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
  85. +1 1  impl/src/main/java/org/apache/myfaces/view/facelets/compiler/BodyEndElementInstruction.java
  86. +1 1  impl/src/main/java/org/apache/myfaces/view/facelets/compiler/DefaultFaceletConfigResourceProvider.java
  87. +1 1  impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java
  88. +2 2 impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java
  89. +1 1  impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
  90. +2 2 impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetImpl.java
  91. +2 2 impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorAttachedObjectTargetImpl.java
  92. +1 1  impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentSupport.java
  93. +1 1  impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidatorTagHandlerDelegate.java
  94. +1 1  impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ActionListenerHandler.java
  95. +2 2 impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AjaxHandler.java
  96. +1 1  impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/LoadBundleHandler.java
  97. +1 1  impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java
  98. +1 1  impl/src/main/java/org/apache/myfaces/view/facelets/util/Classpath.java
  99. +2 2 impl/src/main/java/org/apache/myfaces/view/facelets/util/ReflectionUtil.java
  100. +1 1  impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java
  101. +4 4 impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
  102. +1 1  impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerFactory.java
  103. +1 1  impl/src/main/java/org/apache/myfaces/webapp/MyFacesServlet.java
  104. +1 1  impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java
  105. +1 1  impl/src/test/java/org/apache/myfaces/application/jsp/JspStateManagerImplTest.java
  106. +2 2 impl/src/test/java/org/apache/myfaces/application/jsp/JspViewHandlerImplTest.java
  107. +1 1  impl/src/test/java/org/apache/myfaces/context/PartialResponseWriterImplTest.java
  108. +1 1  impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererTest.java
  109. +1 1  impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlEscapeRendererTest.java
  110. +1 1  impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlFormRendererTest.java
  111. +1 1  impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererTest.java
  112. +2 2 impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRendererTest.java
  113. +2 2 impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AbstractClientBehaviorTestCase.java
  114. +3 3 impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlBodyClientBehaviorRendererTest.java
  115. +3 3 impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlClientEventAttributesUtil.java
  116. +3 3 impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlCommandButtonClientBehaviorRendererTest.java
  117. +3 3 impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlCommandLinkClientBehaviorRendererTest.java
  118. +3 3 ...test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutcomeTargetButtonClientBehaviorRendererTest.java
  119. +3 3 ...c/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutcomeTargetLinkClientBehaviorRendererTest.java
  120. +3 3 impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutputLabelClientBehaviorRendererTest.java
  121. +3 3 impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlOutputLinkClientBehaviorRendererTest.java
  122. +1 1  impl/src/test/java/org/apache/myfaces/renderkits/OwnRenderkitTest.java
  123. +1 1  impl/src/test/java/org/apache/myfaces/test/AbstractClassElementTestCase.java
  124. +2 2 impl/src/test/java/org/apache/myfaces/view/facelets/FaceletTestCase.java
  125. +1 1  impl/src/test/java/org/apache/myfaces/view/facelets/compiler/TagLibraryTestCase.java
  126. +2 2 impl/src/test/java/org/apache/myfaces/view/facelets/mock/MockResourceHandlerSupport.java
  127. +2 2 impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/ViewMetadataTestCase.java
  128. +1 1  impl/src/test/java/org/apache/myfaces/view/facelets/tag/jstl/core/CifTestCase.java
249 impl/pom.xml
@@ -419,204 +419,44 @@
419 419 </execution>
420 420 </executions>
421 421 </plugin>
  422 +
  423 + <plugin>
  424 + <!-- The shade plugin includes myfaces-shared-core and myfaces-impl-ee6 directly in the build -->
  425 + <groupId>org.apache.maven.plugins</groupId>
  426 + <artifactId>maven-shade-plugin</artifactId>
  427 + <version>1.4</version>
  428 + <executions>
  429 + <execution>
  430 + <phase>package</phase>
  431 + <goals>
  432 + <goal>shade</goal>
  433 + </goals>
  434 + </execution>
  435 + </executions>
  436 + <configuration>
  437 + <createDependencyReducedPom>true</createDependencyReducedPom>
  438 + <createSourcesJar>true</createSourcesJar>
  439 + <artifactSet>
  440 + <includes>
  441 + <include>org.apache.myfaces.shared:myfaces-shared-core</include>
  442 + <include>org.apache.myfaces.core:myfaces-impl-ee6</include>
  443 + </includes>
  444 + </artifactSet>
  445 + <relocations>
  446 + <relocation>
  447 + <pattern>org.apache.myfaces.shared</pattern>
  448 + <shadedPattern>org.apache.myfaces</shadedPattern> <!-- this used to be o.a.m.shared_impl -->
  449 + </relocation>
  450 + </relocations>
  451 + <transformers>
  452 + <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
  453 + </transformers>
  454 + </configuration>
  455 + </plugin>
422 456 </plugins>
423 457 </build>
424 458 <profiles>
425 459 <profile>
426   - <!-- This profile use a shared dependency rather than unpack the
427   - code directly. The ideal is that this profile is active when the
428   - version of this library is snapshot, but unfortunately there is
429   - no way to activate it (see http://jira.codehaus.org/browse/MNG-3826).
430   - Existing problems on maven 2.0.x architecture makes impossible do it.
431   - For now the solution is trigger it manually using the property
432   - -Ddev=true -->
433   - <id>add-shared-dependency</id>
434   - <activation>
435   - <property>
436   - <name>dev</name>
437   - <value>true</value>
438   - </property>
439   - </activation>
440   - <dependencies>
441   - <dependency>
442   - <groupId>org.apache.myfaces.shared</groupId>
443   - <artifactId>myfaces-shared-impl</artifactId>
444   - <version>${myfaces-shared.version}</version>
445   - <scope>compile</scope>
446   - </dependency>
447   - </dependencies>
448   - </profile>
449   - <profile>
450   - <id>unpack-shared-implee6</id>
451   - <activation>
452   - <property>
453   - <name>!dev</name>
454   - </property>
455   - </activation>
456   - <build>
457   - <plugins>
458   - <plugin>
459   - <!--
460   - - The shared-impl project generates a modified version of the "shared" module
461   - - source and classes. The result is a jar full of files in the "shared_impl"
462   - - package that we can merge into the jar for this project.
463   - -->
464   - <!--
465   - - The implee6 project contains classes which need Java EE 6 dependencies.
466   - - The result is a jar that we can merge into the jar for this project.
467   - -->
468   - <groupId>org.apache.maven.plugins</groupId>
469   - <artifactId>maven-dependency-plugin</artifactId>
470   - <version>2.0</version>
471   - <executions>
472   - <execution>
473   - <id>unpack-shared-impl</id>
474   - <phase>process-classes</phase>
475   - <goals>
476   - <goal>unpack</goal>
477   - </goals>
478   - <configuration>
479   - <artifactItems>
480   - <artifactItem>
481   - <groupId>org.apache.myfaces.shared</groupId>
482   - <artifactId>myfaces-shared-impl</artifactId>
483   - <version>${myfaces-shared.version}</version>
484   - <!-- we need to include META-INF/resources and META-INF/internal-resources -->
485   - <excludes>META-INF/DEPENDENCIES,META-INF/LICENSE,META-INF/NOTICE,META-INF/MANIFEST.MF</excludes>
486   - </artifactItem>
487   - </artifactItems>
488   - <outputDirectory>${project.build.directory}/classes</outputDirectory>
489   - </configuration>
490   - </execution>
491   - <execution>
492   - <id>unpack-shared-impl-sources</id>
493   - <phase>process-sources</phase>
494   - <goals>
495   - <goal>unpack</goal>
496   - </goals>
497   - <configuration>
498   - <artifactItems>
499   - <artifactItem>
500   - <groupId>org.apache.myfaces.shared</groupId>
501   - <artifactId>myfaces-shared-impl</artifactId>
502   - <version>${myfaces-shared.version}</version>
503   - <classifier>sources</classifier>
504   - <excludes>META-INF/**</excludes>
505   - </artifactItem>
506   - </artifactItems>
507   - <outputDirectory>${project.build.directory}/shared_sources</outputDirectory>
508   - </configuration>
509   - </execution>
510   - <execution>
511   - <id>unpack-impl-ee6</id>
512   - <phase>process-resources</phase>
513   - <goals>
514   - <goal>unpack</goal>
515   - </goals>
516   - <configuration>
517   - <artifactItems>
518   - <artifactItem>
519   - <groupId>org.apache.myfaces.core</groupId>
520   - <artifactId>myfaces-impl-ee6</artifactId>
521   - <version>${project.version}</version>
522   - </artifactItem>
523   - </artifactItems>
524   - <!-- Just include the .class files in org/** and the META-INF/services directory -->
525   - <includes>org/**,META-INF/services/**</includes>
526   - <outputDirectory>${project.build.directory}/classes</outputDirectory>
527   - </configuration>
528   - </execution>
529   - <execution>
530   - <id>unpack-impl-ee6-sources</id>
531   - <phase>process-resources</phase>
532   - <goals>
533   - <goal>unpack</goal>
534   - </goals>
535   - <configuration>
536   - <artifactItems>
537   - <artifactItem>
538   - <groupId>org.apache.myfaces.core</groupId>
539   - <artifactId>myfaces-impl-ee6</artifactId>
540   - <version>${project.version}</version>
541   - <classifier>sources</classifier>
542   - </artifactItem>
543   - </artifactItems>
544   - <!-- Just include the .java files in org/** and the META-INF/services directory -->
545   - <includes>org/**,META-INF/services/**</includes>
546   - <outputDirectory>${project.build.directory}/implee6_sources</outputDirectory>
547   - </configuration>
548   - </execution>
549   - </executions>
550   - </plugin>
551   - <plugin>
552   - <!--
553   - - Add the unpacked shared sources directory as source directory into the pom datastructure,
554   - - so that the -source jar includes them too; every .class file in the jar should have its
555   - - source in the -source jar.
556   - -->
557   - <!--
558   - - Add the unpacked implee6 sources directory as source directory into the pom datastructure,
559   - - so that the -source jar includes them too; every .class file in the jar should have its
560   - - source in the -source jar.
561   - - This has to happen after the "real" sources have been compiled, otherwise the compilation
562   - - would fail because of wrong dependencies.
563   - -->
564   - <groupId>org.codehaus.mojo</groupId>
565   - <artifactId>build-helper-maven-plugin</artifactId>
566   - <version>1.0</version>
567   - <executions>
568   - <execution>
569   - <id>add-source-shared</id>
570   - <phase>process-sources</phase>
571   - <goals>
572   - <goal>add-source</goal>
573   - </goals>
574   - <configuration>
575   - <sources>
576   - <source>${project.build.directory}/shared_sources</source>
577   - <source>${project.build.directory}/implee6_sources</source>
578   - </sources>
579   - </configuration>
580   - </execution>
581   - </executions>
582   - </plugin>
583   - </plugins>
584   - </build>
585   - </profile>
586   - <profile>
587   - <!-- USAGE: mvn eclipse:eclipse -Ddev=eclipse -->
588   - <id>eclipse-with-unpacked-shared</id>
589   - <activation>
590   - <property>
591   - <name>dev</name>
592   - <value>eclipse</value>
593   - </property>
594   - </activation>
595   - <build>
596   - <plugins>
597   - <plugin>
598   - <groupId>org.codehaus.mojo</groupId>
599   - <artifactId>build-helper-maven-plugin</artifactId>
600   - <version>1.0</version>
601   - <executions>
602   - <execution>
603   - <id>add-source-shared</id>
604   - <phase>process-sources</phase>
605   - <goals>
606   - <goal>add-source</goal>
607   - </goals>
608   - <configuration>
609   - <sources>
610   - <source>${project.build.directory}/shared_sources</source>
611   - </sources>
612   - </configuration>
613   - </execution>
614   - </executions>
615   - </plugin>
616   - </plugins>
617   - </build>
618   - </profile>
619   - <profile>
620 460 <!--
621 461 - Whenever the full website is generated, the command
622 462 - mvn -Pgenerate-site -Pgenerate-tlddoc site
@@ -882,18 +722,33 @@
882 722 </profile>
883 723 </profiles>
884 724 <dependencies>
  725 +
  726 + <!-- API dependency -->
  727 +
885 728 <dependency>
886 729 <groupId>org.apache.myfaces.core</groupId>
887 730 <artifactId>myfaces-api</artifactId>
888 731 <version>${project.version}</version>
889 732 </dependency>
  733 +
  734 + <!-- SHADED IMPL DEPENDENCIES -->
  735 +
890 736 <dependency>
891   - <!-- this dependency will be packed together with the main artifact of this pom -->
892 737 <groupId>org.apache.myfaces.shared</groupId>
893   - <artifactId>myfaces-shared-impl</artifactId>
  738 + <artifactId>myfaces-shared-core</artifactId>
894 739 <version>${myfaces-shared.version}</version>
895   - <scope>provided</scope>
  740 + <scope>compile</scope>
896 741 </dependency>
  742 +
  743 + <dependency>
  744 + <groupId>org.apache.myfaces.core</groupId>
  745 + <artifactId>myfaces-impl-ee6</artifactId>
  746 + <version>${project.version}</version>
  747 + <scope>compile</scope>
  748 + </dependency>
  749 +
  750 + <!-- NORMAL DEPENDENCIES -->
  751 +
897 752 <dependency>
898 753 <!-- el-api 2.1 is included in jsp-api, so this one has to be on top of it -->
899 754 <groupId>javax.el</groupId>
2  impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
@@ -35,7 +35,7 @@
35 35 import org.apache.myfaces.el.unified.resolver.FacesCompositeELResolver;
36 36 import org.apache.myfaces.el.unified.resolver.FacesCompositeELResolver.Scope;
37 37 import org.apache.myfaces.lifecycle.LifecycleImpl;
38   -import org.apache.myfaces.shared_impl.util.ClassUtils;
  38 +import org.apache.myfaces.shared.util.ClassUtils;
39 39 import org.apache.myfaces.view.facelets.el.ELText;
40 40
41 41 import javax.el.CompositeELResolver;
8 impl/src/main/java/org/apache/myfaces/application/DefaultResourceHandlerSupport.java
@@ -22,10 +22,10 @@
22 22 import javax.faces.context.FacesContext;
23 23
24 24 import org.apache.myfaces.resource.InternalClassLoaderResourceLoader;
25   -import org.apache.myfaces.shared_impl.resource.BaseResourceHandlerSupport;
26   -import org.apache.myfaces.shared_impl.resource.ClassLoaderResourceLoader;
27   -import org.apache.myfaces.shared_impl.resource.ExternalContextResourceLoader;
28   -import org.apache.myfaces.shared_impl.resource.ResourceLoader;
  25 +import org.apache.myfaces.shared.resource.BaseResourceHandlerSupport;
  26 +import org.apache.myfaces.shared.resource.ClassLoaderResourceLoader;
  27 +import org.apache.myfaces.shared.resource.ExternalContextResourceLoader;
  28 +import org.apache.myfaces.shared.resource.ResourceLoader;
29 29
30 30 /**
31 31 * A ResourceHandlerSupport implementation for use with standard Java Servlet engines,
4 impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
@@ -44,8 +44,8 @@
44 44
45 45 import org.apache.myfaces.config.RuntimeConfig;
46 46 import org.apache.myfaces.config.element.NavigationRule;
47   -import org.apache.myfaces.shared_impl.util.HashMapUtils;
48   -import org.apache.myfaces.shared_impl.util.StringUtils;
  47 +import org.apache.myfaces.shared.util.HashMapUtils;
  48 +import org.apache.myfaces.shared.util.StringUtils;
49 49
50 50 /**
51 51 * @author Thomas Spiegl (latest modification by $Author$)
18 impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
@@ -35,15 +35,15 @@
35 35 import javax.servlet.http.HttpServletResponse;
36 36
37 37 import org.apache.myfaces.renderkit.ErrorPageWriter;
38   -import org.apache.myfaces.shared_impl.resource.ResourceHandlerCache;
39   -import org.apache.myfaces.shared_impl.resource.ResourceHandlerSupport;
40   -import org.apache.myfaces.shared_impl.resource.ResourceImpl;
41   -import org.apache.myfaces.shared_impl.resource.ResourceLoader;
42   -import org.apache.myfaces.shared_impl.resource.ResourceMeta;
43   -import org.apache.myfaces.shared_impl.resource.ResourceHandlerCache.ResourceValue;
44   -import org.apache.myfaces.shared_impl.util.ClassUtils;
45   -import org.apache.myfaces.shared_impl.util.ExternalContextUtils;
46   -import org.apache.myfaces.shared_impl.util.StringUtils;
  38 +import org.apache.myfaces.shared.resource.ResourceHandlerCache;
  39 +import org.apache.myfaces.shared.resource.ResourceHandlerSupport;
  40 +import org.apache.myfaces.shared.resource.ResourceImpl;
  41 +import org.apache.myfaces.shared.resource.ResourceLoader;
  42 +import org.apache.myfaces.shared.resource.ResourceMeta;
  43 +import org.apache.myfaces.shared.resource.ResourceHandlerCache.ResourceValue;
  44 +import org.apache.myfaces.shared.util.ClassUtils;
  45 +import org.apache.myfaces.shared.util.ExternalContextUtils;
  46 +import org.apache.myfaces.shared.util.StringUtils;
47 47
48 48 /**
49 49 * DOCUMENT ME!
2  impl/src/main/java/org/apache/myfaces/application/TreeStructureManager.java
@@ -18,7 +18,7 @@
18 18 */
19 19 package org.apache.myfaces.application;
20 20
21   -import org.apache.myfaces.shared_impl.util.ClassUtils;
  21 +import org.apache.myfaces.shared.util.ClassUtils;
22 22
23 23 import javax.faces.component.UIComponent;
24 24 import javax.faces.component.UIViewRoot;
10 impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java
@@ -46,11 +46,11 @@
46 46 import javax.servlet.http.HttpServletResponse;
47 47
48 48 import org.apache.myfaces.application.jsp.JspStateManagerImpl;
49   -import org.apache.myfaces.shared_impl.application.DefaultViewHandlerSupport;
50   -import org.apache.myfaces.shared_impl.application.InvalidViewIdException;
51   -import org.apache.myfaces.shared_impl.application.ViewHandlerSupport;
52   -import org.apache.myfaces.shared_impl.config.MyfacesConfig;
53   -import org.apache.myfaces.shared_impl.renderkit.html.util.JavascriptUtils;
  49 +import org.apache.myfaces.shared.application.DefaultViewHandlerSupport;
  50 +import org.apache.myfaces.shared.application.InvalidViewIdException;
  51 +import org.apache.myfaces.shared.application.ViewHandlerSupport;
  52 +import org.apache.myfaces.shared.config.MyfacesConfig;
  53 +import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
54 54 import org.apache.myfaces.view.facelets.StateWriter;
55 55
56 56 /**
8 impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
@@ -50,8 +50,8 @@
50 50 import org.apache.myfaces.application.TreeStructureManager;
51 51 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
52 52 import org.apache.myfaces.renderkit.MyfacesResponseStateManager;
53   -import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
54   -import org.apache.myfaces.shared_impl.util.MyFacesObjectInputStream;
  53 +import org.apache.myfaces.shared.renderkit.RendererUtils;
  54 +import org.apache.myfaces.shared.util.MyFacesObjectInputStream;
55 55
56 56 import javax.faces.FactoryFinder;
57 57 import javax.faces.component.NamingContainer;
@@ -70,8 +70,8 @@
70 70 import org.apache.myfaces.application.MyfacesStateManager;
71 71 import org.apache.myfaces.application.TreeStructureManager;
72 72 import org.apache.myfaces.renderkit.MyfacesResponseStateManager;
73   -import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
74   -import org.apache.myfaces.shared_impl.util.MyFacesObjectInputStream;
  73 +import org.apache.myfaces.shared.renderkit.RendererUtils;
  74 +import org.apache.myfaces.shared.util.MyFacesObjectInputStream;
75 75
76 76 /**
77 77 * Default StateManager implementation for use when views are defined
10 impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java
@@ -45,11 +45,11 @@
45 45 import javax.servlet.http.HttpSession;
46 46 import javax.servlet.jsp.jstl.core.Config;
47 47
48   -import org.apache.myfaces.shared_impl.application.DefaultViewHandlerSupport;
49   -import org.apache.myfaces.shared_impl.application.InvalidViewIdException;
50   -import org.apache.myfaces.shared_impl.application.ViewHandlerSupport;
51   -import org.apache.myfaces.shared_impl.config.MyfacesConfig;
52   -import org.apache.myfaces.shared_impl.renderkit.html.util.JavascriptUtils;
  48 +import org.apache.myfaces.shared.application.DefaultViewHandlerSupport;
  49 +import org.apache.myfaces.shared.application.InvalidViewIdException;
  50 +import org.apache.myfaces.shared.application.ViewHandlerSupport;
  51 +import org.apache.myfaces.shared.config.MyfacesConfig;
  52 +import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
53 53
54 54 /**
55 55 * Implementation of the ViewHandler interface that knows how to use JSP pages
2  impl/src/main/java/org/apache/myfaces/application/jsp/ServletViewResponseWrapper.java
@@ -22,7 +22,7 @@
22 22 import javax.servlet.http.HttpServletResponse;
23 23 import javax.servlet.http.HttpServletResponseWrapper;
24 24
25   -import org.apache.myfaces.shared_impl.view.ViewResponseWrapper;
  25 +import org.apache.myfaces.shared.view.ViewResponseWrapper;
26 26
27 27 import java.io.*;
28 28 import java.nio.ByteBuffer;
2  impl/src/main/java/org/apache/myfaces/config/ConfigFilesXmlValidationUtils.java
@@ -37,7 +37,7 @@
37 37 import javax.xml.validation.SchemaFactory;
38 38 import javax.xml.validation.Validator;
39 39
40   -import org.apache.myfaces.shared_impl.util.ClassUtils;
  40 +import org.apache.myfaces.shared.util.ClassUtils;
41 41 import org.w3c.dom.ls.LSInput;
42 42 import org.w3c.dom.ls.LSResourceResolver;
43 43 import org.xml.sax.Attributes;
2  impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigResourceProvider.java
@@ -27,7 +27,7 @@
27 27
28 28 import javax.faces.context.ExternalContext;
29 29
30   -import org.apache.myfaces.shared_impl.util.ClassUtils;
  30 +import org.apache.myfaces.shared.util.ClassUtils;
31 31 import org.apache.myfaces.spi.FacesConfigResourceProvider;
32 32 import org.apache.myfaces.view.facelets.util.Classpath;
33 33
2  impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java
@@ -30,7 +30,7 @@
30 30 import org.apache.myfaces.config.element.ManagedBean;
31 31 import org.apache.myfaces.config.element.NavigationCase;
32 32 import org.apache.myfaces.config.element.NavigationRule;
33   -import org.apache.myfaces.shared_impl.util.ClassUtils;
  33 +import org.apache.myfaces.shared.util.ClassUtils;
34 34
35 35 public class FacesConfigValidator
36 36 {
12 impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
@@ -108,12 +108,12 @@
108 108 import org.apache.myfaces.lifecycle.LifecycleFactoryImpl;
109 109 import org.apache.myfaces.renderkit.RenderKitFactoryImpl;
110 110 import org.apache.myfaces.renderkit.html.HtmlRenderKitImpl;
111   -import org.apache.myfaces.shared_impl.config.MyfacesConfig;
112   -import org.apache.myfaces.shared_impl.util.ClassUtils;
113   -import org.apache.myfaces.shared_impl.util.LocaleUtils;
114   -import org.apache.myfaces.shared_impl.util.StateUtils;
115   -import org.apache.myfaces.shared_impl.util.serial.DefaultSerialFactory;
116   -import org.apache.myfaces.shared_impl.util.serial.SerialFactory;
  111 +import org.apache.myfaces.shared.config.MyfacesConfig;
  112 +import org.apache.myfaces.shared.util.ClassUtils;
  113 +import org.apache.myfaces.shared.util.LocaleUtils;
  114 +import org.apache.myfaces.shared.util.StateUtils;
  115 +import org.apache.myfaces.shared.util.serial.DefaultSerialFactory;
  116 +import org.apache.myfaces.shared.util.serial.SerialFactory;
117 117 import org.apache.myfaces.spi.FacesConfigResourceProvider;
118 118 import org.apache.myfaces.spi.FacesConfigResourceProviderFactory;
119 119 import org.apache.myfaces.util.ContainerUtils;
2  impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java
@@ -51,7 +51,7 @@
51 51 import org.apache.myfaces.config.element.ManagedProperty;
52 52 import org.apache.myfaces.config.element.MapEntries;
53 53 import org.apache.myfaces.config.element.MapEntry;
54   -import org.apache.myfaces.shared_impl.util.ClassUtils;
  54 +import org.apache.myfaces.shared.util.ClassUtils;
55 55 import org.apache.myfaces.util.ContainerUtils;
56 56
57 57
2  impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java
@@ -50,7 +50,7 @@
50 50 import javax.faces.validator.FacesValidator;
51 51
52 52 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
53   -import org.apache.myfaces.shared_impl.util.ClassUtils;
  53 +import org.apache.myfaces.shared.util.ClassUtils;
54 54 import org.apache.myfaces.spi.AnnotationProvider;
55 55 import org.apache.myfaces.view.facelets.util.Classpath;
56 56
2  impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
@@ -22,7 +22,7 @@
22 22 import org.apache.commons.discovery.resource.ClassLoaders;
23 23 import org.apache.commons.discovery.resource.names.DiscoverServiceNames;
24 24 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
25   -import org.apache.myfaces.shared_impl.util.ClassUtils;
  25 +import org.apache.myfaces.shared.util.ClassUtils;
26 26
27 27 import javax.faces.FacesException;
28 28 import javax.faces.context.ExternalContext;
2  impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java
@@ -18,7 +18,7 @@
18 18 */
19 19 package org.apache.myfaces.config.annotation;
20 20
21   -import org.apache.myfaces.shared_impl.util.ClassUtils;
  21 +import org.apache.myfaces.shared.util.ClassUtils;
22 22
23 23 import java.lang.reflect.InvocationTargetException;
24 24
2  impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java
@@ -26,7 +26,7 @@
26 26 import javax.annotation.PreDestroy;
27 27 import javax.naming.NamingException;
28 28
29   -import org.apache.myfaces.shared_impl.util.ClassUtils;
  29 +import org.apache.myfaces.shared.util.ClassUtils;
30 30
31 31 /**
32 32 * See SRV.14.5 Servlet Specification Version 2.5 JSR 154
2  impl/src/main/java/org/apache/myfaces/config/annotation/Tomcat7AnnotationLifecycleProvider.java
@@ -18,7 +18,7 @@
18 18 */
19 19 package org.apache.myfaces.config.annotation;
20 20
21   -import org.apache.myfaces.shared_impl.util.ClassUtils;
  21 +import org.apache.myfaces.shared.util.ClassUtils;
22 22 import org.apache.tomcat.InstanceManager;
23 23
24 24 import javax.faces.context.ExternalContext;
2  impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java
@@ -25,7 +25,7 @@
25 25 import javax.naming.NamingException;
26 26 import javax.servlet.ServletContext;
27 27
28   -import org.apache.myfaces.shared_impl.util.ClassUtils;
  28 +import org.apache.myfaces.shared.util.ClassUtils;
29 29
30 30 public class TomcatAnnotationLifecycleProvider implements
31 31 DiscoverableLifecycleProvider, LifecycleProvider2
2  impl/src/main/java/org/apache/myfaces/config/annotation/_PackageInfo.java
@@ -32,7 +32,7 @@
32 32 import java.util.logging.Level;
33 33 import java.util.logging.Logger;
34 34
35   -import org.apache.myfaces.shared_impl.util.ClassUtils;
  35 +import org.apache.myfaces.shared.util.ClassUtils;
36 36
37 37 /**
38 38 * Copied from org.apache.shale.tiger.view.faces.PackageInfo
2  impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java
@@ -27,7 +27,7 @@
27 27
28 28 import javax.faces.context.ExternalContext;
29 29
30   -import org.apache.myfaces.shared_impl.util.ClassUtils;
  30 +import org.apache.myfaces.shared.util.ClassUtils;
31 31 import org.xml.sax.EntityResolver;
32 32 import org.xml.sax.InputSource;
33 33
2  impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java
@@ -26,7 +26,7 @@
26 26 import org.apache.myfaces.config.impl.digester.elements.*;
27 27 import org.apache.myfaces.config.impl.FacesConfigEntityResolver;
28 28 import org.apache.commons.digester.Digester;
29   -import org.apache.myfaces.shared_impl.util.ClassUtils;
  29 +import org.apache.myfaces.shared.util.ClassUtils;
30 30 import org.xml.sax.InputSource;
31 31 import org.xml.sax.SAXException;
32 32
2  impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java
@@ -25,7 +25,7 @@
25 25 import javax.el.ValueExpression;
26 26 import javax.faces.context.FacesContext;
27 27
28   -import org.apache.myfaces.shared_impl.util.ClassUtils;
  28 +import org.apache.myfaces.shared.util.ClassUtils;
29 29 import org.apache.myfaces.view.facelets.el.ELText;
30 30
31 31
2  impl/src/main/java/org/apache/myfaces/context/ExceptionHandlerFactoryImpl.java
@@ -21,7 +21,7 @@
21 21 import javax.faces.context.ExceptionHandler;
22 22 import javax.faces.context.ExceptionHandlerFactory;
23 23
24   -import org.apache.myfaces.shared_impl.context.ExceptionHandlerImpl;
  24 +import org.apache.myfaces.shared.context.ExceptionHandlerImpl;
25 25
26 26 /**
27 27 * DOCUMENT ME!
2  impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java
@@ -33,7 +33,7 @@
33 33 import javax.servlet.ServletContext;
34 34
35 35 import org.apache.myfaces.context.servlet.FacesContextImpl;
36   -import org.apache.myfaces.shared_impl.util.ClassUtils;
  36 +import org.apache.myfaces.shared.util.ClassUtils;
37 37
38 38 /**
39 39 * DOCUMENT ME!
2  impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
@@ -41,7 +41,7 @@
41 41
42 42 import org.apache.myfaces.context.ReleaseableExternalContext;
43 43 import org.apache.myfaces.context.ReleaseableFacesContextFactory;
44   -import org.apache.myfaces.shared_impl.util.NullIterator;
  44 +import org.apache.myfaces.shared.util.NullIterator;
45 45
46 46 /**
47 47 * @author Manfred Geiler (latest modification by $Author$)
2  impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
@@ -43,7 +43,7 @@
43 43 import javax.faces.view.ViewMetadata;
44 44
45 45 import org.apache.myfaces.context.PartialResponseWriterImpl;
46   -import org.apache.myfaces.shared_impl.util.StringUtils;
  46 +import org.apache.myfaces.shared.util.StringUtils;
47 47
48 48 public class PartialViewContextImpl extends PartialViewContext {
49 49
2  impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
@@ -18,7 +18,7 @@
18 18 */
19 19 package org.apache.myfaces.context.servlet;
20 20
21   -import org.apache.myfaces.shared_impl.context.flash.FlashImpl;
  21 +import org.apache.myfaces.shared.context.flash.FlashImpl;
22 22 import org.apache.myfaces.util.EnumerationIterator;
23 23
24 24 import javax.faces.FacesException;
2  impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java
@@ -24,7 +24,7 @@
24 24 import javax.servlet.http.HttpServletRequest;
25 25 import javax.servlet.http.HttpSession;
26 26
27   -import org.apache.myfaces.shared_impl.util.NullEnumeration;
  27 +import org.apache.myfaces.shared.util.NullEnumeration;
28 28 import org.apache.myfaces.util.AbstractThreadSafeAttributeMap;
29 29
30 30
2  impl/src/main/java/org/apache/myfaces/el/VariableResolverToApplicationELResolverAdapter.java
@@ -23,7 +23,7 @@
23 23 import javax.faces.el.EvaluationException;
24 24 import javax.faces.el.VariableResolver;
25 25
26   -import org.apache.myfaces.shared_impl.util.Assert;
  26 +import org.apache.myfaces.shared.util.Assert;
27 27
28 28 /**
29 29 * This class is used to delegate {@link #resolveVariable(FacesContext, String)} to the el resolver of the application.
2  impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java
@@ -31,7 +31,7 @@
31 31 import javax.faces.el.EvaluationException;
32 32 import javax.faces.el.ValueBinding;
33 33
34   -import org.apache.myfaces.shared_impl.util.ClassUtils;
  34 +import org.apache.myfaces.shared.util.ClassUtils;
35 35
36 36 /**
37 37 * Wraps a ValueBinding inside a ValueExpression. Also allows access to the original ValueBinding object.
2  impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java
@@ -26,7 +26,7 @@
26 26 import javax.faces.el.PropertyNotFoundException;
27 27 import javax.faces.el.ValueBinding;
28 28
29   -import org.apache.myfaces.shared_impl.util.ClassUtils;
  29 +import org.apache.myfaces.shared.util.ClassUtils;
30 30
31 31 /**
32 32 * Converter for legacy ValueBinding objects. See JSF 1.2 section 5.8.3
2  impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java
@@ -35,7 +35,7 @@
35 35 import org.apache.myfaces.config.RuntimeConfig;
36 36 import org.apache.myfaces.el.convert.PropertyResolverToELResolver;
37 37 import org.apache.myfaces.el.convert.VariableResolverToELResolver;
38   -import org.apache.myfaces.shared_impl.util.ClassUtils;
  38 +import org.apache.myfaces.shared.util.ClassUtils;
39 39
40 40 /**
41 41 * @author Mathias Broekelmann (latest modification by $Author$)
8 impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java
@@ -38,10 +38,10 @@
38 38 import javax.faces.render.ResponseStateManager;
39 39
40 40 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
41   -import org.apache.myfaces.shared_impl.application.FacesServletMapping;
42   -import org.apache.myfaces.shared_impl.application.InvalidViewIdException;
43   -import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
44   -import org.apache.myfaces.shared_impl.util.Assert;
  41 +import org.apache.myfaces.shared.application.FacesServletMapping;
  42 +import org.apache.myfaces.shared.application.InvalidViewIdException;
  43 +import org.apache.myfaces.shared.renderkit.RendererUtils;
  44 +import org.apache.myfaces.shared.util.Assert;
45 45
46 46 /**
47 47 * @author Mathias Broekelmann (latest modification by $Author$)
4 impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
@@ -35,8 +35,8 @@
35 35
36 36 import org.apache.myfaces.config.FacesConfigurator;
37 37 import org.apache.myfaces.renderkit.ErrorPageWriter;
38   -import org.apache.myfaces.shared_impl.util.ClassUtils;
39   -import org.apache.myfaces.shared_impl.webapp.webxml.WebXml;
  38 +import org.apache.myfaces.shared.util.ClassUtils;
  39 +import org.apache.myfaces.shared.webapp.webxml.WebXml;
40 40 import org.apache.myfaces.util.DebugUtils;
41 41
42 42 /**
8 impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
@@ -69,10 +69,10 @@
69 69 import javax.servlet.http.HttpServletResponse;
70 70
71 71 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
72   -import org.apache.myfaces.shared_impl.renderkit.html.HtmlResponseWriterImpl;
73   -import org.apache.myfaces.shared_impl.util.ClassUtils;
74   -import org.apache.myfaces.shared_impl.util.StateUtils;
75   -import org.apache.myfaces.shared_impl.webapp.webxml.WebXml;
  72 +import org.apache.myfaces.shared.renderkit.html.HtmlResponseWriterImpl;
  73 +import org.apache.myfaces.shared.util.ClassUtils;
  74 +import org.apache.myfaces.shared.util.StateUtils;
  75 +import org.apache.myfaces.shared.webapp.webxml.WebXml;
76 76 import org.apache.myfaces.view.facelets.component.UIRepeat;
77 77
78 78 /**
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlBodyRenderer.java
@@ -19,7 +19,7 @@
19 19 package org.apache.myfaces.renderkit.html;
20 20
21 21 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
22   -import org.apache.myfaces.shared_impl.renderkit.html.HtmlBodyRendererBase;
  22 +import org.apache.myfaces.shared.renderkit.html.HtmlBodyRendererBase;
23 23
24 24 /**
25 25 * Renderer used by h:body component
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlButtonRenderer.java
@@ -19,7 +19,7 @@
19 19 package org.apache.myfaces.renderkit.html;
20 20
21 21 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
22   -import org.apache.myfaces.shared_impl.renderkit.html.HtmlButtonRendererBase;
  22 +import org.apache.myfaces.shared.renderkit.html.HtmlButtonRendererBase;
23 23
24 24
25 25 /**
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRenderer.java
@@ -20,7 +20,7 @@
20 20
21 21 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
22 22 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderers;
23   -import org.apache.myfaces.shared_impl.renderkit.html.HtmlCheckboxRendererBase;
  23 +import org.apache.myfaces.shared.renderkit.html.HtmlCheckboxRendererBase;
24 24
25 25
26 26 /**
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java
@@ -26,7 +26,7 @@
26 26 import javax.faces.context.FacesContext;
27 27
28 28 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
29   -import org.apache.myfaces.shared_impl.renderkit.html.HtmlRenderer;
  29 +import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
30 30
31 31 /**
32 32 *
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java
@@ -25,7 +25,7 @@
25 25 import javax.faces.context.FacesContext;
26 26
27 27 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
28   -import org.apache.myfaces.shared_impl.renderkit.html.HtmlRenderer;
  28 +import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
29 29
30 30 /**
31 31 *
8 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java
@@ -26,10 +26,10 @@
26 26 import javax.faces.context.ResponseWriter;
27 27
28 28 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
29   -import org.apache.myfaces.shared_impl.config.MyfacesConfig;
30   -import org.apache.myfaces.shared_impl.renderkit.html.HTML;
31   -import org.apache.myfaces.shared_impl.renderkit.html.HtmlFormRendererBase;
32   -import org.apache.myfaces.shared_impl.renderkit.html.util.JavascriptUtils;
  29 +import org.apache.myfaces.shared.config.MyfacesConfig;
  30 +import org.apache.myfaces.shared.renderkit.html.HTML;
  31 +import org.apache.myfaces.shared.renderkit.html.HtmlFormRendererBase;
  32 +import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
33 33
34 34
35 35 /**
10 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java
@@ -32,11 +32,11 @@
32 32 import javax.faces.context.FacesContext;
33 33
34 34 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
35   -import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
36   -import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
37   -import org.apache.myfaces.shared_impl.renderkit.html.HtmlRenderer;
38   -import org.apache.myfaces.shared_impl.renderkit.html.HtmlRendererUtils;
39   -import org.apache.myfaces.shared_impl.renderkit.html.HtmlTextRendererBase;
  35 +import org.apache.myfaces.shared.renderkit.JSFAttr;
  36 +import org.apache.myfaces.shared.renderkit.RendererUtils;
  37 +import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
  38 +import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
  39 +import org.apache.myfaces.shared.renderkit.html.HtmlTextRendererBase;
40 40
41 41 /**
42 42 *
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGridRenderer.java
@@ -19,7 +19,7 @@
19 19 package org.apache.myfaces.renderkit.html;
20 20
21 21 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
22   -import org.apache.myfaces.shared_impl.renderkit.html.HtmlGridRendererBase;
  22 +import org.apache.myfaces.shared.renderkit.html.HtmlGridRendererBase;
23 23
24 24
25 25 /**
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGroupRenderer.java
@@ -19,7 +19,7 @@
19 19 package org.apache.myfaces.renderkit.html;
20 20
21 21 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
22   -import org.apache.myfaces.shared_impl.renderkit.html.HtmlGroupRendererBase;
  22 +import org.apache.myfaces.shared.renderkit.html.HtmlGroupRendererBase;
23 23
24 24
25 25 /**
4 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHeadRenderer.java
@@ -27,8 +27,8 @@
27 27 import javax.faces.render.Renderer;
28 28
29 29 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
30   -import org.apache.myfaces.shared_impl.renderkit.html.HTML;
31   -import org.apache.myfaces.shared_impl.renderkit.html.HtmlRendererUtils;
  30 +import org.apache.myfaces.shared.renderkit.html.HTML;
  31 +import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
32 32
33 33 /**
34 34 * Renderer used by h:head component
10 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHiddenRenderer.java
@@ -28,11 +28,11 @@
28 28 import javax.faces.convert.ConverterException;
29 29
30 30 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
31   -import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
32   -import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
33   -import org.apache.myfaces.shared_impl.renderkit.html.HTML;
34   -import org.apache.myfaces.shared_impl.renderkit.html.HtmlRenderer;
35   -import org.apache.myfaces.shared_impl.renderkit.html.HtmlRendererUtils;
  31 +import org.apache.myfaces.shared.renderkit.JSFAttr;
  32 +import org.apache.myfaces.shared.renderkit.RendererUtils;
  33 +import org.apache.myfaces.shared.renderkit.html.HTML;
  34 +import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
  35 +import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
36 36
37 37 /**
38 38 *
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlImageRenderer.java
@@ -19,7 +19,7 @@
19 19 package org.apache.myfaces.renderkit.html;
20 20
21 21 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
22   -import org.apache.myfaces.shared_impl.renderkit.html.HtmlImageRendererBase;
  22 +import org.apache.myfaces.shared.renderkit.html.HtmlImageRendererBase;
23 23
24 24
25 25 /**
20 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLabelRenderer.java
@@ -33,14 +33,14 @@
33 33 import javax.faces.context.ResponseWriter;
34 34
35 35 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
36   -import org.apache.myfaces.shared_impl.component.EscapeCapable;
37   -import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
38   -import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
39   -import org.apache.myfaces.shared_impl.renderkit.html.HTML;
40   -import org.apache.myfaces.shared_impl.renderkit.html.HtmlRenderer;
41   -import org.apache.myfaces.shared_impl.renderkit.html.HtmlRendererUtils;
42   -import org.apache.myfaces.shared_impl.renderkit.html.util.JavascriptUtils;
43   -import org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils;
  36 +import org.apache.myfaces.shared.component.EscapeCapable;
  37 +import org.apache.myfaces.shared.renderkit.JSFAttr;
  38 +import org.apache.myfaces.shared.renderkit.RendererUtils;
  39 +import org.apache.myfaces.shared.renderkit.html.HTML;
  40 +import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
  41 +import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
  42 +import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
  43 +import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
44 44
45 45 /**
46 46 *
@@ -133,12 +133,12 @@ public void encodeBegin(FacesContext facesContext, UIComponent uiComponent) thro
133 133 }
134 134 else
135 135 {
136   - escape = RendererUtils.getBooleanAttribute(uiComponent, org.apache.myfaces.shared_impl.renderkit.JSFAttr.ESCAPE_ATTR,
  136 + escape = RendererUtils.getBooleanAttribute(uiComponent, org.apache.myfaces.shared.renderkit.JSFAttr.ESCAPE_ATTR,
137 137 true); //default is to escape
138 138 }
139 139 if (escape)
140 140 {
141   - writer.writeText(text, org.apache.myfaces.shared_impl.renderkit.JSFAttr.VALUE_ATTR);
  141 + writer.writeText(text, org.apache.myfaces.shared.renderkit.JSFAttr.VALUE_ATTR);
142 142 }
143 143 else
144 144 {
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLinkRenderer.java
@@ -20,7 +20,7 @@
20 20
21 21 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
22 22 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderers;
23   -import org.apache.myfaces.shared_impl.renderkit.html.HtmlLinkRendererBase;
  23 +import org.apache.myfaces.shared.renderkit.html.HtmlLinkRendererBase;
24 24
25 25
26 26 /**
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlListboxRenderer.java
@@ -20,7 +20,7 @@
20 20