Merge branch 'wicket-cdi-1.1-rewrite' into wicket-6.x
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4824b031 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4824b031 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4824b031 Branch: refs/heads/wicket-6.x Commit: 4824b031d8389d7b43ed1c1f6e8173f87114cabd Parents: 01de4f3 df4b336 Author: Emond Papegaaij <[email protected]> Authored: Fri Nov 22 09:42:07 2013 +0100 Committer: Emond Papegaaij <[email protected]> Committed: Fri Nov 22 09:42:07 2013 +0100 ---------------------------------------------------------------------- wicket-experimental/wicket-cdi-1.1/pom.xml | 36 +- .../org/apache/wicket/cdi/AbstractInjector.java | 39 ++ .../org/apache/wicket/cdi/AutoConversation.java | 51 ++ .../apache/wicket/cdi/BeanManagerLookup.java | 40 ++ .../org/apache/wicket/cdi/BehaviorInjector.java | 42 ++ .../org/apache/wicket/cdi/CdiConfiguration.java | 101 ++++ .../apache/wicket/cdi/CdiShutdownCleaner.java | 45 ++ .../apache/wicket/cdi/ComponentInjector.java | 43 ++ .../cdi/ConversationExpiredException.java | 52 ++ .../wicket/cdi/ConversationExpiryChecker.java | 68 +++ .../wicket/cdi/ConversationPropagation.java | 62 +++ .../wicket/cdi/ConversationPropagator.java | 347 +++++++++++++ .../wicket/cdi/ConversationalComponent.java | 30 ++ .../java/org/apache/wicket/cdi/DetachEvent.java | 28 + .../apache/wicket/cdi/DetachEventEmitter.java | 75 +++ .../cdi/ICdiAwareRequestCycleListener.java | 39 ++ .../wicket/cdi/IConversationPropagation.java | 46 ++ .../org/apache/wicket/cdi/NonContextual.java | 154 ++++++ .../org/apache/wicket/cdi/SessionInjector.java | 42 ++ .../src/main/resources/META-INF/beans.xml | 4 + .../java/org/apache/wicket/WicketTestCase.java | 161 ++++++ .../wicket/cdi/ApacheLicenceHeaderTest.java | 41 ++ .../apache/wicket/cdi/CdiConfigurationTest.java | 68 +++ .../wicket/cdi/ConversationPropagatorTest.java | 199 +++++++ .../apache/wicket/cdi/WicketCdiTestCase.java | 67 +++ .../apache/wicket/cdi/testapp/TestAppScope.java | 40 ++ .../wicket/cdi/testapp/TestApplication.java | 39 ++ .../wicket/cdi/testapp/TestCdiApplication.java | 54 ++ .../cdi/testapp/TestConversationBean.java | 51 ++ .../cdi/testapp/TestConversationPage.html | 12 + .../cdi/testapp/TestConversationPage.java | 89 ++++ .../cdi/testapp/TestConversationalPage.html | 12 + .../cdi/testapp/TestConversationalPage.java | 82 +++ .../testapp/TestNonAutoConversationalPage.html | 12 + .../testapp/TestNonAutoConversationalPage.java | 88 ++++ .../cdi/testapp/TestNonConversationalPage.html | 11 + .../cdi/testapp/TestNonConversationalPage.java | 59 +++ .../org/apache/wicket/cdi/testapp/TestPage.html | 10 + .../org/apache/wicket/cdi/testapp/TestPage.java | 40 ++ .../wicket/cdi/testapp/TestQualifier.java | 35 ++ .../wicket/cdi/util/tester/CdiWicketTester.java | 122 +++++ .../wicket/cdi/util/tester/ContextManager.java | 105 ++++ .../src/test/java/simplelogger.properties | 1 + .../wicket-cdi-1.1/wicket-cdi-1.1-core/pom.xml | 58 --- .../apache/wicket/cdi/AbstractCdiContainer.java | 84 --- .../org/apache/wicket/cdi/AbstractInjector.java | 43 -- .../apache/wicket/cdi/ApplicationQualifier.java | 45 -- .../main/java/org/apache/wicket/cdi/Auto.java | 37 -- .../apache/wicket/cdi/BeanManagerLookup.java | 43 -- .../org/apache/wicket/cdi/BehaviorInjector.java | 40 -- .../org/apache/wicket/cdi/CdiConfiguration.java | 514 ------------------- .../apache/wicket/cdi/CdiShutdownCleaner.java | 53 -- .../wicket/cdi/CdiWebApplicationFactory.java | 207 -------- .../org/apache/wicket/cdi/CdiWicketFilter.java | 49 -- .../apache/wicket/cdi/ComponentInjector.java | 40 -- .../wicket/cdi/ConfigurationParameters.java | 149 ------ .../cdi/ConversationExpiredException.java | 53 -- .../wicket/cdi/ConversationExpiryChecker.java | 74 --- .../wicket/cdi/ConversationIdMetaKey.java | 26 - .../apache/wicket/cdi/ConversationManager.java | 124 ----- .../wicket/cdi/ConversationPropagation.java | 79 --- .../wicket/cdi/ConversationPropagator.java | 505 ------------------ .../org/apache/wicket/cdi/Conversational.java | 40 -- .../wicket/cdi/ConversationalComponent.java | 33 -- .../java/org/apache/wicket/cdi/DetachEvent.java | 27 - .../apache/wicket/cdi/DetachEventEmitter.java | 80 --- .../wicket/cdi/IConversationPropagation.java | 55 -- .../wicket/cdi/INonContextualManager.java | 56 -- .../org/apache/wicket/cdi/NonContextual.java | 154 ------ .../apache/wicket/cdi/NonContextualManager.java | 74 --- .../java/org/apache/wicket/cdi/Propagation.java | 36 -- .../org/apache/wicket/cdi/SessionInjector.java | 37 -- .../java/org/apache/wicket/cdi/WicketApp.java | 50 -- .../src/main/resources/META-INF/beans.xml | 0 .../wicket/cdi/ApacheLicenceHeaderTest.java | 41 -- .../apache/wicket/cdi/CdiConfigurationTest.java | 247 --------- .../wicket/cdi/ConversationManagerTest.java | 97 ---- .../wicket/cdi/ConversationPropagatorTest.java | 210 -------- .../org/apache/wicket/cdi/MockCdiContainer.java | 68 --- .../apache/wicket/cdi/WicketCdiTestCase.java | 121 ----- .../apache/wicket/cdi/testapp/TestAppScope.java | 40 -- .../wicket/cdi/testapp/TestApplication.java | 47 -- .../cdi/testapp/TestCdiAdditionApplication.java | 58 --- .../wicket/cdi/testapp/TestCdiApplication.java | 58 --- .../cdi/testapp/TestConversationBean.java | 51 -- .../cdi/testapp/TestConversationPage.html | 12 - .../cdi/testapp/TestConversationPage.java | 89 ---- .../cdi/testapp/TestConversationalPage.html | 12 - .../cdi/testapp/TestConversationalPage.java | 84 --- .../testapp/TestNonAutoConversationalPage.html | 12 - .../testapp/TestNonAutoConversationalPage.java | 92 ---- .../cdi/testapp/TestNonConversationalPage.html | 11 - .../cdi/testapp/TestNonConversationalPage.java | 59 --- .../org/apache/wicket/cdi/testapp/TestPage.html | 10 - .../org/apache/wicket/cdi/testapp/TestPage.java | 40 -- .../wicket/cdi/testapp/TestQualifier.java | 35 -- .../wicket/cdi/util/tester/CdiWicketTester.java | 144 ------ .../cdi/util/tester/ConfigurationFilter.java | 37 -- .../wicket/cdi/util/tester/ContextManager.java | 100 ---- .../cdi/util/tester/FilterConfigProducer.java | 62 --- .../cdi/util/tester/TestBehaviorInjector.java | 51 -- .../cdi/util/tester/TestCdiConfiguration.java | 75 --- .../cdi/util/tester/TestComponentInjector.java | 51 -- .../cdi/util/tester/TestFilterConfig.java | 89 ---- .../src/test/java/simplelogger.properties | 1 - .../wicket-cdi-1.1/wicket-cdi-1.1-weld/pom.xml | 88 ---- .../wicket/cdi/weld/WeldCdiContainer.java | 67 --- .../src/main/resources/META-INF/beans.xml | 0 .../cdi/weld/ApacheLicenceHeaderTest.java | 41 -- 109 files changed, 2735 insertions(+), 5172 deletions(-) ----------------------------------------------------------------------
