Updated Branches: refs/heads/master ab326605b -> d88d78e1c
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/wicket Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d88d78e1 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d88d78e1 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d88d78e1 Branch: refs/heads/master Commit: d88d78e1cee31fc49ac3691eed1eda30e0fe4ab6 Parents: e5ed953 ab32660 Author: Igor Vaynberg <[email protected]> Authored: Wed Feb 8 18:36:19 2012 -0800 Committer: Igor Vaynberg <[email protected]> Committed: Wed Feb 8 18:36:19 2012 -0800 ---------------------------------------------------------------------- .../AnnotationsRoleAuthorizationStrategy.java | 4 +- .../src/main/java/org/apache/wicket/Component.java | 118 +- .../java/org/apache/wicket/MarkupContainer.java | 2 +- .../java/org/apache/wicket/ResourceBundles.java | 16 +- .../src/main/java/org/apache/wicket/Session.java | 29 +- .../wicket/ajax/AbstractDefaultAjaxBehavior.java | 58 +- .../WicketAjaxDebugJQueryResourceReference.java | 2 +- .../wicket/ajax/res/js/wicket-ajax-jquery.js | 42 +- .../behavior/InvalidBehaviorIdException.java | 12 +- .../DefaultCleanupFeedbackMessageFilter.java | 35 + .../apache/wicket/feedback/FeedbackCollector.java | 135 ++ .../apache/wicket/feedback/FeedbackMessages.java | 112 +- .../wicket/feedback/FeedbackMessagesModel.java | 14 +- .../wicket/feedback/IFeedbackMessageFilter.java | 14 + .../java/org/apache/wicket/markup/MarkupCache.java | 11 +- .../org/apache/wicket/markup/MarkupFactory.java | 17 +- .../apache/wicket/markup/MarkupResourceStream.java | 14 +- .../apache/wicket/markup/head/IHeaderResponse.java | 1 - .../head/filter/FilteringHeaderResponse.java | 15 +- .../head/filter/HeaderResponseContainer.java | 2 +- .../org/apache/wicket/markup/html/form/Form.java | 2 +- .../wicket/markup/html/form/FormComponent.java | 9 + .../validation/FormComponentFeedbackBorder.java | 4 +- .../validation/FormComponentFeedbackIndicator.java | 5 +- .../markup/html/internal/HtmlHeaderContainer.java | 4 +- .../wicket/markup/html/tree/AbstractTree.java | 1766 -------------- .../apache/wicket/markup/html/tree/BaseTree.html | 23 - .../apache/wicket/markup/html/tree/BaseTree.java | 477 ---- .../wicket/markup/html/tree/DefaultTreeState.java | 297 --- .../apache/wicket/markup/html/tree/ITreeState.java | 127 - .../markup/html/tree/ITreeStateListener.java | 68 - .../wicket/markup/html/tree/LabelIconPanel.html | 20 - .../wicket/markup/html/tree/LabelIconPanel.java | 188 -- .../apache/wicket/markup/html/tree/LabelTree.java | 109 - .../wicket/markup/html/tree/LinkIconPanel.html | 20 - .../wicket/markup/html/tree/LinkIconPanel.java | 89 - .../apache/wicket/markup/html/tree/LinkTree.java | 110 - .../apache/wicket/markup/html/tree/LinkType.java | 62 - .../wicket/markup/html/tree/WicketTreeModel.java | 55 - .../apache/wicket/markup/html/tree/package.html | 27 - .../markup/html/tree/res/base-tree-images.png | Bin 969 -> 0 bytes .../wicket/markup/html/tree/res/base-tree.css | 131 -- .../wicket/markup/html/tree/res/folder-closed.gif | Bin 372 -> 0 bytes .../wicket/markup/html/tree/res/folder-open.gif | Bin 376 -> 0 bytes .../apache/wicket/markup/html/tree/res/item.gif | Bin 582 -> 0 bytes .../org/apache/wicket/markup/html/tree/res/tree.js | 179 -- .../markup/loader/InheritedMarkupMarkupLoader.java | 4 +- .../parser/filter/RelativePathPrefixHandler.java | 1 - .../AbstractHeaderRenderStrategy.java | 11 +- .../XsltOutputTransformerContainer.java | 12 +- .../org/apache/wicket/pageStore/DiskDataStore.java | 43 +- .../apache/wicket/protocol/http/WebSession.java | 62 - .../protocol/http/mock/MockHttpServletRequest.java | 16 +- .../apache/wicket/request/cycle/RequestCycle.java | 46 +- .../request/mapper/AbstractBookmarkableMapper.java | 5 + .../apache/wicket/resource/PropertiesFactory.java | 2 +- .../resource/bundles/ResourceBundleReference.java | 6 +- .../apache/wicket/session/DefaultPageFactory.java | 8 +- .../wicket/settings/IApplicationSettings.java | 18 + .../wicket/settings/IRequestCycleSettings.java | 17 +- .../wicket/settings/def/ApplicationSettings.java | 18 + .../wicket/settings/def/RequestCycleSettings.java | 25 +- .../wicket/util/file/WebApplicationPath.java | 47 +- .../util/resource/WebExternalResourceStream.java | 10 +- .../locator/ExtensionResourceNameIterator.java | 24 +- .../resource/locator/IResourceStreamLocator.java | 2 +- .../wicket/util/tester/BaseWicketTester.java | 88 +- .../org/apache/wicket/util/tester/FormTester.java | 2 +- .../org/apache/wicket/util/tester/TagTester.java | 2 - .../org/apache/wicket/FeedbackMessagesTest.java | 6 +- .../head/filter/FilteringHeaderResponseTest.java | 88 + .../html/form/LocalizedErrorMessageTest.java | 4 +- .../markup/html/form/ValidatorPropertiesTest.java | 112 +- .../form/feedback/FeedbackFormPage_result2.html | 2 +- .../form/validation/FormValidatorBehaviorTest.java | 27 +- .../innerfeedback/LocalizedFeedbackBorder.java | 13 +- .../apache/wicket/markup/html/tree/TreeTest.java | 144 -- .../wicket/markup/outputTransformer/Page_1.java | 16 +- .../apache/wicket/request/mapper/UrlInfoTest.java | 2 +- .../resource/locator/ResourceNameIteratorTest.java | 63 +- .../wicket/util/tester/WicketTesterTest.java | 2 +- .../wicket/util/tester/apps_4/FormTesterTest.java | 14 +- .../wicket/validation/ValidatorBehaviorTest.java | 27 +- wicket-core/src/test/js/ajax.js | 144 +- wicket-core/src/test/js/event.js | 22 + wicket-core/src/test/js/head.js | 3 +- .../wicket/devutils/diskstore/PageWindowModel.java | 2 +- .../apache/wicket/examples/ajax/builtin/Index.html | 2 - .../examples/ajax/builtin/tree/BaseTreePage.java | 9 +- .../ajax/builtin/tree/EditableTreeTablePage.java | 3 +- .../examples/ajax/builtin/tree/SimpleTreePage.java | 7 +- .../examples/ajax/builtin/tree/TreeTablePage.java | 3 +- .../apache/wicket/examples/compref/MyPanel.html | 7 +- .../apache/wicket/examples/compref/MyPanel.java | 21 + .../apache/wicket/examples/compref/PanelPage.html | 9 +- .../wicket/examples/compref/RecursivePanel.html | 12 + .../wicket/examples/compref/RecursivePanel.java | 112 + .../org/apache/wicket/examples/nested/Home.html | 26 - .../org/apache/wicket/examples/nested/Home.java | 150 -- .../wicket/examples/nested/NestedApplication.java | 56 - .../wicket/examples/nested/RecursivePanel.html | 12 - .../wicket/examples/nested/RecursivePanel.java | 112 - .../java/org/apache/wicket/examples/tree/Foo.java | 137 ++ .../org/apache/wicket/examples/tree/FooPanel.html | 51 + .../org/apache/wicket/examples/tree/FooPanel.java | 40 + .../apache/wicket/examples/tree/FooProvider.java | 129 ++ .../apache/wicket/examples/tree/InverseSet.java | 143 ++ .../wicket/examples/tree/NestedTreePage.html | 38 + .../wicket/examples/tree/NestedTreePage.java | 51 + .../apache/wicket/examples/tree/TableTreePage.html | 46 + .../apache/wicket/examples/tree/TableTreePage.java | 108 + .../wicket/examples/tree/TreeApplication.java | 134 ++ .../org/apache/wicket/examples/tree/TreePage.html | 57 + .../org/apache/wicket/examples/tree/TreePage.java | 235 ++ .../wicket/examples/tree/TreePage.properties | 15 + .../tree/content/BookmarkableFolderContent.java | 77 + .../tree/content/CheckedFolderContent.java | 96 + .../content/CheckedSelectableFolderContent.java | 90 + .../wicket/examples/tree/content/Content.java | 45 + .../tree/content/EditableFolderContent.java | 91 + .../examples/tree/content/FolderContent.java | 38 + .../wicket/examples/tree/content/LabelContent.java | 38 + .../wicket/examples/tree/content/MixedContent.java | 49 + .../tree/content/MultiLineLabelContent.java | 49 + .../tree/content/MultiSelectableFolderContent.java | 97 + .../wicket/examples/tree/content/PanelContent.java | 38 + .../tree/content/SelectableFolderContent.java | 111 + .../apache/wicket/examples/homepage/HomePage.html | 2 +- wicket-examples/src/main/webapp/WEB-INF/web.xml | 32 +- wicket-examples/src/main/webapp/style.css | 5 + .../wicket/examples/tree/InverseSetTest.java | 77 + .../ajax/markup/html/AjaxEditableLabel.java | 71 +- .../markup/html/repeater/data/table/DataTable.java | 12 +- .../markup/html/repeater/tree/AbstractTree.java | 347 +++ .../html/repeater/tree/DefaultNestedTree.java | 55 + .../html/repeater/tree/DefaultTableTree.java | 75 + .../html/repeater/tree/ISortableTreeProvider.java | 30 + .../markup/html/repeater/tree/ITreeProvider.java | 78 + .../markup/html/repeater/tree/NestedTree.html | 20 + .../markup/html/repeater/tree/NestedTree.java | 122 + .../extensions/markup/html/repeater/tree/Node.html | 27 + .../extensions/markup/html/repeater/tree/Node.java | 213 ++ .../markup/html/repeater/tree/TableTree.html | 20 + .../markup/html/repeater/tree/TableTree.java | 226 ++ .../html/repeater/tree/content/CheckFolder.html | 35 + .../html/repeater/tree/content/CheckFolder.java | 40 + .../html/repeater/tree/content/CheckedFolder.html | 35 + .../html/repeater/tree/content/CheckedFolder.java | 92 + .../markup/html/repeater/tree/content/Folder.java | 157 ++ .../repeater/tree/content/StyledLinkLabel.html | 33 + .../repeater/tree/content/StyledLinkLabel.java | 166 ++ .../html/repeater/tree/nested/BranchItem.java | 61 + .../markup/html/repeater/tree/nested/Subtree.html | 34 + .../markup/html/repeater/tree/nested/Subtree.java | 171 ++ .../repeater/tree/table/AbstractTreeColumn.java | 50 + .../html/repeater/tree/table/ITreeColumn.java | 28 + .../repeater/tree/table/ITreeDataProvider.java | 34 + .../html/repeater/tree/table/NodeBorder.java | 85 + .../markup/html/repeater/tree/table/NodeModel.java | 96 + .../html/repeater/tree/table/TreeColumn.java | 61 + .../html/repeater/tree/table/TreeDataProvider.java | 194 ++ .../html/repeater/tree/theme/HumanTheme.java | 48 + .../html/repeater/tree/theme/WindowsTheme.java | 48 + .../repeater/tree/theme/human/folder-other.gif | Bin 0 -> 1069 bytes .../html/repeater/tree/theme/human/folder.gif | Bin 0 -> 579 bytes .../html/repeater/tree/theme/human/theme.css | 126 + .../markup/html/repeater/tree/theme/human/tree.gif | Bin 0 -> 213 bytes .../repeater/tree/theme/windows/folder-closed.gif | Bin 0 -> 372 bytes .../repeater/tree/theme/windows/folder-open.gif | Bin 0 -> 376 bytes .../repeater/tree/theme/windows/folder-other.gif | Bin 0 -> 582 bytes .../html/repeater/tree/theme/windows/theme.css | 126 + .../html/repeater/tree/theme/windows/tree.gif | Bin 0 -> 3747 bytes .../markup/html/repeater/util/ProviderSubset.java | 242 ++ .../html/repeater/util/SortableTreeProvider.java | 95 + .../html/repeater/util/TreeModelProvider.java | 258 +++ .../extensions/markup/html/tree/AbstractTree.java | 1767 +++++++++++++++ .../extensions/markup/html/tree/BaseTree.html | 23 + .../extensions/markup/html/tree/BaseTree.java | 478 ++++ .../markup/html/tree/DefaultAbstractTree.java | 4 +- .../markup/html/tree/DefaultTreeState.java | 297 +++ .../extensions/markup/html/tree/ITreeState.java | 128 ++ .../markup/html/tree/ITreeStateListener.java | 69 + .../markup/html/tree/LabelIconPanel.html | 20 + .../markup/html/tree/LabelIconPanel.java | 188 ++ .../extensions/markup/html/tree/LabelTree.java | 110 + .../extensions/markup/html/tree/LinkIconPanel.html | 20 + .../extensions/markup/html/tree/LinkIconPanel.java | 89 + .../extensions/markup/html/tree/LinkTree.java | 111 + .../extensions/markup/html/tree/LinkType.java | 62 + .../wicket/extensions/markup/html/tree/Tree.java | 1 + .../markup/html/tree/WicketTreeModel.java | 56 + .../extensions/markup/html/tree/package.html | 27 + .../markup/html/tree/res/base-tree-images.png | Bin 0 -> 969 bytes .../extensions/markup/html/tree/res/base-tree.css | 131 ++ .../wicket/extensions/markup/html/tree/res/tree.js | 179 ++ .../markup/html/tree/table/TreeTable.java | 9 +- .../html/repeater/tree/table/NodeModelTest.java | 87 + .../repeater/tree/table/TreeDataProviderTest.java | 128 ++ .../html/repeater/util/ProviderSubsetTest.java | 171 ++ .../html/repeater/util/TreeModelProviderTest.java | 156 ++ .../extensions/markup/html/tree/TreeTest.java | 146 ++ .../main/java/org/apache/wicket/request/Url.java | 3 - .../request/mapper/CompoundRequestMapper.java | 53 +- .../java/org/apache/wicket/util/file/Path.java | 4 +- .../wicket/util/resource/ZipResourceStream.java | 25 +- 205 files changed, 11467 insertions(+), 4931 deletions(-) ----------------------------------------------------------------------
