合并原作者的更新

.gitignore

@@ -1,17 +1,14 @@
-# Eclipse project files
-.classpath
-.project
-.settings/
-
-
-# Intellij project files
-*.iml
-.idea/
-
-# Others
-target/
-logs/
-/examples/showcase/bin/yuicompressor-2.4.*.jar
-/support/jmeter/*.jtl
-/support/jmeter/*.log
-/support/local-script/
+# Eclipse project files
+.classpath
+.project
+.settings/
+
+
+# Intellij project files
+*.iml
+.idea/
+
+# Others
+target/
+logs/
+modules/utils副本

.travis.yml

@@ -1,10 +1,13 @@
 language: java
+jdk:
+  - oraclejdk8
+  - openjdk7
+install: true
 script:
-- mvn test
-- mvn test -Pfunctional-test -Dselenium.driver=firefox
-env: MAVEN_OPTS="-XX:MaxPermSize=128m"
-addons:
-  firefox: "22.0"
-before_install:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
+  - "cd modules;mvn clean test"
+  - "mvn clean test"
+  - "mvn clean package -Dmaven.test.skip=true"
+
+branches:
+  only:
+    - master 

README.md

@@ -0,0 +1,31 @@
+### 最新开源： [VJTools－唯品会Java核心项目](https://github.com/vipshop/vjtools)
+
+# SpringSide
+
+[![Build Status](https://api.travis-ci.org/springside/springside4.png?branch=master)](https://travis-ci.org/springside/springside4/)
+
+SpringSide是以Spring Framework为核心的，Pragmatic风格的JavaEE应用参考示例，是JavaEE世界中的主流技术选型，最佳实践的总结与演示。
+
+  1. Utils - 性能与易用性兼顾的Java基础库，综合各门各派的大成之作(近期重点).
+  2. BootApi - 基于Spring Boot的Web Service应用, 可以用于SOA服务，或Ajax页面的后台.
+  3. BootWeb - 基于Spring Boot的Web应用, 典型的增删改查管理(未开始).
+  4. Showcase - 更多的示例.
+
+
+## 主要用例
+
+全部示例以一个P2P图书馆展开，P2P图书馆避免了中央式图书馆所需的场地和图书管理员，大家把图书登记在应用里互相借阅。
+
+## 快速开始 (JDK7.0+)
+
+1. 运行根目录下的quick-start.sh 或 quick-start.bat
+   * 将modules安装到本地maven仓库
+   * 以开发模式启动BootApi应用
+
+2. 访问 http://localhost:8080/，按上面的提示体验。
+
+
+-------------------------------
+Offical Site: http://springside.io（域名过期）
+
+Document: https://github.com/springside/springside4/wiki

examples/boot-api/pom.xml

@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>io.springside.examples</groupId>
+	<artifactId>boot-api</artifactId>
+	<version>5.0.0-SNAPSHOT</version>
+	<packaging>war</packaging>
+	<name>Springside :: Examples :: SpringBoot WebService</name>
+
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>1.4.3.RELEASE</version>
+	</parent>
+
+	<properties>
+		<springside.version>5.0.0-SNAPSHOT</springside.version>
+		<commons-lang3.version>3.5</commons-lang3.version>
+		<guava.version>20.0</guava.version>
+		<orika.version>1.5.0</orika.version>
+
+		<java.version>1.7</java.version>
+	</properties>
+
+	<dependencies>
+		<!-- spring boot -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
+
+
+		<!-- springside -->
+		<dependency>
+			<groupId>io.springside</groupId>
+			<artifactId>springside-utils</artifactId>
+			<version>${springside.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>io.springside</groupId>
+			<artifactId>springside-core</artifactId>
+			<version>${springside.version}</version>
+		</dependency>
+
+		<!-- database -->
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.flywaydb</groupId>
+			<artifactId>flyway-core</artifactId>
+		</dependency>
+
+		<!-- utils -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>${commons-lang3.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>${guava.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>ma.glasnost.orika</groupId>
+			<artifactId>orika-core</artifactId>
+			<version>${orika.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+		</dependency>
+
+		<!-- jmx -->
+		<dependency>
+			<groupId>org.jolokia</groupId>
+			<artifactId>jolokia-core</artifactId>
+		</dependency>
+
+		<!-- test -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>io.springside</groupId>
+			<artifactId>springside-utils</artifactId>
+			<version>${springside.version}</version>
+			<classifier>tests</classifier>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.flywaydb</groupId>
+				<artifactId>flyway-maven-plugin</artifactId>
+				<version>${flyway.version}</version>
+				<configuration>
+					<driver>org.h2.Driver</driver>
+					<url>jdbc:h2:file:~/.h2/bootapi;AUTO_SERVER=TRUE;DB_CLOSE_DELAY=-1;</url>
+					<user>sa</user>
+					<password></password>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>

examples/boot-api/refresh-db.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+echo "cleanup the production/qa db,just for demo"
+
+mvn flyway:clean

examples/boot-api/src/main/java/org/springside/examples/bootapi/BootApiApplication.java

@@ -0,0 +1,23 @@
+package org.springside.examples.bootapi;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+// SpringBoot 应用标识
+@SpringBootApplication
+public class BootApiApplication {
+
+	/**
+	 * 启动嵌入式的Tomcat并初始化Spring环境.
+	 * 
+	 * 无 applicationContext.xml 和 web.xml, 靠下述方式进行配置：
+	 * 
+	 * 1. 扫描当前package下的class设置自动注入的Bean<br/>
+	 * 2. 也支持用@Bean标注的类配置Bean <br/>
+	 * 3. 根据classpath中的三方包Class及集中的application.properties条件配置三方包，如线程池 <br/>
+	 * 4. 也支持用@Configuration标注的类配置三方包.
+	 */
+	public static void main(String[] args) throws Exception {
+		SpringApplication.run(BootApiApplication.class, args);
+	}
+}

examples/boot-api/src/main/java/org/springside/examples/bootapi/api/AccountEndPoint.java

@@ -0,0 +1,54 @@
+package org.springside.examples.bootapi.api;
+
+import java.util.Collections;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springside.examples.bootapi.service.AccountService;
+import org.springside.examples.bootapi.service.exception.ErrorCode;
+import org.springside.examples.bootapi.service.exception.ServiceException;
+import org.springside.modules.web.MediaTypes;
+
+// Spring Restful MVC Controller的标识, 直接输出内容，不调用template引擎.
+@RestController
+public class AccountEndPoint {
+
+	private static Logger logger = LoggerFactory.getLogger(AccountEndPoint.class);
+
+	@Autowired
+	private AccountService accountService;
+
+	@RequestMapping(value = "/api/accounts/login", produces = MediaTypes.JSON_UTF_8)
+	public Map<String, String> login(@RequestParam("email") String email, @RequestParam("password") String password) {
+
+		if (StringUtils.isEmpty(email) || StringUtils.isEmpty(password)) {
+			throw new ServiceException("User or password empty", ErrorCode.BAD_REQUEST);
+		}
+
+		String token = accountService.login(email, password);
+
+		return Collections.singletonMap("token", token);
+	}
+
+	@RequestMapping(value = "/api/accounts/logout")
+	public void logout(@RequestParam(value = "token", required = false) String token) {
+		accountService.logout(token);
+	}
+
+	@RequestMapping(value = "/api/accounts/register")
+	public void register(@RequestParam("email") String email,
+			@RequestParam(value = "name", required = false) String name, @RequestParam("password") String password) {
+
+		if (StringUtils.isEmpty(email) || StringUtils.isEmpty(name) || StringUtils.isEmpty(password)) {
+			throw new ServiceException("User or name or password empty", ErrorCode.BAD_REQUEST);
+		}
+
+		accountService.register(email, name, password);
+	}
+}