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.

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

No maven #53

Open
wants to merge 99 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
3e3735d
创建无Maven分支:no-maven
henryyan May 27, 2012
71083ef
补上README
henryyan May 27, 2012
dca8984
Update README.md
henryyan May 27, 2012
70d26b4
Update README.md
henryyan May 27, 2012
19cf6a2
Update README.md
henryyan May 27, 2012
155e14f
清理classes目录的文件,并让git忽略之
henryyan May 28, 2012
f071558
Fixed:hruser用户同意申请时系统报错
henryyan May 28, 2012
a19448b
Fixed:IE不能登录问题
henryyan May 28, 2012
a12b6fd
Fixed:IE下面申请请假不能提交问题
henryyan May 29, 2012
638fff4
从master分支合并
henryyan May 31, 2012
0631393
忽略Mac系统的.DS_Store文件,忽略.ant_targets
henryyan Aug 2, 2012
90c659a
添加流程打包的ant target,在项目木执行ant workflow.package.all即可自动打包流程资源文件为zip格式压缩包
henryyan Aug 2, 2012
dd11173
master分支脱离了springside之后更新依赖jar
henryyan Aug 5, 2012
dcf2b94
系统首页删除springside说明
henryyan Aug 5, 2012
b3fee7c
升级activiti到5.10
henryyan Aug 10, 2012
a5b3bc4
合并了master分支的jsp
henryyan Aug 11, 2012
eb6e0cd
动态表单中的办理添加未完成提示
henryyan Aug 11, 2012
dc4f74f
合并master分支的动态表单功能,已完成
henryyan Aug 11, 2012
202a438
merge from master: 添加部署单个流程的功能,5.10解决了中文乱码问题
henryyan Aug 12, 2012
00b151e
Update README.md
henryyan Aug 13, 2012
1dc5fb7
Update README.md
henryyan Aug 13, 2012
c7c4a18
合并master分支的spring-mvc和web.xml
henryyan Aug 16, 2012
22467d7
Merge branch 'no-maven' of github.com:henryyan/kft-activiti-demo into…
henryyan Aug 16, 2012
1e973a5
合并master分支的单元测试
henryyan Aug 16, 2012
df955a4
属性配置文件中用具体值代替属性名称
henryyan Aug 16, 2012
4b5d3cf
merge from master, for version:1.2.0
henryyan Aug 16, 2012
17803d5
merge from master 1.2.1,修复了几个bug
henryyan Aug 22, 2012
2260014
从master 1.3.0版本合并,添加了外部表单的演示
henryyan Aug 31, 2012
ad72fa8
从master 1.3.0版本合并,添加了外部表单的演示
henryyan Aug 31, 2012
416674c
merge from master
henryyan Sep 17, 2012
51cef74
merge from master
henryyan Sep 18, 2012
4e25049
merge from master
henryyan Sep 24, 2012
c9367a4
merge from master,修复IE的几个bug,添加发文会签单元测试
henryyan Nov 29, 2012
a552d0a
表单名称重构,portlet添加关于作者和表单概念模块
henryyan Nov 29, 2012
7f3059b
升级:jquery -> 1.83,jquery ui -> 1.9.2, jquery.layout -> 1.3,html头部声明用h…
henryyan Dec 1, 2012
ec3f676
jquery.layout.js添加?v=1.3解决缓存问题
henryyan Dec 1, 2012
a682d58
升级activiti至5.11,解决jsp中两个head问题,升级portlet插件至1.1.1
henryyan Dec 15, 2012
00ac786
添加对流程定义状态的控制功能,添加流程实例状态控制功能,formkey查询任务时使用native query
henryyan Dec 16, 2012
96cabf0
删除orm.xml和persistence.xml,see detail: https://github.com/springside/s…
henryyan Dec 31, 2012
2ae8d70
添加发文会签演示
henryyan Jan 6, 2013
2679da3
merge from 1.6.1
henryyan Feb 7, 2013
a01dfb8
删除多余的jar,解决在tomcat7中不能运行的问题
henryyan Feb 23, 2013
16c953b
解决不能运行单元测试的问题
henryyan Feb 25, 2013
68b78b3
修复外置表单任务列表读取失败问题
henryyan Feb 28, 2013
fb4e8fe
添加servlet-api 2.5版本jar,同时清理普通表单的垃圾代码
henryyan Mar 2, 2013
04201e1
还原至1.6.0版本
henryyan Mar 4, 2013
fc37640
release 1.7.0 merged from master branch
henryyan Mar 10, 2013
9436fa3
Update README.md
henryyan Mar 10, 2013
b3bc481
添加生成图片的字体属性,默认设置为:宋体,可以自行更改
henryyan Mar 10, 2013
e0d8fb1
Merge branch 'no-maven' of github.com:henryyan/kft-activiti-demo into…
henryyan Mar 10, 2013
3a849b7
所有查询列表添加排序字段
henryyan Mar 10, 2013
0c5afee
Update README.md
henryyan Mar 10, 2013
4589804
集成Activiti Modeler
henryyan Mar 10, 2013
13a0340
删除resources/activiti.cfg.xml
henryyan Mar 10, 2013
71d31e4
优化ModelController的异常处理
henryyan Mar 10, 2013
4d0f077
Update README.md
henryyan Mar 10, 2013
741f1f1
简化整合modeler的依赖
henryyan Mar 10, 2013
f2023da
简化整合modeler的依赖
henryyan Mar 10, 2013
d5ece58
Merge branch 'no-maven' of github.com:henryyan/kft-activiti-demo into…
henryyan Mar 10, 2013
2c00865
添加测试配置文件
henryyan Mar 14, 2013
ca72048
删除/WEB-INF/applicationContext.xml,多余!!!
henryyan Mar 14, 2013
8a4e7e8
禁用流程定义对象缓存
henryyan Mar 18, 2013
fde9054
删除drop table if exist table OA_LEAVE
henryyan Mar 29, 2013
6bc1757
从master分支合并,升级activiti至5.12.2
henryyan Apr 5, 2013
5722d9f
fixed:formkey使用native query报错
henryyan Apr 9, 2013
393635c
忽略IDEA的文件
henryyan Apr 9, 2013
9fc97b2
添加转换流程定义为Model功能,在模型列表会添加一条记录 release 1.7.1-no-maven
henryyan Apr 10, 2013
f829dc6
解决流程引擎自动生成的图片跟踪坐标错乱问题
henryyan Apr 10, 2013
a6ef007
用重新打包的5.12.1
henryyan Apr 11, 2013
b659265
更新5.12的sql
henryyan Apr 13, 2013
319fc41
使用自定义的Activiti版本 5.12.1-kft,添加全局监听演示
henryyan Apr 17, 2013
b80232d
修复使用mysql时报错:Every derived table must have its own alias
henryyan May 14, 2013
2862805
修正动态表单和外置表单流程列表不能查看xml和图片问题, 解决首页待办任务跟踪提示样式错乱问题, 升级Activiti至5.13
henryyan Jun 19, 2013
d8bceab
上一次提交5.12.1-kft版本未删除导致项目不能运行
henryyan Jun 22, 2013
7683a81
配置文件管理升级
henryyan Jun 30, 2013
4b85827
merge from master: 事瞎折腾型,把登录、欢迎页面做了优化(居中),升级了配置文件管理的Servlet,登陆改为登录,登录…
henryyan Aug 16, 2013
a023a00
发布1.8.2,添加了UUID生成器的配置,参考文章:http://www.kafeitu.me/activiti/2013/08/30/…
henryyan Aug 30, 2013
f2f1527
忽略resources/application.local.properties
henryyan Aug 30, 2013
6f0ec6b
dd35973 - (HEAD, origin/master, master) 添加综合流程演示(只支持动态表单) (3 minutes …
henryyan Dec 1, 2013
5635a15
REST模块升级
henryyan Dec 19, 2013
0da3d4d
针对mysql的乱码问题,在属性文件里面说明要用UTF8编码
henryyan Dec 23, 2013
c382ed6
解决Activiti Modeler的Rest与Activiti-Rest模块实现类冲突问题
henryyan Jan 5, 2014
8012a79
增强请假待办列表容错性
henryyan Jan 11, 2014
2bae109
Hibernate初始化时自动创建实体表
henryyan Jan 17, 2014
d964792
解决Hibernate自动创建表导致activiti的act_id_group和act_id_user没有使用最新版本的sql,导致初始化…
henryyan Feb 18, 2014
4fe4c47
合并1.10.0版本
henryyan Apr 17, 2014
cfc020f
merge from master
henryyan Apr 17, 2014
471ce54
merge from master 1.10.1
henryyan Apr 23, 2014
b6900f8
sql文件的5.15.1-SNAPSHOT版本改为5.15.1
henryyan Apr 23, 2014
65a878e
Update README.md
henryyan Apr 24, 2014
41e7039
Update README.md
henryyan Apr 24, 2014
b01ce4d
Update README.md
henryyan Apr 24, 2014
e902baf
Update README.md
henryyan Apr 24, 2014
f41a3f8
修复动态表单任务列表中任务重复问题 v1.10.2
henryyan May 8, 2014
b108e06
添加webservice以及mail演示
henryyan Jul 4, 2014
4f9ae97
移除了jetty-server模块依赖
henryyan Jul 12, 2014
c35b3a2
升级Activiti -> 5.16
henryyan Aug 1, 2014
18d423b
5.16中流程图生成器重构后API变更
henryyan Aug 4, 2014
9340b4a
升级lang3版本到3.3.2,升级dhcp到dhcp2
henryyan Aug 6, 2014
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
21 changes: 7 additions & 14 deletions .classpath
Original file line number Diff line number Diff line change
@@ -1,22 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test"/>
<classpathentry kind="src" path="resources"/>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
<attribute name="owner.project.facets" value="jst.web"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/functional">
<attributes>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
</classpath>
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,10 @@
*~
.xml
.bpmn
WebContent/WEB-INF/classes
.DS_Store
.ant_targets
*.iml
.idea
resources/application.local.properties
kft-activiti-demo-no-maven.war
20 changes: 4 additions & 16 deletions .project
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>kft-activiti-demo</name>
<name>kft-activiti-demo-no-maven</name>
<comment></comment>
<projects>
</projects>
Expand All @@ -10,39 +10,27 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
</projectDescription>
23 changes: 12 additions & 11 deletions .settings/.jsdtscope
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
<attributes>
<attribute name="hide" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
<classpathentry kind="output" path=""/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="WebContent"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
<attributes>
<attribute name="hide" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
<classpathentry kind="output" path=""/>
</classpath>
7 changes: 0 additions & 7 deletions .settings/org.eclipse.core.resources.prefs

This file was deleted.

20 changes: 7 additions & 13 deletions .settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
#Thu Jul 29 16:59:03 CST 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.6
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
4 changes: 0 additions & 4 deletions .settings/org.eclipse.m2e.core.prefs

This file was deleted.

17 changes: 8 additions & 9 deletions .settings/org.eclipse.wst.common.component
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="joying-budget-web">
<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp"/>
<property name="context-root" value="kft-activiti-demo"/>
<property name="java-output-path" value="/kft-activiti-demo/target/classes"/>
</wb-module>
<wb-module deploy-name="kft-activiti-demo-no-maven">
<wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/test"/>
<property name="context-root" value="kft-activiti-demo-no-maven"/>
<property name="java-output-path" value="/kft-activiti-demo-no-maven/build/classes"/>
</wb-module>
</project-modules>
5 changes: 3 additions & 2 deletions .settings/org.eclipse.wst.common.project.facet.core.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<fixed facet="jst.java"/>
<runtime name="Tomcat v6.0.32-eclipse"/>
<fixed facet="wst.jsdt.web"/>
<fixed facet="jst.web"/>
<installed facet="jst.java" version="6.0"/>
<fixed facet="java"/>
<installed facet="java" version="1.6"/>
<installed facet="jst.web" version="2.5"/>
<installed facet="wst.jsdt.web" version="1.0"/>
</faceted-project>
3 changes: 0 additions & 3 deletions .settings/org.eclipse.wst.css.core.prefs

This file was deleted.

3 changes: 0 additions & 3 deletions .settings/org.eclipse.wst.html.core.prefs

This file was deleted.

3 changes: 0 additions & 3 deletions .settings/org.eclipse.wst.ws.service.policy.prefs

This file was deleted.

8 changes: 0 additions & 8 deletions .settings/org.maven.ide.eclipse.prefs

This file was deleted.

109 changes: 102 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,117 @@
# 简介
# 简介--(no-maven分支)

本项目旨在让初学者快速入门Activiti。
本项目旨在让初学者快速入门Activiti。**作者**:[咖啡兔](http://www.kafeitu.me)

本项目依赖[Springside4](https://github.com/springside/springside4)。
----
> 如果你还不会使用Maven,真的希望能花点时间学习一下,跟随时代的脚步,轻轻松松耍Demo,让不会Maven的一边哭去。。。
----

**作者**:[咖啡兔|http://www.kafeitu.me]
**Wiki文档**: [https://github.com/henryyan/kft-activiti-demo/wiki](https://github.com/henryyan/kft-activiti-demo/wiki)

**QQ群在线支持:**: 23539326

# 框架版本

* Activiti: **5.9**
* Activiti: **5.12.1**

* Spring: **3.1.1.RELEASE**

* SpringSide:**4.0.0.RC4-SNAPSHOT**
# 下载源码

* [zip格式](https://github.com/henryyan/kft-activiti-demo/zipball/no-maven)
* [tar.gz格式](https://github.com/henryyan/kft-activiti-demo/tarball/no-maven)

# 演示说明文档

* [配置说明](https://github.com/henryyan/kft-activiti-demo/wiki/%E9%85%8D%E7%BD%AE%E8%AF%B4%E6%98%8E)
* [功能演示](https://github.com/henryyan/kft-activiti-demo/wiki/%E5%8A%9F%E8%83%BD%E6%BC%94%E7%A4%BA)

![kft-activiti-demo截图](http://www.kafeitu.me/files/2012/05/kft-activiti-demo.png)
![kft-activiti-demo截图](http://www.kafeitu.me/files/2012/05/kft-activiti-demo.png)

## Changelog

### 1.10.1(2014-04-23)
1. 修复在最新版本Chrome(V34)不能运行Activiti Modeler问题

### 1.10.0(2014-04-18)
1. 集成了diagram-viewer,目前提供了三种流程跟踪方式
2. 添加了针对JPA的演示
3. 添加了全局监听的演示
4. 使用5.15.1-kft版本(修复了5.15版本中查询待办任务<包含指定到人、候选人、候选组>方法的Bug)

### 1.9.0(2014-01-01)
1. 升级Activiti到5.14
2. 同时支持纯Rest接口和Activiti Modeler的Rest路径映射

### 1.8.0(2013-06-22)
1. 升级Activiti至5.13
2. 移除了全局监听器(以后的版本会再加入)

### 1.7.2(2013-04-17)
1. 升级Activiti至5.12.1-kft版本
2. 添加全局监听器演示

### 1.7.1(2013-04-10)
1. 解决流程引擎自动生成的图片跟踪坐标错乱问题
2. 使用重新打包的5.12.1,解决JDK6部署时报错问题
3. 解决跟踪流程图时(调用引擎的图片生成工具)中文乱码

### 1.7.0(2013-03-10)
1. 添加分页查询演示
2. 添加流程定义对象(ProcessDefinition)缓存演示, see: [Tweaking the process definition cache in Activiti 5.12](http://www.jorambarrez.be/blog/2012/12/20/tweaking-process-definition-cache/)
3. 添加activityFontName属性配置,可以解决流程图中包含中文导致生成的流程图乱码问题
4. 整合Activiti Modeler,可以在线设计流程

> 特别说明:5.12.1不是官方提供,是我自己打包的一个版本(支持Native Query分页查询功能,5.13将会直接提供此功能)

### 1.6.0(2013-01-06)
1. 添加多实例(发文)演示
2. 添加自动部署流程定义演示

### 1.5.0 (2012-12-16)
1. 13fc350 添加对流程定义状态的控制功能
2. c50ec09 添加流程实例状态控制功能
3. 9a97cda formkey查询任务时使用native query
4. 3e8ab24 清理垃圾
5. 9035e56 动态表单和外置表单的运行中列表显示的当前节点的英文名称,并在查询流程数据时区分动态、外置表单
6. 7f955c4 重写JuelFormEngine,解决windows平台读取表单内容乱码问题
7. d72778b 升级portlet插件为1.1.1
8. 5e4007c 升级初始化sql的activiti版本为5.11
9. 684c8a0 解决jsp文件中出现两个head问题
10. 3bcbd56 菜单的传统改为普通,外部改为外置
11. 645347c 移除不需要的依赖版本号

### 1.4.1 (2012-12-01)

1.升级jquery.portlet.js解决把一列的portlet拖走后不能再拖回问题

2.升级:jquery -> 1.83,jquery ui -> 1.9.2, jquery.layout -> 1.3,html头部声明用html标准代替xhtml

### 1.4 (2012-11-27)

1.表单名称重构,portlet添加关于作者和表单概念模块

2.首页用jquery.portlet插件显示信息,并添加一个待办任务列表的portlet

2. c50ec09 添加流程实例状态控制功能
3. 9a97cda formkey查询任务时使用native query
4. 3e8ab24 清理垃圾
5. 9035e56 动态表单和外置表单的运行中列表显示的当前节点的英文名称,并在查询流程数据时区分动态、外置表单
6. 7f955c4 重写JuelFormEngine,解决windows平台读取表单内容乱码问题
7. d72778b 升级portlet插件为1.1.1
8. 5e4007c 升级初始化sql的activiti版本为5.11
9. 684c8a0 解决jsp文件中出现两个head问题
10. 3bcbd56 菜单的传统改为普通,外部改为外置
11. 645347c 移除不需要的依赖版本号

### 1.4.1 (2012-12-01)

1.升级jquery.portlet.js解决把一列的portlet拖走后不能再拖回问题

2.升级:jquery -> 1.83,jquery ui -> 1.9.2, jquery.layout -> 1.3,html头部声明用html标准代替xhtml

### 1.4 (2012-11-27)

1.表单名称重构,portlet添加关于作者和表单概念模块

2.首页用jquery.portlet插件显示信息,并添加一个待办任务列表的portlet
3 changes: 3 additions & 0 deletions WebContent/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Manifest-Version: 1.0
Class-Path:

Binary file added WebContent/WEB-INF/lib/activation-1.1.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/activiti-cxf-5.16.jar
Binary file not shown.
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/activiti-engine-5.16.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/activiti-modeler-5.16.jar
Binary file not shown.
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/activiti-rest-5.16.jar
Binary file not shown.
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/activiti-spring-5.16.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/antlr-2.7.7.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/aopalliance-1.0.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/asm-3.3.1.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/aspectjrt-1.6.9.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/aspectjweaver-1.6.9.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/batik-anim-1.7.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/batik-awt-util-1.7.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/batik-bridge-1.7.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/batik-codec-1.7.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/batik-css-1.7.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/batik-dom-1.7.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/batik-ext-1.7.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/batik-gvt-1.7.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/batik-js-1.7.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/batik-parser-1.7.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/batik-script-1.7.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/batik-svg-dom-1.7.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/batik-svggen-1.7.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/batik-transcoder-1.7.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/batik-util-1.7.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/batik-xml-1.7.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/cglib-2.2.2.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/commons-dbcp-1.4.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/commons-dbcp2-2.0.1.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/commons-email-1.2.jar
Binary file not shown.
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/commons-io-2.4.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/commons-lang3-3.3.2.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/commons-logging-1.1.3.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/commons-pool-1.5.4.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/commons-pool2-2.2.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/cxf-api-2.7.6.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/cxf-rt-core-2.7.6.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/cxf-rt-ws-addr-2.7.6.jar
Binary file not shown.
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/dbunit-2.4.8.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/dom4j-1.6.1.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/fop-0.94.jar
Binary file not shown.
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/groovy-all-2.1.3.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/guava-17.0.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/h2-1.4.180.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/imgscalr-lib-4.2.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/jackson-core-2.2.3.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/javaGeom-0.11.1.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/javassist-3.15.0-GA.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/jaxb-api-2.1.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/jaxb-impl-2.1.7.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/jaxb-xjc-2.1.7.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/jboss-logging-3.1.0.GA.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/jcl-over-slf4j-1.7.5.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/jgraphx-1.10.4.1.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/jgroups-3.0.13.Final.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/joda-time-2.1.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/jodd-3.3.2.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/jstl-1.2.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/junit-4.10.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/log4j-1.2.17.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/mail-1.4.1.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/mybatis-3.2.5.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/neethi-3.0.2.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/org.restlet-2.2.1.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/servlet-api-2.5.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/slf4j-api-1.7.5.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/slf4j-log4j12-1.7.5.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/snakeyaml-1.13.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/stax-api-1.0-2.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/stax2-api-3.1.1.jar
Binary file not shown.
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/wsdl4j-1.6.3.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/xercesImpl-2.10.0.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/xml-apis-1.3.04.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/xml-apis-ext-1.3.04.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/xml-resolver-1.2.jar
Binary file not shown.
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/xmlschema-core-2.0.3.jar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:p="http://www.springframework.org/schema/p" xmlns:context="http://www.springframework.org/schema/context"
xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:util="http://www.springframework.org/schema/util"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:mvc="http://www.springframework.org/schema/mvc"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd">

<!-- 自动扫描且只扫描@Controller -->
Expand All @@ -25,14 +24,6 @@
<property name="suffix" value=".jsp" />
</bean>

<bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter"
p:messageConverters-ref="messageConverters"></bean>

<util:list id="messageConverters">
<bean class="org.springframework.http.converter.BufferedImageHttpMessageConverter" />
<bean class="org.springframework.http.converter.ByteArrayHttpMessageConverter" />
<bean class="org.springframework.http.converter.StringHttpMessageConverter" />
<bean class="org.springframework.http.converter.json.MappingJacksonHttpMessageConverter" />
</util:list>

</beans>
<!-- 支持上传文件 -->
<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver" />
</beans>
Loading