[gatein-commits] gatein SVN: r7578 - in epp/portal/branches/EPP_5_2_Branch: component and 7 other directories.

Author: hfnukal Date: 2011-10-01 12:14:30 -0400 (Sat, 01 Oct 2011) New Revision: 7578 Added: epp/portal/branches/EPP_5_2_Branch/component/web/server/src/main/java/org/exoplatform/upload/MimeTypeUploadPlugin.java epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/mimetype/ epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/mimetype/mimetypes.properties Removed: epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/mimetype/mimetypes.properties Modified: epp/portal/branches/EPP_5_2_Branch/ epp/portal/branches/EPP_5_2_Branch/component/ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/ epp/portal/branches/EPP_5_2_Branch/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/web/web-inf-extension-configuration.xml epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/src/main/webapp/WEB-INF/web.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/ Log: JBEPP-1196 Mime Type definition for file uploading Property changes on: epp/portal/branches/EPP_5_2_Branch ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868 /portal/branches/branch-GTNPORTAL-1592:4894 /portal/branches/branch-GTNPORTAL-1643:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745:5765 /portal/branches/branch-GTNPORTAL-1790:5871 /portal/branches/branch-GTNPORTAL-1822:5943,5952 /portal/branches/branch-GTNPORTAL-1832:6030,6063 /portal/branches/branch-GTNPORTAL-1872:6400,6551 /portal/branches/branch-GTNPORTAL-1921:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963:6904,6915-6916 /portal/branches/decoupled-webos:6214-6243 /portal/branches/gatein-management:6920-6958 /portal/branches/global-portlet-metadata:6298-6384 /portal/branches/site-describability:6171-6235 /portal/trunk:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7095,7117,7125,7132-7134,7186,7239,7262,7308,7326,7331,7359,7367,7433,7454 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868 /portal/branches/branch-GTNPORTAL-1592:4894 /portal/branches/branch-GTNPORTAL-1643:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745:5765 /portal/branches/branch-GTNPORTAL-1790:5871 /portal/branches/branch-GTNPORTAL-1822:5943,5952 /portal/branches/branch-GTNPORTAL-1832:6030,6063 /portal/branches/branch-GTNPORTAL-1872:6400,6551 /portal/branches/branch-GTNPORTAL-1921:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963:6904,6915-6916 /portal/branches/decoupled-webos:6214-6243 /portal/branches/gatein-management:6920-6958 /portal/branches/global-portlet-metadata:6298-6384 /portal/branches/site-describability:6171-6235 /portal/trunk:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7095,7117,7125,7132-7134,7186,7239,7262,7308,7326,7331,7359,7367,7433,7452,7454,7478 Property changes on: epp/portal/branches/EPP_5_2_Branch/component ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868 /portal/branches/branch-GTNPORTAL-1592/component:4894 /portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/component:5765 /portal/branches/branch-GTNPORTAL-1790/component:5871 /portal/branches/branch-GTNPORTAL-1822/component:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/component:6904,6915-6916 /portal/trunk/component:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7095,7117,7120,7125,7132-7134,7186,7239,7262,7308,7326,7331,7359,7367,7433,7454 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868 /portal/branches/branch-GTNPORTAL-1592/component:4894 /portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/component:5765 /portal/branches/branch-GTNPORTAL-1790/component:5871 /portal/branches/branch-GTNPORTAL-1822/component:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/component:6904,6915-6916 /portal/trunk/component:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7095,7117,7120,7125,7132-7134,7186,7239,7262,7308,7326,7331,7359,7367,7433,7452,7454,7478 Property changes on: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component/portal/src/main/java/org:5868 /portal/branches/branch-GTNPORTAL-1592/component/portal/src/main/java/org:4894 /portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component/portal/src/main/java/org:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component/portal/src/main/java/org:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/java/org:5765 /portal/branches/branch-GTNPORTAL-1790/component/portal/src/main/java/org:5871 /portal/branches/branch-GTNPORTAL-1822/component/portal/src/main/java/org:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component/portal/src/main/java/org:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/component/portal/src/main/java/org:6904,6915-6916 /portal/trunk/component/portal/src/main/java/org:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7095,7117,7120,7125,7132-7134,7186,7198,7239,7262,7308,7326,7331,7359,7367,7433,7454 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component/portal/src/main/java/org:5868 /portal/branches/branch-GTNPORTAL-1592/component/portal/src/main/java/org:4894 /portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component/portal/src/main/java/org:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component/portal/src/main/java/org:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/java/org:5765 /portal/branches/branch-GTNPORTAL-1790/component/portal/src/main/java/org:5871 /portal/branches/branch-GTNPORTAL-1822/component/portal/src/main/java/org:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component/portal/src/main/java/org:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/component/portal/src/main/java/org:6904,6915-6916 /portal/trunk/component/portal/src/main/java/org:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7095,7117,7120,7125,7132-7134,7186,7198,7239,7262,7308,7326,7331,7359,7367,7433,7452,7454,7478 Copied: epp/portal/branches/EPP_5_2_Branch/component/web/server/src/main/java/org/exoplatform/upload/MimeTypeUploadPlugin.java (from rev 7478, portal/trunk/component/web/server/src/main/java/org/exoplatform/upload/MimeTypeUploadPlugin.java) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/server/src/main/java/org/exoplatform/upload/MimeTypeUploadPlugin.java (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/web/server/src/main/java/org/exoplatform/upload/MimeTypeUploadPlugin.java 2011-10-01 16:14:30 UTC (rev 7578) @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2003-2011 eXo Platform SAS. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License + * as published by the Free Software Foundation; either version 3 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see<http://www.gnu.org/licenses/>;. + */ +package org.exoplatform.upload; + +import java.net.URL; +import java.net.URLConnection; +import java.util.Properties; + +import org.exoplatform.container.component.BaseComponentPlugin; +import org.exoplatform.container.configuration.ConfigurationManager; +import org.exoplatform.container.xml.InitParams; +import org.exoplatform.container.xml.ValueParam; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; + +/** + * Created by The eXo Platform SAS + * Author : Nguyen Thanh Hai + * haint(a)exoplatform.com + * Jun 29, 2011 + */ +public class MimeTypeUploadPlugin extends BaseComponentPlugin +{ + final private static Logger log = LoggerFactory.getLogger(MimeTypeUploadPlugin.class); + final private static String MIMETYPE_PATH = "mimetype-path" ; + final private static String DEFAULT_MIMETYPE = "mimetype-default"; + + private Properties mimeTypes = new Properties(); + private String mimetypeDefault ; + + public MimeTypeUploadPlugin(InitParams initParams, ConfigurationManager configurationService) throws Exception + { + ValueParam param = initParams.getValueParam(MIMETYPE_PATH) ; + URL filePath = configurationService.getURL(param.getValue()); + URLConnection connection = filePath.openConnection() ; + mimeTypes.load(connection.getInputStream()) ; + + param = initParams.getValueParam(DEFAULT_MIMETYPE) ; + if(param != null) mimetypeDefault = param.getValue() ; + } + + public String getMimeType(String fileName) + { + if(fileName.indexOf('.') == -1) return mimetypeDefault ; + String ext = fileName.substring(fileName.lastIndexOf('.') + 1); + String mimeType = mimeTypes.getProperty(ext.toLowerCase(), mimetypeDefault); + if (mimeType == null || mimeType.length() == 0) return null ; + return mimeType; + } +} Modified: epp/portal/branches/EPP_5_2_Branch/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java 2011-09-30 20:55:57 UTC (rev 7577) +++ epp/portal/branches/EPP_5_2_Branch/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java 2011-10-01 16:14:30 UTC (rev 7578) @@ -20,6 +20,9 @@ package org.exoplatform.upload; import java.io.File; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; @@ -44,6 +47,8 @@ { /** . */ private static final Logger log = LoggerFactory.getLogger(UploadService.class); + + private List<MimeTypeUploadPlugin> plugins ; private Map<String, UploadResource> uploadResources = new LinkedHashMap<String, UploadResource>(); @@ -52,7 +57,7 @@ private int defaultUploadLimitMB_; private Map<String, Integer> uploadLimitsMB_ = new LinkedHashMap<String, Integer>(); - + public static String UPLOAD_RESOURCES_STACK = "uploadResourcesStack"; public UploadService(PortalContainerInfo pinfo, InitParams params) throws Exception @@ -67,7 +72,12 @@ if (!uploadDir.exists()) uploadDir.mkdirs(); } - + + public void register(MimeTypeUploadPlugin plugin) { + if(plugins == null) plugins = new ArrayList<MimeTypeUploadPlugin>() ; + plugins.add(plugin) ; + } + /** * Create UploadResource for HttpServletRequest * @@ -115,6 +125,12 @@ upResource.setFileName(fileName); upResource.setMimeType(fileItem.getContentType()); + if(plugins != null) + for(MimeTypeUploadPlugin plugin : plugins) + { + String mimeType = plugin.getMimeType(fileName) ; + if(mimeType != null) upResource.setMimeType(mimeType) ; + } upResource.setStoreLocation(storeLocation); upResource.setStatus(UploadResource.UPLOADED_STATUS); } @@ -271,4 +287,6 @@ } return false; } + + } Deleted: epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/mimetype/mimetypes.properties =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/mimetype/mimetypes.properties 2011-09-22 03:16:42 UTC (rev 7478) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/mimetype/mimetypes.properties 2011-10-01 16:14:30 UTC (rev 7578) @@ -1,156 +0,0 @@ -ai=application/postscript -aif=audio/x-aiff -aifc=audio/x-aiff -aiff=audio/x-aiff -any=text/any -asc=text/plain -au=audio/basic -avi=video/x-msvideo -bcpio=application/x-bcpio -bin=application/octet-stream -bz2=application/x-bzip2 -cdf=application/x-netcdf -class=application/octet-stream -cpio=application/x-cpio -cpt=application/mac-compactpro -cq=application/cq-durboser -csh=application/x-csh -css=text/css -dcr=application/x-director -dir=application/x-director -dms=application/octet-stream -doc=application/msword -dvi=application/x-dvi -dxr=application/x-director -ecma=text/qhtml -eps=application/postscript -esp=text/qhtml -etx=text/x-setext -exe=application/octet-stream -ez=application/andrew-inset -gif=image/gif -gtar=application/x-gtar -gz=application/x-gzip -hdf=application/x-hdf -hqx=application/mac-binhex40 -htm=text/html -html=text/html -ice=x-conference/x-cooltalk -ief=image/ief -iges=model/iges -igs=model/iges -jpeg=image/jpeg -jpe=image/jpeg -jpg=image/jpeg -bmp=image/bmp -js=application/x-javascript -kar=audio/midi -latex=application/x-latex -lha=application/octet-stream -lzh=application/octet-stream -man=application/x-troff-man -me=application/x-troff-me -mesh=model/mesh -mid=audio/midi -midi=audio/midi -mif=application/vnd=mif -mov=video/quicktime -m4v=video/x-m4v -m4a=audio/x-m4a -movie=video/x-sgi-movie -mp2=audio/mp2 -mp3=audio/mp3 -mpe=video/mpe -mp4=video/mp4 -mpeg=video/mpeg -mpg=video/mpeg -mpg=video/mpg -mpga=audio/mpga -ms=application/x-troff-ms -msh=model/mesh -nc=application/x-netcdf -oda=application/oda -pbm=image/x-portable-bitmap -pdb=chemical/x-pdb -pdf=application/pdf -pgm=image/x-portable-graymap -pgn=application/x-chess-pgn -png=image/png -pnm=image/x-portable-anymap -ppm=image/x-portable-pixmap -ppt=application/ppt -properties=text/plain -ps=application/postscript -qhtml=text/qhtml -qt=video/quicktime -ra=audio/x-realaudio -ram=audio/x-pn-realaudio -rm=audio/x-pn-realaudio -ras=image/x-cmu-raster -rgb=image/x-rgb -roff=application/x-troff -rpm=application/x-rpm -rtf=application/rtf -sgm=text/sgml -sgml=text/sgml -sh=application/x-sh -shar=application/x-shar -silo=model/mesh -sit=application/x-stuffit -skd=application/x-koan -skm=application/x-koan -skp=application/x-koan -skt=application/x-koan -smi=application/smil -smil=application/smil -snd=audio/basic -spl=application/x-futuresplash -src=application/x-wais-source -sv4cpio=application/x-sv4cpio -sv4crc=application/x-sv4crc -swf=application/x-shockwave-flash -t=application/x-troff -tar=application/x-tar -tcl=application/x-tcl -tex=application/x-tex -texi=application/x-texinfo -texinfo=application/x-texinfo -tgz=application/x-gzip -tif=image/tiff -tiff=image/tiff -tr=application/x-troff -tsv=text/tab-separated-values -txt=text/plain -odt=application/vnd.oasis.opendocument.text -ods=application/vnd.oasis.opendocument.spreadsheet -odp=application/vnd.oasis.opendocument.presentation -odb=application/vnd.oasis.opendocument.database -ustar=application/x-ustar -vcd=application/x-cdlink -vm=text/plain -vrml=model/vrml -wav=audio/x-wav -wrl=model/vrml -xbm=image/x-xbitmap -xls=application/xls -xml=text/xml -xpdl=text/xml -xpm=image/x-xpixmap -xwd=image/x-xwindowdump -xyz=chemical/x-pdb -zip=application/zip -rar=application/rar -msg=application/vnd.ms-outlook -flv=video/x-flv -docx=application/vnd.openxmlformats-officedocument.wordprocessingml.document -wpd=application/wordperfect -wiki=text/x-wiki -sxc=application/vnd.sun.xml.calc -xlsx=application/vnd.openxmlformats-officedocument.spreadsheetml.sheet -csv=text/csv -tsv=text/tab-separated-values -sxi=application/vnd.sun.xml.impress -pptx=application/vnd.openxmlformats-officedocument.presentationml.presentation -odg=application/vnd.oasis.opendocument.graphics -svg=image/svg+xml -sxw=application/vnd.sun.xml.writer \ No newline at end of file Copied: epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/mimetype/mimetypes.properties (from rev 7478, portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/mimetype/mimetypes.properties) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/mimetype/mimetypes.properties (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/mimetype/mimetypes.properties 2011-10-01 16:14:30 UTC (rev 7578) @@ -0,0 +1,156 @@ +ai=application/postscript +aif=audio/x-aiff +aifc=audio/x-aiff +aiff=audio/x-aiff +any=text/any +asc=text/plain +au=audio/basic +avi=video/x-msvideo +bcpio=application/x-bcpio +bin=application/octet-stream +bz2=application/x-bzip2 +cdf=application/x-netcdf +class=application/octet-stream +cpio=application/x-cpio +cpt=application/mac-compactpro +cq=application/cq-durboser +csh=application/x-csh +css=text/css +dcr=application/x-director +dir=application/x-director +dms=application/octet-stream +doc=application/msword +dvi=application/x-dvi +dxr=application/x-director +ecma=text/qhtml +eps=application/postscript +esp=text/qhtml +etx=text/x-setext +exe=application/octet-stream +ez=application/andrew-inset +gif=image/gif +gtar=application/x-gtar +gz=application/x-gzip +hdf=application/x-hdf +hqx=application/mac-binhex40 +htm=text/html +html=text/html +ice=x-conference/x-cooltalk +ief=image/ief +iges=model/iges +igs=model/iges +jpeg=image/jpeg +jpe=image/jpeg +jpg=image/jpeg +bmp=image/bmp +js=application/x-javascript +kar=audio/midi +latex=application/x-latex +lha=application/octet-stream +lzh=application/octet-stream +man=application/x-troff-man +me=application/x-troff-me +mesh=model/mesh +mid=audio/midi +midi=audio/midi +mif=application/vnd=mif +mov=video/quicktime +m4v=video/x-m4v +m4a=audio/x-m4a +movie=video/x-sgi-movie +mp2=audio/mp2 +mp3=audio/mp3 +mpe=video/mpe +mp4=video/mp4 +mpeg=video/mpeg +mpg=video/mpeg +mpg=video/mpg +mpga=audio/mpga +ms=application/x-troff-ms +msh=model/mesh +nc=application/x-netcdf +oda=application/oda +pbm=image/x-portable-bitmap +pdb=chemical/x-pdb +pdf=application/pdf +pgm=image/x-portable-graymap +pgn=application/x-chess-pgn +png=image/png +pnm=image/x-portable-anymap +ppm=image/x-portable-pixmap +ppt=application/ppt +properties=text/plain +ps=application/postscript +qhtml=text/qhtml +qt=video/quicktime +ra=audio/x-realaudio +ram=audio/x-pn-realaudio +rm=audio/x-pn-realaudio +ras=image/x-cmu-raster +rgb=image/x-rgb +roff=application/x-troff +rpm=application/x-rpm +rtf=application/rtf +sgm=text/sgml +sgml=text/sgml +sh=application/x-sh +shar=application/x-shar +silo=model/mesh +sit=application/x-stuffit +skd=application/x-koan +skm=application/x-koan +skp=application/x-koan +skt=application/x-koan +smi=application/smil +smil=application/smil +snd=audio/basic +spl=application/x-futuresplash +src=application/x-wais-source +sv4cpio=application/x-sv4cpio +sv4crc=application/x-sv4crc +swf=application/x-shockwave-flash +t=application/x-troff +tar=application/x-tar +tcl=application/x-tcl +tex=application/x-tex +texi=application/x-texinfo +texinfo=application/x-texinfo +tgz=application/x-gzip +tif=image/tiff +tiff=image/tiff +tr=application/x-troff +tsv=text/tab-separated-values +txt=text/plain +odt=application/vnd.oasis.opendocument.text +ods=application/vnd.oasis.opendocument.spreadsheet +odp=application/vnd.oasis.opendocument.presentation +odb=application/vnd.oasis.opendocument.database +ustar=application/x-ustar +vcd=application/x-cdlink +vm=text/plain +vrml=model/vrml +wav=audio/x-wav +wrl=model/vrml +xbm=image/x-xbitmap +xls=application/xls +xml=text/xml +xpdl=text/xml +xpm=image/x-xpixmap +xwd=image/x-xwindowdump +xyz=chemical/x-pdb +zip=application/zip +rar=application/rar +msg=application/vnd.ms-outlook +flv=video/x-flv +docx=application/vnd.openxmlformats-officedocument.wordprocessingml.document +wpd=application/wordperfect +wiki=text/x-wiki +sxc=application/vnd.sun.xml.calc +xlsx=application/vnd.openxmlformats-officedocument.spreadsheetml.sheet +csv=text/csv +tsv=text/tab-separated-values +sxi=application/vnd.sun.xml.impress +pptx=application/vnd.openxmlformats-officedocument.presentationml.presentation +odg=application/vnd.oasis.opendocument.graphics +svg=image/svg+xml +sxw=application/vnd.sun.xml.writer \ No newline at end of file Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/web/web-inf-extension-configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/web/web-inf-extension-configuration.xml 2011-09-30 20:55:57 UTC (rev 7577) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/web/web-inf-extension-configuration.xml 2011-10-01 16:14:30 UTC (rev 7578) @@ -88,4 +88,22 @@ </init-params> </component-plugin> </external-component-plugins> + <external-component-plugins> + <target-component>org.exoplatform.upload.UploadService</target-component> + <component-plugin> + <name>MIME type Plugins for UploadService</name> + <set-method>register</set-method> + <type>org.exoplatform.upload.MimeTypeUploadPlugin</type> + <init-params> + <value-param> + <name>mimetype-path</name> + <value>war:/conf/mimetype/mimetypes.properties</value> + </value-param> + <value-param> + <name>mimetype-default</name> + <value>application/octet-stream</value> + </value-param> + </init-params> + </component-plugin> + </external-component-plugins> </configuration> \ No newline at end of file Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/src/main/webapp/WEB-INF/web.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/src/main/webapp/WEB-INF/web.xml 2011-09-30 20:55:57 UTC (rev 7577) +++ epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/src/main/webapp/WEB-INF/web.xml 2011-10-01 16:14:30 UTC (rev 7578) @@ -28,11 +28,12 @@ <servlet> <servlet-name>GateInServlet</servlet-name> <servlet-class>org.gatein.wci.api.GateInServlet</servlet-class> + <load-on-startup>0</load-on-startup> </servlet> + <servlet-mapping> <servlet-name>GateInServlet</servlet-name> <url-pattern>/gateinservlet</url-pattern> - <load-on-startup>0</load-on-startup> </servlet-mapping> <security-role> Property changes on: epp/portal/branches/EPP_5_2_Branch/wsrp-integration ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/wsrp-integration:5868 /portal/branches/branch-GTNPORTAL-1592/wsrp-integration:4894 /portal/branches/branch-GTNPORTAL-1643/wsrp-integration:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/wsrp-integration:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/wsrp-integration:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/wsrp-integration:5765 /portal/branches/branch-GTNPORTAL-1790/wsrp-integration:5871 /portal/branches/branch-GTNPORTAL-1822/wsrp-integration:5943,5952 /portal/branches/branch-GTNPORTAL-1832/wsrp-integration:6030,6063 /portal/branches/branch-GTNPORTAL-1872/wsrp-integration:6400,6551 /portal/branches/branch-GTNPORTAL-1921/wsrp-integration:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/wsrp-integration:6904,6915-6916 /portal/branches/decoupled-webos/wsrp-integration:6214-6243 /portal/branches/gatein-management/wsrp-integration:6920-6958 /portal/branches/global-portlet-metadata/wsrp-integration:6298-6384 /portal/branches/site-describability/wsrp-integration:6171-6235 /portal/trunk/wsrp-integration:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7095,7117,7125,7132-7134,7186,7198,7239,7262,7308,7326,7331,7359,7367,7433,7454 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/wsrp-integration:5868 /portal/branches/branch-GTNPORTAL-1592/wsrp-integration:4894 /portal/branches/branch-GTNPORTAL-1643/wsrp-integration:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/wsrp-integration:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/wsrp-integration:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/wsrp-integration:5765 /portal/branches/branch-GTNPORTAL-1790/wsrp-integration:5871 /portal/branches/branch-GTNPORTAL-1822/wsrp-integration:5943,5952 /portal/branches/branch-GTNPORTAL-1832/wsrp-integration:6030,6063 /portal/branches/branch-GTNPORTAL-1872/wsrp-integration:6400,6551 /portal/branches/branch-GTNPORTAL-1921/wsrp-integration:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/wsrp-integration:6904,6915-6916 /portal/branches/decoupled-webos/wsrp-integration:6214-6243 /portal/branches/gatein-management/wsrp-integration:6920-6958 /portal/branches/global-portlet-metadata/wsrp-integration:6298-6384 /portal/branches/site-describability/wsrp-integration:6171-6235 /portal/trunk/wsrp-integration:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7095,7117,7125,7132-7134,7186,7198,7239,7262,7308,7326,7331,7359,7367,7433,7452,7454,7478