Index: trunk/src/oauth/signpost/basic/DefaultOAuthConsumer.java
===================================================================
--- trunk/src/oauth/signpost/basic/DefaultOAuthConsumer.java	(revision 6849)
+++ 	(revision )
@@ -1,45 +1,0 @@
-/* Copyright (c) 2009 Matthias Kaeppler
- *
- * 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.
- */
-package oauth.signpost.basic;
-
-import java.net.HttpURLConnection;
-
-import oauth.signpost.AbstractOAuthConsumer;
-import oauth.signpost.http.HttpRequest;
-
-/**
- * The default implementation for an OAuth consumer. Only supports signing
- * {@link java.net.HttpURLConnection} type requests.
- * 
- * @author Matthias Kaeppler
- */
-public class DefaultOAuthConsumer extends AbstractOAuthConsumer {
-
-    private static final long serialVersionUID = 1L;
-
-    public DefaultOAuthConsumer(String consumerKey, String consumerSecret) {
-        super(consumerKey, consumerSecret);
-    }
-
-    @Override
-    protected HttpRequest wrap(Object request) {
-        if (!(request instanceof HttpURLConnection)) {
-            throw new IllegalArgumentException(
-                    "The default consumer expects requests of type java.net.HttpURLConnection");
-        }
-        return new HttpURLConnectionRequestAdapter((HttpURLConnection) request);
-    }
-
-}
Index: trunk/src/oauth/signpost/basic/DefaultOAuthProvider.java
===================================================================
--- trunk/src/oauth/signpost/basic/DefaultOAuthProvider.java	(revision 6849)
+++ 	(revision )
@@ -1,59 +1,0 @@
-/*
- * Copyright (c) 2009 Matthias Kaeppler 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.
- */
-package oauth.signpost.basic;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import oauth.signpost.AbstractOAuthProvider;
-import oauth.signpost.http.HttpRequest;
-import oauth.signpost.http.HttpResponse;
-
-/**
- * This default implementation uses {@link java.net.HttpURLConnection} type GET
- * requests to receive tokens from a service provider.
- * 
- * @author Matthias Kaeppler
- */
-public class DefaultOAuthProvider extends AbstractOAuthProvider {
-
-    private static final long serialVersionUID = 1L;
-
-    public DefaultOAuthProvider(String requestTokenEndpointUrl, String accessTokenEndpointUrl,
-            String authorizationWebsiteUrl) {
-        super(requestTokenEndpointUrl, accessTokenEndpointUrl, authorizationWebsiteUrl);
-    }
-
-    protected HttpRequest createRequest(String endpointUrl) throws MalformedURLException,
-            IOException {
-        HttpURLConnection connection = (HttpURLConnection) new URL(endpointUrl).openConnection();
-        connection.setRequestMethod("POST");
-        connection.setAllowUserInteraction(false);
-        connection.setRequestProperty("Content-Length", "0");
-        return new HttpURLConnectionRequestAdapter(connection);
-    }
-
-    protected HttpResponse sendRequest(HttpRequest request) throws IOException {
-        HttpURLConnection connection = (HttpURLConnection) request.unwrap();
-        connection.connect();
-        return new HttpURLConnectionResponseAdapter(connection);
-    }
-
-    @Override
-    protected void closeConnection(HttpRequest request, HttpResponse response) {
-        HttpURLConnection connection = (HttpURLConnection) request.unwrap();
-        if (connection != null) {
-            connection.disconnect();
-        }
-    }
-}
Index: trunk/src/oauth/signpost/basic/HttpURLConnectionRequestAdapter.java
===================================================================
--- trunk/src/oauth/signpost/basic/HttpURLConnectionRequestAdapter.java	(revision 6849)
+++ 	(revision )
@@ -1,63 +1,0 @@
-package oauth.signpost.basic;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import oauth.signpost.http.HttpRequest;
-
-public class HttpURLConnectionRequestAdapter implements HttpRequest {
-
-    protected HttpURLConnection connection;
-
-    public HttpURLConnectionRequestAdapter(HttpURLConnection connection) {
-        this.connection = connection;
-    }
-
-    public String getMethod() {
-        return connection.getRequestMethod();
-    }
-
-    public String getRequestUrl() {
-        return connection.getURL().toExternalForm();
-    }
-
-    public void setRequestUrl(String url) {
-        // can't do
-    }
-
-    public void setHeader(String name, String value) {
-        connection.setRequestProperty(name, value);
-    }
-
-    public String getHeader(String name) {
-        return connection.getRequestProperty(name);
-    }
-
-    public Map<String, String> getAllHeaders() {
-        Map<String, List<String>> origHeaders = connection.getRequestProperties();
-        Map<String, String> headers = new HashMap<String, String>(origHeaders.size());
-        for (String name : origHeaders.keySet()) {
-            List<String> values = origHeaders.get(name);
-            if (!values.isEmpty()) {
-                headers.put(name, values.get(0));
-            }
-        }
-        return headers;
-    }
-
-    public InputStream getMessagePayload() throws IOException {
-        return null;
-    }
-
-    public String getContentType() {
-        return connection.getRequestProperty("Content-Type");
-    }
-
-    public HttpURLConnection unwrap() {
-        return connection;
-    }
-}
Index: trunk/src/oauth/signpost/basic/HttpURLConnectionResponseAdapter.java
===================================================================
--- trunk/src/oauth/signpost/basic/HttpURLConnectionResponseAdapter.java	(revision 6849)
+++ 	(revision )
@@ -1,36 +1,0 @@
-package oauth.signpost.basic;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-
-import oauth.signpost.http.HttpResponse;
-
-public class HttpURLConnectionResponseAdapter implements HttpResponse {
-
-    private HttpURLConnection connection;
-
-    public HttpURLConnectionResponseAdapter(HttpURLConnection connection) {
-        this.connection = connection;
-    }
-
-    public InputStream getContent() throws IOException {
-        try {
-            return connection.getInputStream();
-        } catch (IOException e) {
-            return connection.getErrorStream();
-        }
-    }
-
-    public int getStatusCode() throws IOException {
-        return connection.getResponseCode();
-    }
-
-    public String getReasonPhrase() throws Exception {
-        return connection.getResponseMessage();
-    }
-
-    public Object unwrap() {
-        return connection;
-    }
-}
Index: trunk/src/oauth/signpost/basic/UrlStringRequestAdapter.java
===================================================================
--- trunk/src/oauth/signpost/basic/UrlStringRequestAdapter.java	(revision 6849)
+++ trunk/src/oauth/signpost/basic/UrlStringRequestAdapter.java	(revision 10831)
@@ -16,35 +16,44 @@
     }
 
+    @Override
     public String getMethod() {
         return "GET";
     }
 
+    @Override
     public String getRequestUrl() {
         return url;
     }
 
+    @Override
     public void setRequestUrl(String url) {
         this.url = url;
     }
 
+    @Override
     public void setHeader(String name, String value) {
     }
 
+    @Override
     public String getHeader(String name) {
         return null;
     }
 
+    @Override
     public Map<String, String> getAllHeaders() {
         return Collections.emptyMap();
     }
 
+    @Override
     public InputStream getMessagePayload() throws IOException {
         return null;
     }
 
+    @Override
     public String getContentType() {
         return null;
     }
 
+    @Override
     public Object unwrap() {
         return url;