diff --git a/.classpath b/.classpath index 895ca95f49..1f93580104 100644 --- a/.classpath +++ b/.classpath @@ -1,22 +1,15 @@ - - - - - - - + + + + - + - - - - - - + + diff --git a/.gitignore b/.gitignore index 9a016de535..0161785e27 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/.project b/.project index 1651f78ac4..86d722d27c 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - kft-activiti-demo + kft-activiti-demo-no-maven @@ -10,39 +10,27 @@ - - org.eclipse.wst.common.project.facet.core.builder - - - org.eclipse.jdt.core.javabuilder - org.eclipse.wst.validation.validationbuilder - - - - - org.maven.ide.eclipse.maven2Builder + org.eclipse.wst.common.project.facet.core.builder - org.eclipse.m2e.core.maven2Builder + org.eclipse.wst.validation.validationbuilder - org.eclipse.m2e.core.maven2Nature org.eclipse.jem.workbench.JavaEMFNature org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jdt.core.javanature - org.maven.ide.eclipse.maven2Nature org.eclipse.wst.common.project.facet.core.nature + org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope index f40dd98e2d..3a28de0c79 100644 --- a/.settings/.jsdtscope +++ b/.settings/.jsdtscope @@ -1,11 +1,12 @@ - - - - - - - - - - - + + + + + + + + + + + + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 94f1282498..0000000000 --- a/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding//src/test/resources=UTF-8 -encoding/=UTF-8 -encoding/rebel.xml=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 6cf1c72516..c537b63063 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb..0000000000 --- a/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index e2c663385f..db5263a78b 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,12 +1,11 @@ - - - - - - - - - + + + + + + + + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index 1cc0acd13a..0c5ff153f9 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,9 +1,10 @@ - + - + + diff --git a/.settings/org.eclipse.wst.css.core.prefs b/.settings/org.eclipse.wst.css.core.prefs deleted file mode 100644 index 29110a7f58..0000000000 --- a/.settings/org.eclipse.wst.css.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Jun 29 09:58:22 CST 2010 -css-profile/=org.eclipse.wst.css.core.cssprofile.css2 -eclipse.preferences.version=1 diff --git a/.settings/org.eclipse.wst.html.core.prefs b/.settings/org.eclipse.wst.html.core.prefs deleted file mode 100644 index b824cdaf51..0000000000 --- a/.settings/org.eclipse.wst.html.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Jun 29 09:58:22 CST 2010 -document-type/=-//W3C//DTD XHTML 1.0 Transitional//EN -eclipse.preferences.version=1 diff --git a/.settings/org.eclipse.wst.ws.service.policy.prefs b/.settings/org.eclipse.wst.ws.service.policy.prefs deleted file mode 100644 index 8b163325cb..0000000000 --- a/.settings/org.eclipse.wst.ws.service.policy.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Jun 08 21:20:29 CST 2010 -eclipse.preferences.version=1 -org.eclipse.wst.ws.service.policy.projectEnabled=false diff --git a/.settings/org.maven.ide.eclipse.prefs b/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 5fed4cf5ae..0000000000 --- a/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,8 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/README.md b/README.md index 89f9a5b2cb..7ff7dbee6c 100644 --- a/README.md +++ b/README.md @@ -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) \ No newline at end of file +![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 diff --git a/WebContent/META-INF/MANIFEST.MF b/WebContent/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..5e9495128c --- /dev/null +++ b/WebContent/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + diff --git a/src/main/webapp/WEB-INF/decorators.xml b/WebContent/WEB-INF/decorators.xml similarity index 100% rename from src/main/webapp/WEB-INF/decorators.xml rename to WebContent/WEB-INF/decorators.xml diff --git a/WebContent/WEB-INF/lib/activation-1.1.jar b/WebContent/WEB-INF/lib/activation-1.1.jar new file mode 100644 index 0000000000..53f82a1c4c Binary files /dev/null and b/WebContent/WEB-INF/lib/activation-1.1.jar differ diff --git a/WebContent/WEB-INF/lib/activiti-bpmn-converter-5.16.jar b/WebContent/WEB-INF/lib/activiti-bpmn-converter-5.16.jar new file mode 100644 index 0000000000..d0ae0534bd Binary files /dev/null and b/WebContent/WEB-INF/lib/activiti-bpmn-converter-5.16.jar differ diff --git a/WebContent/WEB-INF/lib/activiti-bpmn-layout-5.16.jar b/WebContent/WEB-INF/lib/activiti-bpmn-layout-5.16.jar new file mode 100644 index 0000000000..a935531649 Binary files /dev/null and b/WebContent/WEB-INF/lib/activiti-bpmn-layout-5.16.jar differ diff --git a/WebContent/WEB-INF/lib/activiti-bpmn-model-5.16.jar b/WebContent/WEB-INF/lib/activiti-bpmn-model-5.16.jar new file mode 100644 index 0000000000..730584e144 Binary files /dev/null and b/WebContent/WEB-INF/lib/activiti-bpmn-model-5.16.jar differ diff --git a/WebContent/WEB-INF/lib/activiti-common-rest-5.16.jar b/WebContent/WEB-INF/lib/activiti-common-rest-5.16.jar new file mode 100644 index 0000000000..a43f8d9ec9 Binary files /dev/null and b/WebContent/WEB-INF/lib/activiti-common-rest-5.16.jar differ diff --git a/WebContent/WEB-INF/lib/activiti-crystalball-5.16.jar b/WebContent/WEB-INF/lib/activiti-crystalball-5.16.jar new file mode 100644 index 0000000000..94d2b94797 Binary files /dev/null and b/WebContent/WEB-INF/lib/activiti-crystalball-5.16.jar differ diff --git a/WebContent/WEB-INF/lib/activiti-cxf-5.16.jar b/WebContent/WEB-INF/lib/activiti-cxf-5.16.jar new file mode 100644 index 0000000000..011a72c2c5 Binary files /dev/null and b/WebContent/WEB-INF/lib/activiti-cxf-5.16.jar differ diff --git a/WebContent/WEB-INF/lib/activiti-diagram-rest-5.16.jar b/WebContent/WEB-INF/lib/activiti-diagram-rest-5.16.jar new file mode 100644 index 0000000000..9948748d1a Binary files /dev/null and b/WebContent/WEB-INF/lib/activiti-diagram-rest-5.16.jar differ diff --git a/WebContent/WEB-INF/lib/activiti-engine-5.16.jar b/WebContent/WEB-INF/lib/activiti-engine-5.16.jar new file mode 100644 index 0000000000..b3b39efe35 Binary files /dev/null and b/WebContent/WEB-INF/lib/activiti-engine-5.16.jar differ diff --git a/WebContent/WEB-INF/lib/activiti-explorer-5.16.jar b/WebContent/WEB-INF/lib/activiti-explorer-5.16.jar new file mode 100644 index 0000000000..940814f726 Binary files /dev/null and b/WebContent/WEB-INF/lib/activiti-explorer-5.16.jar differ diff --git a/WebContent/WEB-INF/lib/activiti-image-generator-5.16.jar b/WebContent/WEB-INF/lib/activiti-image-generator-5.16.jar new file mode 100644 index 0000000000..c597f46742 Binary files /dev/null and b/WebContent/WEB-INF/lib/activiti-image-generator-5.16.jar differ diff --git a/WebContent/WEB-INF/lib/activiti-json-converter-5.16.jar b/WebContent/WEB-INF/lib/activiti-json-converter-5.16.jar new file mode 100644 index 0000000000..1428d8c18f Binary files /dev/null and b/WebContent/WEB-INF/lib/activiti-json-converter-5.16.jar differ diff --git a/WebContent/WEB-INF/lib/activiti-modeler-5.16.jar b/WebContent/WEB-INF/lib/activiti-modeler-5.16.jar new file mode 100644 index 0000000000..e04f343d05 Binary files /dev/null and b/WebContent/WEB-INF/lib/activiti-modeler-5.16.jar differ diff --git a/WebContent/WEB-INF/lib/activiti-process-validation-5.16.jar b/WebContent/WEB-INF/lib/activiti-process-validation-5.16.jar new file mode 100644 index 0000000000..02dbf6f3fc Binary files /dev/null and b/WebContent/WEB-INF/lib/activiti-process-validation-5.16.jar differ diff --git a/WebContent/WEB-INF/lib/activiti-rest-5.16.jar b/WebContent/WEB-INF/lib/activiti-rest-5.16.jar new file mode 100644 index 0000000000..86330b85ce Binary files /dev/null and b/WebContent/WEB-INF/lib/activiti-rest-5.16.jar differ diff --git a/WebContent/WEB-INF/lib/activiti-simple-workflow-5.16.jar b/WebContent/WEB-INF/lib/activiti-simple-workflow-5.16.jar new file mode 100644 index 0000000000..1197a63d10 Binary files /dev/null and b/WebContent/WEB-INF/lib/activiti-simple-workflow-5.16.jar differ diff --git a/WebContent/WEB-INF/lib/activiti-spring-5.16.jar b/WebContent/WEB-INF/lib/activiti-spring-5.16.jar new file mode 100644 index 0000000000..23865824c9 Binary files /dev/null and b/WebContent/WEB-INF/lib/activiti-spring-5.16.jar differ diff --git a/WebContent/WEB-INF/lib/antlr-2.7.7.jar b/WebContent/WEB-INF/lib/antlr-2.7.7.jar new file mode 100644 index 0000000000..5e5f14b355 Binary files /dev/null and b/WebContent/WEB-INF/lib/antlr-2.7.7.jar differ diff --git a/WebContent/WEB-INF/lib/aopalliance-1.0.jar b/WebContent/WEB-INF/lib/aopalliance-1.0.jar new file mode 100644 index 0000000000..578b1a0c35 Binary files /dev/null and b/WebContent/WEB-INF/lib/aopalliance-1.0.jar differ diff --git a/WebContent/WEB-INF/lib/asm-3.3.1.jar b/WebContent/WEB-INF/lib/asm-3.3.1.jar new file mode 100644 index 0000000000..f50f03f361 Binary files /dev/null and b/WebContent/WEB-INF/lib/asm-3.3.1.jar differ diff --git a/WebContent/WEB-INF/lib/aspectjrt-1.6.9.jar b/WebContent/WEB-INF/lib/aspectjrt-1.6.9.jar new file mode 100644 index 0000000000..a7efd37cd1 Binary files /dev/null and b/WebContent/WEB-INF/lib/aspectjrt-1.6.9.jar differ diff --git a/WebContent/WEB-INF/lib/aspectjweaver-1.6.9.jar b/WebContent/WEB-INF/lib/aspectjweaver-1.6.9.jar new file mode 100644 index 0000000000..51fc8be122 Binary files /dev/null and b/WebContent/WEB-INF/lib/aspectjweaver-1.6.9.jar differ diff --git a/WebContent/WEB-INF/lib/avalon-framework-api-4.3.1.jar b/WebContent/WEB-INF/lib/avalon-framework-api-4.3.1.jar new file mode 100644 index 0000000000..b60000b34b Binary files /dev/null and b/WebContent/WEB-INF/lib/avalon-framework-api-4.3.1.jar differ diff --git a/WebContent/WEB-INF/lib/avalon-framework-impl-4.3.1.jar b/WebContent/WEB-INF/lib/avalon-framework-impl-4.3.1.jar new file mode 100644 index 0000000000..d56e988114 Binary files /dev/null and b/WebContent/WEB-INF/lib/avalon-framework-impl-4.3.1.jar differ diff --git a/WebContent/WEB-INF/lib/batik-anim-1.7.jar b/WebContent/WEB-INF/lib/batik-anim-1.7.jar new file mode 100644 index 0000000000..2a150b2bcc Binary files /dev/null and b/WebContent/WEB-INF/lib/batik-anim-1.7.jar differ diff --git a/WebContent/WEB-INF/lib/batik-awt-util-1.7.jar b/WebContent/WEB-INF/lib/batik-awt-util-1.7.jar new file mode 100644 index 0000000000..f83b5bd48b Binary files /dev/null and b/WebContent/WEB-INF/lib/batik-awt-util-1.7.jar differ diff --git a/WebContent/WEB-INF/lib/batik-bridge-1.7.jar b/WebContent/WEB-INF/lib/batik-bridge-1.7.jar new file mode 100644 index 0000000000..872cf27a67 Binary files /dev/null and b/WebContent/WEB-INF/lib/batik-bridge-1.7.jar differ diff --git a/WebContent/WEB-INF/lib/batik-codec-1.7.jar b/WebContent/WEB-INF/lib/batik-codec-1.7.jar new file mode 100644 index 0000000000..7cd907efb3 Binary files /dev/null and b/WebContent/WEB-INF/lib/batik-codec-1.7.jar differ diff --git a/WebContent/WEB-INF/lib/batik-css-1.7.jar b/WebContent/WEB-INF/lib/batik-css-1.7.jar new file mode 100644 index 0000000000..ef3013d071 Binary files /dev/null and b/WebContent/WEB-INF/lib/batik-css-1.7.jar differ diff --git a/WebContent/WEB-INF/lib/batik-dom-1.7.jar b/WebContent/WEB-INF/lib/batik-dom-1.7.jar new file mode 100644 index 0000000000..0206475472 Binary files /dev/null and b/WebContent/WEB-INF/lib/batik-dom-1.7.jar differ diff --git a/WebContent/WEB-INF/lib/batik-ext-1.7.jar b/WebContent/WEB-INF/lib/batik-ext-1.7.jar new file mode 100644 index 0000000000..57fb273276 Binary files /dev/null and b/WebContent/WEB-INF/lib/batik-ext-1.7.jar differ diff --git a/WebContent/WEB-INF/lib/batik-gvt-1.7.jar b/WebContent/WEB-INF/lib/batik-gvt-1.7.jar new file mode 100644 index 0000000000..9aa9686872 Binary files /dev/null and b/WebContent/WEB-INF/lib/batik-gvt-1.7.jar differ diff --git a/WebContent/WEB-INF/lib/batik-js-1.7.jar b/WebContent/WEB-INF/lib/batik-js-1.7.jar new file mode 100644 index 0000000000..ccad3cc1bf Binary files /dev/null and b/WebContent/WEB-INF/lib/batik-js-1.7.jar differ diff --git a/WebContent/WEB-INF/lib/batik-parser-1.7.jar b/WebContent/WEB-INF/lib/batik-parser-1.7.jar new file mode 100644 index 0000000000..b84ad36e00 Binary files /dev/null and b/WebContent/WEB-INF/lib/batik-parser-1.7.jar differ diff --git a/WebContent/WEB-INF/lib/batik-script-1.7.jar b/WebContent/WEB-INF/lib/batik-script-1.7.jar new file mode 100644 index 0000000000..a684f1c753 Binary files /dev/null and b/WebContent/WEB-INF/lib/batik-script-1.7.jar differ diff --git a/WebContent/WEB-INF/lib/batik-svg-dom-1.7.jar b/WebContent/WEB-INF/lib/batik-svg-dom-1.7.jar new file mode 100644 index 0000000000..463d0e012a Binary files /dev/null and b/WebContent/WEB-INF/lib/batik-svg-dom-1.7.jar differ diff --git a/WebContent/WEB-INF/lib/batik-svggen-1.7.jar b/WebContent/WEB-INF/lib/batik-svggen-1.7.jar new file mode 100644 index 0000000000..0feaf60524 Binary files /dev/null and b/WebContent/WEB-INF/lib/batik-svggen-1.7.jar differ diff --git a/WebContent/WEB-INF/lib/batik-transcoder-1.7.jar b/WebContent/WEB-INF/lib/batik-transcoder-1.7.jar new file mode 100644 index 0000000000..3934ed0a99 Binary files /dev/null and b/WebContent/WEB-INF/lib/batik-transcoder-1.7.jar differ diff --git a/WebContent/WEB-INF/lib/batik-util-1.7.jar b/WebContent/WEB-INF/lib/batik-util-1.7.jar new file mode 100644 index 0000000000..c50d1ff29e Binary files /dev/null and b/WebContent/WEB-INF/lib/batik-util-1.7.jar differ diff --git a/WebContent/WEB-INF/lib/batik-xml-1.7.jar b/WebContent/WEB-INF/lib/batik-xml-1.7.jar new file mode 100644 index 0000000000..45ba1570a5 Binary files /dev/null and b/WebContent/WEB-INF/lib/batik-xml-1.7.jar differ diff --git a/WebContent/WEB-INF/lib/cglib-2.2.2.jar b/WebContent/WEB-INF/lib/cglib-2.2.2.jar new file mode 100644 index 0000000000..564b9f8834 Binary files /dev/null and b/WebContent/WEB-INF/lib/cglib-2.2.2.jar differ diff --git a/WebContent/WEB-INF/lib/commons-beanutils-1.8.3.jar b/WebContent/WEB-INF/lib/commons-beanutils-1.8.3.jar new file mode 100644 index 0000000000..218510bc5d Binary files /dev/null and b/WebContent/WEB-INF/lib/commons-beanutils-1.8.3.jar differ diff --git a/WebContent/WEB-INF/lib/commons-collections-3.2.1.jar b/WebContent/WEB-INF/lib/commons-collections-3.2.1.jar new file mode 100644 index 0000000000..c35fa1fee1 Binary files /dev/null and b/WebContent/WEB-INF/lib/commons-collections-3.2.1.jar differ diff --git a/WebContent/WEB-INF/lib/commons-dbcp-1.4.jar b/WebContent/WEB-INF/lib/commons-dbcp-1.4.jar new file mode 100644 index 0000000000..c4c1c4f286 Binary files /dev/null and b/WebContent/WEB-INF/lib/commons-dbcp-1.4.jar differ diff --git a/WebContent/WEB-INF/lib/commons-dbcp2-2.0.1.jar b/WebContent/WEB-INF/lib/commons-dbcp2-2.0.1.jar new file mode 100644 index 0000000000..5e8d142dd7 Binary files /dev/null and b/WebContent/WEB-INF/lib/commons-dbcp2-2.0.1.jar differ diff --git a/WebContent/WEB-INF/lib/commons-email-1.2.jar b/WebContent/WEB-INF/lib/commons-email-1.2.jar new file mode 100644 index 0000000000..f085975942 Binary files /dev/null and b/WebContent/WEB-INF/lib/commons-email-1.2.jar differ diff --git a/WebContent/WEB-INF/lib/commons-fileupload-1.2.2.jar b/WebContent/WEB-INF/lib/commons-fileupload-1.2.2.jar new file mode 100644 index 0000000000..131f1924e0 Binary files /dev/null and b/WebContent/WEB-INF/lib/commons-fileupload-1.2.2.jar differ diff --git a/WebContent/WEB-INF/lib/commons-io-2.4.jar b/WebContent/WEB-INF/lib/commons-io-2.4.jar new file mode 100644 index 0000000000..90035a4fe0 Binary files /dev/null and b/WebContent/WEB-INF/lib/commons-io-2.4.jar differ diff --git a/WebContent/WEB-INF/lib/commons-lang3-3.3.2.jar b/WebContent/WEB-INF/lib/commons-lang3-3.3.2.jar new file mode 100644 index 0000000000..2ce08ae99d Binary files /dev/null and b/WebContent/WEB-INF/lib/commons-lang3-3.3.2.jar differ diff --git a/WebContent/WEB-INF/lib/commons-logging-1.1.3.jar b/WebContent/WEB-INF/lib/commons-logging-1.1.3.jar new file mode 100644 index 0000000000..ab5125407a Binary files /dev/null and b/WebContent/WEB-INF/lib/commons-logging-1.1.3.jar differ diff --git a/WebContent/WEB-INF/lib/commons-pool-1.5.4.jar b/WebContent/WEB-INF/lib/commons-pool-1.5.4.jar new file mode 100644 index 0000000000..43edf99635 Binary files /dev/null and b/WebContent/WEB-INF/lib/commons-pool-1.5.4.jar differ diff --git a/WebContent/WEB-INF/lib/commons-pool2-2.2.jar b/WebContent/WEB-INF/lib/commons-pool2-2.2.jar new file mode 100644 index 0000000000..6a3eb38acb Binary files /dev/null and b/WebContent/WEB-INF/lib/commons-pool2-2.2.jar differ diff --git a/WebContent/WEB-INF/lib/cxf-api-2.7.6.jar b/WebContent/WEB-INF/lib/cxf-api-2.7.6.jar new file mode 100644 index 0000000000..66f0573544 Binary files /dev/null and b/WebContent/WEB-INF/lib/cxf-api-2.7.6.jar differ diff --git a/WebContent/WEB-INF/lib/cxf-rt-bindings-soap-2.7.6.jar b/WebContent/WEB-INF/lib/cxf-rt-bindings-soap-2.7.6.jar new file mode 100644 index 0000000000..838e1c3f07 Binary files /dev/null and b/WebContent/WEB-INF/lib/cxf-rt-bindings-soap-2.7.6.jar differ diff --git a/WebContent/WEB-INF/lib/cxf-rt-bindings-xml-2.7.6.jar b/WebContent/WEB-INF/lib/cxf-rt-bindings-xml-2.7.6.jar new file mode 100644 index 0000000000..46a47a125c Binary files /dev/null and b/WebContent/WEB-INF/lib/cxf-rt-bindings-xml-2.7.6.jar differ diff --git a/WebContent/WEB-INF/lib/cxf-rt-core-2.7.6.jar b/WebContent/WEB-INF/lib/cxf-rt-core-2.7.6.jar new file mode 100644 index 0000000000..b3edef2a45 Binary files /dev/null and b/WebContent/WEB-INF/lib/cxf-rt-core-2.7.6.jar differ diff --git a/WebContent/WEB-INF/lib/cxf-rt-databinding-jaxb-2.7.6.jar b/WebContent/WEB-INF/lib/cxf-rt-databinding-jaxb-2.7.6.jar new file mode 100644 index 0000000000..b2c86ce8a2 Binary files /dev/null and b/WebContent/WEB-INF/lib/cxf-rt-databinding-jaxb-2.7.6.jar differ diff --git a/WebContent/WEB-INF/lib/cxf-rt-frontend-jaxws-2.7.6.jar b/WebContent/WEB-INF/lib/cxf-rt-frontend-jaxws-2.7.6.jar new file mode 100644 index 0000000000..4ebef3edee Binary files /dev/null and b/WebContent/WEB-INF/lib/cxf-rt-frontend-jaxws-2.7.6.jar differ diff --git a/WebContent/WEB-INF/lib/cxf-rt-frontend-simple-2.7.6.jar b/WebContent/WEB-INF/lib/cxf-rt-frontend-simple-2.7.6.jar new file mode 100644 index 0000000000..b453c35116 Binary files /dev/null and b/WebContent/WEB-INF/lib/cxf-rt-frontend-simple-2.7.6.jar differ diff --git a/WebContent/WEB-INF/lib/cxf-rt-transports-http-2.7.6.jar b/WebContent/WEB-INF/lib/cxf-rt-transports-http-2.7.6.jar new file mode 100644 index 0000000000..fd555b0d6a Binary files /dev/null and b/WebContent/WEB-INF/lib/cxf-rt-transports-http-2.7.6.jar differ diff --git a/WebContent/WEB-INF/lib/cxf-rt-ws-addr-2.7.6.jar b/WebContent/WEB-INF/lib/cxf-rt-ws-addr-2.7.6.jar new file mode 100644 index 0000000000..ee73461f0c Binary files /dev/null and b/WebContent/WEB-INF/lib/cxf-rt-ws-addr-2.7.6.jar differ diff --git a/WebContent/WEB-INF/lib/cxf-rt-ws-policy-2.7.6.jar b/WebContent/WEB-INF/lib/cxf-rt-ws-policy-2.7.6.jar new file mode 100644 index 0000000000..4cc8789bb2 Binary files /dev/null and b/WebContent/WEB-INF/lib/cxf-rt-ws-policy-2.7.6.jar differ diff --git a/WebContent/WEB-INF/lib/dbunit-2.4.8.jar b/WebContent/WEB-INF/lib/dbunit-2.4.8.jar new file mode 100644 index 0000000000..7bf8dbc48f Binary files /dev/null and b/WebContent/WEB-INF/lib/dbunit-2.4.8.jar differ diff --git a/WebContent/WEB-INF/lib/dom4j-1.6.1.jar b/WebContent/WEB-INF/lib/dom4j-1.6.1.jar new file mode 100644 index 0000000000..c8c4dbb92d Binary files /dev/null and b/WebContent/WEB-INF/lib/dom4j-1.6.1.jar differ diff --git a/WebContent/WEB-INF/lib/fop-0.94.jar b/WebContent/WEB-INF/lib/fop-0.94.jar new file mode 100644 index 0000000000..0000369875 Binary files /dev/null and b/WebContent/WEB-INF/lib/fop-0.94.jar differ diff --git a/WebContent/WEB-INF/lib/geronimo-javamail_1.4_spec-1.7.1.jar b/WebContent/WEB-INF/lib/geronimo-javamail_1.4_spec-1.7.1.jar new file mode 100644 index 0000000000..eaa1c4d5d1 Binary files /dev/null and b/WebContent/WEB-INF/lib/geronimo-javamail_1.4_spec-1.7.1.jar differ diff --git a/WebContent/WEB-INF/lib/groovy-all-2.1.3.jar b/WebContent/WEB-INF/lib/groovy-all-2.1.3.jar new file mode 100644 index 0000000000..9e434a5f0c Binary files /dev/null and b/WebContent/WEB-INF/lib/groovy-all-2.1.3.jar differ diff --git a/WebContent/WEB-INF/lib/guava-17.0.jar b/WebContent/WEB-INF/lib/guava-17.0.jar new file mode 100644 index 0000000000..661fc7473f Binary files /dev/null and b/WebContent/WEB-INF/lib/guava-17.0.jar differ diff --git a/WebContent/WEB-INF/lib/h2-1.4.180.jar b/WebContent/WEB-INF/lib/h2-1.4.180.jar new file mode 100644 index 0000000000..0d1410eb87 Binary files /dev/null and b/WebContent/WEB-INF/lib/h2-1.4.180.jar differ diff --git a/WebContent/WEB-INF/lib/hibernate-commons-annotations-4.0.2.Final.jar b/WebContent/WEB-INF/lib/hibernate-commons-annotations-4.0.2.Final.jar new file mode 100644 index 0000000000..c26aba4ed5 Binary files /dev/null and b/WebContent/WEB-INF/lib/hibernate-commons-annotations-4.0.2.Final.jar differ diff --git a/WebContent/WEB-INF/lib/hibernate-core-4.2.5.Final.jar b/WebContent/WEB-INF/lib/hibernate-core-4.2.5.Final.jar new file mode 100644 index 0000000000..fae9fe98ef Binary files /dev/null and b/WebContent/WEB-INF/lib/hibernate-core-4.2.5.Final.jar differ diff --git a/WebContent/WEB-INF/lib/hibernate-entitymanager-4.2.5.Final.jar b/WebContent/WEB-INF/lib/hibernate-entitymanager-4.2.5.Final.jar new file mode 100644 index 0000000000..b51f674a10 Binary files /dev/null and b/WebContent/WEB-INF/lib/hibernate-entitymanager-4.2.5.Final.jar differ diff --git a/WebContent/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar b/WebContent/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar new file mode 100644 index 0000000000..1e9f71b8c1 Binary files /dev/null and b/WebContent/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar differ diff --git a/WebContent/WEB-INF/lib/imgscalr-lib-4.2.jar b/WebContent/WEB-INF/lib/imgscalr-lib-4.2.jar new file mode 100644 index 0000000000..e1cc9b98ce Binary files /dev/null and b/WebContent/WEB-INF/lib/imgscalr-lib-4.2.jar differ diff --git a/WebContent/WEB-INF/lib/infinispan-core-5.1.7.Final.jar b/WebContent/WEB-INF/lib/infinispan-core-5.1.7.Final.jar new file mode 100644 index 0000000000..5678bdb5a9 Binary files /dev/null and b/WebContent/WEB-INF/lib/infinispan-core-5.1.7.Final.jar differ diff --git a/WebContent/WEB-INF/lib/jackson-annotations-2.2.3.jar b/WebContent/WEB-INF/lib/jackson-annotations-2.2.3.jar new file mode 100644 index 0000000000..b62c87d7ed Binary files /dev/null and b/WebContent/WEB-INF/lib/jackson-annotations-2.2.3.jar differ diff --git a/WebContent/WEB-INF/lib/jackson-core-2.2.3.jar b/WebContent/WEB-INF/lib/jackson-core-2.2.3.jar new file mode 100644 index 0000000000..24318a4640 Binary files /dev/null and b/WebContent/WEB-INF/lib/jackson-core-2.2.3.jar differ diff --git a/WebContent/WEB-INF/lib/jackson-core-asl-1.9.7.jar b/WebContent/WEB-INF/lib/jackson-core-asl-1.9.7.jar new file mode 100644 index 0000000000..ea5f586fe4 Binary files /dev/null and b/WebContent/WEB-INF/lib/jackson-core-asl-1.9.7.jar differ diff --git a/WebContent/WEB-INF/lib/jackson-databind-2.2.3.jar b/WebContent/WEB-INF/lib/jackson-databind-2.2.3.jar new file mode 100644 index 0000000000..8545084786 Binary files /dev/null and b/WebContent/WEB-INF/lib/jackson-databind-2.2.3.jar differ diff --git a/WebContent/WEB-INF/lib/jackson-dataformat-csv-2.2.3.jar b/WebContent/WEB-INF/lib/jackson-dataformat-csv-2.2.3.jar new file mode 100644 index 0000000000..7a46918a6a Binary files /dev/null and b/WebContent/WEB-INF/lib/jackson-dataformat-csv-2.2.3.jar differ diff --git a/WebContent/WEB-INF/lib/jackson-dataformat-smile-2.2.3.jar b/WebContent/WEB-INF/lib/jackson-dataformat-smile-2.2.3.jar new file mode 100644 index 0000000000..0e4986a3dd Binary files /dev/null and b/WebContent/WEB-INF/lib/jackson-dataformat-smile-2.2.3.jar differ diff --git a/WebContent/WEB-INF/lib/jackson-dataformat-xml-2.2.3.jar b/WebContent/WEB-INF/lib/jackson-dataformat-xml-2.2.3.jar new file mode 100644 index 0000000000..34067f1e2f Binary files /dev/null and b/WebContent/WEB-INF/lib/jackson-dataformat-xml-2.2.3.jar differ diff --git a/WebContent/WEB-INF/lib/jackson-dataformat-yaml-2.2.3.jar b/WebContent/WEB-INF/lib/jackson-dataformat-yaml-2.2.3.jar new file mode 100644 index 0000000000..e1efd310f5 Binary files /dev/null and b/WebContent/WEB-INF/lib/jackson-dataformat-yaml-2.2.3.jar differ diff --git a/WebContent/WEB-INF/lib/jackson-mapper-asl-1.9.7.jar b/WebContent/WEB-INF/lib/jackson-mapper-asl-1.9.7.jar new file mode 100644 index 0000000000..21559fb57a Binary files /dev/null and b/WebContent/WEB-INF/lib/jackson-mapper-asl-1.9.7.jar differ diff --git a/WebContent/WEB-INF/lib/jackson-module-jaxb-annotations-2.2.3.jar b/WebContent/WEB-INF/lib/jackson-module-jaxb-annotations-2.2.3.jar new file mode 100644 index 0000000000..946de9f68b Binary files /dev/null and b/WebContent/WEB-INF/lib/jackson-module-jaxb-annotations-2.2.3.jar differ diff --git a/WebContent/WEB-INF/lib/java-uuid-generator-3.1.3.jar b/WebContent/WEB-INF/lib/java-uuid-generator-3.1.3.jar new file mode 100644 index 0000000000..d72d2e3b9d Binary files /dev/null and b/WebContent/WEB-INF/lib/java-uuid-generator-3.1.3.jar differ diff --git a/WebContent/WEB-INF/lib/javaGeom-0.11.1.jar b/WebContent/WEB-INF/lib/javaGeom-0.11.1.jar new file mode 100644 index 0000000000..4689a5497f Binary files /dev/null and b/WebContent/WEB-INF/lib/javaGeom-0.11.1.jar differ diff --git a/WebContent/WEB-INF/lib/javassist-3.15.0-GA.jar b/WebContent/WEB-INF/lib/javassist-3.15.0-GA.jar new file mode 100644 index 0000000000..5af8eaeb25 Binary files /dev/null and b/WebContent/WEB-INF/lib/javassist-3.15.0-GA.jar differ diff --git a/WebContent/WEB-INF/lib/jaxb-api-2.1.jar b/WebContent/WEB-INF/lib/jaxb-api-2.1.jar new file mode 100644 index 0000000000..be3d6dca2f Binary files /dev/null and b/WebContent/WEB-INF/lib/jaxb-api-2.1.jar differ diff --git a/WebContent/WEB-INF/lib/jaxb-impl-2.1.7.jar b/WebContent/WEB-INF/lib/jaxb-impl-2.1.7.jar new file mode 100644 index 0000000000..034c158670 Binary files /dev/null and b/WebContent/WEB-INF/lib/jaxb-impl-2.1.7.jar differ diff --git a/WebContent/WEB-INF/lib/jaxb-xjc-2.1.7.jar b/WebContent/WEB-INF/lib/jaxb-xjc-2.1.7.jar new file mode 100644 index 0000000000..ba2ec468ed Binary files /dev/null and b/WebContent/WEB-INF/lib/jaxb-xjc-2.1.7.jar differ diff --git a/WebContent/WEB-INF/lib/jboss-logging-3.1.0.GA.jar b/WebContent/WEB-INF/lib/jboss-logging-3.1.0.GA.jar new file mode 100644 index 0000000000..72113b0f84 Binary files /dev/null and b/WebContent/WEB-INF/lib/jboss-logging-3.1.0.GA.jar differ diff --git a/WebContent/WEB-INF/lib/jboss-marshalling-1.3.11.GA.jar b/WebContent/WEB-INF/lib/jboss-marshalling-1.3.11.GA.jar new file mode 100644 index 0000000000..6186c257b6 Binary files /dev/null and b/WebContent/WEB-INF/lib/jboss-marshalling-1.3.11.GA.jar differ diff --git a/WebContent/WEB-INF/lib/jboss-marshalling-river-1.3.11.GA.jar b/WebContent/WEB-INF/lib/jboss-marshalling-river-1.3.11.GA.jar new file mode 100644 index 0000000000..f655db8912 Binary files /dev/null and b/WebContent/WEB-INF/lib/jboss-marshalling-river-1.3.11.GA.jar differ diff --git a/WebContent/WEB-INF/lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar b/WebContent/WEB-INF/lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar new file mode 100644 index 0000000000..b3bf81f60f Binary files /dev/null and b/WebContent/WEB-INF/lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar differ diff --git a/WebContent/WEB-INF/lib/jcl-over-slf4j-1.7.5.jar b/WebContent/WEB-INF/lib/jcl-over-slf4j-1.7.5.jar new file mode 100644 index 0000000000..90153b0696 Binary files /dev/null and b/WebContent/WEB-INF/lib/jcl-over-slf4j-1.7.5.jar differ diff --git a/WebContent/WEB-INF/lib/jgraphx-1.10.4.1.jar b/WebContent/WEB-INF/lib/jgraphx-1.10.4.1.jar new file mode 100644 index 0000000000..a85757d631 Binary files /dev/null and b/WebContent/WEB-INF/lib/jgraphx-1.10.4.1.jar differ diff --git a/WebContent/WEB-INF/lib/jgroups-3.0.13.Final.jar b/WebContent/WEB-INF/lib/jgroups-3.0.13.Final.jar new file mode 100644 index 0000000000..15b04f1afd Binary files /dev/null and b/WebContent/WEB-INF/lib/jgroups-3.0.13.Final.jar differ diff --git a/WebContent/WEB-INF/lib/joda-time-2.1.jar b/WebContent/WEB-INF/lib/joda-time-2.1.jar new file mode 100644 index 0000000000..b2aca95bbb Binary files /dev/null and b/WebContent/WEB-INF/lib/joda-time-2.1.jar differ diff --git a/WebContent/WEB-INF/lib/jodd-3.3.2.jar b/WebContent/WEB-INF/lib/jodd-3.3.2.jar new file mode 100644 index 0000000000..a6b0374572 Binary files /dev/null and b/WebContent/WEB-INF/lib/jodd-3.3.2.jar differ diff --git a/WebContent/WEB-INF/lib/jstl-1.2.jar b/WebContent/WEB-INF/lib/jstl-1.2.jar new file mode 100644 index 0000000000..0fd275e946 Binary files /dev/null and b/WebContent/WEB-INF/lib/jstl-1.2.jar differ diff --git a/WebContent/WEB-INF/lib/junit-4.10.jar b/WebContent/WEB-INF/lib/junit-4.10.jar new file mode 100644 index 0000000000..954851e67d Binary files /dev/null and b/WebContent/WEB-INF/lib/junit-4.10.jar differ diff --git a/WebContent/WEB-INF/lib/log4j-1.2.17.jar b/WebContent/WEB-INF/lib/log4j-1.2.17.jar new file mode 100644 index 0000000000..1d425cf7d7 Binary files /dev/null and b/WebContent/WEB-INF/lib/log4j-1.2.17.jar differ diff --git a/WebContent/WEB-INF/lib/mail-1.4.1.jar b/WebContent/WEB-INF/lib/mail-1.4.1.jar new file mode 100644 index 0000000000..1d15e793ec Binary files /dev/null and b/WebContent/WEB-INF/lib/mail-1.4.1.jar differ diff --git a/WebContent/WEB-INF/lib/mybatis-3.2.5.jar b/WebContent/WEB-INF/lib/mybatis-3.2.5.jar new file mode 100644 index 0000000000..539b8ada3d Binary files /dev/null and b/WebContent/WEB-INF/lib/mybatis-3.2.5.jar differ diff --git a/WebContent/WEB-INF/lib/neethi-3.0.2.jar b/WebContent/WEB-INF/lib/neethi-3.0.2.jar new file mode 100644 index 0000000000..383efde215 Binary files /dev/null and b/WebContent/WEB-INF/lib/neethi-3.0.2.jar differ diff --git a/WebContent/WEB-INF/lib/org.restlet-2.2.1.jar b/WebContent/WEB-INF/lib/org.restlet-2.2.1.jar new file mode 100644 index 0000000000..291e18d6a7 Binary files /dev/null and b/WebContent/WEB-INF/lib/org.restlet-2.2.1.jar differ diff --git a/WebContent/WEB-INF/lib/org.restlet.ext.fileupload-2.2.1.jar b/WebContent/WEB-INF/lib/org.restlet.ext.fileupload-2.2.1.jar new file mode 100644 index 0000000000..db1a786510 Binary files /dev/null and b/WebContent/WEB-INF/lib/org.restlet.ext.fileupload-2.2.1.jar differ diff --git a/WebContent/WEB-INF/lib/org.restlet.ext.jackson-2.2.1.jar b/WebContent/WEB-INF/lib/org.restlet.ext.jackson-2.2.1.jar new file mode 100644 index 0000000000..c8046394c5 Binary files /dev/null and b/WebContent/WEB-INF/lib/org.restlet.ext.jackson-2.2.1.jar differ diff --git a/WebContent/WEB-INF/lib/org.restlet.ext.servlet-2.2.1.jar b/WebContent/WEB-INF/lib/org.restlet.ext.servlet-2.2.1.jar new file mode 100644 index 0000000000..c225e79186 Binary files /dev/null and b/WebContent/WEB-INF/lib/org.restlet.ext.servlet-2.2.1.jar differ diff --git a/WebContent/WEB-INF/lib/rhq-pluginAnnotations-3.0.4.jar b/WebContent/WEB-INF/lib/rhq-pluginAnnotations-3.0.4.jar new file mode 100644 index 0000000000..98350a3bee Binary files /dev/null and b/WebContent/WEB-INF/lib/rhq-pluginAnnotations-3.0.4.jar differ diff --git a/WebContent/WEB-INF/lib/servlet-api-2.5.jar b/WebContent/WEB-INF/lib/servlet-api-2.5.jar new file mode 100644 index 0000000000..fb52493468 Binary files /dev/null and b/WebContent/WEB-INF/lib/servlet-api-2.5.jar differ diff --git a/WebContent/WEB-INF/lib/slf4j-api-1.7.5.jar b/WebContent/WEB-INF/lib/slf4j-api-1.7.5.jar new file mode 100644 index 0000000000..8f004d3906 Binary files /dev/null and b/WebContent/WEB-INF/lib/slf4j-api-1.7.5.jar differ diff --git a/WebContent/WEB-INF/lib/slf4j-log4j12-1.7.5.jar b/WebContent/WEB-INF/lib/slf4j-log4j12-1.7.5.jar new file mode 100644 index 0000000000..f5298b5e9d Binary files /dev/null and b/WebContent/WEB-INF/lib/slf4j-log4j12-1.7.5.jar differ diff --git a/WebContent/WEB-INF/lib/snakeyaml-1.13.jar b/WebContent/WEB-INF/lib/snakeyaml-1.13.jar new file mode 100644 index 0000000000..453f99fc02 Binary files /dev/null and b/WebContent/WEB-INF/lib/snakeyaml-1.13.jar differ diff --git a/WebContent/WEB-INF/lib/spring-aop-4.0.6.RELEASE.jar b/WebContent/WEB-INF/lib/spring-aop-4.0.6.RELEASE.jar new file mode 100644 index 0000000000..127442c096 Binary files /dev/null and b/WebContent/WEB-INF/lib/spring-aop-4.0.6.RELEASE.jar differ diff --git a/WebContent/WEB-INF/lib/spring-beans-4.0.6.RELEASE.jar b/WebContent/WEB-INF/lib/spring-beans-4.0.6.RELEASE.jar new file mode 100644 index 0000000000..f8ca7a9a6b Binary files /dev/null and b/WebContent/WEB-INF/lib/spring-beans-4.0.6.RELEASE.jar differ diff --git a/WebContent/WEB-INF/lib/spring-context-4.0.6.RELEASE.jar b/WebContent/WEB-INF/lib/spring-context-4.0.6.RELEASE.jar new file mode 100644 index 0000000000..40dcc1cdaf Binary files /dev/null and b/WebContent/WEB-INF/lib/spring-context-4.0.6.RELEASE.jar differ diff --git a/WebContent/WEB-INF/lib/spring-context-support-4.0.6.RELEASE.jar b/WebContent/WEB-INF/lib/spring-context-support-4.0.6.RELEASE.jar new file mode 100644 index 0000000000..3b4a2bb07b Binary files /dev/null and b/WebContent/WEB-INF/lib/spring-context-support-4.0.6.RELEASE.jar differ diff --git a/WebContent/WEB-INF/lib/spring-core-4.0.6.RELEASE.jar b/WebContent/WEB-INF/lib/spring-core-4.0.6.RELEASE.jar new file mode 100644 index 0000000000..977cd369f7 Binary files /dev/null and b/WebContent/WEB-INF/lib/spring-core-4.0.6.RELEASE.jar differ diff --git a/WebContent/WEB-INF/lib/spring-data-commons-1.8.2.RELEASE.jar b/WebContent/WEB-INF/lib/spring-data-commons-1.8.2.RELEASE.jar new file mode 100644 index 0000000000..9812a1a8ad Binary files /dev/null and b/WebContent/WEB-INF/lib/spring-data-commons-1.8.2.RELEASE.jar differ diff --git a/WebContent/WEB-INF/lib/spring-data-jpa-1.6.2.RELEASE.jar b/WebContent/WEB-INF/lib/spring-data-jpa-1.6.2.RELEASE.jar new file mode 100644 index 0000000000..538f2eabdc Binary files /dev/null and b/WebContent/WEB-INF/lib/spring-data-jpa-1.6.2.RELEASE.jar differ diff --git a/WebContent/WEB-INF/lib/spring-expression-4.0.6.RELEASE.jar b/WebContent/WEB-INF/lib/spring-expression-4.0.6.RELEASE.jar new file mode 100644 index 0000000000..095dfe1c98 Binary files /dev/null and b/WebContent/WEB-INF/lib/spring-expression-4.0.6.RELEASE.jar differ diff --git a/WebContent/WEB-INF/lib/spring-jdbc-4.0.6.RELEASE.jar b/WebContent/WEB-INF/lib/spring-jdbc-4.0.6.RELEASE.jar new file mode 100644 index 0000000000..06e8eaa033 Binary files /dev/null and b/WebContent/WEB-INF/lib/spring-jdbc-4.0.6.RELEASE.jar differ diff --git a/WebContent/WEB-INF/lib/spring-orm-4.0.6.RELEASE.jar b/WebContent/WEB-INF/lib/spring-orm-4.0.6.RELEASE.jar new file mode 100644 index 0000000000..ca9f2da041 Binary files /dev/null and b/WebContent/WEB-INF/lib/spring-orm-4.0.6.RELEASE.jar differ diff --git a/WebContent/WEB-INF/lib/spring-test-4.0.6.RELEASE.jar b/WebContent/WEB-INF/lib/spring-test-4.0.6.RELEASE.jar new file mode 100644 index 0000000000..b1792d9d12 Binary files /dev/null and b/WebContent/WEB-INF/lib/spring-test-4.0.6.RELEASE.jar differ diff --git a/WebContent/WEB-INF/lib/spring-tx-3.2.7.RELEASE.jar b/WebContent/WEB-INF/lib/spring-tx-3.2.7.RELEASE.jar new file mode 100644 index 0000000000..effaa96e40 Binary files /dev/null and b/WebContent/WEB-INF/lib/spring-tx-3.2.7.RELEASE.jar differ diff --git a/WebContent/WEB-INF/lib/spring-web-4.0.6.RELEASE.jar b/WebContent/WEB-INF/lib/spring-web-4.0.6.RELEASE.jar new file mode 100644 index 0000000000..923f708fd8 Binary files /dev/null and b/WebContent/WEB-INF/lib/spring-web-4.0.6.RELEASE.jar differ diff --git a/WebContent/WEB-INF/lib/spring-webmvc-4.0.6.RELEASE.jar b/WebContent/WEB-INF/lib/spring-webmvc-4.0.6.RELEASE.jar new file mode 100644 index 0000000000..479883dca6 Binary files /dev/null and b/WebContent/WEB-INF/lib/spring-webmvc-4.0.6.RELEASE.jar differ diff --git a/WebContent/WEB-INF/lib/stax-api-1.0-2.jar b/WebContent/WEB-INF/lib/stax-api-1.0-2.jar new file mode 100644 index 0000000000..015169dc71 Binary files /dev/null and b/WebContent/WEB-INF/lib/stax-api-1.0-2.jar differ diff --git a/WebContent/WEB-INF/lib/stax2-api-3.1.1.jar b/WebContent/WEB-INF/lib/stax2-api-3.1.1.jar new file mode 100644 index 0000000000..63a8a06467 Binary files /dev/null and b/WebContent/WEB-INF/lib/stax2-api-3.1.1.jar differ diff --git a/WebContent/WEB-INF/lib/woodstox-core-asl-4.2.0.jar b/WebContent/WEB-INF/lib/woodstox-core-asl-4.2.0.jar new file mode 100644 index 0000000000..8ca96d52a9 Binary files /dev/null and b/WebContent/WEB-INF/lib/woodstox-core-asl-4.2.0.jar differ diff --git a/WebContent/WEB-INF/lib/wsdl4j-1.6.3.jar b/WebContent/WEB-INF/lib/wsdl4j-1.6.3.jar new file mode 100644 index 0000000000..b9c10b97cc Binary files /dev/null and b/WebContent/WEB-INF/lib/wsdl4j-1.6.3.jar differ diff --git a/WebContent/WEB-INF/lib/xercesImpl-2.10.0.jar b/WebContent/WEB-INF/lib/xercesImpl-2.10.0.jar new file mode 100644 index 0000000000..9dcd8c3819 Binary files /dev/null and b/WebContent/WEB-INF/lib/xercesImpl-2.10.0.jar differ diff --git a/WebContent/WEB-INF/lib/xml-apis-1.3.04.jar b/WebContent/WEB-INF/lib/xml-apis-1.3.04.jar new file mode 100644 index 0000000000..d42c0ea6cf Binary files /dev/null and b/WebContent/WEB-INF/lib/xml-apis-1.3.04.jar differ diff --git a/WebContent/WEB-INF/lib/xml-apis-ext-1.3.04.jar b/WebContent/WEB-INF/lib/xml-apis-ext-1.3.04.jar new file mode 100644 index 0000000000..a7869d68aa Binary files /dev/null and b/WebContent/WEB-INF/lib/xml-apis-ext-1.3.04.jar differ diff --git a/WebContent/WEB-INF/lib/xml-resolver-1.2.jar b/WebContent/WEB-INF/lib/xml-resolver-1.2.jar new file mode 100644 index 0000000000..e535bdc073 Binary files /dev/null and b/WebContent/WEB-INF/lib/xml-resolver-1.2.jar differ diff --git a/WebContent/WEB-INF/lib/xmlgraphics-commons-1.2.jar b/WebContent/WEB-INF/lib/xmlgraphics-commons-1.2.jar new file mode 100644 index 0000000000..a3489a7167 Binary files /dev/null and b/WebContent/WEB-INF/lib/xmlgraphics-commons-1.2.jar differ diff --git a/WebContent/WEB-INF/lib/xmlschema-core-2.0.3.jar b/WebContent/WEB-INF/lib/xmlschema-core-2.0.3.jar new file mode 100644 index 0000000000..c15ca90ecd Binary files /dev/null and b/WebContent/WEB-INF/lib/xmlschema-core-2.0.3.jar differ diff --git a/src/main/webapp/WEB-INF/spring-mvc.xml b/WebContent/WEB-INF/spring-mvc.xml similarity index 56% rename from src/main/webapp/WEB-INF/spring-mvc.xml rename to WebContent/WEB-INF/spring-mvc.xml index c8fc7f84b6..c1e3913d0b 100644 --- a/src/main/webapp/WEB-INF/spring-mvc.xml +++ b/WebContent/WEB-INF/spring-mvc.xml @@ -1,10 +1,9 @@ @@ -25,14 +24,6 @@ - - - - - - - - - - + + + \ No newline at end of file diff --git a/WebContent/WEB-INF/tags/pagination.tag b/WebContent/WEB-INF/tags/pagination.tag new file mode 100644 index 0000000000..56afcdc58f --- /dev/null +++ b/WebContent/WEB-INF/tags/pagination.tag @@ -0,0 +1,43 @@ +<%@tag pageEncoding="UTF-8"%> +<%@ attribute name="page" type="me.kafeitu.demo.activiti.util.Page" required="true"%> +<%@ attribute name="paginationSize" type="java.lang.Integer" required="true"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<% +int current = page.getPageNo(); +long begin = Math.max(1, current - paginationSize/2); +long end = Math.min(begin + (paginationSize - 1), page.getTotalPages()); +request.setAttribute("current", current); +request.setAttribute("begin", begin); +request.setAttribute("end", end); +%> + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/error/403.jsp b/WebContent/WEB-INF/views/error/403.jsp similarity index 55% rename from src/main/webapp/WEB-INF/views/error/403.jsp rename to WebContent/WEB-INF/views/error/403.jsp index 004fcf64c3..2839a5bb56 100644 --- a/src/main/webapp/WEB-INF/views/error/403.jsp +++ b/WebContent/WEB-INF/views/error/403.jsp @@ -1,10 +1,6 @@ <%@ page contentType="text/html;charset=UTF-8" %> -<%@ page import="org.apache.shiro.web.filter.authc.FormAuthenticationFilter"%> -<%@ page import="org.apache.shiro.authc.ExcessiveAttemptsException"%> -<%@ page import="org.apache.shiro.authc.IncorrectCredentialsException"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> diff --git a/src/main/webapp/WEB-INF/views/error/404.jsp b/WebContent/WEB-INF/views/error/404.jsp similarity index 100% rename from src/main/webapp/WEB-INF/views/error/404.jsp rename to WebContent/WEB-INF/views/error/404.jsp diff --git a/src/main/webapp/WEB-INF/views/error/500.jsp b/WebContent/WEB-INF/views/error/500.jsp similarity index 81% rename from src/main/webapp/WEB-INF/views/error/500.jsp rename to WebContent/WEB-INF/views/error/500.jsp index 595fcf3830..50c9e7fb8f 100644 --- a/src/main/webapp/WEB-INF/views/error/500.jsp +++ b/WebContent/WEB-INF/views/error/500.jsp @@ -15,8 +15,8 @@ logger.error(ex.getMessage(), ex); %> - - + + 500 - 系统内部错误 diff --git a/WebContent/WEB-INF/views/form/dynamic/dynamic-form-process-list.jsp b/WebContent/WEB-INF/views/form/dynamic/dynamic-form-process-list.jsp new file mode 100644 index 0000000000..ef00524b22 --- /dev/null +++ b/WebContent/WEB-INF/views/form/dynamic/dynamic-form-process-list.jsp @@ -0,0 +1,69 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> + +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> + + + <%@ include file="/common/global.jsp"%> + 动态Form流程列表 + <%@ include file="/common/meta.jsp" %> + <%@ include file="/common/include-base-styles.jsp" %> + <%@ include file="/common/include-jquery-ui-theme.jsp" %> + + + <%@ include file="/common/include-custom-styles.jsp" %> + + + + + + + + + + + + + + +
${message}
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
IDDID名称KEY版本号XML图片操作
${process.id }${process.deploymentId }${process.name }${process.key }${process.version }${process.resourceName }${process.diagramResourceName }启动
+ + + diff --git a/WebContent/WEB-INF/views/form/dynamic/dynamic-form-task-list.jsp b/WebContent/WEB-INF/views/form/dynamic/dynamic-form-task-list.jsp new file mode 100644 index 0000000000..07b2ea381c --- /dev/null +++ b/WebContent/WEB-INF/views/form/dynamic/dynamic-form-task-list.jsp @@ -0,0 +1,86 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> + +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> + + + <%@ include file="/common/global.jsp"%> + 待办任务列表 + <%@ include file="/common/meta.jsp" %> + <%@ include file="/common/include-base-styles.jsp" %> + <%@ include file="/common/include-jquery-ui-theme.jsp" %> + + + <%@ include file="/common/include-custom-styles.jsp" %> + + + + + + + + + + + + + + + + + + +
${message}
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
任务ID任务Key任务名称流程定义ID流程实例ID优先级任务创建日期任务逾期日任务描述任务所属人操作
${task.id }${task.taskDefinitionKey }${task.name }${task.processDefinitionId }${task.processInstanceId }${task.priority }${task.createTime }${task.dueDate }${task.description }${task.owner } + + 签收 + + + <%-- 此处用tkey记录当前节点的名称 --%> + 办理 + +
+ + +
+ + + diff --git a/WebContent/WEB-INF/views/form/finished-list.jsp b/WebContent/WEB-INF/views/form/finished-list.jsp new file mode 100644 index 0000000000..3967d10f24 --- /dev/null +++ b/WebContent/WEB-INF/views/form/finished-list.jsp @@ -0,0 +1,41 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> + +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> + + + <%@ include file="/common/global.jsp"%> + 已结束列表 + <%@ include file="/common/meta.jsp" %> + <%@ include file="/common/include-base-styles.jsp" %> + <%@ include file="/common/include-jquery-ui-theme.jsp" %> + + + <%@ include file="/common/include-custom-styles.jsp" %> + + + + + + + + + + + + + + + + + + + + + +
流程ID流程定义ID流程启动时间流程结束时间流程结束原因
${hpi.id }${hpi.processDefinitionId }${hpi.startTime }${hpi.endTime }${empty hpi.deleteReason ? "正常结束" : hpi.deleteReason}
+ + +
+ + + diff --git a/WebContent/WEB-INF/views/form/formkey/formkey-process-list.jsp b/WebContent/WEB-INF/views/form/formkey/formkey-process-list.jsp new file mode 100644 index 0000000000..cdff76d0e4 --- /dev/null +++ b/WebContent/WEB-INF/views/form/formkey/formkey-process-list.jsp @@ -0,0 +1,66 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> + +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> + + + <%@ include file="/common/global.jsp"%> + 外置表单流程列表 + <%@ include file="/common/meta.jsp" %> + <%@ include file="/common/include-base-styles.jsp" %> + <%@ include file="/common/include-jquery-ui-theme.jsp" %> + + + <%@ include file="/common/include-custom-styles.jsp" %> + + + + + + + + + + + + + + +
${message}
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
IDDID名称KEY版本号XML图片操作
${process.id }${process.deploymentId }${process.name }${process.key }${process.version }${process.resourceName }${process.diagramResourceName }启动
+ + + diff --git a/WebContent/WEB-INF/views/form/formkey/formkey-task-list.jsp b/WebContent/WEB-INF/views/form/formkey/formkey-task-list.jsp new file mode 100644 index 0000000000..549ffc3040 --- /dev/null +++ b/WebContent/WEB-INF/views/form/formkey/formkey-task-list.jsp @@ -0,0 +1,83 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> + +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> + + + <%@ include file="/common/global.jsp"%> + 待办任务列表 + <%@ include file="/common/meta.jsp" %> + <%@ include file="/common/include-base-styles.jsp" %> + <%@ include file="/common/include-jquery-ui-theme.jsp" %> + + + <%@ include file="/common/include-custom-styles.jsp" %> + + + + + + + + + + + + + + + + + +
${message}
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
任务ID任务Key任务名称流程定义ID流程实例ID优先级任务创建日期任务逾期日任务描述任务所属人操作
${task.id }${task.taskDefinitionKey }${task.name }${task.processDefinitionId }${task.processInstanceId }${task.priority }${task.createTime }${task.dueDate }${task.description }${task.owner } + + 签收 + + + <%-- 此处用tkey记录当前节点的名称 --%> + 办理 + +
+ + +
+ + + diff --git a/WebContent/WEB-INF/views/form/running-list.jsp b/WebContent/WEB-INF/views/form/running-list.jsp new file mode 100644 index 0000000000..36163a65d3 --- /dev/null +++ b/WebContent/WEB-INF/views/form/running-list.jsp @@ -0,0 +1,63 @@ +<%@page import="me.kafeitu.demo.activiti.util.ProcessDefinitionCache,org.activiti.engine.RepositoryService"%> +<%@page import="org.springframework.web.context.support.WebApplicationContextUtils"%> +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> + +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> + + + <%@ include file="/common/global.jsp"%> + 运行中流程列表 + <%@ include file="/common/meta.jsp" %> + <%@ include file="/common/include-base-styles.jsp" %> + <%@ include file="/common/include-jquery-ui-theme.jsp" %> + + + <%@ include file="/common/include-custom-styles.jsp" %> + + + + + + + + + + + + + <% + RepositoryService repositoryService = WebApplicationContextUtils.getWebApplicationContext(session.getServletContext()).getBean(org.activiti.engine.RepositoryService.class); + ProcessDefinitionCache.setRepositoryService(repositoryService); + %> + + + + + + + + + + + + + + + + + + + + +
执行ID流程实例ID流程定义ID当前节点是否挂起
${p.id }${p.processInstanceId }${p.processDefinitionId }<%=ProcessDefinitionCache.getActivityName(pageContext.getAttribute("pdid").toString(), ObjectUtils.toString(pageContext.getAttribute("activityId"))) %>${p.suspended }
+ + +
+ + + diff --git a/WebContent/WEB-INF/views/login.jsp b/WebContent/WEB-INF/views/login.jsp new file mode 100644 index 0000000000..a7e5b8d15b --- /dev/null +++ b/WebContent/WEB-INF/views/login.jsp @@ -0,0 +1,165 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> + + + + + <%@ include file="/common/global.jsp"%> + 登录页 + + <%@ include file="/common/meta.jsp" %> + <%@ include file="/common/include-jquery-ui-theme.jsp" %> + <%@ include file="/common/include-base-styles.jsp" %> + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/views/main/index.jsp b/WebContent/WEB-INF/views/main/index.jsp similarity index 80% rename from src/main/webapp/WEB-INF/views/main/index.jsp rename to WebContent/WEB-INF/views/main/index.jsp index ae5bc283dd..800c2833ff 100644 --- a/src/main/webapp/WEB-INF/views/main/index.jsp +++ b/WebContent/WEB-INF/views/main/index.jsp @@ -1,13 +1,17 @@ +<%@page import="me.kafeitu.demo.activiti.util.PropertyFileUtil"%> +<%@page import="org.springframework.beans.factory.config.PropertiesFactoryBean"%> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> - - - + +<% +PropertyFileUtil.init(); +%> + <%@ include file="/common/global.jsp"%> <%@ include file="/common/meta.jsp" %> @@ -23,12 +27,12 @@ #tabs li .ui-icon-close { float: left; margin: 0.5em 0.2em 0 0; cursor: pointer; } #add_tab { cursor: pointer; } - - - + + + - + @@ -48,7 +52,7 @@
- ${user.firstName } ${user.lastName }/${user.id } + ${user.firstName } ${user.lastName }/${user.id }
切换风格 @@ -75,10 +79,11 @@
<%@ include file="menu.jsp" %>
- \ No newline at end of file + diff --git a/WebContent/WEB-INF/views/main/menu.jsp b/WebContent/WEB-INF/views/main/menu.jsp new file mode 100644 index 0000000000..99405ec0ad --- /dev/null +++ b/WebContent/WEB-INF/views/main/menu.jsp @@ -0,0 +1,48 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> + \ No newline at end of file diff --git a/WebContent/WEB-INF/views/main/welcome.jsp b/WebContent/WEB-INF/views/main/welcome.jsp new file mode 100644 index 0000000000..9dd7dd272e --- /dev/null +++ b/WebContent/WEB-INF/views/main/welcome.jsp @@ -0,0 +1,156 @@ + +<%@page import="me.kafeitu.demo.activiti.util.PropertyFileUtil"%> +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> + + + + <%@ include file="/common/global.jsp"%> + <%@ include file="/common/meta.jsp"%> + + <%@ include file="/common/include-base-styles.jsp" %> + <%@ include file="/common/include-jquery-ui-theme.jsp" %> + + + <%@ include file="/common/include-custom-styles.jsp" %> + + + + + + + + + + + +
+
+

欢迎访问Activiti Demo,专为优秀的BPMN2.0规范的轻量级工作流引擎Activiti服务

+
+
+
+ +
+
    +
  • + 普通表单:每个节点的表单内容都写死在JSP或者HTML中。 +
  • +
  • + 动态表单:表单内容存放在流程定义文件中(包含在启动事件以及每个用户任务中)。 +
  • +
  • + 外置表单:每个用户任务对应一个单独的.form文件,和流程定义文件同时部署(打包为zip/bar文件)。 +
  • +
  • + 综合流程:可以查询到所有的流程(普通、动态、外置固定查询某些流程的表单,为了演示所以单独分开);综合流程的目的 + 在于可以启动用户上传或者设计后部署的流程定义。 +
  • +
+
+
+ 在填写会签参与人字段时使用用户的ID作为值,例如:kafeitu,admin表示两个用户,即两个任务实例被创建。 +
+
+ +
+ +
+
    +
  • + Activiti版本:公共版本(${prop['activiti.version']}) +  引擎特定版本(${prop['activiti.engine.version']}) +
  • +
  • Spring版本:${prop['spring.version']}
  • +
  • Hibernate:${prop['hibernate.version']}
  • +
  • 使用Maven管理依赖
  • +
+
+ +
+
    +
  • 部署流程
  • +
  • 启动流程
  • +
  • 任务签收
  • +
  • 任务办理
  • +
  • 驳回请求
  • +
  • 查询运行中流程
  • +
  • 查询历史流程
  • +
  • 任务监听
  • +
  • 自定义表单
  • +
  • 动态表单
  • +
  • 外置表单
  • +
  • 个人待办任务汇总
  • +
  • 分页查询(New)
  • +
  • 流程定义缓存(New)
  • +
  • 集成Activiti Modeler(New)
  • +
+
+ + + +
+
    +
  • + 作者:咖啡兔 +
  • +
  • + QQ:576525789 +
  • +
  • + Weibo:@kafeituzi +
  • +
  • + QQ群: +
      +
    • Activiti中文群1(欢迎):236540304
    • +
    • Activiti中文群2(已满):23539326
    • +
    • Activiti中文群3(已满):139983080
    • +
    • Activiti中文群4(已满):327913744
    • +
    +
  • +
+
+ +
+

在web.xml中映射了两个两个Servlet

+
+
ExplorerRestletServlet
+
+

针对Activiti Modeler的Rest接口,映射路径:/service/*

+
+
RestletServlet
+
+

官方提供的完整Rest接口

+

访问路径:http://localhost/yourappname/<用户手册提供的Rest地址>

+

映射路径:/rest/*

+

如何使用Activiti Rest模块

+
+
+
+ + diff --git a/src/main/webapp/WEB-INF/views/oa/leave/finished.jsp b/WebContent/WEB-INF/views/oa/leave/finished.jsp similarity index 85% rename from src/main/webapp/WEB-INF/views/oa/leave/finished.jsp rename to WebContent/WEB-INF/views/oa/leave/finished.jsp index 079bfb20aa..a6399ff497 100644 --- a/src/main/webapp/WEB-INF/views/oa/leave/finished.jsp +++ b/WebContent/WEB-INF/views/oa/leave/finished.jsp @@ -1,8 +1,7 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> - + <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - - + <%@ include file="/common/global.jsp"%> 请假已结束的流程实例列表 @@ -12,9 +11,9 @@ <%@ include file="/common/include-custom-styles.jsp" %> - - - + + + @@ -40,7 +39,7 @@ - + ${leave.leaveType } @@ -58,5 +57,6 @@ + diff --git a/src/main/webapp/WEB-INF/views/oa/leave/leaveApply.jsp b/WebContent/WEB-INF/views/oa/leave/leaveApply.jsp similarity index 70% rename from src/main/webapp/WEB-INF/views/oa/leave/leaveApply.jsp rename to WebContent/WEB-INF/views/oa/leave/leaveApply.jsp index 88ec9b3f6f..290e9729ac 100644 --- a/src/main/webapp/WEB-INF/views/oa/leave/leaveApply.jsp +++ b/WebContent/WEB-INF/views/oa/leave/leaveApply.jsp @@ -1,8 +1,7 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> - + <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - - + <%@ include file="/common/global.jsp"%> 请假申请 @@ -10,9 +9,9 @@ <%@ include file="/common/include-base-styles.jsp" %> <%@ include file="/common/include-jquery-ui-theme.jsp" %> - - - + + + + + +
${error}
+ +
- +
请假申请 @@ -48,6 +62,8 @@ + + @@ -60,7 +76,7 @@
开始时间:
结束时间:
  - +
diff --git a/src/main/webapp/WEB-INF/views/oa/leave/running.jsp b/WebContent/WEB-INF/views/oa/leave/running.jsp similarity index 82% rename from src/main/webapp/WEB-INF/views/oa/leave/running.jsp rename to WebContent/WEB-INF/views/oa/leave/running.jsp index dacb1cbaae..a9d61f1104 100644 --- a/src/main/webapp/WEB-INF/views/oa/leave/running.jsp +++ b/WebContent/WEB-INF/views/oa/leave/running.jsp @@ -1,8 +1,7 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> - + <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - - + <%@ include file="/common/global.jsp"%> 请假正在运行中的流程实例列表 @@ -12,9 +11,9 @@ <%@ include file="/common/include-custom-styles.jsp" %> - - - + + + @@ -44,7 +43,7 @@ - + @@ -54,7 +53,7 @@ ${leave.startTime } ${leave.endTime } - ${task.name } + ${task.name } ${task.createTime } ${pi.suspended ? "已挂起" : "正常" };V: ${leave.processDefinition.version } @@ -63,5 +62,6 @@ + diff --git a/src/main/webapp/WEB-INF/views/oa/leave/taskList.jsp b/WebContent/WEB-INF/views/oa/leave/taskList.jsp similarity index 87% rename from src/main/webapp/WEB-INF/views/oa/leave/taskList.jsp rename to WebContent/WEB-INF/views/oa/leave/taskList.jsp index f8e31313cf..05d4f62424 100644 --- a/src/main/webapp/WEB-INF/views/oa/leave/taskList.jsp +++ b/WebContent/WEB-INF/views/oa/leave/taskList.jsp @@ -1,8 +1,7 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> - + <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - - + <%@ include file="/common/global.jsp"%> 请假待办任务列表 @@ -12,13 +11,23 @@ <%@ include file="/common/include-custom-styles.jsp" %> - - - + + + + + @@ -42,7 +51,7 @@ - + @@ -52,7 +61,7 @@ ${leave.startTime } ${leave.endTime } - ${task.name } + ${task.name } <%--${task.name } --%> ${task.createTime } @@ -70,24 +79,24 @@ - + - + - + - +