svn commit: r1130873 - in /oodt/branches/protocol/protocol-http/src: main/java/org/apache/oodt/cas/protocol/http/ main/java/org/apache/oodt/cas/protocol/http/util/ test/org/apache/oodt/cas/protocol/http/util/

[bfoster]

Author: bfoster
Date: Thu Jun  2 23:35:24 2011
New Revision: 1130873

URL: http://svn.apache.org/viewvc?rev=1130873&view=rev
Log:

- cleanup

---------------
OODT-194

Modified:
    
oodt/branches/protocol/protocol-http/src/main/java/org/apache/oodt/cas/protocol/http/HttpProtocol.java
    
oodt/branches/protocol/protocol-http/src/main/java/org/apache/oodt/cas/protocol/http/util/HttpUtils.java
    
oodt/branches/protocol/protocol-http/src/test/org/apache/oodt/cas/protocol/http/util/TestHttpUtils.java

Modified: 
oodt/branches/protocol/protocol-http/src/main/java/org/apache/oodt/cas/protocol/http/HttpProtocol.java
URL: 
http://svn.apache.org/viewvc/oodt/branches/protocol/protocol-http/src/main/java/org/apache/oodt/cas/protocol/http/HttpProtocol.java?rev=1130873&r1=1130872&r2=1130873&view=diff
==============================================================================
--- 
oodt/branches/protocol/protocol-http/src/main/java/org/apache/oodt/cas/protocol/http/HttpProtocol.java
 (original)
+++ 
oodt/branches/protocol/protocol-http/src/main/java/org/apache/oodt/cas/protocol/http/HttpProtocol.java
 Thu Jun  2 23:35:24 2011
@@ -17,26 +17,16 @@
 package org.apache.oodt.cas.protocol.http;
 
 //OODT imports
-import org.apache.oodt.cas.metadata.util.MimeTypeUtils;
 import org.apache.oodt.cas.protocol.Protocol;
 import org.apache.oodt.cas.protocol.ProtocolFile;
 import org.apache.oodt.cas.protocol.auth.Authentication;
 import org.apache.oodt.cas.protocol.exceptions.ProtocolException;
 import org.apache.oodt.cas.protocol.http.util.HttpUtils;
 
-//TIKA imports
-import org.apache.tika.metadata.Metadata;
-import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.html.HtmlParser;
-import org.apache.tika.sax.Link;
-import org.apache.tika.sax.LinkContentHandler;
-
 //JDK imports
 import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
@@ -47,7 +37,6 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Scanner;
 import java.util.StringTokenizer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

Modified: 
oodt/branches/protocol/protocol-http/src/main/java/org/apache/oodt/cas/protocol/http/util/HttpUtils.java
URL: 
http://svn.apache.org/viewvc/oodt/branches/protocol/protocol-http/src/main/java/org/apache/oodt/cas/protocol/http/util/HttpUtils.java?rev=1130873&r1=1130872&r2=1130873&view=diff
==============================================================================
--- 
oodt/branches/protocol/protocol-http/src/main/java/org/apache/oodt/cas/protocol/http/util/HttpUtils.java
 (original)
+++ 
oodt/branches/protocol/protocol-http/src/main/java/org/apache/oodt/cas/protocol/http/util/HttpUtils.java
 Thu Jun  2 23:35:24 2011
@@ -17,9 +17,7 @@
 package org.apache.oodt.cas.protocol.http.util;
 
 //JDK imports
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -32,16 +30,10 @@ import java.util.regex.Pattern;
 
 //APACHE imports
 import org.apache.commons.lang.Validate;
+
+//OODT imports
 import org.apache.oodt.cas.metadata.util.MimeTypeUtils;
 import org.apache.oodt.cas.protocol.http.HttpFile;
-import org.apache.tika.exception.TikaException;
-import org.apache.tika.metadata.Metadata;
-import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.html.HtmlParser;
-import org.apache.tika.sax.Link;
-import org.apache.tika.sax.LinkContentHandler;
-import org.apache.tika.sax.XHTMLContentHandler;
-import org.xml.sax.SAXException;
 
 /**
  * Utility methods for HTTP Protocol related tasks.
@@ -117,12 +109,6 @@ public class HttpUtils {
                return httpFiles;
        }
        
-       public static HttpFile toHttpFile(Link link, HttpFile parent) throws 
IOException {
-    URL href = new URL(link.getUri());
-    String linkPath = parent.getPath() + "/" + link.getTitle();
-    return new HttpFile(linkPath, isDirectory(href, linkPath), href, parent);
-       }
-       
        public static boolean isDirectory(URL url, String virtualPath) throws 
IOException {
                try {
                        String mime = 
mimeTypes.autoResolveContentType(url.toString(),

Modified: 
oodt/branches/protocol/protocol-http/src/test/org/apache/oodt/cas/protocol/http/util/TestHttpUtils.java
URL: 
http://svn.apache.org/viewvc/oodt/branches/protocol/protocol-http/src/test/org/apache/oodt/cas/protocol/http/util/TestHttpUtils.java?rev=1130873&r1=1130872&r2=1130873&view=diff
==============================================================================
--- 
oodt/branches/protocol/protocol-http/src/test/org/apache/oodt/cas/protocol/http/util/TestHttpUtils.java
 (original)
+++ 
oodt/branches/protocol/protocol-http/src/test/org/apache/oodt/cas/protocol/http/util/TestHttpUtils.java
 Thu Jun  2 23:35:24 2011
@@ -25,10 +25,8 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.List;
 
+//OODT imports
 import org.apache.oodt.cas.protocol.http.HttpFile;
-import org.apache.tika.exception.TikaException;
-import org.apache.tika.sax.Link;
-import org.xml.sax.SAXException;
 
 //JUnits imports
 import junit.framework.TestCase;