Skip to content
Browse files

TAPESTRY-2421: Allow Tapestry4/Tapestry5 to be deployed in the same WAR

  • Loading branch information...
1 parent aef1537 commit 4c1aaa8c7b5204d2ffeee67ff9d555b436338fa7 @hlship hlship committed
Showing with 1,548 additions and 1,544 deletions.
  1. +1 −1 build.xml
  2. +3 −3 pom.xml
  3. +1 −1 quickstart/src/main/resources/META-INF/archetype.xml
  4. +1 −1 quickstart/src/main/resources/archetype-resources/src/main/java/pages/Index.java
  5. +9 −9 quickstart/src/main/resources/archetype-resources/src/main/java/services/AppModule.java
  6. +3 −3 quickstart/src/main/resources/archetype-resources/src/main/resources/log4j.properties
  7. +2 −2 quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
  8. +3 −3 src/site/apt/dev/bible.apt
  9. +1 −1 src/site/apt/index.apt
  10. +1 −1 src/site/xdoc/release-notes.xml
  11. +4 −4 tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/DataType.java
  12. +5 −5 tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/NonVisual.java
  13. +5 −4 tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/OrderAfter.java
  14. +5 −4 tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/OrderBefore.java
  15. +3 −2 tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/RelativePosition.java
  16. +7 −7 tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/Validate.java
  17. +4 −4 tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/Width.java
  18. +4 −4 tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Inject.java
  19. +2 −2 tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/InjectService.java
  20. +4 −4 tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/IntermediateType.java
  21. +3 −3 tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Primary.java
  22. +3 −3 tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Symbol.java
  23. +4 −4 tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Value.java
  24. +2 −2 tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ClassDescription.java
  25. +9 −9 tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ComponentReport.java
  26. +1 −1 tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParameterDescription.java
  27. +3 −2 tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParametersDoclet.java
  28. +1 −1 tapestry-core/pom.xml
  29. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/AbstractOptionModel.java
  30. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/Asset.java
  31. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/BaseValidationDecorator.java
  32. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/Binding.java
  33. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/BindingConstants.java
  34. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/Block.java
  35. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/BlockNotFoundException.java
  36. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/CSSClassConstants.java
  37. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/ClientElement.java
  38. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/ComponentAction.java
  39. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/ComponentEventCallback.java
  40. +8 −8 tapestry-core/src/main/java/org/apache/tapestry5/ComponentResources.java
  41. +13 −13 tapestry-core/src/main/java/org/apache/tapestry5/ComponentResourcesCommon.java
  42. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/ContentType.java
  43. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/EventConstants.java
  44. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/EventContext.java
  45. +5 −5 tapestry-core/src/main/java/org/apache/tapestry5/Field.java
  46. +10 −10 tapestry-core/src/main/java/org/apache/tapestry5/FieldValidationSupport.java
  47. +8 −8 tapestry-core/src/main/java/org/apache/tapestry5/FieldValidator.java
  48. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/FormValidationControl.java
  49. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/Link.java
  50. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/MarkupUtils.java
  51. +5 −5 tapestry-core/src/main/java/org/apache/tapestry5/MarkupWriter.java
  52. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/MarkupWriterAdapter.java
  53. +5 −5 tapestry-core/src/main/java/org/apache/tapestry5/MarkupWriterListener.java
  54. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/MetaDataConstants.java
  55. +6 −6 tapestry-core/src/main/java/org/apache/tapestry5/NullFieldStrategy.java
  56. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/OptionGroupModel.java
  57. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/OptionModel.java
  58. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/PersistenceConstants.java
  59. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/PrimaryKeyEncoder.java
  60. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/PropertyConduit.java
  61. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/RadioContainer.java
  62. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/RenderSupport.java
  63. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/Renderable.java
  64. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/SelectModel.java
  65. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/SelectModelVisitor.java
  66. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/StreamResponse.java
  67. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
  68. +12 −12 tapestry-core/src/main/java/org/apache/tapestry5/TapestryFilter.java
  69. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/Translator.java
  70. +5 −5 tapestry-core/src/main/java/org/apache/tapestry5/ValidationDecorator.java
  71. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/ValidationException.java
  72. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/ValidationTracker.java
  73. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/ValidationTrackerImpl.java
  74. +7 −7 tapestry-core/src/main/java/org/apache/tapestry5/Validator.java
  75. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/ValueEncoder.java
  76. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/VersionUtils.java
  77. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/annotations/AfterRender.java
  78. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/annotations/AfterRenderBody.java
  79. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/annotations/AfterRenderTemplate.java
  80. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/annotations/ApplicationState.java
  81. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/annotations/BeforeRenderBody.java
  82. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/annotations/BeforeRenderTemplate.java
  83. +8 −8 tapestry-core/src/main/java/org/apache/tapestry5/annotations/BeginRender.java
  84. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/annotations/Cached.java
  85. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/annotations/CleanupRender.java
  86. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/annotations/Component.java
  87. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/annotations/ContentType.java
  88. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/annotations/Environmental.java
  89. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/annotations/Id.java
  90. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/annotations/IncludeJavaScriptLibrary.java
  91. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/annotations/IncludeStylesheet.java
  92. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/annotations/InjectComponent.java
  93. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/annotations/InjectContainer.java
  94. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/annotations/InjectPage.java
  95. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/annotations/Log.java
  96. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/annotations/Meta.java
  97. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/annotations/Mixin.java
  98. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/annotations/MixinAfter.java
  99. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/annotations/MixinClasses.java
  100. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/annotations/Mixins.java
  101. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/annotations/OnEvent.java
  102. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/annotations/PageAttached.java
  103. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/annotations/PageDetached.java
  104. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/annotations/PageLoaded.java
  105. +5 −5 tapestry-core/src/main/java/org/apache/tapestry5/annotations/Parameter.java
  106. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/annotations/Path.java
  107. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/annotations/Persist.java
  108. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/annotations/Property.java
  109. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/annotations/ResponseEncoding.java
  110. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/annotations/Retain.java
  111. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/annotations/Secure.java
  112. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/annotations/Service.java
  113. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/annotations/SetupRender.java
  114. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/annotations/SupportsInformalParameters.java
  115. +8 −8 tapestry-core/src/main/java/org/apache/tapestry5/beaneditor/BeanModel.java
  116. +6 −6 tapestry-core/src/main/java/org/apache/tapestry5/beaneditor/PropertyModel.java
  117. +8 −8 tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractComponentEventLink.java
  118. +10 −10 tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractField.java
  119. +10 −10 tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractLink.java
  120. +14 −14 tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractPropertyOutput.java
  121. +17 −17 tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractTextField.java
  122. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/BaseMessages.java
  123. +6 −6 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/ActionLink.java
  124. +6 −6 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Any.java
  125. +16 −16 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/BeanDisplay.java
  126. +14 −14 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/BeanEditForm.java
  127. +20 −20 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/BeanEditor.java
  128. +11 −11 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Checkbox.java
  129. +13 −13 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java
  130. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Delegate.java
  131. +10 −10 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Errors.java
  132. +9 −9 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/EventLink.java
  133. +11 −11 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/ExceptionDisplay.java
  134. +22 −22 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Form.java
  135. +21 −21 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormFragment.java
  136. +18 −18 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormInjector.java
  137. +28 −28 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Grid.java
  138. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridCell.java
  139. +16 −16 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridColumns.java
  140. +11 −11 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridPager.java
  141. +13 −13 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridRows.java
  142. +5 −5 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/If.java
  143. +14 −14 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Label.java
  144. +9 −9 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Loop.java
  145. +10 −10 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Output.java
  146. +7 −7 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/OutputRaw.java
  147. +7 −7 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PageLink.java
  148. +14 −14 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java
  149. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PasswordField.java
  150. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PropertyDisplay.java
  151. +13 −13 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PropertyEditor.java
  152. +12 −12 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Radio.java
  153. +8 −8 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/RadioGroup.java
  154. +7 −7 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/RenderObject.java
  155. +17 −17 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Select.java
  156. +13 −13 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Submit.java
  157. +7 −7 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/SubmitNotifier.java
  158. +5 −5 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/TextArea.java
  159. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/TextField.java
  160. +6 −6 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/TextOutput.java
  161. +6 −6 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Unless.java
  162. +10 −10 tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java
  163. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/corelib/data/BlankOption.java
  164. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/corelib/data/GridPagerPosition.java
  165. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/corelib/data/InsertPosition.java
  166. +6 −6 tapestry-core/src/main/java/org/apache/tapestry5/corelib/internal/FormSupportAdapter.java
  167. +10 −10 tapestry-core/src/main/java/org/apache/tapestry5/corelib/internal/FormSupportImpl.java
  168. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/corelib/internal/InternalMessages.java
  169. +7 −7 tapestry-core/src/main/java/org/apache/tapestry5/corelib/internal/WrappedComponentAction.java
  170. +13 −13 tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/Autocomplete.java
  171. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/DiscardBody.java
  172. +5 −5 tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/RenderDisabled.java
  173. +6 −6 tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/RenderInformals.java
  174. +13 −13 tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/TriggerFragment.java
  175. +13 −13 tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ExceptionReport.java
  176. +7 −7 tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/PropertyDisplayBlocks.java
  177. +13 −13 tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/PropertyEditBlocks.java
  178. +10 −10 tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ServiceStatus.java
  179. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/dom/CData.java
  180. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/dom/Comment.java
  181. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/dom/DTD.java
  182. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/dom/DefaultMarkupModel.java
  183. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/dom/Document.java
  184. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/dom/DomMessages.java
  185. +9 −9 tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java
  186. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/dom/EndTagStyle.java
  187. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/dom/MarkupModel.java
  188. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/dom/Node.java
  189. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/dom/Raw.java
  190. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/dom/Text.java
  191. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/dom/XMLMarkupModel.java
  192. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/grid/ColumnSort.java
  193. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/grid/GridConstants.java
  194. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/grid/GridDataSource.java
  195. +5 −5 tapestry-core/src/main/java/org/apache/tapestry5/grid/GridModel.java
  196. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/grid/GridSortModel.java
  197. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/grid/SortConstraint.java
  198. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/internal/DefaultNullFieldStrategy.java
  199. +6 −6 tapestry-core/src/main/java/org/apache/tapestry5/internal/DefaultValidationDecorator.java
  200. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/internal/EmptyEventContext.java
  201. +12 −12 tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalComponentResources.java
  202. +5 −5 tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalComponentResourcesCommon.java
  203. +5 −5 tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalConstants.java
  204. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalMessages.java
  205. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/internal/KeyValue.java
  206. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/internal/OptionGroupModelImpl.java
  207. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/internal/OptionModelImpl.java
  208. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/internal/SelectModelImpl.java
  209. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/internal/ServletContextSymbolProvider.java
  210. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/internal/SingleKeySymbolProvider.java
  211. +6 −6 tapestry-core/src/main/java/org/apache/tapestry5/internal/SyntheticModuleDef.java
  212. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/internal/SyntheticSymbolSourceContributionDef.java
  213. +12 −12 tapestry-core/src/main/java/org/apache/tapestry5/internal/TapestryAppInitializer.java
  214. +16 −16 tapestry-core/src/main/java/org/apache/tapestry5/internal/TapestryInternalUtils.java
  215. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/internal/URLEventContext.java
  216. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/internal/ZeroNullFieldStrategy.java
  217. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanEditorMessages.java
  218. +14 −14 tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelImpl.java
  219. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelUtils.java
  220. +3 −3 ...ore/src/main/java/org/apache/tapestry5/internal/beaneditor/PrimitiveFieldConstraintGenerator.java
  221. +9 −9 tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/PropertyModelImpl.java
  222. +4 −4 ...src/main/java/org/apache/tapestry5/internal/beaneditor/ValidateAnnotationConstraintGenerator.java
  223. +5 −5 tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/AbstractBinding.java
  224. +12 −12 tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/AssetBindingFactory.java
  225. +5 −5 tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/BindingsMessages.java
  226. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/BlockBinding.java
  227. +5 −5 tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/BlockBindingFactory.java
  228. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/ComponentBinding.java
  229. +5 −5 tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/ComponentBindingFactory.java
  230. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/LiteralBinding.java
  231. +6 −6 tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/LiteralBindingFactory.java
  232. +5 −5 tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/MessageBindingFactory.java
  233. +9 −9 ...ry-core/src/main/java/org/apache/tapestry5/internal/bindings/NullFieldStrategyBindingFactory.java
  234. +6 −6 tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBinding.java
  235. +9 −9 tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBindingFactory.java
  236. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/RenderVariableBinding.java
  237. +5 −5 tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/RenderVariableBindingFactory.java
  238. +7 −7 tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/TranslateBindingFactory.java
  239. +10 −10 tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/ValidateBindingFactory.java
  240. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/internal/event/InvalidationEventHub.java
  241. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/internal/event/InvalidationEventHubImpl.java
  242. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/internal/events/InvalidationListener.java
  243. +1 −1 tapestry-core/src/main/java/org/apache/tapestry5/internal/events/UpdateListener.java
  244. +8 −8 tapestry-core/src/main/java/org/apache/tapestry5/internal/grid/CollectionGridDataSource.java
  245. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/internal/grid/NullDataSource.java
  246. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/internal/model/ModelMessages.java
  247. +10 −10 tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableComponentModelImpl.java
  248. +6 −6 ...try-core/src/main/java/org/apache/tapestry5/internal/model/MutableEmbeddedComponentModelImpl.java
  249. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/internal/model/ParameterModelImpl.java
  250. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/AttributeToken.java
  251. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/BlockToken.java
  252. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/BodyToken.java
  253. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/CDATAToken.java
  254. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/CommentToken.java
  255. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ComponentTemplate.java
  256. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ComponentTemplateImpl.java
  257. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/DTDToken.java
  258. +5 −5 tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/DefineNamespacePrefixToken.java
  259. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/EndElementToken.java
  260. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ExpansionToken.java
  261. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ParameterToken.java
  262. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/StartComponentToken.java
  263. +5 −5 tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/StartElementToken.java
  264. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/TemplateToken.java
  265. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/TextToken.java
  266. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/TokenType.java
  267. +6 −6 tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ComponentResourcesRenderer.java
  268. +5 −5 tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/EventContextRenderer.java
  269. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ListRenderer.java
  270. +11 −11 tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/LocationRenderer.java
  271. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ObjectArrayRenderer.java
  272. +5 −5 tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/RequestRenderer.java
  273. +4 −4 ...-core/src/main/java/org/apache/tapestry5/internal/services/AbstractComponentMethodInvocation.java
  274. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AbstractInstantiator.java
  275. +8 −8 .../src/main/java/org/apache/tapestry5/internal/services/AbstractSessionPersistentFieldStrategy.java
  276. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ActionLinkTarget.java
  277. +2 −2 ...stry-core/src/main/java/org/apache/tapestry5/internal/services/ActionRenderResponseGenerator.java
  278. +6 −6 ...-core/src/main/java/org/apache/tapestry5/internal/services/ActionRenderResponseGeneratorImpl.java
  279. +8 −8 ...y-core/src/main/java/org/apache/tapestry5/internal/services/AjaxComponentEventRequestHandler.java
  280. +6 −6 ...c/main/java/org/apache/tapestry5/internal/services/AjaxComponentInstanceEventResultProcessor.java
  281. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxFilter.java
  282. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxPartialResponseRenderer.java
  283. +9 −9 ...ry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxPartialResponseRendererImpl.java
  284. +8 −8 tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AliasImpl.java
  285. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AliasManagerImpl.java
  286. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AnnotationDataTypeAnalyzer.java
  287. +2 −2 tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ApplicationGlobalsImpl.java
  288. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ApplicationStateManagerImpl.java
  289. +3 −3 ...in/java/org/apache/tapestry5/internal/services/ApplicationStatePersistenceStrategySourceImpl.java
  290. +8 −8 tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetDispatcher.java
  291. +10 −10 tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetInjectionProvider.java
  292. +11 −11 tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetObjectProvider.java
  293. +10 −10 tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetSourceImpl.java
  294. +4 −4 tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AttributeExpansionBinding.java
  295. +6 −6 tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BasePropertyConduit.java
  296. +3 −3 tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BaseURLSourceImpl.java
  297. +6 −6 tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BeanBlockOverrideSourceImpl.java
  298. +5 −5 tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BeanBlockSourceImpl.java
  299. +18 −18 tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BeanModelSourceImpl.java
  300. +10 −10 tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BindingSourceImpl.java
Sorry, we could not display the entire diff because too many files (1,668) changed.
View
2 build.xml
@@ -207,4 +207,4 @@
<antcall target="assemble"/>
</target>
-</project>
+</project>
View
6 pom.xml
@@ -91,19 +91,19 @@
<name>Tapestry User List</name>
<subscribe>users-subscribe@tapestry.apache.org</subscribe>
<unsubscribe>users-unsubscribe@tapestry.apache.org</unsubscribe>
- <archive>http://markmail.org/search/list:org.apache.tapestry.users</archive>
+ <archive>http://markmail.org/search/list:org.apache.tapestry5.users</archive>
</mailingList>
<mailingList>
<name>Tapestry Developer List</name>
<subscribe>dev-subscribe@tapestry.apache.org</subscribe>
<unsubscribe>dev-unsubscribe@tapestry.apache.org</unsubscribe>
- <archive>http://markmail.org/search/list:org.apache.tapestry.dev</archive>
+ <archive>http://markmail.org/search/list:org.apache.tapestry5.dev</archive>
</mailingList>
<mailingList>
<name>Tapestry Commits List</name>
<subscribe>commits-subscribe@tapestry.apache.org</subscribe>
<unsubscribe>commits-unsubscribe@tapestry.apache.org</unsubscribe>
- <archive>http://markmail.org/search/list:org.apache.tapestry.commits</archive>
+ <archive>http://markmail.org/search/list:org.apache.tapestry5.commits</archive>
</mailingList>
</mailingLists>
View
2 quickstart/src/main/resources/META-INF/archetype.xml
@@ -30,4 +30,4 @@
<source>src/main/java/pages/Index.java</source>
<source>src/main/java/services/AppModule.java</source>
</sources>
-</archetype>
+</archetype>
View
2 quickstart/src/main/resources/archetype-resources/src/main/java/pages/Index.java
@@ -11,4 +11,4 @@ public Date getCurrentTime()
{
return new Date();
}
-}
+}
View
18 quickstart/src/main/resources/archetype-resources/src/main/java/services/AppModule.java
@@ -2,15 +2,15 @@
import java.io.IOException;
-import org.apache.tapestry.*;
-import org.apache.tapestry.ioc.MappedConfiguration;
-import org.apache.tapestry.ioc.OrderedConfiguration;
-import org.apache.tapestry.ioc.ServiceBinder;
-import org.apache.tapestry.ioc.annotations.InjectService;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.RequestFilter;
-import org.apache.tapestry.services.RequestHandler;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.ioc.MappedConfiguration;
+import org.apache.tapestry5.ioc.OrderedConfiguration;
+import org.apache.tapestry5.ioc.ServiceBinder;
+import org.apache.tapestry5.ioc.annotations.InjectService;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.RequestFilter;
+import org.apache.tapestry5.services.RequestHandler;
+import org.apache.tapestry5.services.Response;
import org.slf4j.Logger;
/**
View
6 quickstart/src/main/resources/archetype-resources/src/main/resources/log4j.properties
@@ -13,11 +13,11 @@ log4j.appender.A1.layout.ConversionPattern=[%p] %c{2} %m%n
log4j.category.${packageName}.services.AppModule.TimingFilter=info
# Outputs a list of pages, components and mixins at startup.
-log4j.category.org.apache.tapestry.services.TapestryModule.ComponentClassResolver=info
+log4j.category.org.apache.tapestry5.services.TapestryModule.ComponentClassResolver=info
# Outputs startup statistics; time to setup and initialize the registry, and a list of
# available services.
-log4j.category.org.apache.tapestry.TapestryFilter=info
+log4j.category.org.apache.tapestry5.TapestryFilter=info
# Turning on debug mode for a page or component will show all of the code changes that occur when the
@@ -25,4 +25,4 @@ log4j.category.org.apache.tapestry.TapestryFilter=info
# the contruction of the page, including the runtime code modifications that occur. Verbose
# mode is rarely used, as it outputs voluminous details about the rendering of the page.
-# log4j.category.${packageName}.pages.Index=debug
+# log4j.category.${packageName}.pages.Index=debug
View
4 quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
@@ -28,11 +28,11 @@ of where to look for pages, components and mixins. -->
</context-param>
<filter>
<filter-name>app</filter-name>
- <filter-class>org.apache.tapestry.TapestryFilter</filter-class>
+ <filter-class>org.apache.tapestry5.TapestryFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>app</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
</web-app>
-
+
View
6 src/site/apt/dev/bible.apt
@@ -104,10 +104,10 @@ Public vs. Private/Internal
to change it. As soon as code is public, we become handcuffed to backwards compatibility.
<<Interfaces are public, implementations are private>>. You can see this is the bulk of the code, where
- org.apache.tapestry.services is almost all interfaces and the implementations are
- in org.apache.tapestry.internal.services.
+ org.apache.tapestry5.services is almost all interfaces and the implementations are
+ in org.apache.tapestry5.internal.services.
- Many more services have both the interface and the implementation in org.apache.tapestry.internal.services.
+ Many more services have both the interface and the implementation in org.apache.tapestry5.internal.services.
We absolutely <<do not>> want to make Page or ComponentPageElement public. You will often see
public service facades that take a page name as a method parameter,
View
2 src/site/apt/index.apt
@@ -255,7 +255,7 @@ Public vs. Internal
With the clean slate of Tapestry 5, we are being much more ruthless about internal vs. external.
- First of all, anything inside the org.apache.tapestry.internal package
+ First of all, anything inside the org.apache.tapestry5.internal package
is <<internal>>. It is part of the implementation of Tapestry. It is the man behind the curtain.
You should not ever need to directly use this code. It is a <<bad idea>> to do so, because
internal code may <<change from one release to the next>> without concern for backwards
View
2 src/site/xdoc/release-notes.xml
@@ -1100,7 +1100,7 @@
</li>
<li>
[<a href="https://issues.apache.org/jira/browse/TAPESTRY-1443">TAPESTRY-1443</a>] -
- org.apache.tapestry.annotation.Service annotation is
+ org.apache.tapestry5.annotations.Service annotation is
ignored
</li>
<li>
View
8 tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/DataType.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.beaneditor;
+package org.apache.tapestry5.beaneditor;
import java.lang.annotation.*;
/**
- * Used to explicitly set the data type used to select an editor (or display) block. Normally, the data type
- * is determined from the type of the property (for example, property type java.lang.String would map to data
- * type "text").
+ * Used to explicitly set the data type used to select an editor (or display) block. Normally, the data type is
+ * determined from the type of the property (for example, property type java.lang.String would map to data type
+ * "text").
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
View
10 tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/NonVisual.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.beaneditor;
+package org.apache.tapestry5.beaneditor;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.METHOD;
@@ -21,13 +21,13 @@
import java.lang.annotation.Target;
/**
- * Marker annotation for properties which are non-visual, and so should not appear (by default)
- * inside a {@link BeanModel}. The annotation may be placed on either the getter or the setter
- * method.
+ * Marker annotation for properties which are non-visual, and so should not appear (by default) inside a {@link
+ * BeanModel}. The annotation may be placed on either the getter or the setter method.
*/
@Target(METHOD)
@Retention(RUNTIME)
@Documented
-public @interface NonVisual {
+public @interface NonVisual
+{
}
View
9 tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/OrderAfter.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.beaneditor;
+package org.apache.tapestry5.beaneditor;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.METHOD;
@@ -21,13 +21,14 @@
import java.lang.annotation.Target;
/**
- * Placed on either a property getter or a property setter method to control the order in which the
- * properties are presented to the user.
+ * Placed on either a property getter or a property setter method to control the order in which the properties are
+ * presented to the user.
*/
@Target(METHOD)
@Retention(RUNTIME)
@Documented
-public @interface OrderAfter {
+public @interface OrderAfter
+{
/**
* The name of the other property. This property will be ordered before the other property.
*/
View
9 tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/OrderBefore.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.beaneditor;
+package org.apache.tapestry5.beaneditor;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.METHOD;
@@ -21,13 +21,14 @@
import java.lang.annotation.Target;
/**
- * Placed on either a property getter or a property setter method to control the order in which the
- * properties are presented to the user.
+ * Placed on either a property getter or a property setter method to control the order in which the properties are
+ * presented to the user.
*/
@Target(METHOD)
@Retention(RUNTIME)
@Documented
-public @interface OrderBefore {
+public @interface OrderBefore
+{
/**
* The name of the other property. This property will be ordered before the other property.
*/
View
5 tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/RelativePosition.java
@@ -12,12 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.beaneditor;
+package org.apache.tapestry5.beaneditor;
/**
* Controls the position of newly added {@link PropertyModel}s inside a {@link BeanModel}.
*/
-public enum RelativePosition {
+public enum RelativePosition
+{
/**
* The new {@link PropertyModel} goes before the existing model.
*/
View
14 tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/Validate.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.beaneditor;
+package org.apache.tapestry5.beaneditor;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.METHOD;
@@ -21,15 +21,15 @@
import java.lang.annotation.Target;
/**
- * Used to attach validation constraints directly to a property (either the getter or the setter
- * method). The annotation value is a comma separated list of <em>validation constraints</em>,
- * each one identifying a validator type (such as "required", "minlength") and optionally, a
- * constraint value. Most validators need a constraint value, which is separated from the type by an
- * equals size (i.e., "maxlength=30").
+ * Used to attach validation constraints directly to a property (either the getter or the setter method). The annotation
+ * value is a comma separated list of <em>validation constraints</em>, each one identifying a validator type (such as
+ * "required", "minlength") and optionally, a constraint value. Most validators need a constraint value, which is
+ * separated from the type by an equals size (i.e., "maxlength=30").
*/
@Target(METHOD)
@Retention(RUNTIME)
@Documented
-public @interface Validate {
+public @interface Validate
+{
String value();
}
View
8 tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/Width.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.beaneditor;
+package org.apache.tapestry5.beaneditor;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.METHOD;
@@ -21,9 +21,9 @@
import java.lang.annotation.Target;
/**
- * Defines the desired width of the field used to edit the property. Note that width (generally equivalent to the
- * size attribute of an HTML &lt;input&gt; element) is only used for presentation; validation must be used to
- * actually enforce a maximum input length.
+ * Defines the desired width of the field used to edit the property. Note that width (generally equivalent to the size
+ * attribute of an HTML &lt;input&gt; element) is only used for presentation; validation must be used to actually
+ * enforce a maximum input length.
*/
@Target(METHOD)
@Retention(RetentionPolicy.RUNTIME)
View
8 tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Inject.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.annotation;
+package org.apache.tapestry5.ioc.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -31,8 +31,8 @@
* <p/>
* In terms of the IoC container; normally, resources take precedence over annotations when injecting. The Inject
* annotation overrides this default, forcing the resolution of the parameters value via the master {@link
- * org.apache.tapestry.ioc.ObjectProvider}, even when the parameter's type matches a type that is normally a resource.
- * This is most often used in conjunction with {@link org.apache.tapestry.ioc.annotation.Value} annotation when
+ * org.apache.tapestry5.ioc.ObjectProvider}, even when the parameter's type matches a type that is normally a resource.
+ * This is most often used in conjunction with {@link org.apache.tapestry5.ioc.annotations.Value} annotation when
* injecting a string, as normally, the String would be matched as the service id.
* <p/>
* In terms of the IoC container, the Inject annotation is only used on parameters to service builder methods (and
@@ -43,7 +43,7 @@
* Finally, on a constructor, this is used to indicate <em>which</em> constructor should be used when more than one is
* available.
*
- * @see org.apache.tapestry.ioc.ObjectProvider
+ * @see org.apache.tapestry5.ioc.ObjectProvider
*/
@Target(
{ PARAMETER, FIELD, ElementType.CONSTRUCTOR })
View
4 tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/InjectService.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.annotation;
+package org.apache.tapestry5.ioc.annotations;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.PARAMETER;
@@ -26,7 +26,7 @@
/**
* Annotation used with parameters of service builder methods to identify the service to be injected
* into the service builder method via the parameter. In many cases the
- * {@link org.apache.tapestry.ioc.annotation.Inject} annotation is more flexible or appropriate.
+ * {@link org.apache.tapestry5.ioc.annotations.Inject} annotation is more flexible or appropriate.
*
*
*/
View
8 ...stry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/IntermediateType.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.annotation;
+package org.apache.tapestry5.ioc.annotations;
import java.lang.annotation.*;
@@ -20,10 +20,10 @@
/**
* Used to guide Tapestry when coercing from a raw type to a field or parameter type, by forcing Tapestry to coerce to
* the intermediate type. This was introduced to allow coercion from string to a time period (in milliseconds) via
- * {@link org.apache.tapestry.ioc.util.TimeInterval}.
+ * {@link org.apache.tapestry5.ioc.util.TimeInterval}.
*
- * @see org.apache.tapestry.ioc.annotation.Value
- * @see org.apache.tapestry.ioc.annotation.Symbol
+ * @see org.apache.tapestry5.ioc.annotations.Value
+ * @see org.apache.tapestry5.ioc.annotations.Symbol
*/
@Target({ ElementType.PARAMETER, ElementType.FIELD })
@Retention(RetentionPolicy.RUNTIME)
View
6 tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Primary.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.annotation;
+package org.apache.tapestry5.ioc.annotations;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
@@ -23,8 +23,8 @@
/**
* Marker annotation used to denote a service that is the primary instance of some common interface. This is often used
- * when a service is a {@linkplain org.apache.tapestry.ioc.services.ChainBuilder chain of command} or {@linkplain
- * org.apache.tapestry.ioc.services.StrategyBuilder strategy-based} and, therefore, many services will implement the
+ * when a service is a {@linkplain org.apache.tapestry5.ioc.services.ChainBuilder chain of command} or {@linkplain
+ * org.apache.tapestry5.ioc.services.StrategyBuilder strategy-based} and, therefore, many services will implement the
* same interface.
*/
@Target(
View
6 tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Symbol.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.annotation;
+package org.apache.tapestry5.ioc.annotations;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
@@ -23,8 +23,8 @@
/**
* Used to inject a symbol value, via a symbol name. This is used much like {@link
- * org.apache.tapestry.ioc.annotation.Value} annotation, except that symbols are not expanded ... the entire value is a
- * symbol name. This allows the annotation to reference a public constant variable.
+ * org.apache.tapestry5.ioc.annotations.Value} annotation, except that symbols are not expanded ... the entire value is
+ * a symbol name. This allows the annotation to reference a public constant variable.
*/
@Target(
{ PARAMETER, FIELD })
View
8 tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Value.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.annotation;
+package org.apache.tapestry5.ioc.annotations;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
@@ -22,13 +22,13 @@
import java.lang.annotation.Target;
/**
- * Used in conjunction with {@link org.apache.tapestry.ioc.annotation.Inject} to inject a literal value, rather than a
+ * Used in conjunction with {@link org.apache.tapestry5.ioc.annotations.Inject} to inject a literal value, rather than a
* service. Symbols in the value are expanded and the resulting string is coerced to the desired type. For IoC, this
* annotation is only applied to parameters (on service builder methods, and on service constructors); for components,
* it may also be applied to field.
*
- * @see org.apache.tapestry.ioc.services.SymbolSource
- * @see org.apache.tapestry.ioc.services.TypeCoercer
+ * @see org.apache.tapestry5.ioc.services.SymbolSource
+ * @see org.apache.tapestry5.ioc.services.TypeCoercer
*/
@Target(
{ PARAMETER, FIELD })
View
4 tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ClassDescription.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.mojo;
+package org.apache.tapestry5.mojo;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
import java.util.Map;
View
18 tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ComponentReport.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.mojo;
+package org.apache.tapestry5.mojo;
import nu.xom.*;
import org.apache.commons.lang.StringUtils;
@@ -23,10 +23,10 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.MavenReportException;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.codehaus.doxia.sink.Sink;
import org.codehaus.doxia.site.renderer.SiteRenderer;
import org.codehaus.plexus.util.cli.CommandLineException;
@@ -51,8 +51,8 @@
*/
private static final String REFERENCE_DIR = "ref";
- private final static String[] PARAMETER_HEADERS = {"Name", "Type", "Flags", "Default", "Default Prefix",
- "Description"};
+ private final static String[] PARAMETER_HEADERS = { "Name", "Type", "Flags", "Default", "Default Prefix",
+ "Description" };
/**
@@ -526,7 +526,7 @@ private void copy(File sourceFile, File targetFile) throws IOException
String parametersPath = workDirectory + File.separator + "component-parameters.xml";
- String[] arguments = {"-private", "-o", parametersPath,
+ String[] arguments = { "-private", "-o", parametersPath,
"-subpackages", rootPackage,
@@ -536,7 +536,7 @@ private void copy(File sourceFile, File targetFile) throws IOException
"-sourcepath", sourcePath(),
- "-classpath", classPath()};
+ "-classpath", classPath() };
command.addArguments(arguments);
View
2 tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParameterDescription.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.mojo;
+package org.apache.tapestry5.mojo;
public class ParameterDescription
{
View
5 tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParametersDoclet.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.mojo;
+package org.apache.tapestry5.mojo;
import com.sun.javadoc.*;
import com.sun.javadoc.AnnotationDesc.ElementValuePair;
@@ -124,7 +124,8 @@ private String get(Map<String, String> map, String key, String defaultValue)
{
for (AnnotationDesc annotation : fd.annotations())
{
- if (annotation.annotationType().qualifiedTypeName().equals("org.apache.tapestry.annotation.Parameter"))
+ if (annotation.annotationType().qualifiedTypeName().equals(
+ "org.apache.tapestry5.annotations.Parameter"))
{
Map<String, String> result = new HashMap<String, String>();
View
2 tapestry-core/pom.xml
@@ -98,7 +98,7 @@
<artifactId>tapestry-component-report</artifactId>
<version>${project.version}</version>
<configuration>
- <rootPackage>org.apache.tapestry.corelib</rootPackage>
+ <rootPackage>org.apache.tapestry5.corelib</rootPackage>
<apidocs>../apidocs</apidocs>
</configuration>
</plugin>
View
4 tapestry-core/src/main/java/org/apache/tapestry5/AbstractOptionModel.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
import java.util.Map;
/**
* Base class for implementing {@link OptionModel}. Subclasses must implement {@link
- * org.apache.tapestry.OptionModel#getLabel()} and {@link org.apache.tapestry.OptionModel#getValue()} }.
+ * org.apache.tapestry5.OptionModel#getLabel()} and {@link org.apache.tapestry5.OptionModel#getValue()} }.
*/
public abstract class AbstractOptionModel implements OptionModel
{
View
4 tapestry-core/src/main/java/org/apache/tapestry5/Asset.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.ioc.Resource;
+import org.apache.tapestry5.ioc.Resource;
/**
* An Asset is any kind of resource that can be exposed to the client web browser. Although quite often an Asset is a
View
4 tapestry-core/src/main/java/org/apache/tapestry5/BaseValidationDecorator.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.dom.Element;
+import org.apache.tapestry5.dom.Element;
/**
* Base implementation of {@link ValidationDecorator} that does nothing. Subclasses may override specific methods,
View
4 tapestry-core/src/main/java/org/apache/tapestry5/Binding.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.AnnotationProvider;
/**
* A binding is a connection between a component and its container (another component), that allows the embedded
View
6 tapestry-core/src/main/java/org/apache/tapestry5/BindingConstants.java
@@ -1,8 +1,8 @@
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
* Constants for the built-in binding prefixes. These are often used with the {@link
- * org.apache.tapestry.annotation.Parameter#defaultPrefix()} annotation attribute.
+ * org.apache.tapestry5.annotations.Parameter#defaultPrefix()} annotation attribute.
*/
public class BindingConstants
{
@@ -12,7 +12,7 @@
public static final String LITERAL = "literal";
/**
* Binding expression prefix used to bind to a property of the component. When {@link
- * org.apache.tapestry.annotation.Parameter#defaultPrefix()} is not specified, the default is PROP.
+ * org.apache.tapestry5.annotations.Parameter#defaultPrefix()} is not specified, the default is PROP.
*/
public static final String PROP = "prop";
View
2 tapestry-core/src/main/java/org/apache/tapestry5/Block.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
* A block is a collection of static text and elements, and components, derived from a component template. In the
View
6 tapestry-core/src/main/java/org/apache/tapestry5/BlockNotFoundException.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.ioc.Locatable;
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry5.ioc.Locatable;
+import org.apache.tapestry5.ioc.Location;
/**
* Exception thrown when a {@link Block} is requested but not found.
View
2 tapestry-core/src/main/java/org/apache/tapestry5/CSSClassConstants.java
@@ -1,4 +1,4 @@
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
* Constants used when rendering a CSS class attribute.
View
2 tapestry-core/src/main/java/org/apache/tapestry5/ClientElement.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
View
2 tapestry-core/src/main/java/org/apache/tapestry5/ComponentAction.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
import java.io.Serializable;
View
8 tapestry-core/src/main/java/org/apache/tapestry5/ComponentEventCallback.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
- * Callback interface for a {@linkplain org.apache.tapestry.runtime.Event render phase event) or {@link
- * org.apache.tapestry.runtime.ComponentEvent}, notified when a non-null value is returned from some event handler
+ * Callback interface for a {@linkplain org.apache.tapestry5.runtime.Event render phase event) or {@link
+ * org.apache.tapestry5.runtime.ComponentEvent}, notified when a non-null value is returned from some event handler
* method.
*/
public interface ComponentEventCallback<T>
@@ -28,7 +28,7 @@
* <p/>
* Boolean values are <em>not</em> passed to the handler. Booleans are used to indicate that the event has been
* handled (true) or that a further search for handlers should continue (true). If a component event method returns
- * true, then {@link org.apache.tapestry.runtime.Event#isAborted()} will return true.
+ * true, then {@link org.apache.tapestry5.runtime.Event#isAborted()} will return true.
*
* @param result the result value return from the event handler method
* @return true if the event is aborted, false if the event may continue
View
16 tapestry-core/src/main/java/org/apache/tapestry5/ComponentResources.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.runtime.PageLifecycleListener;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.runtime.PageLifecycleListener;
import java.lang.annotation.Annotation;
@@ -188,7 +188,7 @@
/**
* Discards all persistent field changes for the page containing the component. Changes are eliminated from
- * persistent storage (such as the {@link org.apache.tapestry.services.Session}) which will take effect in the
+ * persistent storage (such as the {@link org.apache.tapestry5.services.Session}) which will take effect in the
* <em>next</em> request (the attached page instance is not affected).
*/
void discardPersistentFieldChanges();
View
26 tapestry-core/src/main/java/org/apache/tapestry5/ComponentResourcesCommon.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.ioc.Locatable;
+import org.apache.tapestry5.ioc.Locatable;
import org.slf4j.Logger;
import java.util.Locale;
/**
- * Operations shared by the public {@link org.apache.tapestry.ComponentResources} interface and {@link
- * org.apache.tapestry.internal.structure.ComponentPageElement} interface (on the internal side).
+ * Operations shared by the public {@link org.apache.tapestry5.ComponentResources} interface and {@link
+ * org.apache.tapestry5.internal.structure.ComponentPageElement} interface (on the internal side).
*/
public interface ComponentResourcesCommon extends Locatable
{
@@ -45,14 +45,14 @@
* <p/>
* This value is often used to obtain an equivalent component instance in a later request.
*
- * @see org.apache.tapestry.services.ComponentSource#getComponent(String)
+ * @see org.apache.tapestry5.services.ComponentSource#getComponent(String)
*/
String getCompleteId();
/**
* A convienience for invoking {@link #triggerContextEvent(String, EventContext , ComponentEventCallback)}. Wraps
- * the context values into an {@link org.apache.tapestry.EventContext}.
+ * the context values into an {@link org.apache.tapestry5.EventContext}.
*
* @param eventType event type (as determined from the request, or otherwise by design)
* @param context Values that may be provided to the event handler method as method parameters, or null if no
@@ -61,10 +61,10 @@
* support return values from event handler methods (the value true is allowed even if the handler
* is null).
* @return true if any event handler was invoked (even if no event handler method returns a non-null value)
- * @throws org.apache.tapestry.runtime.ComponentEventException
+ * @throws org.apache.tapestry5.runtime.ComponentEventException
* if an event handler method throws a checked or unchecked exception
- * @see org.apache.tapestry.internal.transform.OnEventWorker
- * @see org.apache.tapestry.annotation.OnEvent
+ * @see org.apache.tapestry5.internal.transform.OnEventWorker
+ * @see org.apache.tapestry5.annotations.OnEvent
*/
boolean triggerEvent(String eventType, Object[] contextValues, ComponentEventCallback callback);
@@ -83,10 +83,10 @@
* support return values from event handler methods (the value true is allowed even if the handler
* is null).
* @return true if any event handler was invoked (even if no event handler method returns a non-null value)
- * @throws org.apache.tapestry.runtime.ComponentEventException
+ * @throws org.apache.tapestry5.runtime.ComponentEventException
* if an event handler method throws a checked or unchecked exception
- * @see org.apache.tapestry.internal.transform.OnEventWorker
- * @see org.apache.tapestry.annotation.OnEvent
+ * @see org.apache.tapestry5.internal.transform.OnEventWorker
+ * @see org.apache.tapestry5.annotations.OnEvent
*/
boolean triggerContextEvent(String eventType, EventContext context, ComponentEventCallback callback);
@@ -99,7 +99,7 @@
/**
* Returns the log instance associated with the component (which is based on the component or mixin's class name).
*
- * @see org.apache.tapestry.model.ComponentModel#getLogger()
+ * @see org.apache.tapestry5.model.ComponentModel#getLogger()
*/
Logger getLogger();
View
8 tapestry-core/src/main/java/org/apache/tapestry5/ContentType.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import java.util.List;
import java.util.Map;
View
2 tapestry-core/src/main/java/org/apache/tapestry5/EventConstants.java
@@ -1,4 +1,4 @@
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
* Constant values for common event names fired by Tapestry components.
View
6 tapestry-core/src/main/java/org/apache/tapestry5/EventContext.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
* A collection of parameters that may eventually be passed to an event handler method. Includes the ability to coerce
* or encode parameters as needed.
*
- * @see org.apache.tapestry.ioc.services.TypeCoercer
- * @see org.apache.tapestry.ValueEncoder
+ * @see org.apache.tapestry5.ioc.services.TypeCoercer
+ * @see org.apache.tapestry5.ValueEncoder
*/
public interface EventContext
{
View
10 tapestry-core/src/main/java/org/apache/tapestry5/Field.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
* Defines a field within a form. Fields have a <a href="http://www.w3.org/TR/html4/interact/forms.html#control-name">control
@@ -20,7 +20,7 @@
* <p/>
* Timing is important, as components may render multiple times, due to looping and other factors. Generally, a
* component's {@link #getControlName()} will only be accurate after it has rendered. In some cases, when generating
- * JavaScript for example, it is necessary to {@linkplain org.apache.tapestry.services.Heartbeat#defer(Runnable) wait
+ * JavaScript for example, it is necessary to {@linkplain org.apache.tapestry5.services.Heartbeat#defer(Runnable) wait
* until the end of the current Heartbeat} to ensure that all components have had thier chance to render.
*/
public interface Field extends ClientElement
@@ -29,7 +29,7 @@
* Returns the value used as the name attribute of the rendered element. This value will be unique within an
* enclosing form, even if the same component renders multiple times.
*
- * @see org.apache.tapestry.services.FormSupport#allocateControlName(String)
+ * @see org.apache.tapestry5.services.FormSupport#allocateControlName(String)
*/
String getControlName();
@@ -38,7 +38,7 @@
* the client, and inside client or server-side validation error messages.
*
* @return the label
- * @see org.apache.tapestry.corelib.components.Label
+ * @see org.apache.tapestry5.corelib.components.Label
*/
String getLabel();
@@ -52,7 +52,7 @@
boolean isDisabled();
/**
- * Returns true if this field required (as per {@link org.apache.tapestry.FieldValidator#isRequired()}).
+ * Returns true if this field required (as per {@link org.apache.tapestry5.FieldValidator#isRequired()}).
*
* @return true if a non-blank value is required for the field
*/
View
20 tapestry-core/src/main/java/org/apache/tapestry5/FieldValidationSupport.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
- * Services to help with field {@linkplain org.apache.tapestry.Validator validation} and {@linkplain
- * org.apache.tapestry.Translator translation}. This service encapsulates the logic that mixes normal
+ * Services to help with field {@linkplain org.apache.tapestry5.Validator validation} and {@linkplain
+ * org.apache.tapestry5.Translator translation}. This service encapsulates the logic that mixes normal
* configured/declared validation/translation with events triggered on the component.
*/
public interface FieldValidationSupport
{
/**
- * A wrapper around {@link org.apache.tapestry.Translator#toClient(Object)} that first fires a "toclient" event on
+ * A wrapper around {@link org.apache.tapestry5.Translator#toClient(Object)} that first fires a "toclient" event on
* the component to see if it can perform the conversion. If the value is null, then no event is fired and the
* translator is <em>not</em> invoked, the return value is simply null.
*
@@ -31,13 +31,13 @@
* @param translator used if the component does not provide a non-null value
* @param nullFieldStrategy used to convert a null server side value to an appropriate client side value
* @return the translated value or null if the value is null
- * @see org.apache.tapestry.Translator#toClient(Object)
+ * @see org.apache.tapestry5.Translator#toClient(Object)
*/
String toClient(Object value, ComponentResources componentResources, Translator translator,
NullFieldStrategy nullFieldStrategy);
/**
- * A wrapper around {@link org.apache.tapestry.Translator#parseClient(String, org.apache.tapestry.ioc.Messages)}.
+ * A wrapper around {@link org.apache.tapestry5.Translator#parseClient(String, org.apache.tapestry5.ioc.Messages)}.
* First a "parseclient" event is fired; the translator is only invoked if that returns null (typically because
* there is not handler for the event).
*
@@ -46,9 +46,9 @@ String toClient(Object value, ComponentResources componentResources, Translator
* @param translator translator that will do the work if the component event returns null
* @param nullFieldStrategy used to convert null/blank values from client into non-null server side values
* @return the input parsed to an object
- * @throws org.apache.tapestry.ValidationException
+ * @throws org.apache.tapestry5.ValidationException
* if the value can't be parsed
- * @see org.apache.tapestry.Translator#parseClient(String, org.apache.tapestry.ioc.Messages)
+ * @see org.apache.tapestry5.Translator#parseClient(String, org.apache.tapestry5.ioc.Messages)
*/
Object parseClient(String clientValue, ComponentResources componentResources, Translator translator,
NullFieldStrategy nullFieldStrategy)
@@ -62,8 +62,8 @@ Object parseClient(String clientValue, ComponentResources componentResources, Tr
* @param componentResources used to trigger events
* @param validator performs normal validations
* @throws ValidationException if the value is not valid
- * @see org.apache.tapestry.Validator#validate(Field, Object, org.apache.tapestry.ioc.MessageFormatter, Object)
+ * @see org.apache.tapestry5.Validator#validate(Field, Object, org.apache.tapestry5.ioc.MessageFormatter, Object)
*/
void validate(Object value, ComponentResources componentResources, FieldValidator validator)
throws ValidationException;
-}
+}
View
16 tapestry-core/src/main/java/org/apache/tapestry5/FieldValidator.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
* Responsible for validation of a single field.
*
* @param <T>
* @see Validator
- * @see org.apache.tapestry.services.FieldValidatorDefaultSource
+ * @see org.apache.tapestry5.services.FieldValidatorDefaultSource
*/
public interface FieldValidator<T>
{
@@ -34,19 +34,19 @@
void validate(T value) throws ValidationException;
/**
- * Invokes {@link Validator#render(Field, Object, org.apache.tapestry.ioc.MessageFormatter, MarkupWriter,
- * org.apache.tapestry.services.FormSupport)}. This is called at a point "inside" the tag, so that additional
- * attributes may be added. In many cases, the underlying {@link org.apache.tapestry.Validator} may write
+ * Invokes {@link Validator#render(Field, Object, org.apache.tapestry5.ioc.MessageFormatter, MarkupWriter,
+ * org.apache.tapestry5.services.FormSupport)}. This is called at a point "inside" the tag, so that additional
+ * attributes may be added. In many cases, the underlying {@link org.apache.tapestry5.Validator} may write
* client-side JavaScript to enforce the constraint as well.
*
* @param writer markup writer to direct output to.
- * @see org.apache.tapestry.MarkupWriter#attributes(Object[])
+ * @see org.apache.tapestry5.MarkupWriter#attributes(Object[])
*/
void render(MarkupWriter writer);
/**
- * Returns true if any underlying {@link org.apache.tapestry.Validator} returns true from {@link
- * org.apache.tapestry.Validator#isRequired()}.
+ * Returns true if any underlying {@link org.apache.tapestry5.Validator} returns true from {@link
+ * org.apache.tapestry5.Validator#isRequired()}.
*
* @return true if the field is required (a non-blank value is expected)
*/
View
4 tapestry-core/src/main/java/org/apache/tapestry5/FormValidationControl.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
* Allows control over validation concerns of a Form component.
@@ -46,4 +46,4 @@
*/
public abstract void clearErrors();
-}
+}
View
4 tapestry-core/src/main/java/org/apache/tapestry5/Link.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
import org.apache.commons.codec.net.URLCodec;
@@ -21,7 +21,7 @@
/**
* A link is the Tapestry representation of a URL or URI that triggers dynamic behavior. This link is in three parts: a
* path portion, an optional anchor, and a set of query parameters. A request for a link will ultimately be recognized
- * by a {@link org.apache.tapestry.services.Dispatcher}.
+ * by a {@link org.apache.tapestry5.services.Dispatcher}.
* <p/>
* Query parameter values are kept separate from the path portion to support encoding those values into hidden form
* fields (where appropriate).
View
4 tapestry-core/src/main/java/org/apache/tapestry5/MarkupUtils.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import java.util.Collections;
import java.util.List;
View
10 tapestry-core/src/main/java/org/apache/tapestry5/MarkupWriter.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.dom.MarkupModel;
-import org.apache.tapestry.dom.Raw;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.dom.MarkupModel;
+import org.apache.tapestry5.dom.Raw;
import java.io.PrintWriter;
View
6 tapestry-core/src/main/java/org/apache/tapestry5/MarkupWriterAdapter.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.dom.Element;
+import org.apache.tapestry5.dom.Element;
/**
- * Default, empty implementation of {@link org.apache.tapestry.MarkupWriterListener}.
+ * Default, empty implementation of {@link org.apache.tapestry5.MarkupWriterListener}.
*/
public class MarkupWriterAdapter implements MarkupWriterListener
{
View
10 tapestry-core/src/main/java/org/apache/tapestry5/MarkupWriterListener.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.dom.Element;
+import org.apache.tapestry5.dom.Element;
/**
@@ -26,8 +26,8 @@
* Invoked just after an element and its initial set of attributes has been written.
*
* @param element element just created and populated with attributes
- * @see org.apache.tapestry.MarkupWriter#element(String, Object[])
- * @see org.apache.tapestry.MarkupWriter#elementNS(String, String)
+ * @see org.apache.tapestry5.MarkupWriter#element(String, Object[])
+ * @see org.apache.tapestry5.MarkupWriter#elementNS(String, String)
*/
void elementDidStart(Element element);
@@ -35,7 +35,7 @@
* Invoked just after an element has ended.
*
* @param element just ended
- * @see org.apache.tapestry.MarkupWriter#end()
+ * @see org.apache.tapestry5.MarkupWriter#end()
*/
void elementDidEnd(Element element);
}
View