[incubator-streampipes] 02/02: Merge branch 'dev' into edge-extensions

[wi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wiener pushed a commit to branch edge-extensions
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git

commit 6a7c1e63f777da2292647b983614a830904537f2
Merge: afacf89 ff43f77
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Thu Mar 4 01:42:46 2021 +0100

    Merge branch 'dev' into edge-extensions

 .../src/main/resources/openapi.yaml                |   2 +-
 streampipes-backend/src/main/resources/shiro.ini   |   4 +-
 .../container/master/rest/SourcesResource.java     |   4 +-
 .../template/PipelineElementTemplateConfig.java    |   8 +
 .../monitoring/pipeline/TopicInfoCollector.java    |   4 -
 .../template/PipelineElementTemplateHandler.java   |   7 +-
 .../template/PipelineElementTemplateVisitor.java   |  95 +++--
 .../apache/streampipes/rest/impl/AutoComplete.java |  31 +-
 ...AbstractConfigurablePipelineElementBuilder.java |  18 +-
 .../org/apache/streampipes/vocabulary/Geo.java     |   7 +
 .../apache/streampipes/vocabulary/Geonames.java    |  13 +
 .../java/org/apache/streampipes/vocabulary/SO.java | 439 +++++++++++++++++++++
 .../apache/streampipes/vocabulary/SPSensor.java    |  14 +
 .../{Geonames.java => SemanticTypeRegistry.java}   |  39 +-
 .../event-schema/event-schema.component.html       |   6 +-
 .../adapter-started-dialog.component.html          |  31 +-
 .../adapter-started-dialog.component.scss          |   9 +-
 .../adapter-started-dialog.component.ts            |   4 +-
 .../edit-event-property.component.html             |   9 +-
 .../edit-event-property.component.ts               |  20 +-
 ui/src/app/connect/services/rest.service.ts        |   6 +-
 .../components/grid/dashboard-grid.component.ts    |   3 +
 .../components/panel/dashboard-panel.component.ts  |   4 +-
 .../widgets/table/table-widget.component.css       |   9 +-
 .../widgets/table/table-widget.component.html      |   6 +-
 .../widgets/table/table-widget.component.ts        |   3 +-
 .../pipeline-element-template-generator.ts         |  54 ++-
 .../apis/semantic-types.service.ts                 |  23 +-
 ui/src/app/platform-services/platform.module.ts    |   5 +-
 29 files changed, 774 insertions(+), 103 deletions(-)

diff --cc streampipes-backend/src/main/resources/shiro.ini
index f4c9ed8,3d348a1..76d1046
--- a/streampipes-backend/src/main/resources/shiro.ini
+++ b/streampipes-backend/src/main/resources/shiro.ini
@@@ -67,12 -67,8 +67,10 @@@ securityManager.rememberMeManager.cooki
  /api/v2/users/*/labeling/category/* = anon
  /api/v2/users/*/labeling/* = anon
  /api/v2/users/*/labeling = anon
 +/api/v2/users/*/nodes = anon
 +/api/v2/users/*/nodes/* = anon
  /api/v2/connect/*/master/administration = anon
- /api/v2/connect/*/master/sources/* = anon
- /api/v2/connect/*/master/sources/*/streams = anon
- /api/v2/connect/*/master/sources/*/streams/* = anon
+ /api/v2/connect/*/master/sources/** = anon
  /api/v2/connect/*/master/resolvable/*/configurations = anon
  /api/openapi.json = anon
  /api/** = authcBearer, customFilter
diff --cc ui/src/app/platform-services/platform.module.ts
index 9d90ac7,44c8bea..4bc0738
--- a/ui/src/app/platform-services/platform.module.ts
+++ b/ui/src/app/platform-services/platform.module.ts
@@@ -40,7 -40,7 +41,9 @@@ import {SemanticTypesService} from "./a
      PipelineElementService,
      PipelineMonitoringService,
      PipelineService,
-     NodeService
++    NodeService,
++    PipelineService,
+     SemanticTypesService
    ],
    entryComponents: []
  })