inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.1 to HEAD

Browse Source 
6580: AVM bulk import performance tweaks.
   6582: WCM-767, WCM-768
   6583: Fix for AWC-1528 (potential NPE in ErrorsRenderer)
   6584: Fix for AWC-1256 (Links produced by inline HTML editor are incorrect)
   6585: AR-1635: event listeners added in a beforeCommit event are now executed successfully
   6586: AR-1561 Update Web Scripts readme.html to be consistent with "Category Search Sample" (or vice-versa)
   6587: Fix for AWC-1390 (Paste all doesn't work for forum items)
   6588: AR-1701 Script getDocument call doesn't check for non-existent content
   6589: Fix for AWC-1530 - Saved search does not work for custom properties of type d:text with list constraint
   6591: Improvement for submit speed.
   6592: Removed obsolete tests.
   6594: Index tracking sample to include AVM index tracking
   6595: Added the AVM helpers methods from the FreeMarker AVM API that were missing from the JavaScript API
   6597: Rationalize post commit execution hooks for deployment receiver
   6598: Properly escape path names for ProgramRunnable.
   6599: AVM store name lookup cache is (theoretically) clusterable.
   6600: Some or other gramatically incorrect stuff about Chiba.
   6601: Fix for AR-1121 and AR-1673
   6602: AR-1655: Versioning is not MLText aware
   6603: Updated messages from lang packs
   6604: Fixed AR-1476: JCR import end element escaping
   6605: Updated Japanese lang messages


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6746 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-11 03:03:50 +00:00
parent 61808ef4a7
commit 1ef35756f8
14 changed files with 286 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/java/org/alfresco/web/bean/wcm/CreateWebappDialog.java
View File

@@ -43,6 +43,8 @@ public class CreateWebappDialog extends CreateFolderDialog
// ------------------------------------------------------------------------------
// Dialog implementation
protected String path;
/**
* @see org.alfresco.web.bean.dialog.BaseDialogBean#finishImpl(javax.faces.context.FacesContext, java.lang.String)
*/
@@ -53,9 +55,9 @@ public class CreateWebappDialog extends CreateFolderDialog
final String parent = AVMUtil.buildSandboxRootPath( stagingStore );
this.avmService.createDirectory(parent, this.name);
final String path = AVMNodeConverter.ExtendAVMPath(parent, this.name);
this.avmService.addAspect(path, ApplicationModel.ASPECT_UIFACETS);
this.avmService.addAspect(path, WCMAppModel.ASPECT_WEBAPP);
this.path = AVMNodeConverter.ExtendAVMPath(parent, this.name);
this.avmService.addAspect(this.path, ApplicationModel.ASPECT_UIFACETS);
this.avmService.addAspect(this.path, WCMAppModel.ASPECT_WEBAPP);
if (this.description != null && this.description.length() != 0)
{
this.avmService.setNodeProperty(path,
@@ -65,8 +67,18 @@ public class CreateWebappDialog extends CreateFolderDialog
}
// Snapshot the store with the empty webapp
this.avmService.createSnapshot( stagingStore, null, null);
this.avmService.createSnapshot(stagingStore, null, null);
return outcome;
}
@Override
protected String doPostCommitProcessing(FacesContext context, String outcome)
{
// Tell the virtualization server about the new webapp.
// e.g.: this.path = "mysite:/www/avm_webapps/mywebapp"
AVMUtil.updateVServerWebapp(this.path, true);
return outcome;
}
}