. WCM UI

- Create Web Content action (HTML and plain text) now creates content in the current AVM store
   - TODO: create in the correct sub-folder
 - Refactoring of the modified Create Content Wizard into a new wizard Create Web Content Wizard
   - Integrated XML form templating into the current website AVM path (still needs some testing/fixing up…)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3867 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/bean/CheckinCheckoutBean.java

@@ -46,8 +46,6 @@ import org.alfresco.web.app.context.UIContextService;
 import org.alfresco.web.app.servlet.DownloadContentServlet;
 import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.bean.repository.Repository;
-import org.alfresco.web.templating.OutputUtil;
-import org.alfresco.web.templating.TemplatingService;
 import org.alfresco.web.ui.common.Utils;
 import org.alfresco.web.ui.common.component.UIActionLink;
 import org.apache.commons.logging.Log;
@@ -641,14 +639,6 @@ public class CheckinCheckoutBean
             // commit the transaction
             tx.commit();
             
-	    if (nodeService.getProperty(node.getNodeRef(),
-					TemplatingService.TT_QNAME) != null)
-	    {
-		OutputUtil.regenerate(node.getNodeRef(),
-				      this.contentService,
-				      this.nodeService);
-	    }
-            
             // clean up and clear action context
             clearUpload();
             setDocument(null);

source/java/org/alfresco/web/bean/content/BaseContentWizard.java

@@ -334,7 +334,16 @@ public abstract class BaseContentWizard extends BaseWizardBean
    protected void saveContent(File fileContent, String strContent) throws Exception
    {
       // get the node ref of the node that will contain the content
-      NodeRef containerNodeRef = getContainerNodeRef();
+      NodeRef containerNodeRef;
+      String nodeId = this.navigator.getCurrentNodeId();
+      if (nodeId == null)
+      {
+         containerNodeRef = this.nodeService.getRootNode(Repository.getStoreRef());
+      }
+      else
+      {
+         containerNodeRef = new NodeRef(Repository.getStoreRef(), nodeId);
+      }
       
       FileInfo fileInfo = this.fileFolderService.create(
             containerNodeRef,

source/java/org/alfresco/web/bean/content/CreateXmlContentTypeWizard.java

@@ -57,87 +57,94 @@ import org.xml.sax.SAXException;
  */
 public class CreateXmlContentTypeWizard extends BaseWizardBean
 {
+   private final static Log LOGGER = 
+      LogFactory.getLog(CreateXmlContentTypeWizard.class);
    
-    private final static Log LOGGER = 
-	LogFactory.getLog(CreateXmlContentTypeWizard.class);
-
-    private String presentationTemplateType;
-    protected ContentService contentService;
-
-    // ------------------------------------------------------------------------------
-    // Wizard implementation
-    
-    @Override
-    protected String finishImpl(FacesContext context, String outcome)
-	throws Exception
-    {
-	// get the node ref of the node that will contain the content
-	NodeRef containerNodeRef = this.getContainerNodeRef();
-
-	FileInfo fileInfo = 
-	    this.fileFolderService.create(containerNodeRef,
-					  this.getSchemaFileName(),
-					  ContentModel.TYPE_CONTENT);
-	final NodeRef schemaFileNodeRef = fileInfo.getNodeRef();
-	
-	if (LOGGER.isDebugEnabled())
-	    LOGGER.debug("Created file node for file: " + 
-			 this.getSchemaFileName());
-	
-	// get a writer for the content and put the file
-	ContentWriter writer = contentService.getWriter(schemaFileNodeRef, 
-							ContentModel.PROP_CONTENT, true);
-	// set the mimetype and encoding
-	writer.setMimetype("text/xml");
-	writer.setEncoding("UTF-8");
-	writer.putContent(this.getSchemaFile());
-
-	fileInfo = this.fileFolderService.create(containerNodeRef,
-						 this.getPresentationTemplateFileName(),
-						 ContentModel.TYPE_CONTENT);
-	final NodeRef presentationTemplateFileNodeRef = fileInfo.getNodeRef();
+   private String presentationTemplateType;
+   protected ContentService contentService;
+   
+   // ------------------------------------------------------------------------------
+   // Wizard implementation
+   
+   @Override
+   protected String finishImpl(FacesContext context, String outcome)
+      throws Exception
+   {
+      // get the node ref of the node that will contain the content
+      NodeRef containerNodeRef;
+      String nodeId = this.navigator.getCurrentNodeId();
+      if (nodeId == null)
+      {
+         containerNodeRef = this.nodeService.getRootNode(Repository.getStoreRef());
+      }
+      else
+      {
+         containerNodeRef = new NodeRef(Repository.getStoreRef(), nodeId);
+      }
       
-	if (LOGGER.isDebugEnabled())
-	    LOGGER.debug("Created file node for file: " + 
-			 this.getPresentationTemplateFileName());
-	
-	// get a writer for the content and put the file
-	writer = contentService.getWriter(presentationTemplateFileNodeRef, 
-					  ContentModel.PROP_CONTENT, true);
-	// set the mimetype and encoding
-	writer.setMimetype("text/xml");
-	writer.setEncoding("UTF-8");
-	writer.putContent(this.getPresentationTemplateFile());
-
-	final TemplatingService ts = TemplatingService.getInstance();
-	final String rootTagName = 
-	    this.getSchemaFileName().replaceAll("([^\\.])\\..+", "$1");
-	final TemplateType tt = ts.newTemplateType(rootTagName, schemaFileNodeRef);
-	if (this.getPresentationTemplateFile() != null)
-	{
-	    tt.addOutputMethod(new XSLTOutputMethod(presentationTemplateFileNodeRef));
-	}
-	ts.registerTemplateType(tt);
-
-	// return the default outcome
-	return outcome;
-    }
+      FileInfo fileInfo = this.fileFolderService.create(containerNodeRef,
+               this.getSchemaFileName(),
+               ContentModel.TYPE_CONTENT);
+      final NodeRef schemaFileNodeRef = fileInfo.getNodeRef();
+      
+      if (LOGGER.isDebugEnabled())
+         LOGGER.debug("Created file node for file: " + 
+               this.getSchemaFileName());
+      
+      // get a writer for the content and put the file
+      ContentWriter writer = contentService.getWriter(schemaFileNodeRef, 
+            ContentModel.PROP_CONTENT, true);
+      // set the mimetype and encoding
+      writer.setMimetype("text/xml");
+      writer.setEncoding("UTF-8");
+      writer.putContent(this.getSchemaFile());
+      
+      fileInfo = this.fileFolderService.create(containerNodeRef,
+            this.getPresentationTemplateFileName(),
+            ContentModel.TYPE_CONTENT);
+      final NodeRef presentationTemplateFileNodeRef = fileInfo.getNodeRef();
+      
+      if (LOGGER.isDebugEnabled())
+         LOGGER.debug("Created file node for file: " + 
+               this.getPresentationTemplateFileName());
+      
+      // get a writer for the content and put the file
+      writer = contentService.getWriter(presentationTemplateFileNodeRef, 
+            ContentModel.PROP_CONTENT, true);
+      // set the mimetype and encoding
+      writer.setMimetype("text/xml");
+      writer.setEncoding("UTF-8");
+      writer.putContent(this.getPresentationTemplateFile());
+      
+      final TemplatingService ts = TemplatingService.getInstance();
+      final String rootTagName = 
+         this.getSchemaFileName().replaceAll("([^\\.])\\..+", "$1");
+      final TemplateType tt = ts.newTemplateType(rootTagName, schemaFileNodeRef);
+      if (this.getPresentationTemplateFile() != null)
+      {
+         tt.addOutputMethod(new XSLTOutputMethod(presentationTemplateFileNodeRef));
+      }
+      ts.registerTemplateType(tt);
+      
+      // return the default outcome
+      return outcome;
+   }
    
    @Override
    public void init(Map<String, String> parameters)
    {
       super.init(parameters);
-
+      
       this.removeUploadedSchemaFile();
       this.removeUploadedPresentationTemplateFile();
    }
-
+   
    @Override
    public String cancel()
    {
-       this.removeUploadedSchemaFile();
-       this.removeUploadedPresentationTemplateFile();
-       return super.cancel();
+      this.removeUploadedSchemaFile();
+      this.removeUploadedPresentationTemplateFile();
+      return super.cancel();
    }
    
    @Override
@@ -153,8 +160,8 @@ public class CreateXmlContentTypeWizard extends BaseWizardBean
       {
          case 1:
          {
-	     disabled = (this.getSchemaFileName() == null || 
-			 this.getSchemaFileName().length() == 0);
+            disabled = (this.getSchemaFileName() == null || 
+                  this.getSchemaFileName().length() == 0);
             break;
          }
       }
@@ -162,26 +169,26 @@ public class CreateXmlContentTypeWizard extends BaseWizardBean
       return disabled;
    }
    
-//   @Override
-//   protected String doPostCommitProcessing(FacesContext context, String outcome)
-//   {
-//      // as we were successful, go to the set properties dialog if asked
-//      // to otherwise just return
-//      if (this.showOtherProperties)
-//      {
-//         // we are going to immediately edit the properties so we need
-//         // to setup the BrowseBean context appropriately
-//         this.browseBean.setDocument(new Node(this.createdNode));
-//      
-//         return getDefaultFinishOutcome() + AlfrescoNavigationHandler.OUTCOME_SEPARATOR + 
-//                "dialog:setContentProperties";
-//      }
-//      else
-//      {
-//         return outcome;
-//      }
-//   }
-
+// @Override
+// protected String doPostCommitProcessing(FacesContext context, String outcome)
+// {
+// // as we were successful, go to the set properties dialog if asked
+// // to otherwise just return
+// if (this.showOtherProperties)
+// {
+// // we are going to immediately edit the properties so we need
+// // to setup the BrowseBean context appropriately
+// this.browseBean.setDocument(new Node(this.createdNode));
+// 
+// return getDefaultFinishOutcome() + AlfrescoNavigationHandler.OUTCOME_SEPARATOR + 
+// "dialog:setContentProperties";
+// }
+// else
+// {
+// return outcome;
+// }
+// }
+   
    /**
     * Action handler called when the user wishes to remove an uploaded file
     */
@@ -192,7 +199,7 @@ public class CreateXmlContentTypeWizard extends BaseWizardBean
       // refresh the current page
       return null;
    }
-
+   
    /**
     * Action handler called when the user wishes to remove an uploaded file
     */
@@ -204,105 +211,106 @@ public class CreateXmlContentTypeWizard extends BaseWizardBean
       return null;
    }
    
+   
    // ------------------------------------------------------------------------------
    // Bean Getters and Setters
-
+   
    /**
     * @return Returns the mime type currenty selected
     */
-    public String getPresentationTemplateType()
-    {
-	if (this.getPresentationTemplateFileName() != null)
-	{
-	    //	    String s = this.getPresentationTemplateFileName();
-	    //	    String extension = 
-	    this.presentationTemplateType = "XSL";
-	}
-	return this.presentationTemplateType;
-    }
-    
-    /**
-     * @param presentationTemplateType Sets the currently selected mime type
-     */
-    public void setPresentationTemplateType(String presentationTemplateType)
-    {
-	this.presentationTemplateType = presentationTemplateType;
-    }
+   public String getPresentationTemplateType()
+   {
+      if (this.getPresentationTemplateFileName() != null)
+      {
+         //	    String s = this.getPresentationTemplateFileName();
+         //	    String extension = 
+         this.presentationTemplateType = "XSL";
+      }
+      return this.presentationTemplateType;
+   }
+   
+   /**
+    * @param presentationTemplateType Sets the currently selected mime type
+    */
+   public void setPresentationTemplateType(String presentationTemplateType)
+   {
+      this.presentationTemplateType = presentationTemplateType;
+   }
+   
+   private FileUploadBean getFileUploadBean(final String id)
+   {
+      final FacesContext ctx = FacesContext.getCurrentInstance();
+      final Map sessionMap = ctx.getExternalContext().getSessionMap();
+      return (FileUploadBean)sessionMap.get(FileUploadBean.getKey(id));
+   }
    
-    private FileUploadBean getFileUploadBean(final String id)
-    {
-	final FacesContext ctx = FacesContext.getCurrentInstance();
-	final Map sessionMap = ctx.getExternalContext().getSessionMap();
-	return (FileUploadBean)sessionMap.get(FileUploadBean.getKey(id));
-    }
-
    /**
     * @return Returns the name of the file
     */
-    private String getFileName(final String id)
-    {
-	// try and retrieve the file and filename from the file upload bean
-	// representing the file we previously uploaded.
-	final FileUploadBean fileBean = this.getFileUploadBean(id);
-	return fileBean == null ? null : fileBean.getFileName();
-    }
-
-    /**
-     * @return Returns the schema file or <tt>null</tt>
-     */
-    private File getFile(final String id)
-    {
-	// try and retrieve the file and filename from the file upload bean
-	// representing the file we previously uploaded.
-	final FileUploadBean fileBean = this.getFileUploadBean(id);
-	return fileBean != null ? fileBean.getFile() : null;
-    }
-
-    /**
-     * @return Returns the schema file or <tt>null</tt>
-     */
-    public File getSchemaFile()
-    {
-	return this.getFile("schema");
-    }
-
-    /**
-     * @return Returns the schema file or <tt>null</tt>
-     */
-    public String getSchemaFileName()
-    {
-	// try and retrieve the file and filename from the file upload bean
-	// representing the file we previously uploaded.
-	return this.getFileName("schema");
-    }
-
-    /**
-     * @return Returns the schema file or <tt>null</tt>
-     */
-    public String getPresentationTemplateFileName()
-    {
-	return this.getFileName("pt");
-    }
-
-    /**
-     * @return Returns the presentationTemplate file or <tt>null</tt>
-     */
-    public File getPresentationTemplateFile()
-    {
-	return this.getFile("pt");
-    }
+   private String getFileName(final String id)
+   {
+      // try and retrieve the file and filename from the file upload bean
+      // representing the file we previously uploaded.
+      final FileUploadBean fileBean = this.getFileUploadBean(id);
+      return fileBean == null ? null : fileBean.getFileName();
+   }
+   
+   /**
+    * @return Returns the schema file or <tt>null</tt>
+    */
+   private File getFile(final String id)
+   {
+      // try and retrieve the file and filename from the file upload bean
+      // representing the file we previously uploaded.
+      final FileUploadBean fileBean = this.getFileUploadBean(id);
+      return fileBean != null ? fileBean.getFile() : null;
+   }
+   
+   /**
+    * @return Returns the schema file or <tt>null</tt>
+    */
+   public File getSchemaFile()
+   {
+      return this.getFile("schema");
+   }
+   
+   /**
+    * @return Returns the schema file or <tt>null</tt>
+    */
+   public String getSchemaFileName()
+   {
+      // try and retrieve the file and filename from the file upload bean
+      // representing the file we previously uploaded.
+      return this.getFileName("schema");
+   }
+   
+   /**
+    * @return Returns the schema file or <tt>null</tt>
+    */
+   public String getPresentationTemplateFileName()
+   {
+      return this.getFileName("pt");
+   }
+   
+   /**
+    * @return Returns the presentationTemplate file or <tt>null</tt>
+    */
+   public File getPresentationTemplateFile()
+   {
+      return this.getFile("pt");
+   }
    
    /**
     * @return Returns a list of mime types to allow the user to select from
     */
    public List<SelectItem> getCreatePresentationTemplateTypes()
    {
-       return (List<SelectItem>)Arrays.asList(new SelectItem[] {
-	       new SelectItem("freemarker", "FreeMarker"),
-	       new SelectItem("xslt", "XSLT")
-	   });
+      return (List<SelectItem>)Arrays.asList(new SelectItem[] {
+            new SelectItem("freemarker", "FreeMarker"),
+            new SelectItem("xslt", "XSLT")
+      });
    }
-
+   
    /**
     * @return Returns the summary data for the wizard.
     */
@@ -312,15 +320,15 @@ public class CreateXmlContentTypeWizard extends BaseWizardBean
       
       // TODO: show first few lines of content here?
       return buildSummary(new String[] {
-	      "Schema File", 
-	      "Presentation Template Type",
-	      "Presentation Template"
-	  },
-	  new String[] {
-	      this.getSchemaFileName(),
-	      this.getPresentationTemplateType(),
-	      this.getPresentationTemplateFileName()
-	  });
+            "Schema File", 
+            "Presentation Template Type",
+            "Presentation Template"
+      },
+      new String[] {
+            this.getSchemaFileName(),
+            this.getPresentationTemplateType(),
+            this.getPresentationTemplateFileName()
+      });
    }
    
    // ------------------------------------------------------------------------------
@@ -328,7 +336,7 @@ public class CreateXmlContentTypeWizard extends BaseWizardBean
    
    // ------------------------------------------------------------------------------
    // Service Injection
-
+   
    /**
     * @param contentService The contentService to set.
     */
@@ -336,21 +344,21 @@ public class CreateXmlContentTypeWizard extends BaseWizardBean
    {
       this.contentService = contentService;
    }
-
+   
    
    // ------------------------------------------------------------------------------
    // Helper Methods
    
    /**
     */
-    protected void clearUpload(final String id)
-    {
+   protected void clearUpload(final String id)
+   {
       // remove the file upload bean from the session
-	FacesContext ctx = FacesContext.getCurrentInstance();
-	FileUploadBean fileBean = (FileUploadBean)
-	    ctx.getExternalContext().getSessionMap().
-	    get(FileUploadBean.getKey(id));
-	if (fileBean != null)
-	    fileBean.setFile(null);
-    }
+      FacesContext ctx = FacesContext.getCurrentInstance();
+      FileUploadBean fileBean = (FileUploadBean)
+      ctx.getExternalContext().getSessionMap().
+      get(FileUploadBean.getKey(id));
+      if (fileBean != null)
+         fileBean.setFile(null);
+   }
 }

source/java/org/alfresco/web/bean/dialog/BaseDialogBean.java

@@ -278,12 +278,4 @@ public abstract class BaseDialogBean implements IDialogBean
             FacesContext.getCurrentInstance(), getErrorMessageId()), 
             exception.getMessage());
    }
-   
-   protected NodeRef getContainerNodeRef()
-   {
-      String nodeId = this.navigator.getCurrentNodeId();
-      return (nodeId == null
-              ? this.nodeService.getRootNode(Repository.getStoreRef())
-              :  new NodeRef(Repository.getStoreRef(), nodeId));
-   }
 }

source/java/org/alfresco/web/bean/wcm/AVMEditBean.java

@@ -28,11 +28,14 @@ import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.web.app.AlfrescoNavigationHandler;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.app.servlet.DownloadContentServlet;
 import org.alfresco.web.bean.CheckinCheckoutBean;
 import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.templating.OutputUtil;
+import org.alfresco.web.templating.TemplatingService;
 import org.alfresco.web.ui.common.Utils;
 
 /**
@@ -55,6 +58,9 @@ public class AVMEditBean
    /** The ContentService bean reference */
    protected ContentService contentService;
    
+   /** The NodeService bean reference */
+   protected NodeService nodeService;
+   
    
    // ------------------------------------------------------------------------------
    // Bean property getters and setters 
@@ -83,6 +89,14 @@ public class AVMEditBean
       this.contentService = contentService;
    }
    
+   /**
+    * @param nodeService      The nodeService to set.
+    */
+   public void setNodeService(NodeService nodeService)
+   {
+      this.nodeService = nodeService;
+   }
+
    /**
     * @return Returns the current AVM node context.
     */
@@ -250,14 +264,13 @@ public class AVMEditBean
             // commit the transaction
             tx.commit();
             
-            // TODO: generate template content
-            /*if (nodeService.getProperty(node.getNodeRef(),
-                  TemplatingService.TT_QNAME) != null)
+            // TODO: regenerate template content
+            if (nodeService.getProperty(avmRef, TemplatingService.TT_QNAME) != null)
             {
-               OutputUtil.regenerate(node.getNodeRef(),
+               OutputUtil.regenerate(avmRef,
                      this.contentService,
                      this.nodeService);
-            }*/
+            }
             
             resetState();
             

source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java

@@ -16,8 +16,15 @@
  */
 package org.alfresco.web.bean.wcm;
 
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.Serializable;
+import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.ResourceBundle;
@@ -29,11 +36,20 @@ import javax.faces.model.SelectItem;
 import org.alfresco.config.Config;
 import org.alfresco.config.ConfigElement;
 import org.alfresco.config.ConfigService;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.avm.AVMNodeConverter;
 import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.service.cmr.avm.AVMService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.MimetypeService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.QName;
 import org.alfresco.web.app.AlfrescoNavigationHandler;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.content.BaseContentWizard;
 import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.data.IDataContainer;
 import org.alfresco.web.data.QuickSort;
 import org.alfresco.web.templating.OutputUtil;
@@ -47,11 +63,35 @@ import org.apache.commons.logging.LogFactory;
  */
 public class CreateWebContentWizard extends BaseContentWizard
 {
+   private static final Log logger = LogFactory.getLog(CreateWebContentWizard.class);
+   
    protected String content = null;
    protected String templateTypeName;
    protected List<SelectItem> createMimeTypes;
+   protected String createdPath = null;
    
-   private static final Log logger = LogFactory.getLog(CreateWebContentWizard.class);
+   /** AVM service bean reference */
+   protected AVMService avmService;
+   
+   /** AVM Browse Bean reference */
+   protected AVMBrowseBean avmBrowseBean;
+   
+   
+   /**
+    * @param avmService       The AVMService to set.
+    */
+   public void setAvmService(AVMService avmService)
+   {
+      this.avmService = avmService;
+   }
+   
+   /**
+    * @param avmBrowseBean    The AVMBrowseBean to set.
+    */
+   public void setAvmBrowseBean(AVMBrowseBean avmBrowseBean)
+   {
+      this.avmBrowseBean = avmBrowseBean;
+   }
    
    
    // ------------------------------------------------------------------------------
@@ -63,28 +103,69 @@ public class CreateWebContentWizard extends BaseContentWizard
    {
       logger.debug("saving file content to " + this.fileName);
       saveContent(null, this.content);
-      if (this.templateTypeName != null)
+      
+      if (MimetypeMap.MIMETYPE_XML.equals(this.mimeType) && this.templateTypeName != null)
       {
          logger.debug("generating template output for " + this.templateTypeName);
-         this.nodeService.setProperty(this.createdNode, 
+         this.nodeService.setProperty(AVMNodeConverter.ToNodeRef(-1, this.createdPath), 
                TemplatingService.TT_QNAME, 
                this.templateTypeName);
          TemplatingService ts = TemplatingService.getInstance();
          TemplateType tt = this.getTemplateType();
-         OutputUtil.generate(this.createdNode,
+         OutputUtil.generate(this.createdPath.substring(0, this.createdPath.lastIndexOf('/')),
                ts.parseXML(this.content),
                tt,
                this.fileName,
-               this.getContainerNodeRef(),
-               this.fileFolderService,
                this.contentService,
-               this.nodeService);
+               this.nodeService,
+               this.avmService);
       }
       
       // return the default outcome
       return outcome;
    }
    
+   // ------------------------------------------------------------------------------
+   // Helper methods
+
+   /**
+    * Save the specified content using the currently set wizard attributes
+    * 
+    * @param fileContent      File content to save
+    * @param strContent       String content to save
+    */
+   protected void saveContent(File fileContent, String strContent) throws Exception
+   {
+      // get the parent path of the location to save the content
+      String path;
+      AVMNode avmNode = this.avmBrowseBean.getAvmNode();
+      if (avmNode == null)
+      {
+         // create in root of current website
+         Node websiteNode = this.navigator.getCurrentNode();
+         String storeRoot = (String)websiteNode.getProperties().get(ContentModel.PROP_AVMSTORE);
+         path = AVMConstants.buildAVMStoreRootPath(AVMConstants.buildAVMStagingStoreName(storeRoot));
+      }
+      else
+      {
+         // create in current folder path
+         path = avmNode.getPath();
+      }
+      
+      // put the content of the file into the AVM store
+      if (fileContent != null)
+      {
+         avmService.createFile(path, this.fileName, new BufferedInputStream(new FileInputStream(fileContent)));
+      }
+      else 
+      {
+         avmService.createFile(path, this.fileName, new ByteArrayInputStream((strContent == null ? "" : strContent).getBytes()));
+      }
+      
+      // remember the created path
+      this.createdPath = path + '/' + this.fileName;
+   }
+   
    @Override
    public void init(Map<String, String> parameters)
    {
@@ -117,25 +198,6 @@ public class CreateWebContentWizard extends BaseContentWizard
       return disabled;
    }
    
-   @Override
-   protected String doPostCommitProcessing(FacesContext context, String outcome)
-   {
-      // as we were successful, go to the set properties dialog if asked
-      // to otherwise just return
-      if (this.showOtherProperties)
-      {
-         // we are going to immediately edit the properties so we need
-         // to setup the BrowseBean context appropriately
-         this.browseBean.setDocument(new Node(this.createdNode));
-         
-         return getDefaultFinishOutcome() + AlfrescoNavigationHandler.OUTCOME_SEPARATOR + 
-         "dialog:setContentProperties";
-      }
-      else
-      {
-         return outcome;
-      }
-   }
    
    // ------------------------------------------------------------------------------
    // Bean Getters and Setters