Latest SS dlls, update to ext 4.1

angelcolmenares · May 9, 2012 · 0b6af21 · 0b6af21
1 parent e3bf9b6
commit 0b6af21
Show file tree

Hide file tree

Showing 29 changed files with 21 additions and 13 deletions.
diff --git a/lib/Northwind.Benchmarks.dll b/lib/Northwind.Benchmarks.dll
diff --git a/lib/Northwind.Common.dll b/lib/Northwind.Common.dll
diff --git a/lib/Northwind.Perf.dll b/lib/Northwind.Perf.dll
diff --git a/lib/ServiceStack.Common.Tests.dll b/lib/ServiceStack.Common.Tests.dll
diff --git a/lib/ServiceStack.Common.dll b/lib/ServiceStack.Common.dll
diff --git a/lib/ServiceStack.FluentValidation.Mvc3.dll b/lib/ServiceStack.FluentValidation.Mvc3.dll
diff --git a/lib/ServiceStack.Interfaces.dll b/lib/ServiceStack.Interfaces.dll
diff --git a/lib/ServiceStack.Messaging.Tests.dll b/lib/ServiceStack.Messaging.Tests.dll
diff --git a/lib/ServiceStack.OrmLite.Firebird.dll b/lib/ServiceStack.OrmLite.Firebird.dll
diff --git a/lib/ServiceStack.OrmLite.MySql.dll b/lib/ServiceStack.OrmLite.MySql.dll
diff --git a/lib/ServiceStack.OrmLite.PostgreSQL.dll b/lib/ServiceStack.OrmLite.PostgreSQL.dll
diff --git a/lib/ServiceStack.OrmLite.SqlServer.dll b/lib/ServiceStack.OrmLite.SqlServer.dll
diff --git a/lib/ServiceStack.OrmLite.Sqlite.dll b/lib/ServiceStack.OrmLite.Sqlite.dll
diff --git a/lib/ServiceStack.OrmLite.dll b/lib/ServiceStack.OrmLite.dll
diff --git a/lib/ServiceStack.Plugins.ProtoBuf.dll b/lib/ServiceStack.Plugins.ProtoBuf.dll
diff --git a/lib/ServiceStack.RazorEngine.dll b/lib/ServiceStack.RazorEngine.dll
diff --git a/lib/ServiceStack.Redis.dll b/lib/ServiceStack.Redis.dll
diff --git a/lib/ServiceStack.ServiceHost.Tests.dll b/lib/ServiceStack.ServiceHost.Tests.dll
diff --git a/lib/ServiceStack.ServiceInterface.dll b/lib/ServiceStack.ServiceInterface.dll
diff --git a/lib/ServiceStack.ServiceModel.Tests.dll b/lib/ServiceStack.ServiceModel.Tests.dll
diff --git a/lib/ServiceStack.Text.dll b/lib/ServiceStack.Text.dll
diff --git a/lib/ServiceStack.WebHost.Endpoints.Tests.dll b/lib/ServiceStack.WebHost.Endpoints.Tests.dll
diff --git a/lib/ServiceStack.WebHost.IntegrationTests.dll b/lib/ServiceStack.WebHost.IntegrationTests.dll
diff --git a/lib/ServiceStack.dll b/lib/ServiceStack.dll
diff --git a/src/AuthDemo.Host.Web/AppHost.cs b/src/AuthDemo.Host.Web/AppHost.cs
@@ -20,6 +20,7 @@
 using ServiceStack.FluentValidation;
 using ServiceStack.MiniProfiler;
 using ServiceStack.MiniProfiler.Data;
+using ServiceStack.Text;
 
 using AuthDemo.ServiceInterface;
 using AuthDemo.ServiceDbAcces;
@@ -155,12 +156,15 @@ private void ConfigureServiceRoutes()
 			        PasswordHash = hash,
 			        Salt = salt,
 					Roles =roles,
-					Permissions=adminPermissions
+					Permissions=adminPermissions,
 			    }, password);
 			}
 			// user
 			userName="user1";
 			password="user1";
+			var meta= new Dictionary<string,string>();
+			meta.Add("ExpiresAt", DateTime.UtcNow.SerializeToString());
+
 			if ( authRepo.GetUserAuthByUserName(userName)== default(UserAuth) ){
 				string hash;
 			    string salt;
@@ -173,7 +177,8 @@ private void ConfigureServiceRoutes()
 			        LastName = "",
 			        PasswordHash = hash,
 			        Salt = salt,
-					Permissions=userPermissions
+					Permissions=userPermissions,
+					Meta= meta
 				}, password);
 			}
 

diff --git a/src/AuthDemo.Host.Web/AuthDemo.Host.Web.csproj b/src/AuthDemo.Host.Web/AuthDemo.Host.Web.csproj
@@ -56,6 +56,9 @@
     <Reference Include="ServiceStack.ServiceInterface">
       <HintPath>..\..\lib\ServiceStack.ServiceInterface.dll</HintPath>
     </Reference>
+    <Reference Include="ServiceStack.Text">
+      <HintPath>..\..\lib\ServiceStack.Text.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" />

diff --git a/src/AuthDemo.Host.Web/WebApp/modules/author/app.js b/src/AuthDemo.Host.Web/WebApp/modules/author/app.js
@@ -1,5 +1,5 @@
 Ext.require(['*']);
-
+Ext.onReady(function() {		
 	Ext.create('Ext.form.Panel', {
 		frame: true,
         renderTo: 'module',
@@ -32,7 +32,7 @@ Ext.require(['*']);
                 	Ext.getBody().unmask();
                 }
             });
-
+});
 
 // {"ResponseStatus":{"ErrorCode":"Invalid UserName or
 // Password","Message":"Invalid UserName or Password","Errors":[]}}

diff --git a/src/AuthDemo.Host.Web/WebApp/resources/util.js b/src/AuthDemo.Host.Web/WebApp/resources/util.js
@@ -324,7 +324,7 @@ Ext.define('Aicl.data.Store',{
 });  
 
 
-
+/*
 Ext.data.Store.implement({
     rejectChanges: function(){
     	Ext.each(this.removed, function(record){
@@ -348,7 +348,7 @@ Ext.form.Panel.implement({
     }
 });
 
-
+*/
 
 /*Ext.data.Store.implement({
 	convertToDate:function(v){ 

diff --git a/src/AuthDemo.Host.Web/web.config b/src/AuthDemo.Host.Web/web.config
@@ -102,32 +102,32 @@
 	<add key="RootDirectory" value="/home/angel/Projects/github/ServiceStack.AuthDemo/src/AuthDemo.Host.Web" />
     <add key="PhotoDirectory" value="/home/angel/Projects/github/ServiceStack.AuthDemo/src/AuthDemo.WebApp/photos" />
 	<add key="LibDirectory" value="/home/angel/Projects/github/ServiceStack.AuthDemo/lib" />
-
+	<!-- 		
     <add key ="DialectProvider" 
 		value="Name:Sqlite,AssemblyName:ServiceStack.OrmLite.Sqlite.dll,ClassName:ServiceStack.OrmLite.Sqlite.SqliteOrmLiteDialectProvider,InstanceFieldName:Instance"/>
-
+	!-->	
     <!--	
 	<add key ="DialectProvider" 
 		value="Name:PostgreSQL,AssemblyName:ServiceStack.OrmLite.PostgreSQL.dll,ClassName:ServiceStack.OrmLite.PostgreSQL.PostgreSQLDialectProvider,InstanceFieldName:Instance"/>
 	!-->
-    <!-- 		
+
     <add key="DialectProvider" 
 		value="Name:FirebirdSql,AssemblyName:ServiceStack.OrmLite.Firebird.dll,ClassName:ServiceStack.OrmLite.Firebird.FirebirdOrmLiteDialectProvider,InstanceFieldName:Instance" />
-    !-->	
+
     <!--
     <add key="DialectProvider" 
     	value="Name:MySql,AssemblyName:ServiceStack.OrmLite.MySql.dll,ClassName:ServiceStack.OrmLite.MySql.MySqlDialectProvider,InstanceFieldName:Instance" />
     !-->
   </appSettings>
   <connectionStrings>
-    <!--	 
+
     <add name="ApplicationDb" connectionString="User=sysdba;Password=masterkey;Database=employee.fdb;DataSource=localhost;Dialect=3;charset=ISO8859_1;" />
     <add name="UserAuth" connectionString="User=sysdba;Password=masterkey;Database=employee.fdb;DataSource=localhost;Dialect=3;charset=ISO8859_1;" />
-    !-->
 
+    <!--	 
     <add name="ApplicationDb" connectionString="/home/angel/Projects/github/ServiceStack.AuthDemo/src/AuthDemo.Host.Web/App_Data/ormlite.sqlite" />
     <add name="UserAuth" connectionString="/home/angel/Projects/github/ServiceStack.AuthDemo/src/AuthDemo.Host.Web/App_Data/ormlite.sqlite" />
-
+	!-->
 	<!--
     <add name="ApplicationDb" connectionString="Server = 127.0.0.1; Database = ormlite; Uid = root; Pwd = password" />
     <add name="UserAuth" connectionString="Server = 127.0.0.1; Database = ormlite; Uid = root; Pwd = password" />