This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.commons.contentdetection-1.0.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-contentdetection.git
commit b35c36c4c3c0e28d137be618c58bbb7adc30b827 Author: Bertrand Delacretaz <[email protected]> AuthorDate: Wed May 27 14:14:03 2015 +0000 SLING-4694 - new contentdetection module, contributed by Satya Deep Maheshwari, thanks! git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/contentdetection@1682035 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 136 ++++++++++++ .../ContentAwareMimeTypeService.java | 42 ++++ .../contentdetection/FileNameExtractor.java | 31 +++ .../internal/ContentAwareMimeTypeServiceImpl.java | 75 +++++++ .../internal/FileNameExtractorImpl.java | 67 ++++++ .../commons/contentdetection/package-info.java | 34 +++ .../ContentAwareMimeTypeServiceImplTest.java | 34 +++ src/main/resources/META-INF/LICENSE | 234 +++++++++++++++++++++ src/main/resources/META-INF/NOTICE | 8 + .../OSGI-INF/metatype/metatype.properties | 31 +++ .../ContentAwareMimeTypeServiceImplTest.java | 112 ++++++++++ .../internal/FileNameExtractorImplTest.java | 33 +++ 12 files changed, 837 insertions(+) diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..b3dd87b --- /dev/null +++ b/pom.xml @@ -0,0 +1,136 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.sling</groupId> + <artifactId>sling</artifactId> + <version>22</version> + <relativePath>../../../parent/pom.xml</relativePath> + </parent> + + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.commons.contentdetection</artifactId> + <version>0.9.9-SNAPSHOT</version> + <packaging>bundle</packaging> + + <name>Apache Sling Content Detection Support</name> + <description>Support for MIME type detection on the basis of contents.</description> + + <properties> + <powermock.version>1.6.2</powermock.version> + </properties> + + <dependencies> + + <!-- OSGi Dependncies--> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> + </dependency> + + <!-- Sling Dependncies--> + <dependency> + <version>2.1.9-SNAPSHOT</version> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.commons.mime</artifactId> + <scope>provided</scope> + </dependency> + + <!-- Other Dependncies--> + <dependency> + <version>1.2</version> + <groupId>org.apache.tika</groupId> + <artifactId>tika-core</artifactId> + <scope>provided</scope> + </dependency> + + <!-- Test Dependncies--> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.junit.core</artifactId> + <version>1.0.10</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <version>3.3.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-junit4</artifactId> + <version>${powermock.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-easymock</artifactId> + <version>${powermock.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-scr-plugin</artifactId> + </plugin> + + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> + <Bundle-Version>${project.version}</Bundle-Version> + <Export-Package> + org.apache.sling.commons.contentdetection.serversidetests, + org.apache.sling.commons.contentdetection + </Export-Package> + <Import-Package> + * + </Import-Package> + <Sling-Test-Regexp>.*Test</Sling-Test-Regexp> + </instructions> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + </plugin> + + </plugins> + </build> + +</project> diff --git a/src/main/java/org/apache/sling/commons/contentdetection/ContentAwareMimeTypeService.java b/src/main/java/org/apache/sling/commons/contentdetection/ContentAwareMimeTypeService.java new file mode 100644 index 0000000..37be925 --- /dev/null +++ b/src/main/java/org/apache/sling/commons/contentdetection/ContentAwareMimeTypeService.java @@ -0,0 +1,42 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.sling.commons.contentdetection; + +import org.apache.sling.commons.mime.MimeTypeService; + +import java.io.IOException; +import java.io.InputStream; + +/** + * The <code>ContentAwareMimeTypeService</code> interface extends the + * {@link org.apache.sling.commons.mime.MimeTypeService} API for services + * which can detect mime types based on the content passed to them. + * <p> + * The implementing services should rely on analyzing the content to ascertain + * the mime type. This interface may be implemented by bundles wishing to provide + * a mechanism to detect mime type based on the contents. + */ + +public interface ContentAwareMimeTypeService extends MimeTypeService { + /** + * @param filename used if <code>content</code> is <code>null</code> or if + * this service does not support content-based detection + * @param content optional stream that points to the content to analyze + * @return the mime type + */ + String getMimeType(String filename, InputStream content) throws IOException; +} diff --git a/src/main/java/org/apache/sling/commons/contentdetection/FileNameExtractor.java b/src/main/java/org/apache/sling/commons/contentdetection/FileNameExtractor.java new file mode 100644 index 0000000..93f405b --- /dev/null +++ b/src/main/java/org/apache/sling/commons/contentdetection/FileNameExtractor.java @@ -0,0 +1,31 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.sling.commons.contentdetection; + +/** + * The <code>FileNameExtractor</code> interface provides an API for extracting + * a files name from the provided <code>rawName</code>. + */ +public interface FileNameExtractor { + + /** + * + * @param rawName of the file which may be a file's path or url + * @return the extracted file name + */ + public String extract(String rawName); +} diff --git a/src/main/java/org/apache/sling/commons/contentdetection/internal/ContentAwareMimeTypeServiceImpl.java b/src/main/java/org/apache/sling/commons/contentdetection/internal/ContentAwareMimeTypeServiceImpl.java new file mode 100644 index 0000000..81b9e4a --- /dev/null +++ b/src/main/java/org/apache/sling/commons/contentdetection/internal/ContentAwareMimeTypeServiceImpl.java @@ -0,0 +1,75 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +package org.apache.sling.commons.contentdetection.internal; + + +import org.apache.felix.scr.annotations.*; +import org.apache.sling.commons.contentdetection.ContentAwareMimeTypeService; +import org.apache.sling.commons.mime.MimeTypeService; +import org.apache.tika.detect.Detector; +import org.apache.tika.io.TikaInputStream; +import org.apache.tika.metadata.Metadata; +import org.apache.tika.mime.MediaType; +import org.osgi.framework.Constants; + +import java.io.IOException; +import java.io.InputStream; + +@Component(label = "%contentawaremime.service.name", description = "%contentawaremime.service.description") +@Service(value = {ContentAwareMimeTypeService.class}) + +@Properties({ + @Property(name = Constants.SERVICE_DESCRIPTION, value = "Apache Sling Content Aware MIME Type Service"), + @Property(name = "detection.mode", value = "tika") } +) +public class ContentAwareMimeTypeServiceImpl implements ContentAwareMimeTypeService { + + @Reference + Detector detector; + + @Reference + MimeTypeService mimeTypeService; + + public String getMimeType(String filename, InputStream content) throws IOException { + if(content == null) { + return mimeTypeService.getMimeType(filename); + } + TikaInputStream stream = TikaInputStream.get(content); + Metadata metadata = new Metadata(); + metadata.set(Metadata.RESOURCE_NAME_KEY, filename); + MediaType mediaType = detector.detect(stream, metadata); + return mediaType.toString(); + } + + public String getMimeType(String name) { + return mimeTypeService.getMimeType(name); + } + + public String getExtension(String mimeType) { + return mimeTypeService.getExtension(mimeType); + } + + public void registerMimeType(String mimeType, String... extensions) { + mimeTypeService.registerMimeType(mimeType, extensions); + } + + public void registerMimeType(InputStream mimeTabStream) throws IOException { + mimeTypeService.registerMimeType(mimeTabStream); + } +} diff --git a/src/main/java/org/apache/sling/commons/contentdetection/internal/FileNameExtractorImpl.java b/src/main/java/org/apache/sling/commons/contentdetection/internal/FileNameExtractorImpl.java new file mode 100644 index 0000000..289f777 --- /dev/null +++ b/src/main/java/org/apache/sling/commons/contentdetection/internal/FileNameExtractorImpl.java @@ -0,0 +1,67 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.sling.commons.contentdetection.internal; + +import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.Property; +import org.apache.felix.scr.annotations.Service; +import org.apache.sling.commons.contentdetection.FileNameExtractor; +import org.osgi.framework.Constants; + +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; + +@Component(metatype = true, label = "%filenameextractor.service.name", description = "%filenameextractor.service.description") +@Service(FileNameExtractor.class) +@Property(name = Constants.SERVICE_DESCRIPTION, value = "Apache Sling Filename Extractor Service") +public class FileNameExtractorImpl implements FileNameExtractor { + public String extract(String name) { + // If the name is a URL, skip the trailing query and fragment parts + int question = name.indexOf('?'); + if (question != -1) { + name = name.substring(0, question); + } + int hash = name.indexOf('#'); + if (hash != -1) { + name = name.substring(0, hash); + } + + // If the name is a URL or a path, skip all but the last component + int slash = name.lastIndexOf('/'); + if (slash != -1) { + name = name.substring(slash + 1); + } + int backslash = name.lastIndexOf('\\'); + if (backslash != -1) { + name = name.substring(backslash + 1); + } + + // Decode any potential URL encoding + int percent = name.indexOf('%'); + if (percent != -1) { + try { + name = URLDecoder.decode(name, "UTF-8"); + } catch (UnsupportedEncodingException e) { + throw new AssertionError("UTF-8 not supported"); + } + } + + // Skip any leading or trailing whitespace + name = name.trim(); + return name; + } +} diff --git a/src/main/java/org/apache/sling/commons/contentdetection/package-info.java b/src/main/java/org/apache/sling/commons/contentdetection/package-info.java new file mode 100644 index 0000000..0612384 --- /dev/null +++ b/src/main/java/org/apache/sling/commons/contentdetection/package-info.java @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/** + * Extends the {@link org.apache.sling.commons.mime.MimeTypeService} + * service used by client to resolve MIME type information based on content as well as the + * {@link org.apache.sling.commons.contentdetection.FileNameExtractor} service + * for extracting the file name from a url or path + * + * @version 1.0.0 + */ +@Version("1.0.0") +@Export(optional = "provide:=true") +package org.apache.sling.commons.contentdetection; + +import aQute.bnd.annotation.Export; +import aQute.bnd.annotation.Version; + diff --git a/src/main/java/org/apache/sling/commons/contentdetection/serversidetests/ContentAwareMimeTypeServiceImplTest.java b/src/main/java/org/apache/sling/commons/contentdetection/serversidetests/ContentAwareMimeTypeServiceImplTest.java new file mode 100644 index 0000000..1a48b5a --- /dev/null +++ b/src/main/java/org/apache/sling/commons/contentdetection/serversidetests/ContentAwareMimeTypeServiceImplTest.java @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.sling.commons.contentdetection.serversidetests; + +import org.apache.sling.commons.contentdetection.ContentAwareMimeTypeService; +import org.apache.sling.junit.annotations.SlingAnnotationsTestRunner; +import org.apache.sling.junit.annotations.TestReference; +import org.junit.Test; +import org.junit.runner.RunWith; + +//Right now this is just a placeholder for future serverside tests. +//Current test coverage is in plain UTs +@RunWith(SlingAnnotationsTestRunner.class) +public class ContentAwareMimeTypeServiceImplTest { + + @TestReference + ContentAwareMimeTypeService contentAwareMimeTypeService; + +} diff --git a/src/main/resources/META-INF/LICENSE b/src/main/resources/META-INF/LICENSE new file mode 100644 index 0000000..ef13dba --- /dev/null +++ b/src/main/resources/META-INF/LICENSE @@ -0,0 +1,234 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +APACHE SLING SUBCOMPONENTS: + +Apache Sling includes subcomponents with separate copyright notices and +license terms. Your use of these subcomponents is subject to the terms +and conditions of the following licenses. + +JQuery TreeTable plugin + + Copyright (c) 2009 Ludo van den Boom + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/main/resources/META-INF/NOTICE b/src/main/resources/META-INF/NOTICE new file mode 100644 index 0000000..921deb8 --- /dev/null +++ b/src/main/resources/META-INF/NOTICE @@ -0,0 +1,8 @@ +Apache Sling content detection support +Copyright 2008-2009 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +Apache Sling is based on source code originally developed +by Day Software (http://www.day.com/). diff --git a/src/main/resources/OSGI-INF/metatype/metatype.properties b/src/main/resources/OSGI-INF/metatype/metatype.properties new file mode 100644 index 0000000..5572b18 --- /dev/null +++ b/src/main/resources/OSGI-INF/metatype/metatype.properties @@ -0,0 +1,31 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + + +# +# This file contains localization strings for configuration labels and +# descriptions as used in the metatype.xml descriptor generated by the +# the Felix SCR plugin + +contentawaremime.service.name = Apache Sling Content Aware MIME Type Service +contentawaremime.service.description = The Sling Content Aware MIME Type Service provides support for \ +determining the MIME type based on filename and its contents. +filenameextractor.service.name = Apache Sling Filename extractor Service +filenameextractor.service.description = The Sling Filename extractor Service provides support for \ +extracting the file's name from a url or path \ No newline at end of file diff --git a/src/test/java/org/apache/sling/commons/contentdetection/internal/ContentAwareMimeTypeServiceImplTest.java b/src/test/java/org/apache/sling/commons/contentdetection/internal/ContentAwareMimeTypeServiceImplTest.java new file mode 100644 index 0000000..ece1156 --- /dev/null +++ b/src/test/java/org/apache/sling/commons/contentdetection/internal/ContentAwareMimeTypeServiceImplTest.java @@ -0,0 +1,112 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.sling.commons.contentdetection.internal; + +import org.apache.sling.commons.mime.MimeTypeService; +import org.apache.tika.detect.Detector; +import org.apache.tika.io.TikaInputStream; +import org.apache.tika.metadata.Metadata; +import org.apache.tika.mime.MediaType; +import org.easymock.EasyMock; +import org.easymock.EasyMockSupport; +import org.easymock.TestSubject; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.powermock.api.easymock.PowerMock; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; + +@RunWith(PowerMockRunner.class) +@PrepareForTest(TikaInputStream.class) +public class ContentAwareMimeTypeServiceImplTest extends EasyMockSupport { + + private Detector mockDetector = EasyMock.createMock(Detector.class); + + private Metadata mockMetadata = EasyMock.createMock(Metadata.class); + + private MimeTypeService mockMimeTypeService = EasyMock.createMock(MimeTypeService.class); + + @TestSubject + private ContentAwareMimeTypeServiceImpl contentAwareMimeTypeService = new ContentAwareMimeTypeServiceImpl(); + + @Before + public void setUp() throws IOException { + contentAwareMimeTypeService.detector = mockDetector; + contentAwareMimeTypeService.mimeTypeService = mockMimeTypeService; + } + + @Test + public void testGetMimeType() throws IOException { + + //Initializations + String filename = "test.txt"; + Metadata metadata = new Metadata(); + metadata.set(Metadata.RESOURCE_NAME_KEY, filename); + byte[] byteArray = new byte[]{}; + InputStream content = new ByteArrayInputStream(byteArray); + TikaInputStream stream = TikaInputStream.get(content); + PowerMock.mockStatic(TikaInputStream.class); + + //Record Expectations + EasyMock.expect(TikaInputStream.get(content)).andReturn(stream).once(); + EasyMock.expect(mockDetector.detect(stream, metadata)).andReturn(MediaType.TEXT_PLAIN).once(); + + //Getting ready for run + PowerMock.replay(TikaInputStream.class); + EasyMock.replay(mockDetector); + + //The test run + String mimeType = contentAwareMimeTypeService.getMimeType(filename, content); + + //Verification of expectations + Assert.assertEquals(MediaType.TEXT_PLAIN.toString(), mimeType); + EasyMock.verify(mockDetector); + PowerMock.verify(TikaInputStream.class); + } + + @Test + public void testGetMimeTypeWithNullContent() throws IOException { + //Initializations + String filename = "test.txt"; + InputStream content = null; + + //Record Expectations + EasyMock.expect(mockMimeTypeService.getMimeType(filename)).andReturn(MediaType.TEXT_PLAIN.getType()).once(); + + //Getting ready for run + EasyMock.replay(mockMimeTypeService); + + //The test run + String mimeType = contentAwareMimeTypeService.getMimeType(filename, content); + + //Verification of expectations + Assert.assertEquals(MediaType.TEXT_PLAIN.getType(), mimeType); + EasyMock.verify(mockMimeTypeService); + } + + @After + public void tearDown() { + } +} diff --git a/src/test/java/org/apache/sling/commons/contentdetection/internal/FileNameExtractorImplTest.java b/src/test/java/org/apache/sling/commons/contentdetection/internal/FileNameExtractorImplTest.java new file mode 100644 index 0000000..c00cb5a --- /dev/null +++ b/src/test/java/org/apache/sling/commons/contentdetection/internal/FileNameExtractorImplTest.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.sling.commons.contentdetection.internal; + +import junit.framework.TestCase; +import org.apache.sling.commons.contentdetection.FileNameExtractor; +import org.junit.Assert; + +public class FileNameExtractorImplTest extends TestCase { + + FileNameExtractor fileNameExtractor = new FileNameExtractorImpl(); + + public void testExtract() throws Exception { + String rawPath = "http://midches.com/images/uploads/default/demo.jpg#anchor?query=test";; + String expectedFileName = "demo.jpg"; + Assert.assertEquals(expectedFileName, fileNameExtractor.extract(rawPath)); + } +} \ No newline at end of file -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
![http://midches.com/images/uploads/default/demo.jpg#anchor?query=test"](http://midches.com/images/uploads/default/demo.jpg#anchor?query=test"){kind=link}