Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Refactor3 #1121

Merged
merged 42 commits into from
Jul 27, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
53f2600
Add Spring boot support
Mar 29, 2021
ecf327c
Merging Code in Springboot
Jul 14, 2021
6c02bb7
Correction of some tests
Jul 14, 2021
27ac2f3
Delete /SecurityUtilsTest.java
Janite Jul 14, 2021
b9eeca4
add enableEtl flag in application.yml
Janite Jul 14, 2021
1aca9c5
fix: renamed the module with correct name in build file
mayankgituni Jul 14, 2021
b0a340b
null pointer issue fix
justinapromore Jul 14, 2021
d1e915c
Minor chnages in integration test
Jul 15, 2021
32c3bbf
Fix pd
Jul 16, 2021
033725c
Minor fix
Jul 16, 2021
ab372b7
Added Keycloak support
Jul 20, 2021
d493697
Added login controller
Jul 20, 2021
8a12001
AP-2529 Refactor CSV Exporter to reduce memory footprint (#1107)
franklma Jul 20, 2021
3cef495
Minor bug fix
Jul 20, 2021
c79edc7
Merge branch 'refactor3' of github.com:apromore/ApromoreCore into ref…
Jul 20, 2021
8173ca0
Minor path change in js
Jul 20, 2021
c81d877
minor chnages to log dir in application
Jul 20, 2021
16410c0
fix: the css and impala error
mayanktomar20 Jul 21, 2021
2e8a2f7
fix: session issues
mayanktomar20 Jul 21, 2021
6d9f6eb
Minor fix in css and security
Jul 22, 2021
d158cca
Merge branch 'refactor3' of github.com:apromore/ApromoreCore into ref…
Jul 22, 2021
cdda924
Appl yaml
Jul 22, 2021
3ba1b6c
Changes in spring security
Jul 22, 2021
162980c
fix: links in UserAdminController and username error message for crea…
Janite Jul 23, 2021
d994fdd
Merge pull request #1113 from apromore/bugfix/AP-4245/Fix-create-user…
nolantellis Jul 23, 2021
7ab6bb5
AP-4284 Save BPMN Model on Process Discoverer is returning error (#1111)
franklma Jul 23, 2021
c7e58ca
Bugfix/AP-4292/select all select none labels switched (#1114)
Janite Jul 23, 2021
81b1cf2
Change properties
Jul 23, 2021
6ccf8a8
Merge branch 'refactor3' of github.com:apromore/ApromoreCore into ref…
Jul 23, 2021
6f4d3f9
Added docker-compose
Jul 23, 2021
bb29354
AP-3702 ordering of bpmn file
justinapromore Jul 23, 2021
c0dd222
fix etl menu item order and add a seperator before etl in menu
Janite Jul 26, 2021
7b4459a
Merge pull request #1117 from apromore/AP-4320/fix-etl-menu-item-order
nolantellis Jul 26, 2021
3199180
Added global handling
Jul 26, 2021
2a7c2bf
Merge branch 'refactor3' of github.com:apromore/ApromoreCore into ref…
Jul 26, 2021
9583d49
AP-4247 Hide buttons in PD according to user's access type to Log
Jul 26, 2021
cbd46f6
Merge dash changes from dev branch
Jul 26, 2021
7a9ddd8
Merge branch 'AP-4247-springboot' into refactor3
Jul 27, 2021
a8b423a
Comment secure flag for http
Jul 27, 2021
b4565a8
Merge branch 'refactor3' of github.com:apromore/ApromoreCore into ref…
Jul 27, 2021
caed31a
Fix minnnor bugs
Jul 27, 2021
dfe1bed
Merge development branch
Jul 27, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Next Next commit
Add Spring boot support
  • Loading branch information
Nolan Tellis committed Jul 15, 2021
commit 53f2600b849c260d1a9b6dac81fb6069fa4766a0
9 changes: 6 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
**/.checkstyle
**/dependency-reduced-pom.xml
**/catalina.home_IS_UNDEFINED

**/apromore-editor.js
Apromore-Core-Components/Apromore-BPMNEditor/src/main/resources/static/bpmneditor/editor/apromore-editor.js
# IntelliJ IDEA artifacts, see https://intellij-support.jetbrains.com/hc/en-us/articles/206544839-How-to-manage-projects-under-Version-Control-Systems
**/.idea/*
**/*.iws
Expand Down Expand Up @@ -47,5 +48,7 @@ Apromore-Assembly/Manager-Repository*
Apromore-Assembly/Parquet-Repository
Apromore-Assembly/virgo-tomcat-server-3.6.4.RELEASE

# Gradle
.gradle/
Event-Logs-Repository/
# Ignore Gradle project-specific cache directory
.gradle

Binary file added .gradle/6.8.3/fileChanges/last-build.bin
Binary file not shown.
Binary file added .gradle/6.8.3/fileHashes/fileHashes.lock
Binary file not shown.
Binary file added .gradle/checksums/checksums.lock
Binary file not shown.
Empty file.
Empty file added .gradle/vcs-1/gc.properties
Empty file.
6 changes: 6 additions & 0 deletions Apromore-Boot/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#
# https://help.github.com/articles/dealing-with-line-endings/
#
# These are explicitly windows files and should use crlf
*.bat text eol=crlf

83 changes: 83 additions & 0 deletions Apromore-Boot/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
group = 'org.apromore.plugin'
version = '7.21-SNAPSHOT'
apply plugin : "org.springframework.boot"
apply plugin: "com.gorylenko.gradle-git-properties"
apply plugin: 'application'


dependencies {
implementation project(':Apromore-Core-Components:Apromore-Portal')
implementation project(':Apromore-Zk')
implementation project(':Apromore-Custom-Plugins')
implementation project(':Apromore-Plugins:plugin-core:core:api')
developmentOnly 'org.springframework.boot:spring-boot-devtools'
}

bootJar {
mainClassName = 'org.apromore.ApromoreCoreBootApplication'
enabled = true
}

distZip {
enabled =false
}

distTar {
enabled =false
}
bootRun {
mainClass = 'org.apromore.ApromoreCoreBootApplication'
enabled = true;
}
processResources {

from ('../Apromore-Core-Components/Apromore-Portal/src/main/webapp') {
include '*.zul'
into 'web'
}


from ('../Apromore-Core-Components/Apromore-Portal/src/main/webapp') {
exclude '*.zul'
exclude 'WEB-INF/*'
into 'web'
}



from ('../Apromore-Core-Components/Apromore-Portal/src/main/webapp/WEB-INF') {
include 'zk.xml'
into 'metainfo/zk'
}

from ('../Apromore-Core-Components/Apromore-Portal/src/main/webapp/WEB-INF') {
include 'zk-label.properties'
into 'metainfo'
}

from '../Apromore-Database/src/main/resources'


from ('../Apromore-Core-Components/Apromore-BPMNEditor/src/main/resources/static') {
into 'web'
}


// static files for each plugins

from ('../Apromore-Custom-Plugins/User-Admin-Portal-Plugin/src/main/resources/static') {
into 'web'
}

from ('../Apromore-Custom-Plugins/Log-Animation-Portal-Plugin/src/main/resources/static') {
into 'web'
}

from ('../Apromore-Custom-Plugins/Process-Discoverer-Portal-Plugin/src/main/resources/static') {
into 'web'
}


}


13 changes: 13 additions & 0 deletions Apromore-Boot/dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
FROM adoptopenjdk:11-jre-hotspot as builder
WORKDIR application
ARG JAR_FILE=./build/libs/Apromore-Core-7.21-SNAPSHOT.jar
COPY ${JAR_FILE} application.jar
RUN java -Djarmode=layertools -jar application.jar extract

FROM adoptopenjdk:11-jre-hotspot
WORKDIR application
COPY --from=builder application/dependencies/ ./
COPY --from=builder application/spring-boot-loader/ ./
COPY --from=builder application/snapshot-dependencies/ ./
COPY --from=builder application/application/ ./
ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/**
* #%L
* This file is part of "Apromore Core".
* %%
* Copyright (C) 2018 - 2021 Apromore Pty Ltd.
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Lesser Public License for more details.
*
* You should have received a copy of the GNU General Lesser Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #L%
*/
package org.apromore;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;


@SpringBootApplication
public class ApromoreCoreBootApplication {


public static void main(String[] args) {
SpringApplication.run(ApromoreCoreBootApplication.class, args);
}



}
169 changes: 169 additions & 0 deletions Apromore-Boot/src/main/resources/application.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,169 @@
airflow:
hostname: 'http://54.206.190.197:8000'
password: 'apromore2020!'
username: 'admin'

apromore:
tenant: 'ap'

bimp:
simulation:
post:
baseURL: http://localhost:8080

cache:
numOfEvent: 0
numOfTrace: 0

calendar:
enable: false

contactEmail: support@apromore.atlassian.net

editor:
dir: ../Editor-Repository
js: apromore-editor-min.js

etl:
s3:
url: 'S3::mayank-test-databucket::ap-southeast-2::https://s3.ap-southeast-2.amazonaws.com'

etlplugin:
pipeline:
s3:
bucketname: 'mayank-test-databucket'
region: 'ap-southeast-2'


filestore:
dir: ../Filestore-Repository


impala:
etl:
dataStore: '/etl_data'
s3:
directory: 'apromore/etl/portal/users/'
jdbc:
password: 'MAcri'
url: 'jdbc:impala://49.192.153.100:21050/'
username: 'apromore'

import:
maxSize: 100000000

ldap:
emailAttribute: mail
firstNameAttribute: givenName
lastNameAttribute: sn
providerURL: ldaps://centaur.unimelb.edu.au
userContext: ou=people,o=unimelb
usernameAttribute: uid

logging:
level:
root: INFO
file:
name: ${user_home}/.apromore/logs/apromore.log
max-size: 20MB
total-size-cap: 20GB
clean-history-on-start: true
pattern:
rolling-file-name: ${user_home}/.apromore/logs/apromore-%d{yyyy-MM-dd}.%i.log

logs:
dir: ${user_home}/.apromore/Event-Logs-Repository

mail:
host: smtp.gmail.com
password: password
port: 587
username: user@gmail.com


management:
security:
enabled: false

manager:
ehcache:
config:
url: classpath:ehcache.xml

portal:
menuitemorder:
File: Upload,Download,ETLPlugin,Export log as CSV,Create folder,Create model,Create
model (legacy editor),Edit model,Edit model (legacy editor),Rename,Delete
menuorder: About,File,Discover,Analyze,Redesign,Implement,Monitor,Account

security:
basic:
enabled: false
fulluserreg:
enable: true
ppagree:
enable: true
publish:
enable: false
subscribe:
enable: true
tcagree:
enable: true
userreg:
enable: false


site:
editor: editor
externalhost: localhost
externalport: 8181
filestore: filestore
fullProtocolHostPortUrl: http://localhost:8181/
host: localhost
logvisualizer: logvisualizer
manager: manager
port: 9000
portal: /
pql: pql
securityms:
httplogoutUrl: ''
httpslogoutUrl: ''
host: localhost
port: 8282
useKeycloakSso: false


spring:
datasource:
password: MAcri
# url: jdbc:h2:mem:Manager-Repository;DATABASE_TO_UPPER=FALSE;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
url : jdbc:mysql://localhost:3307/apromore?createDatabaseIfNotExist=true&autoReconnect=true&allowMultiQueries=true&rewriteBatchedStatements=true&characterEncoding=utf-8&serverTimezone=GMT%2B10
username: root
jpa:
hibernate:
ddl-auto: none
naming:
implicit-strategy: org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyJpaImpl
physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
liquibase:
change-log: classpath:db/migration/changeLog.yaml
contexts: MYSQL
password: MAcri
user: root


storage:
path: FILE::${user_home}/.apromore/Event-Logs-Repository


version:
number: ${project_version}
edition: ${version_edition}

maxUploadSize : 100000000

numOfEvent : 10000

numOfTrace : 10000

aboutMeName : 'Apromore Pty Ltd.'
12 changes: 12 additions & 0 deletions Apromore-Cache/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@

group = 'org.apromore'
version = '1.0'
description = 'Apromore Cache'

dependencies {

implementation 'org.springframework.boot:spring-boot-starter-cache'
implementation 'org.apache.servicemix.bundles:org.apache.servicemix.bundles.ehcache:2.6.11_1'
implementation 'net.sf.ehcache:ehcache'
implementation 'javax.cache:cache-api'
}
Loading