Modified: oodt/trunk/mvn/plugins/cas-install/maven-cas-install-plugin.iml URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/plugins/cas-install/maven-cas-install-plugin.iml?rev=1631859&r1=1631858&r2=1631859&view=diff ============================================================================== --- oodt/trunk/mvn/plugins/cas-install/maven-cas-install-plugin.iml (original) +++ oodt/trunk/mvn/plugins/cas-install/maven-cas-install-plugin.iml Tue Oct 14 19:56:52 2014 @@ -9,13 +9,15 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="library" name="Maven: xml-apis:xml-apis:2.0.2" level="project" /> + <orderEntry type="library" name="Maven: org.apache.tika:tika-core:0.8" level="project" /> <orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:2.0" level="project" /> <orderEntry type="module" module-name="cas-metadata" /> <orderEntry type="module" module-name="oodt-commons" /> <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.2.1" level="project" /> <orderEntry type="library" name="Maven: commons-collections:commons-collections:2.1" level="project" /> <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.2" level="project" /> - <orderEntry type="library" name="Maven: xml-apis:xml-apis:2.0.2" level="project" /> + <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> <orderEntry type="library" name="Maven: xerces:xercesImpl:2.9.1" level="project" /> <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.3" level="project" /> <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.3" level="project" /> @@ -38,7 +40,9 @@ <orderEntry type="module" module-name="pcs-input" /> <orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.3" level="project" /> - <orderEntry type="library" name="Maven: org.apache.tika:tika-core:0.8" level="project" /> + <orderEntry type="library" name="Maven: org.apache.tika:tika-core:1.6" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:10.0.1" level="project" /> + <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" /> <orderEntry type="library" name="Maven: org.apache.ant:ant:1.7.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.7.0" level="project" /> </component>
Modified: oodt/trunk/product/pom.xml URL: http://svn.apache.org/viewvc/oodt/trunk/product/pom.xml?rev=1631859&r1=1631858&r2=1631859&view=diff ============================================================================== --- oodt/trunk/product/pom.xml (original) +++ oodt/trunk/product/pom.xml Tue Oct 14 19:56:52 2014 @@ -103,7 +103,6 @@ <dependency> <groupId>org.apache.tika</groupId> <artifactId>tika-core</artifactId> - <version>0.8</version> </dependency> <dependency> <groupId>org.apache.oodt</groupId> Modified: oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandler.java URL: http://svn.apache.org/viewvc/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandler.java?rev=1631859&r1=1631858&r2=1631859&view=diff ============================================================================== --- oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandler.java (original) +++ oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandler.java Tue Oct 14 19:56:52 2014 @@ -147,7 +147,11 @@ public class OFSNFileHandler implements } mimeType = mediaType.toString(); } else { // use default mimetype of product on disk - mimeType = MimeTypesFactory.create().getMimeType(new File(realPath)).getName(); + try { + mimeType = MimeTypesFactory.create().getMimeType(new File(realPath)).getName(); + } catch (Exception e) { + mimeType = null; + } } xmlQuery.getResults().add( Modified: oodt/trunk/protocol/http/pom.xml URL: http://svn.apache.org/viewvc/oodt/trunk/protocol/http/pom.xml?rev=1631859&r1=1631858&r2=1631859&view=diff ============================================================================== --- oodt/trunk/protocol/http/pom.xml (original) +++ oodt/trunk/protocol/http/pom.xml Tue Oct 14 19:56:52 2014 @@ -78,13 +78,7 @@ </dependency> <dependency> <groupId>org.apache.tika</groupId> - <artifactId>tika-core</artifactId> - <version>0.8</version> - </dependency> - <dependency> - <groupId>org.apache.tika</groupId> <artifactId>tika-parsers</artifactId> - <version>0.8</version> </dependency> <dependency> <groupId>junit</groupId> Modified: oodt/trunk/protocol/imaps/pom.xml URL: http://svn.apache.org/viewvc/oodt/trunk/protocol/imaps/pom.xml?rev=1631859&r1=1631858&r2=1631859&view=diff ============================================================================== --- oodt/trunk/protocol/imaps/pom.xml (original) +++ oodt/trunk/protocol/imaps/pom.xml Tue Oct 14 19:56:52 2014 @@ -78,13 +78,7 @@ </dependency> <dependency> <groupId>org.apache.tika</groupId> - <artifactId>tika-core</artifactId> - <version>0.8</version> - </dependency> - <dependency> - <groupId>org.apache.tika</groupId> <artifactId>tika-parsers</artifactId> - <version>0.8</version> </dependency> <dependency> <groupId>com.icegreen</groupId> @@ -92,7 +86,12 @@ <version>1.3.1b</version> <scope>test</scope> </dependency> - <dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.3.1</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>3.8.2</version> Modified: oodt/trunk/webapp/fmprod/pom.xml URL: http://svn.apache.org/viewvc/oodt/trunk/webapp/fmprod/pom.xml?rev=1631859&r1=1631858&r2=1631859&view=diff ============================================================================== --- oodt/trunk/webapp/fmprod/pom.xml (original) +++ oodt/trunk/webapp/fmprod/pom.xml Tue Oct 14 19:56:52 2014 @@ -125,7 +125,6 @@ <dependency> <groupId>org.apache.tika</groupId> <artifactId>tika-core</artifactId> - <version>0.8</version> </dependency> <dependency> <groupId>javax.servlet</groupId> Modified: oodt/trunk/xmlquery/oodt-xmlquery.iml URL: http://svn.apache.org/viewvc/oodt/trunk/xmlquery/oodt-xmlquery.iml?rev=1631859&r1=1631858&r2=1631859&view=diff ============================================================================== --- oodt/trunk/xmlquery/oodt-xmlquery.iml (original) +++ oodt/trunk/xmlquery/oodt-xmlquery.iml Tue Oct 14 19:56:52 2014 @@ -12,11 +12,12 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="library" name="Maven: xml-apis:xml-apis:2.0.2" level="project" /> <orderEntry type="module" module-name="oodt-commons" /> <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.2.1" level="project" /> <orderEntry type="library" name="Maven: commons-collections:commons-collections:2.1" level="project" /> <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.2" level="project" /> - <orderEntry type="library" name="Maven: xml-apis:xml-apis:2.0.2" level="project" /> + <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> <orderEntry type="library" name="Maven: xerces:xercesImpl:2.9.1" level="project" /> <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.3" level="project" /> <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.3" level="project" />
