diff --git a/.gitignore b/.gitignore index 186688bb..5a1f1371 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ org.eclipse.wst.common.project.facet.core.xml /examples/showcase/bin/yuicompressor-2.4.7.jar /support/script /TODO.txt -/examples/mini-web-old \ No newline at end of file +/examples/mini-web-old +/examples/mini-service-old \ No newline at end of file diff --git a/examples/mini-service/.settings/org.eclipse.core.resources.prefs b/examples/mini-service/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 72608245..00000000 --- a/examples/mini-service/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Sat Dec 25 21:21:12 CST 2010 -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/examples/mini-service/bin/eclipse.bat b/examples/mini-service/bin/eclipse.bat deleted file mode 100644 index 47a8ddc3..00000000 --- a/examples/mini-service/bin/eclipse.bat +++ /dev/null @@ -1,9 +0,0 @@ -@echo off -echo [INFO] Use maven eclipse-plugin download jars and generate eclipse project files. -echo [Info] Please add "-Declipse.workspace=" at the end. - -cd %~dp0 -cd .. -call mvn eclipse:clean eclipse:eclipse -cd bin -pause \ No newline at end of file diff --git a/examples/mini-service/bin/mybatis/generator.bat b/examples/mini-service/bin/mybatis/generator.bat deleted file mode 100644 index c3e95141..00000000 --- a/examples/mini-service/bin/mybatis/generator.bat +++ /dev/null @@ -1,10 +0,0 @@ -@echo off - -cd %~dp0/../../ -call mvn mybatis-generator:generate -if errorlevel 1 goto end - -echo [INFO] Code had generated to - -:end -pause \ No newline at end of file diff --git a/examples/mini-service/bin/mybatis/generatorConfig.xml b/examples/mini-service/bin/mybatis/generatorConfig.xml deleted file mode 100644 index 1bbbe952..00000000 --- a/examples/mini-service/bin/mybatis/generatorConfig.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - diff --git a/examples/mini-service/bin/webservice/build.xml b/examples/mini-service/bin/webservice/build.xml deleted file mode 100644 index 97230a8b..00000000 --- a/examples/mini-service/bin/webservice/build.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - ]]> - - ]]> - - - diff --git a/examples/mini-service/bin/webservice/save-wsdl.bat b/examples/mini-service/bin/webservice/save-wsdl.bat deleted file mode 100644 index 3595176a..00000000 --- a/examples/mini-service/bin/webservice/save-wsdl.bat +++ /dev/null @@ -1,11 +0,0 @@ -@echo off -echo [INFO] Make sure the local WebService appllication started - -cd %~dp0 -call ant -if errorlevel 1 goto end - -echo [INFO] WSDL had saved to webapp/wsdl/mini-service.wsdl. - -:end -pause \ No newline at end of file diff --git a/examples/mini-service/bin/webservice/wsdl2java.bat b/examples/mini-service/bin/webservice/wsdl2java.bat deleted file mode 100644 index d8671d05..00000000 --- a/examples/mini-service/bin/webservice/wsdl2java.bat +++ /dev/null @@ -1,10 +0,0 @@ -@echo off - -cd %~dp0/../../ -call mvn cxf-codegen:wsdl2java -if errorlevel 1 goto end - -echo [INFO] Code had generated to - -:end -pause \ No newline at end of file diff --git a/examples/mini-service/pom.xml b/examples/mini-service/pom.xml deleted file mode 100644 index 597fb974..00000000 --- a/examples/mini-service/pom.xml +++ /dev/null @@ -1,360 +0,0 @@ - - - 4.0.0 - - org.springside - springside-parent - 4.0.0.RC4-SNAPSHOT - ../../modules/parent/ - - org.springside.examples - mini-service - war - Springside :: Example :: Mini-Service - - - - com.h2database - h2 - ${h2.version} - - - - - - - org.springside - springside-core - - - - - org.springframework - spring-aop - - - org.aspectj - aspectjweaver - - - cglib - cglib - - - asm - asm - - - - - - - org.mybatis - mybatis - - - org.mybatis - mybatis-spring - - - - - org.springframework - spring-jdbc - - - - - commons-dbcp - commons-dbcp - - - - - ${jdbc.driver.groupId} - ${jdbc.driver.artifactId} - ${jdbc.driver.version} - runtime - - - - - - org.apache.cxf - cxf-rt-frontend-jaxws - - - org.apache.cxf - cxf-rt-transports-http - - - javax.activation - activation - - - - - - com.sun.jersey - jersey-server - - - com.sun.jersey - jersey-servlet - - - com.sun.jersey.contribs - jersey-spring - - - com.sun.jersey - jersey-client - - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - - - - - - org.hibernate - hibernate-validator - - - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-log4j12 - - - org.slf4j - jcl-over-slf4j - - - log4j - log4j - - - org.lazyluke - log4jdbc-remix - - - - - - org.apache.commons - commons-lang3 - - - commons-io - commons-io - - - com.google.guava - guava - - - net.sf.dozer - dozer - - - - - - org.springside - springside-test - - - - junit - junit - - - - org.mockito - mockito-core - - - - org.powermock - powermock-module-junit4 - - - org.powermock - powermock-api-mockito - - - - org.springframework - spring-test - - - - com.h2database - h2 - - - org.dbunit - dbunit - - - - org.eclipse.jetty.aggregate - jetty-webapp - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-functional-source - generate-sources - - add-test-source - - - - src/test/functional - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Xmx256M - - - - - org.codehaus.mojo - cobertura-maven-plugin - - - - **/entity/**/*.class - **/dto/**/*.class - **/response/**/*.class - - - - - - - - org.apache.maven.plugins - maven-eclipse-plugin - - 2.0 - - org.springframework.ide.eclipse.core.springnature - - - - - - - org.mortbay.jetty - jetty-maven-plugin - - - - spring.profiles.active - development - - - true - - /${project.artifactId} - - - - - - - org.apache.cxf - cxf-codegen-plugin - ${cxf.version} - - ${basedir}/target/generated-sources/cxf - - - ${basedir}/src/main/webapp/wsdl/mini-service.wsdl - - - - - - - - org.mybatis.generator - mybatis-generator-maven-plugin - 1.3.1 - - true - ${project.basedir}/bin/mybatis/generatorConfig.xml - - - - - - - - - refresh-db - - - - org.apache.maven.plugins - maven-antrun-plugin - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/mini-service/src/main/java/org/springside/examples/miniservice/dao/AccountDao.java b/examples/mini-service/src/main/java/org/springside/examples/miniservice/dao/AccountDao.java deleted file mode 100644 index 7154072d..00000000 --- a/examples/mini-service/src/main/java/org/springside/examples/miniservice/dao/AccountDao.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.springside.examples.miniservice.dao; - -import java.util.List; -import java.util.Map; - -import org.mybatis.spring.support.SqlSessionDaoSupport; -import org.springframework.stereotype.Component; -import org.springside.examples.miniservice.entity.Department; -import org.springside.examples.miniservice.entity.User; - -@Component -public class AccountDao extends SqlSessionDaoSupport { - - public Department getDepartmentDetail(Long id) { - return (Department) getSqlSession().selectOne("Account.getDepartmentDetail", id); - } - - public User getUser(Long id) { - return (User) getSqlSession().selectOne("Account.getUser", id); - } - - public Long saveUser(User user) { - getSqlSession().insert("Account.saveUser", user); - return user.getId(); - } - - public void deleteUser(Long id) { - getSqlSession().delete("Account.deleteUser", id); - - } - - public List searchUser(Map parameters) { - return getSqlSession().selectList("Account.searchUser", parameters); - } -} diff --git a/examples/mini-service/src/main/java/org/springside/examples/miniservice/entity/Department.java b/examples/mini-service/src/main/java/org/springside/examples/miniservice/entity/Department.java deleted file mode 100644 index d68bb694..00000000 --- a/examples/mini-service/src/main/java/org/springside/examples/miniservice/entity/Department.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.springside.examples.miniservice.entity; - -import java.util.List; - -import com.google.common.collect.Lists; - -/** - * 部门. - * - * @author calvin - */ -public class Department extends IdEntity { - - private String name; - private User manager; - private List userList = Lists.newArrayList(); - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public User getManager() { - return manager; - } - - public void setManager(User manager) { - this.manager = manager; - } - - public List getUserList() { - return userList; - } - - public void setUserList(List userList) { - this.userList = userList; - } -} diff --git a/examples/mini-service/src/main/java/org/springside/examples/miniservice/entity/IdEntity.java b/examples/mini-service/src/main/java/org/springside/examples/miniservice/entity/IdEntity.java deleted file mode 100644 index 9e1bd850..00000000 --- a/examples/mini-service/src/main/java/org/springside/examples/miniservice/entity/IdEntity.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.springside.examples.miniservice.entity; - -/** - * 统一定义id的entity基类. - * - * @author calvin - */ -public abstract class IdEntity { - - protected Long id; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } -} diff --git a/examples/mini-service/src/main/java/org/springside/examples/miniservice/entity/User.java b/examples/mini-service/src/main/java/org/springside/examples/miniservice/entity/User.java deleted file mode 100644 index 9b7bb431..00000000 --- a/examples/mini-service/src/main/java/org/springside/examples/miniservice/entity/User.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.springside.examples.miniservice.entity; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.hibernate.validator.constraints.Email; -import org.hibernate.validator.constraints.NotBlank; - -/** - * 用户. - * - * @author calvin - */ -public class User extends IdEntity { - - private String loginName; - private String password; - private String name; - private String email; - private Department department; - - @NotBlank - public String getLoginName() { - return loginName; - } - - public void setLoginName(String loginName) { - this.loginName = loginName; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - @NotBlank - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Email - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public Department getDepartment() { - return department; - } - - public void setDepartment(Department department) { - this.department = department; - } - - @Override - public String toString() { - return ToStringBuilder.reflectionToString(this); - } -} \ No newline at end of file diff --git a/examples/mini-service/src/main/java/org/springside/examples/miniservice/service/AccountManager.java b/examples/mini-service/src/main/java/org/springside/examples/miniservice/service/AccountManager.java deleted file mode 100644 index 89fd803c..00000000 --- a/examples/mini-service/src/main/java/org/springside/examples/miniservice/service/AccountManager.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.springside.examples.miniservice.service; - -import java.util.List; -import java.util.Map; - -import javax.validation.ConstraintViolationException; -import javax.validation.Validator; - -import org.apache.commons.lang3.Validate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; -import org.springside.examples.miniservice.dao.AccountDao; -import org.springside.examples.miniservice.entity.Department; -import org.springside.examples.miniservice.entity.User; -import org.springside.modules.beanvalidator.BeanValidators; - -import com.google.common.collect.Maps; - -/** - * 帐号管理类. - * - * 实现领域对象用户及其相关实体的所有业务管理函数. - * 使用Spring annotation定义事务管理. - * - * @author calvin - */ -//Spring Service Bean的标识. -@Component -//默认将类中的所有函数纳入事务管理. -@Transactional(readOnly = true) -public class AccountManager { - - private AccountDao accountDao = null; - - private Validator validator = null; - - public Department getDepartmentDetail(Long id) { - Validate.notNull(id, "id参数为空"); - return accountDao.getDepartmentDetail(id); - } - - public User getUser(Long id) { - Validate.notNull(id, "id参数为空"); - return accountDao.getUser(id); - } - - public List searchUser(String loginName, String name) { - Map parameters = Maps.newHashMap(); - parameters.put("loginName", loginName); - parameters.put("name", name); - return accountDao.searchUser(parameters); - } - - @Transactional(readOnly = false) - public Long saveUser(User user) throws ConstraintViolationException { - Validate.notNull(user, "用户参数为空"); - //使用Hibernate Validator校验请求参数 - BeanValidators.validateWithException(validator, user); - - return accountDao.saveUser(user); - } - - @Transactional(readOnly = false) - public void deleteUser(Long id) { - accountDao.deleteUser(id); - } - - @Autowired - public void setAccountDao(AccountDao accountDao) { - this.accountDao = accountDao; - } - - @Autowired - public void setValidator(Validator validator) { - this.validator = validator; - } -} diff --git a/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/WsConstants.java b/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/WsConstants.java deleted file mode 100644 index e46a12ec..00000000 --- a/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/WsConstants.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.springside.examples.miniservice.webservice; - -/** - * WebService常量定义. - * - * @author calvin - */ -public class WsConstants { - - /**项目内统一的NameSpace定义, for SOAP.*/ - public static final String NS = "http://miniservice.examples.springside.org"; - - /**项目内统一的XML charset定义, for REST*/ - public static final String CHARSET = ";charset=UTF-8"; -} diff --git a/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/dto/DepartmentDTO.java b/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/dto/DepartmentDTO.java deleted file mode 100644 index 7882f8d8..00000000 --- a/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/dto/DepartmentDTO.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.springside.examples.miniservice.webservice.dto; - -import java.util.List; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.springside.examples.miniservice.webservice.WsConstants; - -import com.google.common.collect.Lists; - -@XmlRootElement -@XmlType(name = "Department", namespace = WsConstants.NS) -public class DepartmentDTO { - - private String name; - private UserDTO manager; - private List userList = Lists.newArrayList(); - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public UserDTO getManager() { - return manager; - } - - public void setManager(UserDTO manager) { - this.manager = manager; - } - - //配置输出xml为1 - @XmlElementWrapper(name = "userList") - @XmlElement(name = "User") - public List getUserList() { - return userList; - } - - public void setUserList(List userList) { - this.userList = userList; - } - - /** - * 重新实现toString()函数方便在日志中打印DTO信息. - */ - @Override - public String toString() { - return ToStringBuilder.reflectionToString(this); - } -} diff --git a/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/dto/UserDTO.java b/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/dto/UserDTO.java deleted file mode 100644 index 4a83c72c..00000000 --- a/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/dto/UserDTO.java +++ /dev/null @@ -1,73 +0,0 @@ -package org.springside.examples.miniservice.webservice.dto; - -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.springside.examples.miniservice.webservice.WsConstants; - -/** - * Web Service传输User信息的DTO. - * - * 只传输外部接口需要的属性.使用JAXB 2.0的annotation标注JAVA-XML映射,尽量使用默认约定. - * - * @author calvin - */ -@XmlRootElement -@XmlType(name = "User", namespace = WsConstants.NS) -public class UserDTO { - - private Long id; - private String loginName; - private String name; - private String email; - private DepartmentDTO department; - - public Long getId() { - return id; - } - - public void setId(Long value) { - id = value; - } - - public String getLoginName() { - return loginName; - } - - public void setLoginName(String value) { - loginName = value; - } - - public String getName() { - return name; - } - - public void setName(String value) { - name = value; - } - - public String getEmail() { - return email; - } - - public void setEmail(String value) { - email = value; - } - - public DepartmentDTO getDepartment() { - return department; - } - - public void setDepartment(DepartmentDTO department) { - this.department = department; - } - - /** - * 重新实现toString()函数方便在日志中打印DTO信息. - */ - @Override - public String toString() { - return ToStringBuilder.reflectionToString(this); - } -} diff --git a/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/rs/client/AccountResourceClient.java b/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/rs/client/AccountResourceClient.java deleted file mode 100644 index 864fca90..00000000 --- a/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/rs/client/AccountResourceClient.java +++ /dev/null @@ -1,90 +0,0 @@ -package org.springside.examples.miniservice.webservice.rs.client; - -import java.net.URI; -import java.util.List; - -import javax.ws.rs.core.MediaType; - -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Required; -import org.springside.examples.miniservice.webservice.dto.DepartmentDTO; -import org.springside.examples.miniservice.webservice.dto.UserDTO; - -import com.sun.jersey.api.client.Client; -import com.sun.jersey.api.client.ClientResponse; -import com.sun.jersey.api.client.ClientResponse.Status; -import com.sun.jersey.api.client.GenericType; -import com.sun.jersey.api.client.UniformInterfaceException; -import com.sun.jersey.api.client.WebResource; - -/** - * 使用Jersey Client的AccountResourceService REST客户端. - * - * Department相关的使用XML格式,User 相关的使用JSON格式 。 - * - * @author calvin - */ -public class AccountResourceClient { - - private WebResource client; - - private final GenericType> userListType = new GenericType>() { - }; - - @Required - public void setBaseUrl(String baseUrl) { - client = Client.create().resource(baseUrl); - } - - /** - * 获取部门. - */ - public DepartmentDTO getDepartmentDetail(Long id) { - return client.path("/departments/" + id).accept(MediaType.APPLICATION_XML).get(DepartmentDTO.class); - } - - /** - * 获取用户. - */ - public UserDTO getUser(Long id) { - return client.path("/users/" + id).accept(MediaType.APPLICATION_JSON).get(UserDTO.class); - } - - /** - * 查询用户列表, 使用URL参数发送查询条件, 返回用户列表. - */ - public List searchUser(String loginName, String name) { - WebResource wr = client.path("/users/search"); - if (StringUtils.isNotBlank(loginName)) { - wr = wr.queryParam("loginName", loginName); - } - if (StringUtils.isNotBlank(name)) { - wr = wr.queryParam("name", name); - } - - return wr.accept(MediaType.APPLICATION_JSON).get(userListType); - } - - /** - * 创建用户, 使用Post发送JSON编码的用户对象, 返回代表用户的url. - */ - public URI createUser(UserDTO user) { - ClientResponse response = client.path("/users").entity(user, MediaType.APPLICATION_JSON) - .post(ClientResponse.class); - if (Status.CREATED.getStatusCode() == response.getStatus()) { - return response.getLocation(); - } else { - throw new UniformInterfaceException(response); - } - } - - /** - * 删除用户. - */ - public void deleteUser(Long id) { - ClientResponse response = client.path("/users/" + id).delete(ClientResponse.class); - if (Status.NO_CONTENT.getStatusCode() != response.getStatus()) { - throw new UniformInterfaceException(response); - } - } -} diff --git a/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/rs/server/DepartmentResouceService.java b/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/rs/server/DepartmentResouceService.java deleted file mode 100644 index 2299f876..00000000 --- a/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/rs/server/DepartmentResouceService.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.springside.examples.miniservice.webservice.rs.server; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response.Status; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springside.examples.miniservice.entity.Department; -import org.springside.examples.miniservice.service.AccountManager; -import org.springside.examples.miniservice.webservice.WsConstants; -import org.springside.examples.miniservice.webservice.dto.DepartmentDTO; -import org.springside.modules.mapper.BeanMapper; -import org.springside.modules.rest.RsResponse; - -/** - * Department资源的REST服务. - * - * @author calvin - */ -@Path("/departments") -public class DepartmentResouceService { - - private AccountManager accountManager; - - /** - * 获取部门详细信息. - */ - @GET - @Path("{id}") - @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML + WsConstants.CHARSET }) - public DepartmentDTO getDepartmentDetail(@PathParam("id") Long id) { - try { - Department entity = accountManager.getDepartmentDetail(id); - - if (entity == null) { - String message = "部门不存在(id:" + id + ")"; - throw RsResponse.buildException(Status.NOT_FOUND, message); - } - - return BeanMapper.map(entity, DepartmentDTO.class); - } catch (RuntimeException e) { - throw RsResponse.buildDefaultException(e); - } - } - - @Autowired - public void setAccountManager(AccountManager accountManager) { - this.accountManager = accountManager; - } -} diff --git a/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/rs/server/UserResouceService.java b/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/rs/server/UserResouceService.java deleted file mode 100644 index 29b71931..00000000 --- a/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/rs/server/UserResouceService.java +++ /dev/null @@ -1,121 +0,0 @@ -package org.springside.examples.miniservice.webservice.rs.server; - -import java.net.URI; -import java.util.List; - -import javax.validation.ConstraintViolationException; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriInfo; - -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.dao.DataIntegrityViolationException; -import org.springside.examples.miniservice.entity.User; -import org.springside.examples.miniservice.service.AccountManager; -import org.springside.examples.miniservice.webservice.WsConstants; -import org.springside.examples.miniservice.webservice.dto.UserDTO; -import org.springside.modules.beanvalidator.BeanValidators; -import org.springside.modules.mapper.BeanMapper; -import org.springside.modules.rest.RsResponse; - -/** - * User资源的REST服务. - * - * @author calvin - */ -@Path("/users") -public class UserResouceService { - - private AccountManager accountManager; - - @Context - private UriInfo uriInfo; - - /** - * 获取用户信息. - */ - @GET - @Path("{id}") - @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML + WsConstants.CHARSET }) - public UserDTO getUser(@PathParam("id") Long id) { - try { - User entity = accountManager.getUser(id); - - if (entity == null) { - String message = "用户不存在(id:" + id + ")"; - throw RsResponse.buildException(Status.NOT_FOUND, message); - } - - return BeanMapper.map(entity, UserDTO.class); - } catch (RuntimeException e) { - throw RsResponse.buildDefaultException(e); - } - } - - /** - * 查询用户, 请求数据为URL中的请求参数, 返回用户列表. - */ - @GET - @Path("search") - @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML + WsConstants.CHARSET }) - public List searchUser(@QueryParam("loginName") String loginName, @QueryParam("name") String name) { - try { - List entityList = accountManager.searchUser(loginName, name); - - return BeanMapper.mapList(entityList, UserDTO.class); - } catch (RuntimeException e) { - throw RsResponse.buildDefaultException(e); - } - } - - /** - * 创建用户, 请求数据为POST过来的JSON/XML格式编码的DTO, 返回 状态码201("Created")及 表示所创建用户的URI. - */ - @POST - @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML + WsConstants.CHARSET }) - public Response createUser(UserDTO user) { - //转换并创建用户 - try { - User userEntity = BeanMapper.map(user, User.class); - - Long id = accountManager.saveUser(userEntity); - - URI createdUri = uriInfo.getAbsolutePathBuilder().path(id.toString()).build(); - return Response.created(createdUri).build(); - } catch (ConstraintViolationException e) { - String message = StringUtils.join(BeanValidators.extractPropertyAndMessage(e), "\n"); - throw RsResponse.buildException(Status.BAD_REQUEST, message); - } catch (DataIntegrityViolationException e) { - String message = "新建用户参数存在唯一性冲突(用户:" + user + ")"; - throw RsResponse.buildException(Status.BAD_REQUEST, message); - } catch (RuntimeException e) { - throw RsResponse.buildDefaultException(e); - } - } - - /** - * 刪除用户,返回状态码204("No Content"). - */ - @DELETE - @Path("{id}") - public Response deleteUser(@PathParam("id") Long id) { - accountManager.deleteUser(id); - return Response.noContent().build(); - } - - @Autowired - public void setAccountManager(AccountManager accountManager) { - this.accountManager = accountManager; - } -} diff --git a/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/ws/AccountWebService.java b/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/ws/AccountWebService.java deleted file mode 100644 index ef1d8ac4..00000000 --- a/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/ws/AccountWebService.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.springside.examples.miniservice.webservice.ws; - -import javax.jws.WebParam; -import javax.jws.WebService; - -import org.springside.examples.miniservice.webservice.WsConstants; -import org.springside.examples.miniservice.webservice.dto.UserDTO; -import org.springside.examples.miniservice.webservice.ws.response.DepartmentResponse; -import org.springside.examples.miniservice.webservice.ws.response.UserListResponse; -import org.springside.examples.miniservice.webservice.ws.response.base.IdResponse; - -/** - * JAX-WS2.0的WebService接口定义类. - * - * 使用JAX-WS2.0 annotation设置WSDL中的定义. - * 使用WSResult及其子类类包裹返回结果. - * 使用DTO传输对象隔绝系统内部领域对象的修改对外系统的影响. - * - * @author calvin - */ -@WebService(name = "AccountService", targetNamespace = WsConstants.NS) -public interface AccountWebService { - /** - * 获取部门的详细信息. - */ - DepartmentResponse getDepartmentDetail(@WebParam(name = "id") Long id); - - /** - * 搜索用户信息. - */ - UserListResponse searchUser(@WebParam(name = "loginName") String loginName, @WebParam(name = "name") String name); - - /** - * 新建用户. - */ - IdResponse createUser(@WebParam(name = "user") UserDTO user); - -} diff --git a/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/ws/impl/AccountWebServiceImpl.java b/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/ws/impl/AccountWebServiceImpl.java deleted file mode 100644 index d7411464..00000000 --- a/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/ws/impl/AccountWebServiceImpl.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.springside.examples.miniservice.webservice.ws.impl; - -import java.util.List; - -import javax.jws.WebService; -import javax.validation.ConstraintViolationException; - -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.Validate; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.dao.DataIntegrityViolationException; -import org.springside.examples.miniservice.entity.Department; -import org.springside.examples.miniservice.entity.User; -import org.springside.examples.miniservice.service.AccountManager; -import org.springside.examples.miniservice.webservice.WsConstants; -import org.springside.examples.miniservice.webservice.dto.DepartmentDTO; -import org.springside.examples.miniservice.webservice.dto.UserDTO; -import org.springside.examples.miniservice.webservice.ws.AccountWebService; -import org.springside.examples.miniservice.webservice.ws.response.DepartmentResponse; -import org.springside.examples.miniservice.webservice.ws.response.UserListResponse; -import org.springside.examples.miniservice.webservice.ws.response.base.IdResponse; -import org.springside.examples.miniservice.webservice.ws.response.base.WSResponse; -import org.springside.modules.beanvalidator.BeanValidators; -import org.springside.modules.mapper.BeanMapper; - -/** - * WebService服务端实现类. - * - * 客户端实现见功能测试用例. - * - * @author calvin - */ -//serviceName与portName属性指明WSDL中的名称, endpointInterface属性指向Interface定义类. -@WebService(serviceName = "AccountService", portName = "AccountServicePort", endpointInterface = "org.springside.examples.miniservice.webservice.ws.AccountWebService", targetNamespace = WsConstants.NS) -public class AccountWebServiceImpl implements AccountWebService { - - private static Logger logger = LoggerFactory.getLogger(AccountWebServiceImpl.class); - - private AccountManager accountManager; - - /** - * @see AccountWebService#getDepartmentDetail() - */ - @Override - public DepartmentResponse getDepartmentDetail(Long id) { - try { - Department entity = accountManager.getDepartmentDetail(id); - - Validate.notNull(entity, "部门不存在(id:" + id + ")"); - - DepartmentDTO dto = BeanMapper.map(entity, DepartmentDTO.class); - - return new DepartmentResponse(dto); - } catch (IllegalArgumentException e) { - logger.error(e.getMessage()); - return new DepartmentResponse().setError(WSResponse.PARAMETER_ERROR, e.getMessage()); - } catch (RuntimeException e) { - logger.error(e.getMessage(), e); - return new DepartmentResponse().setDefaultError(); - } - } - - /** - * @see AccountWebService#searchUser() - */ - @Override - public UserListResponse searchUser(String loginName, String name) { - try { - List entityList = accountManager.searchUser(loginName, name); - - List dtoList = BeanMapper.mapList(entityList, UserDTO.class); - - return new UserListResponse(dtoList); - } catch (RuntimeException e) { - logger.error(e.getMessage(), e); - return new UserListResponse().setDefaultError(); - } - } - - /** - * @see AccountWebService#createUser() - */ - @Override - public IdResponse createUser(UserDTO user) { - try { - User userEntity = BeanMapper.map(user, User.class); - - Long userId = accountManager.saveUser(userEntity); - - return new IdResponse(userId); - } catch (ConstraintViolationException e) { - String message = StringUtils.join(BeanValidators.extractPropertyAndMessage(e), "\n"); - return new IdResponse().setError(WSResponse.PARAMETER_ERROR, message); - } catch (DataIntegrityViolationException e) { - String message = "新建用户参数存在唯一性冲突(用户:" + user + ")"; - logger.error(message, e); - return new IdResponse().setError(WSResponse.PARAMETER_ERROR, message); - } catch (RuntimeException e) { - logger.error(e.getMessage(), e); - return new IdResponse().setDefaultError(); - } - } - - @Autowired - public void setAccountManager(AccountManager accountManager) { - this.accountManager = accountManager; - } -} diff --git a/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/ws/response/DepartmentResponse.java b/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/ws/response/DepartmentResponse.java deleted file mode 100644 index 04de4b7d..00000000 --- a/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/ws/response/DepartmentResponse.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.springside.examples.miniservice.webservice.ws.response; - -import javax.xml.bind.annotation.XmlType; - -import org.springside.examples.miniservice.webservice.WsConstants; -import org.springside.examples.miniservice.webservice.dto.DepartmentDTO; -import org.springside.examples.miniservice.webservice.ws.response.base.WSResponse; - -/** - * 包含Department的返回结果. - * - * @author calvin - * @author badqiu - */ -@XmlType(name = "DepartmentResponse", namespace = WsConstants.NS) -public class DepartmentResponse extends WSResponse { - - private DepartmentDTO department; - - public DepartmentResponse() { - } - - public DepartmentResponse(DepartmentDTO department) { - this.department = department; - } - - public DepartmentDTO getDepartment() { - return department; - } - - public void setDepartment(DepartmentDTO department) { - this.department = department; - } -} diff --git a/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/ws/response/UserListResponse.java b/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/ws/response/UserListResponse.java deleted file mode 100644 index e93a144b..00000000 --- a/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/ws/response/UserListResponse.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.springside.examples.miniservice.webservice.ws.response; - -import java.util.List; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlType; - -import org.springside.examples.miniservice.webservice.WsConstants; -import org.springside.examples.miniservice.webservice.dto.UserDTO; -import org.springside.examples.miniservice.webservice.ws.response.base.WSResponse; - -/** - * 包含UserList的返回结果. - * - * @author calvin - * @author badqiu - */ -@XmlType(name = "UserListResponse", namespace = WsConstants.NS) -public class UserListResponse extends WSResponse { - - private List userList; - - public UserListResponse() { - } - - public UserListResponse(List userList) { - this.userList = userList; - } - - @XmlElementWrapper(name = "userList") - @XmlElement(name = "user") - public List getUserList() { - return userList; - } - - public void setUserList(List userList) { - this.userList = userList; - } -} diff --git a/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/ws/response/base/IdResponse.java b/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/ws/response/base/IdResponse.java deleted file mode 100644 index 2cb01d66..00000000 --- a/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/ws/response/base/IdResponse.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.springside.examples.miniservice.webservice.ws.response.base; - -import javax.xml.bind.annotation.XmlType; - -import org.springside.examples.miniservice.webservice.WsConstants; - -/** - * 创建某个对象返回的 通用IdResult - * - * @author badqiu - * - */ -@XmlType(name = "IdResponse", namespace = WsConstants.NS) -public class IdResponse extends WSResponse { - private Long id; - - public IdResponse() { - } - - public IdResponse(Long id) { - super(); - this.id = id; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - -} diff --git a/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/ws/response/base/WSResponse.java b/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/ws/response/base/WSResponse.java deleted file mode 100644 index 6018ae81..00000000 --- a/examples/mini-service/src/main/java/org/springside/examples/miniservice/webservice/ws/response/base/WSResponse.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.springside.examples.miniservice.webservice.ws.response.base; - -import javax.xml.bind.annotation.XmlType; - -import org.springside.examples.miniservice.webservice.WsConstants; - -/** - * WebService返回结果基类,定义所有返回码. - * - * @author calvin - */ -@XmlType(name = "WSResponse", namespace = WsConstants.NS) -public class WSResponse { - - //-- 返回代码定义 --// - // 按项目的规则进行定义, 比如4xx代表客户端参数错误,5xx代表服务端业务错误等. - public static final String SUCCESS = "0"; - public static final String PARAMETER_ERROR = "400"; - - public static final String SYSTEM_ERROR = "500"; - public static final String SYSTEM_ERROR_MESSAGE = "Runtime unknown internal error."; - - //-- WSResult基本属性 --// - private String code = SUCCESS; - private String message; - - /** - * 创建结果. - */ - public T setError(String resultCode, String resultMessage) { - code = resultCode; - message = resultMessage; - return (T) this; - } - - /** - * 创建默认异常结果. - */ - public T setDefaultError() { - return (T) setError(SYSTEM_ERROR, SYSTEM_ERROR_MESSAGE); - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } -} diff --git a/examples/mini-service/src/main/resources/application.properties b/examples/mini-service/src/main/resources/application.properties deleted file mode 100644 index 731f03e2..00000000 --- a/examples/mini-service/src/main/resources/application.properties +++ /dev/null @@ -1,13 +0,0 @@ -#h2 database settings -jdbc.driver=org.h2.Driver -jdbc.url=jdbc:h2:file:~/.h2/mini-service4;AUTO_SERVER=TRUE -jdbc.username=sa -jdbc.password= - -#log4jdbc driver -#jdbc.driver=net.sf.log4jdbc.DriverSpy -#jdbc.url=jdbc:log4jdbc:h2:file:~/.h2/mini-service4;AUTO_SERVER=TRUE - -#dbcp settings -dbcp.maxIdle=20 -dbcp.maxActive=20 diff --git a/examples/mini-service/src/main/resources/applicationContext-rs-server.xml b/examples/mini-service/src/main/resources/applicationContext-rs-server.xml deleted file mode 100644 index a69d6ec5..00000000 --- a/examples/mini-service/src/main/resources/applicationContext-rs-server.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - Restful Service Bean的配置文件 - - - - - \ No newline at end of file diff --git a/examples/mini-service/src/main/resources/applicationContext-ws-server.xml b/examples/mini-service/src/main/resources/applicationContext-ws-server.xml deleted file mode 100644 index 91160ef0..00000000 --- a/examples/mini-service/src/main/resources/applicationContext-ws-server.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - Apache CXF的Web Service配置 - - - - - - - - - diff --git a/examples/mini-service/src/main/resources/applicationContext.xml b/examples/mini-service/src/main/resources/applicationContext.xml deleted file mode 100644 index ec209969..00000000 --- a/examples/mini-service/src/main/resources/applicationContext.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - Spring公共配置文件 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/mini-service/src/main/resources/log4j.properties b/examples/mini-service/src/main/resources/log4j.properties deleted file mode 100644 index e64f38cc..00000000 --- a/examples/mini-service/src/main/resources/log4j.properties +++ /dev/null @@ -1,19 +0,0 @@ -# Output pattern : date [thread] priority category - message -log4j.rootLogger=WARN, Console, RollingFile - -#Console -log4j.appender.Console=org.apache.log4j.ConsoleAppender -log4j.appender.Console.layout=org.apache.log4j.PatternLayout -log4j.appender.Console.layout.ConversionPattern=%d [%t] %-5p [%c] - %m%n - -#RollingFile -log4j.appender.RollingFile=org.apache.log4j.DailyRollingFileAppender -log4j.appender.RollingFile.File=logs/mini-service.log -log4j.appender.RollingFile.layout=org.apache.log4j.PatternLayout -log4j.appender.RollingFile.layout.ConversionPattern=%d [%t] %-5p [%c] - %m%n - -#Project defalult level -log4j.logger.org.springside.examples.miniservice=INFO - -#log4jdbc -log4j.logger.jdbc.sqltiming=INFO \ No newline at end of file diff --git a/examples/mini-service/src/main/resources/mapper/AccountMapper.xml b/examples/mini-service/src/main/resources/mapper/AccountMapper.xml deleted file mode 100644 index 9c0a7054..00000000 --- a/examples/mini-service/src/main/resources/mapper/AccountMapper.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - insert into acct_user ( - login_name, name, password, email, department_id) - values ( - #{loginName}, #{name}, #{password}, #{email}, - #{department.id}) - - - - - delete from acct_user where id=#{id} - - diff --git a/examples/mini-service/src/main/resources/mapper/Configuration.xml b/examples/mini-service/src/main/resources/mapper/Configuration.xml deleted file mode 100644 index 479bbc97..00000000 --- a/examples/mini-service/src/main/resources/mapper/Configuration.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/examples/mini-service/src/main/resources/sql/h2/schema.sql b/examples/mini-service/src/main/resources/sql/h2/schema.sql deleted file mode 100644 index 0f6bd808..00000000 --- a/examples/mini-service/src/main/resources/sql/h2/schema.sql +++ /dev/null @@ -1,20 +0,0 @@ - drop table if exists acct_department; - - drop table if exists acct_user; - - create table acct_department ( - id bigint generated by default as identity, - manager_id bigint, - name varchar(255) not null unique, - primary key (id) - ) ; - - create table acct_user ( - id bigint generated by default as identity, - department_id bigint, - login_name varchar(255) not null unique, - name varchar(255), - password varchar(255), - email varchar(255), - primary key (id) - ) ; \ No newline at end of file diff --git a/examples/mini-service/src/main/webapp/WEB-INF/web.xml b/examples/mini-service/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 08f3c877..00000000 --- a/examples/mini-service/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - mini-service - - - - contextConfigLocation - - classpath*:/applicationContext.xml - classpath*:/applicationContext-rs-server.xml - classpath*:/applicationContext-ws-server.xml - - - - - - spring.profiles.default - production - - - - - org.springframework.web.context.ContextLoaderListener - - - - - CXFServlet - org.apache.cxf.transport.servlet.CXFServlet - - - CXFServlet - /ws/* - - - - - JerseyServlet - com.sun.jersey.spi.spring.container.servlet.SpringServlet - - - JerseyServlet - /rs/* - - diff --git a/examples/mini-service/src/main/webapp/index.jsp b/examples/mini-service/src/main/webapp/index.jsp deleted file mode 100644 index b3d0b8e6..00000000 --- a/examples/mini-service/src/main/webapp/index.jsp +++ /dev/null @@ -1,16 +0,0 @@ -<%@ page contentType="text/html;charset=UTF-8"%> - - - -Mini-Service示例 - - -

Mini-Service示例

-

--Web Service后台服务演示

- - - - diff --git a/examples/mini-service/src/main/webapp/wsdl/mini-service.wsdl b/examples/mini-service/src/main/webapp/wsdl/mini-service.wsdl deleted file mode 100644 index 083c61ba..00000000 --- a/examples/mini-service/src/main/webapp/wsdl/mini-service.wsdl +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/mini-service/src/test/functional/org/springside/examples/miniservice/functional/BaseFunctionalTestCase.java b/examples/mini-service/src/test/functional/org/springside/examples/miniservice/functional/BaseFunctionalTestCase.java deleted file mode 100644 index 925a6e06..00000000 --- a/examples/mini-service/src/test/functional/org/springside/examples/miniservice/functional/BaseFunctionalTestCase.java +++ /dev/null @@ -1,85 +0,0 @@ -package org.springside.examples.miniservice.functional; - -import java.net.URL; -import java.sql.Driver; - -import org.eclipse.jetty.server.Server; -import org.junit.BeforeClass; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.jdbc.datasource.SimpleDriverDataSource; -import org.springside.modules.test.data.DataFixtures; -import org.springside.modules.test.functional.JettyFactory; -import org.springside.modules.utils.PropertiesLoader; - -/** - * 功能测试基类. - * - * 在整个测试期间启动一次Jetty Server. - * 在每个TestCase执行前重新载入默认数据 - * - * @author calvin - */ -public class BaseFunctionalTestCase { - - protected static String baseUrl; - - protected static Server jettyServer; - - protected static SimpleDriverDataSource dataSource; - - protected static PropertiesLoader propertiesLoader = new PropertiesLoader("classpath:/application.properties", - "classpath:/application.functional.properties", "classpath:/application.functional-local.properties"); - - private static Logger logger = LoggerFactory.getLogger(BaseFunctionalTestCase.class); - - @BeforeClass - public static void beforeClass() throws Exception { - baseUrl = propertiesLoader.getProperty("baseUrl", MiniServiceServer.BASE_URL); - - Boolean isEmbedded = new URL(baseUrl).getHost().equals("localhost"); - - if (isEmbedded) { - startJettyOnce(); - } - - buildDataSourceOnce(); - reloadSampleData(); - } - - /** - * 启动Jetty服务器, 在整个功能测试期间仅启动一次. - */ - protected static void startJettyOnce() throws Exception { - if (jettyServer == null) { - //设定Spring的profile - System.setProperty("spring.profiles.active", "functional"); - - jettyServer = JettyFactory.createServerInSource(new URL(baseUrl).getPort(), MiniServiceServer.CONTEXT); - jettyServer.start(); - - logger.info("Jetty Server started"); - } - } - - /** - * 构造数据源,仅构造一次. - */ - protected static void buildDataSourceOnce() throws ClassNotFoundException { - if (dataSource == null) { - dataSource = new SimpleDriverDataSource(); - dataSource.setDriverClass((Class) Class.forName(propertiesLoader - .getProperty("jdbc.driver"))); - dataSource.setUrl(propertiesLoader.getProperty("jdbc.url")); - dataSource.setUsername(propertiesLoader.getProperty("jdbc.username")); - dataSource.setPassword(propertiesLoader.getProperty("jdbc.password")); - } - } - - /** - * 载入测试数据. - */ - protected static void reloadSampleData() throws Exception { - DataFixtures.reloadData(dataSource, "/data/sample-data.xml"); - } -} diff --git a/examples/mini-service/src/test/functional/org/springside/examples/miniservice/functional/MiniServiceServer.java b/examples/mini-service/src/test/functional/org/springside/examples/miniservice/functional/MiniServiceServer.java deleted file mode 100644 index 6aa7a540..00000000 --- a/examples/mini-service/src/test/functional/org/springside/examples/miniservice/functional/MiniServiceServer.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.springside.examples.miniservice.functional; - -import org.eclipse.jetty.server.Server; -import org.springside.modules.test.functional.JettyFactory; - -/** - * 使用Jetty运行调试Web应用,在Console输入回车快速重新加载应用. - * - * @author calvin - */ -public class MiniServiceServer { - - public static final int PORT = 8080; - public static final String CONTEXT = "/mini-service"; - public static final String BASE_URL = "http://localhost:8080/mini-service"; - - public static void main(String[] args) throws Exception { - - //设定Spring的profile - System.setProperty("spring.profiles.active", "development"); - - //启动Jetty - Server server = JettyFactory.createServerInSource(PORT, CONTEXT); - try { - server.start(); - - System.out.println("Server running at " + BASE_URL); - System.out.println("Hit Enter to reload the application"); - - //等待用户输入回车重载应用. - while (true) { - char c = (char) System.in.read(); - if (c == '\n') { - JettyFactory.reloadContext(server); - } - } - } catch (Exception e) { - e.printStackTrace(); - System.exit(-1); - } - } -} diff --git a/examples/mini-service/src/test/functional/org/springside/examples/miniservice/functional/rs/AccountResourceServiceIT.java b/examples/mini-service/src/test/functional/org/springside/examples/miniservice/functional/rs/AccountResourceServiceIT.java deleted file mode 100644 index a81842b8..00000000 --- a/examples/mini-service/src/test/functional/org/springside/examples/miniservice/functional/rs/AccountResourceServiceIT.java +++ /dev/null @@ -1,99 +0,0 @@ -package org.springside.examples.miniservice.functional.rs; - -import static org.junit.Assert.*; - -import java.net.URI; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; -import org.dozer.DozerBeanMapper; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.springside.examples.miniservice.data.AccountData; -import org.springside.examples.miniservice.entity.User; -import org.springside.examples.miniservice.functional.BaseFunctionalTestCase; -import org.springside.examples.miniservice.webservice.dto.DepartmentDTO; -import org.springside.examples.miniservice.webservice.dto.UserDTO; -import org.springside.examples.miniservice.webservice.rs.client.AccountResourceClient; -import org.springside.modules.test.category.Smoke; - -import com.sun.jersey.api.client.UniformInterfaceException; - -public class AccountResourceServiceIT extends BaseFunctionalTestCase { - - private static AccountResourceClient client; - - @BeforeClass - public static void setUpClient() throws Exception { - client = new AccountResourceClient(); - client.setBaseUrl(baseUrl + "/rs"); - } - - @Test - @Category(Smoke.class) - public void getDeptartmentDetail() { - DepartmentDTO department = client.getDepartmentDetail(1L); - assertEquals("Development", department.getName()); - assertEquals(2, department.getUserList().size()); - assertEquals("Jack", department.getUserList().get(0).getName()); - } - - @Test - public void getDeptartmentDetailWithInvalidId() { - try { - client.getDepartmentDetail(999L); - fail("Should thrown exception while invalid id"); - } catch (UniformInterfaceException e) { - assertEquals(404, e.getResponse().getStatus()); - } - } - - @Test - @Category(Smoke.class) - public void searchUser() { - List result = client.searchUser(null, null); - assertTrue(result.size() > 1); - - result = client.searchUser("user1", null); - assertEquals(1, result.size()); - } - - @Test - @Category(Smoke.class) - public void createAndDeleteUser() { - User user = AccountData.randomUser(); - UserDTO dto = new DozerBeanMapper().map(user, UserDTO.class); - - URI uri = client.createUser(dto); - assertNotNull(uri); - System.out.println("Created user uri:" + uri); - - String id = StringUtils.substringAfterLast(uri.toString(), "/"); - client.deleteUser(new Long(id)); - } - - @Test - public void createUserWithInvalidLoginName() { - //必须值为空 - User user = AccountData.randomUser(); - UserDTO dto = new DozerBeanMapper().map(user, UserDTO.class); - dto.setLoginName(null); - - try { - client.createUser(dto); - fail("Should thrown exception while invalid id"); - } catch (UniformInterfaceException e) { - assertEquals(400, e.getResponse().getStatus()); - } - - dto.setLoginName("user2"); - - try { - client.createUser(dto); - fail("Should thrown exception while invalid id"); - } catch (UniformInterfaceException e) { - assertEquals(400, e.getResponse().getStatus()); - } - } -} diff --git a/examples/mini-service/src/test/functional/org/springside/examples/miniservice/functional/ws/AccountWebServiceWithDynamicCreateClientIT.java b/examples/mini-service/src/test/functional/org/springside/examples/miniservice/functional/ws/AccountWebServiceWithDynamicCreateClientIT.java deleted file mode 100644 index 9af3a8f5..00000000 --- a/examples/mini-service/src/test/functional/org/springside/examples/miniservice/functional/ws/AccountWebServiceWithDynamicCreateClientIT.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.springside.examples.miniservice.functional.ws; - -import static org.junit.Assert.*; - -import javax.xml.ws.BindingProvider; - -import org.apache.cxf.endpoint.Client; -import org.apache.cxf.frontend.ClientProxy; -import org.apache.cxf.jaxws.JaxWsProxyFactoryBean; -import org.apache.cxf.transport.http.HTTPConduit; -import org.apache.cxf.transports.http.configuration.HTTPClientPolicy; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.springside.examples.miniservice.functional.BaseFunctionalTestCase; -import org.springside.examples.miniservice.webservice.ws.AccountWebService; -import org.springside.examples.miniservice.webservice.ws.response.UserListResponse; -import org.springside.modules.test.category.Smoke; - -/** - * UserService Web服务的功能测试, 测试主要的接口调用. - * - * 以用JAXWS的API自行创建. - * - * @author calvin - */ -public class AccountWebServiceWithDynamicCreateClientIT extends BaseFunctionalTestCase { - - public AccountWebService creatClient() { - String address = baseUrl + "/ws/accountservice"; - - JaxWsProxyFactoryBean proxyFactory = new JaxWsProxyFactoryBean(); - proxyFactory.setAddress(address); - proxyFactory.setServiceClass(AccountWebService.class); - AccountWebService accountWebServiceProxy = (AccountWebService) proxyFactory.create(); - - //(可选)演示重新设定endpoint address. - ((BindingProvider) accountWebServiceProxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, - address); - - //(可选)演示重新设定Timeout时间 - Client client = ClientProxy.getClient(accountWebServiceProxy); - HTTPConduit conduit = (HTTPConduit) client.getConduit(); - HTTPClientPolicy policy = conduit.getClient(); - policy.setReceiveTimeout(600000); - - return accountWebServiceProxy; - } - - /** - * 测试搜索用户 - */ - @Test - @Category(Smoke.class) - public void searchUser() { - AccountWebService accountWebService = creatClient(); - - UserListResponse result = accountWebService.searchUser(null, null); - - assertTrue(result.getUserList().size() >= 4); - assertEquals("Jack", result.getUserList().get(0).getName()); - } - -} diff --git a/examples/mini-service/src/test/functional/org/springside/examples/miniservice/functional/ws/AccountWebServiceWithPredefineClientIT.java b/examples/mini-service/src/test/functional/org/springside/examples/miniservice/functional/ws/AccountWebServiceWithPredefineClientIT.java deleted file mode 100644 index 27f0dda4..00000000 --- a/examples/mini-service/src/test/functional/org/springside/examples/miniservice/functional/ws/AccountWebServiceWithPredefineClientIT.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.springside.examples.miniservice.functional.ws; - -import static org.junit.Assert.*; - -import org.dozer.DozerBeanMapper; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.TestExecutionListeners; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; -import org.springside.examples.miniservice.data.AccountData; -import org.springside.examples.miniservice.entity.User; -import org.springside.examples.miniservice.functional.BaseFunctionalTestCase; -import org.springside.examples.miniservice.webservice.dto.UserDTO; -import org.springside.examples.miniservice.webservice.ws.AccountWebService; -import org.springside.examples.miniservice.webservice.ws.response.base.IdResponse; -import org.springside.examples.miniservice.webservice.ws.response.base.WSResponse; - -/** - * UserService Web服务的功能测试, 测试主要的接口调用. - * - * 使用在Spring applicaitonContext.xml中用创建的Client. - * - * @author calvin - */ -@RunWith(SpringJUnit4ClassRunner.class) -@TestExecutionListeners({ DependencyInjectionTestExecutionListener.class }) -@ContextConfiguration(locations = { "/applicationContext-ws-client.xml" }) -public class AccountWebServiceWithPredefineClientIT extends BaseFunctionalTestCase { - - @Autowired - private AccountWebService accountWebServiceClient; - - /** - * 测试创建用户,在Spring applicaitonContext.xml中用创建Client. - */ - @Test - public void createUser() { - User user = AccountData.randomUser(); - - UserDTO userDTO = new UserDTO(); - userDTO.setLoginName(user.getLoginName()); - userDTO.setName(user.getName()); - userDTO.setEmail(user.getEmail()); - - IdResponse result = accountWebServiceClient.createUser(userDTO); - assertNotNull(result.getId()); - } - - /** - * 测试创建用户,使用错误的登录名, 在Spring applicaitonContext.xml中用创建Client. - */ - @Test - public void createUserWithInvalidLoginName() { - User user = AccountData.randomUser(); - UserDTO userDTO = new DozerBeanMapper().map(user, UserDTO.class); - - //登录名为空 - userDTO.setLoginName(null); - IdResponse result = accountWebServiceClient.createUser(userDTO); - assertEquals(result.getCode(), WSResponse.PARAMETER_ERROR); - - //登录名重复 - userDTO.setLoginName("user1"); - result = accountWebServiceClient.createUser(userDTO); - assertEquals(result.getCode(), WSResponse.PARAMETER_ERROR); - } -} diff --git a/examples/mini-service/src/test/java/org/springside/examples/miniservice/dao/AccountDaoTest.java b/examples/mini-service/src/test/java/org/springside/examples/miniservice/dao/AccountDaoTest.java deleted file mode 100644 index 9bb9a553..00000000 --- a/examples/mini-service/src/test/java/org/springside/examples/miniservice/dao/AccountDaoTest.java +++ /dev/null @@ -1,96 +0,0 @@ -package org.springside.examples.miniservice.dao; - -import static org.junit.Assert.*; - -import java.util.List; -import java.util.Map; - -import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; -import org.springside.examples.miniservice.data.AccountData; -import org.springside.examples.miniservice.entity.Department; -import org.springside.examples.miniservice.entity.User; -import org.springside.modules.test.spring.SpringTransactionalTestCase; - -import com.google.common.collect.Maps; - -/** - * AccountDao的集成测试用例,测试ORM映射及SQL操作. - * - * 默认在每个测试函数后进行回滚. - * - * @author calvin - */ -@ContextConfiguration(locations = { "/applicationContext.xml" }) -public class AccountDaoTest extends SpringTransactionalTestCase { - - @Autowired - private AccountDao accountDao; - - @Test - public void getDepartmentDetail() { - Department department = accountDao.getDepartmentDetail(1L); - assertEquals("Development", department.getName()); - assertEquals("Jack", department.getManager().getName()); - assertEquals(2, department.getUserList().size()); - assertEquals("Jack", department.getUserList().get(0).getName()); - } - - @Test - public void getUser() { - User user = accountDao.getUser(1L); - assertEquals("user1", user.getLoginName()); - assertEquals(new Long(1L), user.getDepartment().getId()); - - user = accountDao.getUser(999L); - assertNull(user); - } - - @Test - public void searchUser() { - Map parameters = Maps.newHashMap(); - - parameters.put("loginName", null); - parameters.put("name", null); - List result = accountDao.searchUser(parameters); - assertEquals(4, result.size()); - - parameters.put("loginName", "user1"); - parameters.put("name", null); - result = accountDao.searchUser(parameters); - assertEquals(1, result.size()); - - parameters.clear(); - parameters.put("name", "Jack"); - parameters.put("loginName", null); - result = accountDao.searchUser(parameters); - assertEquals(1, result.size()); - - parameters.clear(); - parameters.put("name", "Jack"); - parameters.put("loginName", "user1"); - result = accountDao.searchUser(parameters); - assertEquals(1, result.size()); - - parameters.clear(); - parameters.put("name", "Jack"); - parameters.put("loginName", "errorName"); - result = accountDao.searchUser(parameters); - assertEquals(0, result.size()); - } - - @Test - public void saveAndDeleteUser() { - User user = AccountData.randomUser(); - Long id = accountDao.saveUser(user); - assertEquals(new Long(5L), id); - - assertEquals(4 + 1, this.countRowsInTable("acct_user")); - assertEquals(2 + 1, accountDao.getDepartmentDetail(1L).getUserList().size()); - - accountDao.deleteUser(id); - assertEquals(4, this.countRowsInTable("acct_user")); - } - -} diff --git a/examples/mini-service/src/test/java/org/springside/examples/miniservice/data/AccountData.java b/examples/mini-service/src/test/java/org/springside/examples/miniservice/data/AccountData.java deleted file mode 100644 index efc96208..00000000 --- a/examples/mini-service/src/test/java/org/springside/examples/miniservice/data/AccountData.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.springside.examples.miniservice.data; - -import org.springside.examples.miniservice.entity.Department; -import org.springside.examples.miniservice.entity.User; -import org.springside.modules.test.data.RandomData; - -/** - * 用户测试数据生成. - * - * @author calvin - */ -public class AccountData { - - public static Department randomDepartment() { - String departmentName = RandomData.randomName("Department"); - User manager = randomUser(); - - Department department = new Department(); - department.setName(departmentName); - - department.setManager(manager); - department.getUserList().add(manager); - - return department; - } - - public static User randomUser() { - String userName = RandomData.randomName("User"); - Department department = defaultDepartment(); - - User user = new User(); - user.setLoginName(userName); - user.setName(userName); - user.setPassword("123456"); - user.setEmail(userName + "@springside.org.cn"); - user.setDepartment(department); - - return user; - } - - public static Department defaultDepartment() { - Department department = new Department(); - department.setId(1L); - return department; - } -} diff --git a/examples/mini-service/src/test/java/org/springside/examples/miniservice/service/AccountManagerTest.java b/examples/mini-service/src/test/java/org/springside/examples/miniservice/service/AccountManagerTest.java deleted file mode 100644 index 031a81ca..00000000 --- a/examples/mini-service/src/test/java/org/springside/examples/miniservice/service/AccountManagerTest.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.springside.examples.miniservice.service; - -import static org.junit.Assert.*; - -import java.util.Locale; - -import javax.validation.ConstraintViolationException; - -import org.apache.commons.lang3.StringUtils; -import org.junit.BeforeClass; -import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; -import org.springside.examples.miniservice.data.AccountData; -import org.springside.examples.miniservice.entity.User; -import org.springside.modules.beanvalidator.BeanValidators; -import org.springside.modules.test.spring.SpringContextTestCase; - -@ContextConfiguration(locations = { "/applicationContext.xml" }) -public class AccountManagerTest extends SpringContextTestCase { - - @Autowired - private AccountManager accountManager; - - @BeforeClass - public static void beforeClass() { - //To avoid the non-English environment test failure on message asserts. - Locale.setDefault(Locale.ENGLISH); - } - - /** - * 测试参数校验. - */ - @Test - public void validateParamter() { - - User userDTOWithoutLoginName = AccountData.randomUser(); - userDTOWithoutLoginName.setLoginName(null); - try { - accountManager.saveUser(userDTOWithoutLoginName); - fail("exception should be thrown"); - } catch (ConstraintViolationException e) { - assertEquals("loginName may not be empty", - StringUtils.join(BeanValidators.extractPropertyAndMessage(e), ',')); - } - - User userDTOWitWrongEmail = AccountData.randomUser(); - userDTOWitWrongEmail.setEmail("abc"); - try { - accountManager.saveUser(userDTOWitWrongEmail); - fail("exception should be thrown"); - } catch (ConstraintViolationException e) { - assertEquals("email not a well-formed email address", - StringUtils.join(BeanValidators.extractPropertyAndMessage(e), ",")); - } - } -} diff --git a/examples/mini-service/src/test/java/org/springside/examples/miniservice/webservice/ws/AccountWebServiceTest.java b/examples/mini-service/src/test/java/org/springside/examples/miniservice/webservice/ws/AccountWebServiceTest.java deleted file mode 100644 index 25b66ba2..00000000 --- a/examples/mini-service/src/test/java/org/springside/examples/miniservice/webservice/ws/AccountWebServiceTest.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.springside.examples.miniservice.webservice.ws; - -import static org.junit.Assert.*; - -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.MockitoAnnotations; -import org.springside.examples.miniservice.data.AccountData; -import org.springside.examples.miniservice.entity.Department; -import org.springside.examples.miniservice.service.AccountManager; -import org.springside.examples.miniservice.webservice.dto.DepartmentDTO; -import org.springside.examples.miniservice.webservice.ws.impl.AccountWebServiceImpl; -import org.springside.examples.miniservice.webservice.ws.response.DepartmentResponse; -import org.springside.examples.miniservice.webservice.ws.response.base.WSResponse; - -/** - * Account WebService的单元测试用例. - * - * 使用Mockito对AccountManager进行模拟. - * - * @author calvin - */ -public class AccountWebServiceTest { - - private AccountWebServiceImpl accountWebService; - - @Mock - private AccountManager mockAccountManager; - - @Before - public void setUp() { - MockitoAnnotations.initMocks(this); - - accountWebService = new AccountWebServiceImpl(); - accountWebService.setAccountManager(mockAccountManager); - } - - /** - * 测试dozer正确映射. - */ - @Test - public void dozerBinding() { - Department department = AccountData.randomDepartment(); - Mockito.when(mockAccountManager.getDepartmentDetail(1L)).thenReturn(department); - - DepartmentResponse result = accountWebService.getDepartmentDetail(1L); - - assertEquals(WSResponse.SUCCESS, result.getCode()); - - DepartmentDTO dto = result.getDepartment(); - - assertEquals(department.getName(), dto.getName()); - assertEquals(department.getUserList().get(0).getName(), dto.getUserList().get(0).getName()); - } - - /** - * 测试系统内部抛出异常时的处理. - */ - @Test - public void handleException() { - Mockito.when(mockAccountManager.getDepartmentDetail(1L)).thenThrow(new RuntimeException("Expected exception.")); - - DepartmentResponse result = accountWebService.getDepartmentDetail(1L); - - assertEquals(WSResponse.SYSTEM_ERROR, result.getCode()); - assertEquals(WSResponse.SYSTEM_ERROR_MESSAGE, result.getMessage()); - } -} diff --git a/examples/mini-service/src/test/resources/application.functional.properties b/examples/mini-service/src/test/resources/application.functional.properties deleted file mode 100644 index 9f1be152..00000000 --- a/examples/mini-service/src/test/resources/application.functional.properties +++ /dev/null @@ -1 +0,0 @@ -baseUrl=http://localhost:8084/mini-service \ No newline at end of file diff --git a/examples/mini-service/src/test/resources/applicationContext-ws-client.xml b/examples/mini-service/src/test/resources/applicationContext-ws-client.xml deleted file mode 100644 index 8fbe8aae..00000000 --- a/examples/mini-service/src/test/resources/applicationContext-ws-client.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - Apache CXF Web Service Client端配置 - - - - - - classpath*:/application.functional.properties - classpath*:/application.functional-local.properties - - - - - - diff --git a/examples/mini-service/src/test/resources/data/sample-data.xml b/examples/mini-service/src/test/resources/data/sample-data.xml deleted file mode 100644 index 048e4b36..00000000 --- a/examples/mini-service/src/test/resources/data/sample-data.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/examples/mini-web/bin/jetty.bat b/examples/mini-web/bin/jetty.bat deleted file mode 100644 index 306038fe..00000000 --- a/examples/mini-web/bin/jetty.bat +++ /dev/null @@ -1,11 +0,0 @@ -@echo off -echo [INFO] Use maven jetty-plugin run the project. - -cd %~dp0 -cd .. - -set MAVEN_OPTS=%MAVEN_OPTS% -XX:MaxPermSize=128m -call mvn jetty:run -Djetty.port=8080 - -cd bin -pause \ No newline at end of file diff --git a/examples/mini-web/bin/refresh-db.bat b/examples/mini-web/bin/refresh-db.bat deleted file mode 100644 index 6a63ae5d..00000000 --- a/examples/mini-web/bin/refresh-db.bat +++ /dev/null @@ -1,10 +0,0 @@ -@echo off -echo [INFO] Re-create the schema and provision the sample data. - -cd %~dp0 -cd .. - -call mvn antrun:run -Prefresh-db - -cd bin -pause \ No newline at end of file diff --git a/examples/mini-web/bin/smoke-test.bat b/examples/mini-web/bin/smoke-test.bat deleted file mode 100644 index 706c70f0..00000000 --- a/examples/mini-web/bin/smoke-test.bat +++ /dev/null @@ -1,11 +0,0 @@ -@echo off -echo [INFO] run smoking functional test. - -cd %~dp0 -cd .. - -set MAVEN_OPTS=%MAVEN_OPTS% -XX:MaxPermSize=128m -call mvn clean test -Psmoke-test - -cd bin -pause \ No newline at end of file diff --git a/examples/mini-web/src/main/java/org/springside/examples/miniweb/rest/TaskRestController.java b/examples/mini-web/src/main/java/org/springside/examples/miniweb/rest/TaskRestController.java deleted file mode 100644 index b6c66740..00000000 --- a/examples/mini-web/src/main/java/org/springside/examples/miniweb/rest/TaskRestController.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.springside.examples.miniweb.rest; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springside.examples.miniweb.entity.Task; -import org.springside.examples.miniweb.service.TaskManager; - -/** - * Task的Restful API的Controller. - * - * @author calvin - * - */ -@Controller -@RequestMapping(value = "/api/task") -public class TaskRestController { - - @Autowired - private TaskManager taskManager; - - @RequestMapping(method = RequestMethod.GET, produces = "application/json") - public @ResponseBody - List list(Model model) { - return taskManager.getAllTask(); - } - - @RequestMapping(value = "/{id}", method = RequestMethod.GET, produces = "application/json") - public @ResponseBody - Task get(@PathVariable("id") Long id) { - return taskManager.getTask(id); - } -} diff --git a/examples/mini-web/src/main/webapp/WEB-INF/web.xml b/examples/mini-web/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 442d1bcf..00000000 --- a/examples/mini-web/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - Mini-Web - - - - contextConfigLocation - - classpath*:/applicationContext.xml - - - - - - spring.profiles.default - production - - - - - org.springframework.web.context.ContextLoaderListener - - - - - - encodingFilter - org.springframework.web.filter.CharacterEncodingFilter - - encoding - UTF-8 - - - forceEncoding - true - - - - encodingFilter - /* - - - - - openEntityManagerInViewFilter - org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter - - - openEntityManagerInViewFilter - /* - - - - - sitemeshFilter - com.opensymphony.sitemesh.webapp.SiteMeshFilter - - - sitemeshFilter - /* - - - - - springServlet - org.springframework.web.servlet.DispatcherServlet - - contextConfigLocation - /WEB-INF/spring-mvc.xml - - 1 - - - springServlet - / - - - - - 20 - - - - - java.lang.Throwable - /WEB-INF/views/error/500.jsp - - - 500 - /WEB-INF/views/error/500.jsp - - - 404 - /WEB-INF/views/error/404.jsp - - diff --git a/examples/mini-web/src/test/resources/META-INF/services/javax.ws.rs.ext.MessageBodyReader b/examples/mini-web/src/test/resources/META-INF/services/javax.ws.rs.ext.MessageBodyReader deleted file mode 100644 index 0cd7ee39..00000000 --- a/examples/mini-web/src/test/resources/META-INF/services/javax.ws.rs.ext.MessageBodyReader +++ /dev/null @@ -1 +0,0 @@ -com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider \ No newline at end of file diff --git a/examples/mini-web/src/test/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter b/examples/mini-web/src/test/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter deleted file mode 100644 index 0cd7ee39..00000000 --- a/examples/mini-web/src/test/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter +++ /dev/null @@ -1 +0,0 @@ -com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider \ No newline at end of file diff --git a/examples/mini-web/src/test/resources/application.test.properties b/examples/mini-web/src/test/resources/application.test.properties deleted file mode 100644 index e69de29b..00000000 diff --git a/examples/pom.xml b/examples/pom.xml index afaa433e..79378072 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -14,8 +14,7 @@ pom - mini-web - mini-service + quickstart showcase \ No newline at end of file diff --git a/examples/mini-web/.settings/org.eclipse.core.resources.prefs b/examples/quickstart/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from examples/mini-web/.settings/org.eclipse.core.resources.prefs rename to examples/quickstart/.settings/org.eclipse.core.resources.prefs diff --git a/examples/mini-web/bin/eclipse.bat b/examples/quickstart/bin/eclipse.bat similarity index 100% rename from examples/mini-web/bin/eclipse.bat rename to examples/quickstart/bin/eclipse.bat diff --git a/examples/mini-service/bin/jetty.bat b/examples/quickstart/bin/jetty.bat similarity index 100% rename from examples/mini-service/bin/jetty.bat rename to examples/quickstart/bin/jetty.bat diff --git a/examples/mini-service/bin/refresh-db.bat b/examples/quickstart/bin/refresh-db.bat similarity index 100% rename from examples/mini-service/bin/refresh-db.bat rename to examples/quickstart/bin/refresh-db.bat diff --git a/examples/mini-service/bin/smoke-test.bat b/examples/quickstart/bin/smoke-test.bat similarity index 100% rename from examples/mini-service/bin/smoke-test.bat rename to examples/quickstart/bin/smoke-test.bat diff --git a/examples/mini-web/pom.xml b/examples/quickstart/pom.xml similarity index 99% rename from examples/mini-web/pom.xml rename to examples/quickstart/pom.xml index 3b7d99c1..5aed304c 100644 --- a/examples/mini-web/pom.xml +++ b/examples/quickstart/pom.xml @@ -3,10 +3,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springside.examples - mini-web + quickstart 4.0.0.RC4-SNAPSHOT war - Springside :: Example :: Mini-Web + Springside :: Example :: QuickStart diff --git a/examples/mini-web/src/main/java/org/springside/examples/miniweb/dao/TaskDao.java b/examples/quickstart/src/main/java/org/springside/examples/quickstart/dao/TaskDao.java similarity index 59% rename from examples/mini-web/src/main/java/org/springside/examples/miniweb/dao/TaskDao.java rename to examples/quickstart/src/main/java/org/springside/examples/quickstart/dao/TaskDao.java index fefb0aa3..bc7b49eb 100644 --- a/examples/mini-web/src/main/java/org/springside/examples/miniweb/dao/TaskDao.java +++ b/examples/quickstart/src/main/java/org/springside/examples/quickstart/dao/TaskDao.java @@ -1,7 +1,7 @@ -package org.springside.examples.miniweb.dao; +package org.springside.examples.quickstart.dao; import org.springframework.data.repository.PagingAndSortingRepository; -import org.springside.examples.miniweb.entity.Task; +import org.springside.examples.quickstart.entity.Task; public interface TaskDao extends PagingAndSortingRepository { diff --git a/examples/mini-web/src/main/java/org/springside/examples/miniweb/entity/IdEntity.java b/examples/quickstart/src/main/java/org/springside/examples/quickstart/entity/IdEntity.java similarity index 93% rename from examples/mini-web/src/main/java/org/springside/examples/miniweb/entity/IdEntity.java rename to examples/quickstart/src/main/java/org/springside/examples/quickstart/entity/IdEntity.java index cd9c44b2..3c523360 100644 --- a/examples/mini-web/src/main/java/org/springside/examples/miniweb/entity/IdEntity.java +++ b/examples/quickstart/src/main/java/org/springside/examples/quickstart/entity/IdEntity.java @@ -1,4 +1,4 @@ -package org.springside.examples.miniweb.entity; +package org.springside.examples.quickstart.entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; diff --git a/examples/mini-web/src/main/java/org/springside/examples/miniweb/entity/Task.java b/examples/quickstart/src/main/java/org/springside/examples/quickstart/entity/Task.java similarity index 81% rename from examples/mini-web/src/main/java/org/springside/examples/miniweb/entity/Task.java rename to examples/quickstart/src/main/java/org/springside/examples/quickstart/entity/Task.java index a4b06f0a..cc40259f 100644 --- a/examples/mini-web/src/main/java/org/springside/examples/miniweb/entity/Task.java +++ b/examples/quickstart/src/main/java/org/springside/examples/quickstart/entity/Task.java @@ -1,4 +1,4 @@ -package org.springside.examples.miniweb.entity; +package org.springside.examples.quickstart.entity; import javax.persistence.Entity; diff --git a/examples/quickstart/src/main/java/org/springside/examples/quickstart/rest/TaskRestController.java b/examples/quickstart/src/main/java/org/springside/examples/quickstart/rest/TaskRestController.java new file mode 100644 index 00000000..b639b825 --- /dev/null +++ b/examples/quickstart/src/main/java/org/springside/examples/quickstart/rest/TaskRestController.java @@ -0,0 +1,61 @@ +package org.springside.examples.quickstart.rest; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springside.examples.quickstart.entity.Task; +import org.springside.examples.quickstart.service.TaskManager; + +/** + * Task的Restful API的Controller. + * + * @author calvin + * + */ +@Controller +@RequestMapping(value = "/api/task") +public class TaskRestController { + + @Autowired + private TaskManager taskManager; + + @RequestMapping(method = RequestMethod.GET, produces = "application/json") + @ResponseBody + public List list() { + return taskManager.getAllTask(); + } + + @RequestMapping(value = "/{id}", method = RequestMethod.GET, produces = "application/json") + @ResponseBody + public Task get(@PathVariable("id") Long id) { + return taskManager.getTask(id); + } + + @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) + @ResponseBody + @ResponseStatus(HttpStatus.CREATED) + public Long create(@RequestBody final Task task) { + taskManager.saveTask(task); + return task.getId(); + } + + @RequestMapping(value = "/{id}", method = RequestMethod.PUT) + @ResponseStatus(HttpStatus.NO_CONTENT) + public void update(@RequestBody final Task task) { + taskManager.saveTask(task); + } + + @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) + @ResponseStatus(HttpStatus.NO_CONTENT) + public void delete(@PathVariable("id") Long id) { + taskManager.deleteTask(id); + } +} diff --git a/examples/mini-web/src/main/java/org/springside/examples/miniweb/service/ServiceException.java b/examples/quickstart/src/main/java/org/springside/examples/quickstart/service/ServiceException.java similarity index 91% rename from examples/mini-web/src/main/java/org/springside/examples/miniweb/service/ServiceException.java rename to examples/quickstart/src/main/java/org/springside/examples/quickstart/service/ServiceException.java index 4158bd88..f852b73b 100644 --- a/examples/mini-web/src/main/java/org/springside/examples/miniweb/service/ServiceException.java +++ b/examples/quickstart/src/main/java/org/springside/examples/quickstart/service/ServiceException.java @@ -1,4 +1,4 @@ -package org.springside.examples.miniweb.service; +package org.springside.examples.quickstart.service; /** * Service层公用的Exception. diff --git a/examples/mini-web/src/main/java/org/springside/examples/miniweb/service/TaskManager.java b/examples/quickstart/src/main/java/org/springside/examples/quickstart/service/TaskManager.java similarity index 85% rename from examples/mini-web/src/main/java/org/springside/examples/miniweb/service/TaskManager.java rename to examples/quickstart/src/main/java/org/springside/examples/quickstart/service/TaskManager.java index c7c183f0..62ccb125 100644 --- a/examples/mini-web/src/main/java/org/springside/examples/miniweb/service/TaskManager.java +++ b/examples/quickstart/src/main/java/org/springside/examples/quickstart/service/TaskManager.java @@ -1,4 +1,4 @@ -package org.springside.examples.miniweb.service; +package org.springside.examples.quickstart.service; import java.util.List; @@ -7,8 +7,8 @@ import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort.Direction; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import org.springside.examples.miniweb.dao.TaskDao; -import org.springside.examples.miniweb.entity.Task; +import org.springside.examples.quickstart.dao.TaskDao; +import org.springside.examples.quickstart.entity.Task; //Spring Bean的标识. @Component diff --git a/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/TaskController.java b/examples/quickstart/src/main/java/org/springside/examples/quickstart/web/TaskController.java similarity index 91% rename from examples/mini-web/src/main/java/org/springside/examples/miniweb/web/TaskController.java rename to examples/quickstart/src/main/java/org/springside/examples/quickstart/web/TaskController.java index db006c85..0acd3507 100644 --- a/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/TaskController.java +++ b/examples/quickstart/src/main/java/org/springside/examples/quickstart/web/TaskController.java @@ -1,4 +1,4 @@ -package org.springside.examples.miniweb.web; +package org.springside.examples.quickstart.web; import java.util.List; @@ -8,8 +8,8 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.mvc.support.RedirectAttributes; -import org.springside.examples.miniweb.entity.Task; -import org.springside.examples.miniweb.service.TaskManager; +import org.springside.examples.quickstart.entity.Task; +import org.springside.examples.quickstart.service.TaskManager; /** * Task管理的Controller, 使用Restful风格的Urls: diff --git a/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/TaskDetailController.java b/examples/quickstart/src/main/java/org/springside/examples/quickstart/web/TaskDetailController.java similarity index 89% rename from examples/mini-web/src/main/java/org/springside/examples/miniweb/web/TaskDetailController.java rename to examples/quickstart/src/main/java/org/springside/examples/quickstart/web/TaskDetailController.java index 70bdd57b..16bdfc3e 100644 --- a/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/TaskDetailController.java +++ b/examples/quickstart/src/main/java/org/springside/examples/quickstart/web/TaskDetailController.java @@ -1,4 +1,4 @@ -package org.springside.examples.miniweb.web; +package org.springside.examples.quickstart.web; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -7,8 +7,8 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.mvc.support.RedirectAttributes; -import org.springside.examples.miniweb.entity.Task; -import org.springside.examples.miniweb.service.TaskManager; +import org.springside.examples.quickstart.entity.Task; +import org.springside.examples.quickstart.service.TaskManager; /** * 使用@ModelAttribute, 实现Struts2 Preparable二次绑定的效果,先根据url中的id从数据库查出Task对象,再把Form提交的内容绑定到该对象上。 diff --git a/examples/mini-web/src/main/resources/META-INF/orm.xml b/examples/quickstart/src/main/resources/META-INF/orm.xml similarity index 100% rename from examples/mini-web/src/main/resources/META-INF/orm.xml rename to examples/quickstart/src/main/resources/META-INF/orm.xml diff --git a/examples/mini-web/src/main/resources/META-INF/persistence.xml b/examples/quickstart/src/main/resources/META-INF/persistence.xml similarity index 100% rename from examples/mini-web/src/main/resources/META-INF/persistence.xml rename to examples/quickstart/src/main/resources/META-INF/persistence.xml diff --git a/examples/mini-web/src/main/resources/application.properties b/examples/quickstart/src/main/resources/application.properties similarity index 60% rename from examples/mini-web/src/main/resources/application.properties rename to examples/quickstart/src/main/resources/application.properties index 61e2e993..73739748 100644 --- a/examples/mini-web/src/main/resources/application.properties +++ b/examples/quickstart/src/main/resources/application.properties @@ -1,22 +1,22 @@ #h2 database settings jdbc.driver=org.h2.Driver -jdbc.url=jdbc:h2:file:~/.h2/mini-web4;AUTO_SERVER=TRUE +jdbc.url=jdbc:h2:file:~/.h2/quickstart;AUTO_SERVER=TRUE jdbc.username=sa jdbc.password= #log4jdbc driver #jdbc.driver=net.sf.log4jdbc.DriverSpy -#jdbc.url=jdbc:log4jdbc:h2:file:~/.h2/mini-web4;AUTO_SERVER=TRUE +#jdbc.url=jdbc:log4jdbc:h2:file:~/.h2/quickstart;AUTO_SERVER=TRUE #oracle database settings #jdbc.driver=oracle.jdbc.driver.OracleDriver #jdbc.url=jdbc:oracle:thin:@127.0.0.1:1521:XE -#jdbc.username=miniweb -#jdbc.password=miniweb +#jdbc.username=quickstart +#jdbc.password=quickstart #mysql database setting #jdbc.driver=com.mysql.jdbc.Driver -#jdbc.url=jdbc:mysql://localhost/mini-web?useUnicode=true&characterEncoding=utf-8 +#jdbc.url=jdbc:mysql://localhost/quickstart?useUnicode=true&characterEncoding=utf-8 #jdbc.username=root #jdbc.password= diff --git a/examples/mini-web/src/main/resources/applicationContext.xml b/examples/quickstart/src/main/resources/applicationContext.xml similarity index 96% rename from examples/mini-web/src/main/resources/applicationContext.xml rename to examples/quickstart/src/main/resources/applicationContext.xml index 261ca277..cc3b95a6 100644 --- a/examples/mini-web/src/main/resources/applicationContext.xml +++ b/examples/quickstart/src/main/resources/applicationContext.xml @@ -15,7 +15,7 @@ Spring公共配置 - + @@ -40,7 +40,7 @@ - + diff --git a/examples/mini-web/src/main/resources/log4j.properties b/examples/quickstart/src/main/resources/log4j.properties similarity index 85% rename from examples/mini-web/src/main/resources/log4j.properties rename to examples/quickstart/src/main/resources/log4j.properties index 8bd15dcf..fe0fe854 100644 --- a/examples/mini-web/src/main/resources/log4j.properties +++ b/examples/quickstart/src/main/resources/log4j.properties @@ -8,12 +8,12 @@ log4j.appender.Console.layout.ConversionPattern=%d [%t] %-5p [%c] - %m%n #RollingFile log4j.appender.RollingFile=org.apache.log4j.DailyRollingFileAppender -log4j.appender.RollingFile.File=logs/mini-web.log +log4j.appender.RollingFile.File=logs/quickstart.log log4j.appender.RollingFile.layout=org.apache.log4j.PatternLayout log4j.appender.RollingFile.layout.ConversionPattern=%d [%t] %-5p [%c] - %m%n #Project defalult level -log4j.logger.org.springside.examples.miniweb=INFO +log4j.logger.org.springside.examples.quickstart=INFO #log4jdbc #log4j.logger.jdbc.sqltiming=INFO \ No newline at end of file diff --git a/examples/mini-web/src/main/resources/sql/h2/schema.sql b/examples/quickstart/src/main/resources/sql/h2/schema.sql similarity index 100% rename from examples/mini-web/src/main/resources/sql/h2/schema.sql rename to examples/quickstart/src/main/resources/sql/h2/schema.sql diff --git a/examples/mini-web/src/main/webapp/WEB-INF/decorators.xml b/examples/quickstart/src/main/webapp/WEB-INF/decorators.xml similarity index 100% rename from examples/mini-web/src/main/webapp/WEB-INF/decorators.xml rename to examples/quickstart/src/main/webapp/WEB-INF/decorators.xml diff --git a/examples/mini-web/src/main/webapp/WEB-INF/layouts/default.jsp b/examples/quickstart/src/main/webapp/WEB-INF/layouts/default.jsp similarity index 96% rename from examples/mini-web/src/main/webapp/WEB-INF/layouts/default.jsp rename to examples/quickstart/src/main/webapp/WEB-INF/layouts/default.jsp index 880c6ca7..28e9c4e7 100644 --- a/examples/mini-web/src/main/webapp/WEB-INF/layouts/default.jsp +++ b/examples/quickstart/src/main/webapp/WEB-INF/layouts/default.jsp @@ -7,7 +7,7 @@ -Mini-Web示例:<sitemesh:title/> +QuickStart示例:<sitemesh:title/> diff --git a/examples/mini-web/src/main/webapp/WEB-INF/layouts/footer.jsp b/examples/quickstart/src/main/webapp/WEB-INF/layouts/footer.jsp similarity index 100% rename from examples/mini-web/src/main/webapp/WEB-INF/layouts/footer.jsp rename to examples/quickstart/src/main/webapp/WEB-INF/layouts/footer.jsp diff --git a/examples/mini-web/src/main/webapp/WEB-INF/layouts/header.jsp b/examples/quickstart/src/main/webapp/WEB-INF/layouts/header.jsp similarity index 77% rename from examples/mini-web/src/main/webapp/WEB-INF/layouts/header.jsp rename to examples/quickstart/src/main/webapp/WEB-INF/layouts/header.jsp index 3d930ec1..a9fec05a 100644 --- a/examples/mini-web/src/main/webapp/WEB-INF/layouts/header.jsp +++ b/examples/quickstart/src/main/webapp/WEB-INF/layouts/header.jsp @@ -3,6 +3,6 @@ \ No newline at end of file diff --git a/examples/mini-web/src/main/webapp/WEB-INF/spring-mvc.xml b/examples/quickstart/src/main/webapp/WEB-INF/spring-mvc.xml similarity index 91% rename from examples/mini-web/src/main/webapp/WEB-INF/spring-mvc.xml rename to examples/quickstart/src/main/webapp/WEB-INF/spring-mvc.xml index d1710338..9bb51432 100644 --- a/examples/mini-web/src/main/webapp/WEB-INF/spring-mvc.xml +++ b/examples/quickstart/src/main/webapp/WEB-INF/spring-mvc.xml @@ -8,7 +8,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd"> - + diff --git a/examples/mini-web/src/main/webapp/WEB-INF/views/error/404.jsp b/examples/quickstart/src/main/webapp/WEB-INF/views/error/404.jsp similarity index 100% rename from examples/mini-web/src/main/webapp/WEB-INF/views/error/404.jsp rename to examples/quickstart/src/main/webapp/WEB-INF/views/error/404.jsp diff --git a/examples/mini-web/src/main/webapp/WEB-INF/views/error/500.jsp b/examples/quickstart/src/main/webapp/WEB-INF/views/error/500.jsp similarity index 100% rename from examples/mini-web/src/main/webapp/WEB-INF/views/error/500.jsp rename to examples/quickstart/src/main/webapp/WEB-INF/views/error/500.jsp diff --git a/examples/mini-web/src/main/webapp/WEB-INF/views/taskForm.jsp b/examples/quickstart/src/main/webapp/WEB-INF/views/taskForm.jsp similarity index 100% rename from examples/mini-web/src/main/webapp/WEB-INF/views/taskForm.jsp rename to examples/quickstart/src/main/webapp/WEB-INF/views/taskForm.jsp diff --git a/examples/mini-web/src/main/webapp/WEB-INF/views/taskList.jsp b/examples/quickstart/src/main/webapp/WEB-INF/views/taskList.jsp similarity index 100% rename from examples/mini-web/src/main/webapp/WEB-INF/views/taskList.jsp rename to examples/quickstart/src/main/webapp/WEB-INF/views/taskList.jsp diff --git a/examples/quickstart/src/main/webapp/WEB-INF/web.xml b/examples/quickstart/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 00000000..2bfad46e --- /dev/null +++ b/examples/quickstart/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,77 @@ + + + QuickStart + + contextConfigLocation + + classpath*:/applicationContext.xml + + + + spring.profiles.default + production + + + org.springframework.web.context.ContextLoaderListener + + + encodingFilter + org.springframework.web.filter.CharacterEncodingFilter + + encoding + UTF-8 + + + forceEncoding + true + + + + encodingFilter + /* + + + openEntityManagerInViewFilter + org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter + + + openEntityManagerInViewFilter + /* + + + sitemeshFilter + com.opensymphony.sitemesh.webapp.SiteMeshFilter + + + sitemeshFilter + /* + + + springServlet + org.springframework.web.servlet.DispatcherServlet + + contextConfigLocation + /WEB-INF/spring-mvc.xml + + 1 + + + springServlet + / + + + 20 + + + java.lang.Throwable + /WEB-INF/views/error/500.jsp + + + 500 + /WEB-INF/views/error/500.jsp + + + 404 + /WEB-INF/views/error/404.jsp + + \ No newline at end of file diff --git a/examples/mini-web/src/main/webapp/static/bootstrap/2.0.4/css/bootstrap-responsive.css b/examples/quickstart/src/main/webapp/static/bootstrap/2.0.4/css/bootstrap-responsive.css similarity index 100% rename from examples/mini-web/src/main/webapp/static/bootstrap/2.0.4/css/bootstrap-responsive.css rename to examples/quickstart/src/main/webapp/static/bootstrap/2.0.4/css/bootstrap-responsive.css diff --git a/examples/mini-web/src/main/webapp/static/bootstrap/2.0.4/css/bootstrap-responsive.min.css b/examples/quickstart/src/main/webapp/static/bootstrap/2.0.4/css/bootstrap-responsive.min.css similarity index 100% rename from examples/mini-web/src/main/webapp/static/bootstrap/2.0.4/css/bootstrap-responsive.min.css rename to examples/quickstart/src/main/webapp/static/bootstrap/2.0.4/css/bootstrap-responsive.min.css diff --git a/examples/mini-web/src/main/webapp/static/bootstrap/2.0.4/css/bootstrap.css b/examples/quickstart/src/main/webapp/static/bootstrap/2.0.4/css/bootstrap.css similarity index 100% rename from examples/mini-web/src/main/webapp/static/bootstrap/2.0.4/css/bootstrap.css rename to examples/quickstart/src/main/webapp/static/bootstrap/2.0.4/css/bootstrap.css diff --git a/examples/mini-web/src/main/webapp/static/bootstrap/2.0.4/css/bootstrap.min.css b/examples/quickstart/src/main/webapp/static/bootstrap/2.0.4/css/bootstrap.min.css similarity index 100% rename from examples/mini-web/src/main/webapp/static/bootstrap/2.0.4/css/bootstrap.min.css rename to examples/quickstart/src/main/webapp/static/bootstrap/2.0.4/css/bootstrap.min.css diff --git a/examples/mini-web/src/main/webapp/static/bootstrap/2.0.4/img/glyphicons-halflings-white.png b/examples/quickstart/src/main/webapp/static/bootstrap/2.0.4/img/glyphicons-halflings-white.png similarity index 100% rename from examples/mini-web/src/main/webapp/static/bootstrap/2.0.4/img/glyphicons-halflings-white.png rename to examples/quickstart/src/main/webapp/static/bootstrap/2.0.4/img/glyphicons-halflings-white.png diff --git a/examples/mini-web/src/main/webapp/static/bootstrap/2.0.4/img/glyphicons-halflings.png b/examples/quickstart/src/main/webapp/static/bootstrap/2.0.4/img/glyphicons-halflings.png similarity index 100% rename from examples/mini-web/src/main/webapp/static/bootstrap/2.0.4/img/glyphicons-halflings.png rename to examples/quickstart/src/main/webapp/static/bootstrap/2.0.4/img/glyphicons-halflings.png diff --git a/examples/mini-web/src/main/webapp/static/bootstrap/2.0.4/js/bootstrap.js b/examples/quickstart/src/main/webapp/static/bootstrap/2.0.4/js/bootstrap.js similarity index 100% rename from examples/mini-web/src/main/webapp/static/bootstrap/2.0.4/js/bootstrap.js rename to examples/quickstart/src/main/webapp/static/bootstrap/2.0.4/js/bootstrap.js diff --git a/examples/mini-web/src/main/webapp/static/bootstrap/2.0.4/js/bootstrap.min.js b/examples/quickstart/src/main/webapp/static/bootstrap/2.0.4/js/bootstrap.min.js similarity index 100% rename from examples/mini-web/src/main/webapp/static/bootstrap/2.0.4/js/bootstrap.min.js rename to examples/quickstart/src/main/webapp/static/bootstrap/2.0.4/js/bootstrap.min.js diff --git a/examples/mini-web/src/main/webapp/static/jquery-validation/1.9.0/images/unchecked.gif b/examples/quickstart/src/main/webapp/static/jquery-validation/1.9.0/images/unchecked.gif similarity index 100% rename from examples/mini-web/src/main/webapp/static/jquery-validation/1.9.0/images/unchecked.gif rename to examples/quickstart/src/main/webapp/static/jquery-validation/1.9.0/images/unchecked.gif diff --git a/examples/mini-web/src/main/webapp/static/jquery-validation/1.9.0/jquery.validate.min.js b/examples/quickstart/src/main/webapp/static/jquery-validation/1.9.0/jquery.validate.min.js similarity index 100% rename from examples/mini-web/src/main/webapp/static/jquery-validation/1.9.0/jquery.validate.min.js rename to examples/quickstart/src/main/webapp/static/jquery-validation/1.9.0/jquery.validate.min.js diff --git a/examples/mini-web/src/main/webapp/static/jquery-validation/1.9.0/messages_cn.js b/examples/quickstart/src/main/webapp/static/jquery-validation/1.9.0/messages_cn.js similarity index 100% rename from examples/mini-web/src/main/webapp/static/jquery-validation/1.9.0/messages_cn.js rename to examples/quickstart/src/main/webapp/static/jquery-validation/1.9.0/messages_cn.js diff --git a/examples/mini-web/src/main/webapp/static/jquery-validation/1.9.0/validate.css b/examples/quickstart/src/main/webapp/static/jquery-validation/1.9.0/validate.css similarity index 100% rename from examples/mini-web/src/main/webapp/static/jquery-validation/1.9.0/validate.css rename to examples/quickstart/src/main/webapp/static/jquery-validation/1.9.0/validate.css diff --git a/examples/mini-web/src/main/webapp/static/jquery/1.7.1/jquery.js b/examples/quickstart/src/main/webapp/static/jquery/1.7.1/jquery.js similarity index 100% rename from examples/mini-web/src/main/webapp/static/jquery/1.7.1/jquery.js rename to examples/quickstart/src/main/webapp/static/jquery/1.7.1/jquery.js diff --git a/examples/mini-web/src/main/webapp/static/jquery/1.7.1/jquery.min.js b/examples/quickstart/src/main/webapp/static/jquery/1.7.1/jquery.min.js similarity index 100% rename from examples/mini-web/src/main/webapp/static/jquery/1.7.1/jquery.min.js rename to examples/quickstart/src/main/webapp/static/jquery/1.7.1/jquery.min.js diff --git a/examples/mini-web/src/main/webapp/static/main.css b/examples/quickstart/src/main/webapp/static/main.css similarity index 100% rename from examples/mini-web/src/main/webapp/static/main.css rename to examples/quickstart/src/main/webapp/static/main.css diff --git a/examples/mini-web/src/test/functional/org/springside/examples/miniweb/functional/BaseFunctionalTestCase.java b/examples/quickstart/src/test/functional/org/springside/examples/quickstart/functional/BaseFunctionalTestCase.java similarity index 94% rename from examples/mini-web/src/test/functional/org/springside/examples/miniweb/functional/BaseFunctionalTestCase.java rename to examples/quickstart/src/test/functional/org/springside/examples/quickstart/functional/BaseFunctionalTestCase.java index 91f3e90d..5da9431b 100644 --- a/examples/mini-web/src/test/functional/org/springside/examples/miniweb/functional/BaseFunctionalTestCase.java +++ b/examples/quickstart/src/test/functional/org/springside/examples/quickstart/functional/BaseFunctionalTestCase.java @@ -1,4 +1,4 @@ -package org.springside.examples.miniweb.functional; +package org.springside.examples.quickstart.functional; import java.net.URL; import java.sql.Driver; @@ -41,7 +41,7 @@ public class BaseFunctionalTestCase { @BeforeClass public static void beforeClass() throws Exception { - baseUrl = propertiesLoader.getProperty("baseUrl", MiniWebServer.BASE_URL); + baseUrl = propertiesLoader.getProperty("baseUrl", QuickStartServer.BASE_URL); //如果是目标地址是localhost,则启动嵌入式jetty。如果指向远程地址,则不需要启动Jetty. Boolean isEmbedded = new URL(baseUrl).getHost().equals("localhost"); @@ -64,7 +64,7 @@ public class BaseFunctionalTestCase { //设定Spring的profile System.setProperty("spring.profiles.active", "functional"); - jettyServer = JettyFactory.createServerInSource(new URL(baseUrl).getPort(), MiniWebServer.CONTEXT); + jettyServer = JettyFactory.createServerInSource(new URL(baseUrl).getPort(), QuickStartServer.CONTEXT); JettyFactory.setTldJars(jettyServer, "sitemesh", "spring-webmvc"); jettyServer.start(); diff --git a/examples/mini-web/src/test/functional/org/springside/examples/miniweb/functional/MiniWebServer.java b/examples/quickstart/src/test/functional/org/springside/examples/quickstart/functional/QuickStartServer.java similarity index 81% rename from examples/mini-web/src/test/functional/org/springside/examples/miniweb/functional/MiniWebServer.java rename to examples/quickstart/src/test/functional/org/springside/examples/quickstart/functional/QuickStartServer.java index 5f643351..e014598a 100644 --- a/examples/mini-web/src/test/functional/org/springside/examples/miniweb/functional/MiniWebServer.java +++ b/examples/quickstart/src/test/functional/org/springside/examples/quickstart/functional/QuickStartServer.java @@ -1,4 +1,4 @@ -package org.springside.examples.miniweb.functional; +package org.springside.examples.quickstart.functional; import org.eclipse.jetty.server.Server; import org.springside.modules.test.functional.JettyFactory; @@ -8,11 +8,11 @@ import org.springside.modules.test.functional.JettyFactory; * * @author calvin */ -public class MiniWebServer { +public class QuickStartServer { public static final int PORT = 8080; - public static final String CONTEXT = "/mini-web"; - public static final String BASE_URL = "http://localhost:8080/mini-web"; + public static final String CONTEXT = "/quickstart"; + public static final String BASE_URL = "http://localhost:8080/quickstart"; public static void main(String[] args) throws Exception { //设定Spring的profile diff --git a/examples/mini-web/src/test/functional/org/springside/examples/miniweb/functional/gui/TaskGuiIT.java b/examples/quickstart/src/test/functional/org/springside/examples/quickstart/functional/gui/TaskGuiIT.java similarity index 85% rename from examples/mini-web/src/test/functional/org/springside/examples/miniweb/functional/gui/TaskGuiIT.java rename to examples/quickstart/src/test/functional/org/springside/examples/quickstart/functional/gui/TaskGuiIT.java index 81ddeadf..4fb88f11 100644 --- a/examples/mini-web/src/test/functional/org/springside/examples/miniweb/functional/gui/TaskGuiIT.java +++ b/examples/quickstart/src/test/functional/org/springside/examples/quickstart/functional/gui/TaskGuiIT.java @@ -1,4 +1,4 @@ -package org.springside.examples.miniweb.functional.gui; +package org.springside.examples.quickstart.functional.gui; import static org.junit.Assert.*; @@ -6,9 +6,9 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import org.springside.examples.miniweb.data.TaskData; -import org.springside.examples.miniweb.entity.Task; -import org.springside.examples.miniweb.functional.BaseFunctionalTestCase; +import org.springside.examples.quickstart.data.TaskData; +import org.springside.examples.quickstart.entity.Task; +import org.springside.examples.quickstart.functional.BaseFunctionalTestCase; import org.springside.modules.test.category.Smoke; /** diff --git a/examples/mini-web/src/test/functional/org/springside/examples/miniweb/functional/rest/TaskRestIT.java b/examples/quickstart/src/test/functional/org/springside/examples/quickstart/functional/rest/TaskRestIT.java similarity index 87% rename from examples/mini-web/src/test/functional/org/springside/examples/miniweb/functional/rest/TaskRestIT.java rename to examples/quickstart/src/test/functional/org/springside/examples/quickstart/functional/rest/TaskRestIT.java index 62603a39..83e0007f 100644 --- a/examples/mini-web/src/test/functional/org/springside/examples/miniweb/functional/rest/TaskRestIT.java +++ b/examples/quickstart/src/test/functional/org/springside/examples/quickstart/functional/rest/TaskRestIT.java @@ -1,4 +1,4 @@ -package org.springside.examples.miniweb.functional.rest; +package org.springside.examples.quickstart.functional.rest; import static org.junit.Assert.*; @@ -9,8 +9,8 @@ import javax.ws.rs.core.MediaType; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.springside.examples.miniweb.entity.Task; -import org.springside.examples.miniweb.functional.BaseFunctionalTestCase; +import org.springside.examples.quickstart.entity.Task; +import org.springside.examples.quickstart.functional.BaseFunctionalTestCase; import org.springside.modules.test.category.Smoke; import com.sun.jersey.api.client.Client; diff --git a/examples/mini-web/src/test/java/org/springside/examples/miniweb/dao/JpaMappingTest.java b/examples/quickstart/src/test/java/org/springside/examples/quickstart/dao/JpaMappingTest.java similarity index 95% rename from examples/mini-web/src/test/java/org/springside/examples/miniweb/dao/JpaMappingTest.java rename to examples/quickstart/src/test/java/org/springside/examples/quickstart/dao/JpaMappingTest.java index 49a81216..25f1d8ea 100644 --- a/examples/mini-web/src/test/java/org/springside/examples/miniweb/dao/JpaMappingTest.java +++ b/examples/quickstart/src/test/java/org/springside/examples/quickstart/dao/JpaMappingTest.java @@ -1,4 +1,4 @@ -package org.springside.examples.miniweb.dao; +package org.springside.examples.quickstart.dao; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; diff --git a/examples/mini-web/src/test/java/org/springside/examples/miniweb/data/TaskData.java b/examples/quickstart/src/test/java/org/springside/examples/quickstart/data/TaskData.java similarity index 76% rename from examples/mini-web/src/test/java/org/springside/examples/miniweb/data/TaskData.java rename to examples/quickstart/src/test/java/org/springside/examples/quickstart/data/TaskData.java index 0fee6b34..08c6c948 100644 --- a/examples/mini-web/src/test/java/org/springside/examples/miniweb/data/TaskData.java +++ b/examples/quickstart/src/test/java/org/springside/examples/quickstart/data/TaskData.java @@ -1,6 +1,6 @@ -package org.springside.examples.miniweb.data; +package org.springside.examples.quickstart.data; -import org.springside.examples.miniweb.entity.Task; +import org.springside.examples.quickstart.entity.Task; import org.springside.modules.test.data.RandomData; /** diff --git a/examples/mini-web/src/test/java/org/springside/examples/miniweb/service/TaskManagerTest.java b/examples/quickstart/src/test/java/org/springside/examples/quickstart/service/TaskManagerTest.java similarity index 72% rename from examples/mini-web/src/test/java/org/springside/examples/miniweb/service/TaskManagerTest.java rename to examples/quickstart/src/test/java/org/springside/examples/quickstart/service/TaskManagerTest.java index 1f6f1deb..51b6bb0d 100644 --- a/examples/mini-web/src/test/java/org/springside/examples/miniweb/service/TaskManagerTest.java +++ b/examples/quickstart/src/test/java/org/springside/examples/quickstart/service/TaskManagerTest.java @@ -1,10 +1,10 @@ -package org.springside.examples.miniweb.service; +package org.springside.examples.quickstart.service; import org.junit.Before; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.springside.examples.miniweb.dao.TaskDao; -import org.springside.examples.miniweb.service.TaskManager; +import org.springside.examples.quickstart.dao.TaskDao; +import org.springside.examples.quickstart.service.TaskManager; /** * TaskManager的测试用例, 测试Service层的业务逻辑. diff --git a/examples/mini-service/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyReader b/examples/quickstart/src/test/resources/META-INF/services/javax.ws.rs.ext.MessageBodyReader similarity index 100% rename from examples/mini-service/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyReader rename to examples/quickstart/src/test/resources/META-INF/services/javax.ws.rs.ext.MessageBodyReader diff --git a/examples/mini-service/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter b/examples/quickstart/src/test/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter similarity index 100% rename from examples/mini-service/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter rename to examples/quickstart/src/test/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter diff --git a/examples/mini-web/src/test/resources/application.development.properties b/examples/quickstart/src/test/resources/application.development.properties similarity index 100% rename from examples/mini-web/src/test/resources/application.development.properties rename to examples/quickstart/src/test/resources/application.development.properties diff --git a/examples/mini-web/src/test/resources/application.functional.properties b/examples/quickstart/src/test/resources/application.functional.properties similarity index 80% rename from examples/mini-web/src/test/resources/application.functional.properties rename to examples/quickstart/src/test/resources/application.functional.properties index 812f7b35..1bfb6dcb 100644 --- a/examples/mini-web/src/test/resources/application.functional.properties +++ b/examples/quickstart/src/test/resources/application.functional.properties @@ -1,4 +1,4 @@ -baseUrl=http://localhost:8082/mini-web +baseUrl=http://localhost:8082/quickstart #selenium settings, options include firefox,ie,chrome,htmlunit,remote:localhost:4444:firefox selenium.driver=firefox diff --git a/examples/mini-service/src/test/resources/application.test.properties b/examples/quickstart/src/test/resources/application.test.properties similarity index 100% rename from examples/mini-service/src/test/resources/application.test.properties rename to examples/quickstart/src/test/resources/application.test.properties diff --git a/examples/mini-web/src/test/resources/data/sample-data.xml b/examples/quickstart/src/test/resources/data/sample-data.xml similarity index 100% rename from examples/mini-web/src/test/resources/data/sample-data.xml rename to examples/quickstart/src/test/resources/data/sample-data.xml diff --git a/quick-start b/quick-start index 31965b2e..095c31e4 100644 --- a/quick-start +++ b/quick-start @@ -5,12 +5,12 @@ echo "[Pre-Requirement] Makesure install Maven 3.0.4+ and set the PATH." set MAVEN_OPTS=$MAVEN_OPTS -XX:MaxPermSize=128m -echo "[Step 1] Install all springside modules to local maven repository, and generate eclipse files to all projects." +echo "[Step 1] Install all springside modules to local maven repository." cd modules mvn clean install -Dmaven.test.skip=true cd .. -echo "[Step 2] Generate Eclipse project files for all projects" +echo "[Step 2] Generate Eclipse project files for all projects." mvn eclipse:clean eclipse:eclipse echo "[Step 3] Initialize schema and data for all example projects." @@ -19,15 +19,12 @@ mvn antrun:run -Prefresh-db cd .. echo "[Step 4] Start all example projects." -cd examples/mini-web +cd examples/quickstart mvn clean jetty:run & -cd ../mini-service -mvn clean jetty:run -Djetty.port=8081 & cd ../showcase -mvn clean jetty:run -Djetty.port=8082 & +mvn clean jetty:run -Djetty.port=8081 & echo "[INFO] Please wait a moment then access below demo sites:" -echo "[INFO] http://localhost:8080/mini-web" -echo "[INFO] http://localhost:8081/mini-service" -echo "[INFO] http://localhost:8082/showcase" +echo "[INFO] http://localhost:8080/quickstart" +echo "[INFO] http://localhost:8081/showcase" diff --git a/quick-start.bat b/quick-start.bat index af44cc9f..727233fa 100644 --- a/quick-start.bat +++ b/quick-start.bat @@ -11,7 +11,7 @@ call %MVN% clean install -Dmaven.test.skip=true if errorlevel 1 goto error cd ..\ -echo [Step 2] Generate Eclipse project files for all projects +echo [Step 2] Generate Eclipse project files for all projects. call %MVN% eclipse:clean eclipse:eclipse if errorlevel 1 goto error @@ -23,21 +23,17 @@ cd ..\ echo [Step 4] Start all example projects. cd examples\mini-web -start "Mini-Web" %MVN% clean jetty:run -if errorlevel 1 goto error -cd ..\mini-service -start "Mini-Service" %MVN% clean jetty:run -Djetty.port=8081 +start "QuickStart" %MVN% clean jetty:run if errorlevel 1 goto error cd ..\showcase -start "Showcase" %MVN% clean jetty:run -Djetty.port=8082 +start "Showcase" %MVN% clean jetty:run -Djetty.port=8081 if errorlevel 1 goto error cd ..\..\ echo [INFO] Please wait a moment then access below demo sites: -echo [INFO] http://localhost:8080/mini-web -echo [INFO] http://localhost:8081/mini-service -echo [INFO] http://localhost:8082/showcase +echo [INFO] http://localhost:8080/quickstart +echo [INFO] http://localhost:8081/showcase goto end :error