Moved all the OAuth classes into its own namespace in preparation to receiving DotNetOpenId merge.

13 files changed, 25 insertions, 21 deletions

diff --git a/samples/Consumer/App_Code/InMemoryTokenManager.cs b/samples/Consumer/App_Code/InMemoryTokenManager.cs
index 7312c2e..6b20ad9 100644
--- a/samples/Consumer/App_Code/InMemoryTokenManager.cs
+++ b/samples/Consumer/App_Code/InMemoryTokenManager.cs
@@ -7,8 +7,8 @@
 using System;

 using System.Collections.Generic;

 using System.Diagnostics;

-using DotNetOAuth.ChannelElements;

-using DotNetOAuth.Messages;

+using DotNetOAuth.OAuth.ChannelElements;

+using DotNetOAuth.OAuth.Messages;

 

 public class InMemoryTokenManager : ITokenManager {

 	private Dictionary<string, string> tokensAndSecrets = new Dictionary<string, string>();

diff --git a/samples/Consumer/SampleWcf.aspx.cs b/samples/Consumer/SampleWcf.aspx.cs
index 01afb43..ee776f1 100644
--- a/samples/Consumer/SampleWcf.aspx.cs
+++ b/samples/Consumer/SampleWcf.aspx.cs
@@ -8,8 +8,9 @@ using System.ServiceModel.Channels;
 using System.ServiceModel.Security;

 using System.Web.UI.WebControls;

 using DotNetOAuth;

-using DotNetOAuth.ChannelElements;

 using DotNetOAuth.Messaging;

+using DotNetOAuth.OAuth;

+using DotNetOAuth.OAuth.ChannelElements;

 using SampleServiceProvider;

 

 /// <summary>

diff --git a/samples/ConsumerWpf/InMemoryTokenManager.cs b/samples/ConsumerWpf/InMemoryTokenManager.cs
index b29d2e0..ef70ce8 100644
--- a/samples/ConsumerWpf/InMemoryTokenManager.cs
+++ b/samples/ConsumerWpf/InMemoryTokenManager.cs
@@ -8,8 +8,8 @@ namespace DotNetOAuth.Samples.ConsumerWpf {
 	using System;

 	using System.Collections.Generic;

 	using System.Diagnostics;

-	using DotNetOAuth.ChannelElements;

-	using DotNetOAuth.Messages;

+	using DotNetOAuth.OAuth.ChannelElements;

+	using DotNetOAuth.OAuth.Messages;

 

 	internal class InMemoryTokenManager : ITokenManager {

 		private Dictionary<string, string> tokensAndSecrets = new Dictionary<string, string>();

diff --git a/samples/ConsumerWpf/MainWindow.xaml.cs b/samples/ConsumerWpf/MainWindow.xaml.cs
index 4c983e8..884269a 100644
--- a/samples/ConsumerWpf/MainWindow.xaml.cs
+++ b/samples/ConsumerWpf/MainWindow.xaml.cs
@@ -15,9 +15,10 @@
 	using System.Windows.Shapes;

 	using System.Xml.Linq;

 	using DotNetOAuth;

-	using DotNetOAuth.ChannelElements;

 	using DotNetOAuth.ApplicationBlock;

 	using DotNetOAuth.Messaging;

+	using DotNetOAuth.OAuth;

+	using DotNetOAuth.OAuth.ChannelElements;

 

 	/// <summary>

 	/// Interaction logic for MainWindow.xaml

diff --git a/samples/DotNetOAuth.ApplicationBlock/GoogleConsumer.cs b/samples/DotNetOAuth.ApplicationBlock/GoogleConsumer.cs
index a0387e9..062de2b 100644
--- a/samples/DotNetOAuth.ApplicationBlock/GoogleConsumer.cs
+++ b/samples/DotNetOAuth.ApplicationBlock/GoogleConsumer.cs
@@ -9,9 +9,9 @@ namespace DotNetOAuth.ApplicationBlock {
 	using System.Collections.Generic;

 	using System.Linq;

 	using System.Xml.Linq;

-	using DotNetOAuth.ChannelElements;

-	using DotNetOAuth.Messages;

 	using DotNetOAuth.Messaging;

+	using DotNetOAuth.OAuth;

+	using DotNetOAuth.OAuth.ChannelElements;

 

 	/// <summary>

 	/// A consumer capable of communicating with Google Data APIs.

diff --git a/samples/ServiceProvider/App_Code/Constants.cs b/samples/ServiceProvider/App_Code/Constants.cs
index 897834a..4adfd13 100644
--- a/samples/ServiceProvider/App_Code/Constants.cs
+++ b/samples/ServiceProvider/App_Code/Constants.cs
@@ -1,7 +1,7 @@
 using System;

-using DotNetOAuth;

-using DotNetOAuth.ChannelElements;

 using DotNetOAuth.Messaging;

+using DotNetOAuth.OAuth;

+using DotNetOAuth.OAuth.ChannelElements;

 

 /// <summary>

 /// Service Provider definitions.

diff --git a/samples/ServiceProvider/App_Code/CustomOAuthTypeProvider.cs b/samples/ServiceProvider/App_Code/CustomOAuthTypeProvider.cs
index 98eae68..7adb808 100644
--- a/samples/ServiceProvider/App_Code/CustomOAuthTypeProvider.cs
+++ b/samples/ServiceProvider/App_Code/CustomOAuthTypeProvider.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;

 using System.Linq;

 using System.Web;

-using DotNetOAuth.ChannelElements;

-using DotNetOAuth.Messages;

+using DotNetOAuth.OAuth.ChannelElements;

+using DotNetOAuth.OAuth.Messages;

 

 /// <summary>

 /// A custom class that will cause the OAuth library to use our custom message types

diff --git a/samples/ServiceProvider/App_Code/DatabaseTokenManager.cs b/samples/ServiceProvider/App_Code/DatabaseTokenManager.cs
index 2a0e265..3a567fd 100644
--- a/samples/ServiceProvider/App_Code/DatabaseTokenManager.cs
+++ b/samples/ServiceProvider/App_Code/DatabaseTokenManager.cs
@@ -8,8 +8,8 @@ using System;
 using System.Collections.Generic;

 using System.Diagnostics;

 using System.Linq;

-using DotNetOAuth.ChannelElements;

-using DotNetOAuth.Messages;

+using DotNetOAuth.OAuth.ChannelElements;

+using DotNetOAuth.OAuth.Messages;

 

 public class DatabaseTokenManager : ITokenManager {

 	#region ITokenManager Members

diff --git a/samples/ServiceProvider/App_Code/Global.cs b/samples/ServiceProvider/App_Code/Global.cs
index aa0d738..9ece43c 100644
--- a/samples/ServiceProvider/App_Code/Global.cs
+++ b/samples/ServiceProvider/App_Code/Global.cs
@@ -3,7 +3,7 @@ using System.Linq;
 using System.ServiceModel;

 using System.Text;

 using System.Web;

-using DotNetOAuth.Messages;

+using DotNetOAuth.OAuth.Messages;

 

 /// <summary>

 /// The web application global events and properties.

diff --git a/samples/ServiceProvider/App_Code/OAuthAuthorizationManager.cs b/samples/ServiceProvider/App_Code/OAuthAuthorizationManager.cs
index 9d2e3e9..8188c67 100644
--- a/samples/ServiceProvider/App_Code/OAuthAuthorizationManager.cs
+++ b/samples/ServiceProvider/App_Code/OAuthAuthorizationManager.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using System.ServiceModel;

 using System.ServiceModel.Channels;

 using DotNetOAuth;

+using DotNetOAuth.OAuth;

 

 /// <summary>

 /// A WCF extension to authenticate incoming messages using OAuth.

diff --git a/samples/ServiceProvider/App_Code/RequestScopedTokenMessage.cs b/samples/ServiceProvider/App_Code/RequestScopedTokenMessage.cs
index fa23dc2..7459653 100644
--- a/samples/ServiceProvider/App_Code/RequestScopedTokenMessage.cs
+++ b/samples/ServiceProvider/App_Code/RequestScopedTokenMessage.cs
@@ -1,5 +1,5 @@
-using DotNetOAuth.Messages;

-using DotNetOAuth.Messaging;

+using DotNetOAuth.Messaging;

+using DotNetOAuth.OAuth.Messages;

 

 /// <summary>

 /// A custom web app version of the message sent to request an unauthorized token.

diff --git a/samples/ServiceProvider/Members/Authorize.aspx.cs b/samples/ServiceProvider/Members/Authorize.aspx.cs
index 9285df3..b78d8e1 100644
--- a/samples/ServiceProvider/Members/Authorize.aspx.cs
+++ b/samples/ServiceProvider/Members/Authorize.aspx.cs
@@ -5,7 +5,8 @@ using System.Web;
 using System.Web.UI;

 using System.Web.UI.WebControls;

 using DotNetOAuth;

-using DotNetOAuth.Messages;

+using DotNetOAuth.OAuth;

+using DotNetOAuth.OAuth.Messages;

 

 /// <summary>

 /// Conducts the user through a Consumer authorization process.

diff --git a/samples/ServiceProvider/OAuth.ashx b/samples/ServiceProvider/OAuth.ashx
index 2577b9a..fa21f49 100644
--- a/samples/ServiceProvider/OAuth.ashx
+++ b/samples/ServiceProvider/OAuth.ashx
@@ -4,9 +4,9 @@ using System;
 using System.Linq;

 using System.Web;

 using System.Web.SessionState;

-using DotNetOAuth;

-using DotNetOAuth.ChannelElements;

-using DotNetOAuth.Messages;

+using DotNetOAuth.OAuth;

+using DotNetOAuth.OAuth.ChannelElements;

+using DotNetOAuth.OAuth.Messages;

 using DotNetOAuth.Messaging;

 

 public class OAuth : IHttpHandler, IRequiresSessionState {