You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/04/04 16:27:04 UTC
[1/2] git commit: Minor typo fixes
Updated Branches:
refs/heads/master 12d3bd33e -> af34de7f6
Minor typo fixes
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e6002531
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e6002531
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e6002531
Branch: refs/heads/master
Commit: e600253159d0e1ebfee28017933bc78cc4a2d690
Parents: 12d3bd3
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Apr 4 17:19:05 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Apr 4 17:20:24 2013 +0300
----------------------------------------------------------------------
.../org/apache/wicket/cdi/CdiConfiguration.java | 4 ++--
.../apache/wicket/cdi/ConversationalComponent.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6002531/wicket-cdi/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java
----------------------------------------------------------------------
diff --git a/wicket-cdi/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java b/wicket-cdi/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java
index 32f3f56..10ae80a 100644
--- a/wicket-cdi/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java
+++ b/wicket-cdi/src/main/java/org/apache/wicket/cdi/CdiConfiguration.java
@@ -82,8 +82,8 @@ public class CdiConfiguration
* Toggles automatic conversation management feature.
*
* Automatic conversation management controls the lifecycle of the conversation based on
- * presense of components implementing the {@link ConversationalComponent} interface. If such
- * components are found in the page a conversation is makred persistent, and if they are not the
+ * presence of components implementing the {@link ConversationalComponent} interface. If such
+ * components are found in the page a conversation is marked persistent, and if they are not the
* conversation is marked transient. This greatly simplifies the management of conversation
* lifecycle.
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/e6002531/wicket-cdi/src/main/java/org/apache/wicket/cdi/ConversationalComponent.java
----------------------------------------------------------------------
diff --git a/wicket-cdi/src/main/java/org/apache/wicket/cdi/ConversationalComponent.java b/wicket-cdi/src/main/java/org/apache/wicket/cdi/ConversationalComponent.java
index abe3871..e041a87 100644
--- a/wicket-cdi/src/main/java/org/apache/wicket/cdi/ConversationalComponent.java
+++ b/wicket-cdi/src/main/java/org/apache/wicket/cdi/ConversationalComponent.java
@@ -19,7 +19,7 @@ package org.apache.wicket.cdi;
/**
* Marks a component that requires a conversation. This marker is used by the automatic conversation
* management feature ({@link CdiConfiguration#setAutoConversationManagement(boolean)}) to
- * automatically begin and end conversations based on the presense of these components in the
+ * automatically begin and end conversations based on the presence of these components in the
* component hierarchy of pages (can be applied to the page itself).
*
* @author igor
[2/2] git commit: Make AutoConversation IClusterable - just in case
someone still uses Terracotta integration.
Posted by mg...@apache.org.
Make AutoConversation IClusterable - just in case someone still uses Terracotta integration.
Make the field a simple boolean, afais there is no chance to make it 'null'
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/af34de7f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/af34de7f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/af34de7f
Branch: refs/heads/master
Commit: af34de7f6274b09e667081501b19deb8ce6db7a0
Parents: e600253
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Apr 4 17:24:56 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Apr 4 17:24:56 2013 +0300
----------------------------------------------------------------------
.../org/apache/wicket/cdi/AutoConversation.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/af34de7f/wicket-cdi/src/main/java/org/apache/wicket/cdi/AutoConversation.java
----------------------------------------------------------------------
diff --git a/wicket-cdi/src/main/java/org/apache/wicket/cdi/AutoConversation.java b/wicket-cdi/src/main/java/org/apache/wicket/cdi/AutoConversation.java
index 62d078f..0193a7d 100644
--- a/wicket-cdi/src/main/java/org/apache/wicket/cdi/AutoConversation.java
+++ b/wicket-cdi/src/main/java/org/apache/wicket/cdi/AutoConversation.java
@@ -16,10 +16,10 @@
*/
package org.apache.wicket.cdi;
-import java.io.Serializable;
-
import javax.enterprise.context.ConversationScoped;
+import org.apache.wicket.util.io.IClusterable;
+
/**
* A bean that can be used to override whether the lifecycle of the conversation should be managed
* automatically or not. See {@link CdiConfiguration#setAutoConversationManagement(boolean)} for
@@ -28,9 +28,9 @@ import javax.enterprise.context.ConversationScoped;
* @author igor
*/
@ConversationScoped
-public class AutoConversation implements Serializable
+public class AutoConversation implements IClusterable
{
- private Boolean automatic;
+ private boolean automatic;
public AutoConversation()
{