svn commit: r453389 - in /shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml: SCXMLDialogContext.java ShaleDialogELEvaluator.java config/DialogMetadata.java

[rahul]

Author: rahul
Date: Thu Oct  5 14:28:11 2006
New Revision: 453389

URL: http://svn.apache.org/viewvc?view=rev&rev=453389
Log:
The Commons SCXML trunk has numerous improvements regarding serializability. 
The lazy initialization bits in shale-dialog2-scxml can go away after the next 
release of Commons SCXML (no release plan yet) if we choose to upgrade. Leaving 
reminder TODOs in code.

Modified:
    
shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/SCXMLDialogContext.java
    
shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/ShaleDialogELEvaluator.java
    
shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/config/DialogMetadata.java

Modified: 
shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/SCXMLDialogContext.java
URL: 
http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/SCXMLDialogContext.java?view=diff&rev=453389&r1=453388&r2=453389
==============================================================================
--- 
shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/SCXMLDialogContext.java
 (original)
+++ 
shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/SCXMLDialogContext.java
 Thu Oct  5 14:28:11 2006
@@ -133,6 +133,10 @@
     /**
      * <p>The [EMAIL PROTECTED] SCXMLExecutor}, an instance of the state 
machine
      * defined for the SCXML document for this dialog.</p>
+     *
+     * TODO: Won't need to be transient after next release of Commons SCXML
+     *       (the current release is v0.5).
+     *       Remove lazy initialization bits as well then.
      */
     private transient SCXMLExecutor executor = null;
 

Modified: 
shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/ShaleDialogELEvaluator.java
URL: 
http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/ShaleDialogELEvaluator.java?view=diff&rev=453389&r1=453388&r2=453389
==============================================================================
--- 
shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/ShaleDialogELEvaluator.java
 (original)
+++ 
shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/ShaleDialogELEvaluator.java
 Thu Oct  5 14:28:11 2006
@@ -79,7 +79,7 @@
 
 
     /** FacesContext for this request. */
-    private FacesContext context;
+    private transient FacesContext context;
 
 
     /**

Modified: 
shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/config/DialogMetadata.java
URL: 
http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/config/DialogMetadata.java?view=diff&rev=453389&r1=453388&r2=453389
==============================================================================
--- 
shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/config/DialogMetadata.java
 (original)
+++ 
shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/config/DialogMetadata.java
 Thu Oct  5 14:28:11 2006
@@ -54,6 +54,9 @@
 
         /**
          * The Commons SCXML object model describing the state machine for 
this dialog.
+         *
+         * TODO: Won't need to be transient after next release of Commons SCXML
+         *       (the current release is v0.5)
          */
         private transient SCXML stateMachine;