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.2 to HEAD

Browse Source 
8105: Fix for AR-1828 - multiple users being created from web siteregistration
   8107: Merged V2.1 to v2.2
      8106: Fixed fallout from MetadataExtractors setting properties to thecorrect data type
   8109: Fix for AR-2016
   8119: AR-1778: putContent method in the ContentUtils class fail to upload*.java, *.txt, *.xml
   8120: AR-1895: fix to web service SDK sample
   8125: Test added to prevent regression of AR-1707
   8126: Enhanced exception message when non-marking InputStream is used.
   8131: Merged V2.1 to V2.2
      8129: Merged V1.4 to V2.1:
         8128: Fix AR-2041: NPE checking voids during index tracking
   8140: AR-1762 - correct generation of download servlet URL


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8477 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-03-10 13:35:04 +00:00
parent ef5161678c
commit 2133375d89
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/web/app/servlet/UploadContentServlet.java
View File

@@ -24,6 +24,7 @@
*/ */
package org.alfresco.web.app.servlet; package org.alfresco.web.app.servlet;
import java.io.BufferedInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.charset.Charset; import java.nio.charset.Charset;
@@ -164,7 +165,8 @@ public class UploadContentServlet extends BaseServlet
PermissionService permissionService = serviceRegistry.getPermissionService(); PermissionService permissionService = serviceRegistry.getPermissionService();
MimetypeService mimetypeService = serviceRegistry.getMimetypeService(); MimetypeService mimetypeService = serviceRegistry.getMimetypeService();
InputStream inputStream = req.getInputStream(); InputStream is = req.getInputStream();
BufferedInputStream inputStream = new BufferedInputStream(is);
// Sort out the mimetype // Sort out the mimetype
String mimetype = req.getParameter(ARG_MIMETYPE); String mimetype = req.getParameter(ARG_MIMETYPE);

5
source/java/org/alfresco/web/bean/ajax/FileUploadBean.java
View File

@@ -48,6 +48,7 @@ import org.alfresco.service.cmr.model.FileInfo;
import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.util.TempFileProvider; import org.alfresco.util.TempFileProvider;
import org.alfresco.web.app.servlet.BaseServlet; import org.alfresco.web.app.servlet.BaseServlet;
@@ -166,8 +167,8 @@ public class FileUploadBean implements Serializable
if (Repository.extractMetadata(fc, cr, contentProps)) if (Repository.extractMetadata(fc, cr, contentProps))
{ {
author = (String)(contentProps.get(ContentModel.PROP_AUTHOR)); author = (String)(contentProps.get(ContentModel.PROP_AUTHOR));
title = (String)(contentProps.get(ContentModel.PROP_TITLE)); title = DefaultTypeConverter.INSTANCE.convert(String.class, contentProps.get(ContentModel.PROP_TITLE));
description = (String)(contentProps.get(ContentModel.PROP_DESCRIPTION)); description = DefaultTypeConverter.INSTANCE.convert(String.class, contentProps.get(ContentModel.PROP_DESCRIPTION));
} }
// default the title to the file name if not set // default the title to the file name if not set

5
source/java/org/alfresco/web/bean/content/AddContentDialog.java
View File

@@ -45,6 +45,7 @@ import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.content.filestore.FileContentReader; import org.alfresco.repo.content.filestore.FileContentReader;
import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.web.app.Application; import org.alfresco.web.app.Application;
import org.alfresco.web.bean.FileUploadBean; import org.alfresco.web.bean.FileUploadBean;
@@ -81,8 +82,8 @@ public class AddContentDialog extends BaseContentWizard
if (Repository.extractMetadata(FacesContext.getCurrentInstance(), cr, contentProps)) if (Repository.extractMetadata(FacesContext.getCurrentInstance(), cr, contentProps))
{ {
this.author = (String)(contentProps.get(ContentModel.PROP_AUTHOR)); this.author = (String)(contentProps.get(ContentModel.PROP_AUTHOR));
this.title = (String)(contentProps.get(ContentModel.PROP_TITLE)); this.title = DefaultTypeConverter.INSTANCE.convert(String.class, contentProps.get(ContentModel.PROP_TITLE));
this.description = (String)(contentProps.get(ContentModel.PROP_DESCRIPTION)); this.description = DefaultTypeConverter.INSTANCE.convert(String.class, contentProps.get(ContentModel.PROP_DESCRIPTION));
} }
// default the title to the file name if not set // default the title to the file name if not set