Index: WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/definition.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/definition.xml	(revision 455)
+++ WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/definition.xml	(revision 472)
@@ -6,11 +6,11 @@
  <permission>Modify portal content</permission>
  <permission>View</permission>
- <state state_id="admission_pin_entered" title="">
-  <exit-transition transition_id="request_admission"/>
+ <state state_id="application_pin_entered" title="">
+  <exit-transition transition_id="apply"/>
  </state>
  <state state_id="admission_rejected" title="">
   <exit-transition transition_id="finally_reject"/>
  </state>
- <state state_id="admission_requested" title="">
+ <state state_id="applied" title="">
   <exit-transition transition_id="pume_fail"/>
   <exit-transition transition_id="pume_pass"/>
@@ -33,5 +33,5 @@
  <state state_id="created" title="">
   <exit-transition transition_id="create_content"/>
-  <exit-transition transition_id="enter_admission_pin"/>
+  <exit-transition transition_id="enter_application_pin"/>
   <exit-transition transition_id="open"/>
   <permission-map name="Modify portal content"
@@ -61,13 +61,9 @@
   <exit-transition transition_id="reject_admission"/>
  </state>
- <state state_id="rejected" title="">
- </state>
- <state state_id="sleeping_mode" title="">
-  <exit-transition transition_id="enter_admission_pin"/>
- </state>
+
  <transition transition_id="admit" title=""
              new_state="admitted" trigger="USER"
              before_script="" after_script="open_clearance">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -80,5 +76,5 @@
              trigger="USER" before_script=""
              after_script="open_personal">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -90,5 +86,5 @@
              new_state="closed" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -99,5 +95,5 @@
              new_state="created" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
   </guard>
@@ -108,5 +104,5 @@
              new_state="" trigger="USER" before_script=""
              after_script="">
-  
+
   <guard>
   </guard>
@@ -114,10 +110,10 @@
   <transition-behavior behavior_id="allow-sub-delete"/>
  </transition>
- <transition transition_id="enter_admission_pin" title=""
-             new_state="admission_pin_entered"
+ <transition transition_id="enter_application_pin" title=""
+             new_state="application_pin_entered"
              trigger="USER"
-             before_script="validate_admission_pin"
-             after_script="open_admission">
-  
+             before_script="validate_application_pin"
+             after_script="open_application">
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -131,5 +127,5 @@
              before_script="validate_clearance_pin"
              after_script="open_clearance">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -141,5 +137,5 @@
              new_state="finally_rejected" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -151,5 +147,5 @@
              new_state="opened" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -160,5 +156,5 @@
              new_state="pume_failed" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -170,5 +166,5 @@
              new_state="pume_passed" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -180,5 +176,5 @@
              new_state="rejected" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
   </guard>
@@ -187,5 +183,5 @@
              new_state="admission_rejected" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -198,5 +194,5 @@
              trigger="USER" before_script="open_clearance"
              after_script="">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -205,8 +201,8 @@
   </guard>
  </transition>
- <transition transition_id="request_admission" title=""
-             new_state="admission_requested" trigger="USER"
-             before_script="" after_script="close_admission">
-  
+ <transition transition_id="apply" title=""
+             new_state="applied" trigger="USER"
+             before_script="" after_script="close_application">
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -218,26 +214,26 @@
              new_state="clearence_requested" trigger="USER"
              before_script="" after_script="close_clearance">
-  
-  <guard>
-   <guard-role>Manager</guard-role>
-   <guard-role>SectionManager</guard-role>
-   <guard-role>Owner</guard-role>
-  </guard>
- </transition>
- <script script_id="close_admission" type="Script (Python)"
-         filename="workflows/waeup_student_wf/scripts/close_admission.py"/>
+
+  <guard>
+   <guard-role>Manager</guard-role>
+   <guard-role>SectionManager</guard-role>
+   <guard-role>Owner</guard-role>
+  </guard>
+ </transition>
+ <script script_id="close_application" type="Script (Python)"
+         filename="workflows/waeup_student_wf/scripts/close_application.py"/>
  <script script_id="close_clearance" type="Script (Python)"
          filename="workflows/waeup_student_wf/scripts/close_clearance.py"/>
  <script script_id="close_personal" type="Script (Python)"
          filename="workflows/waeup_student_wf/scripts/close_personal.py"/>
- <script script_id="open_admission" type="Script (Python)"
-         filename="workflows/waeup_student_wf/scripts/open_admission.py"/>
+ <script script_id="open_application" type="Script (Python)"
+         filename="workflows/waeup_student_wf/scripts/open_application.py"/>
  <script script_id="open_clearance" type="Script (Python)"
          filename="workflows/waeup_student_wf/scripts/open_clearance.py"/>
  <script script_id="open_personal" type="Script (Python)"
          filename="workflows/waeup_student_wf/scripts/open_personal.py"/>
- <script script_id="validate_admission_pin"
+ <script script_id="validate_application_pin"
          type="Script (Python)"
-         filename="workflows/waeup_student_wf/scripts/validate_admission_pin.py"/>
+         filename="workflows/waeup_student_wf/scripts/validate_application_pin.py"/>
  <script script_id="validate_clearance_pin"
          type="Script (Python)"
Index: WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/close_admission.py
===================================================================
--- WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/close_admission.py	(revision 455)
+++ 	(revision )
@@ -1,22 +1,0 @@
-## Script (Python) "close_admission"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-# Example code:
-
-# Import a standard function, and get the HTML request and response objects.
-from Products.PythonScripts.standard import html_quote
-request = container.REQUEST
-RESPONSE =  request.RESPONSE
-
-# Return a string identifying this script.
-print "This is the", script.meta_type, '"%s"' % script.getId(),
-if script.title:
-    print "(%s)" % html_quote(script.title),
-print "in", container.absolute_url()
-return printed
Index: WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/close_application.py
===================================================================
--- WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/close_application.py	(revision 472)
+++ WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/close_application.py	(revision 472)
@@ -0,0 +1,22 @@
+## Script (Python) "close_application"
+##bind container=container
+##bind context=context
+##bind namespace=
+##bind script=script
+##bind subpath=traverse_subpath
+##parameters=
+##title=
+##
+# Example code:
+
+# Import a standard function, and get the HTML request and response objects.
+from Products.PythonScripts.standard import html_quote
+request = container.REQUEST
+RESPONSE =  request.RESPONSE
+
+# Return a string identifying this script.
+print "This is the", script.meta_type, '"%s"' % script.getId(),
+if script.title:
+    print "(%s)" % html_quote(script.title),
+print "in", container.absolute_url()
+return printed
Index: WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/open_admission.py
===================================================================
--- WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/open_admission.py	(revision 455)
+++ 	(revision )
@@ -1,22 +1,0 @@
-## Script (Python) "open_admission"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-# Example code:
-
-# Import a standard function, and get the HTML request and response objects.
-from Products.PythonScripts.standard import html_quote
-request = container.REQUEST
-RESPONSE =  request.RESPONSE
-
-# Return a string identifying this script.
-print "This is the", script.meta_type, '"%s"' % script.getId(),
-if script.title:
-    print "(%s)" % html_quote(script.title),
-print "in", container.absolute_url()
-return printed
Index: WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/open_application.py
===================================================================
--- WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/open_application.py	(revision 472)
+++ WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/open_application.py	(revision 472)
@@ -0,0 +1,22 @@
+## Script (Python) "open_application"
+##bind container=container
+##bind context=context
+##bind namespace=
+##bind script=script
+##bind subpath=traverse_subpath
+##parameters=
+##title=
+##
+# Example code:
+
+# Import a standard function, and get the HTML request and response objects.
+from Products.PythonScripts.standard import html_quote
+request = container.REQUEST
+RESPONSE =  request.RESPONSE
+
+# Return a string identifying this script.
+print "This is the", script.meta_type, '"%s"' % script.getId(),
+if script.title:
+    print "(%s)" % html_quote(script.title),
+print "in", container.absolute_url()
+return printed
Index: WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/validate_admission_pin.py
===================================================================
--- WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/validate_admission_pin.py	(revision 455)
+++ 	(revision )
@@ -1,22 +1,0 @@
-## Script (Python) "validate_admission_pin"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-# Example code:
-
-# Import a standard function, and get the HTML request and response objects.
-from Products.PythonScripts.standard import html_quote
-request = container.REQUEST
-RESPONSE =  request.RESPONSE
-
-# Return a string identifying this script.
-print "This is the", script.meta_type, '"%s"' % script.getId(),
-if script.title:
-    print "(%s)" % html_quote(script.title),
-print "in", container.absolute_url()
-return printed
Index: WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/validate_application_pin.py
===================================================================
--- WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/validate_application_pin.py	(revision 472)
+++ WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/validate_application_pin.py	(revision 472)
@@ -0,0 +1,22 @@
+## Script (Python) "validate_application_pin"
+##bind container=container
+##bind context=context
+##bind namespace=
+##bind script=script
+##bind subpath=traverse_subpath
+##parameters=
+##title=
+##
+# Example code:
+
+# Import a standard function, and get the HTML request and response objects.
+from Products.PythonScripts.standard import html_quote
+request = container.REQUEST
+RESPONSE =  request.RESPONSE
+
+# Return a string identifying this script.
+print "This is the", script.meta_type, '"%s"' % script.getId(),
+if script.title:
+    print "(%s)" % html_quote(script.title),
+print "in", container.absolute_url()
+return printed
