diff --git a/snow-admin/src/main/java/com/snow/SnowApplication.java b/snow-admin/src/main/java/com/snow/SnowApplication.java index ae26dc8..ffa9281 100644 --- a/snow-admin/src/main/java/com/snow/SnowApplication.java +++ b/snow-admin/src/main/java/com/snow/SnowApplication.java @@ -1,20 +1,49 @@ package com.snow; +import org.flowable.ui.common.rest.idm.remote.RemoteAccountResource; +import org.flowable.ui.modeler.properties.FlowableModelerAppProperties; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration; +import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.FilterType; /** * 启动程序 * * @author snow */ -@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) +@SpringBootApplication( + exclude= { + DataSourceAutoConfiguration.class, + SecurityAutoConfiguration.class, + SecurityAutoConfiguration.class, + UserDetailsServiceAutoConfiguration.class, + LiquibaseAutoConfiguration.class + } +) +@ComponentScan(basePackages = {"com.snow", + "org.flowable.ui" + +}, + excludeFilters= @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {RemoteAccountResource.class}) +) public class SnowApplication { public static void main(String[] args) { // System.setProperty("spring.devtools.restart.enabled", "false"); SpringApplication.run(SnowApplication.class, args); + + + } + @Bean + public FlowableModelerAppProperties flowableModelerAppProperties() { + FlowableModelerAppProperties flowableModelerAppProperties=new FlowableModelerAppProperties(); + return flowableModelerAppProperties; } } \ No newline at end of file diff --git a/snow-admin/src/main/java/com/snow/web/controller/flowable/FlowModelerController.java b/snow-admin/src/main/java/com/snow/web/controller/flowable/FlowModelerController.java new file mode 100644 index 0000000..4e28e0a --- /dev/null +++ b/snow-admin/src/main/java/com/snow/web/controller/flowable/FlowModelerController.java @@ -0,0 +1,185 @@ +package com.snow.web.controller.flowable; + +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelReader; +import com.alibaba.excel.read.metadata.ReadSheet; +import com.snow.common.annotation.Log; +import com.snow.common.core.controller.BaseController; +import com.snow.common.core.domain.AjaxResult; +import com.snow.common.core.page.TableDataInfo; +import com.snow.common.enums.BusinessType; +import com.snow.common.utils.poi.ExcelUtil; +import com.snow.flowable.domain.DeploymentDTO; +import com.snow.flowable.domain.DeploymentQueryDTO; +import com.snow.flowable.domain.DeploymentVO; +import com.snow.flowable.service.impl.FlowablePublishServiceImpl; +import com.snow.flowable.service.impl.FlowableServiceImpl; +import com.snow.framework.excel.FinanceAlipayFlowListener; +import com.snow.framework.util.ShiroUtils; +import com.snow.system.domain.FinanceAlipayFlow; +import com.snow.system.domain.FinanceAlipayFlowImport; +import com.snow.system.domain.SysUser; +import com.snow.system.service.IFinanceAlipayFlowService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.flowable.engine.repository.DeploymentQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.InputStream; +import java.util.List; + +/** + * 财务支付宝流水Controller + * + * @author snow + * @date 2020-11-09 + */ +@Controller +@RequestMapping("/modeler") +public class FlowModelerController extends BaseController +{ + private String prefix = "flow"; + + @Autowired + private IFinanceAlipayFlowService financeAlipayFlowService; + @Autowired + private FlowableServiceImpl flowableService; + @Autowired + private FlowablePublishServiceImpl flowablePublishService; + + /** + * 跳转流程编译器 + * @return + */ + @RequiresPermissions("modeler:flow:view") + @GetMapping("/index") + public String index() + { + + return redirect("/modeler/index.html"); + } + @RequiresPermissions("modeler:flow:view") + @GetMapping() + public String deploymentView() + { + return prefix + "/deployment"; + } + + /** + * 查询发布实例列表 + */ + @RequiresPermissions("modeler:flow:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(DeploymentQueryDTO deploymentQuery) + { + + startPage(); + List deploymentList = flowableService.getDeploymentList(deploymentQuery); + return getDataTable(deploymentList); + } + + /** + * 导出财务支付宝流水列表 + */ + @RequiresPermissions("system:flow:export") + @Log(title = "财务支付宝流水", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(FinanceAlipayFlow financeAlipayFlow) + { + List list = financeAlipayFlowService.selectFinanceAlipayFlowList(financeAlipayFlow); + ExcelUtil util = new ExcelUtil(FinanceAlipayFlow.class); + return util.exportExcel(list, "flow"); + } + + /** + * 获取XML + */ + @GetMapping("/getXml") + public void getXml(String id,String resourceName,HttpServletResponse response) + { + + flowableService.getDeploymentSource(id,resourceName,"xml",response); + } + + /** + * 获取XML + */ + @GetMapping("/getFlowPicture") + public void getFlowPicture(String id,String resourceName,HttpServletResponse response) + { + + flowableService.getDeploymentSource(id,resourceName,"png",response); + } + + /** + * 新增保存财务支付宝流水 + */ + @RequiresPermissions("system:flow:add") + @Log(title = "财务支付宝流水", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(FinanceAlipayFlow financeAlipayFlow) + { + return toAjax(financeAlipayFlowService.insertFinanceAlipayFlow(financeAlipayFlow)); + } + + /** + * 修改财务支付宝流水 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + FinanceAlipayFlow financeAlipayFlow = financeAlipayFlowService.selectFinanceAlipayFlowById(id); + mmap.put("financeAlipayFlow", financeAlipayFlow); + return prefix + "/edit"; + } + + /** + * 修改保存财务支付宝流水 + */ + @RequiresPermissions("system:flow:edit") + @Log(title = "财务支付宝流水", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(FinanceAlipayFlow financeAlipayFlow) + { + return toAjax(financeAlipayFlowService.updateFinanceAlipayFlow(financeAlipayFlow)); + } + + /** + * 删除发布 + */ + @RequiresPermissions("modeler:flow:remove") + @Log(title = "删除发布", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + flowableService.deleteDeployment(ids); + return toAjax(1); + } + + + @Log(title = "发布流程", businessType = BusinessType.IMPORT) + @RequiresPermissions("modeler:flow:import") + @PostMapping("/importData") + @ResponseBody + public AjaxResult importData(MultipartFile file, String name,String key,String category) throws Exception + { + InputStream inputStream = file.getInputStream(); + String originalFilename = file.getOriginalFilename(); + DeploymentDTO deploymentQueryDTO=new DeploymentDTO(); + deploymentQueryDTO.setName(name); + deploymentQueryDTO.setKey(key); + deploymentQueryDTO.setCategory(category); + deploymentQueryDTO.setResourceName(originalFilename); + flowablePublishService.createInputStreamDeployment(deploymentQueryDTO,inputStream); + return AjaxResult.success("发布成功"); + } +} diff --git a/snow-admin/src/main/java/com/snow/web/controller/flowable/FlowUserController.java b/snow-admin/src/main/java/com/snow/web/controller/flowable/FlowUserController.java new file mode 100644 index 0000000..b55b713 --- /dev/null +++ b/snow-admin/src/main/java/com/snow/web/controller/flowable/FlowUserController.java @@ -0,0 +1,70 @@ +package com.snow.web.controller.flowable; + +import com.snow.common.core.controller.BaseController; +import com.snow.common.core.page.TableDataInfo; +import com.snow.flowable.domain.FlowRemoteVO; +import com.snow.flowable.service.FlowableUserService; +import org.flowable.ui.common.model.RemoteGroup; +import org.flowable.ui.common.model.RemoteUser; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author qimingjin + * @Title: + * @Description: + * @date 2020/11/20 10:34 + */ +@RestController +@RequestMapping("/app") +public class FlowUserController extends BaseController { + + @Autowired + private FlowableUserService flowableUserService; + + /** + * 编译器登录 + * @return + */ + @RequestMapping(value="/rest/account") + public String getAccount() { + return "{\"id\":\"admin\",\"firstName\":\"Test\",\"lastName\":\"Administrator\",\"email\":\"admin@modeler.org\",\"fullName\":\"Test Administrator\",\"groups\":[],\"privileges\":[\"access-idm\",\"access-task\",\"access-modeler\",\"access-admin\"]}\n" + + ""; + } + + /** + * 获取用户列表 + * @param filter + */ + @GetMapping(value = "/rest/getUserList") + public FlowRemoteVO getFlowUserList(@RequestParam(value = "filter",required = false) String filter) { + startPage(); + List flowUserList = flowableUserService.getFlowUserList(filter); + TableDataInfo dataTable = getDataTable(flowUserList); + FlowRemoteVO flowRemoteVO = new FlowRemoteVO(); + flowRemoteVO.setData(dataTable.getRows()); + flowRemoteVO.setSize(dataTable.getPageSize()); + flowRemoteVO.setStart(dataTable.getPageIndex()); + flowRemoteVO.setTotal(dataTable.getTotal()); + return flowRemoteVO; + } + + /** + * 获取用户列表 + * @param filter + */ + @GetMapping(value = "/rest/getUserGroupList") + public FlowRemoteVO getUserGroupList(@RequestParam(value = "filter",required = false) String filter) { + startPage(); + List flowUserGroupList = flowableUserService.getFlowUserGroupList(filter); + TableDataInfo dataTable = getDataTable(flowUserGroupList); + FlowRemoteVO flowRemoteVO = new FlowRemoteVO(); + flowRemoteVO.setData(dataTable.getRows()); + flowRemoteVO.setSize(dataTable.getPageSize()); + flowRemoteVO.setStart(dataTable.getPageIndex()); + flowRemoteVO.setTotal(dataTable.getTotal()); + return flowRemoteVO; + } +} diff --git a/snow-admin/src/main/resources/application.yml b/snow-admin/src/main/resources/application.yml index fa63c3d..de933aa 100644 --- a/snow-admin/src/main/resources/application.yml +++ b/snow-admin/src/main/resources/application.yml @@ -54,7 +54,7 @@ spring: basename: static/i18n/messages jackson: time-zone: GMT+8 - date-format: yyyy-MM-dd HH:mm:ss + profiles: active: druid # 文件上传 @@ -75,10 +75,11 @@ mybatis: # 搜索指定包别名 typeAliasesPackage: com.snow.**.domain # 配置mapper的扫描,找到所有的mapper.xml映射文件 - mapperLocations: classpath*:mapper/**/*Mapper.xml + mapperLocations: classpath*:META-INF/modeler-mybatis-mappings/*.xml,classpath*:mapper/**/*Mapper.xml # 加载全局的配置文件 configLocation: classpath:mybatis/mybatis-config.xml + # PageHelper分页插件 pagehelper: helperDialect: mysql @@ -140,6 +141,13 @@ flowable: async-executor-activate: false # 将databaseSchemaUpdate设置为true。当Flowable发现库与数据库表结构不一致时,会自动将数据库表结构升级至新版本。 database-schema-update: true + common: + app: + idm-url: http://localhost:80 + idm-admin: + user: admin + password: test + log4j: rootLogger: ERROR, CA diff --git a/snow-admin/src/main/resources/mybatis/mybatis-config.xml b/snow-admin/src/main/resources/mybatis/mybatis-config.xml index 2b18113..1901b75 100644 --- a/snow-admin/src/main/resources/mybatis/mybatis-config.xml +++ b/snow-admin/src/main/resources/mybatis/mybatis-config.xml @@ -3,7 +3,12 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "http://mybatis.org/dtd/mybatis-3-config.dtd"> - + + + + + + @@ -11,5 +16,5 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN" - + diff --git a/snow-flowable/src/main/resources/static/404.html b/snow-admin/src/main/resources/static/modeler/404.html similarity index 100% rename from snow-flowable/src/main/resources/static/404.html rename to snow-admin/src/main/resources/static/modeler/404.html diff --git a/snow-flowable/src/main/resources/static/browserconfig.xml b/snow-admin/src/main/resources/static/modeler/browserconfig.xml similarity index 100% rename from snow-flowable/src/main/resources/static/browserconfig.xml rename to snow-admin/src/main/resources/static/modeler/browserconfig.xml diff --git a/snow-flowable/src/main/resources/static/display-cmmn/cmmn-draw.js b/snow-admin/src/main/resources/static/modeler/display-cmmn/cmmn-draw.js similarity index 100% rename from snow-flowable/src/main/resources/static/display-cmmn/cmmn-draw.js rename to snow-admin/src/main/resources/static/modeler/display-cmmn/cmmn-draw.js diff --git a/snow-flowable/src/main/resources/static/display-cmmn/cmmn-icons.js b/snow-admin/src/main/resources/static/modeler/display-cmmn/cmmn-icons.js similarity index 100% rename from snow-flowable/src/main/resources/static/display-cmmn/cmmn-icons.js rename to snow-admin/src/main/resources/static/modeler/display-cmmn/cmmn-icons.js diff --git a/snow-flowable/src/main/resources/static/display-cmmn/displaymodel.css b/snow-admin/src/main/resources/static/modeler/display-cmmn/displaymodel.css similarity index 100% rename from snow-flowable/src/main/resources/static/display-cmmn/displaymodel.css rename to snow-admin/src/main/resources/static/modeler/display-cmmn/displaymodel.css diff --git a/snow-flowable/src/main/resources/static/display-cmmn/displaymodel.html b/snow-admin/src/main/resources/static/modeler/display-cmmn/displaymodel.html similarity index 100% rename from snow-flowable/src/main/resources/static/display-cmmn/displaymodel.html rename to snow-admin/src/main/resources/static/modeler/display-cmmn/displaymodel.html diff --git a/snow-flowable/src/main/resources/static/display-cmmn/displaymodel.js b/snow-admin/src/main/resources/static/modeler/display-cmmn/displaymodel.js similarity index 99% rename from snow-flowable/src/main/resources/static/display-cmmn/displaymodel.js rename to snow-admin/src/main/resources/static/modeler/display-cmmn/displaymodel.js index a4c2d2e..78d1346 100644 --- a/snow-flowable/src/main/resources/static/display-cmmn/displaymodel.js +++ b/snow-admin/src/main/resources/static/modeler/display-cmmn/displaymodel.js @@ -105,7 +105,7 @@ function _showTip(htmlNode, element) event: 'click mouseleave' }, style: { - classes: 'ui-tooltip-flowable-cmmn' + classes: 'ui-tooltip-modeler-cmmn' } }); } diff --git a/snow-flowable/src/main/resources/static/display/Gruntfile.js b/snow-admin/src/main/resources/static/modeler/display/Gruntfile.js similarity index 100% rename from snow-flowable/src/main/resources/static/display/Gruntfile.js rename to snow-admin/src/main/resources/static/modeler/display/Gruntfile.js diff --git a/snow-flowable/src/main/resources/static/display/Polyline.js b/snow-admin/src/main/resources/static/modeler/display/Polyline.js similarity index 100% rename from snow-flowable/src/main/resources/static/display/Polyline.js rename to snow-admin/src/main/resources/static/modeler/display/Polyline.js diff --git a/snow-flowable/src/main/resources/static/display/bpmn-draw.js b/snow-admin/src/main/resources/static/modeler/display/bpmn-draw.js similarity index 100% rename from snow-flowable/src/main/resources/static/display/bpmn-draw.js rename to snow-admin/src/main/resources/static/modeler/display/bpmn-draw.js diff --git a/snow-flowable/src/main/resources/static/display/bpmn-icons.js b/snow-admin/src/main/resources/static/modeler/display/bpmn-icons.js similarity index 100% rename from snow-flowable/src/main/resources/static/display/bpmn-icons.js rename to snow-admin/src/main/resources/static/modeler/display/bpmn-icons.js diff --git a/snow-flowable/src/main/resources/static/display/displaymodel.css b/snow-admin/src/main/resources/static/modeler/display/displaymodel.css similarity index 100% rename from snow-flowable/src/main/resources/static/display/displaymodel.css rename to snow-admin/src/main/resources/static/modeler/display/displaymodel.css diff --git a/snow-flowable/src/main/resources/static/display/displaymodel.html b/snow-admin/src/main/resources/static/modeler/display/displaymodel.html similarity index 100% rename from snow-flowable/src/main/resources/static/display/displaymodel.html rename to snow-admin/src/main/resources/static/modeler/display/displaymodel.html diff --git a/snow-flowable/src/main/resources/static/display/displaymodel.js b/snow-admin/src/main/resources/static/modeler/display/displaymodel.js similarity index 100% rename from snow-flowable/src/main/resources/static/display/displaymodel.js rename to snow-admin/src/main/resources/static/modeler/display/displaymodel.js diff --git a/snow-flowable/src/main/resources/static/display/jquery.qtip.min.css b/snow-admin/src/main/resources/static/modeler/display/jquery.qtip.min.css similarity index 100% rename from snow-flowable/src/main/resources/static/display/jquery.qtip.min.css rename to snow-admin/src/main/resources/static/modeler/display/jquery.qtip.min.css diff --git a/snow-flowable/src/main/resources/static/display/jquery.qtip.min.js b/snow-admin/src/main/resources/static/modeler/display/jquery.qtip.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/display/jquery.qtip.min.js rename to snow-admin/src/main/resources/static/modeler/display/jquery.qtip.min.js diff --git a/snow-flowable/src/main/resources/static/display/package.json b/snow-admin/src/main/resources/static/modeler/display/package.json similarity index 100% rename from snow-flowable/src/main/resources/static/display/package.json rename to snow-admin/src/main/resources/static/modeler/display/package.json diff --git a/snow-flowable/src/main/resources/static/display/raphael.min.js b/snow-admin/src/main/resources/static/modeler/display/raphael.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/display/raphael.min.js rename to snow-admin/src/main/resources/static/modeler/display/raphael.min.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/flowable-header-custom.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/flowable-header-custom.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/flowable-header-custom.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/flowable-header-custom.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/flowable-toolbar-custom-actions.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/flowable-toolbar-custom-actions.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/flowable-toolbar-custom-actions.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/flowable-toolbar-custom-actions.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-assignment-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-assignment-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-assignment-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-assignment-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-calledelementtype-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-calledelementtype-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-calledelementtype-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-calledelementtype-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-case-reference-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-case-reference-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-case-reference-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-case-reference-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-condition-expression-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-condition-expression-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-condition-expression-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-condition-expression-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-custom-controllers.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-custom-controllers.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-custom-controllers.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-custom-controllers.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-data-properties-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-data-properties-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-data-properties-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-data-properties-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-decisiontable-reference-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-decisiontable-reference-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-decisiontable-reference-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-decisiontable-reference-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-default-controllers.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-default-controllers.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-default-controllers.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-default-controllers.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-duedate-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-duedate-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-duedate-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-duedate-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-event-listeners-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-event-listeners-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-event-listeners-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-event-listeners-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-execution-listeners-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-execution-listeners-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-execution-listeners-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-execution-listeners-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-fields-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-fields-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-fields-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-fields-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-form-properties-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-form-properties-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-form-properties-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-form-properties-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-form-reference-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-form-reference-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-form-reference-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-form-reference-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-httprequest-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-httprequest-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-httprequest-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-httprequest-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-in-parameters-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-in-parameters-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-in-parameters-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-in-parameters-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-message-definitions-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-message-definitions-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-message-definitions-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-message-definitions-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-message-scope-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-message-scope-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-message-scope-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-message-scope-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-multiinstance-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-multiinstance-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-multiinstance-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-multiinstance-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-ordering-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-ordering-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-ordering-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-ordering-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-out-parameters-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-out-parameters-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-out-parameters-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-out-parameters-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-plan-item-lifecycle-listeners-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-plan-item-lifecycle-listeners-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-plan-item-lifecycle-listeners-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-plan-item-lifecycle-listeners-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-planitem-dropdown-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-planitem-dropdown-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-planitem-dropdown-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-planitem-dropdown-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-process-historylevel-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-process-historylevel-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-process-historylevel-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-process-historylevel-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-process-reference-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-process-reference-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-process-reference-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-process-reference-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-sequenceflow-order-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-sequenceflow-order-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-sequenceflow-order-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-sequenceflow-order-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-signal-definitions-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-signal-definitions-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-signal-definitions-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-signal-definitions-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-signal-scope-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-signal-scope-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-signal-scope-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-signal-scope-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-task-listeners-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-task-listeners-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-task-listeners-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-task-listeners-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-transition-event-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-transition-event-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-transition-event-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-transition-event-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties-trigger-mode-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-trigger-mode-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties-trigger-mode-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties-trigger-mode-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/assignment-display-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/assignment-display-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/assignment-display-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/assignment-display-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/assignment-popup.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/assignment-popup.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/assignment-popup.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/assignment-popup.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/assignment-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/assignment-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/assignment-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/assignment-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/boolean-property-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/boolean-property-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/boolean-property-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/boolean-property-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/calledelementtype-property-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/calledelementtype-property-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/calledelementtype-property-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/calledelementtype-property-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/case-reference-display-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/case-reference-display-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/case-reference-display-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/case-reference-display-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/case-reference-popup.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/case-reference-popup.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/case-reference-popup.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/case-reference-popup.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/case-reference-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/case-reference-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/case-reference-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/case-reference-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/condition-expression-display-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/condition-expression-display-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/condition-expression-display-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/condition-expression-display-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/condition-expression-popup.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/condition-expression-popup.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/condition-expression-popup.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/condition-expression-popup.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/condition-expression-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/condition-expression-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/condition-expression-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/condition-expression-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/data-properties-display-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/data-properties-display-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/data-properties-display-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/data-properties-display-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/data-properties-popup.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/data-properties-popup.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/data-properties-popup.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/data-properties-popup.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/data-properties-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/data-properties-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/data-properties-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/data-properties-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/decisiontable-reference-display-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/decisiontable-reference-display-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/decisiontable-reference-display-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/decisiontable-reference-display-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/decisiontable-reference-popup.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/decisiontable-reference-popup.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/decisiontable-reference-popup.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/decisiontable-reference-popup.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/decisiontable-reference-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/decisiontable-reference-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/decisiontable-reference-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/decisiontable-reference-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/default-value-display-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/default-value-display-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/default-value-display-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/default-value-display-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/duedate-display-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/duedate-display-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/duedate-display-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/duedate-display-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/duedate-popup.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/duedate-popup.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/duedate-popup.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/duedate-popup.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/duedate-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/duedate-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/duedate-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/duedate-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/errorgrid-critical.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/errorgrid-critical.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/errorgrid-critical.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/errorgrid-critical.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/event-listeners-display-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/event-listeners-display-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/event-listeners-display-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/event-listeners-display-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/event-listeners-popup.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/event-listeners-popup.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/event-listeners-popup.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/event-listeners-popup.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/event-listeners-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/event-listeners-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/event-listeners-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/event-listeners-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/execution-listeners-display-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/execution-listeners-display-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/execution-listeners-display-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/execution-listeners-display-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/execution-listeners-popup.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/execution-listeners-popup.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/execution-listeners-popup.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/execution-listeners-popup.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/execution-listeners-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/execution-listeners-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/execution-listeners-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/execution-listeners-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/feedback-popup.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/feedback-popup.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/feedback-popup.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/feedback-popup.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/fields-display-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/fields-display-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/fields-display-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/fields-display-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/fields-popup.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/fields-popup.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/fields-popup.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/fields-popup.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/fields-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/fields-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/fields-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/fields-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/form-properties-display-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/form-properties-display-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/form-properties-display-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/form-properties-display-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/form-properties-popup.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/form-properties-popup.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/form-properties-popup.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/form-properties-popup.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/form-properties-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/form-properties-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/form-properties-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/form-properties-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/form-reference-display-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/form-reference-display-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/form-reference-display-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/form-reference-display-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/form-reference-popup.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/form-reference-popup.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/form-reference-popup.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/form-reference-popup.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/form-reference-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/form-reference-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/form-reference-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/form-reference-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/http-request-method-display-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/http-request-method-display-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/http-request-method-display-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/http-request-method-display-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/http-request-method-property-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/http-request-method-property-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/http-request-method-property-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/http-request-method-property-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/in-parameters-display-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/in-parameters-display-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/in-parameters-display-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/in-parameters-display-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/in-parameters-popup.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/in-parameters-popup.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/in-parameters-popup.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/in-parameters-popup.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/in-parameters-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/in-parameters-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/in-parameters-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/in-parameters-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/message-definitions-display-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/message-definitions-display-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/message-definitions-display-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/message-definitions-display-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/message-definitions-popup.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/message-definitions-popup.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/message-definitions-popup.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/message-definitions-popup.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/message-definitions-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/message-definitions-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/message-definitions-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/message-definitions-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/message-property-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/message-property-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/message-property-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/message-property-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/multiinstance-property-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/multiinstance-property-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/multiinstance-property-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/multiinstance-property-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/ordering-property-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/ordering-property-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/ordering-property-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/ordering-property-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/out-parameters-display-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/out-parameters-display-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/out-parameters-display-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/out-parameters-display-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/out-parameters-popup.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/out-parameters-popup.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/out-parameters-popup.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/out-parameters-popup.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/out-parameters-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/out-parameters-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/out-parameters-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/out-parameters-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/plan-item-lifecycle-listeners-display-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/plan-item-lifecycle-listeners-display-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/plan-item-lifecycle-listeners-display-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/plan-item-lifecycle-listeners-display-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/plan-item-lifecycle-listeners-popup.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/plan-item-lifecycle-listeners-popup.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/plan-item-lifecycle-listeners-popup.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/plan-item-lifecycle-listeners-popup.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/plan-item-lifecycle-listeners-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/plan-item-lifecycle-listeners-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/plan-item-lifecycle-listeners-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/plan-item-lifecycle-listeners-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/planitem-dropdown-read-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/planitem-dropdown-read-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/planitem-dropdown-read-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/planitem-dropdown-read-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/planitem-dropdown-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/planitem-dropdown-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/planitem-dropdown-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/planitem-dropdown-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/process-historylevel-property-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/process-historylevel-property-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/process-historylevel-property-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/process-historylevel-property-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/process-reference-display-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/process-reference-display-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/process-reference-display-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/process-reference-display-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/process-reference-popup.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/process-reference-popup.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/process-reference-popup.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/process-reference-popup.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/process-reference-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/process-reference-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/process-reference-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/process-reference-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/sequenceflow-order-display-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/sequenceflow-order-display-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/sequenceflow-order-display-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/sequenceflow-order-display-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/sequenceflow-order-popup.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/sequenceflow-order-popup.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/sequenceflow-order-popup.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/sequenceflow-order-popup.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/sequenceflow-order-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/sequenceflow-order-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/sequenceflow-order-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/sequenceflow-order-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/signal-definitions-display-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/signal-definitions-display-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/signal-definitions-display-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/signal-definitions-display-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/signal-definitions-popup.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/signal-definitions-popup.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/signal-definitions-popup.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/signal-definitions-popup.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/signal-definitions-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/signal-definitions-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/signal-definitions-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/signal-definitions-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/signal-property-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/signal-property-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/signal-property-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/signal-property-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/string-property-write-mode-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/string-property-write-mode-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/string-property-write-mode-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/string-property-write-mode-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/task-listeners-display-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/task-listeners-display-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/task-listeners-display-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/task-listeners-display-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/task-listeners-popup.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/task-listeners-popup.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/task-listeners-popup.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/task-listeners-popup.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/task-listeners-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/task-listeners-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/task-listeners-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/task-listeners-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/text-popup.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/text-popup.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/text-popup.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/text-popup.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/text-property-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/text-property-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/text-property-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/text-property-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/transition-event-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/transition-event-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/transition-event-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/transition-event-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/trigger-mode-read-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/trigger-mode-read-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/trigger-mode-read-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/trigger-mode-read-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/properties/trigger-mode-write-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/trigger-mode-write-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/properties/trigger-mode-write-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/properties/trigger-mode-write-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/toolbar-custom-actions.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/toolbar-custom-actions.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/toolbar-custom-actions.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/toolbar-custom-actions.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/toolbar-default-actions.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/toolbar-default-actions.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/toolbar-default-actions.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/toolbar-default-actions.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/toolbar.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/toolbar.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/toolbar.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/toolbar.js diff --git a/snow-flowable/src/main/resources/static/editor-app/configuration/url-config.js b/snow-admin/src/main/resources/static/modeler/editor-app/configuration/url-config.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/configuration/url-config.js rename to snow-admin/src/main/resources/static/modeler/editor-app/configuration/url-config.js diff --git a/snow-flowable/src/main/resources/static/editor-app/css/style.css b/snow-admin/src/main/resources/static/modeler/editor-app/css/style.css similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/css/style.css rename to snow-admin/src/main/resources/static/modeler/editor-app/css/style.css diff --git a/snow-flowable/src/main/resources/static/editor-app/define-data-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/define-data-controller.js similarity index 99% rename from snow-flowable/src/main/resources/static/editor-app/define-data-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/define-data-controller.js index db3a403..3e6017d 100644 --- a/snow-flowable/src/main/resources/static/editor-app/define-data-controller.js +++ b/snow-admin/src/main/resources/static/modeler/editor-app/define-data-controller.js @@ -85,7 +85,7 @@ var FlowableDefineDataCtrl = [ '$rootScope', '$scope', 'dialog', '$timeout', '$t $scope.definedDataItems.splice(index + 1, 0, temp); }, 100); - } + }getUserList } }; diff --git a/snow-flowable/src/main/resources/static/editor-app/editor-config.js b/snow-admin/src/main/resources/static/modeler/editor-app/editor-config.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/editor-config.js rename to snow-admin/src/main/resources/static/modeler/editor-app/editor-config.js diff --git a/snow-flowable/src/main/resources/static/editor-app/editor-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/editor-controller.js similarity index 99% rename from snow-flowable/src/main/resources/static/editor-app/editor-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/editor-controller.js index 4dc39f5..b3a982b 100644 --- a/snow-flowable/src/main/resources/static/editor-app/editor-controller.js +++ b/snow-admin/src/main/resources/static/modeler/editor-app/editor-controller.js @@ -399,6 +399,7 @@ angular.module('flowableModeler') editorManager.setModelData(response); return response; }).then(function (modelData) { + console.log("======>"+JSON.stringify(modelData)); if(modelData.data.model.stencilset.namespace == 'http://b3mn.org/stencilset/cmmn1.1#') { return $http.get(FLOWABLE.URL.getCmmnStencilSet()); } else { diff --git a/snow-flowable/src/main/resources/static/editor-app/editor-utils.js b/snow-admin/src/main/resources/static/modeler/editor-app/editor-utils.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/editor-utils.js rename to snow-admin/src/main/resources/static/modeler/editor-app/editor-utils.js diff --git a/snow-flowable/src/main/resources/static/editor-app/editor.html b/snow-admin/src/main/resources/static/modeler/editor-app/editor.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/editor.html rename to snow-admin/src/main/resources/static/modeler/editor-app/editor.html diff --git a/snow-flowable/src/main/resources/static/editor-app/editor/css/editor.css b/snow-admin/src/main/resources/static/modeler/editor-app/editor/css/editor.css similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/editor/css/editor.css rename to snow-admin/src/main/resources/static/modeler/editor-app/editor/css/editor.css diff --git a/snow-flowable/src/main/resources/static/editor-app/editor/i18n/translation_de.js b/snow-admin/src/main/resources/static/modeler/editor-app/editor/i18n/translation_de.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/editor/i18n/translation_de.js rename to snow-admin/src/main/resources/static/modeler/editor-app/editor/i18n/translation_de.js diff --git a/snow-flowable/src/main/resources/static/editor-app/editor/i18n/translation_en_us.js b/snow-admin/src/main/resources/static/modeler/editor-app/editor/i18n/translation_en_us.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/editor/i18n/translation_en_us.js rename to snow-admin/src/main/resources/static/modeler/editor-app/editor/i18n/translation_en_us.js diff --git a/snow-flowable/src/main/resources/static/editor-app/editor/i18n/translation_signavio_de.js b/snow-admin/src/main/resources/static/modeler/editor-app/editor/i18n/translation_signavio_de.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/editor/i18n/translation_signavio_de.js rename to snow-admin/src/main/resources/static/modeler/editor-app/editor/i18n/translation_signavio_de.js diff --git a/snow-flowable/src/main/resources/static/editor-app/editor/i18n/translation_signavio_en_us.js b/snow-admin/src/main/resources/static/modeler/editor-app/editor/i18n/translation_signavio_en_us.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/editor/i18n/translation_signavio_en_us.js rename to snow-admin/src/main/resources/static/modeler/editor-app/editor/i18n/translation_signavio_en_us.js diff --git a/snow-flowable/src/main/resources/static/editor-app/editor/oryx.debug.js b/snow-admin/src/main/resources/static/modeler/editor-app/editor/oryx.debug.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/editor/oryx.debug.js rename to snow-admin/src/main/resources/static/modeler/editor-app/editor/oryx.debug.js diff --git a/snow-flowable/src/main/resources/static/editor-app/editor/oryx.js b/snow-admin/src/main/resources/static/modeler/editor-app/editor/oryx.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/editor/oryx.js rename to snow-admin/src/main/resources/static/modeler/editor-app/editor/oryx.js diff --git a/snow-flowable/src/main/resources/static/editor-app/editormanager.js b/snow-admin/src/main/resources/static/modeler/editor-app/editormanager.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/editormanager.js rename to snow-admin/src/main/resources/static/modeler/editor-app/editormanager.js diff --git a/snow-flowable/src/main/resources/static/editor-app/eventbus.js b/snow-admin/src/main/resources/static/modeler/editor-app/eventbus.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/eventbus.js rename to snow-admin/src/main/resources/static/modeler/editor-app/eventbus.js diff --git a/snow-flowable/src/main/resources/static/editor-app/fonts/FontAwesome.otf b/snow-admin/src/main/resources/static/modeler/editor-app/fonts/FontAwesome.otf similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/fonts/FontAwesome.otf rename to snow-admin/src/main/resources/static/modeler/editor-app/fonts/FontAwesome.otf diff --git a/snow-flowable/src/main/resources/static/editor-app/fonts/activiti-admin-webfont.eot b/snow-admin/src/main/resources/static/modeler/editor-app/fonts/activiti-admin-webfont.eot similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/fonts/activiti-admin-webfont.eot rename to snow-admin/src/main/resources/static/modeler/editor-app/fonts/activiti-admin-webfont.eot diff --git a/snow-flowable/src/main/resources/static/editor-app/fonts/activiti-admin-webfont.svg b/snow-admin/src/main/resources/static/modeler/editor-app/fonts/activiti-admin-webfont.svg similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/fonts/activiti-admin-webfont.svg rename to snow-admin/src/main/resources/static/modeler/editor-app/fonts/activiti-admin-webfont.svg diff --git a/snow-flowable/src/main/resources/static/editor-app/fonts/activiti-admin-webfont.ttf b/snow-admin/src/main/resources/static/modeler/editor-app/fonts/activiti-admin-webfont.ttf similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/fonts/activiti-admin-webfont.ttf rename to snow-admin/src/main/resources/static/modeler/editor-app/fonts/activiti-admin-webfont.ttf diff --git a/snow-flowable/src/main/resources/static/editor-app/fonts/activiti-admin-webfont.woff b/snow-admin/src/main/resources/static/modeler/editor-app/fonts/activiti-admin-webfont.woff similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/fonts/activiti-admin-webfont.woff rename to snow-admin/src/main/resources/static/modeler/editor-app/fonts/activiti-admin-webfont.woff diff --git a/snow-flowable/src/main/resources/static/editor-app/fonts/fontawesome-webfont.eot b/snow-admin/src/main/resources/static/modeler/editor-app/fonts/fontawesome-webfont.eot similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/fonts/fontawesome-webfont.eot rename to snow-admin/src/main/resources/static/modeler/editor-app/fonts/fontawesome-webfont.eot diff --git a/snow-flowable/src/main/resources/static/editor-app/fonts/fontawesome-webfont.svg b/snow-admin/src/main/resources/static/modeler/editor-app/fonts/fontawesome-webfont.svg similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/fonts/fontawesome-webfont.svg rename to snow-admin/src/main/resources/static/modeler/editor-app/fonts/fontawesome-webfont.svg diff --git a/snow-flowable/src/main/resources/static/editor-app/fonts/fontawesome-webfont.ttf b/snow-admin/src/main/resources/static/modeler/editor-app/fonts/fontawesome-webfont.ttf similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/fonts/fontawesome-webfont.ttf rename to snow-admin/src/main/resources/static/modeler/editor-app/fonts/fontawesome-webfont.ttf diff --git a/snow-flowable/src/main/resources/static/editor-app/fonts/fontawesome-webfont.woff b/snow-admin/src/main/resources/static/modeler/editor-app/fonts/fontawesome-webfont.woff similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/fonts/fontawesome-webfont.woff rename to snow-admin/src/main/resources/static/modeler/editor-app/fonts/fontawesome-webfont.woff diff --git a/snow-flowable/src/main/resources/static/editor-app/fonts/fontawesome-webfont.woff2 b/snow-admin/src/main/resources/static/modeler/editor-app/fonts/fontawesome-webfont.woff2 similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/fonts/fontawesome-webfont.woff2 rename to snow-admin/src/main/resources/static/modeler/editor-app/fonts/fontawesome-webfont.woff2 diff --git a/snow-flowable/src/main/resources/static/editor-app/fonts/glyphicons-halflings-regular.eot b/snow-admin/src/main/resources/static/modeler/editor-app/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/fonts/glyphicons-halflings-regular.eot rename to snow-admin/src/main/resources/static/modeler/editor-app/fonts/glyphicons-halflings-regular.eot diff --git a/snow-flowable/src/main/resources/static/editor-app/fonts/glyphicons-halflings-regular.svg b/snow-admin/src/main/resources/static/modeler/editor-app/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/fonts/glyphicons-halflings-regular.svg rename to snow-admin/src/main/resources/static/modeler/editor-app/fonts/glyphicons-halflings-regular.svg diff --git a/snow-flowable/src/main/resources/static/editor-app/fonts/glyphicons-halflings-regular.ttf b/snow-admin/src/main/resources/static/modeler/editor-app/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/fonts/glyphicons-halflings-regular.ttf rename to snow-admin/src/main/resources/static/modeler/editor-app/fonts/glyphicons-halflings-regular.ttf diff --git a/snow-flowable/src/main/resources/static/editor-app/fonts/glyphicons-halflings-regular.woff b/snow-admin/src/main/resources/static/modeler/editor-app/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/fonts/glyphicons-halflings-regular.woff rename to snow-admin/src/main/resources/static/modeler/editor-app/fonts/glyphicons-halflings-regular.woff diff --git a/snow-flowable/src/main/resources/static/editor-app/header-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/header-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/header-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/header-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/images/bpmn-error.png b/snow-admin/src/main/resources/static/modeler/editor-app/images/bpmn-error.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/images/bpmn-error.png rename to snow-admin/src/main/resources/static/modeler/editor-app/images/bpmn-error.png diff --git a/snow-flowable/src/main/resources/static/editor-app/images/bpmn-warning.png b/snow-admin/src/main/resources/static/modeler/editor-app/images/bpmn-warning.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/images/bpmn-warning.png rename to snow-admin/src/main/resources/static/modeler/editor-app/images/bpmn-warning.png diff --git a/snow-flowable/src/main/resources/static/editor-app/images/datadefinition.png b/snow-admin/src/main/resources/static/modeler/editor-app/images/datadefinition.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/images/datadefinition.png rename to snow-admin/src/main/resources/static/modeler/editor-app/images/datadefinition.png diff --git a/snow-flowable/src/main/resources/static/editor-app/images/delete.png b/snow-admin/src/main/resources/static/modeler/editor-app/images/delete.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/images/delete.png rename to snow-admin/src/main/resources/static/modeler/editor-app/images/delete.png diff --git a/snow-flowable/src/main/resources/static/editor-app/images/loading.gif b/snow-admin/src/main/resources/static/modeler/editor-app/images/loading.gif similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/images/loading.gif rename to snow-admin/src/main/resources/static/modeler/editor-app/images/loading.gif diff --git a/snow-flowable/src/main/resources/static/editor-app/images/nw-handle-dark.gif b/snow-admin/src/main/resources/static/modeler/editor-app/images/nw-handle-dark.gif similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/images/nw-handle-dark.gif rename to snow-admin/src/main/resources/static/modeler/editor-app/images/nw-handle-dark.gif diff --git a/snow-flowable/src/main/resources/static/editor-app/images/pencil.png b/snow-admin/src/main/resources/static/modeler/editor-app/images/pencil.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/images/pencil.png rename to snow-admin/src/main/resources/static/modeler/editor-app/images/pencil.png diff --git a/snow-flowable/src/main/resources/static/editor-app/images/report_edit.png b/snow-admin/src/main/resources/static/modeler/editor-app/images/report_edit.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/images/report_edit.png rename to snow-admin/src/main/resources/static/modeler/editor-app/images/report_edit.png diff --git a/snow-flowable/src/main/resources/static/editor-app/images/se-handle-dark.gif b/snow-admin/src/main/resources/static/modeler/editor-app/images/se-handle-dark.gif similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/images/se-handle-dark.gif rename to snow-admin/src/main/resources/static/modeler/editor-app/images/se-handle-dark.gif diff --git a/snow-flowable/src/main/resources/static/editor-app/images/shapemenu_highlight.png b/snow-admin/src/main/resources/static/modeler/editor-app/images/shapemenu_highlight.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/images/shapemenu_highlight.png rename to snow-admin/src/main/resources/static/modeler/editor-app/images/shapemenu_highlight.png diff --git a/snow-flowable/src/main/resources/static/editor-app/images/wrench.png b/snow-admin/src/main/resources/static/modeler/editor-app/images/wrench.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/images/wrench.png rename to snow-admin/src/main/resources/static/modeler/editor-app/images/wrench.png diff --git a/snow-flowable/src/main/resources/static/editor-app/img-kis/add-bendpoint-hover.png b/snow-admin/src/main/resources/static/modeler/editor-app/img-kis/add-bendpoint-hover.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/img-kis/add-bendpoint-hover.png rename to snow-admin/src/main/resources/static/modeler/editor-app/img-kis/add-bendpoint-hover.png diff --git a/snow-flowable/src/main/resources/static/editor-app/img-kis/add-bendpoint.png b/snow-admin/src/main/resources/static/modeler/editor-app/img-kis/add-bendpoint.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/img-kis/add-bendpoint.png rename to snow-admin/src/main/resources/static/modeler/editor-app/img-kis/add-bendpoint.png diff --git a/snow-flowable/src/main/resources/static/editor-app/img-kis/grid.gif b/snow-admin/src/main/resources/static/modeler/editor-app/img-kis/grid.gif similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/img-kis/grid.gif rename to snow-admin/src/main/resources/static/modeler/editor-app/img-kis/grid.gif diff --git a/snow-flowable/src/main/resources/static/editor-app/img-kis/icon-add-bendpoint-selected.png b/snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-add-bendpoint-selected.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/img-kis/icon-add-bendpoint-selected.png rename to snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-add-bendpoint-selected.png diff --git a/snow-flowable/src/main/resources/static/editor-app/img-kis/icon-add-bendpoint.png b/snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-add-bendpoint.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/img-kis/icon-add-bendpoint.png rename to snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-add-bendpoint.png diff --git a/snow-flowable/src/main/resources/static/editor-app/img-kis/icon-align-horizontal-selected.png b/snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-align-horizontal-selected.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/img-kis/icon-align-horizontal-selected.png rename to snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-align-horizontal-selected.png diff --git a/snow-flowable/src/main/resources/static/editor-app/img-kis/icon-align-horizontal.png b/snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-align-horizontal.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/img-kis/icon-align-horizontal.png rename to snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-align-horizontal.png diff --git a/snow-flowable/src/main/resources/static/editor-app/img-kis/icon-align-vertical-selected.png b/snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-align-vertical-selected.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/img-kis/icon-align-vertical-selected.png rename to snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-align-vertical-selected.png diff --git a/snow-flowable/src/main/resources/static/editor-app/img-kis/icon-align-vertical.png b/snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-align-vertical.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/img-kis/icon-align-vertical.png rename to snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-align-vertical.png diff --git a/snow-flowable/src/main/resources/static/editor-app/img-kis/icon-remove-bendpoint-selected.png b/snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-remove-bendpoint-selected.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/img-kis/icon-remove-bendpoint-selected.png rename to snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-remove-bendpoint-selected.png diff --git a/snow-flowable/src/main/resources/static/editor-app/img-kis/icon-remove-bendpoint.png b/snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-remove-bendpoint.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/img-kis/icon-remove-bendpoint.png rename to snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-remove-bendpoint.png diff --git a/snow-flowable/src/main/resources/static/editor-app/img-kis/icon-same-size-selected.png b/snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-same-size-selected.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/img-kis/icon-same-size-selected.png rename to snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-same-size-selected.png diff --git a/snow-flowable/src/main/resources/static/editor-app/img-kis/icon-same-size.png b/snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-same-size.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/img-kis/icon-same-size.png rename to snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-same-size.png diff --git a/snow-flowable/src/main/resources/static/editor-app/img-kis/icon-zoom-actual-selected.png b/snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-zoom-actual-selected.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/img-kis/icon-zoom-actual-selected.png rename to snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-zoom-actual-selected.png diff --git a/snow-flowable/src/main/resources/static/editor-app/img-kis/icon-zoom-actual.png b/snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-zoom-actual.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/img-kis/icon-zoom-actual.png rename to snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-zoom-actual.png diff --git a/snow-flowable/src/main/resources/static/editor-app/img-kis/icon-zoom-fit-selected.png b/snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-zoom-fit-selected.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/img-kis/icon-zoom-fit-selected.png rename to snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-zoom-fit-selected.png diff --git a/snow-flowable/src/main/resources/static/editor-app/img-kis/icon-zoom-fit.png b/snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-zoom-fit.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/img-kis/icon-zoom-fit.png rename to snow-admin/src/main/resources/static/modeler/editor-app/img-kis/icon-zoom-fit.png diff --git a/snow-flowable/src/main/resources/static/editor-app/img-kis/kis_logo.png b/snow-admin/src/main/resources/static/modeler/editor-app/img-kis/kis_logo.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/img-kis/kis_logo.png rename to snow-admin/src/main/resources/static/modeler/editor-app/img-kis/kis_logo.png diff --git a/snow-flowable/src/main/resources/static/editor-app/img-kis/remove-bendpoint-hover.png b/snow-admin/src/main/resources/static/modeler/editor-app/img-kis/remove-bendpoint-hover.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/img-kis/remove-bendpoint-hover.png rename to snow-admin/src/main/resources/static/modeler/editor-app/img-kis/remove-bendpoint-hover.png diff --git a/snow-flowable/src/main/resources/static/editor-app/img-kis/remove-bendpoint.png b/snow-admin/src/main/resources/static/modeler/editor-app/img-kis/remove-bendpoint.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/img-kis/remove-bendpoint.png rename to snow-admin/src/main/resources/static/modeler/editor-app/img-kis/remove-bendpoint.png diff --git a/snow-flowable/src/main/resources/static/editor-app/libs/jquery.autogrow-textarea.js b/snow-admin/src/main/resources/static/modeler/editor-app/libs/jquery.autogrow-textarea.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/libs/jquery.autogrow-textarea.js rename to snow-admin/src/main/resources/static/modeler/editor-app/libs/jquery.autogrow-textarea.js diff --git a/snow-flowable/src/main/resources/static/editor-app/libs/mousetrap/1.6.0/mousetrap-record.js b/snow-admin/src/main/resources/static/modeler/editor-app/libs/mousetrap/1.6.0/mousetrap-record.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/libs/mousetrap/1.6.0/mousetrap-record.js rename to snow-admin/src/main/resources/static/modeler/editor-app/libs/mousetrap/1.6.0/mousetrap-record.js diff --git a/snow-flowable/src/main/resources/static/editor-app/libs/mousetrap/1.6.0/mousetrap.js b/snow-admin/src/main/resources/static/modeler/editor-app/libs/mousetrap/1.6.0/mousetrap.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/libs/mousetrap/1.6.0/mousetrap.js rename to snow-admin/src/main/resources/static/modeler/editor-app/libs/mousetrap/1.6.0/mousetrap.js diff --git a/snow-flowable/src/main/resources/static/editor-app/libs/mousetrap/1.6.0/mousetrap.min.js b/snow-admin/src/main/resources/static/modeler/editor-app/libs/mousetrap/1.6.0/mousetrap.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/libs/mousetrap/1.6.0/mousetrap.min.js rename to snow-admin/src/main/resources/static/modeler/editor-app/libs/mousetrap/1.6.0/mousetrap.min.js diff --git a/snow-flowable/src/main/resources/static/editor-app/libs/path_parser.js b/snow-admin/src/main/resources/static/modeler/editor-app/libs/path_parser.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/libs/path_parser.js rename to snow-admin/src/main/resources/static/modeler/editor-app/libs/path_parser.js diff --git a/snow-flowable/src/main/resources/static/editor-app/libs/prototype-1.6.1.js b/snow-admin/src/main/resources/static/modeler/editor-app/libs/prototype-1.6.1.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/libs/prototype-1.6.1.js rename to snow-admin/src/main/resources/static/modeler/editor-app/libs/prototype-1.6.1.js diff --git a/snow-flowable/src/main/resources/static/editor-app/libs/prototype-1.7.3.js b/snow-admin/src/main/resources/static/modeler/editor-app/libs/prototype-1.7.3.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/libs/prototype-1.7.3.js rename to snow-admin/src/main/resources/static/modeler/editor-app/libs/prototype-1.7.3.js diff --git a/snow-flowable/src/main/resources/static/editor-app/libs/ui-utils.min-0.2.1.js b/snow-admin/src/main/resources/static/modeler/editor-app/libs/ui-utils.min-0.2.1.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/libs/ui-utils.min-0.2.1.js rename to snow-admin/src/main/resources/static/modeler/editor-app/libs/ui-utils.min-0.2.1.js diff --git a/snow-flowable/src/main/resources/static/editor-app/libs/update-helper.js b/snow-admin/src/main/resources/static/modeler/editor-app/libs/update-helper.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/libs/update-helper.js rename to snow-admin/src/main/resources/static/modeler/editor-app/libs/update-helper.js diff --git a/snow-flowable/src/main/resources/static/editor-app/partials/process-tree-list.html b/snow-admin/src/main/resources/static/modeler/editor-app/partials/process-tree-list.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/partials/process-tree-list.html rename to snow-admin/src/main/resources/static/modeler/editor-app/partials/process-tree-list.html diff --git a/snow-flowable/src/main/resources/static/editor-app/partials/root-stencil-item-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/partials/root-stencil-item-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/partials/root-stencil-item-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/partials/root-stencil-item-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/partials/stencil-item-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/partials/stencil-item-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/partials/stencil-item-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/partials/stencil-item-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/plugins.xml b/snow-admin/src/main/resources/static/modeler/editor-app/plugins.xml similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/plugins.xml rename to snow-admin/src/main/resources/static/modeler/editor-app/plugins.xml diff --git a/snow-flowable/src/main/resources/static/editor-app/popups/define-data.html b/snow-admin/src/main/resources/static/modeler/editor-app/popups/define-data.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/popups/define-data.html rename to snow-admin/src/main/resources/static/modeler/editor-app/popups/define-data.html diff --git a/snow-flowable/src/main/resources/static/editor-app/popups/icon-template.html b/snow-admin/src/main/resources/static/modeler/editor-app/popups/icon-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/popups/icon-template.html rename to snow-admin/src/main/resources/static/modeler/editor-app/popups/icon-template.html diff --git a/snow-flowable/src/main/resources/static/editor-app/popups/save-model.html b/snow-admin/src/main/resources/static/modeler/editor-app/popups/save-model.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/popups/save-model.html rename to snow-admin/src/main/resources/static/modeler/editor-app/popups/save-model.html diff --git a/snow-flowable/src/main/resources/static/editor-app/popups/select-shape.html b/snow-admin/src/main/resources/static/modeler/editor-app/popups/select-shape.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/popups/select-shape.html rename to snow-admin/src/main/resources/static/modeler/editor-app/popups/select-shape.html diff --git a/snow-flowable/src/main/resources/static/editor-app/popups/unsaved-changes.html b/snow-admin/src/main/resources/static/modeler/editor-app/popups/unsaved-changes.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/popups/unsaved-changes.html rename to snow-admin/src/main/resources/static/modeler/editor-app/popups/unsaved-changes.html diff --git a/snow-flowable/src/main/resources/static/editor-app/popups/validate-model.html b/snow-admin/src/main/resources/static/modeler/editor-app/popups/validate-model.html similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/popups/validate-model.html rename to snow-admin/src/main/resources/static/modeler/editor-app/popups/validate-model.html diff --git a/snow-flowable/src/main/resources/static/editor-app/process-navigator-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/process-navigator-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/process-navigator-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/process-navigator-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/select-shape-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/select-shape-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/select-shape-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/select-shape-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/stencil-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/stencil-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencil-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/stencil-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/adhoc.subprocess.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/adhoc.subprocess.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/adhoc.subprocess.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/adhoc.subprocess.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/event.subprocess.collapsed.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/event.subprocess.collapsed.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/event.subprocess.collapsed.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/event.subprocess.collapsed.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/event.subprocess.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/event.subprocess.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/event.subprocess.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/event.subprocess.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/expanded.subprocess.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/expanded.subprocess.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/expanded.subprocess.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/expanded.subprocess.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.business.rule.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.business.rule.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.business.rule.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.business.rule.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.camel.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.camel.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.camel.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.camel.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.decision.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.decision.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.decision.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.decision.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.http.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.http.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.http.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.http.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.manual.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.manual.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.manual.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.manual.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.mule.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.mule.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.mule.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.mule.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.receive.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.receive.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.receive.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.receive.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.script.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.script.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.script.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.script.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.send.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.send.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.send.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.send.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.service.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.service.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.service.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.service.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.shell.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.shell.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.shell.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.shell.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.user.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.user.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.user.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.user.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/subprocess.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/subprocess.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/subprocess.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/subprocess.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/task.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/task.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/activity/task.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/activity/task.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/artifact/text.annotation.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/artifact/text.annotation.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/artifact/text.annotation.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/artifact/text.annotation.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/catching/cancel.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/catching/cancel.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/catching/cancel.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/catching/cancel.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/catching/compensation.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/catching/compensation.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/catching/compensation.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/catching/compensation.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/catching/error.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/catching/error.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/catching/error.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/catching/error.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/catching/message.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/catching/message.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/catching/message.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/catching/message.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/catching/signal.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/catching/signal.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/catching/signal.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/catching/signal.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/catching/timer.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/catching/timer.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/catching/timer.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/catching/timer.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/connector/association.undirected.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/connector/association.undirected.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/connector/association.undirected.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/connector/association.undirected.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/connector/association.unidirectional.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/connector/association.unidirectional.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/connector/association.unidirectional.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/connector/association.unidirectional.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/connector/messageflow.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/connector/messageflow.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/connector/messageflow.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/connector/messageflow.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/connector/sequenceflow.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/connector/sequenceflow.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/connector/sequenceflow.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/connector/sequenceflow.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/dataobject/data.store.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/dataobject/data.store.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/dataobject/data.store.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/dataobject/data.store.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/diagram.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/diagram.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/diagram.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/diagram.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/endevent/cancel.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/endevent/cancel.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/endevent/cancel.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/endevent/cancel.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/endevent/error.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/endevent/error.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/endevent/error.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/endevent/error.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/endevent/none.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/endevent/none.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/endevent/none.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/endevent/none.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/endevent/terminate.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/endevent/terminate.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/endevent/terminate.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/endevent/terminate.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/gateway/eventbased.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/gateway/eventbased.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/gateway/eventbased.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/gateway/eventbased.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/gateway/exclusive.databased.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/gateway/exclusive.databased.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/gateway/exclusive.databased.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/gateway/exclusive.databased.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/gateway/inclusive.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/gateway/inclusive.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/gateway/inclusive.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/gateway/inclusive.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/gateway/parallel.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/gateway/parallel.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/gateway/parallel.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/gateway/parallel.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/startevent/error.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/startevent/error.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/startevent/error.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/startevent/error.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/startevent/message.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/startevent/message.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/startevent/message.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/startevent/message.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/startevent/none.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/startevent/none.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/startevent/none.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/startevent/none.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/startevent/signal.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/startevent/signal.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/startevent/signal.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/startevent/signal.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/startevent/timer.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/startevent/timer.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/startevent/timer.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/startevent/timer.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/swimlane/lane.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/swimlane/lane.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/swimlane/lane.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/swimlane/lane.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/swimlane/pool.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/swimlane/pool.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/swimlane/pool.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/swimlane/pool.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/throwing/none.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/throwing/none.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/throwing/none.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/throwing/none.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/throwing/signal.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/throwing/signal.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/bpmn2.0/icons/throwing/signal.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/bpmn2.0/icons/throwing/signal.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/activity/casefileitem.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/activity/casefileitem.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/activity/casefileitem.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/activity/casefileitem.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/activity/casetask.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/activity/casetask.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/activity/casetask.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/activity/casetask.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/activity/collapsed.planfragment.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/activity/collapsed.planfragment.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/activity/collapsed.planfragment.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/activity/collapsed.planfragment.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/activity/decisiontask.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/activity/decisiontask.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/activity/decisiontask.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/activity/decisiontask.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/activity/expanded.planfragment.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/activity/expanded.planfragment.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/activity/expanded.planfragment.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/activity/expanded.planfragment.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/activity/httptask.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/activity/httptask.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/activity/httptask.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/activity/httptask.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/activity/humantask.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/activity/humantask.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/activity/humantask.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/activity/humantask.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/activity/milestone.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/activity/milestone.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/activity/milestone.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/activity/milestone.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/activity/processtask.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/activity/processtask.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/activity/processtask.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/activity/processtask.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/activity/scripttask.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/activity/scripttask.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/activity/scripttask.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/activity/scripttask.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/activity/servicetask.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/activity/servicetask.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/activity/servicetask.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/activity/servicetask.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/activity/task.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/activity/task.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/activity/task.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/activity/task.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/activity/timereventlistener.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/activity/timereventlistener.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/activity/timereventlistener.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/activity/timereventlistener.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/connection/connector.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/connection/connector.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/connection/connector.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/connection/connector.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/containers/caseplanmodel.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/containers/caseplanmodel.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/containers/caseplanmodel.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/containers/caseplanmodel.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/containers/collapsed.stage.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/containers/collapsed.stage.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/containers/collapsed.stage.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/containers/collapsed.stage.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/containers/expanded.stage.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/containers/expanded.stage.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/containers/expanded.stage.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/containers/expanded.stage.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/event/eventlistener.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/event/eventlistener.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/event/eventlistener.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/event/eventlistener.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/event/timerlistener.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/event/timerlistener.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/event/timerlistener.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/event/timerlistener.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/event/userlistener.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/event/userlistener.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/event/userlistener.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/event/userlistener.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/sentry/entry.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/sentry/entry.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/sentry/entry.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/sentry/entry.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/sentry/exit.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/sentry/exit.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/sentry/exit.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/sentry/exit.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/tables/planningtable.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/tables/planningtable.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/cmmn1.1/icons/tables/planningtable.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/cmmn1.1/icons/tables/planningtable.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_action.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_action.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_action.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_action.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_action_container.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_action_container.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_action_container.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_action_container.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_alert.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_alert.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_alert.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_alert.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_case.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_case.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_case.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_case.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_checkbox.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_checkbox.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_checkbox.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_checkbox.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_choices.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_choices.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_choices.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_choices.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_combo.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_combo.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_combo.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_combo.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_date.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_date.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_date.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_date.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_form.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_form.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_form.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_form.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_group.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_group.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_group.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_group.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_header.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_header.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_header.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_header.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_help.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_help.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_help.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_help.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_hint.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_hint.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_hint.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_hint.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_input.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_input.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_input.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_input.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_item.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_item.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_item.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_item.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_itemset.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_itemset.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_itemset.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_itemset.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_label.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_label.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_label.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_label.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_number.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_number.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_number.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_number.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_output.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_output.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_output.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_output.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_paragraph.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_paragraph.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_paragraph.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_paragraph.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_radiobutton.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_radiobutton.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_radiobutton.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_radiobutton.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_range.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_range.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_range.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_range.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_repeat.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_repeat.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_repeat.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_repeat.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_repeating_group.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_repeating_group.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_repeating_group.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_repeating_group.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_secret.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_secret.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_secret.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_secret.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_select.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_select.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_select.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_select.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_select1.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_select1.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_select1.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_select1.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_separator.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_separator.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_separator.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_separator.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_submit.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_submit.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_submit.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_submit.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_switch.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_switch.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_switch.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_switch.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_textarea.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_textarea.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_textarea.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_textarea.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_trigger.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_trigger.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_trigger.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_trigger.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_upload.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_upload.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/icons/new_upload.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/icons/new_upload.png diff --git a/snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/xforms.png b/snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/xforms.png similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/stencilsets/xforms/xforms.png rename to snow-admin/src/main/resources/static/modeler/editor-app/stencilsets/xforms/xforms.png diff --git a/snow-flowable/src/main/resources/static/editor-app/toolbar-controller.js b/snow-admin/src/main/resources/static/modeler/editor-app/toolbar-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/toolbar-controller.js rename to snow-admin/src/main/resources/static/modeler/editor-app/toolbar-controller.js diff --git a/snow-flowable/src/main/resources/static/editor-app/tour.js b/snow-admin/src/main/resources/static/modeler/editor-app/tour.js similarity index 100% rename from snow-flowable/src/main/resources/static/editor-app/tour.js rename to snow-admin/src/main/resources/static/modeler/editor-app/tour.js diff --git a/snow-flowable/src/main/resources/static/favicon.ico b/snow-admin/src/main/resources/static/modeler/favicon.ico similarity index 100% rename from snow-flowable/src/main/resources/static/favicon.ico rename to snow-admin/src/main/resources/static/modeler/favicon.ico diff --git a/snow-flowable/src/main/resources/static/fonts/TitilliumWeb-Bold.ttf b/snow-admin/src/main/resources/static/modeler/fonts/TitilliumWeb-Bold.ttf similarity index 100% rename from snow-flowable/src/main/resources/static/fonts/TitilliumWeb-Bold.ttf rename to snow-admin/src/main/resources/static/modeler/fonts/TitilliumWeb-Bold.ttf diff --git a/snow-flowable/src/main/resources/static/fonts/TitilliumWeb-Regular.ttf b/snow-admin/src/main/resources/static/modeler/fonts/TitilliumWeb-Regular.ttf similarity index 100% rename from snow-flowable/src/main/resources/static/fonts/TitilliumWeb-Regular.ttf rename to snow-admin/src/main/resources/static/modeler/fonts/TitilliumWeb-Regular.ttf diff --git a/snow-flowable/src/main/resources/static/fonts/cherokee-webfont.eot b/snow-admin/src/main/resources/static/modeler/fonts/cherokee-webfont.eot similarity index 100% rename from snow-flowable/src/main/resources/static/fonts/cherokee-webfont.eot rename to snow-admin/src/main/resources/static/modeler/fonts/cherokee-webfont.eot diff --git a/snow-flowable/src/main/resources/static/fonts/cherokee-webfont.svg b/snow-admin/src/main/resources/static/modeler/fonts/cherokee-webfont.svg similarity index 100% rename from snow-flowable/src/main/resources/static/fonts/cherokee-webfont.svg rename to snow-admin/src/main/resources/static/modeler/fonts/cherokee-webfont.svg diff --git a/snow-flowable/src/main/resources/static/fonts/cherokee-webfont.ttf b/snow-admin/src/main/resources/static/modeler/fonts/cherokee-webfont.ttf similarity index 100% rename from snow-flowable/src/main/resources/static/fonts/cherokee-webfont.ttf rename to snow-admin/src/main/resources/static/modeler/fonts/cherokee-webfont.ttf diff --git a/snow-flowable/src/main/resources/static/fonts/cherokee-webfont.woff b/snow-admin/src/main/resources/static/modeler/fonts/cherokee-webfont.woff similarity index 100% rename from snow-flowable/src/main/resources/static/fonts/cherokee-webfont.woff rename to snow-admin/src/main/resources/static/modeler/fonts/cherokee-webfont.woff diff --git a/snow-flowable/src/main/resources/static/fonts/glyphicons-halflings-regular.eot b/snow-admin/src/main/resources/static/modeler/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from snow-flowable/src/main/resources/static/fonts/glyphicons-halflings-regular.eot rename to snow-admin/src/main/resources/static/modeler/fonts/glyphicons-halflings-regular.eot diff --git a/snow-flowable/src/main/resources/static/fonts/glyphicons-halflings-regular.svg b/snow-admin/src/main/resources/static/modeler/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from snow-flowable/src/main/resources/static/fonts/glyphicons-halflings-regular.svg rename to snow-admin/src/main/resources/static/modeler/fonts/glyphicons-halflings-regular.svg diff --git a/snow-flowable/src/main/resources/static/fonts/glyphicons-halflings-regular.ttf b/snow-admin/src/main/resources/static/modeler/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from snow-flowable/src/main/resources/static/fonts/glyphicons-halflings-regular.ttf rename to snow-admin/src/main/resources/static/modeler/fonts/glyphicons-halflings-regular.ttf diff --git a/snow-flowable/src/main/resources/static/fonts/glyphicons-halflings-regular.woff b/snow-admin/src/main/resources/static/modeler/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from snow-flowable/src/main/resources/static/fonts/glyphicons-halflings-regular.woff rename to snow-admin/src/main/resources/static/modeler/fonts/glyphicons-halflings-regular.woff diff --git a/snow-flowable/src/main/resources/static/fonts/lato-bold-webfont.eot b/snow-admin/src/main/resources/static/modeler/fonts/lato-bold-webfont.eot similarity index 100% rename from snow-flowable/src/main/resources/static/fonts/lato-bold-webfont.eot rename to snow-admin/src/main/resources/static/modeler/fonts/lato-bold-webfont.eot diff --git a/snow-flowable/src/main/resources/static/fonts/lato-bold-webfont.svg b/snow-admin/src/main/resources/static/modeler/fonts/lato-bold-webfont.svg similarity index 100% rename from snow-flowable/src/main/resources/static/fonts/lato-bold-webfont.svg rename to snow-admin/src/main/resources/static/modeler/fonts/lato-bold-webfont.svg diff --git a/snow-flowable/src/main/resources/static/fonts/lato-bold-webfont.ttf b/snow-admin/src/main/resources/static/modeler/fonts/lato-bold-webfont.ttf similarity index 100% rename from snow-flowable/src/main/resources/static/fonts/lato-bold-webfont.ttf rename to snow-admin/src/main/resources/static/modeler/fonts/lato-bold-webfont.ttf diff --git a/snow-flowable/src/main/resources/static/fonts/lato-bold-webfont.woff b/snow-admin/src/main/resources/static/modeler/fonts/lato-bold-webfont.woff similarity index 100% rename from snow-flowable/src/main/resources/static/fonts/lato-bold-webfont.woff rename to snow-admin/src/main/resources/static/modeler/fonts/lato-bold-webfont.woff diff --git a/snow-flowable/src/main/resources/static/fonts/lato-regular-webfont.eot b/snow-admin/src/main/resources/static/modeler/fonts/lato-regular-webfont.eot similarity index 100% rename from snow-flowable/src/main/resources/static/fonts/lato-regular-webfont.eot rename to snow-admin/src/main/resources/static/modeler/fonts/lato-regular-webfont.eot diff --git a/snow-flowable/src/main/resources/static/fonts/lato-regular-webfont.svg b/snow-admin/src/main/resources/static/modeler/fonts/lato-regular-webfont.svg similarity index 100% rename from snow-flowable/src/main/resources/static/fonts/lato-regular-webfont.svg rename to snow-admin/src/main/resources/static/modeler/fonts/lato-regular-webfont.svg diff --git a/snow-flowable/src/main/resources/static/fonts/lato-regular-webfont.ttf b/snow-admin/src/main/resources/static/modeler/fonts/lato-regular-webfont.ttf similarity index 100% rename from snow-flowable/src/main/resources/static/fonts/lato-regular-webfont.ttf rename to snow-admin/src/main/resources/static/modeler/fonts/lato-regular-webfont.ttf diff --git a/snow-flowable/src/main/resources/static/fonts/lato-regular-webfont.woff b/snow-admin/src/main/resources/static/modeler/fonts/lato-regular-webfont.woff similarity index 100% rename from snow-flowable/src/main/resources/static/fonts/lato-regular-webfont.woff rename to snow-admin/src/main/resources/static/modeler/fonts/lato-regular-webfont.woff diff --git a/snow-flowable/src/main/resources/static/i18n/en.json b/snow-admin/src/main/resources/static/modeler/i18n/en.json similarity index 100% rename from snow-flowable/src/main/resources/static/i18n/en.json rename to snow-admin/src/main/resources/static/modeler/i18n/en.json diff --git a/snow-flowable/src/main/resources/static/i18n/es.json b/snow-admin/src/main/resources/static/modeler/i18n/es.json similarity index 100% rename from snow-flowable/src/main/resources/static/i18n/es.json rename to snow-admin/src/main/resources/static/modeler/i18n/es.json diff --git a/snow-flowable/src/main/resources/static/i18n/fr.json b/snow-admin/src/main/resources/static/modeler/i18n/fr.json similarity index 100% rename from snow-flowable/src/main/resources/static/i18n/fr.json rename to snow-admin/src/main/resources/static/modeler/i18n/fr.json diff --git a/snow-flowable/src/main/resources/static/i18n/pt-BR.json b/snow-admin/src/main/resources/static/modeler/i18n/pt-BR.json similarity index 100% rename from snow-flowable/src/main/resources/static/i18n/pt-BR.json rename to snow-admin/src/main/resources/static/modeler/i18n/pt-BR.json diff --git a/snow-flowable/src/main/resources/static/i18n/zh-CN.json b/snow-admin/src/main/resources/static/modeler/i18n/zh-CN.json similarity index 100% rename from snow-flowable/src/main/resources/static/i18n/zh-CN.json rename to snow-admin/src/main/resources/static/modeler/i18n/zh-CN.json diff --git a/snow-flowable/src/main/resources/static/images/android-chrome-192x192.png b/snow-admin/src/main/resources/static/modeler/images/android-chrome-192x192.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/android-chrome-192x192.png rename to snow-admin/src/main/resources/static/modeler/images/android-chrome-192x192.png diff --git a/snow-flowable/src/main/resources/static/images/android-chrome-384x384.png b/snow-admin/src/main/resources/static/modeler/images/android-chrome-384x384.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/android-chrome-384x384.png rename to snow-admin/src/main/resources/static/modeler/images/android-chrome-384x384.png diff --git a/snow-flowable/src/main/resources/static/images/apple-touch-icon.png b/snow-admin/src/main/resources/static/modeler/images/apple-touch-icon.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/apple-touch-icon.png rename to snow-admin/src/main/resources/static/modeler/images/apple-touch-icon.png diff --git a/snow-flowable/src/main/resources/static/images/favicon-16x16.png b/snow-admin/src/main/resources/static/modeler/images/favicon-16x16.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/favicon-16x16.png rename to snow-admin/src/main/resources/static/modeler/images/favicon-16x16.png diff --git a/snow-flowable/src/main/resources/static/images/favicon-32x32.png b/snow-admin/src/main/resources/static/modeler/images/favicon-32x32.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/favicon-32x32.png rename to snow-admin/src/main/resources/static/modeler/images/favicon-32x32.png diff --git a/snow-flowable/src/main/resources/static/images/flowable-logo.png b/snow-admin/src/main/resources/static/modeler/images/flowable-logo.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/flowable-logo.png rename to snow-admin/src/main/resources/static/modeler/images/flowable-logo.png diff --git a/snow-flowable/src/main/resources/static/images/flowable-logo@2x.png b/snow-admin/src/main/resources/static/modeler/images/flowable-logo@2x.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/flowable-logo@2x.png rename to snow-admin/src/main/resources/static/modeler/images/flowable-logo@2x.png diff --git a/snow-flowable/src/main/resources/static/images/form-builder/amountfield-icon.png b/snow-admin/src/main/resources/static/modeler/images/form-builder/amountfield-icon.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/form-builder/amountfield-icon.png rename to snow-admin/src/main/resources/static/modeler/images/form-builder/amountfield-icon.png diff --git a/snow-flowable/src/main/resources/static/images/form-builder/booleanfield-icon.png b/snow-admin/src/main/resources/static/modeler/images/form-builder/booleanfield-icon.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/form-builder/booleanfield-icon.png rename to snow-admin/src/main/resources/static/modeler/images/form-builder/booleanfield-icon.png diff --git a/snow-flowable/src/main/resources/static/images/form-builder/choicefield-icon.png b/snow-admin/src/main/resources/static/modeler/images/form-builder/choicefield-icon.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/form-builder/choicefield-icon.png rename to snow-admin/src/main/resources/static/modeler/images/form-builder/choicefield-icon.png diff --git a/snow-flowable/src/main/resources/static/images/form-builder/datefield-icon.png b/snow-admin/src/main/resources/static/modeler/images/form-builder/datefield-icon.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/form-builder/datefield-icon.png rename to snow-admin/src/main/resources/static/modeler/images/form-builder/datefield-icon.png diff --git a/snow-flowable/src/main/resources/static/images/form-builder/decimalfield-icon.png b/snow-admin/src/main/resources/static/modeler/images/form-builder/decimalfield-icon.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/form-builder/decimalfield-icon.png rename to snow-admin/src/main/resources/static/modeler/images/form-builder/decimalfield-icon.png diff --git a/snow-flowable/src/main/resources/static/images/form-builder/dropdownfield-icon.png b/snow-admin/src/main/resources/static/modeler/images/form-builder/dropdownfield-icon.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/form-builder/dropdownfield-icon.png rename to snow-admin/src/main/resources/static/modeler/images/form-builder/dropdownfield-icon.png diff --git a/snow-flowable/src/main/resources/static/images/form-builder/dynamic-table-icon.png b/snow-admin/src/main/resources/static/modeler/images/form-builder/dynamic-table-icon.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/form-builder/dynamic-table-icon.png rename to snow-admin/src/main/resources/static/modeler/images/form-builder/dynamic-table-icon.png diff --git a/snow-flowable/src/main/resources/static/images/form-builder/group-icon.png b/snow-admin/src/main/resources/static/modeler/images/form-builder/group-icon.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/form-builder/group-icon.png rename to snow-admin/src/main/resources/static/modeler/images/form-builder/group-icon.png diff --git a/snow-flowable/src/main/resources/static/images/form-builder/headline-icon.png b/snow-admin/src/main/resources/static/modeler/images/form-builder/headline-icon.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/form-builder/headline-icon.png rename to snow-admin/src/main/resources/static/modeler/images/form-builder/headline-icon.png diff --git a/snow-flowable/src/main/resources/static/images/form-builder/headline-with-line-icon.png b/snow-admin/src/main/resources/static/modeler/images/form-builder/headline-with-line-icon.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/form-builder/headline-with-line-icon.png rename to snow-admin/src/main/resources/static/modeler/images/form-builder/headline-with-line-icon.png diff --git a/snow-flowable/src/main/resources/static/images/form-builder/horizontal-line-icon.png b/snow-admin/src/main/resources/static/modeler/images/form-builder/horizontal-line-icon.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/form-builder/horizontal-line-icon.png rename to snow-admin/src/main/resources/static/modeler/images/form-builder/horizontal-line-icon.png diff --git a/snow-flowable/src/main/resources/static/images/form-builder/hyperlink-icon.png b/snow-admin/src/main/resources/static/modeler/images/form-builder/hyperlink-icon.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/form-builder/hyperlink-icon.png rename to snow-admin/src/main/resources/static/modeler/images/form-builder/hyperlink-icon.png diff --git a/snow-flowable/src/main/resources/static/images/form-builder/multi-line-textfield-icon.png b/snow-admin/src/main/resources/static/modeler/images/form-builder/multi-line-textfield-icon.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/form-builder/multi-line-textfield-icon.png rename to snow-admin/src/main/resources/static/modeler/images/form-builder/multi-line-textfield-icon.png diff --git a/snow-flowable/src/main/resources/static/images/form-builder/numberfield-icon.png b/snow-admin/src/main/resources/static/modeler/images/form-builder/numberfield-icon.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/form-builder/numberfield-icon.png rename to snow-admin/src/main/resources/static/modeler/images/form-builder/numberfield-icon.png diff --git a/snow-flowable/src/main/resources/static/images/form-builder/password-icon.png b/snow-admin/src/main/resources/static/modeler/images/form-builder/password-icon.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/form-builder/password-icon.png rename to snow-admin/src/main/resources/static/modeler/images/form-builder/password-icon.png diff --git a/snow-flowable/src/main/resources/static/images/form-builder/peoplefield-icon.png b/snow-admin/src/main/resources/static/modeler/images/form-builder/peoplefield-icon.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/form-builder/peoplefield-icon.png rename to snow-admin/src/main/resources/static/modeler/images/form-builder/peoplefield-icon.png diff --git a/snow-flowable/src/main/resources/static/images/form-builder/readonly-icon.png b/snow-admin/src/main/resources/static/modeler/images/form-builder/readonly-icon.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/form-builder/readonly-icon.png rename to snow-admin/src/main/resources/static/modeler/images/form-builder/readonly-icon.png diff --git a/snow-flowable/src/main/resources/static/images/form-builder/readonly-text-icon.png b/snow-admin/src/main/resources/static/modeler/images/form-builder/readonly-text-icon.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/form-builder/readonly-text-icon.png rename to snow-admin/src/main/resources/static/modeler/images/form-builder/readonly-text-icon.png diff --git a/snow-flowable/src/main/resources/static/images/form-builder/spacer-icon.png b/snow-admin/src/main/resources/static/modeler/images/form-builder/spacer-icon.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/form-builder/spacer-icon.png rename to snow-admin/src/main/resources/static/modeler/images/form-builder/spacer-icon.png diff --git a/snow-flowable/src/main/resources/static/images/form-builder/textfield-icon.png b/snow-admin/src/main/resources/static/modeler/images/form-builder/textfield-icon.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/form-builder/textfield-icon.png rename to snow-admin/src/main/resources/static/modeler/images/form-builder/textfield-icon.png diff --git a/snow-flowable/src/main/resources/static/images/form-builder/uploadfield-icon.png b/snow-admin/src/main/resources/static/modeler/images/form-builder/uploadfield-icon.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/form-builder/uploadfield-icon.png rename to snow-admin/src/main/resources/static/modeler/images/form-builder/uploadfield-icon.png diff --git a/snow-flowable/src/main/resources/static/images/glasspane.png b/snow-admin/src/main/resources/static/modeler/images/glasspane.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/glasspane.png rename to snow-admin/src/main/resources/static/modeler/images/glasspane.png diff --git a/snow-flowable/src/main/resources/static/images/line-1px.png b/snow-admin/src/main/resources/static/modeler/images/line-1px.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/line-1px.png rename to snow-admin/src/main/resources/static/modeler/images/line-1px.png diff --git a/snow-flowable/src/main/resources/static/images/line.png b/snow-admin/src/main/resources/static/modeler/images/line.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/line.png rename to snow-admin/src/main/resources/static/modeler/images/line.png diff --git a/snow-flowable/src/main/resources/static/images/mstile-150x150.png b/snow-admin/src/main/resources/static/modeler/images/mstile-150x150.png similarity index 100% rename from snow-flowable/src/main/resources/static/images/mstile-150x150.png rename to snow-admin/src/main/resources/static/modeler/images/mstile-150x150.png diff --git a/snow-flowable/src/main/resources/static/images/safari-pinned-tab.svg b/snow-admin/src/main/resources/static/modeler/images/safari-pinned-tab.svg similarity index 100% rename from snow-flowable/src/main/resources/static/images/safari-pinned-tab.svg rename to snow-admin/src/main/resources/static/modeler/images/safari-pinned-tab.svg diff --git a/snow-flowable/src/main/resources/static/images/tour/open-group.gif b/snow-admin/src/main/resources/static/modeler/images/tour/open-group.gif similarity index 100% rename from snow-flowable/src/main/resources/static/images/tour/open-group.gif rename to snow-admin/src/main/resources/static/modeler/images/tour/open-group.gif diff --git a/snow-flowable/src/main/resources/static/images/tour/sequenceflow-bendpoint.gif b/snow-admin/src/main/resources/static/modeler/images/tour/sequenceflow-bendpoint.gif similarity index 100% rename from snow-flowable/src/main/resources/static/images/tour/sequenceflow-bendpoint.gif rename to snow-admin/src/main/resources/static/modeler/images/tour/sequenceflow-bendpoint.gif diff --git a/snow-flowable/src/main/resources/static/images/tour/tour-dnd.gif b/snow-admin/src/main/resources/static/modeler/images/tour/tour-dnd.gif similarity index 100% rename from snow-flowable/src/main/resources/static/images/tour/tour-dnd.gif rename to snow-admin/src/main/resources/static/modeler/images/tour/tour-dnd.gif diff --git a/snow-flowable/src/main/resources/static/index.html b/snow-admin/src/main/resources/static/modeler/index.html similarity index 100% rename from snow-flowable/src/main/resources/static/index.html rename to snow-admin/src/main/resources/static/modeler/index.html diff --git a/snow-flowable/src/main/resources/static/libs/angular-animate_1.3.13/angular-animate.js b/snow-admin/src/main/resources/static/modeler/libs/angular-animate_1.3.13/angular-animate.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-animate_1.3.13/angular-animate.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-animate_1.3.13/angular-animate.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-animate_1.3.13/angular-animate.min.js b/snow-admin/src/main/resources/static/modeler/libs/angular-animate_1.3.13/angular-animate.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-animate_1.3.13/angular-animate.min.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-animate_1.3.13/angular-animate.min.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-animate_1.3.13/angular-animate.min.js.map b/snow-admin/src/main/resources/static/modeler/libs/angular-animate_1.3.13/angular-animate.min.js.map similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-animate_1.3.13/angular-animate.min.js.map rename to snow-admin/src/main/resources/static/modeler/libs/angular-animate_1.3.13/angular-animate.min.js.map diff --git a/snow-flowable/src/main/resources/static/libs/angular-cookies_1.3.13/angular-cookies.js b/snow-admin/src/main/resources/static/modeler/libs/angular-cookies_1.3.13/angular-cookies.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-cookies_1.3.13/angular-cookies.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-cookies_1.3.13/angular-cookies.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-cookies_1.3.13/angular-cookies.min.js b/snow-admin/src/main/resources/static/modeler/libs/angular-cookies_1.3.13/angular-cookies.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-cookies_1.3.13/angular-cookies.min.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-cookies_1.3.13/angular-cookies.min.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-cookies_1.3.13/angular-cookies.min.js.map b/snow-admin/src/main/resources/static/modeler/libs/angular-cookies_1.3.13/angular-cookies.min.js.map similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-cookies_1.3.13/angular-cookies.min.js.map rename to snow-admin/src/main/resources/static/modeler/libs/angular-cookies_1.3.13/angular-cookies.min.js.map diff --git a/snow-flowable/src/main/resources/static/libs/angular-drag-and-drop-lists_1.2.0/angular-drag-and-drop-lists.js b/snow-admin/src/main/resources/static/modeler/libs/angular-drag-and-drop-lists_1.2.0/angular-drag-and-drop-lists.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-drag-and-drop-lists_1.2.0/angular-drag-and-drop-lists.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-drag-and-drop-lists_1.2.0/angular-drag-and-drop-lists.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-drag-and-drop-lists_1.2.0/angular-drag-and-drop-lists.min.js b/snow-admin/src/main/resources/static/modeler/libs/angular-drag-and-drop-lists_1.2.0/angular-drag-and-drop-lists.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-drag-and-drop-lists_1.2.0/angular-drag-and-drop-lists.min.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-drag-and-drop-lists_1.2.0/angular-drag-and-drop-lists.min.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-dragdrop_1.0.11/angular-dragdrop.js b/snow-admin/src/main/resources/static/modeler/libs/angular-dragdrop_1.0.11/angular-dragdrop.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-dragdrop_1.0.11/angular-dragdrop.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-dragdrop_1.0.11/angular-dragdrop.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-dragdrop_1.0.11/angular-dragdrop.min.js b/snow-admin/src/main/resources/static/modeler/libs/angular-dragdrop_1.0.11/angular-dragdrop.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-dragdrop_1.0.11/angular-dragdrop.min.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-dragdrop_1.0.11/angular-dragdrop.min.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-gridster_0.11.7/angular-gridster.js b/snow-admin/src/main/resources/static/modeler/libs/angular-gridster_0.11.7/angular-gridster.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-gridster_0.11.7/angular-gridster.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-gridster_0.11.7/angular-gridster.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-gridster_0.11.7/angular-gridster.min.css b/snow-admin/src/main/resources/static/modeler/libs/angular-gridster_0.11.7/angular-gridster.min.css similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-gridster_0.11.7/angular-gridster.min.css rename to snow-admin/src/main/resources/static/modeler/libs/angular-gridster_0.11.7/angular-gridster.min.css diff --git a/snow-flowable/src/main/resources/static/libs/angular-gridster_0.11.7/angular-gridster.min.js b/snow-admin/src/main/resources/static/modeler/libs/angular-gridster_0.11.7/angular-gridster.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-gridster_0.11.7/angular-gridster.min.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-gridster_0.11.7/angular-gridster.min.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-hotkeys_1.4.5/hotkeys--activiti-patch.js b/snow-admin/src/main/resources/static/modeler/libs/angular-hotkeys_1.4.5/hotkeys--activiti-patch.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-hotkeys_1.4.5/hotkeys--activiti-patch.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-hotkeys_1.4.5/hotkeys--activiti-patch.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-hotkeys_1.4.5/hotkeys.css b/snow-admin/src/main/resources/static/modeler/libs/angular-hotkeys_1.4.5/hotkeys.css similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-hotkeys_1.4.5/hotkeys.css rename to snow-admin/src/main/resources/static/modeler/libs/angular-hotkeys_1.4.5/hotkeys.css diff --git a/snow-flowable/src/main/resources/static/libs/angular-hotkeys_1.4.5/hotkeys.js b/snow-admin/src/main/resources/static/modeler/libs/angular-hotkeys_1.4.5/hotkeys.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-hotkeys_1.4.5/hotkeys.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-hotkeys_1.4.5/hotkeys.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-hotkeys_1.4.5/hotkeys.min.css b/snow-admin/src/main/resources/static/modeler/libs/angular-hotkeys_1.4.5/hotkeys.min.css similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-hotkeys_1.4.5/hotkeys.min.css rename to snow-admin/src/main/resources/static/modeler/libs/angular-hotkeys_1.4.5/hotkeys.min.css diff --git a/snow-flowable/src/main/resources/static/libs/angular-hotkeys_1.4.5/hotkeys.min.js b/snow-admin/src/main/resources/static/modeler/libs/angular-hotkeys_1.4.5/hotkeys.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-hotkeys_1.4.5/hotkeys.min.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-hotkeys_1.4.5/hotkeys.min.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-loading-bar-0.7.0/loading-bar.min.css b/snow-admin/src/main/resources/static/modeler/libs/angular-loading-bar-0.7.0/loading-bar.min.css similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-loading-bar-0.7.0/loading-bar.min.css rename to snow-admin/src/main/resources/static/modeler/libs/angular-loading-bar-0.7.0/loading-bar.min.css diff --git a/snow-flowable/src/main/resources/static/libs/angular-loading-bar-0.7.0/loading-bar.min.js b/snow-admin/src/main/resources/static/modeler/libs/angular-loading-bar-0.7.0/loading-bar.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-loading-bar-0.7.0/loading-bar.min.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-loading-bar-0.7.0/loading-bar.min.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-mocks_1.2.13/angular-mocks.js b/snow-admin/src/main/resources/static/modeler/libs/angular-mocks_1.2.13/angular-mocks.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-mocks_1.2.13/angular-mocks.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-mocks_1.2.13/angular-mocks.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-resource_1.3.13/angular-resource.js b/snow-admin/src/main/resources/static/modeler/libs/angular-resource_1.3.13/angular-resource.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-resource_1.3.13/angular-resource.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-resource_1.3.13/angular-resource.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-resource_1.3.13/angular-resource.min.js b/snow-admin/src/main/resources/static/modeler/libs/angular-resource_1.3.13/angular-resource.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-resource_1.3.13/angular-resource.min.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-resource_1.3.13/angular-resource.min.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-resource_1.3.13/angular-resource.min.js.map b/snow-admin/src/main/resources/static/modeler/libs/angular-resource_1.3.13/angular-resource.min.js.map similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-resource_1.3.13/angular-resource.min.js.map rename to snow-admin/src/main/resources/static/modeler/libs/angular-resource_1.3.13/angular-resource.min.js.map diff --git a/snow-flowable/src/main/resources/static/libs/angular-route_1.3.13/angular-route.js b/snow-admin/src/main/resources/static/modeler/libs/angular-route_1.3.13/angular-route.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-route_1.3.13/angular-route.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-route_1.3.13/angular-route.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-route_1.3.13/angular-route.min.js b/snow-admin/src/main/resources/static/modeler/libs/angular-route_1.3.13/angular-route.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-route_1.3.13/angular-route.min.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-route_1.3.13/angular-route.min.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-route_1.3.13/angular-route.min.js.map b/snow-admin/src/main/resources/static/modeler/libs/angular-route_1.3.13/angular-route.min.js.map similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-route_1.3.13/angular-route.min.js.map rename to snow-admin/src/main/resources/static/modeler/libs/angular-route_1.3.13/angular-route.min.js.map diff --git a/snow-flowable/src/main/resources/static/libs/angular-sanitize_1.3.13/angular-sanitize.js b/snow-admin/src/main/resources/static/modeler/libs/angular-sanitize_1.3.13/angular-sanitize.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-sanitize_1.3.13/angular-sanitize.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-sanitize_1.3.13/angular-sanitize.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-sanitize_1.3.13/angular-sanitize.min.js b/snow-admin/src/main/resources/static/modeler/libs/angular-sanitize_1.3.13/angular-sanitize.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-sanitize_1.3.13/angular-sanitize.min.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-sanitize_1.3.13/angular-sanitize.min.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-sanitize_1.3.13/angular-sanitize.min.js.map b/snow-admin/src/main/resources/static/modeler/libs/angular-sanitize_1.3.13/angular-sanitize.min.js.map similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-sanitize_1.3.13/angular-sanitize.min.js.map rename to snow-admin/src/main/resources/static/modeler/libs/angular-sanitize_1.3.13/angular-sanitize.min.js.map diff --git a/snow-flowable/src/main/resources/static/libs/angular-scroll_0.5.7/angular-scroll.min.js b/snow-admin/src/main/resources/static/modeler/libs/angular-scroll_0.5.7/angular-scroll.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-scroll_0.5.7/angular-scroll.min.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-scroll_0.5.7/angular-scroll.min.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-spectrum-colorpicker_1.0.13/angular-spectrum-colorpicker.min.js b/snow-admin/src/main/resources/static/modeler/libs/angular-spectrum-colorpicker_1.0.13/angular-spectrum-colorpicker.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-spectrum-colorpicker_1.0.13/angular-spectrum-colorpicker.min.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-spectrum-colorpicker_1.0.13/angular-spectrum-colorpicker.min.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-spectrum-colorpicker_1.0.13/spectrum.css b/snow-admin/src/main/resources/static/modeler/libs/angular-spectrum-colorpicker_1.0.13/spectrum.css similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-spectrum-colorpicker_1.0.13/spectrum.css rename to snow-admin/src/main/resources/static/modeler/libs/angular-spectrum-colorpicker_1.0.13/spectrum.css diff --git a/snow-flowable/src/main/resources/static/libs/angular-spectrum-colorpicker_1.0.13/spectrum.js b/snow-admin/src/main/resources/static/modeler/libs/angular-spectrum-colorpicker_1.0.13/spectrum.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-spectrum-colorpicker_1.0.13/spectrum.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-spectrum-colorpicker_1.0.13/spectrum.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-strap_2.1.6/angular-strap.js b/snow-admin/src/main/resources/static/modeler/libs/angular-strap_2.1.6/angular-strap.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-strap_2.1.6/angular-strap.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-strap_2.1.6/angular-strap.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-strap_2.1.6/angular-strap.min.js b/snow-admin/src/main/resources/static/modeler/libs/angular-strap_2.1.6/angular-strap.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-strap_2.1.6/angular-strap.min.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-strap_2.1.6/angular-strap.min.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-strap_2.1.6/angular-strap.min.js.map b/snow-admin/src/main/resources/static/modeler/libs/angular-strap_2.1.6/angular-strap.min.js.map similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-strap_2.1.6/angular-strap.min.js.map rename to snow-admin/src/main/resources/static/modeler/libs/angular-strap_2.1.6/angular-strap.min.js.map diff --git a/snow-flowable/src/main/resources/static/libs/angular-strap_2.1.6/angular-strap.tpl.js b/snow-admin/src/main/resources/static/modeler/libs/angular-strap_2.1.6/angular-strap.tpl.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-strap_2.1.6/angular-strap.tpl.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-strap_2.1.6/angular-strap.tpl.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-strap_2.1.6/angular-strap.tpl.min.js b/snow-admin/src/main/resources/static/modeler/libs/angular-strap_2.1.6/angular-strap.tpl.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-strap_2.1.6/angular-strap.tpl.min.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-strap_2.1.6/angular-strap.tpl.min.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-translate-loader-static-files/.bower.json b/snow-admin/src/main/resources/static/modeler/libs/angular-translate-loader-static-files/.bower.json similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-translate-loader-static-files/.bower.json rename to snow-admin/src/main/resources/static/modeler/libs/angular-translate-loader-static-files/.bower.json diff --git a/snow-flowable/src/main/resources/static/libs/angular-translate-loader-static-files/angular-translate-loader-static-files.js b/snow-admin/src/main/resources/static/modeler/libs/angular-translate-loader-static-files/angular-translate-loader-static-files.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-translate-loader-static-files/angular-translate-loader-static-files.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-translate-loader-static-files/angular-translate-loader-static-files.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js b/snow-admin/src/main/resources/static/modeler/libs/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-translate-storage-cookie/.bower.json b/snow-admin/src/main/resources/static/modeler/libs/angular-translate-storage-cookie/.bower.json similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-translate-storage-cookie/.bower.json rename to snow-admin/src/main/resources/static/modeler/libs/angular-translate-storage-cookie/.bower.json diff --git a/snow-flowable/src/main/resources/static/libs/angular-translate-storage-cookie/angular-translate-storage-cookie.js b/snow-admin/src/main/resources/static/modeler/libs/angular-translate-storage-cookie/angular-translate-storage-cookie.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-translate-storage-cookie/angular-translate-storage-cookie.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-translate-storage-cookie/angular-translate-storage-cookie.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-translate-storage-cookie/angular-translate-storage-cookie.min.js b/snow-admin/src/main/resources/static/modeler/libs/angular-translate-storage-cookie/angular-translate-storage-cookie.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-translate-storage-cookie/angular-translate-storage-cookie.min.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-translate-storage-cookie/angular-translate-storage-cookie.min.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-translate_2.15.1/angular-translate.js b/snow-admin/src/main/resources/static/modeler/libs/angular-translate_2.15.1/angular-translate.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-translate_2.15.1/angular-translate.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-translate_2.15.1/angular-translate.js diff --git a/snow-flowable/src/main/resources/static/libs/angular-translate_2.15.1/angular-translate.min.js b/snow-admin/src/main/resources/static/modeler/libs/angular-translate_2.15.1/angular-translate.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular-translate_2.15.1/angular-translate.min.js rename to snow-admin/src/main/resources/static/modeler/libs/angular-translate_2.15.1/angular-translate.min.js diff --git a/snow-flowable/src/main/resources/static/libs/angular_1.3.13/angular.js b/snow-admin/src/main/resources/static/modeler/libs/angular_1.3.13/angular.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular_1.3.13/angular.js rename to snow-admin/src/main/resources/static/modeler/libs/angular_1.3.13/angular.js diff --git a/snow-flowable/src/main/resources/static/libs/angular_1.3.13/angular.min.js b/snow-admin/src/main/resources/static/modeler/libs/angular_1.3.13/angular.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular_1.3.13/angular.min.js rename to snow-admin/src/main/resources/static/modeler/libs/angular_1.3.13/angular.min.js diff --git a/snow-flowable/src/main/resources/static/libs/angular_1.3.13/angular.min.js.map b/snow-admin/src/main/resources/static/modeler/libs/angular_1.3.13/angular.min.js.map similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angular_1.3.13/angular.min.js.map rename to snow-admin/src/main/resources/static/modeler/libs/angular_1.3.13/angular.min.js.map diff --git a/snow-flowable/src/main/resources/static/libs/angularjs-nvd3-directives_0.0.7/angular-nvd3-directives.min.js b/snow-admin/src/main/resources/static/modeler/libs/angularjs-nvd3-directives_0.0.7/angular-nvd3-directives.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/angularjs-nvd3-directives_0.0.7/angular-nvd3-directives.min.js rename to snow-admin/src/main/resources/static/modeler/libs/angularjs-nvd3-directives_0.0.7/angular-nvd3-directives.min.js diff --git a/snow-flowable/src/main/resources/static/libs/autofill-events_1.0.0/autofill-event.js b/snow-admin/src/main/resources/static/modeler/libs/autofill-events_1.0.0/autofill-event.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/autofill-events_1.0.0/autofill-event.js rename to snow-admin/src/main/resources/static/modeler/libs/autofill-events_1.0.0/autofill-event.js diff --git a/snow-flowable/src/main/resources/static/libs/bootstrap-daterangepicker_1.3.7/daterangepicker-bs3.css b/snow-admin/src/main/resources/static/modeler/libs/bootstrap-daterangepicker_1.3.7/daterangepicker-bs3.css similarity index 100% rename from snow-flowable/src/main/resources/static/libs/bootstrap-daterangepicker_1.3.7/daterangepicker-bs3.css rename to snow-admin/src/main/resources/static/modeler/libs/bootstrap-daterangepicker_1.3.7/daterangepicker-bs3.css diff --git a/snow-flowable/src/main/resources/static/libs/bootstrap-daterangepicker_1.3.7/daterangepicker.js b/snow-admin/src/main/resources/static/modeler/libs/bootstrap-daterangepicker_1.3.7/daterangepicker.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/bootstrap-daterangepicker_1.3.7/daterangepicker.js rename to snow-admin/src/main/resources/static/modeler/libs/bootstrap-daterangepicker_1.3.7/daterangepicker.js diff --git a/snow-flowable/src/main/resources/static/libs/bootstrap-tour_0.9.1/bootstrap-tour.js b/snow-admin/src/main/resources/static/modeler/libs/bootstrap-tour_0.9.1/bootstrap-tour.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/bootstrap-tour_0.9.1/bootstrap-tour.js rename to snow-admin/src/main/resources/static/modeler/libs/bootstrap-tour_0.9.1/bootstrap-tour.js diff --git a/snow-flowable/src/main/resources/static/libs/bootstrap-tour_0.9.1/bootstrap-tour.min.css b/snow-admin/src/main/resources/static/modeler/libs/bootstrap-tour_0.9.1/bootstrap-tour.min.css similarity index 100% rename from snow-flowable/src/main/resources/static/libs/bootstrap-tour_0.9.1/bootstrap-tour.min.css rename to snow-admin/src/main/resources/static/modeler/libs/bootstrap-tour_0.9.1/bootstrap-tour.min.css diff --git a/snow-flowable/src/main/resources/static/libs/bootstrap-tour_0.9.1/bootstrap-tour.min.js b/snow-admin/src/main/resources/static/modeler/libs/bootstrap-tour_0.9.1/bootstrap-tour.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/bootstrap-tour_0.9.1/bootstrap-tour.min.js rename to snow-admin/src/main/resources/static/modeler/libs/bootstrap-tour_0.9.1/bootstrap-tour.min.js diff --git a/snow-flowable/src/main/resources/static/libs/bootstrap_3.1.1/css/bootstrap-theme.css b/snow-admin/src/main/resources/static/modeler/libs/bootstrap_3.1.1/css/bootstrap-theme.css similarity index 100% rename from snow-flowable/src/main/resources/static/libs/bootstrap_3.1.1/css/bootstrap-theme.css rename to snow-admin/src/main/resources/static/modeler/libs/bootstrap_3.1.1/css/bootstrap-theme.css diff --git a/snow-flowable/src/main/resources/static/libs/bootstrap_3.1.1/css/bootstrap-theme.css.map b/snow-admin/src/main/resources/static/modeler/libs/bootstrap_3.1.1/css/bootstrap-theme.css.map similarity index 100% rename from snow-flowable/src/main/resources/static/libs/bootstrap_3.1.1/css/bootstrap-theme.css.map rename to snow-admin/src/main/resources/static/modeler/libs/bootstrap_3.1.1/css/bootstrap-theme.css.map diff --git a/snow-flowable/src/main/resources/static/libs/bootstrap_3.1.1/css/bootstrap-theme.min.css b/snow-admin/src/main/resources/static/modeler/libs/bootstrap_3.1.1/css/bootstrap-theme.min.css similarity index 100% rename from snow-flowable/src/main/resources/static/libs/bootstrap_3.1.1/css/bootstrap-theme.min.css rename to snow-admin/src/main/resources/static/modeler/libs/bootstrap_3.1.1/css/bootstrap-theme.min.css diff --git a/snow-flowable/src/main/resources/static/libs/bootstrap_3.1.1/css/bootstrap.css b/snow-admin/src/main/resources/static/modeler/libs/bootstrap_3.1.1/css/bootstrap.css similarity index 100% rename from snow-flowable/src/main/resources/static/libs/bootstrap_3.1.1/css/bootstrap.css rename to snow-admin/src/main/resources/static/modeler/libs/bootstrap_3.1.1/css/bootstrap.css diff --git a/snow-flowable/src/main/resources/static/libs/bootstrap_3.1.1/css/bootstrap.css.map b/snow-admin/src/main/resources/static/modeler/libs/bootstrap_3.1.1/css/bootstrap.css.map similarity index 100% rename from snow-flowable/src/main/resources/static/libs/bootstrap_3.1.1/css/bootstrap.css.map rename to snow-admin/src/main/resources/static/modeler/libs/bootstrap_3.1.1/css/bootstrap.css.map diff --git a/snow-flowable/src/main/resources/static/libs/bootstrap_3.1.1/css/bootstrap.min.css b/snow-admin/src/main/resources/static/modeler/libs/bootstrap_3.1.1/css/bootstrap.min.css similarity index 100% rename from snow-flowable/src/main/resources/static/libs/bootstrap_3.1.1/css/bootstrap.min.css rename to snow-admin/src/main/resources/static/modeler/libs/bootstrap_3.1.1/css/bootstrap.min.css diff --git a/snow-flowable/src/main/resources/static/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.eot b/snow-admin/src/main/resources/static/modeler/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from snow-flowable/src/main/resources/static/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.eot rename to snow-admin/src/main/resources/static/modeler/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.eot diff --git a/snow-flowable/src/main/resources/static/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.svg b/snow-admin/src/main/resources/static/modeler/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from snow-flowable/src/main/resources/static/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.svg rename to snow-admin/src/main/resources/static/modeler/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.svg diff --git a/snow-flowable/src/main/resources/static/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.ttf b/snow-admin/src/main/resources/static/modeler/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from snow-flowable/src/main/resources/static/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.ttf rename to snow-admin/src/main/resources/static/modeler/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.ttf diff --git a/snow-flowable/src/main/resources/static/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.woff b/snow-admin/src/main/resources/static/modeler/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from snow-flowable/src/main/resources/static/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.woff rename to snow-admin/src/main/resources/static/modeler/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.woff diff --git a/snow-flowable/src/main/resources/static/libs/bootstrap_3.1.1/js/bootstrap.js b/snow-admin/src/main/resources/static/modeler/libs/bootstrap_3.1.1/js/bootstrap.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/bootstrap_3.1.1/js/bootstrap.js rename to snow-admin/src/main/resources/static/modeler/libs/bootstrap_3.1.1/js/bootstrap.js diff --git a/snow-flowable/src/main/resources/static/libs/bootstrap_3.1.1/js/bootstrap.min.js b/snow-admin/src/main/resources/static/modeler/libs/bootstrap_3.1.1/js/bootstrap.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/bootstrap_3.1.1/js/bootstrap.min.js rename to snow-admin/src/main/resources/static/modeler/libs/bootstrap_3.1.1/js/bootstrap.min.js diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/.bower.json b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/.bower.json similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/.bower.json rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/.bower.json diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/CHANGES b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/CHANGES similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/CHANGES rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/CHANGES diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/CONTRIBUTORS.md b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/CONTRIBUTORS.md similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/CONTRIBUTORS.md rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/CONTRIBUTORS.md diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/LICENSE b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/LICENSE similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/LICENSE rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/LICENSE diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/README.md b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/README.md similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/README.md rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/README.md diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/es5-sham.js b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/es5-sham.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/es5-sham.js rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/es5-sham.js diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/es5-sham.map b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/es5-sham.map similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/es5-sham.map rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/es5-sham.map diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/es5-sham.min.js b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/es5-sham.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/es5-sham.min.js rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/es5-sham.min.js diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/es5-shim.js b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/es5-shim.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/es5-shim.js rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/es5-shim.js diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/es5-shim.map b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/es5-shim.map similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/es5-shim.map rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/es5-shim.map diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/es5-shim.min.js b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/es5-shim.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/es5-shim.min.js rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/es5-shim.min.js diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/package.json b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/package.json similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/package.json rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/package.json diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/helpers/h-kill.js b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/helpers/h-kill.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/helpers/h-kill.js rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/helpers/h-kill.js diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/helpers/h-matchers.js b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/helpers/h-matchers.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/helpers/h-matchers.js rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/helpers/h-matchers.js diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/helpers/h.js b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/helpers/h.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/helpers/h.js rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/helpers/h.js diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/index.html b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/index.html similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/index.html rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/index.html diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/index.min.html b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/index.min.html similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/index.min.html rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/index.min.html diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/lib/jasmine-html.js b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/lib/jasmine-html.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/lib/jasmine-html.js rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/lib/jasmine-html.js diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/lib/jasmine.css b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/lib/jasmine.css similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/lib/jasmine.css rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/lib/jasmine.css diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/lib/jasmine.js b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/lib/jasmine.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/lib/jasmine.js rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/lib/jasmine.js diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/lib/jasmine_favicon.png b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/lib/jasmine_favicon.png similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/lib/jasmine_favicon.png rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/lib/jasmine_favicon.png diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/lib/json2.js b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/lib/json2.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/lib/json2.js rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/lib/json2.js diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/spec/s-array.js b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/spec/s-array.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/spec/s-array.js rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/spec/s-array.js diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/spec/s-date.js b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/spec/s-date.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/spec/s-date.js rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/spec/s-date.js diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/spec/s-function.js b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/spec/s-function.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/spec/s-function.js rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/spec/s-function.js diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/spec/s-number.js b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/spec/s-number.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/spec/s-number.js rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/spec/s-number.js diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/spec/s-object.js b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/spec/s-object.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/spec/s-object.js rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/spec/s-object.js diff --git a/snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/spec/s-string.js b/snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/spec/s-string.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/es5-shim-15.3.4.5/tests/spec/s-string.js rename to snow-admin/src/main/resources/static/modeler/libs/es5-shim-15.3.4.5/tests/spec/s-string.js diff --git a/snow-flowable/src/main/resources/static/libs/handsontable_0.31.2/handsontable.full.min.css b/snow-admin/src/main/resources/static/modeler/libs/handsontable_0.31.2/handsontable.full.min.css similarity index 100% rename from snow-flowable/src/main/resources/static/libs/handsontable_0.31.2/handsontable.full.min.css rename to snow-admin/src/main/resources/static/modeler/libs/handsontable_0.31.2/handsontable.full.min.css diff --git a/snow-flowable/src/main/resources/static/libs/handsontable_0.31.2/handsontable.full.min.js b/snow-admin/src/main/resources/static/modeler/libs/handsontable_0.31.2/handsontable.full.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/handsontable_0.31.2/handsontable.full.min.js rename to snow-admin/src/main/resources/static/modeler/libs/handsontable_0.31.2/handsontable.full.min.js diff --git a/snow-flowable/src/main/resources/static/libs/html2canvas_0.4.1/html2canvas.js b/snow-admin/src/main/resources/static/modeler/libs/html2canvas_0.4.1/html2canvas.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/html2canvas_0.4.1/html2canvas.js rename to snow-admin/src/main/resources/static/modeler/libs/html2canvas_0.4.1/html2canvas.js diff --git a/snow-flowable/src/main/resources/static/libs/jquery-ui-1.10.3.custom.min.js b/snow-admin/src/main/resources/static/modeler/libs/jquery-ui-1.10.3.custom.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/jquery-ui-1.10.3.custom.min.js rename to snow-admin/src/main/resources/static/modeler/libs/jquery-ui-1.10.3.custom.min.js diff --git a/snow-flowable/src/main/resources/static/libs/jquery_1.11.0/jquery.js b/snow-admin/src/main/resources/static/modeler/libs/jquery_1.11.0/jquery.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/jquery_1.11.0/jquery.js rename to snow-admin/src/main/resources/static/modeler/libs/jquery_1.11.0/jquery.js diff --git a/snow-flowable/src/main/resources/static/libs/jquery_1.11.0/jquery.min.js b/snow-admin/src/main/resources/static/modeler/libs/jquery_1.11.0/jquery.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/jquery_1.11.0/jquery.min.js rename to snow-admin/src/main/resources/static/modeler/libs/jquery_1.11.0/jquery.min.js diff --git a/snow-flowable/src/main/resources/static/libs/jquery_1.11.0/jquery.min.map b/snow-admin/src/main/resources/static/modeler/libs/jquery_1.11.0/jquery.min.map similarity index 100% rename from snow-flowable/src/main/resources/static/libs/jquery_1.11.0/jquery.min.map rename to snow-admin/src/main/resources/static/modeler/libs/jquery_1.11.0/jquery.min.map diff --git a/snow-flowable/src/main/resources/static/libs/json3_3.2.6/LICENSE b/snow-admin/src/main/resources/static/modeler/libs/json3_3.2.6/LICENSE similarity index 100% rename from snow-flowable/src/main/resources/static/libs/json3_3.2.6/LICENSE rename to snow-admin/src/main/resources/static/modeler/libs/json3_3.2.6/LICENSE diff --git a/snow-flowable/src/main/resources/static/libs/json3_3.2.6/lib/json3.js b/snow-admin/src/main/resources/static/modeler/libs/json3_3.2.6/lib/json3.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/json3_3.2.6/lib/json3.js rename to snow-admin/src/main/resources/static/modeler/libs/json3_3.2.6/lib/json3.js diff --git a/snow-flowable/src/main/resources/static/libs/json3_3.2.6/lib/json3.min.js b/snow-admin/src/main/resources/static/modeler/libs/json3_3.2.6/lib/json3.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/json3_3.2.6/lib/json3.min.js rename to snow-admin/src/main/resources/static/modeler/libs/json3_3.2.6/lib/json3.min.js diff --git a/snow-flowable/src/main/resources/static/libs/momentjs_2.18.1/momentjs.min.js b/snow-admin/src/main/resources/static/modeler/libs/momentjs_2.18.1/momentjs.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/momentjs_2.18.1/momentjs.min.js rename to snow-admin/src/main/resources/static/modeler/libs/momentjs_2.18.1/momentjs.min.js diff --git a/snow-flowable/src/main/resources/static/libs/ng-file-upload/FileAPI.flash.swf b/snow-admin/src/main/resources/static/modeler/libs/ng-file-upload/FileAPI.flash.swf similarity index 100% rename from snow-flowable/src/main/resources/static/libs/ng-file-upload/FileAPI.flash.swf rename to snow-admin/src/main/resources/static/modeler/libs/ng-file-upload/FileAPI.flash.swf diff --git a/snow-flowable/src/main/resources/static/libs/ng-file-upload/FileAPI.js b/snow-admin/src/main/resources/static/modeler/libs/ng-file-upload/FileAPI.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/ng-file-upload/FileAPI.js rename to snow-admin/src/main/resources/static/modeler/libs/ng-file-upload/FileAPI.js diff --git a/snow-flowable/src/main/resources/static/libs/ng-file-upload/FileAPI.min.js b/snow-admin/src/main/resources/static/modeler/libs/ng-file-upload/FileAPI.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/ng-file-upload/FileAPI.min.js rename to snow-admin/src/main/resources/static/modeler/libs/ng-file-upload/FileAPI.min.js diff --git a/snow-flowable/src/main/resources/static/libs/ng-file-upload/ng-file-upload-all.js b/snow-admin/src/main/resources/static/modeler/libs/ng-file-upload/ng-file-upload-all.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/ng-file-upload/ng-file-upload-all.js rename to snow-admin/src/main/resources/static/modeler/libs/ng-file-upload/ng-file-upload-all.js diff --git a/snow-flowable/src/main/resources/static/libs/ng-file-upload/ng-file-upload-all.min.js b/snow-admin/src/main/resources/static/modeler/libs/ng-file-upload/ng-file-upload-all.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/ng-file-upload/ng-file-upload-all.min.js rename to snow-admin/src/main/resources/static/modeler/libs/ng-file-upload/ng-file-upload-all.min.js diff --git a/snow-flowable/src/main/resources/static/libs/ng-file-upload/ng-file-upload-shim.js b/snow-admin/src/main/resources/static/modeler/libs/ng-file-upload/ng-file-upload-shim.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/ng-file-upload/ng-file-upload-shim.js rename to snow-admin/src/main/resources/static/modeler/libs/ng-file-upload/ng-file-upload-shim.js diff --git a/snow-flowable/src/main/resources/static/libs/ng-file-upload/ng-file-upload-shim.min.js b/snow-admin/src/main/resources/static/modeler/libs/ng-file-upload/ng-file-upload-shim.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/ng-file-upload/ng-file-upload-shim.min.js rename to snow-admin/src/main/resources/static/modeler/libs/ng-file-upload/ng-file-upload-shim.min.js diff --git a/snow-flowable/src/main/resources/static/libs/ng-file-upload/ng-file-upload.js b/snow-admin/src/main/resources/static/modeler/libs/ng-file-upload/ng-file-upload.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/ng-file-upload/ng-file-upload.js rename to snow-admin/src/main/resources/static/modeler/libs/ng-file-upload/ng-file-upload.js diff --git a/snow-flowable/src/main/resources/static/libs/ng-file-upload/ng-file-upload.min.js b/snow-admin/src/main/resources/static/modeler/libs/ng-file-upload/ng-file-upload.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/ng-file-upload/ng-file-upload.min.js rename to snow-admin/src/main/resources/static/modeler/libs/ng-file-upload/ng-file-upload.min.js diff --git a/snow-flowable/src/main/resources/static/libs/ng-handsontable_0.13/ngHandsontable.js b/snow-admin/src/main/resources/static/modeler/libs/ng-handsontable_0.13/ngHandsontable.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/ng-handsontable_0.13/ngHandsontable.js rename to snow-admin/src/main/resources/static/modeler/libs/ng-handsontable_0.13/ngHandsontable.js diff --git a/snow-flowable/src/main/resources/static/libs/ng-handsontable_0.13/ngHandsontable.min.js b/snow-admin/src/main/resources/static/modeler/libs/ng-handsontable_0.13/ngHandsontable.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/ng-handsontable_0.13/ngHandsontable.min.js rename to snow-admin/src/main/resources/static/modeler/libs/ng-handsontable_0.13/ngHandsontable.min.js diff --git a/snow-flowable/src/main/resources/static/libs/nvd3_1.1.15-beta/nvd3.min.css b/snow-admin/src/main/resources/static/modeler/libs/nvd3_1.1.15-beta/nvd3.min.css similarity index 100% rename from snow-flowable/src/main/resources/static/libs/nvd3_1.1.15-beta/nvd3.min.css rename to snow-admin/src/main/resources/static/modeler/libs/nvd3_1.1.15-beta/nvd3.min.css diff --git a/snow-flowable/src/main/resources/static/libs/nvd3_1.1.15-beta/nvd3.min.js b/snow-admin/src/main/resources/static/modeler/libs/nvd3_1.1.15-beta/nvd3.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/nvd3_1.1.15-beta/nvd3.min.js rename to snow-admin/src/main/resources/static/modeler/libs/nvd3_1.1.15-beta/nvd3.min.js diff --git a/snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/.bower.json b/snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/.bower.json similarity index 100% rename from snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/.bower.json rename to snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/.bower.json diff --git a/snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/tasks/commit.js b/snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/tasks/commit.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/tasks/commit.js rename to snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/tasks/commit.js diff --git a/snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/tasks/compile.js b/snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/tasks/compile.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/tasks/compile.js rename to snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/tasks/compile.js diff --git a/snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/tasks/dist.js b/snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/tasks/dist.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/tasks/dist.js rename to snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/tasks/dist.js diff --git a/snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/tasks/release.js b/snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/tasks/release.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/tasks/release.js rename to snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/tasks/release.js diff --git a/snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/tasks/tag.js b/snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/tasks/tag.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/tasks/tag.js rename to snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/tasks/tag.js diff --git a/snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/tasks/version.js b/snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/tasks/version.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/tasks/version.js rename to snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/tasks/version.js diff --git a/snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/test/data/empty.js b/snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/test/data/empty.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/test/data/empty.js rename to snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/test/data/empty.js diff --git a/snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/test/data/mixed_sort.html b/snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/test/data/mixed_sort.html similarity index 100% rename from snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/test/data/mixed_sort.html rename to snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/test/data/mixed_sort.html diff --git a/snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/test/data/testinit.js b/snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/test/data/testinit.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/test/data/testinit.js rename to snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/test/data/testinit.js diff --git a/snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/test/index.html b/snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/test/index.html similarity index 100% rename from snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/test/index.html rename to snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/test/index.html diff --git a/snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/test/jquery.js b/snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/test/jquery.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/test/jquery.js rename to snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/test/jquery.js diff --git a/snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/test/libs/qunit/qunit.css b/snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/test/libs/qunit/qunit.css similarity index 100% rename from snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/test/libs/qunit/qunit.css rename to snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/test/libs/qunit/qunit.css diff --git a/snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/test/libs/qunit/qunit.js b/snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/test/libs/qunit/qunit.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/test/libs/qunit/qunit.js rename to snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/test/libs/qunit/qunit.js diff --git a/snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/test/unit/extending.js b/snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/test/unit/extending.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/test/unit/extending.js rename to snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/test/unit/extending.js diff --git a/snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/test/unit/selector.js b/snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/test/unit/selector.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/test/unit/selector.js rename to snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/test/unit/selector.js diff --git a/snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/test/unit/utilities.js b/snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/test/unit/utilities.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/sizzle_1.10.16/test/unit/utilities.js rename to snow-admin/src/main/resources/static/modeler/libs/sizzle_1.10.16/test/unit/utilities.js diff --git a/snow-flowable/src/main/resources/static/libs/ui-grid_3.0.0/ui-grid.css b/snow-admin/src/main/resources/static/modeler/libs/ui-grid_3.0.0/ui-grid.css similarity index 100% rename from snow-flowable/src/main/resources/static/libs/ui-grid_3.0.0/ui-grid.css rename to snow-admin/src/main/resources/static/modeler/libs/ui-grid_3.0.0/ui-grid.css diff --git a/snow-flowable/src/main/resources/static/libs/ui-grid_3.0.0/ui-grid.eot b/snow-admin/src/main/resources/static/modeler/libs/ui-grid_3.0.0/ui-grid.eot similarity index 100% rename from snow-flowable/src/main/resources/static/libs/ui-grid_3.0.0/ui-grid.eot rename to snow-admin/src/main/resources/static/modeler/libs/ui-grid_3.0.0/ui-grid.eot diff --git a/snow-flowable/src/main/resources/static/libs/ui-grid_3.0.0/ui-grid.js b/snow-admin/src/main/resources/static/modeler/libs/ui-grid_3.0.0/ui-grid.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/ui-grid_3.0.0/ui-grid.js rename to snow-admin/src/main/resources/static/modeler/libs/ui-grid_3.0.0/ui-grid.js diff --git a/snow-flowable/src/main/resources/static/libs/ui-grid_3.0.0/ui-grid.min.css b/snow-admin/src/main/resources/static/modeler/libs/ui-grid_3.0.0/ui-grid.min.css similarity index 100% rename from snow-flowable/src/main/resources/static/libs/ui-grid_3.0.0/ui-grid.min.css rename to snow-admin/src/main/resources/static/modeler/libs/ui-grid_3.0.0/ui-grid.min.css diff --git a/snow-flowable/src/main/resources/static/libs/ui-grid_3.0.0/ui-grid.min.js b/snow-admin/src/main/resources/static/modeler/libs/ui-grid_3.0.0/ui-grid.min.js similarity index 100% rename from snow-flowable/src/main/resources/static/libs/ui-grid_3.0.0/ui-grid.min.js rename to snow-admin/src/main/resources/static/modeler/libs/ui-grid_3.0.0/ui-grid.min.js diff --git a/snow-flowable/src/main/resources/static/libs/ui-grid_3.0.0/ui-grid.svg b/snow-admin/src/main/resources/static/modeler/libs/ui-grid_3.0.0/ui-grid.svg similarity index 100% rename from snow-flowable/src/main/resources/static/libs/ui-grid_3.0.0/ui-grid.svg rename to snow-admin/src/main/resources/static/modeler/libs/ui-grid_3.0.0/ui-grid.svg diff --git a/snow-flowable/src/main/resources/static/libs/ui-grid_3.0.0/ui-grid.ttf b/snow-admin/src/main/resources/static/modeler/libs/ui-grid_3.0.0/ui-grid.ttf similarity index 100% rename from snow-flowable/src/main/resources/static/libs/ui-grid_3.0.0/ui-grid.ttf rename to snow-admin/src/main/resources/static/modeler/libs/ui-grid_3.0.0/ui-grid.ttf diff --git a/snow-flowable/src/main/resources/static/libs/ui-grid_3.0.0/ui-grid.woff b/snow-admin/src/main/resources/static/modeler/libs/ui-grid_3.0.0/ui-grid.woff similarity index 100% rename from snow-flowable/src/main/resources/static/libs/ui-grid_3.0.0/ui-grid.woff rename to snow-admin/src/main/resources/static/modeler/libs/ui-grid_3.0.0/ui-grid.woff diff --git a/snow-flowable/src/main/resources/static/manifest.json b/snow-admin/src/main/resources/static/modeler/manifest.json similarity index 100% rename from snow-flowable/src/main/resources/static/manifest.json rename to snow-admin/src/main/resources/static/modeler/manifest.json diff --git a/snow-flowable/src/main/resources/static/scripts/app-cfg.js b/snow-admin/src/main/resources/static/modeler/scripts/app-cfg.js similarity index 94% rename from snow-flowable/src/main/resources/static/scripts/app-cfg.js rename to snow-admin/src/main/resources/static/modeler/scripts/app-cfg.js index 18f787c..d1b37b0 100644 --- a/snow-flowable/src/main/resources/static/scripts/app-cfg.js +++ b/snow-admin/src/main/resources/static/modeler/scripts/app-cfg.js @@ -18,10 +18,9 @@ var FLOWABLE = FLOWABLE || {}; var pathname = window.location.pathname.replace(/^(\/[^\/]*)(\/.*)?$/, '$1').replace(/\/$/, ''); - FLOWABLE.CONFIG = { 'onPremise' : true, - 'contextRoot' : pathname, + 'contextRoot' : pathname.replace("/modeler",""), 'webContextRoot' : pathname, 'datesLocalization' : false }; diff --git a/snow-flowable/src/main/resources/static/scripts/app.js b/snow-admin/src/main/resources/static/modeler/scripts/app.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/app.js rename to snow-admin/src/main/resources/static/modeler/scripts/app.js diff --git a/snow-flowable/src/main/resources/static/scripts/common/controllers/about.js b/snow-admin/src/main/resources/static/modeler/scripts/common/controllers/about.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/common/controllers/about.js rename to snow-admin/src/main/resources/static/modeler/scripts/common/controllers/about.js diff --git a/snow-flowable/src/main/resources/static/scripts/common/directives.js b/snow-admin/src/main/resources/static/modeler/scripts/common/directives.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/common/directives.js rename to snow-admin/src/main/resources/static/modeler/scripts/common/directives.js diff --git a/snow-flowable/src/main/resources/static/scripts/common/providers-config.js b/snow-admin/src/main/resources/static/modeler/scripts/common/providers-config.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/common/providers-config.js rename to snow-admin/src/main/resources/static/modeler/scripts/common/providers-config.js diff --git a/snow-flowable/src/main/resources/static/scripts/common/services/recursion-helper.js b/snow-admin/src/main/resources/static/modeler/scripts/common/services/recursion-helper.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/common/services/recursion-helper.js rename to snow-admin/src/main/resources/static/modeler/scripts/common/services/recursion-helper.js diff --git a/snow-flowable/src/main/resources/static/scripts/common/services/resource-service.js b/snow-admin/src/main/resources/static/modeler/scripts/common/services/resource-service.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/common/services/resource-service.js rename to snow-admin/src/main/resources/static/modeler/scripts/common/services/resource-service.js diff --git a/snow-flowable/src/main/resources/static/scripts/configuration/app-definition-toolbar-default-actions.js b/snow-admin/src/main/resources/static/modeler/scripts/configuration/app-definition-toolbar-default-actions.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/configuration/app-definition-toolbar-default-actions.js rename to snow-admin/src/main/resources/static/modeler/scripts/configuration/app-definition-toolbar-default-actions.js diff --git a/snow-flowable/src/main/resources/static/scripts/configuration/app-definition-toolbar.js b/snow-admin/src/main/resources/static/modeler/scripts/configuration/app-definition-toolbar.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/configuration/app-definition-toolbar.js rename to snow-admin/src/main/resources/static/modeler/scripts/configuration/app-definition-toolbar.js diff --git a/snow-flowable/src/main/resources/static/scripts/configuration/decision-table-toolbar-default-actions.js b/snow-admin/src/main/resources/static/modeler/scripts/configuration/decision-table-toolbar-default-actions.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/configuration/decision-table-toolbar-default-actions.js rename to snow-admin/src/main/resources/static/modeler/scripts/configuration/decision-table-toolbar-default-actions.js diff --git a/snow-flowable/src/main/resources/static/scripts/configuration/decision-table-toolbar.js b/snow-admin/src/main/resources/static/modeler/scripts/configuration/decision-table-toolbar.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/configuration/decision-table-toolbar.js rename to snow-admin/src/main/resources/static/modeler/scripts/configuration/decision-table-toolbar.js diff --git a/snow-flowable/src/main/resources/static/scripts/configuration/form-builder-toolbar-default-actions.js b/snow-admin/src/main/resources/static/modeler/scripts/configuration/form-builder-toolbar-default-actions.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/configuration/form-builder-toolbar-default-actions.js rename to snow-admin/src/main/resources/static/modeler/scripts/configuration/form-builder-toolbar-default-actions.js diff --git a/snow-flowable/src/main/resources/static/scripts/configuration/form-builder-toolbar.js b/snow-admin/src/main/resources/static/modeler/scripts/configuration/form-builder-toolbar.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/configuration/form-builder-toolbar.js rename to snow-admin/src/main/resources/static/modeler/scripts/configuration/form-builder-toolbar.js diff --git a/snow-flowable/src/main/resources/static/scripts/configuration/url-config.js b/snow-admin/src/main/resources/static/modeler/scripts/configuration/url-config.js similarity index 97% rename from snow-flowable/src/main/resources/static/scripts/configuration/url-config.js rename to snow-admin/src/main/resources/static/modeler/scripts/configuration/url-config.js index 281da33..b230fa3 100644 --- a/snow-flowable/src/main/resources/static/scripts/configuration/url-config.js +++ b/snow-admin/src/main/resources/static/modeler/scripts/configuration/url-config.js @@ -234,11 +234,13 @@ FLOWABLE.APP_URL = { getEditorUsersUrl: function () { //return FLOWABLE.CONFIG.contextRoot + '/app/rest/editor-users'; - return FLOWABLE.CONFIG.contextRoot + '/flowableUser/getUserList'; + return FLOWABLE.CONFIG.contextRoot + '/app/rest/getUserList'; }, /*用户组用户*/ getEditorGroupsUrl: function () { - return FLOWABLE.CONFIG.contextRoot + '/app/rest/editor-groups'; + + // return FLOWABLE.CONFIG.contextRoot + '/app/rest/editor-groups'; + return FLOWABLE.CONFIG.contextRoot + '/app/rest/getUserGroupList' }, getAboutInfoUrl: function () { diff --git a/snow-flowable/src/main/resources/static/scripts/controllers/app-definition-builder.js b/snow-admin/src/main/resources/static/modeler/scripts/controllers/app-definition-builder.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/controllers/app-definition-builder.js rename to snow-admin/src/main/resources/static/modeler/scripts/controllers/app-definition-builder.js diff --git a/snow-flowable/src/main/resources/static/scripts/controllers/app-definition-toolbar-controller.js b/snow-admin/src/main/resources/static/modeler/scripts/controllers/app-definition-toolbar-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/controllers/app-definition-toolbar-controller.js rename to snow-admin/src/main/resources/static/modeler/scripts/controllers/app-definition-toolbar-controller.js diff --git a/snow-flowable/src/main/resources/static/scripts/controllers/app-definition.js b/snow-admin/src/main/resources/static/modeler/scripts/controllers/app-definition.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/controllers/app-definition.js rename to snow-admin/src/main/resources/static/modeler/scripts/controllers/app-definition.js diff --git a/snow-flowable/src/main/resources/static/scripts/controllers/app-definitions.js b/snow-admin/src/main/resources/static/modeler/scripts/controllers/app-definitions.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/controllers/app-definitions.js rename to snow-admin/src/main/resources/static/modeler/scripts/controllers/app-definitions.js diff --git a/snow-flowable/src/main/resources/static/scripts/controllers/casemodel.js b/snow-admin/src/main/resources/static/modeler/scripts/controllers/casemodel.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/controllers/casemodel.js rename to snow-admin/src/main/resources/static/modeler/scripts/controllers/casemodel.js diff --git a/snow-flowable/src/main/resources/static/scripts/controllers/casemodels.js b/snow-admin/src/main/resources/static/modeler/scripts/controllers/casemodels.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/controllers/casemodels.js rename to snow-admin/src/main/resources/static/modeler/scripts/controllers/casemodels.js diff --git a/snow-flowable/src/main/resources/static/scripts/controllers/decision-table-editor.js b/snow-admin/src/main/resources/static/modeler/scripts/controllers/decision-table-editor.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/controllers/decision-table-editor.js rename to snow-admin/src/main/resources/static/modeler/scripts/controllers/decision-table-editor.js diff --git a/snow-flowable/src/main/resources/static/scripts/controllers/decision-table-toolbar-controller.js b/snow-admin/src/main/resources/static/modeler/scripts/controllers/decision-table-toolbar-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/controllers/decision-table-toolbar-controller.js rename to snow-admin/src/main/resources/static/modeler/scripts/controllers/decision-table-toolbar-controller.js diff --git a/snow-flowable/src/main/resources/static/scripts/controllers/decision-table.js b/snow-admin/src/main/resources/static/modeler/scripts/controllers/decision-table.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/controllers/decision-table.js rename to snow-admin/src/main/resources/static/modeler/scripts/controllers/decision-table.js diff --git a/snow-flowable/src/main/resources/static/scripts/controllers/decision-tables.js b/snow-admin/src/main/resources/static/modeler/scripts/controllers/decision-tables.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/controllers/decision-tables.js rename to snow-admin/src/main/resources/static/modeler/scripts/controllers/decision-tables.js diff --git a/snow-flowable/src/main/resources/static/scripts/controllers/form-builder.js b/snow-admin/src/main/resources/static/modeler/scripts/controllers/form-builder.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/controllers/form-builder.js rename to snow-admin/src/main/resources/static/modeler/scripts/controllers/form-builder.js diff --git a/snow-flowable/src/main/resources/static/scripts/controllers/form-readonly-view.js b/snow-admin/src/main/resources/static/modeler/scripts/controllers/form-readonly-view.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/controllers/form-readonly-view.js rename to snow-admin/src/main/resources/static/modeler/scripts/controllers/form-readonly-view.js diff --git a/snow-flowable/src/main/resources/static/scripts/controllers/form-toolbar-controller.js b/snow-admin/src/main/resources/static/modeler/scripts/controllers/form-toolbar-controller.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/controllers/form-toolbar-controller.js rename to snow-admin/src/main/resources/static/modeler/scripts/controllers/form-toolbar-controller.js diff --git a/snow-flowable/src/main/resources/static/scripts/controllers/form.js b/snow-admin/src/main/resources/static/modeler/scripts/controllers/form.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/controllers/form.js rename to snow-admin/src/main/resources/static/modeler/scripts/controllers/form.js diff --git a/snow-flowable/src/main/resources/static/scripts/controllers/forms.js b/snow-admin/src/main/resources/static/modeler/scripts/controllers/forms.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/controllers/forms.js rename to snow-admin/src/main/resources/static/modeler/scripts/controllers/forms.js diff --git a/snow-flowable/src/main/resources/static/scripts/controllers/model-common-actions.js b/snow-admin/src/main/resources/static/modeler/scripts/controllers/model-common-actions.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/controllers/model-common-actions.js rename to snow-admin/src/main/resources/static/modeler/scripts/controllers/model-common-actions.js diff --git a/snow-flowable/src/main/resources/static/scripts/controllers/process.js b/snow-admin/src/main/resources/static/modeler/scripts/controllers/process.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/controllers/process.js rename to snow-admin/src/main/resources/static/modeler/scripts/controllers/process.js diff --git a/snow-flowable/src/main/resources/static/scripts/controllers/processes.js b/snow-admin/src/main/resources/static/modeler/scripts/controllers/processes.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/controllers/processes.js rename to snow-admin/src/main/resources/static/modeler/scripts/controllers/processes.js diff --git a/snow-flowable/src/main/resources/static/scripts/editor-directives.js b/snow-admin/src/main/resources/static/modeler/scripts/editor-directives.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/editor-directives.js rename to snow-admin/src/main/resources/static/modeler/scripts/editor-directives.js diff --git a/snow-flowable/src/main/resources/static/scripts/resource-loader.js b/snow-admin/src/main/resources/static/modeler/scripts/resource-loader.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/resource-loader.js rename to snow-admin/src/main/resources/static/modeler/scripts/resource-loader.js diff --git a/snow-flowable/src/main/resources/static/scripts/services/decision-table-service.js b/snow-admin/src/main/resources/static/modeler/scripts/services/decision-table-service.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/services/decision-table-service.js rename to snow-admin/src/main/resources/static/modeler/scripts/services/decision-table-service.js diff --git a/snow-flowable/src/main/resources/static/scripts/services/form-services.js b/snow-admin/src/main/resources/static/modeler/scripts/services/form-services.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/services/form-services.js rename to snow-admin/src/main/resources/static/modeler/scripts/services/form-services.js diff --git a/snow-flowable/src/main/resources/static/scripts/services/identity-services.js b/snow-admin/src/main/resources/static/modeler/scripts/services/identity-services.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/services/identity-services.js rename to snow-admin/src/main/resources/static/modeler/scripts/services/identity-services.js diff --git a/snow-flowable/src/main/resources/static/scripts/services/util-services.js b/snow-admin/src/main/resources/static/modeler/scripts/services/util-services.js similarity index 100% rename from snow-flowable/src/main/resources/static/scripts/services/util-services.js rename to snow-admin/src/main/resources/static/modeler/scripts/services/util-services.js diff --git a/snow-flowable/src/main/resources/static/styles/common/bootstrap.min.css b/snow-admin/src/main/resources/static/modeler/styles/common/bootstrap.min.css similarity index 100% rename from snow-flowable/src/main/resources/static/styles/common/bootstrap.min.css rename to snow-admin/src/main/resources/static/modeler/styles/common/bootstrap.min.css diff --git a/snow-flowable/src/main/resources/static/styles/common/style-retina.css b/snow-admin/src/main/resources/static/modeler/styles/common/style-retina.css similarity index 100% rename from snow-flowable/src/main/resources/static/styles/common/style-retina.css rename to snow-admin/src/main/resources/static/modeler/styles/common/style-retina.css diff --git a/snow-flowable/src/main/resources/static/styles/common/style.css b/snow-admin/src/main/resources/static/modeler/styles/common/style.css similarity index 100% rename from snow-flowable/src/main/resources/static/styles/common/style.css rename to snow-admin/src/main/resources/static/modeler/styles/common/style.css diff --git a/snow-flowable/src/main/resources/static/styles/style-editor.css b/snow-admin/src/main/resources/static/modeler/styles/style-editor.css similarity index 100% rename from snow-flowable/src/main/resources/static/styles/style-editor.css rename to snow-admin/src/main/resources/static/modeler/styles/style-editor.css diff --git a/snow-flowable/src/main/resources/static/views/app-definition-builder.html b/snow-admin/src/main/resources/static/modeler/views/app-definition-builder.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/app-definition-builder.html rename to snow-admin/src/main/resources/static/modeler/views/app-definition-builder.html diff --git a/snow-flowable/src/main/resources/static/views/app-definition.html b/snow-admin/src/main/resources/static/modeler/views/app-definition.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/app-definition.html rename to snow-admin/src/main/resources/static/modeler/views/app-definition.html diff --git a/snow-flowable/src/main/resources/static/views/app-definitions.html b/snow-admin/src/main/resources/static/modeler/views/app-definitions.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/app-definitions.html rename to snow-admin/src/main/resources/static/modeler/views/app-definitions.html diff --git a/snow-flowable/src/main/resources/static/views/casemodel.html b/snow-admin/src/main/resources/static/modeler/views/casemodel.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/casemodel.html rename to snow-admin/src/main/resources/static/modeler/views/casemodel.html diff --git a/snow-flowable/src/main/resources/static/views/casemodels.html b/snow-admin/src/main/resources/static/modeler/views/casemodels.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/casemodels.html rename to snow-admin/src/main/resources/static/modeler/views/casemodels.html diff --git a/snow-flowable/src/main/resources/static/views/decision-table-editor.html b/snow-admin/src/main/resources/static/modeler/views/decision-table-editor.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/decision-table-editor.html rename to snow-admin/src/main/resources/static/modeler/views/decision-table-editor.html diff --git a/snow-flowable/src/main/resources/static/views/decision-table.html b/snow-admin/src/main/resources/static/modeler/views/decision-table.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/decision-table.html rename to snow-admin/src/main/resources/static/modeler/views/decision-table.html diff --git a/snow-flowable/src/main/resources/static/views/decision-tables.html b/snow-admin/src/main/resources/static/modeler/views/decision-tables.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/decision-tables.html rename to snow-admin/src/main/resources/static/modeler/views/decision-tables.html diff --git a/snow-flowable/src/main/resources/static/views/form-builder.html b/snow-admin/src/main/resources/static/modeler/views/form-builder.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/form-builder.html rename to snow-admin/src/main/resources/static/modeler/views/form-builder.html diff --git a/snow-flowable/src/main/resources/static/views/form.html b/snow-admin/src/main/resources/static/modeler/views/form.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/form.html rename to snow-admin/src/main/resources/static/modeler/views/form.html diff --git a/snow-flowable/src/main/resources/static/views/forms.html b/snow-admin/src/main/resources/static/modeler/views/forms.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/forms.html rename to snow-admin/src/main/resources/static/modeler/views/forms.html diff --git a/snow-flowable/src/main/resources/static/views/popover/formfield-edit-popover.html b/snow-admin/src/main/resources/static/modeler/views/popover/formfield-edit-popover.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popover/formfield-edit-popover.html rename to snow-admin/src/main/resources/static/modeler/views/popover/formfield-edit-popover.html diff --git a/snow-flowable/src/main/resources/static/views/popover/history.html b/snow-admin/src/main/resources/static/modeler/views/popover/history.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popover/history.html rename to snow-admin/src/main/resources/static/modeler/views/popover/history.html diff --git a/snow-flowable/src/main/resources/static/views/popover/select-app-icon.html b/snow-admin/src/main/resources/static/modeler/views/popover/select-app-icon.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popover/select-app-icon.html rename to snow-admin/src/main/resources/static/modeler/views/popover/select-app-icon.html diff --git a/snow-flowable/src/main/resources/static/views/popover/select-app-theme.html b/snow-admin/src/main/resources/static/modeler/views/popover/select-app-theme.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popover/select-app-theme.html rename to snow-admin/src/main/resources/static/modeler/views/popover/select-app-theme.html diff --git a/snow-flowable/src/main/resources/static/views/popover/select-group-popover.html b/snow-admin/src/main/resources/static/modeler/views/popover/select-group-popover.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popover/select-group-popover.html rename to snow-admin/src/main/resources/static/modeler/views/popover/select-group-popover.html diff --git a/snow-flowable/src/main/resources/static/views/popup/app-definition-create.html b/snow-admin/src/main/resources/static/modeler/views/popup/app-definition-create.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/app-definition-create.html rename to snow-admin/src/main/resources/static/modeler/views/popup/app-definition-create.html diff --git a/snow-flowable/src/main/resources/static/views/popup/app-definition-delete.html b/snow-admin/src/main/resources/static/modeler/views/popup/app-definition-delete.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/app-definition-delete.html rename to snow-admin/src/main/resources/static/modeler/views/popup/app-definition-delete.html diff --git a/snow-flowable/src/main/resources/static/views/popup/app-definition-duplicate.html b/snow-admin/src/main/resources/static/modeler/views/popup/app-definition-duplicate.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/app-definition-duplicate.html rename to snow-admin/src/main/resources/static/modeler/views/popup/app-definition-duplicate.html diff --git a/snow-flowable/src/main/resources/static/views/popup/app-definition-import.html b/snow-admin/src/main/resources/static/modeler/views/popup/app-definition-import.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/app-definition-import.html rename to snow-admin/src/main/resources/static/modeler/views/popup/app-definition-import.html diff --git a/snow-flowable/src/main/resources/static/views/popup/app-definition-models-included.html b/snow-admin/src/main/resources/static/modeler/views/popup/app-definition-models-included.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/app-definition-models-included.html rename to snow-admin/src/main/resources/static/modeler/views/popup/app-definition-models-included.html diff --git a/snow-flowable/src/main/resources/static/views/popup/app-definition-publish.html b/snow-admin/src/main/resources/static/modeler/views/popup/app-definition-publish.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/app-definition-publish.html rename to snow-admin/src/main/resources/static/modeler/views/popup/app-definition-publish.html diff --git a/snow-flowable/src/main/resources/static/views/popup/app-definition-save-model.html b/snow-admin/src/main/resources/static/modeler/views/popup/app-definition-save-model.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/app-definition-save-model.html rename to snow-admin/src/main/resources/static/modeler/views/popup/app-definition-save-model.html diff --git a/snow-flowable/src/main/resources/static/views/popup/app-definitions-import.html b/snow-admin/src/main/resources/static/modeler/views/popup/app-definitions-import.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/app-definitions-import.html rename to snow-admin/src/main/resources/static/modeler/views/popup/app-definitions-import.html diff --git a/snow-flowable/src/main/resources/static/views/popup/casemodel-create.html b/snow-admin/src/main/resources/static/modeler/views/popup/casemodel-create.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/casemodel-create.html rename to snow-admin/src/main/resources/static/modeler/views/popup/casemodel-create.html diff --git a/snow-flowable/src/main/resources/static/views/popup/casemodel-duplicate.html b/snow-admin/src/main/resources/static/modeler/views/popup/casemodel-duplicate.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/casemodel-duplicate.html rename to snow-admin/src/main/resources/static/modeler/views/popup/casemodel-duplicate.html diff --git a/snow-flowable/src/main/resources/static/views/popup/casemodel-import.html b/snow-admin/src/main/resources/static/modeler/views/popup/casemodel-import.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/casemodel-import.html rename to snow-admin/src/main/resources/static/modeler/views/popup/casemodel-import.html diff --git a/snow-flowable/src/main/resources/static/views/popup/decision-table-create.html b/snow-admin/src/main/resources/static/modeler/views/popup/decision-table-create.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/decision-table-create.html rename to snow-admin/src/main/resources/static/modeler/views/popup/decision-table-create.html diff --git a/snow-flowable/src/main/resources/static/views/popup/decision-table-duplicate.html b/snow-admin/src/main/resources/static/modeler/views/popup/decision-table-duplicate.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/decision-table-duplicate.html rename to snow-admin/src/main/resources/static/modeler/views/popup/decision-table-duplicate.html diff --git a/snow-flowable/src/main/resources/static/views/popup/decision-table-edit-hit-policy.html b/snow-admin/src/main/resources/static/modeler/views/popup/decision-table-edit-hit-policy.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/decision-table-edit-hit-policy.html rename to snow-admin/src/main/resources/static/modeler/views/popup/decision-table-edit-hit-policy.html diff --git a/snow-flowable/src/main/resources/static/views/popup/decision-table-edit-input-expression.html b/snow-admin/src/main/resources/static/modeler/views/popup/decision-table-edit-input-expression.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/decision-table-edit-input-expression.html rename to snow-admin/src/main/resources/static/modeler/views/popup/decision-table-edit-input-expression.html diff --git a/snow-flowable/src/main/resources/static/views/popup/decision-table-edit-output-expression.html b/snow-admin/src/main/resources/static/modeler/views/popup/decision-table-edit-output-expression.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/decision-table-edit-output-expression.html rename to snow-admin/src/main/resources/static/modeler/views/popup/decision-table-edit-output-expression.html diff --git a/snow-flowable/src/main/resources/static/views/popup/decision-table-import.html b/snow-admin/src/main/resources/static/modeler/views/popup/decision-table-import.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/decision-table-import.html rename to snow-admin/src/main/resources/static/modeler/views/popup/decision-table-import.html diff --git a/snow-flowable/src/main/resources/static/views/popup/decision-table-save-model.html b/snow-admin/src/main/resources/static/modeler/views/popup/decision-table-save-model.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/decision-table-save-model.html rename to snow-admin/src/main/resources/static/modeler/views/popup/decision-table-save-model.html diff --git a/snow-flowable/src/main/resources/static/views/popup/form-create.html b/snow-admin/src/main/resources/static/modeler/views/popup/form-create.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/form-create.html rename to snow-admin/src/main/resources/static/modeler/views/popup/form-create.html diff --git a/snow-flowable/src/main/resources/static/views/popup/form-duplicate.html b/snow-admin/src/main/resources/static/modeler/views/popup/form-duplicate.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/form-duplicate.html rename to snow-admin/src/main/resources/static/modeler/views/popup/form-duplicate.html diff --git a/snow-flowable/src/main/resources/static/views/popup/form-save-model.html b/snow-admin/src/main/resources/static/modeler/views/popup/form-save-model.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/form-save-model.html rename to snow-admin/src/main/resources/static/modeler/views/popup/form-save-model.html diff --git a/snow-flowable/src/main/resources/static/views/popup/model-delete.html b/snow-admin/src/main/resources/static/modeler/views/popup/model-delete.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/model-delete.html rename to snow-admin/src/main/resources/static/modeler/views/popup/model-delete.html diff --git a/snow-flowable/src/main/resources/static/views/popup/model-edit.html b/snow-admin/src/main/resources/static/modeler/views/popup/model-edit.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/model-edit.html rename to snow-admin/src/main/resources/static/modeler/views/popup/model-edit.html diff --git a/snow-flowable/src/main/resources/static/views/popup/model-use-as-new-version.html b/snow-admin/src/main/resources/static/modeler/views/popup/model-use-as-new-version.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/model-use-as-new-version.html rename to snow-admin/src/main/resources/static/modeler/views/popup/model-use-as-new-version.html diff --git a/snow-flowable/src/main/resources/static/views/popup/process-create.html b/snow-admin/src/main/resources/static/modeler/views/popup/process-create.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/process-create.html rename to snow-admin/src/main/resources/static/modeler/views/popup/process-create.html diff --git a/snow-flowable/src/main/resources/static/views/popup/process-duplicate.html b/snow-admin/src/main/resources/static/modeler/views/popup/process-duplicate.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/process-duplicate.html rename to snow-admin/src/main/resources/static/modeler/views/popup/process-duplicate.html diff --git a/snow-flowable/src/main/resources/static/views/popup/process-import.html b/snow-admin/src/main/resources/static/modeler/views/popup/process-import.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/process-import.html rename to snow-admin/src/main/resources/static/modeler/views/popup/process-import.html diff --git a/snow-flowable/src/main/resources/static/views/popup/subprocess-create.html b/snow-admin/src/main/resources/static/modeler/views/popup/subprocess-create.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/popup/subprocess-create.html rename to snow-admin/src/main/resources/static/modeler/views/popup/subprocess-create.html diff --git a/snow-flowable/src/main/resources/static/views/process.html b/snow-admin/src/main/resources/static/modeler/views/process.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/process.html rename to snow-admin/src/main/resources/static/modeler/views/process.html diff --git a/snow-flowable/src/main/resources/static/views/processes.html b/snow-admin/src/main/resources/static/modeler/views/processes.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/processes.html rename to snow-admin/src/main/resources/static/modeler/views/processes.html diff --git a/snow-flowable/src/main/resources/static/views/templates/decision-table-header-template.html b/snow-admin/src/main/resources/static/modeler/views/templates/decision-table-header-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/templates/decision-table-header-template.html rename to snow-admin/src/main/resources/static/modeler/views/templates/decision-table-header-template.html diff --git a/snow-flowable/src/main/resources/static/views/templates/decision-table-headercell-template.html b/snow-admin/src/main/resources/static/modeler/views/templates/decision-table-headercell-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/templates/decision-table-headercell-template.html rename to snow-admin/src/main/resources/static/modeler/views/templates/decision-table-headercell-template.html diff --git a/snow-flowable/src/main/resources/static/views/templates/form-builder-element-template.html b/snow-admin/src/main/resources/static/modeler/views/templates/form-builder-element-template.html similarity index 100% rename from snow-flowable/src/main/resources/static/views/templates/form-builder-element-template.html rename to snow-admin/src/main/resources/static/modeler/views/templates/form-builder-element-template.html diff --git a/snow-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/snow-admin/src/main/resources/static/ruoyi/js/ry-ui.js index 7985ec2..100c1c0 100644 --- a/snow-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/snow-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -437,6 +437,62 @@ var table = { }); } }); + }, + // 导入数据 + importFlowDeployment:function(formId) { + table.set(); + var currentId = $.common.isEmpty(formId) ? 'importTpl' : formId; + layer.open({ + type: 1, + area: ['550px', '500px'], + fix: false, + //不固定 + maxmin: true, + shade: 0.3, + title: '导入' + table.options.modalName + '数据', + content: $('#' + currentId).html(), + btn: [' 导入', ' 取消'], + // 弹层外区域关闭 + shadeClose: true, + btn1: function(index, layero){ + var file = layero.find('#file').val(); + var name = layero.find('#name').val(); + if (file == '' || (!$.common.endWith(file, '.xml') && !$.common.endWith(file, '.zip'))){ + $.modal.msgWarning("请选择后缀为 “xml”或“zip”的文件。"); + return false; + } + if(name==''||name==null){ + $.modal.msgWarning("流程名称不能为空"); + return false; + } + var index = layer.load(2, {shade: false}); + $.modal.disable(); + var formData = new FormData(layero.find('form')[0]); + $.ajax({ + url: table.options.importUrl, + data: formData, + cache: false, + contentType: false, + processData: false, + type: 'POST', + success: function (result) { + if (result.code == web_status.SUCCESS) { + $.modal.closeAll(); + $.modal.alertSuccess(result.msg); + $.table.refresh(); + } else if (result.code == web_status.WARNING) { + layer.close(index); + $.modal.enable(); + $.modal.alertWarning(result.msg) + } else { + layer.close(index); + $.modal.enable(); + $.modal.alertError(result.msg); + } + } + }); + } + }); }, // 下载模板 importTemplate: function() { diff --git a/snow-admin/src/main/resources/templates/flow/deployment.html b/snow-admin/src/main/resources/templates/flow/deployment.html new file mode 100644 index 0000000..dcf303e --- /dev/null +++ b/snow-admin/src/main/resources/templates/flow/deployment.html @@ -0,0 +1,198 @@ + + + + + + + +
+
+
+
+
+
+
    +
  • + + +
  • +
  • + + +
  • +
+
+
+ +
  • + + +
  • +
  • +  搜索 +  重置 +
  • + +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + + + + \ No newline at end of file diff --git a/snow-admin/src/test/java/com.snow/flowable/DeploymentTests.java b/snow-admin/src/test/java/com.snow/flowable/DeploymentTests.java index 95f9198..8b56c3f 100644 --- a/snow-admin/src/test/java/com.snow/flowable/DeploymentTests.java +++ b/snow-admin/src/test/java/com.snow/flowable/DeploymentTests.java @@ -33,7 +33,7 @@ public class DeploymentTests extends JunitTestApplication { // classDeploymentDTO.setCategory("snow"); classDeploymentDTO.setResourceName("请假流程"); // classDeploymentDTO.setTenantId("snow"); - // classDeploymentDTO.setClassPathResource("D:\\flowable\\leave.bpmn20.xml"); + // classDeploymentDTO.setClassPathResource("D:\\modeler\\leave.bpmn20.xml"); Deployment classDeployment = flowAblePublishService.createInputStreamDeployment(classDeploymentDTO,in); log.info("发布结果:{}",JSON.toJSONString(classDeployment)); } diff --git a/snow-admin/src/test/java/com.snow/flowable/FlowableServiceTests.java b/snow-admin/src/test/java/com.snow/flowable/FlowableServiceTests.java index 2dfbd8f..ae9aaee 100644 --- a/snow-admin/src/test/java/com.snow/flowable/FlowableServiceTests.java +++ b/snow-admin/src/test/java/com.snow/flowable/FlowableServiceTests.java @@ -3,6 +3,7 @@ package com.snow.flowable; import com.alibaba.fastjson.JSON; import com.google.common.collect.Maps; import com.snow.JunitTestApplication; +import com.snow.flowable.domain.DeploymentQueryDTO; import com.snow.flowable.domain.StartProcessDTO; import com.snow.flowable.service.FlowableService; import lombok.extern.slf4j.Slf4j; @@ -35,4 +36,12 @@ public class FlowableServiceTests extends JunitTestApplication { ProcessInstance processInstance = flowableService.startProcessInstanceByKey(startProcessDTO); log.info("发布结果:{}",JSON.toJSONString(processInstance)); } + + @Test + public void getDeploymentList(){ + DeploymentQueryDTO startProcessDTO=new DeploymentQueryDTO(); + + flowableService.getDeploymentList(startProcessDTO); + + } } diff --git a/snow-common/src/main/java/com/snow/common/core/controller/BaseController.java b/snow-common/src/main/java/com/snow/common/core/controller/BaseController.java index 99875be..6563b30 100644 --- a/snow-common/src/main/java/com/snow/common/core/controller/BaseController.java +++ b/snow-common/src/main/java/com/snow/common/core/controller/BaseController.java @@ -111,6 +111,9 @@ public class BaseController rspData.setCode(0); rspData.setRows(list); rspData.setTotal(new PageInfo(list).getTotal()); + rspData.setPageIndex(new PageInfo(list).getPageNum()); + rspData.setPageSize(new PageInfo(list).getPageSize()); + return rspData; } diff --git a/snow-common/src/main/java/com/snow/common/core/page/TableDataInfo.java b/snow-common/src/main/java/com/snow/common/core/page/TableDataInfo.java index 7b6be31..d3fa246 100644 --- a/snow-common/src/main/java/com/snow/common/core/page/TableDataInfo.java +++ b/snow-common/src/main/java/com/snow/common/core/page/TableDataInfo.java @@ -24,6 +24,11 @@ public class TableDataInfo implements Serializable /** 消息内容 */ private String msg; + private int pageSize; + + private int pageIndex; + + /** * 表格数据对象 */ @@ -82,4 +87,20 @@ public class TableDataInfo implements Serializable { this.msg = msg; } + + public int getPageSize() { + return pageSize; + } + + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } + + public int getPageIndex() { + return pageIndex; + } + + public void setPageIndex(int pageIndex) { + this.pageIndex = pageIndex; + } } \ No newline at end of file diff --git a/snow-flowable/pom.xml b/snow-flowable/pom.xml index 123ddff..12afb0d 100644 --- a/snow-flowable/pom.xml +++ b/snow-flowable/pom.xml @@ -23,11 +23,22 @@ mysql-connector-java 5.1.38 + + org.liquibase + liquibase-core + org.flowable flowable-spring-boot-starter 6.4.1 + + + org.flowable + flowable-ui-modeler-rest + 6.4.1 + + org.flowable flowable-json-converter diff --git a/snow-flowable/src/main/java/com/snow/flowable/config/CustomHandlerInterceptor.java b/snow-flowable/src/main/java/com/snow/flowable/config/CustomHandlerInterceptor.java new file mode 100644 index 0000000..38bca29 --- /dev/null +++ b/snow-flowable/src/main/java/com/snow/flowable/config/CustomHandlerInterceptor.java @@ -0,0 +1,55 @@ +package com.snow.flowable.config; + + +import org.flowable.idm.api.User; +import org.flowable.idm.engine.impl.persistence.entity.UserEntityImpl; + +import org.flowable.ui.common.security.SecurityUtils; +import org.springframework.stereotype.Component; +import org.springframework.web.servlet.HandlerInterceptor; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@Component +public class CustomHandlerInterceptor implements HandlerInterceptor { + + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) + throws Exception { + String servletPath = request.getServletPath(); + + if (servletPath.endsWith(".css") || servletPath.endsWith(".js") || servletPath.endsWith(".jpg") + || servletPath.endsWith(".png")) { + return true; + } + + //System.out.println(servletPath); + if (servletPath.startsWith("/app")) { + User user = new UserEntityImpl(); + user.setId("admin"); + SecurityUtils.assumeUser(user); + } +// Object obj = request.getSession().getAttribute(Const.SESSION_USER); +// if (obj == null) { +// response.sendRedirect("/"); +// return false; +// } + + return true; + } + + @Override + public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, + ModelAndView modelAndView) throws Exception { + HandlerInterceptor.super.postHandle(request, response, handler, modelAndView); + } + + @Override + public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) + throws Exception { + HandlerInterceptor.super.afterCompletion(request, response, handler, ex); + } + +} diff --git a/snow-framework/src/main/java/com/snow/framework/config/ResourcesConfig.java b/snow-flowable/src/main/java/com/snow/flowable/config/ResourcesConfig.java similarity index 85% rename from snow-framework/src/main/java/com/snow/framework/config/ResourcesConfig.java rename to snow-flowable/src/main/java/com/snow/flowable/config/ResourcesConfig.java index 4c0b1ec..5129ec6 100644 --- a/snow-framework/src/main/java/com/snow/framework/config/ResourcesConfig.java +++ b/snow-flowable/src/main/java/com/snow/flowable/config/ResourcesConfig.java @@ -1,4 +1,4 @@ -package com.snow.framework.config; +package com.snow.flowable.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -27,6 +27,8 @@ public class ResourcesConfig implements WebMvcConfigurer @Autowired private RepeatSubmitInterceptor repeatSubmitInterceptor; + @Autowired + private CustomHandlerInterceptor customHandlerInterceptor; /** * 默认首页的设置,当输入域名是可以自动跳转到默认指定的网页 @@ -55,5 +57,8 @@ public class ResourcesConfig implements WebMvcConfigurer public void addInterceptors(InterceptorRegistry registry) { registry.addInterceptor(repeatSubmitInterceptor).addPathPatterns("/**"); + registry.addInterceptor(customHandlerInterceptor) + //告知拦截器:/static/admin/** 与 /static/user/** 不需要拦截 (配置的是 路径) + .excludePathPatterns("/static/**"); } } \ No newline at end of file diff --git a/snow-flowable/src/main/java/com/snow/flowable/controller/FlowableUserController.java b/snow-flowable/src/main/java/com/snow/flowable/controller/FlowableUserController.java deleted file mode 100644 index 1f88dea..0000000 --- a/snow-flowable/src/main/java/com/snow/flowable/controller/FlowableUserController.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.snow.flowable.controller; - -import com.snow.flowable.service.FlowableUserService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author qimingjin - * @Title: - * @Description: - * @date 2020/11/20 10:34 - */ -@RestController -@RequestMapping("/flowableUser") -public class FlowableUserController { - - @Autowired - private FlowableUserService flowableUserService; - - - @RequestMapping(value = "/getUserList",method = RequestMethod.GET) - public void getFlowableUserList() { - - flowableUserService.getFlowableUserList(); - } -} diff --git a/snow-flowable/src/main/java/com/snow/flowable/domain/DeploymentQueryDTO.java b/snow-flowable/src/main/java/com/snow/flowable/domain/DeploymentQueryDTO.java new file mode 100644 index 0000000..3e02e14 --- /dev/null +++ b/snow-flowable/src/main/java/com/snow/flowable/domain/DeploymentQueryDTO.java @@ -0,0 +1,33 @@ +package com.snow.flowable.domain; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @program: snow + * @description + * @author: 没用的阿吉 + * @create: 2020-11-20 21:44 + **/ +@Data +public class DeploymentQueryDTO implements Serializable { + + private String deploymentKeyLike; + + private String deploymentId; + + private String deploymentNameLike; + + private String processDefinitionKeyLike; + + private String startUserId; + /** + * 初始页 + */ + private int firstResult=0; + /** + * 每页数 + */ + private int maxResults=10; +} diff --git a/snow-flowable/src/main/java/com/snow/flowable/domain/DeploymentVO.java b/snow-flowable/src/main/java/com/snow/flowable/domain/DeploymentVO.java new file mode 100644 index 0000000..84aa93c --- /dev/null +++ b/snow-flowable/src/main/java/com/snow/flowable/domain/DeploymentVO.java @@ -0,0 +1,44 @@ +package com.snow.flowable.domain; + +import com.alibaba.fastjson.annotation.JSONField; +import lombok.Data; +import org.flowable.engine.repository.ProcessDefinition; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * @program: snow + * @description + * @author: 没用的阿吉 + * @create: 2020-11-21 20:09 + **/ +@Data +public class DeploymentVO implements Serializable { + private String id; + + private String name; + + @JSONField(format = "YYYY-MM-DD hh:mm:ss") + private Date deploymentTime; + + private String category; + + private String key; + + private String derivedFrom; + + private String derivedFromRoot; + + private String tenantId; + + private String engineVersion; + + private ProcessDefinitionVO processDefinitionVO; + + private List processDefinitionVOList; + + private List modelVOList; + +} diff --git a/snow-flowable/src/main/java/com/snow/flowable/domain/FlowRemoteVO.java b/snow-flowable/src/main/java/com/snow/flowable/domain/FlowRemoteVO.java new file mode 100644 index 0000000..b8808ee --- /dev/null +++ b/snow-flowable/src/main/java/com/snow/flowable/domain/FlowRemoteVO.java @@ -0,0 +1,24 @@ +package com.snow.flowable.domain; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @program: snow + * @description + * @author: 没用的阿吉 + * @create: 2020-11-21 11:21 + **/ +@Data +public class FlowRemoteVO implements Serializable { + + private Integer size; + + private long total; + + private Integer start; + + private List data; +} diff --git a/snow-flowable/src/main/java/com/snow/flowable/domain/ModelVO.java b/snow-flowable/src/main/java/com/snow/flowable/domain/ModelVO.java new file mode 100644 index 0000000..4bbf109 --- /dev/null +++ b/snow-flowable/src/main/java/com/snow/flowable/domain/ModelVO.java @@ -0,0 +1,39 @@ +package com.snow.flowable.domain; + +import com.alibaba.fastjson.annotation.JSONField; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @program: snow + * @description + * @author: 没用的阿吉 + * @create: 2020-11-21 21:00 + **/ +@Data +public class ModelVO implements Serializable { + private String id; + + private String name; + + private String key; + + private String category; + + @JSONField(format = "YYYY-MM-DD hh:mm:ss") + private Date createTime; + + private Date lastUpdateTime; + + private Integer version; + + private String metaInfo; + + private String deploymentId; + + private String tenantId; + + +} diff --git a/snow-flowable/src/main/java/com/snow/flowable/domain/ProcessDefinitionVO.java b/snow-flowable/src/main/java/com/snow/flowable/domain/ProcessDefinitionVO.java new file mode 100644 index 0000000..4532d46 --- /dev/null +++ b/snow-flowable/src/main/java/com/snow/flowable/domain/ProcessDefinitionVO.java @@ -0,0 +1,48 @@ +package com.snow.flowable.domain; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @program: snow + * @description + * @author: 没用的阿吉 + * @create: 2020-11-21 22:40 + **/ +@Data +public class ProcessDefinitionVO implements Serializable { + private String id; + + private String category; + + private String name; + + private String key; + + private String description; + + private int version; + + private String resourceName; + + private String deploymentId; + + private String diagramResourceName; + + private boolean hasStartFormKey; + + private boolean hasGraphicalNotation; + + private boolean isSuspended; + + private String tenantId; + + private String derivedFrom; + + private String derivedFromRoot; + + private int derivedVersion; + + private String engineVersion; +} diff --git a/snow-flowable/src/main/java/com/snow/flowable/service/FlowableService.java b/snow-flowable/src/main/java/com/snow/flowable/service/FlowableService.java index 274ebbf..9c8dae6 100644 --- a/snow-flowable/src/main/java/com/snow/flowable/service/FlowableService.java +++ b/snow-flowable/src/main/java/com/snow/flowable/service/FlowableService.java @@ -1,11 +1,10 @@ package com.snow.flowable.service; -import com.snow.flowable.domain.CompleteTaskDTO; -import com.snow.flowable.domain.StartProcessDTO; -import com.snow.flowable.domain.TaskBaseDTO; +import com.snow.flowable.domain.*; import org.flowable.engine.runtime.ProcessInstance; import org.flowable.task.api.Task; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -16,6 +15,29 @@ import java.util.Map; * @date 2020/11/19 17:27 */ public interface FlowableService { + + /** + * 查询发布列表 + * @param deploymentQueryDTO + * @return + */ + List getDeploymentList(DeploymentQueryDTO deploymentQueryDTO); + + /** + * 删除发布 + * @param ids + */ + void deleteDeployment(String ids); + + /** + * 获取流程资源 + * @param id + * @param resourceName + * @param type + * @param response + */ + public void getDeploymentSource(String id, String resourceName, String type,HttpServletResponse response); + /** * 通过processDefinitionKey开始流程 * @param startProcessDTO diff --git a/snow-flowable/src/main/java/com/snow/flowable/service/FlowableUserService.java b/snow-flowable/src/main/java/com/snow/flowable/service/FlowableUserService.java index ff47fbb..a7e1c4f 100644 --- a/snow-flowable/src/main/java/com/snow/flowable/service/FlowableUserService.java +++ b/snow-flowable/src/main/java/com/snow/flowable/service/FlowableUserService.java @@ -1,5 +1,9 @@ package com.snow.flowable.service; +import org.flowable.ui.common.model.RemoteGroup; +import org.flowable.ui.common.model.RemoteUser; + +import java.util.List; import java.util.Map; /** @@ -15,7 +19,7 @@ public interface FlowableUserService { */ Map loginFlowable(); - void getFlowableUserList(); + List getFlowUserList(String name); - void getFlowableUserGroupList(); + List getFlowUserGroupList(String filter); } diff --git a/snow-flowable/src/main/java/com/snow/flowable/service/impl/FlowableServiceImpl.java b/snow-flowable/src/main/java/com/snow/flowable/service/impl/FlowableServiceImpl.java index 6e81218..d26ff85 100644 --- a/snow-flowable/src/main/java/com/snow/flowable/service/impl/FlowableServiceImpl.java +++ b/snow-flowable/src/main/java/com/snow/flowable/service/impl/FlowableServiceImpl.java @@ -1,28 +1,30 @@ package com.snow.flowable.service.impl; +import com.alibaba.fastjson.JSON; +import com.snow.common.core.text.Convert; import com.snow.common.exception.BusinessException; -import com.snow.flowable.domain.CompleteTaskDTO; -import com.snow.flowable.domain.FileEntry; -import com.snow.flowable.domain.StartProcessDTO; -import com.snow.flowable.domain.TaskBaseDTO; +import com.snow.flowable.domain.*; import com.snow.flowable.service.FlowableService; import com.snow.system.domain.SysRole; import com.snow.system.service.ISysRoleService; import lombok.extern.slf4j.Slf4j; -import org.flowable.engine.IdentityService; -import org.flowable.engine.RepositoryService; -import org.flowable.engine.RuntimeService; -import org.flowable.engine.TaskService; +import org.flowable.common.engine.impl.util.IoUtil; +import org.flowable.engine.*; +import org.flowable.engine.repository.*; import org.flowable.engine.runtime.ProcessInstance; import org.flowable.task.api.Task; import org.flowable.task.api.TaskQuery; import org.flowable.task.service.impl.TaskQueryProperty; -import org.flowable.task.service.impl.persistence.entity.TaskEntity; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Set; @@ -51,7 +53,92 @@ public class FlowableServiceImpl implements FlowableService { @Autowired private RepositoryService repositoryService; - + + @Autowired + private ManagementService managementService; + + @Override + public List getDeploymentList(DeploymentQueryDTO deploymentQueryDTO) { + + DeploymentQuery deploymentQuery = repositoryService.createDeploymentQuery(); + if(!StringUtils.isEmpty(deploymentQueryDTO.getDeploymentNameLike())){ + deploymentQuery.deploymentKeyLike(deploymentQueryDTO.getDeploymentNameLike()); + } + if(!StringUtils.isEmpty(deploymentQueryDTO.getDeploymentId())){ + deploymentQuery.deploymentId(deploymentQueryDTO.getDeploymentId()); + } + if(!StringUtils.isEmpty(deploymentQueryDTO.getDeploymentKeyLike())){ + deploymentQuery.deploymentKeyLike(deploymentQueryDTO.getDeploymentKeyLike()); + } + if(!StringUtils.isEmpty(deploymentQueryDTO.getProcessDefinitionKeyLike())){ + deploymentQuery.processDefinitionKeyLike(deploymentQueryDTO.getProcessDefinitionKeyLike()); + } + List deployments = deploymentQuery.orderByDeploymenTime().desc(). + listPage(deploymentQueryDTO.getFirstResult(), deploymentQueryDTO.getMaxResults()); + /*List deploymentVOList = deployments.stream().map(deployment -> { + DeploymentVO deploymentVO = new DeploymentVO(); + ModelQuery modelQuery = repositoryService.createModelQuery(); + List modelList = modelQuery.deploymentId(deployment.getId()).list(); + List modelVoList = modelList.stream().map(model -> { + ModelVO modelVO = new ModelVO(); + BeanUtils.copyProperties(model, modelVO); + return modelVO; + }).collect(Collectors.toList()); + BeanUtils.copyProperties(deployment, deploymentVO); + deploymentVO.setModelVOList(modelVoList); + return deploymentVO; + }).collect(Collectors.toList());*/ + List deploymentVOList = deployments.stream().map(t -> { + DeploymentVO deploymentVO = new DeploymentVO(); + ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery(); + processDefinitionQuery.deploymentId(t.getId()); + if (!StringUtils.isEmpty(deploymentQueryDTO.getStartUserId())) { + processDefinitionQuery.startableByUser(deploymentQueryDTO.getStartUserId()); + } + List processDefinitionList = processDefinitionQuery.active().list(); + List processDefinitionVOList = processDefinitionList.stream().map(processDefinition -> { + ProcessDefinitionVO processDefinitionVO = new ProcessDefinitionVO(); + BeanUtils.copyProperties(processDefinition, processDefinitionVO); + return processDefinitionVO; + }).collect(Collectors.toList()); + BeanUtils.copyProperties(t,deploymentVO); + deploymentVO.setProcessDefinitionVO(processDefinitionVOList.get(0)); + deploymentVO.setProcessDefinitionVOList(processDefinitionVOList); + return deploymentVO; + }).collect(Collectors.toList()); + + return deploymentVOList; + } + + @Override + public void deleteDeployment(String ids) { + List idList = Arrays.asList(Convert.toStrArray(ids)); + idList.parallelStream().forEach(t-> + repositoryService.deleteDeployment(t,true) + ); + } + + @Override + public void getDeploymentSource(String id, String resourceName, String type,HttpServletResponse response) { + try { + byte[] b = null; + if (type.equals("xml")) { + response.setHeader("Content-type", "text/xml;charset=UTF-8"); + InputStream inputStream = repositoryService.getResourceAsStream(id, resourceName); + b = IoUtil.readInputStream(inputStream, "image inputStream name"); + } else { + response.setHeader("Content-Type", "image/png"); + InputStream inputStream = repositoryService.getResourceAsStream(id, resourceName); + b = IoUtil.readInputStream(inputStream, "image inputStream name"); + } + + response.getOutputStream().write(b); + } catch (IOException e) { + log.error("ApiFlowableModelResource-loadXmlByModelId:" + e); + e.printStackTrace(); + } + + } @Override public ProcessInstance startProcessInstanceByKey(StartProcessDTO startProcessDTO) { ProcessInstance processInstance=null; diff --git a/snow-flowable/src/main/java/com/snow/flowable/service/impl/FlowableUserServiceImpl.java b/snow-flowable/src/main/java/com/snow/flowable/service/impl/FlowableUserServiceImpl.java index 9d91a81..e000e85 100644 --- a/snow-flowable/src/main/java/com/snow/flowable/service/impl/FlowableUserServiceImpl.java +++ b/snow-flowable/src/main/java/com/snow/flowable/service/impl/FlowableUserServiceImpl.java @@ -1,9 +1,15 @@ package com.snow.flowable.service.impl; +import com.google.common.collect.Lists; +import com.snow.common.utils.StringUtils; import com.snow.flowable.service.FlowableUserService; +import com.snow.system.domain.SysRole; import com.snow.system.domain.SysUser; +import com.snow.system.service.ISysRoleService; import com.snow.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; +import org.flowable.ui.common.model.RemoteGroup; +import org.flowable.ui.common.model.RemoteUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -11,6 +17,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @author qimingjin @@ -24,6 +31,8 @@ public class FlowableUserServiceImpl implements FlowableUserService { @Autowired private ISysUserService iSysUserService; + @Autowired + private ISysRoleService sysRoleService; @Override public Map loginFlowable() { @@ -48,13 +57,54 @@ public class FlowableUserServiceImpl implements FlowableUserService { } @Override - public void getFlowableUserList() { + public List getFlowUserList(String name) { SysUser sysUser=new SysUser(); - iSysUserService.selectAllocatedList(sysUser); + sysUser.setUserName(name); + List sysUsers = iSysUserService.selectUserList(sysUser); + List result = new ArrayList(); + + sysUsers.parallelStream().forEach(t->{ + RemoteUser remoteUser=new RemoteUser(); + remoteUser.setId(String.valueOf(t.getUserId())); + remoteUser.setEmail(t.getEmail()); + remoteUser.setDisplayName(t.getUserName()); + remoteUser.setFullName(t.getUserName()); + remoteUser.setFirstName(t.getUserName()); + remoteUser.setLastName(t.getUserName()); + + List roles = t.getRoles(); + if(!StringUtils.isEmpty(roles)) { + List remoteGroupList = roles.stream().map(role -> { + RemoteGroup remoteGroup = new RemoteGroup(); + remoteGroup.setId(String.valueOf(role.getRoleId())); + remoteGroup.setName(role.getRoleName()); + remoteGroup.setType(role.getRoleKey()); + return remoteGroup; + }).collect(Collectors.toList()); + remoteUser.setGroups(remoteGroupList); + } + + result.add(remoteUser); + }); + return result; } @Override - public void getFlowableUserGroupList() { - + public List getFlowUserGroupList(String filter) { + SysRole sysRole=new SysRole(); + sysRole.setRoleName(filter); + List sysRoles = sysRoleService.selectRoleList(sysRole); + List remoteGroupList=Lists.newArrayList(); + if(!StringUtils.isEmpty(sysRoles)) { + remoteGroupList = sysRoles.stream().map(role -> { + RemoteGroup remoteGroup = new RemoteGroup(); + remoteGroup.setName(role.getRoleName()); + remoteGroup.setId(String.valueOf(role.getRoleId())); + remoteGroup.setType(role.getRoleKey()); + return remoteGroup; + }).collect(Collectors.toList()); + } + return remoteGroupList; } + } diff --git a/snow-framework/src/main/java/com/snow/framework/config/MyBatisConfig.java b/snow-framework/src/main/java/com/snow/framework/config/MyBatisConfig.java index e418855..abd79d3 100644 --- a/snow-framework/src/main/java/com/snow/framework/config/MyBatisConfig.java +++ b/snow-framework/src/main/java/com/snow/framework/config/MyBatisConfig.java @@ -2,6 +2,7 @@ package com.snow.framework.config; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashSet; import java.util.List; import javax.sql.DataSource; @@ -97,12 +98,33 @@ public class MyBatisConfig String configLocation = env.getProperty("mybatis.configLocation"); typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage); VFS.addImplClass(SpringBootVFS.class); - + String[] split = mapperLocations.split(","); + List mapperLocationList= Arrays.asList(split); final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean(); sessionFactory.setDataSource(dataSource); sessionFactory.setTypeAliasesPackage(typeAliasesPackage); - sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources(mapperLocations)); + sessionFactory.setMapperLocations(resolveMapperLocations(mapperLocationList)); sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation)); return sessionFactory.getObject(); } + + /** + * 加载多个mapper路径 + * @return + */ + public Resource[] resolveMapperLocations(List mapperLocations ) { + ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver(); + List resources = new ArrayList<>(); + if (mapperLocations != null) { + for (String mapperLocation : mapperLocations) { + try { + Resource[] mappers = resourceResolver.getResources(mapperLocation); + resources.addAll(Arrays.asList(mappers)); + } catch (IOException e) { + e.getStackTrace(); + } + } + } + return resources.toArray(new Resource[resources.size()]); + } } \ No newline at end of file diff --git a/snow-framework/src/main/java/com/snow/framework/config/ShiroConfig.java b/snow-framework/src/main/java/com/snow/framework/config/ShiroConfig.java index a97df89..ae4e324 100644 --- a/snow-framework/src/main/java/com/snow/framework/config/ShiroConfig.java +++ b/snow-framework/src/main/java/com/snow/framework/config/ShiroConfig.java @@ -279,6 +279,7 @@ public class ShiroConfig filterChainDefinitionMap.put("/ajax/**", "anon"); filterChainDefinitionMap.put("/js/**", "anon"); filterChainDefinitionMap.put("/ruoyi/**", "anon"); + filterChainDefinitionMap.put("/modeler/**", "anon"); filterChainDefinitionMap.put("/captcha/captchaImage**", "anon"); filterChainDefinitionMap.put("/dingTalk/dingTalkCallBack", "anon"); // 退出 logout地址,shiro去清除session diff --git a/snow-system/src/main/resources/mapper/system/SysUserMapper.xml b/snow-system/src/main/resources/mapper/system/SysUserMapper.xml index 3c583a6..175e0a0 100644 --- a/snow-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/snow-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -99,6 +99,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND u.login_name like concat('%', #{loginName}, '%') + + AND u.user_name like concat('%', #{userName}, '%') + AND u.phonenumber like concat('%', #{phonenumber}, '%')