Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

5.0.0 rc1 1 #545

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

5.0.0 rc1 1 #545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f3ddbe
CrossOrigin
Feb 9, 2017
d4f7b20
加入UI测试
Feb 10, 2017
04e9ba6
add activity dependency
Mar 9, 2017
343c8da
eclipse project ignore
Mar 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 17 additions & 13 deletions .gitignore
View file
Open in desktop
@@ -1,13 +1,17 @@
# Eclipse project files
.classpath
.project
.settings/


# Intellij project files
*.iml
.idea/

# Others
target/
logs/
# Eclipse project files
.classpath
.project
.settings/


# Intellij project files
*.iml
.idea/

# Others
target/
logs/
examples/boot-api/src/main/resources/processes/Developer_Hiring.bpmn20.xml
examples/boot-api/src/main/resources/processes/Developer_Hiring_with_jpa.bpmn20.xml
examples/boot-api/src/main/resources/processes/leave-dynamic-form.bpmn20.xml
examples/boot-api/src/test/java/org/activiti/HireProcessTest.java
43 changes: 43 additions & 0 deletions examples/boot-api/pom.xml
View file
Open in desktop
Expand Up @@ -22,6 +22,8 @@
<orika.version>1.5.0</orika.version>

<java.version>1.7</java.version>
<activiti.version>6.0.0.Beta4</activiti.version>

</properties>

<dependencies>
Expand Down Expand Up @@ -91,6 +93,34 @@
<groupId>org.jolokia</groupId>
<artifactId>jolokia-core</artifactId>
</dependency>

<!-- activiti begin -->
<dependency>
<groupId>org.activiti</groupId>
<artifactId>activiti-spring-boot-starter-basic</artifactId>
<version>${activiti.version}</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
<dependency>
<groupId>org.activiti</groupId>
<artifactId>activiti-spring-boot-starter-rest-api</artifactId>
<!--<artifactId>spring-boot-starter-rest-api</artifactId>-->
<version>${activiti.version}</version>
</dependency>
<dependency>
<groupId>org.activiti</groupId>
<artifactId>activiti-spring-boot-starter-actuator</artifactId>
<version>${activiti.version}</version>
</dependency>
<dependency>
<groupId>org.activiti</groupId>
<artifactId>activiti-spring-boot-starter-jpa</artifactId>
<version>${activiti.version}</version>
</dependency>
<!-- activiti end -->

<!-- test -->
<dependency>
Expand All @@ -112,6 +142,19 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<!-- test activiti -->
<dependency>
<groupId>org.subethamail</groupId>
<artifactId>subethasmtp-wiser</artifactId>
<version>1.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

<build>
Expand Down
3 changes: 3 additions & 0 deletions examples/boot-api/src/main/java/org/springside/examples/bootapi/api/AccountEndPoint.java
View file
Open in desktop
Expand Up @@ -14,8 +14,11 @@
import org.springside.examples.bootapi.service.exception.ErrorCode;
import org.springside.examples.bootapi.service.exception.ServiceException;
import org.springside.modules.web.MediaTypes;
import org.springframework.web.bind.annotation.*;


// Spring Restful MVC Controller的标识, 直接输出内容，不调用template引擎.
@CrossOrigin(maxAge = 3600)
@RestController
public class AccountEndPoint {

Expand Down
8 changes: 2 additions & 6 deletions examples/boot-api/src/main/java/org/springside/examples/bootapi/api/BookEndpoint.java
View file
Open in desktop
Expand Up @@ -6,12 +6,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
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.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.springside.examples.bootapi.domain.Account;
import org.springside.examples.bootapi.domain.Book;
import org.springside.examples.bootapi.dto.BookDto;
Expand All @@ -24,6 +19,7 @@
import org.springside.modules.web.MediaTypes;

// Spring Restful MVC Controller的标识, 直接输出内容，不调用template引擎.
@CrossOrigin(maxAge = 3600)
@RestController
public class BookEndpoint {

Expand Down
2 changes: 1 addition & 1 deletion examples/boot-api/src/main/resources/.h2.server.properties
View file
Open in desktop
@@ -1,5 +1,5 @@
#H2 Server Properties
#Sat Nov 07 10:12:13 CST 2015
#Wed Feb 08 17:47:18 CST 2017
0=TestDB(Embedded)|org.h2.Driver|jdbc\:h2\:mem\:testdb|sa
webAllowOthers=false
webPort=8090
Expand Down
220 changes: 220 additions & 0 deletions examples/boot-api/src/main/webapp/index2.html
View file
Open in desktop
@@ -0,0 +1,220 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, minimal-ui">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<title>Framework7</title>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/framework7/1.4.2/css/framework7.ios.min.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/framework7/1.4.2/css/framework7.ios.colors.min.css">
</head>
<body>


<div class="login-screen modal-in">
<div class="view">
<div class="page">
<div class="page-content login-screen-content">
<div class="login-screen-title">Login Here</div>
<form>
<div class="list-block">
<ul>
<li class="item-content">
<div class="item-inner">
<div class="item-title label">Username</div>
<div class="item-input">
<input type="text" name="username" placeholder="Enter the username" value="calvin.xiao@springside.io">
</div>
</div>
</li>
<li class="item-content">
<div class="item-inner">
<div class="item-title label">Password</div>
<div class="item-input">
<input type="password" name="password" placeholder="Enter the password" value="springside">
</div>
</div>
</li>
</ul>
</div>
<div class="list-block">
<ul>
<li><a href="#" class="item-link list-button">Log In</a></li>
</ul>
<div class="list-block-label">
<p><a href="#" class="close-login-screen">Click here to close Login Screen</a></p>
</div>
</div>
</form>
</div>
</div>
</div>
</div>

<div class="views">
<div class="view view-main">
<div class="navbar">
<div class="navbar-inner">
<div class="center sliding">Template7 Pages</div>
</div>
</div>
<div class="pages navbar-through toolbar-through">
<div data-page="index" class="page">
<div class="page-content">
<div class="list-block">
<ul>
<li>
<a href="#" data-template="books" data-context-name="books" class="item-link item-content books">
<div class="item-inner">
<div class="item-title">所有图书</div>
</div>
</a>
</li>
<li>
<a href="#" data-template="mybook" data-context-name="mybook" class="item-link item-content mybook">
<div class="item-inner">
<div class="item-title">我拥有的图书</div>
</div>
</a>
</li>
<li>
<a href="#" data-template="requests" data-context-name="requests" class="item-link item-content request">
<div class="item-inner">
<div class="item-title">我借阅的</div>
</div>
</a>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
</div>
<script type="text/template7" id="about">
<div class="navbar">
<div class="navbar-inner">
<div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><span>Back</span></a></div>
<div class="center sliding">About Me</div>
<div class="right"><a href="#" class="link icon-only open-panel"> <i class="icon icon-bars"></i></a></div>
</div>
</div>
<div class="pages">
<div data-page="about" class="page">
<div class="page-content">
<div class="content-block">
<div class="content-block-inner">
//displays the details of the user by using the 'my-app.js' file
<p>Hello, i am <b>{{firstname}} {{lastname}}</b>, <b>{{age}}</b> years old and working as <b>{{position}}</b> at <b>{{company}}</b>.</p>
</div>
</div>
</div>
</div>
</div>
</script>

<script type="text/template7" id="books">
<div class="navbar">
<div class="navbar-inner">
<div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><span>Back</span></a></div>
<div class="center sliding">所有图书</div>
<div class="right"><a href="#" class="link icon-only open-panel"> <i class="icon icon-bars"></i></a></div>
</div>
</div>
<div class="pages">
<div data-page="likes" class="page">
<div class="page-content">
<div class="content-block-title">所有图书</div>
<div class="list-block media-list">
<ul>{{#each likes}}
<li class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">{{title}}</div>
</div>
<div class="item-subtitle">ID:{{id}} </div>
<div class="item-subtitle">status:{{description}}</div>
</div>
<div class="item-after">
<p><a href="#" class="button button-fill borrow">借阅</a></p>
</div>
</li>{{/each}}
</ul>
</div>
</div>
</div>
</div>
</script>

<script type="text/template7" id="mybook">
<div class="navbar">
<div class="navbar-inner">
<div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><span>Back</span></a></div>
<div class="center sliding">我拥有的图书</div>
<div class="right"><a href="#" class="link icon-only open-panel"> <i class="icon icon-bars"></i></a></div>
</div>
</div>
<div class="pages">
<div data-page="likes" class="page">
<div class="page-content">
<div class="content-block-title">我拥有的图书</div>
<div class="list-block media-list">
<ul>{{#each likes}}
<li class="item-content">
<div class="item-inner">
<div class="item-title-row">
<a href="#" data-template="about" data-context-name="about" class="item-link">
<div class="item-title">{{title}}</div>
</a>
</div>
<div class="item-subtitle">ID:{{id}} </div>
<div class="item-subtitle">status:{{description}} </div>
</div>
<div class="item-after">
<p><a href="#" class="button button-fill confirm">同意借阅</a></p>
<p><a href="#" class="button button-fill markBookReturned">确认归还</a></p>
</div>
</li>{{/each}}
</ul>
</div>
</div>
</div>
</div>
</script>

<script type="text/template7" id="requests">
<div class="navbar">
<div class="navbar-inner">
<div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><span>Back</span></a></div>
<div class="center sliding">我借阅的</div>
<div class="right"><a href="#" class="link icon-only open-panel"> <i class="icon icon-bars"></i></a></div>
</div>
</div>
<div class="pages">
<div data-page="likes" class="page">
<div class="page-content">
<div class="content-block-title">我借阅的</div>
<div class="list-block media-list">
<ul>{{#each likes}}
<li class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">{{title}}</div>
</div>
<div class="item-subtitle">ID:{{id}} </div>
<div class="item-subtitle">status:{{description}} </div>
</div>

</li>{{/each}}
</ul>
</div>
</div>
</div>
</div>
</script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/framework7/1.4.2/js/framework7.min.js"></script>
<script type="text/javascript" src="jquery.min.js"></script>
<script type="text/javascript" src="my-app.js"></script>
</body>
</html>
5 changes: 5 additions & 0 deletions examples/boot-api/src/main/webapp/jquery.min.js
View file
Open in desktop

Large diffs are not rendered by default.