Spring security and OAuth only, security, currently, specific, library

amy

I'm having trouble getting my head around what needs to happen to integrate OAuth authentication into my Spring Security 2.0 implementation that currently only supports Basic authentication. I've spent a good week looking at the library that someone created to integrate Spring Security and OAuth but I wasn't able to make much progress with it within our current implementation. The sample code is just very basic and specific and hardcoded.

I have code that we used to use to implement OAuth back with the 1.0 spec and before we implemented Spring Security. What I want to do is reuse a good amount of that if possible, but just integrate it with Spring security. Can anyone help poiint me in the right path? I have some specific questions:

1. Do I need a custom OAuthEntryPoint since I have a BasicProcessingEntryPoint? I need to send back a WWW-Authenticate challenge response that includes both Basic auth and OAuth as available authentication mechanisms
2. Can I just create an OAuth Provider and include that in the manager I'm already using for Basic auth?

CAn someone please help me get started in the right direction?