Skip to content

Commit

Permalink
Merge pull request #189 from assimbly/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
assimbly authored Jan 6, 2019
2 parents 0e8adf4 + ba0174e commit 4f87bf8
Show file tree
Hide file tree
Showing 743 changed files with 33,760 additions and 17,784 deletions.
60 changes: 0 additions & 60 deletions .angular-cli.json

This file was deleted.

2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ insert_final_newline = true
[*.md]
trim_trailing_whitespace = false

[{package,bower}.json]
[package.json]
indent_style = space
indent_size = 2
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ TODO text
.stylelintrc text

## CONFIGS
*.bowerrc text
*.conf text
*.config text
.editorconfig text
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
######################
/build/www/**
/src/test/javascript/coverage/
/src/test/javascript/PhantomJS*/

######################
# Node
Expand All @@ -17,6 +16,7 @@ node_tmp/
node_modules/
npm-debug.log.*
/.awcache/*
/.cache-loader/*

######################
# SASS
Expand Down Expand Up @@ -67,6 +67,7 @@ local.properties
*.ids
*.orig
classes/
out/

######################
# Visual Studio Code
Expand Down
5 changes: 5 additions & 0 deletions .huskyrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"hooks": {
"pre-commit": "lint-staged"
}
}
25 changes: 14 additions & 11 deletions .jhipster/EnvironmentVariables.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
{
"fluentMethods": true,
"relationships": [
{
"relationshipName": "gateway",
"otherEntityName": "gateway",
"relationshipType": "many-to-one",
"otherEntityField": "id"
}
],
"name": "EnvironmentVariables",
"fields": [
{
"fieldName": "key",
Expand All @@ -18,10 +10,21 @@
"fieldType": "String"
}
],
"relationships": [
{
"relationshipName": "gateway",
"otherEntityName": "gateway",
"relationshipType": "many-to-one",
"otherEntityField": "id"
}
],
"changelogDate": "20180114132914",
"entityTableName": "environment_variables",
"dto": "mapstruct",
"pagination": "no",
"service": "no",
"jpaMetamodelFiltering": false
"service": "serviceImpl",
"jpaMetamodelFiltering": false,
"fluentMethods": true,
"clientRootFolder": "",
"applications": "*"
}
43 changes: 21 additions & 22 deletions .jhipster/ErrorEndpoint.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,10 @@
{
"fluentMethods": true,
"relationships": [
{
"relationshipType": "one-to-one",
"relationshipName": "service",
"otherEntityName": "service",
"otherEntityField": "id",
"ownerSide": true,
"otherEntityRelationshipName": "errorEndpoint"
},
{
"relationshipType": "one-to-one",
"relationshipName": "header",
"otherEntityName": "header",
"otherEntityField": "id",
"ownerSide": true,
"otherEntityRelationshipName": "errorEndpoint"
}
],
"name": "ErrorEndpoint",
"fields": [
{
"fieldName": "type",
"fieldType": "EndpointType",
"fieldValues": "SONICMQ,ACTIVEMQ,SJMS,SQL,HTTP4,SFTP,STREAM,WASTEBIN,FILE"
"fieldValues": "ACTIVEMQ,FILE,HTTP4,KAFKA,SFTP,SJMS,SMTP,SONICMQ,SQL,STREAM,VM,WASTEBIN"
},
{
"fieldName": "uri",
Expand All @@ -33,10 +15,27 @@
"fieldType": "String"
}
],
"relationships": [
{
"relationshipType": "many-to-one",
"relationshipName": "service",
"otherEntityName": "service",
"otherEntityField": "id"
},
{
"relationshipType": "many-to-one",
"relationshipName": "header",
"otherEntityName": "header",
"otherEntityField": "id"
}
],
"changelogDate": "20180114201817",
"entityTableName": "error_endpoint",
"dto": "mapstruct",
"pagination": "no",
"service": "no",
"jpaMetamodelFiltering": false
"service": "serviceImpl",
"jpaMetamodelFiltering": false,
"fluentMethods": true,
"clientRootFolder": "",
"applications": "*"
}
47 changes: 25 additions & 22 deletions .jhipster/Flow.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
{
"fluentMethods": true,
"name": "Flow",
"fields": [
{
"fieldName": "name",
"fieldType": "String"
},
{
"fieldName": "autoStart",
"fieldType": "Boolean"
},
{
"fieldName": "offLoading",
"fieldType": "Boolean"
}
],
"relationships": [
{
"relationshipName": "gateway",
Expand All @@ -13,41 +27,30 @@
"otherEntityName": "fromEndpoint",
"otherEntityField": "id",
"ownerSide": true,
"otherEntityRelationshipName": "flowRoute"
"otherEntityRelationshipName": "flow"
},
{
"relationshipType": "one-to-one",
"relationshipName": "errorEndpoint",
"otherEntityName": "errorEndpoint",
"otherEntityField": "id",
"ownerSide": true,
"otherEntityRelationshipName": "flowRoute"
"otherEntityRelationshipName": "flow"
},
{
"relationshipType": "one-to-many",
"relationshipName": "toEndpoint",
"otherEntityName": "toEndpoint",
"otherEntityRelationshipName": "flowRoute"
}
],
"fields": [
{
"fieldName": "name",
"fieldType": "String"
},
{
"fieldName": "autoStart",
"fieldType": "Boolean"
},
{
"fieldName": "offloading",
"fieldType": "Boolean"
"otherEntityRelationshipName": "flow"
}
],
"changelogDate": "20180114132915",
"entityTableName": "flow",
"dto": "mapstruct",
"service": "no",
"entityTableName": "flow_route",
"pagination": "infinite-scroll",
"service": "serviceImpl",
"jpaMetamodelFiltering": false,
"pagination": "infinite-scroll"
}
"fluentMethods": true,
"clientRootFolder": "",
"applications": "*"
}
43 changes: 21 additions & 22 deletions .jhipster/FromEndpoint.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,10 @@
{
"fluentMethods": true,
"relationships": [
{
"relationshipType": "one-to-one",
"relationshipName": "service",
"otherEntityName": "service",
"otherEntityField": "id",
"ownerSide": true,
"otherEntityRelationshipName": "fromEndpoint"
},
{
"relationshipType": "one-to-one",
"relationshipName": "header",
"otherEntityName": "header",
"otherEntityField": "id",
"ownerSide": true,
"otherEntityRelationshipName": "fromEndpoint"
}
],
"name": "FromEndpoint",
"fields": [
{
"fieldName": "type",
"fieldType": "EndpointType",
"fieldValues": "SONICMQ,ACTIVEMQ,SJMS,SQL,HTTP4,SFTP,STREAM,WASTEBIN,FILE"
"fieldValues": "ACTIVEMQ,FILE,HTTP4,KAFKA,SFTP,SJMS,SMTP,SONICMQ,SQL,STREAM,VM,WASTEBIN"
},
{
"fieldName": "uri",
Expand All @@ -33,10 +15,27 @@
"fieldType": "String"
}
],
"relationships": [
{
"relationshipType": "many-to-one",
"relationshipName": "service",
"otherEntityName": "service",
"otherEntityField": "id"
},
{
"relationshipType": "many-to-one",
"relationshipName": "header",
"otherEntityName": "header",
"otherEntityField": "id"
}
],
"changelogDate": "20180114201815",
"entityTableName": "from_endpoint",
"dto": "mapstruct",
"pagination": "no",
"service": "no",
"jpaMetamodelFiltering": false
"service": "serviceImpl",
"jpaMetamodelFiltering": false,
"fluentMethods": true,
"clientRootFolder": "",
"applications": "*"
}
Loading

0 comments on commit 4f87bf8

Please sign in to comment.