http moudle also can be disable

Author: allwefantasy

README.md

@@ -5,7 +5,11 @@ Step-by-Step-tutorial-for-ServiceFramework
 * [Step-by-Step-tutorial-for-ServiceFramework(1)](https://github.com/allwefantasy/service_framework_example/blob/master/README.md)
 * [Step-by-Step-tutorial-for-ServiceFramework(2)](https://github.com/allwefantasy/service_framework_example/blob/master/doc/Step-by-Step-tutorial-for-ServiceFramework\(2\).md)
 * [Step-by-Step-tutorial-for-ServiceFramework(3)](https://github.com/allwefantasy/service_framework_example/blob/master/doc/Step-by-Step-tutorial-for-ServiceFramework\(3\).md)
-* [Step-by-Step-tutorial-for-ServiceFramework(4)](https://github.com/allwefantasy/service_framework_example/blob/master/doc/Step-by-Step-tutorial-for-ServiceFramework\(4\).md)
+* [Step-by-Step-tutorial-for-ServiceFramework(4)](https://github.com/allwefantasy/service_framework_example/blob/master/doc/Step-by-Step-tutorial-for-ServiceFramework\(4\).md)* 
+
+
+##[README-EN](https://github.com/allwefantasy/ServiceFramework/blob/master/README-EN.md)
+
 
 ##  创建一个新的ServiceFramework 项目
 
@@ -20,9 +24,10 @@ ServcieFramework 定位在 **移动互联网后端** 领域。
 3. 简单但实用的View层，天然支持JSON,XMl格式输出
 
 框架提供了对mysql([ActiveORM](https://github.com/allwefantasy/active_orm)),mongodb([MongoMongo](https://github.com/allwefantasy/mongomongo))的支持.
-对象缓存正在开发中。
 
-如果你面对的是一个遗留项目或者遗留的数据库，那么ServiceFramework不适合你。我们倾向于在一个全新的项目中使用它。
+_对象缓存正在开发中,开发以[Web应用的缓存设计模式](http://robbinfan.com/blog/38/orm-cache-sumup)的描述为基础思路，并且会直接提供包括计数等的实现。_
+
+*** 如果你面对的是一个遗留项目或者遗留的数据库，那么ServiceFramework不适合你。我们倾向于在一个全新的项目中使用它。***
 相信你会为Java也能做到如此的简洁而惊讶，如此高效的开发而窃喜。
 
 现在让我们了解下 ServiceFramework 吧。

src/net/csdn/bootstrap/Bootstrap.java

@@ -37,11 +37,6 @@ public static void main(String[] args) {
             e.printStackTrace();
             System.exit(3);
         }
-        httpServer = ServiceFramwork.injector.getInstance(HttpServer.class);
-        httpServer.start();
-        httpServer.join();
-
-
     }
 
     public static void shutdown() {
@@ -60,7 +55,10 @@ private static void configureSystem() throws Exception {
         Settings settings = tuple.v1();
         boolean disableMysql = settings.getAsBoolean(ServiceFramwork.mode + ".datasources.mysql.disable", false);
         boolean disableMongo = settings.getAsBoolean(ServiceFramwork.mode + ".datasources.mongodb.disable", false);
-        if (ServiceFramwork.scanService.getLoader() == null || (ServiceFramwork.scanService.getLoader()== DefaultScanService.class)) {
+        boolean disableHttp = settings.getAsBoolean("http.disable", false);
+
+
+        if (ServiceFramwork.scanService.getLoader() == null || (ServiceFramwork.scanService.getLoader() == DefaultScanService.class)) {
             ServiceFramwork.scanService.setLoader(ServiceFramwork.class);
         }
         if (!disableMysql) {
@@ -95,6 +93,12 @@ private static void configureSystem() throws Exception {
         }
 
         isSystemConfigured = true;
+
+        if (!disableHttp) {
+            httpServer = ServiceFramwork.injector.getInstance(HttpServer.class);
+            httpServer.start();
+            httpServer.join();
+        }
     }
 
 

src/net/csdn/modules/http/ApplicationController.java

@@ -260,6 +260,7 @@ public String param(String key) {
         return request.params().get(key);
     }
 
+
     public String paramMultiKey(String... keys) {
         return request.paramMultiKey(keys);
     }

test/test/com/example/PersonTest.java

@@ -29,11 +29,11 @@ public void testDocumentHasManyAssociation() {
 
         person.addresses().build(map("_id", 77, "location", "天国的世界")).save();
         person = Person.findById(100);
-        List<Address> addresses = person.addresses().filter().fetch();
+        List<Address> addresses = person.addresses().findAll();
         Assert.assertTrue(addresses.size() == 1);
 
         Address address = addresses.get(0);
-        Person person1 = address.person().filter().singleFetch();
+        Person person1 = address.person().findOne();
         Assert.assertTrue(person1.getName().equals(person.getName()));
 
         person.remove();
@@ -75,7 +75,7 @@ public void testDocumentEnhancer() {
 
         personList = Person.select(list("name")).where(map("name", "google")).fetch();
         Assert.assertTrue(personList.size() == 1);
-        Assert.assertTrue(personList.get(0).attributes().toMap().size() == 2);
+        Assert.assertTrue(personList.get(0).attributes().size() == 2);
 
         personFound.remove();
         personFound = Person.findById(100);

test/test/com/example/document/BlogTest.java

@@ -20,81 +20,5 @@
 public class BlogTest extends IocTest {
 
 
-    public void embeddedDocumentDeleteTest() {
-        Map blogMap = map(
-                "_id", 100,
-                "userName", "jack",
-                "blogTitle", "this is a test blog",
-                "articles", list(
-                map(
 
-                        "title", "article",
-                        "body", "article body"
-                ),
-                map(
-
-                        "title", "article1",
-                        "body", "article body1"
-                )
-        )
-        );
-
-        Blog blog = Blog.create(blogMap);
-        blog.save();
-        blog = Blog.findById(100);
-        List<Article> articles = blog.articles().find();
-        Assert.assertTrue(articles.size() == 2);
-        Article article = articles.get(0);
-        article.remove();
-
-        blog = Blog.findById(100);
-        articles = blog.articles().find();
-        Assert.assertTrue(articles.size() == 1);
-    }
-
-
-    @Test
-    public void embeddedDocumentTest() {
-        Map blogMap = map(
-                "_id", 100,
-                "userName", "jack",
-                "blogTitle", "this is a test blog",
-                "articles", list(
-                map(
-                        "_id", 101,
-                        "title", "article",
-                        "body", "article body"
-                ),
-                map(
-                        "_id", 102,
-                        "title", "article1",
-                        "body", "article body1"
-                )
-        )
-        );
-
-        Blog blog = Blog.create(blogMap);
-        blog.save();
-
-        List<Article> articleList = blog.articles().find();
-        Assert.assertTrue(articleList.size() == 2);
-
-        articleList = blog.articles().find(101);
-        Assert.assertTrue(articleList.size() == 1);
-
-        Article article = articleList.get(0);
-        Assert.assertTrue(blog.id().equals(article.blog().findOne().id()));
-
-        //test delete
-        articleList = blog.articles().find();
-
-        Assert.assertTrue(articleList.size() == 2);
-        article = articleList.get(0);
-        article.remove();
-
-        articleList = blog.articles().find();
-        Assert.assertTrue(articleList.size() == 1);
-
-
-    }
 }