Removed AutoConversation. Added newlines at end of files missing them Replaced with Producer method in cdiConfiguration.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/42d85ea4 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/42d85ea4 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/42d85ea4 Branch: refs/heads/master Commit: 42d85ea4fa0e9b6b824e02d1a69d68a94e56bfc6 Parents: 8b68cc7 Author: John Sarman <[email protected]> Authored: Wed Jun 26 17:21:05 2013 -0400 Committer: John Sarman <[email protected]> Committed: Wed Jun 26 17:21:05 2013 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/wicket/cdi/Auto.java | 3 ++- .../wicket/cdi/ConversationIdMetaKey.java | 2 +- .../wicket/cdi/ConversationPropagator.java | 22 +++++++------------- .../java/org/apache/wicket/cdi/IgnoreList.java | 3 ++- .../org/apache/wicket/cdi/NonContextual.java | 2 +- 5 files changed, 14 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/42d85ea4/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/Auto.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/Auto.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/Auto.java index 5157a40..65a7abf 100644 --- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/Auto.java +++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/Auto.java @@ -33,4 +33,5 @@ import javax.inject.Qualifier; @Retention(RetentionPolicy.RUNTIME) public @interface Auto { -} \ No newline at end of file + +} http://git-wip-us.apache.org/repos/asf/wicket/blob/42d85ea4/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationIdMetaKey.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationIdMetaKey.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationIdMetaKey.java index 72a3d1f..94874c8 100644 --- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationIdMetaKey.java +++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationIdMetaKey.java @@ -21,4 +21,4 @@ import org.apache.wicket.MetaDataKey; final class ConversationIdMetaKey extends MetaDataKey<String> { static final ConversationIdMetaKey INSTANCE = new ConversationIdMetaKey(); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/42d85ea4/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java index 6003328..e5d2b0f 100644 --- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java +++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java @@ -69,7 +69,7 @@ public class ConversationPropagator extends AbstractRequestCycleListener impleme static final String CID_ATTR = "cid"; @Inject - AbstractCdiContainer container; + Instance<AbstractCdiContainer> containerSource; /** propagation mode to use */ @Propagation @@ -78,14 +78,11 @@ public class ConversationPropagator extends AbstractRequestCycleListener impleme @Auto @Inject - private boolean auto; + Instance<Boolean> auto; @Inject Conversation conversation_; - @Inject - AutoConversation autoConversation; - /** * Constructor * @@ -135,7 +132,7 @@ public class ConversationPropagator extends AbstractRequestCycleListener impleme IRequestablePage requestable = ((StalePageException)ex).getPage(); if (requestable instanceof Page) { - String cid = container.getConversationMarker((Page)requestable); + String cid = containerSource.get().getConversationMarker((Page)requestable); if (cid != null) { try @@ -169,7 +166,7 @@ public class ConversationPropagator extends AbstractRequestCycleListener impleme try { - container.activateConversationalContext(cycle, cid); + containerSource.get().activateConversationalContext(cycle, cid); fireOnAfterConversationStarted(cycle); } catch (NonexistentConversationException e) @@ -324,7 +321,7 @@ public class ConversationPropagator extends AbstractRequestCycleListener impleme ((ICdiAwareRequestCycleListener)listener).onBeforeConversationDeactivated(cycle); } } - container.deactivateConversationalContext(cycle); + containerSource.get().deactivateConversationalContext(cycle); cycle.setMetaData(CONVERSATION_STARTED_KEY, null); } @@ -354,7 +351,7 @@ public class ConversationPropagator extends AbstractRequestCycleListener impleme protected void autoBeginIfNecessary(Page page, IRequestHandler handler, Conversation conversation) { - if (!auto || conversation == null || !conversation.isTransient() || page == null || + if (!auto.get() || conversation == null || !conversation.isTransient() || page == null || !propagationSource.get().propagatesViaPage(page, handler) || !hasConversationalComponent(page)) { return; @@ -363,16 +360,14 @@ public class ConversationPropagator extends AbstractRequestCycleListener impleme // auto activate conversation conversation.begin(); - autoConversation.setAutomatic(true); logger.debug("Auto-began conversation {} for page {}", conversation.getId(), page); } protected void autoEndIfNecessary(Page page, IRequestHandler handler, Conversation conversation) { - if (!auto || conversation == null || conversation.isTransient() || page == null || - !propagationSource.get().propagatesViaPage(page, handler) || hasConversationalComponent(page) || - autoConversation.isAutomatic() == false) + if (!auto.get() || conversation == null || conversation.isTransient() || page == null || + !propagationSource.get().propagatesViaPage(page, handler) || hasConversationalComponent(page)) { return; } @@ -381,7 +376,6 @@ public class ConversationPropagator extends AbstractRequestCycleListener impleme String cid = conversation.getId(); - autoConversation.setAutomatic(false); conversation.end(); logger.debug("Auto-ended conversation {} for page {}", cid, page); http://git-wip-us.apache.org/repos/asf/wicket/blob/42d85ea4/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/IgnoreList.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/IgnoreList.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/IgnoreList.java index d45f099..9b106fb 100644 --- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/IgnoreList.java +++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/IgnoreList.java @@ -33,4 +33,5 @@ import javax.inject.Qualifier; @Retention(RetentionPolicy.RUNTIME) public @interface IgnoreList { -} \ No newline at end of file + +} http://git-wip-us.apache.org/repos/asf/wicket/blob/42d85ea4/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/NonContextual.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/NonContextual.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/NonContextual.java index 1bae109..e030d32 100644 --- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/NonContextual.java +++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/NonContextual.java @@ -150,4 +150,4 @@ public class NonContextual <T> { it.preDestroy(instance); } -} \ No newline at end of file +}
