diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index 67c553f27c..ab8f6269aa 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -1209,53 +1209,53 @@
             </list>
         </property>
     </bean>
-    <bean id="patch.db-V2.2-2-MoveQNames" class="org.alfresco.repo.admin.patch.impl.NoOpPatch" parent="basePatch">
-        <property name="id"><value>patch.db-V2.2-2-MoveQNames</value></property>
-        <property name="description"><value>patch.noOpPatch.description</value></property>
+    <bean id="patch.db-V2.2-2-MoveQNames" class="org.alfresco.repo.admin.patch.impl.NoOpPatch" parent="basePatch">
+        <property name="id"><value>patch.db-V2.2-2-MoveQNames</value></property>
+        <property name="description"><value>patch.noOpPatch.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
         <property name="fixesToSchema"><value>120</value></property>
         <property name="targetSchema"><value>121</value></property>
     </bean>
-    <bean id="patch.db-V2.2-Upgrade-From-2.1" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
-        <property name="id"><value>patch.db-V2.2-Upgrade-From-2.1</value></property>
+    <bean id="patch.db-V2.2-Upgrade-From-2.1" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+        <property name="id"><value>patch.db-V2.2-Upgrade-From-2.1</value></property>
         <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
-        <property name="fixesToSchema"><value>120</value></property>
-        <property name="targetSchema"><value>135</value></property>
+        <property name="fixesToSchema"><value>120</value></property>
+        <property name="targetSchema"><value>135</value></property>
         <property name="scriptUrl">
-            <value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/upgrade-from-2.1.sql</value>
+            <value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/upgrade-from-2.1.sql</value>
         </property>
         <property name="dependsOn" >
             <list>
-                <ref bean="patch.db-V2.2-0-CreateMissingTables" />
+                <ref bean="patch.db-V2.2-0-CreateMissingTables" />
             </list>
         </property>
-        <property name="alternatives" >
+        <property name="alternatives" >
             <list>
                 <ref bean="patch.db-V2.2-2-MoveQNames" />
             </list>
         </property>
     </bean>
-    <bean id="patch.db-V2.2-Upgrade-From-2.2SP1" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
-        <property name="id"><value>patch.db-V2.2-Upgrade-From-2.2SP1</value></property>
+    <bean id="patch.db-V2.2-Upgrade-From-2.2SP1" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+        <property name="id"><value>patch.db-V2.2-Upgrade-From-2.2SP1</value></property>
         <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
-        <property name="fixesToSchema"><value>134</value></property>
-        <property name="targetSchema"><value>135</value></property>
-        <property name="scriptUrl">
-            <value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/upgrade-from-2.2SP1.sql</value>
-        </property>
-        <property name="dependsOn" >
-            <list>
-                <ref bean="patch.db-V2.2-2-MoveQNames" />
-            </list>
-        </property>
-        <property name="alternatives" >
-            <list>
-                <ref bean="patch.db-V2.2-Upgrade-From-2.1" />
-            </list>
-        </property>
-    </bean>
+        <property name="fixesToSchema"><value>134</value></property>
+        <property name="targetSchema"><value>135</value></property>
+        <property name="scriptUrl">
+            <value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/upgrade-from-2.2SP1.sql</value>
+        </property>
+        <property name="dependsOn" >
+            <list>
+                <ref bean="patch.db-V2.2-2-MoveQNames" />
+            </list>
+        </property>
+        <property name="alternatives" >
+            <list>
+                <ref bean="patch.db-V2.2-Upgrade-From-2.1" />
+            </list>
+        </property>
+    </bean>
     
     <bean id="patch.wcmPermissionPatch" class="org.alfresco.repo.admin.patch.impl.WCMPermissionPatch" parent="basePatch" >
         <property name="id"><value>patch.wcmPermissionPatch</value></property>
@@ -1335,7 +1335,7 @@
         </property>
         <property name="dependsOn" >
             <list>
-                <ref bean="patch.db-V2.2-Upgrade-From-2.2SP1" />
+                <ref bean="patch.db-V2.2-Upgrade-From-2.2SP1" />
             </list>
         </property>
     </bean>
@@ -1509,32 +1509,50 @@
             </list>
         </property>
     </bean>
-	
-	<bean id="patch.db-V2.2-Person" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
-        <property name="id"><value>patch.db-V2.2-Person</value></property>
-        <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
-        <property name="fixesFromSchema"><value>0</value></property>
-        <property name="fixesToSchema"><value>134</value></property>
-        <property name="targetSchema"><value>135</value></property>
-        <property name="scriptUrl">
-            <value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/AlfrescoSchemaUpdate-Person.sql</value>
-        </property>
-    </bean>
-
-	<bean id="patch.db-V2.2-OrclBLOB" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
-        <property name="id"><value>patch.db-V2.2-OrclBLOB</value></property>
-        <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
-        <property name="fixesFromSchema"><value>0</value></property>
-        <property name="fixesToSchema"><value>134</value></property>
-        <property name="targetSchema"><value>135</value></property>
-        <property name="scriptUrl">
-            <value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/AlfrescoSchemaUpdate-OrclBLOB.sql</value>
-        </property>
-        <property name="dependsOn" >
-            <list>
-                <ref bean="patch.db-V2.2-Person" />
-            </list>
-        </property>
-    </bean>
-
-</beans>
+	
+	<bean id="patch.db-V2.2-Person" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+        <property name="id"><value>patch.db-V2.2-Person</value></property>
+        <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>134</value></property>
+        <property name="targetSchema"><value>135</value></property>
+        <property name="scriptUrl">
+            <value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/AlfrescoSchemaUpdate-Person.sql</value>
+        </property>
+    </bean>
+
+	<bean id="patch.db-V2.2-OrclBLOB" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+        <property name="id"><value>patch.db-V2.2-OrclBLOB</value></property>
+        <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>134</value></property>
+        <property name="targetSchema"><value>135</value></property>
+        <property name="scriptUrl">
+            <value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/AlfrescoSchemaUpdate-OrclBLOB.sql</value>
+        </property>
+        <property name="dependsOn" >
+            <list>
+                <ref bean="patch.db-V2.2-Person" />
+            </list>
+        </property>
+    </bean>
+
+    <bean id="patch.redeploySubmitProcess4" class="org.alfresco.repo.admin.patch.impl.GenericWorkflowPatch" parent="basePatch" >
+        <property name="id"><value>patch.redeploySubmitProcess4</value></property>
+        <property name="description"><value>patch.redeploySubmitProcess.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>1000</value></property>
+        <property name="targetSchema"><value>1001</value></property>
+        <property name="workflowDefinitions">
+            <list>
+               <props>
+                    <!-- WCM workflow definition -->
+                    <prop key="engineId">jbpm</prop>
+                    <prop key="location">alfresco/workflow/submit_processdefinition.xml</prop>
+                    <prop key="mimetype">text/xml</prop>
+               </props>
+            </list>
+        </property>
+    </bean>
+
+</beans>
diff --git a/config/alfresco/version.properties b/config/alfresco/version.properties
index af304a33c0..3009593d03 100644
--- a/config/alfresco/version.properties
+++ b/config/alfresco/version.properties
@@ -19,4 +19,4 @@ version.build=@build-number@
 
 # Schema number
 
-version.schema=1000
+version.schema=1001
\ No newline at end of file
diff --git a/config/alfresco/workflow/submit_processdefinition.xml b/config/alfresco/workflow/submit_processdefinition.xml
index 3a5fec514e..a670177b85 100644
--- a/config/alfresco/workflow/submit_processdefinition.xml
+++ b/config/alfresco/workflow/submit_processdefinition.xml
@@ -190,7 +190,7 @@
        </transition>
     </decision>
 
-    <task-node name="submitpending">
+    <task-node name="submitpending" end-tasks="true">
         <task name="wcmwf:submitpendingTask" swimlane="initiator">
            <event type="task-create">
               <script>
diff --git a/source/java/org/alfresco/repo/avm/AVMServiceTest.java b/source/java/org/alfresco/repo/avm/AVMServiceTest.java
index e634974791..0167ff58e4 100644
--- a/source/java/org/alfresco/repo/avm/AVMServiceTest.java
+++ b/source/java/org/alfresco/repo/avm/AVMServiceTest.java
@@ -52,6 +52,7 @@ import org.alfresco.repo.domain.PropertyValue;
 import org.alfresco.repo.search.impl.lucene.LuceneQueryParser;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
 import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.sandbox.SandboxConstants;
 import org.alfresco.service.cmr.avm.AVMBadArgumentException;
 import org.alfresco.service.cmr.avm.AVMCycleException;
 import org.alfresco.service.cmr.avm.AVMException;
@@ -1963,24 +1964,25 @@ public class AVMServiceTest extends AVMServiceTestBase
      */
     public void testSubmitAction() throws Exception
     {
+        final String STAGING = "foo-staging"; // note: it is implied that the website/webproject name is the same as staging name
         try
         {
-            fService.createStore("foo-staging");
-            fService.createDirectory("foo-staging:/", JNDIConstants.DIR_DEFAULT_WWW);
-            fService.createDirectory("foo-staging:/" + JNDIConstants.DIR_DEFAULT_WWW, "a");
-            fService.createDirectory("foo-staging:/" + JNDIConstants.DIR_DEFAULT_WWW + "/a", "b");
-            fService.createDirectory("foo-staging:/" + JNDIConstants.DIR_DEFAULT_WWW + "/a/b", "c");
-            fService.createFile("foo-staging:/" + JNDIConstants.DIR_DEFAULT_WWW + "/a/b/c", "foo").close();
-            fService.createFile("foo-staging:/" + JNDIConstants.DIR_DEFAULT_WWW + "/a/b/c", "bar").close();
+            fService.createStore(STAGING);
+            fService.createDirectory(STAGING+":/", JNDIConstants.DIR_DEFAULT_WWW);
+            fService.createDirectory(STAGING+":/" + JNDIConstants.DIR_DEFAULT_WWW, "a");
+            fService.createDirectory(STAGING+":/" + JNDIConstants.DIR_DEFAULT_WWW + "/a", "b");
+            fService.createDirectory(STAGING+":/" + JNDIConstants.DIR_DEFAULT_WWW + "/a/b", "c");
+            fService.createFile(STAGING+":/" + JNDIConstants.DIR_DEFAULT_WWW + "/a/b/c", "foo").close();
+            fService.createFile(STAGING+":/" + JNDIConstants.DIR_DEFAULT_WWW + "/a/b/c", "bar").close();
             fService.createStore("area");
-            fService.setStoreProperty("area", QName.createQName(null, ".website.name"), new PropertyValue(null, "foo"));
-            fService.createLayeredDirectory("foo-staging:/" + JNDIConstants.DIR_DEFAULT_WWW, "area:/", JNDIConstants.DIR_DEFAULT_WWW);
+            fService.setStoreProperty("area", SandboxConstants.PROP_WEBSITE_NAME, new PropertyValue(null, STAGING)); // note: it is implied that the website name is the same as staging name
+            fService.createLayeredDirectory(STAGING+":/" + JNDIConstants.DIR_DEFAULT_WWW, "area:/", JNDIConstants.DIR_DEFAULT_WWW);
             fService.createFile("area:/" + JNDIConstants.DIR_DEFAULT_WWW, "figs").close();
             fService.getFileOutputStream("area:/" + JNDIConstants.DIR_DEFAULT_WWW + "/a/b/c/foo").close();
             fService.removeNode("area:/" + JNDIConstants.DIR_DEFAULT_WWW + "/a/b/c/bar");
-            List<AVMDifference> diffs = fSyncService.compare(-1, "area:/" + JNDIConstants.DIR_DEFAULT_WWW, -1, "foo-staging:/" + JNDIConstants.DIR_DEFAULT_WWW, null);
+            List<AVMDifference> diffs = fSyncService.compare(-1, "area:/" + JNDIConstants.DIR_DEFAULT_WWW, -1, STAGING+":/" + JNDIConstants.DIR_DEFAULT_WWW, null);
             assertEquals(3, diffs.size());
-            assertEquals("[area:/www/a/b/c/bar[-1] > foo-staging:/www/a/b/c/bar[-1], area:/www/a/b/c/foo[-1] > foo-staging:/www/a/b/c/foo[-1], area:/www/figs[-1] > foo-staging:/www/figs[-1]]", diffs.toString());
+            assertEquals("[area:/www/a/b/c/bar[-1] > "+STAGING+":/www/a/b/c/bar[-1], area:/www/a/b/c/foo[-1] > "+STAGING+":/www/a/b/c/foo[-1], area:/www/figs[-1] > "+STAGING+":/www/figs[-1]]", diffs.toString());
             final SimpleAVMSubmitAction action = (SimpleAVMSubmitAction) fContext.getBean("simple-avm-submit");
             class TxnWork implements RetryingTransactionCallback<Object>
             {
@@ -1994,7 +1996,7 @@ public class AVMServiceTest extends AVMServiceTestBase
             TransactionService transactionService = (TransactionService) fContext.getBean("transactionService");
             transactionService.getRetryingTransactionHelper().doInTransaction(new TxnWork());
 
-            diffs = fSyncService.compare(-1, "area:/" + JNDIConstants.DIR_DEFAULT_WWW, -1, "foo-staging:/" + JNDIConstants.DIR_DEFAULT_WWW, null);
+            diffs = fSyncService.compare(-1, "area:/" + JNDIConstants.DIR_DEFAULT_WWW, -1, STAGING+":/" + JNDIConstants.DIR_DEFAULT_WWW, null);
 
             assertEquals(0, diffs.size());
         }
@@ -2005,7 +2007,7 @@ public class AVMServiceTest extends AVMServiceTestBase
         }
         finally
         {
-            fService.purgeStore("foo-staging");
+            fService.purgeStore(STAGING);
             fService.purgeStore("area");
         }
     }
diff --git a/source/java/org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java b/source/java/org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java
index e065f0f304..e4f55493b5 100644
--- a/source/java/org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java
+++ b/source/java/org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Alfresco Software Limited.
+ * Copyright (C) 2005-2008 Alfresco Software Limited.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -30,6 +30,7 @@ import org.alfresco.repo.action.executer.ActionExecuterAbstractBase;
 import org.alfresco.repo.avm.AVMDAOs;
 import org.alfresco.repo.avm.AVMNodeConverter;
 import org.alfresco.repo.domain.PropertyValue;
+import org.alfresco.sandbox.SandboxConstants;
 import org.alfresco.service.cmr.action.Action;
 import org.alfresco.service.cmr.action.ParameterDefinition;
 import org.alfresco.service.cmr.avm.AVMService;
@@ -37,7 +38,6 @@ import org.alfresco.service.cmr.avmsync.AVMDifference;
 import org.alfresco.service.cmr.avmsync.AVMSyncException;
 import org.alfresco.service.cmr.avmsync.AVMSyncService;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.namespace.QName;
 import org.alfresco.util.NameMatcher;
 import org.alfresco.util.Pair;
 import org.apache.commons.logging.Log;
@@ -125,17 +125,16 @@ public class SimpleAVMSubmitAction extends ActionExecuterAbstractBase
         }
         // Get the .website.name property.
         PropertyValue wsProp = 
-            fAVMService.getStoreProperty(storePath[0], 
-                    QName.createQName(null, ".website.name"));
+            fAVMService.getStoreProperty(storePath[0], SandboxConstants.PROP_WEBSITE_NAME);
         if (wsProp == null)
         {
-            fgLogger.warn(".website.name property not found.");
+            fgLogger.warn(SandboxConstants.PROP_WEBSITE_NAME.toString()+" property not found.");
             return;
         }
         // And the actual web-site name.
         String websiteName = wsProp.getStringValue();
         // Construct the submit destination path.
-        String avmDest = websiteName + "-staging:" + storePath[1];
+        String avmDest = websiteName + ":" + storePath[1]; // note: it is implied that the website name is the same as staging name
         // Get the difference between source and destination.
         List<AVMDifference> diffs = 
             fAVMSyncService.compare(version, path, -1, avmDest, fExcluder);
@@ -146,7 +145,7 @@ public class SimpleAVMSubmitAction extends ActionExecuterAbstractBase
         // Cleanup by flattening the source relative to the destination.
         // This is an ugliness to prevent database write misorderings in flatten.
         AVMDAOs.Instance().fAVMNodeDAO.flush();
-        fAVMSyncService.flatten(storePath[0] + ":/" + JNDIConstants.DIR_DEFAULT_WWW, websiteName + "-staging:/" + JNDIConstants.DIR_DEFAULT_WWW);
+        fAVMSyncService.flatten(storePath[0] + ":/" + JNDIConstants.DIR_DEFAULT_WWW, websiteName + ":/" + JNDIConstants.DIR_DEFAULT_WWW);
     }
 
     /**
diff --git a/source/java/org/alfresco/repo/avm/wf/AVMSubmitHandler.java b/source/java/org/alfresco/repo/avm/wf/AVMSubmitHandler.java
index d8418ebe42..9bb9a977c2 100644
--- a/source/java/org/alfresco/repo/avm/wf/AVMSubmitHandler.java
+++ b/source/java/org/alfresco/repo/avm/wf/AVMSubmitHandler.java
@@ -26,10 +26,10 @@ package org.alfresco.repo.avm.wf;
 import java.util.List;
 
 import org.alfresco.repo.workflow.jbpm.JBPMSpringActionHandler;
+import org.alfresco.sandbox.SandboxConstants;
 import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.avmsync.AVMDifference;
 import org.alfresco.service.cmr.avmsync.AVMSyncService;
-import org.alfresco.service.namespace.QName;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jbpm.graph.exe.ExecutionContext;
@@ -81,9 +81,9 @@ public class AVMSubmitHandler extends JBPMSpringActionHandler
             return;
         }
         String webSiteName = 
-            fAVMService.getStoreProperty(storePath[0], QName.createQName(null, ".website.name")).
+            fAVMService.getStoreProperty(storePath[0], SandboxConstants.PROP_WEBSITE_NAME).
             getStringValue();
-        String avmDest = webSiteName + "-staging:" + storePath[1];
+        String avmDest = webSiteName + ":" + storePath[1]; // note: it is implied that the website name is the same as staging name
         List<AVMDifference> diffs = 
             fAVMSyncService.compare(-1, avmSource, -1, avmDest, null);
         // TODO fix update comments if needed.
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java b/source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java
index 4dddf1fa98..9836545b62 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java
@@ -60,6 +60,8 @@ import org.alfresco.repo.search.impl.lucene.analysis.MLTokenDuplicator;
 import org.alfresco.repo.search.impl.lucene.analysis.VerbatimAnalyser;
 import org.alfresco.repo.search.impl.lucene.fts.FTSIndexerAware;
 import org.alfresco.repo.search.impl.lucene.fts.FullTextSearchIndexer;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
 import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
 import org.alfresco.service.cmr.avm.AVMException;
 import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
@@ -1152,8 +1154,15 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<String> impl
     @Override
     protected void doPrepare() throws IOException
     {
-        saveDelta();
-        flushPending();
+    	AuthenticationUtil.runAs(new RunAsWork<String>()
+        {
+            public String doWork() throws Exception
+            {    			
+	            saveDelta();
+	            flushPending();
+	            return null;
+            }
+        }, AuthenticationUtil.getSystemUserName());
     }
 
     @Override