You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2011/11/22 19:02:19 UTC
svn commit: r1205114 - in /jackrabbit/trunk:
jackrabbit-jcr-server/src/main/resources/
jackrabbit-jcr-server/src/test/resources/config.xml
jackrabbit-webapp/src/main/webapp/WEB-INF/config.xml
Author: jukka
Date: Tue Nov 22 18:02:18 2011
New Revision: 1205114
URL: http://svn.apache.org/viewvc?rev=1205114&view=rev
Log:
JCR-2334: Tika-based type detection in jcr-server
Remove obsolete mime type settings.
Removed:
jackrabbit/trunk/jackrabbit-jcr-server/src/main/resources/
Modified:
jackrabbit/trunk/jackrabbit-jcr-server/src/test/resources/config.xml
jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/WEB-INF/config.xml
Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/test/resources/config.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/test/resources/config.xml?rev=1205114&r1=1205113&r2=1205114&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/test/resources/config.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/test/resources/config.xml Tue Nov 22 18:02:18 2011
@@ -180,19 +180,5 @@
</namespaces>
</filter>
- <!--
- Optional 'mimetypeproperties' element.
- It defines additional or replaces existing mappings for the MimeResolver
- instance created by the ResourceConfig.
- The default mappings are defined in org.apache.jackrabbit.server.io.mimetypes.properties.
- If the default mime type defined by MimeResolver is 'application/octet-stream'.
- -->
- <!--
- <mimetypeproperties>
- <mimemapping extension="rtf" mimetype="application/rtf" />
- <mimemapping extension="ott" mimetype="application/vnd.oasis.opendocument.text-template" />
- <defaultmimetype>text/html</defaultmimetype>
- </mimetypeproperties>
- -->
</config>
Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/WEB-INF/config.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/WEB-INF/config.xml?rev=1205114&r1=1205113&r2=1205114&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/WEB-INF/config.xml (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/WEB-INF/config.xml Tue Nov 22 18:02:18 2011
@@ -179,20 +179,6 @@
-->
</namespaces>
</filter>
-
- <!--
- Optional 'mimetypeproperties' element.
- It defines additional or replaces existing mappings for the MimeResolver
- instance created by the ResourceConfig.
- The default mappings are defined in org.apache.jackrabbit.server.io.mimetypes.properties.
- If the default mime type defined by MimeResolver is 'application/octet-stream'.
- -->
- <!--
- <mimetypeproperties>
- <mimemapping extension="rtf" mimetype="application/rtf" />
- <mimemapping extension="ott" mimetype="application/vnd.oasis.opendocument.text-template" />
- <defaultmimetype>text/html</defaultmimetype>
- </mimetypeproperties>
- -->
+
</config>