Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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 with 301 additions and 446 deletions.
  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
View
@@ -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>
2  impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
View
@@ -35,7 +35,7 @@
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;
8 impl/src/main/java/org/apache/myfaces/application/DefaultResourceHandlerSupport.java
View
@@ -22,10 +22,10 @@
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,
4 impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
View
@@ -44,8 +44,8 @@
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$)
18 impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
View
@@ -35,15 +35,15 @@
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!
2  impl/src/main/java/org/apache/myfaces/application/TreeStructureManager.java
View
@@ -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;
10 impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java
View
@@ -46,11 +46,11 @@
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;
/**
8 impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
View
@@ -50,8 +50,8 @@
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.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
10 impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java
View
@@ -45,11 +45,11 @@
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
2  impl/src/main/java/org/apache/myfaces/application/jsp/ServletViewResponseWrapper.java
View
@@ -22,7 +22,7 @@
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;
2  impl/src/main/java/org/apache/myfaces/config/ConfigFilesXmlValidationUtils.java
View
@@ -37,7 +37,7 @@
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;
2  impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigResourceProvider.java
View
@@ -27,7 +27,7 @@
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;
2  impl/src/main/java/org/apache/myfaces/config/FacesConfigValidator.java
View
@@ -30,7 +30,7 @@
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
{
12 impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
View
@@ -108,12 +108,12 @@
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;
2  impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java
View
@@ -51,7 +51,7 @@
import org.apache.myfaces.config.element.ManagedProperty;
import org.apache.myfaces.config.element.MapEntries;
import org.apache.myfaces.config.element.MapEntry;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.util.ContainerUtils;
2  impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java
View
@@ -50,7 +50,7 @@
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;
2  impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
View
@@ -22,7 +22,7 @@
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;
2  impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java
View
@@ -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;
2  impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java
View
@@ -26,7 +26,7 @@
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
2  impl/src/main/java/org/apache/myfaces/config/annotation/Tomcat7AnnotationLifecycleProvider.java
View
@@ -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;
2  impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java
View
@@ -25,7 +25,7 @@
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
2  impl/src/main/java/org/apache/myfaces/config/annotation/_PackageInfo.java
View
@@ -32,7 +32,7 @@
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
2  impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java
View
@@ -27,7 +27,7 @@
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;
2  impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java
View
@@ -26,7 +26,7 @@
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;
2  impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java
View
@@ -25,7 +25,7 @@
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;
2  impl/src/main/java/org/apache/myfaces/context/ExceptionHandlerFactoryImpl.java
View
@@ -21,7 +21,7 @@
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!
2  impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java
View
@@ -33,7 +33,7 @@
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!
2  impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
View
@@ -41,7 +41,7 @@
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$)
2  impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
View
@@ -43,7 +43,7 @@
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 {
2  impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
View
@@ -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;
2  impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java
View
@@ -24,7 +24,7 @@
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;
2  impl/src/main/java/org/apache/myfaces/el/VariableResolverToApplicationELResolverAdapter.java
View
@@ -23,7 +23,7 @@
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.
2  impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java
View
@@ -31,7 +31,7 @@
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.
2  impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java
View
@@ -26,7 +26,7 @@
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
2  impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java
View
@@ -35,7 +35,7 @@
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$)
8 impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java
View
@@ -38,10 +38,10 @@
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$)
4 impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
View
@@ -35,8 +35,8 @@
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;
/**
8 impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
View
@@ -69,10 +69,10 @@
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;
/**
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlBodyRenderer.java
View
@@ -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
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlButtonRenderer.java
View
@@ -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;
/**
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRenderer.java
View
@@ -20,7 +20,7 @@
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;
/**
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java
View
@@ -26,7 +26,7 @@
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;
/**
*
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java
View
@@ -25,7 +25,7 @@
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;
/**
*
8 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java
View
@@ -26,10 +26,10 @@
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;
/**
10 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java
View
@@ -32,11 +32,11 @@
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;
/**
*
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGridRenderer.java
View
@@ -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;
/**
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlGroupRenderer.java
View
@@ -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;
/**
4 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHeadRenderer.java
View
@@ -27,8 +27,8 @@
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
10 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHiddenRenderer.java
View
@@ -28,11 +28,11 @@
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;
/**
*
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlImageRenderer.java
View
@@ -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;
/**
20 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLabelRenderer.java
View
@@ -33,14 +33,14 @@
import javax.faces.context.ResponseWriter;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.component.EscapeCapable;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
-import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.util.JavascriptUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils;
+import org.apache.myfaces.shared.component.EscapeCapable;
+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;
+import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
+import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
/**
*
@@ -133,12 +133,12 @@ public void encodeBegin(FacesContext facesContext, UIComponent uiComponent) thro
}
else
{
- escape = RendererUtils.getBooleanAttribute(uiComponent, org.apache.myfaces.shared_impl.renderkit.JSFAttr.ESCAPE_ATTR,
+ escape = RendererUtils.getBooleanAttribute(uiComponent, org.apache.myfaces.shared.renderkit.JSFAttr.ESCAPE_ATTR,
true); //default is to escape
}
if (escape)
{
- writer.writeText(text, org.apache.myfaces.shared_impl.renderkit.JSFAttr.VALUE_ATTR);
+ writer.writeText(text, org.apache.myfaces.shared.renderkit.JSFAttr.VALUE_ATTR);
}
else
{
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLinkRenderer.java
View
@@ -20,7 +20,7 @@
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderers;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlLinkRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlLinkRendererBase;
/**
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlListboxRenderer.java
View
@@ -20,7 +20,7 @@
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderers;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlListboxRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlListboxRendererBase;
/**
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMenuRenderer.java
View
@@ -20,7 +20,7 @@
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderers;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlMenuRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlMenuRendererBase;
/**
4 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessageRenderer.java
View
@@ -29,8 +29,8 @@
import javax.faces.context.FacesContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlMessageRendererBase;
+import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlMessageRendererBase;
/**
*
4 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessagesRenderer.java
View
@@ -29,8 +29,8 @@
import javax.faces.context.FacesContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlMessagesRendererBase;
-import org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlMessagesRendererBase;
+import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
/**
*
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRenderer.java
View
@@ -24,7 +24,7 @@
import javax.faces.context.FacesContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlOutcomeTargetButtonRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlOutcomeTargetButtonRendererBase;
/**
* @since 2.0
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRadioRenderer.java
View
@@ -19,7 +19,7 @@
package org.apache.myfaces.renderkit.html;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRadioRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlRadioRendererBase;
/**
6 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
View
@@ -39,9 +39,9 @@
import javax.faces.render.ResponseStateManager;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderKit;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlResponseWriterImpl;
+import org.apache.myfaces.shared.config.MyfacesConfig;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlResponseWriterImpl;
/**
* @author Manfred Geiler (latest modification by $Author$)
10 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
View
@@ -32,11 +32,11 @@
import javax.faces.render.ResponseStateManager;
import org.apache.myfaces.renderkit.MyfacesResponseStateManager;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.util.JavascriptUtils;
-import org.apache.myfaces.shared_impl.util.StateUtils;
+import org.apache.myfaces.shared.config.MyfacesConfig;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
+import org.apache.myfaces.shared.util.StateUtils;
/**
* @author Manfred Geiler (latest modification by $Author$)
8 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java
View
@@ -34,10 +34,10 @@
import javax.faces.render.Renderer;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
-import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
import org.apache.myfaces.view.facelets.PostBuildComponentTreeOnRestoreViewEvent;
/**
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlSecretRenderer.java
View
@@ -19,7 +19,7 @@
package org.apache.myfaces.renderkit.html;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlSecretRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlSecretRendererBase;
/**
8 impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java
View
@@ -41,10 +41,10 @@
import javax.faces.render.Renderer;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
-import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
import org.apache.myfaces.view.facelets.PostBuildComponentTreeOnRestoreViewEvent;
/**
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTableRenderer.java
View
@@ -19,7 +19,7 @@
package org.apache.myfaces.renderkit.html;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlTableRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlTableRendererBase;
/**
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextRenderer.java
View
@@ -20,7 +20,7 @@
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderers;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlTextRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlTextRendererBase;
/**
2  impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextareaRenderer.java
View
@@ -19,7 +19,7 @@
package org.apache.myfaces.renderkit.html;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlTextareaRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlTextareaRendererBase;
/**
24 impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java
View
@@ -24,12 +24,12 @@
import javax.faces.context.FacesContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
-import org.apache.myfaces.shared_impl.resource.AliasResourceMetaImpl;
-import org.apache.myfaces.shared_impl.resource.ResourceLoader;
-import org.apache.myfaces.shared_impl.resource.ResourceMeta;
-import org.apache.myfaces.shared_impl.resource.ResourceMetaImpl;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
-import org.apache.myfaces.shared_impl.util.WebConfigParamUtils;
+import org.apache.myfaces.shared.resource.AliasResourceMetaImpl;
+import org.apache.myfaces.shared.resource.ResourceLoader;
+import org.apache.myfaces.shared.resource.ResourceMeta;
+import org.apache.myfaces.shared.resource.ResourceMetaImpl;
+import org.apache.myfaces.shared.util.ClassUtils;
+import org.apache.myfaces.shared.util.WebConfigParamUtils;
/**
* A resource loader implementation which loads resources from the thread ClassLoader.
@@ -100,13 +100,13 @@ public ResourceMeta createResourceMeta(String prefix, String libraryName, String
{
//handle jsf.js
if (libraryName != null &&
- org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils.JAVAX_FACES_LIBRARY_NAME.equals(libraryName) &&
- org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils.JSF_JS_RESOURCE_NAME.equals(resourceName))
+ org.apache.myfaces.shared.renderkit.html.util.ResourceUtils.JAVAX_FACES_LIBRARY_NAME.equals(libraryName) &&
+ org.apache.myfaces.shared.renderkit.html.util.ResourceUtils.JSF_JS_RESOURCE_NAME.equals(resourceName))
{
if (_useMultipleJsFilesForJsfUncompressedJs)
{
return new AliasResourceMetaImpl(prefix, libraryName, libraryVersion,
- resourceName, resourceVersion, org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils.JSF_UNCOMPRESSED_JS_RESOURCE_NAME, true);
+ resourceName, resourceVersion, org.apache.myfaces.shared.renderkit.html.util.ResourceUtils.JSF_UNCOMPRESSED_JS_RESOURCE_NAME, true);
}
else
{
@@ -115,11 +115,11 @@ public ResourceMeta createResourceMeta(String prefix, String libraryName, String
}
//handle the oamSubmit.js
else if (libraryName != null &&
- org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils.MYFACES_LIBRARY_NAME.equals(libraryName) &&
- org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils.MYFACES_JS_RESOURCE_NAME.equals(resourceName))
+ org.apache.myfaces.shared.renderkit.html.util.ResourceUtils.MYFACES_LIBRARY_NAME.equals(libraryName) &&
+ org.apache.myfaces.shared.renderkit.html.util.ResourceUtils.MYFACES_JS_RESOURCE_NAME.equals(resourceName))
{
return new AliasResourceMetaImpl(prefix, libraryName, libraryVersion,
- resourceName, resourceVersion, org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils.MYFACES_JS_RESOURCE_NAME_UNCOMPRESSED, true);
+ resourceName, resourceVersion, org.apache.myfaces.shared.renderkit.html.util.ResourceUtils.MYFACES_JS_RESOURCE_NAME_UNCOMPRESSED, true);
} else if (libraryName != null && libraryName.startsWith("org.apache.myfaces.core"))
{
return new ResourceMetaImpl(prefix, libraryName, libraryVersion, resourceName, resourceVersion);
2  impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java
View
@@ -22,7 +22,7 @@
import org.apache.commons.discovery.resource.ClassLoaders;
import org.apache.commons.discovery.resource.names.DiscoverServiceNames;
import org.apache.myfaces.config.annotation.DefaultAnnotationProvider;
-import org.apache.myfaces.shared_impl.spi.impl.SpiUtils;
+import org.apache.myfaces.shared.spi.impl.SpiUtils;
import org.apache.myfaces.spi.AnnotationProvider;
import org.apache.myfaces.spi.AnnotationProviderFactory;
2  impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java
View
@@ -21,7 +21,7 @@
import org.apache.commons.discovery.ResourceNameIterator;
import org.apache.commons.discovery.resource.ClassLoaders;
import org.apache.commons.discovery.resource.names.DiscoverServiceNames;
-import org.apache.myfaces.shared_impl.spi.impl.SpiUtils;
+import org.apache.myfaces.shared.spi.impl.SpiUtils;
import org.apache.myfaces.spi.FaceletConfigResourceProvider;
import org.apache.myfaces.spi.FaceletConfigResourceProviderFactory;
import org.apache.myfaces.view.facelets.compiler.DefaultFaceletConfigResourceProvider;
2  impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java
View
@@ -22,7 +22,7 @@
import org.apache.commons.discovery.resource.ClassLoaders;
import org.apache.commons.discovery.resource.names.DiscoverServiceNames;
import org.apache.myfaces.config.DefaultFacesConfigResourceProvider;
-import org.apache.myfaces.shared_impl.spi.impl.SpiUtils;
+import org.apache.myfaces.shared.spi.impl.SpiUtils;
import org.apache.myfaces.spi.FacesConfigResourceProvider;
import org.apache.myfaces.spi.FacesConfigResourceProviderFactory;
4 impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java
View
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.taglib.core;
-import org.apache.myfaces.shared_impl.taglib.UIComponentELTagUtils;
-import org.apache.myfaces.shared_impl.util.LocaleUtils;
+import org.apache.myfaces.shared.taglib.UIComponentELTagUtils;
+import org.apache.myfaces.shared.util.LocaleUtils;
import javax.el.ELContext;
import javax.el.ValueExpression;
2  impl/src/main/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java
View
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.taglib.core;
-import org.apache.myfaces.shared_impl.taglib.UIComponentELTagUtils;
+import org.apache.myfaces.shared.taglib.UIComponentELTagUtils;
import javax.el.ELContext;
import javax.el.ValueExpression;
2  impl/src/main/java/org/apache/myfaces/taglib/core/DelegateActionListener.java
View
@@ -27,7 +27,7 @@
import javax.faces.event.ActionEvent;
import javax.faces.event.ActionListener;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
/**
2  impl/src/main/java/org/apache/myfaces/taglib/core/GenericListenerTag.java
View
@@ -28,7 +28,7 @@
import javax.servlet.jsp.tagext.Tag;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
/**
* @author Andreas Berger (latest modification by $Author$)
2  impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java
View
@@ -38,7 +38,7 @@
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspAttribute;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspTag;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
/**
* Loads a resource bundle and saves it as a variable in the request scope.
2  impl/src/main/java/org/apache/myfaces/taglib/core/ParamTag.java
View
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.taglib.core;
-import org.apache.myfaces.shared_impl.taglib.UIComponentELTagBase;
+import org.apache.myfaces.shared.taglib.UIComponentELTagBase;
import javax.faces.component.UIComponent;
import javax.el.ValueExpression;
2  impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java
View
@@ -36,7 +36,7 @@
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspAttribute;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspTag;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
/**
* Register a PhaseListener instance
2  impl/src/main/java/org/apache/myfaces/taglib/core/SelectItemTag.java
View
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.taglib.core;
-import org.apache.myfaces.shared_impl.taglib.core.SelectItemTagBase;
+import org.apache.myfaces.shared.taglib.core.SelectItemTagBase;
/**
4 impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java
View
@@ -20,8 +20,8 @@
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspAttribute;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspTag;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
-import org.apache.myfaces.shared_impl.taglib.UIComponentELTagBase;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.taglib.UIComponentELTagBase;
import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
2  impl/src/main/java/org/apache/myfaces/taglib/core/ViewTag.java
View
@@ -36,7 +36,7 @@
import javax.servlet.jsp.jstl.core.Config;
import org.apache.myfaces.application.jsp.ServletViewResponseWrapper;
-import org.apache.myfaces.shared_impl.util.LocaleUtils;
+import org.apache.myfaces.shared.util.LocaleUtils;
/**
* @author Manfred Geiler (latest modification by $Author$)
2  impl/src/main/java/org/apache/myfaces/util/ContainerUtils.java
View
@@ -22,7 +22,7 @@
import javax.portlet.PortletContext;
import javax.servlet.ServletContext;
-import org.apache.myfaces.shared_impl.util.ExternalContextUtils;
+import org.apache.myfaces.shared.util.ExternalContextUtils;
/**
* Utilities for determining the current container and for the unified
4 impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementHelper.java
View
@@ -43,8 +43,8 @@
import org.apache.commons.collections.map.AbstractReferenceMap;
import org.apache.commons.collections.map.ReferenceMap;
-import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
-import org.apache.myfaces.shared_impl.util.MyFacesObjectInputStream;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.util.MyFacesObjectInputStream;
/**
* This helper class contains methods used by DefaultFaceletsStateManagementStrategy that comes
6 impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategy.java
View
@@ -50,9 +50,9 @@
import javax.faces.view.ViewDeclarationLanguageFactory;
import javax.faces.view.ViewMetadata;
-import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
-import org.apache.myfaces.shared_impl.util.HashMapUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
+import org.apache.myfaces.shared.util.HashMapUtils;
/**
* This class implements partial state saving feature when facelets
14 impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
View
@@ -86,13 +86,13 @@
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.shared_impl.application.DefaultViewHandlerSupport;
-import org.apache.myfaces.shared_impl.application.ViewHandlerSupport;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
-import org.apache.myfaces.shared_impl.util.StringUtils;
-import org.apache.myfaces.shared_impl.util.WebConfigParamUtils;
-import org.apache.myfaces.shared_impl.view.ViewDeclarationLanguageBase;
+import org.apache.myfaces.shared.application.DefaultViewHandlerSupport;
+import org.apache.myfaces.shared.application.ViewHandlerSupport;
+import org.apache.myfaces.shared.config.MyfacesConfig;
+import org.apache.myfaces.shared.util.ClassUtils;
+import org.apache.myfaces.shared.util.StringUtils;
+import org.apache.myfaces.shared.util.WebConfigParamUtils;
+import org.apache.myfaces.shared.view.ViewDeclarationLanguageBase;
import org.apache.myfaces.view.ViewMetadataBase;
import org.apache.myfaces.view.facelets.FaceletViewHandler.NullWriter;
import org.apache.myfaces.view.facelets.compiler.Compiler;
2  impl/src/main/java/org/apache/myfaces/view/facelets/compiler/BodyEndElementInstruction.java
View
@@ -25,7 +25,7 @@
import javax.faces.application.ProjectStage;
import javax.faces.context.FacesContext;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
final class BodyEndElementInstruction implements Instruction
{
2  impl/src/main/java/org/apache/myfaces/view/facelets/compiler/DefaultFaceletConfigResourceProvider.java
View
@@ -26,7 +26,7 @@
import javax.faces.context.ExternalContext;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.FaceletConfigResourceProvider;
import org.apache.myfaces.view.facelets.util.Classpath;
2  impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java
View
@@ -37,7 +37,7 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.view.facelets.tag.TagAttributeImpl;
import org.apache.myfaces.view.facelets.tag.TagAttributesImpl;
import org.apache.myfaces.view.facelets.tag.composite.CompositeLibrary;
4 impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java
View
@@ -42,8 +42,8 @@
import javax.xml.parsers.SAXParserFactory;
import org.apache.myfaces.config.ConfigFilesXmlValidationUtils;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.config.MyfacesConfig;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.FaceletConfigResourceProvider;
import org.apache.myfaces.spi.FaceletConfigResourceProviderFactory;
import org.apache.myfaces.view.facelets.tag.AbstractTagLibrary;
2  impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
View
@@ -29,7 +29,7 @@
import javax.faces.view.facelets.TagAttribute;
import javax.faces.view.facelets.TagException;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HTML;
import org.apache.myfaces.view.facelets.el.ELText;
/**
4 impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetImpl.java
View
@@ -28,7 +28,7 @@
import javax.faces.context.FacesContext;
import javax.faces.view.AttachedObjectTarget;
-import org.apache.myfaces.shared_impl.util.StringUtils;
+import org.apache.myfaces.shared.util.StringUtils;
/**
*
@@ -105,7 +105,7 @@ public String getName()
{
return StringUtils.splitShortString((String) _targets.getValue(context.getELContext()), ' ');
}
- return org.apache.myfaces.shared_impl.util.ArrayUtils.EMPTY_STRING_ARRAY;
+ return org.apache.myfaces.shared.util.ArrayUtils.EMPTY_STRING_ARRAY;
}
public void setName(ValueExpression ve)
4 ...src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorAttachedObjectTargetImpl.java
View
@@ -29,7 +29,7 @@
import javax.faces.component.behavior.ClientBehaviorHolder;
import javax.faces.context.FacesContext;
-import org.apache.myfaces.shared_impl.util.StringUtils;
+import org.apache.myfaces.shared.util.StringUtils;
/**
* @author Leonardo Uribe (latest modification by $Author: lu4242 $)
@@ -125,7 +125,7 @@ public String getName()
{
return StringUtils.splitShortString((String) _targets.getValue(context.getELContext()), ' ');
}
- return org.apache.myfaces.shared_impl.util.ArrayUtils.EMPTY_STRING_ARRAY;
+ return org.apache.myfaces.shared.util.ArrayUtils.EMPTY_STRING_ARRAY;
}
public void setName(ValueExpression name)
2  impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentSupport.java
View
@@ -33,7 +33,7 @@
import javax.faces.view.facelets.TagAttribute;
import javax.faces.view.facelets.TagAttributeException;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
+import org.apache.myfaces.shared.config.MyfacesConfig;
import org.apache.myfaces.view.facelets.ComponentState;
import org.apache.myfaces.view.facelets.DefaultFaceletsStateManagementStrategy;
import org.apache.myfaces.view.facelets.FaceletViewDeclarationLanguage;
2  impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidatorTagHandlerDelegate.java
View
@@ -37,7 +37,7 @@
import javax.faces.view.facelets.TagHandlerDelegate;
import javax.faces.view.facelets.ValidatorHandler;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
import org.apache.myfaces.view.facelets.FaceletCompositionContext;
import org.apache.myfaces.view.facelets.compiler.FaceletsCompilerUtils;
import org.apache.myfaces.view.facelets.tag.MetaRulesetImpl;
2  impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ActionListenerHandler.java
View
@@ -42,7 +42,7 @@
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletAttribute;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletTag;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
import org.apache.myfaces.view.facelets.FaceletCompositionContext;
import org.apache.myfaces.view.facelets.util.ReflectionUtil;
4 impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AjaxHandler.java
View
@@ -46,8 +46,8 @@
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletAttribute;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletTag;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
-import org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
import org.apache.myfaces.view.facelets.AbstractFaceletContext;
import org.apache.myfaces.view.facelets.FaceletCompositionContext;
import org.apache.myfaces.view.facelets.tag.TagHandlerUtils;
2  impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/LoadBundleHandler.java
View
@@ -41,7 +41,7 @@
import javax.faces.view.facelets.TagHandler;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletTag;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.view.facelets.tag.jsf.ComponentSupport;
/**
2  impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java
View
@@ -34,7 +34,7 @@
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletAttribute;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletTag;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.view.facelets.AbstractFaceletContext;
import org.apache.myfaces.view.facelets.FaceletCompositionContext;
import org.apache.myfaces.view.facelets.el.VariableMapperWrapper;
2  impl/src/main/java/org/apache/myfaces/view/facelets/util/Classpath.java
View
@@ -33,7 +33,7 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
/**
4 impl/src/main/java/org/apache/myfaces/view/facelets/util/ReflectionUtil.java
View
@@ -21,8 +21,8 @@
import java.lang.reflect.Array;
import java.util.Arrays;
-import org.apache.myfaces.shared_impl.util.ClassLoaderUtils;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassLoaderUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
public class ReflectionUtil
{
2  impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java
View
@@ -33,7 +33,7 @@
import javax.servlet.jsp.jstl.core.Config;
import org.apache.myfaces.application.jsp.ServletViewResponseWrapper;
-import org.apache.myfaces.shared_impl.view.JspViewDeclarationLanguageBase;
+import org.apache.myfaces.shared.view.JspViewDeclarationLanguageBase;
import org.apache.myfaces.view.facelets.tag.composite.CompositeLibrary;
import org.apache.myfaces.view.facelets.tag.jsf.core.CoreLibrary;
import org.apache.myfaces.view.facelets.tag.jsf.html.HtmlLibrary;
8 impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
View
@@ -27,10 +27,10 @@
import org.apache.myfaces.context.ReleaseableExternalContext;
import org.apache.myfaces.context.servlet.StartupFacesContextImpl;
import org.apache.myfaces.context.servlet.StartupServletExternalContextImpl;
-import org.apache.myfaces.shared_impl.context.ExceptionHandlerImpl;
-import org.apache.myfaces.shared_impl.util.StateUtils;
-import org.apache.myfaces.shared_impl.util.WebConfigParamUtils;
-import org.apache.myfaces.shared_impl.webapp.webxml.WebXml;
+import org.apache.myfaces.shared.context.ExceptionHandlerImpl;
+import org.apache.myfaces.shared.util.StateUtils;
+import org.apache.myfaces.shared.util.WebConfigParamUtils;
+import org.apache.myfaces.shared.webapp.webxml.WebXml;
import javax.el.ExpressionFactory;
import javax.faces.application.Application;
2  impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerFactory.java
View
@@ -22,7 +22,7 @@
import javax.servlet.ServletContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.util.ContainerUtils;
/**
2  impl/src/main/java/org/apache/myfaces/webapp/MyFacesServlet.java
View
@@ -31,7 +31,7 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import org.apache.myfaces.shared_impl.webapp.webxml.DelegatedFacesServlet;
+import org.apache.myfaces.shared.webapp.webxml.DelegatedFacesServlet;
/**
* Derived FacesServlet that can be used for debugging purpose
2  impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java
View
@@ -20,7 +20,7 @@
import org.apache.commons.discovery.tools.DiscoverSingleton;
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.FactoryFinder;
import javax.faces.context.ExternalContext;
2  impl/src/test/java/org/apache/myfaces/application/jsp/JspStateManagerImplTest.java
View
@@ -16,7 +16,7 @@
package org.apache.myfaces.application.jsp;
-//import org.apache.myfaces.shared_impl.config.MyfacesConfig;
+//import org.apache.myfaces.shared.config.MyfacesConfig;
import java.io.BufferedWriter;
import java.io.CharArrayWriter;
4 impl/src/test/java/org/apache/myfaces/application/jsp/JspViewHandlerImplTest.java
View
@@ -21,8 +21,8 @@
import static org.apache.myfaces.Assert.assertException;
import org.apache.myfaces.FacesTestCase;
import org.apache.myfaces.TestRunner;
-import org.apache.myfaces.shared_impl.application.InvalidViewIdException;
-import org.apache.myfaces.shared_impl.application.ViewHandlerSupport;
+import org.apache.myfaces.shared.application.InvalidViewIdException;
+import org.apache.myfaces.shared.application.ViewHandlerSupport;
import static org.easymock.EasyMock.*;