From 7fc21f10569ed3d35c79eb6397444b42d7c42b02 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paulschneider@free.fr>
Date: Fri, 12 Jun 2015 00:52:58 +0200
Subject: [PATCH] refactoring

---
 ...ApiController.cs => WorkFlowController.cs} |  2 +-
 web/ChangeLog                                 | 13 ++++
 web/Controllers/AccountController.cs          | 10 ++-
 web/Models/App.master                         |  1 -
 web/Models/NoLogin.master                     |  7 +-
 web/Theme/style.css                           | 18 ++---
 web/Views/Account/Circles.aspx                | 14 ++++
 web/Views/Account/Login.aspx                  | 10 ++-
 web/Web.config                                | 14 +++-
 web/Web.csproj                                |  3 +-
 web/instdbws.sql                              |  7 +-
 yavscModel/Blogs/BlogHelper.cs                | 14 ++--
 .../BlogProviderConfigurationElement.cs       | 62 ----------------
 .../BlogProvidersConfigurationCollection.cs   | 43 -----------
 .../BlogProvidersConfigurationSection.cs      | 37 ----------
 yavscModel/ChangeLog                          | 16 +++++
 yavscModel/Circles/CircleManager.cs           |  8 ++-
 .../DataProviderConfigurationSection.cs       | 72 +++++++++++++++++++
 .../CatalogProvidersConfigurationSection.cs   |  2 +-
 yavscModel/WorkFlow/Configuration/Provider.cs | 60 ----------------
 .../Configuration/ProviderCollection.cs       | 39 ----------
 .../Configuration/WorkflowConfiguration.cs    | 41 -----------
 yavscModel/WorkFlow/NewEstimateEvenArgs.cs    |  1 -
 yavscModel/WorkFlow/WorkFlowManager.cs        | 13 ++--
 yavscModel/YavscModel.csproj                  |  7 +-
 25 files changed, 179 insertions(+), 335 deletions(-)
 rename web/ApiControllers/{WorkFlowApiController.cs => WorkFlowController.cs} (98%)
 create mode 100644 web/Views/Account/Circles.aspx
 delete mode 100644 yavscModel/Blogs/Configuration/BlogProviderConfigurationElement.cs
 delete mode 100644 yavscModel/Blogs/Configuration/BlogProvidersConfigurationCollection.cs
 delete mode 100644 yavscModel/Blogs/Configuration/BlogProvidersConfigurationSection.cs
 create mode 100644 yavscModel/DataProviderConfigurationSection.cs
 delete mode 100644 yavscModel/WorkFlow/Configuration/Provider.cs
 delete mode 100644 yavscModel/WorkFlow/Configuration/ProviderCollection.cs
 delete mode 100644 yavscModel/WorkFlow/Configuration/WorkflowConfiguration.cs

diff --git a/web/ApiControllers/WorkFlowApiController.cs b/web/ApiControllers/WorkFlowController.cs
similarity index 98%
rename from web/ApiControllers/WorkFlowApiController.cs
rename to web/ApiControllers/WorkFlowController.cs
index bf8ed396..872dc15c 100644
--- a/web/ApiControllers/WorkFlowApiController.cs
+++ b/web/ApiControllers/WorkFlowController.cs
@@ -17,7 +17,7 @@ namespace Yavsc.ApiControllers
 	/// <summary>
 	/// Work flow controller.
 	/// </summary>
-	public class WorkFlowApiController : ApiController
+	public class WorkFlowController : ApiController
     {
 		string adminRoleName="Admin";
 		/// <summary>
diff --git a/web/ChangeLog b/web/ChangeLog
index 14044b90..0d8171b0 100644
--- a/web/ChangeLog
+++ b/web/ChangeLog
@@ -1,3 +1,16 @@
+2015-06-12  Paul Schneider  <paul@pschneider.fr>
+
+	* Web.csproj:
+	* Web.config:
+	* instdbws.sql:
+	* style.css:
+	* App.master:
+	* NoLogin.master:
+	* Login.aspx:
+	* Circles.aspx:
+	* AccountController.cs:
+	* WorkFlowController.cs: 
+
 2015-06-11  Paul Schneider  <paul@pschneider.fr>
 
 	* App.master: g+1 feels better at right ... 
diff --git a/web/Controllers/AccountController.cs b/web/Controllers/AccountController.cs
index 79b20181..c9c212a6 100644
--- a/web/Controllers/AccountController.cs
+++ b/web/Controllers/AccountController.cs
@@ -11,6 +11,7 @@ using Yavsc;
 using Yavsc.Model.RolesAndMembers;
 using Yavsc.Helpers;
 using System.Web.Mvc;
+using Yavsc.Model.Circles;
 
 namespace Yavsc.Controllers
 {
@@ -290,7 +291,14 @@ namespace Yavsc.Controllers
 			}
 			return View (model);
 		}
-
+		/// <summary>
+		/// Circles this instance.
+		/// </summary>
+		[Authorize]
+		public ActionResult Circles ()
+		{
+			return View (CircleManager.DefaultProvider.List (Membership.GetUser().UserName));
+		}
 		/// <summary>
 		/// Logout the specified returnUrl.
 		/// </summary>
diff --git a/web/Models/App.master b/web/Models/App.master
index 33e6e93b..8cf9484a 100644
--- a/web/Models/App.master
+++ b/web/Models/App.master
@@ -59,7 +59,6 @@ ViewState["orgtitle"] = T.GetString(Page.Title);
 </aside>
 <div style="float:right; height:5em; z-index:-1;"></div>
 	<footer>
-	<!-- Placez cette balise dans l'en-tête ou juste avant la balise de fermeture du corps de texte. -->
 <script src="https://apis.google.com/js/platform.js" async defer>
   {lang: 'fr'}
 </script>
diff --git a/web/Models/NoLogin.master b/web/Models/NoLogin.master
index f3c1c9eb..2b374a08 100644
--- a/web/Models/NoLogin.master
+++ b/web/Models/NoLogin.master
@@ -37,12 +37,15 @@ ViewState["orgtitle"] = T.GetString(Page.Title);
 <asp:ContentPlaceHolder ID="MASContent" runat="server">
 </asp:ContentPlaceHolder>
 
-<div style="float:right; height:5em; z-index:-1;"></div>
-	<footer>
+<footer>
+<script src="https://apis.google.com/js/platform.js" async defer>
+  {lang: 'fr'}
+</script>
    <%= Html.ActionLink("Contact","Contact","Home",null, new { @class="footerlink" }) %>    <br/>
    <% foreach ( string link in Yavsc.ThanksHelper.Links()) { %>
      <%= link %>
    <% } %>
+   <div class="g-plusone" data-annotation="inline" data-width="230"></div>
    </footer>
    <script type="text/javascript">
         var apiBaseUrl = '<%=Url.Content(Yavsc.WebApiConfig.UrlPrefixRelative)%>';
diff --git a/web/Theme/style.css b/web/Theme/style.css
index 063d526c..7ce2f738 100644
--- a/web/Theme/style.css
+++ b/web/Theme/style.css
@@ -41,24 +41,24 @@ footer {
 	bottom:0;
 	left:0;
 	right:0;
-	height:2.5em;
 	background-color:rgba(16,0,0,0.8);
 	display: flex;
-	justify-content: space-around;
 	z-index:-1;
+	font-size: small;
 }
 
 footer a { 
-	border: dashed #888 3px;
+    max-height: 2em;
+	padding:.1em;
 }
 
 footer img {
-    max-height: 1em;
-    max-width: 2.5em;
+    max-height: 2em;
+	padding:.1em;
     }
+
 #logo {
 	float: left;
-
 	}
 
 .panel,.bshpanel,aside {
@@ -217,7 +217,7 @@ a.actionlink:hover + .hidcom {
 
 @media print {
 		body {background-color:white;color:black;}
-		header,footer,.postcomment,.actionlink,.metablog{ display:none;} 
+		header,footer,.postcomment,.actionlink,.metablog,#login{ display:none;} 
 	}
 @media all and (min-width: 641px) {
 	.bshpanel { display:block; }
@@ -238,7 +238,7 @@ a.actionlink:hover + .hidcom {
     max-width: 2.0em;
     }
   footer {
-    font-size: small;
+    font-size: x-small;
   }
 
   body { font-size: smaller; }
@@ -248,7 +248,7 @@ a.actionlink:hover + .hidcom {
 	  footer img { 
     max-height: 0.6em;
     max-width: 1.4em; }
-	  footer { font-size: x-small;  }
+	  footer { font-size: xx-small;  }
 	}
 
 }
diff --git a/web/Views/Account/Circles.aspx b/web/Views/Account/Circles.aspx
new file mode 100644
index 00000000..e72c46a7
--- /dev/null
+++ b/web/Views/Account/Circles.aspx
@@ -0,0 +1,14 @@
+<%@ Page Language="C#" MasterPageFile="~/Models/App.master" Inherits="System.Web.Mvc.ViewPage<Yavsc.Model.Circles.CircleInfoCollection>" %>
+<asp:Content ID="initContent" ContentPlaceHolderID="init" runat="server">
+</asp:Content>
+<asp:Content ID="headContent" ContentPlaceHolderID="head" runat="server">
+</asp:Content>
+<asp:Content ID="MainContentContent" ContentPlaceHolderID="MainContent" runat="server">
+<% foreach (CircleInfo ci in model) { %>
+ <%= ci.Title %>
+ <%= ci.Id %>
+ <br/>
+<% } %>
+</asp:Content>
+<asp:Content ID="MASContentContent" ContentPlaceHolderID="MASContent" runat="server">
+</asp:Content>
diff --git a/web/Views/Account/Login.aspx b/web/Views/Account/Login.aspx
index 7e131c7e..ae39df3f 100644
--- a/web/Views/Account/Login.aspx
+++ b/web/Views/Account/Login.aspx
@@ -1,4 +1,4 @@
-<%@ Page Title="Login" Language="C#" Inherits="System.Web.Mvc.ViewPage<LoginModel>" MasterPageFile="~/Models/App.master" %>
+<%@ Page Title="Login" Language="C#" Inherits="System.Web.Mvc.ViewPage<LoginModel>" MasterPageFile="~/Models/NoLogin.master" %>
 <asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
 <%= Html.ValidationSummary("Ouverture de session") %>
 <% using(Html.BeginForm("Login", "Account")) %>
@@ -20,4 +20,10 @@
 <% } %>
 
 <%= Html.ActionLink("S'enregistrer","Register",new {returnUrl=ViewData["returnUrl"]}, new { @class="actionlink" }) %>
-</asp:Content>
+
+<a href="<%=Request.Url.Scheme + "://" + Request.Url.Authority + "/Google/Login"%>?returnUrl=<%=ViewData["returnUrl"]==null?Request.Url.PathAndQuery:(string)ViewData["returnUrl"]%>" class="actionlink">
+	Identification avec un compte Google
+	<img src="/images/sign-in-with-google.png" style="max-height:1.5em; max-width:6em;" alt="Google sign in">
+	</a>
+
+</asp:Content>
\ No newline at end of file
diff --git a/web/Web.config b/web/Web.config
index b4c5a33e..02cf021d 100644
--- a/web/Web.config
+++ b/web/Web.config
@@ -22,11 +22,12 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx
     <section name="paypal" type="PayPal.SDKConfigHandler, PayPal" />
     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
     <sectionGroup name="system.web">
-      <section name="blog" type="Yavsc.Model.Blogs.Configuration.BlogProvidersConfigurationSection, YavscModel" allowLocation="true" requirePermission="false" allowDefinition="Everywhere" />
+      <section name="blog" type="Yavsc.Model.DataProviderConfigurationSection, YavscModel" allowLocation="true" requirePermission="false" allowDefinition="Everywhere" />
       <section name="thanks" type="Yavsc.ThanksConfigurationSection, Yavsc" allowLocation="true" requirePermission="false" allowDefinition="Everywhere" />
       <section name="catalog" type="Yavsc.Model.FrontOffice.Configuration.CatalogProvidersConfigurationSection, YavscModel" allowLocation="true" requirePermission="false" allowDefinition="Everywhere" />
-      <section name="workflow" type="Yavsc.Model.WorkFlow.Configuration.WorkflowConfiguration, YavscModel" allowLocation="true" requirePermission="false" allowDefinition="Everywhere" />
-    </sectionGroup>
+      <section name="workflow" type="Yavsc.Model.DataProviderConfigurationSection, YavscModel" allowLocation="true" requirePermission="false" allowDefinition="Everywhere" />
+   		<section name="circleProviders" type="Yavsc.Model.DataProviderConfigurationSection, YavscModel" />
+       </sectionGroup>
   </configSections>
   <system.web>
     <!-- 
@@ -150,6 +151,13 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx
         <add name="Postgresql" url="http://www.postgresql.org" image="/images/pgsql.png" />
       </to>
     </thanks>
+
+  <circleProviders defaultProvider="NpgsqlCircleProvider">
+  	<providers>
+ 	 <add name="NpgsqlCircleProvider" applicationName="/" type="WorkFlowProvider.NpgsqlCircleProvider, NpgsqlContentProvider" connectionStringName="yavsc" />
+ 	 </providers>
+  </circleProviders>
+
     <!-- <machineKey validationKey="13CA2E37A5A99AD8CE4A6B895BAF0ED3A022AA584B8D922256BA072189CEB085EEB4E573CA833D9B34FBF68687F6A6B3E008FB4EB67585A4D90551B9D36D42A1" decryptionKey="DA89CC83F6FB2EB12D5929DABC89299AC3928E0751705D33D02DB4162ED56536" validation="SHA1" decryption="AES" /> -->
     <!--- <sessionState cookieless="true" regenerateExpiredSessionId="true" timeout="120"/> -->
     <trust level="High" />
diff --git a/web/Web.csproj b/web/Web.csproj
index a80c1db7..0d9b906b 100644
--- a/web/Web.csproj
+++ b/web/Web.csproj
@@ -188,7 +188,7 @@
     <Compile Include="ApiControllers\CircleApiController.cs" />
     <Compile Include="ApiControllers\BasketApiController.cs" />
     <Compile Include="ApiControllers\CalendarApiController.cs" />
-    <Compile Include="ApiControllers\WorkFlowApiController.cs" />
+    <Compile Include="ApiControllers\WorkFlowController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Views\Web.config" />
@@ -340,6 +340,7 @@
     <Content Include="Theme\md\mdd_gripper.png" />
     <Content Include="Theme\md\mdd_modal_background.png" />
     <Content Include="Theme\mdd_styles.css" />
+    <Content Include="Views\Account\Circles.aspx" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
diff --git a/web/instdbws.sql b/web/instdbws.sql
index a6f92817..ebda9e82 100644
--- a/web/instdbws.sql
+++ b/web/instdbws.sql
@@ -658,6 +658,7 @@ CREATE TABLE circle
   _id serial NOT NULL, -- Circle identifier
   owner character varying(255), -- creator of this circle
   applicationname character varying(255), -- Application name
+  title character varying(512),
   CONSTRAINT circle_pkey PRIMARY KEY (_id),
   CONSTRAINT circle_owner_fkey FOREIGN KEY (owner, applicationname)
       REFERENCES users (username, applicationname) MATCH SIMPLE
@@ -666,11 +667,11 @@ CREATE TABLE circle
 WITH (
   OIDS=FALSE
 );
-
+ALTER TABLE circle
+  OWNER TO yavscdev;
 COMMENT ON COLUMN circle._id IS 'Circle identifier';
 COMMENT ON COLUMN circle.owner IS 'creator of this circle';
 COMMENT ON COLUMN circle.applicationname IS 'Application name';
-
 -- Table: circle_members
 
 -- DROP TABLE circle_members;
@@ -688,4 +689,4 @@ WITH (
   OIDS=FALSE
 );
 
- 
\ No newline at end of file
+
diff --git a/yavscModel/Blogs/BlogHelper.cs b/yavscModel/Blogs/BlogHelper.cs
index 82ee715e..e4ec1870 100644
--- a/yavscModel/Blogs/BlogHelper.cs
+++ b/yavscModel/Blogs/BlogHelper.cs
@@ -2,7 +2,6 @@ using System;
 using System.Configuration;
 using System.Reflection;
 using System.Collections.Specialized;
-using Yavsc.Model.Blogs.Configuration;
 
 namespace Yavsc.Model.Blogs
 {
@@ -17,22 +16,17 @@ namespace Yavsc.Model.Blogs
 		/// <returns>The provider.</returns>
 		public static BlogProvider GetProvider ()
 		{
-			BlogProvidersConfigurationSection config = ConfigurationManager.GetSection ("system.web/blog") as BlogProvidersConfigurationSection;
+			DataProviderConfigurationSection config = ConfigurationManager.GetSection ("system.web/blog") as DataProviderConfigurationSection;
 			if (config == null)
 				throw new ConfigurationErrorsException("The configuration bloc for the blog provider was not found");
-			BlogProviderConfigurationElement celt = 
-				config.Providers.GetElement (config.DefaultProvider);
+			ProviderSettings celt = 
+				config.Providers[config.DefaultProvider];
 			if (config == null)
 				throw new ConfigurationErrorsException("The default blog provider was not found");
 			ConstructorInfo ci = Type.GetType (celt.Type).GetConstructor (Type.EmptyTypes);
 			BlogProvider bp = ci.Invoke (Type.EmptyTypes) as BlogProvider;
 			NameValueCollection c = new NameValueCollection ();
-			c.Add ("name", celt.Name);
-			c.Add ("type", celt.Type);
-			c.Add ("connectionStringName", celt.ConnectionStringName);
-			c.Add ("description", celt.Description);
-			c.Add ("applicationName", celt.ApplicationName);
-			bp.Initialize (celt.Name, c);
+			bp.Initialize (celt.Name, celt.Parameters);
 			return bp;
 		}
 
diff --git a/yavscModel/Blogs/Configuration/BlogProviderConfigurationElement.cs b/yavscModel/Blogs/Configuration/BlogProviderConfigurationElement.cs
deleted file mode 100644
index 1cd572e7..00000000
--- a/yavscModel/Blogs/Configuration/BlogProviderConfigurationElement.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using System.Configuration;
-using System.ComponentModel;
-
-namespace Yavsc.Model.Blogs.Configuration
-{
-	/// <summary>
-	/// Blog provider configuration element.
-	/// </summary>
-	public class BlogProviderConfigurationElement : ConfigurationElement
-	{
-		/// <summary>
-		/// Gets or sets the name.
-		/// </summary>
-		/// <value>The name.</value>
-		[ConfigurationProperty("name", IsRequired = true, IsKey=true)]
-		public string Name {
-			get { return (string)this ["name"]; }
-			set { this ["name"] = value; }
-		}
-
-		/// <summary>
-		/// Gets or sets the type.
-		/// </summary>
-		/// <value>The type.</value>
-		[ConfigurationProperty("type", IsRequired = true, IsKey=false)]
-		public string Type {
-			get { return (string)this ["type"]; }
-			set { this ["type"] = value; }
-		}
-
-		/// <summary>
-		/// Gets or sets the name of the connection string.
-		/// </summary>
-		/// <value>The name of the connection string.</value>
-		[ConfigurationProperty("connectionStringName")]
-		public string ConnectionStringName {
-			get { return (string)this ["connectionStringName"]; }
-			set { this ["connectionStringName"] = value; }
-		}
-
-		/// <summary>
-		/// Gets or sets the description.
-		/// </summary>
-		/// <value>The description.</value>
-		[ConfigurationProperty("description")]
-		public string Description {
-			get { return (string)this ["description"]; }
-			set { this ["description"] = value; }
-		}
-
-		/// <summary>
-		/// Gets or sets the name of the application.
-		/// </summary>
-		/// <value>The name of the application.</value>
-		[ConfigurationProperty("applicationName")]
-		public string ApplicationName {
-			get { return (string)this ["applicationName"]; }
-			set { this ["applicationName"] = value; }
-		}
-	}
-}
diff --git a/yavscModel/Blogs/Configuration/BlogProvidersConfigurationCollection.cs b/yavscModel/Blogs/Configuration/BlogProvidersConfigurationCollection.cs
deleted file mode 100644
index 16e76d8e..00000000
--- a/yavscModel/Blogs/Configuration/BlogProvidersConfigurationCollection.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Configuration;
-using System.ComponentModel;
-
-namespace Yavsc.Model.Blogs.Configuration
-{
-	/// <summary>
-	/// Blog providers configuration collection.
-	/// </summary>
-	public class BlogProvidersConfigurationCollection : ConfigurationElementCollection
-	{
-		/// <summary>
-		/// Creates the new element.
-		/// </summary>
-		/// <returns>The new element.</returns>
-		protected override ConfigurationElement CreateNewElement ()
-		{
-			return new BlogProviderConfigurationElement();
-		}
-
-		/// <summary>
-		/// Gets the element key.
-		/// </summary>
-		/// <returns>The element key.</returns>
-		/// <param name="element">Element.</param>
-		protected override object GetElementKey (ConfigurationElement element)
-		{
-			return ((BlogProviderConfigurationElement) element).Name;
-		}
-
-		/// <summary>
-		/// Gets the element.
-		/// </summary>
-		/// <returns>The element.</returns>
-		/// <param name="name">Name.</param>
-		public BlogProviderConfigurationElement GetElement (string name)
-		{
-			return this.BaseGet(name) as BlogProviderConfigurationElement;
-		}
-	}
-
-}
-
diff --git a/yavscModel/Blogs/Configuration/BlogProvidersConfigurationSection.cs b/yavscModel/Blogs/Configuration/BlogProvidersConfigurationSection.cs
deleted file mode 100644
index 631afb0b..00000000
--- a/yavscModel/Blogs/Configuration/BlogProvidersConfigurationSection.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Configuration;
-using System.ComponentModel;
-
-namespace Yavsc.Model.Blogs.Configuration
-{
-	/// <summary>
-	/// Blog providers configuration section.
-	/// </summary>
-	public class BlogProvidersConfigurationSection : ConfigurationSection
-	{
-		/// <summary>
-		/// Gets or sets the default provider.
-		/// </summary>
-		/// <value>The default provider.</value>
-		[ConfigurationProperty("defaultProvider")]
-		public string DefaultProvider {
-			get { return (string) this ["defaultProvider"]; }
-			set { this["defaultProvider"] = value; }
-		}
-
-		/// <summary>
-		/// Gets or sets the providers.
-		/// </summary>
-		/// <value>The providers.</value>
-		[ConfigurationProperty("providers")]
-		[ConfigurationCollection(typeof(BlogProvidersConfigurationCollection),
-        AddItemName = "add",
-        ClearItemsName = "clear",
-        RemoveItemName = "remove")]
-		public BlogProvidersConfigurationCollection	Providers{
-			get { return (BlogProvidersConfigurationCollection) this["providers"]; }
-			set { this["providers"] = value; }
-		}
-	}
-	
-}
diff --git a/yavscModel/ChangeLog b/yavscModel/ChangeLog
index 87a260ad..8611726e 100644
--- a/yavscModel/ChangeLog
+++ b/yavscModel/ChangeLog
@@ -1,3 +1,19 @@
+2015-06-12  Paul Schneider  <paul@pschneider.fr>
+
+	* YavscModel.csproj:
+	* BlogHelper.cs:
+	* CircleManager.cs:
+	* WorkFlowManager.cs:
+	* NewEstimateEvenArgs.cs:
+	* Provider.cs:
+	* DataProviderConfigurationSection.cs:
+	* ProviderCollection.cs:
+	* WorkflowConfiguration.cs:
+	* BlogProviderConfigurationElement.cs:
+	* BlogProvidersConfigurationSection.cs:
+	* BlogProvidersConfigurationCollection.cs:
+	* CatalogProvidersConfigurationSection.cs: 
+
 2015-06-10  Paul Schneider  <paul@pschneider.fr>
 
 	* Circle.cs: refactoring
diff --git a/yavscModel/Circles/CircleManager.cs b/yavscModel/Circles/CircleManager.cs
index f5a0f280..56c8c070 100644
--- a/yavscModel/Circles/CircleManager.cs
+++ b/yavscModel/Circles/CircleManager.cs
@@ -58,9 +58,11 @@ namespace Yavsc.Model.Circles
 				ConfigurationManager.OpenExeConfiguration(
 					ConfigurationUserLevel.None);
 
-			ProtectedConfigurationSection pSection =
-				config.GetSection("circleProviders")
-				as ProtectedConfigurationSection;
+			DataProviderConfigurationSection pSection =
+				config.GetSection("system.web/circleProviders")
+				as DataProviderConfigurationSection;
+			if (pSection == null)
+				throw new ConfigurationErrorsException ("no circleProviders section defined");
 			
 
 			ProviderSettingsCollection providerSettings =
diff --git a/yavscModel/DataProviderConfigurationSection.cs b/yavscModel/DataProviderConfigurationSection.cs
new file mode 100644
index 00000000..ae225384
--- /dev/null
+++ b/yavscModel/DataProviderConfigurationSection.cs
@@ -0,0 +1,72 @@
+//
+//  CircleConfigurationSection.cs
+//
+//  Author:
+//       Paul Schneider <paul@pschneider.fr>
+//
+//  Copyright (c) 2015 GNU GPL
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Lesser General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+using System;
+using System.Configuration;
+
+namespace Yavsc.Model
+{
+	/// <summary>
+	/// Data provider configuration section.
+	/// </summary>
+	public class DataProviderConfigurationSection: ConfigurationSection
+	{
+		/// <summary>
+		/// Initializes a new instance of the <see cref="Yavsc.Model.DataProviderConfigurationSection"/> class.
+		/// </summary>
+		public DataProviderConfigurationSection ()
+		{
+		}
+
+		/// <summary>
+		/// Gets or sets the default provider.
+		/// </summary>
+		/// <value>The default provider.</value>
+		[ConfigurationProperty ("defaultProvider")]
+		public string DefaultProvider { 
+			get {
+				return (string)base ["defaultProvider"];
+			}
+			set {
+				base ["defaultProvider"] = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the providers.
+		/// </summary>
+		/// <value>The providers.</value>
+		[ConfigurationProperty ("providers")]
+		[ConfigurationCollection(typeof(ProviderSettingsCollection),
+			AddItemName = "add",
+			ClearItemsName = "clear",
+			RemoveItemName = "remove")]
+		public ProviderSettingsCollection Providers {
+			get {
+				return (ProviderSettingsCollection)base ["providers"];
+			}
+			set {
+				base ["providers"] = value;
+			}
+		}
+
+	}
+}
+
diff --git a/yavscModel/FrontOffice/Catalog/Configuration/CatalogProvidersConfigurationSection.cs b/yavscModel/FrontOffice/Catalog/Configuration/CatalogProvidersConfigurationSection.cs
index 2bedeb43..7db9eece 100644
--- a/yavscModel/FrontOffice/Catalog/Configuration/CatalogProvidersConfigurationSection.cs
+++ b/yavscModel/FrontOffice/Catalog/Configuration/CatalogProvidersConfigurationSection.cs
@@ -7,7 +7,7 @@ namespace Yavsc.Model.FrontOffice.Configuration
 	/// <summary>
 	/// Catalog providers configuration section.
 	/// </summary>
-	public class CatalogProvidersConfigurationSection : ConfigurationSection
+	[Obsolete("Use DataProviderConfiguration instead")] public class CatalogProvidersConfigurationSection : ConfigurationSection
 	{
 		/// <summary>
 		/// Gets or sets the default provider.
diff --git a/yavscModel/WorkFlow/Configuration/Provider.cs b/yavscModel/WorkFlow/Configuration/Provider.cs
deleted file mode 100644
index 807c8c5f..00000000
--- a/yavscModel/WorkFlow/Configuration/Provider.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System;
-using System.Configuration;
-
-namespace Yavsc.Model.WorkFlow.Configuration
-{
-	/// <summary>
-	/// WF provider.
-	/// </summary>
-	public class WFProvider:ConfigurationElement
-	{
-		/// <summary>
-		/// Gets or sets the name.
-		/// </summary>
-		/// <value>The name.</value>
-		[ConfigurationProperty("name", IsKey=true, IsRequired=true)]
-		public string Name {
-			get {
-				return (string) base ["name"];
-			}
-			set { base ["name"] = value; }
-		}
-
-		/// <summary>
-		/// Gets or sets the type.
-		/// </summary>
-		/// <value>The type.</value>
-		[ConfigurationProperty("type")]
-		public string Type {
-			get { return (string) this ["type"]; }
-			set {
-				this ["type"] = value;
-			}
-		}
-
-		/// <summary>
-		/// Gets or sets the name of the application.
-		/// </summary>
-		/// <value>The name of the application.</value>
-		[ConfigurationProperty("applicationName")]
-		public string ApplicationName {
-			get {
-				return (string)this ["applicationName"];
-			}
-			set {
-				this ["applicationName"] = value;
-			}
-		}
-
-		/// <summary>
-		/// Gets or sets the name of the connection string.
-		/// </summary>
-		/// <value>The name of the connection string.</value>
-		[ConfigurationProperty("connectionStringName")]
-		public string ConnectionStringName {
-			get { return (string)this ["connectionStringName"]; }
-			set { this ["connectionStringName"] = value; }
-		}
-	}
-}
-
diff --git a/yavscModel/WorkFlow/Configuration/ProviderCollection.cs b/yavscModel/WorkFlow/Configuration/ProviderCollection.cs
deleted file mode 100644
index 94a53ddd..00000000
--- a/yavscModel/WorkFlow/Configuration/ProviderCollection.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Configuration;
-
-namespace Yavsc.Model.WorkFlow.Configuration
-{
-	/// <summary>
-	/// WF provider collection.
-	/// </summary>
-	public class WFProviderCollection : ConfigurationElementCollection
-	{
-		/// <summary>
-		/// Gets the element key.
-		/// </summary>
-		/// <returns>The element key.</returns>
-		/// <param name="element">Element.</param>
-		protected override object GetElementKey (ConfigurationElement element)
-		{
-			return ((WFProvider) element).Name;
-		}
-		/// <summary>
-		/// Creates the new element.
-		/// </summary>
-		/// <returns>The new element.</returns>
-		protected override ConfigurationElement CreateNewElement ()
-		{
-			return new WFProvider();
-		}
-		/// <summary>
-		/// Gets the element.
-		/// </summary>
-		/// <returns>The element.</returns>
-		/// <param name="name">Name.</param>
-		public WFProvider GetElement (string name)
-		{
-			return this.BaseGet (name) as WFProvider;
-		}
-	}
-}
-
diff --git a/yavscModel/WorkFlow/Configuration/WorkflowConfiguration.cs b/yavscModel/WorkFlow/Configuration/WorkflowConfiguration.cs
deleted file mode 100644
index f6132da6..00000000
--- a/yavscModel/WorkFlow/Configuration/WorkflowConfiguration.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Configuration;
-
-namespace Yavsc.Model.WorkFlow.Configuration
-{
-	/// <summary>
-	/// Workflow configuration.
-	/// </summary>
-	public class WorkflowConfiguration : ConfigurationSection
-	{
-		/// <summary>
-		/// Gets or sets the default provider.
-		/// </summary>
-		/// <value>The default provider.</value>
-		[ConfigurationProperty("defaultProvider")]
-		public string DefaultProvider {
-			get { return (string)base ["defaultProvider"]; }
-			set { base ["defaultProvider"] = value; }
-		}
-
-		/// <summary>
-		/// Gets or sets the providers.
-		/// </summary>
-		/// <value>The providers.</value>
-		[ConfigurationProperty("providers")]
-		[ConfigurationCollection(typeof(WFProvider),
-			AddItemName = "add",
-			ClearItemsName = "clear",
-			RemoveItemName = "remove")]
-		public WFProviderCollection Providers {
-			get {
-				return this["providers"] as WFProviderCollection;
-			}
-
-			set {
-				this["providers"]=value;
-			}
-		}
-	}
-}
-
diff --git a/yavscModel/WorkFlow/NewEstimateEvenArgs.cs b/yavscModel/WorkFlow/NewEstimateEvenArgs.cs
index 4077f42c..20fbb6dd 100644
--- a/yavscModel/WorkFlow/NewEstimateEvenArgs.cs
+++ b/yavscModel/WorkFlow/NewEstimateEvenArgs.cs
@@ -1,7 +1,6 @@
 using System;
 using Yavsc.Model.WorkFlow;
 using System.Configuration;
-using Yavsc.Model.WorkFlow.Configuration;
 using System.Collections.Specialized;
 
 namespace Yavsc.Model.WorkFlow
diff --git a/yavscModel/WorkFlow/WorkFlowManager.cs b/yavscModel/WorkFlow/WorkFlowManager.cs
index 30279990..a7c5a6cd 100644
--- a/yavscModel/WorkFlow/WorkFlowManager.cs
+++ b/yavscModel/WorkFlow/WorkFlowManager.cs
@@ -1,9 +1,9 @@
 using System;
 using Yavsc.Model.WorkFlow;
 using System.Configuration;
-using Yavsc.Model.WorkFlow.Configuration;
 using System.Collections.Specialized;
 using Yavsc.Model.FrontOffice;
+using System.Configuration.Provider;
 
 namespace Yavsc.Model.WorkFlow
 {
@@ -123,10 +123,10 @@ namespace Yavsc.Model.WorkFlow
 		/// <value>The content provider.</value>
 		public IContentProvider ContentProvider {
 			get {
-				WorkflowConfiguration c = (WorkflowConfiguration) ConfigurationManager.GetSection ("system.web/workflow");
+				DataProviderConfigurationSection c = (DataProviderConfigurationSection) ConfigurationManager.GetSection ("system.web/workflow");
 				if (c == null)
 					throw new Exception ("No system.web/workflow configuration section found");
-				WFProvider confprov = c.Providers.GetElement (c.DefaultProvider);
+				ProviderSettings confprov = c.Providers[c.DefaultProvider] as ProviderSettings;
 				if (confprov == null)
 					throw new Exception ("Default workflow provider not found (system.web/workflow@defaultProvider)");
 				string clsName = confprov.Type;
@@ -147,12 +147,7 @@ namespace Yavsc.Model.WorkFlow
 					System.Reflection.ConstructorInfo ci =cpt.GetConstructor (System.Type.EmptyTypes);
 					contentProvider = (IContentProvider)ci.Invoke (System.Type.EmptyTypes);
 				}
-
-				NameValueCollection config = new NameValueCollection ();
-				config.Add ("name", confprov.Name);
-				config.Add ("connectionStringName", confprov.ConnectionStringName);
-				config.Add ("applicationName", confprov.ApplicationName);
-				contentProvider.Initialize (confprov.Name, config);
+				contentProvider.Initialize (confprov.Name, confprov.Parameters);
 
 				return contentProvider;
 			}
diff --git a/yavscModel/YavscModel.csproj b/yavscModel/YavscModel.csproj
index c6f1866f..f4b8aa63 100644
--- a/yavscModel/YavscModel.csproj
+++ b/yavscModel/YavscModel.csproj
@@ -67,13 +67,7 @@
     <Compile Include="Blogs\BlogManager.cs" />
     <Compile Include="Blogs\BlogProvider.cs" />
     <Compile Include="WorkFlow\WorkFlowManager.cs" />
-    <Compile Include="WorkFlow\Configuration\Provider.cs" />
-    <Compile Include="WorkFlow\Configuration\ProviderCollection.cs" />
-    <Compile Include="WorkFlow\Configuration\WorkflowConfiguration.cs" />
     <Compile Include="Blogs\BlogHelper.cs" />
-    <Compile Include="Blogs\Configuration\BlogProviderConfigurationElement.cs" />
-    <Compile Include="Blogs\Configuration\BlogProvidersConfigurationCollection.cs" />
-    <Compile Include="Blogs\Configuration\BlogProvidersConfigurationSection.cs" />
     <Compile Include="WorkFlow\NewEstimateEvenArgs.cs" />
     <Compile Include="LocalizedText.fr.Designer.cs">
       <DependentUpon>LocalizedText.fr.resx</DependentUpon>
@@ -163,6 +157,7 @@
     <Compile Include="Circles\CircleInfoCollection.cs" />
     <Compile Include="Circles\CircleManager.cs" />
     <Compile Include="Circles\CircleProvider.cs" />
+    <Compile Include="DataProviderConfigurationSection.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>