Author: sgoeschl
Date: Fri Nov 19 17:17:46 2010
New Revision: 1036948
URL: http://svn.apache.org/viewvc?rev=1036948&view=rev
Log:
Added 'mime.types' file and two tests
Added:
turbine/fulcrum/trunk/mimetype/src/test/mime.types
Modified:
turbine/fulcrum/trunk/mimetype/src/test/TestComponentConfig.xml
turbine/fulcrum/trunk/mimetype/src/test/TestRoleConfig.xml
turbine/fulcrum/trunk/mimetype/src/test/org/apache/fulcrum/mimetype/MimetypeTest.java
turbine/fulcrum/trunk/mimetype/xdocs/changes.xml
turbine/fulcrum/trunk/mimetype/xdocs/index.xml
Modified: turbine/fulcrum/trunk/mimetype/src/test/TestComponentConfig.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/mimetype/src/test/TestComponentConfig.xml?rev=1036948&r1=1036947&r2=1036948&view=diff
==============================================================================
--- turbine/fulcrum/trunk/mimetype/src/test/TestComponentConfig.xml (original)
+++ turbine/fulcrum/trunk/mimetype/src/test/TestComponentConfig.xml Fri Nov 19
17:17:46 2010
@@ -18,5 +18,14 @@
under the License.
-->
<componentConfig>
- <mimetype/>
+
+ <!--
+ MimeTypeService
+
+ @mimetypes file containing mime-type to file extension mapping
+ @charsets file containing locale to charset mappings
+ -->
+
+ <MimeTypeService mimetypes="./src/test/mime.types"/>
+
</componentConfig>
Modified: turbine/fulcrum/trunk/mimetype/src/test/TestRoleConfig.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/mimetype/src/test/TestRoleConfig.xml?rev=1036948&r1=1036947&r2=1036948&view=diff
==============================================================================
--- turbine/fulcrum/trunk/mimetype/src/test/TestRoleConfig.xml (original)
+++ turbine/fulcrum/trunk/mimetype/src/test/TestRoleConfig.xml Fri Nov 19
17:17:46 2010
@@ -21,6 +21,6 @@
<role-list>
<role
name="org.apache.fulcrum.mimetype.MimeTypeService"
- shorthand="mimetype"
+ shorthand="MimeTypeService"
default-class="org.apache.fulcrum.mimetype.DefaultMimeTypeService"/>
</role-list>
Added: turbine/fulcrum/trunk/mimetype/src/test/mime.types
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/mimetype/src/test/mime.types?rev=1036948&view=auto
==============================================================================
--- turbine/fulcrum/trunk/mimetype/src/test/mime.types (added)
+++ turbine/fulcrum/trunk/mimetype/src/test/mime.types Fri Nov 19 17:17:46 2010
@@ -0,0 +1,33 @@
+#
+# A simple, old format, mime.types file
+#
+
+application/msexcel xls
+application/msword doc
+application/pdf pdf PDF
+application/postscript ai eps ps
+application/rtf rtf
+application/x-tex tex
+application/x-texinfo texinfo texi
+application/x-troff t tr roff
+application/xhtml+xml xhtml
+audio/basic au
+audio/midi midi mid
+audio/x-aifc aifc
+audio/x-aiff aif aiff
+audio/x-mpeg mpeg mpg
+audio/x-wav wav
+image/gif gif GIF
+image/ief ief
+image/jpeg jpeg jpg jpe JPG
+image/png png PNG
+image/tiff tiff tif
+image/x-xwindowdump xwd
+message/rfc822 eml
+text/html html htm HTML HTM
+text/plain txt text TXT TEXT
+text/xml xml
+video/mpeg mpeg mpg mpe
+video/quicktime qt mov
+video/x-msvideo avi
+
Modified:
turbine/fulcrum/trunk/mimetype/src/test/org/apache/fulcrum/mimetype/MimetypeTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/mimetype/src/test/org/apache/fulcrum/mimetype/MimetypeTest.java?rev=1036948&r1=1036947&r2=1036948&view=diff
==============================================================================
---
turbine/fulcrum/trunk/mimetype/src/test/org/apache/fulcrum/mimetype/MimetypeTest.java
(original)
+++
turbine/fulcrum/trunk/mimetype/src/test/org/apache/fulcrum/mimetype/MimetypeTest.java
Fri Nov 19 17:17:46 2010
@@ -78,13 +78,24 @@ public class MimetypeTest extends BaseUn
}
}
- public void testGetDefaultExtension() throws Exception
+ public void testGetDefaultExtensionForCrazy() throws Exception
{
- String result =
- mimeTypeService.getDefaultExtension(MimeTypeMapperTest.MIME_TYPE);
+ String result =
mimeTypeService.getDefaultExtension(MimeTypeMapperTest.MIME_TYPE);
assertEquals("crazy", result);
MimeType mt = new MimeType(MimeTypeMapperTest.MIME_TYPE);
result = mimeTypeService.getDefaultExtension(mt);
assertEquals("crazy", result);
}
+
+ public void testGetDefaultExtensionForPdf() throws Exception
+ {
+ assertEquals("pdf",
mimeTypeService.getDefaultExtension("application/pdf"));
+ }
+
+ public void testGetContentTypeForPdf() throws Exception
+ {
+ assertEquals("application/pdf",
mimeTypeService.getContentType("foo.pdf"));
+ assertEquals("application/pdf",
mimeTypeService.getContentType("foo.PDF"));
+ assertEquals("application/pdf",
mimeTypeService.getContentType("foo.Pdf"));
+ }
}
Modified: turbine/fulcrum/trunk/mimetype/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/mimetype/xdocs/changes.xml?rev=1036948&r1=1036947&r2=1036948&view=diff
==============================================================================
--- turbine/fulcrum/trunk/mimetype/xdocs/changes.xml (original)
+++ turbine/fulcrum/trunk/mimetype/xdocs/changes.xml Fri Nov 19 17:17:46 2010
@@ -25,6 +25,9 @@
<body>
<release version="1.0.6-SNAPSHOT" date="in SVN">
+ <action dev="sgoeschl" type="add">
+ Added 'mime.types' file and two tests.
+ </action>
</release>
<release version="1.0.5" date="2009-09-11">
<action dev="tv" type="update">
Modified: turbine/fulcrum/trunk/mimetype/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/mimetype/xdocs/index.xml?rev=1036948&r1=1036947&r2=1036948&view=diff
==============================================================================
--- turbine/fulcrum/trunk/mimetype/xdocs/index.xml (original)
+++ turbine/fulcrum/trunk/mimetype/xdocs/index.xml Fri Nov 19 17:17:46 2010
@@ -48,7 +48,7 @@
<source><![CDATA[
<role
name="org.apache.fulcrum.mimetype.MimeTypeService"
- shorthand="mimetype"
+ shorthand="MimeTypeService"
default-class="org.apache.fulcrum.mimetype.DefaultMimeTypeService"/>
]]></source>
</subsection>
@@ -85,7 +85,7 @@
<subsection name="Component Configuration Example">
<source><![CDATA[
- <mimetype
+ <MimeTypeService
mimetypes="WEB-INF/conf/mime.types"
charsets="WEB-INF/conf/charsets.properties" />
]]></source>
