fixed invalid html & replaced custom persistenceProvider with provider from sdk

Author: Daniel Patanin

scb-engine/src/main/resources/application-dev.yaml

@@ -12,3 +12,4 @@ logging.level.io.securecodebox: DEBUG
 securecodebox.rest.user.scanner-default:
   user-id: defaultScanner
   password: scan
+

scb-scanprocesses/archetype-process/new-scan-process/pom.xml

@@ -34,12 +34,6 @@
                 <include>io/securecodebox/scanprocess/ProcessInitConfiguration.java</include>
             </includes>
         </fileSet>
-        <fileSet filtered="true" packaged="true" encoding="UTF-8">
-            <directory>src/main/java/</directory>
-            <includes>
-                <include>SummaryGeneratorDelegate.java</include>
-            </includes>
-        </fileSet>
         <fileSet filtered="true" packaged="false" encoding="UTF-8">
             <directory>src/main/resources/</directory>
             <excludes>

scb-scanprocesses/archetype-process/src/main/resources/META-INF/maven/archetype-metadata.xml

@@ -1,19 +0,0 @@
-<!--
-  ~ /*
-  ~ * SecureCodeBox (SCB)
-  ~ * Copyright 2015-2018 iteratec GmbH
-  ~ *
-  ~ * Licensed under the Apache License, Version 2.0 (the "License");
-  ~ * you may not use this file except in compliance with the License.
-  ~ * You may obtain a copy of the License at
-  ~ *
-  ~ * 	http://www.apache.org/licenses/LICENSE-2.0
-  ~ *
-  ~ * Unless required by applicable law or agreed to in writing, software
-  ~ * distributed under the License is distributed on an "AS IS" BASIS,
-  ~ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ * See the License for the specific language governing permissions and
-  ~ * limitations under the License.
-  ~ */
-  -->
-

scb-scanprocesses/archetype-process/src/main/resources/archetype-resources/src/main/java/SummaryGeneratorDelegate.java

@@ -51,7 +51,7 @@
       <bpmn:outgoing>SequenceFlow_PortscanFinished</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:sequenceFlow id="SequenceFlow_SummaryCreated" name="summary created" sourceRef="ServiceTask_CreateSummary" targetRef="EndEvent_FinishedPortscan" />
-    <bpmn:serviceTask id="ServiceTask_CreateSummary" name="Create Report Summary" camunda:asyncBefore="true" camunda:delegateExpression="${dollar}{${component}_SummaryGeneratorDelegate}">
+    <bpmn:serviceTask id="ServiceTask_CreateSummary" name="Create Report Summary" camunda:asyncBefore="true" camunda:delegateExpression="${summaryGeneratorDelegate}">
       <bpmn:extensionElements />
       <bpmn:incoming>SequenceFlow_ResultApproved</bpmn:incoming>
       <bpmn:incoming>SequenceFlow_1i44eck</bpmn:incoming>

scb-scanprocesses/archetype-process/src/main/resources/archetype-resources/src/main/resources/META-INF/processes.xml

@@ -69,26 +69,26 @@ <h2>Portscan results for "{{ target.name }}"</h2>
                             <td>{{ result.name }}</td>
                             <td>{{ result.category }}</td>
                             <td>
-                                <div ng-switch on="result.severity">
+                                <div ng-switch on="result.severity"></div>
                                 <span class="label label-danger" ng-switch-when="HIGH">
                                     <i aria-hidden="true"
                                        class="glyphicon glyphicon-fire"></i>
                                     {{ result.severity }}
                                 </span>
 
-                                    <span class="label label-warning" ng-switch-when="MEDIUM">
+                                <span class="label label-warning" ng-switch-when="MEDIUM">
                                     <i aria-hidden="true"
                                        class="glyphicon glyphicon glyphicon-alert"></i>
                                     {{ result.severity }}
                                 </span>
 
-                                    <span class="label label-primary" ng-switch-when="LOW">
+                                <span class="label label-primary" ng-switch-when="LOW">
                                     <i aria-hidden="true"
                                        class="glyphicon glyphicon-warning-sign"></i>
                                     {{ result.severity }}
                                 </span>
 
-                                    <span class="label label-default" ng-switch-default>
+                                <span class="label label-default" ng-switch-default>
                                     <i aria-hidden="true"
                                        class="glyphicon glyphicon-education"></i>
                                     {{ result.severity }}

…ources/bpmn/__processName__-process.bpmn …ources/bpmn/__processName___process.bpmnscb-scanprocesses/archetype-process/src/main/resources/archetype-resources/src/main/resources/bpmn/__processName__-process.bpmn renamed to scb-scanprocesses/archetype-process/src/main/resources/archetype-resources/src/main/resources/bpmn/__processName___process.bpmn scb-scanprocesses/archetype-process/src/main/resources/archetype-resources/src/main/resources/bpmn/__processName__-process.bpmn renamed to scb-scanprocesses/archetype-process/src/main/resources/archetype-resources/src/main/resources/bpmn/__processName___process.bpmn

@@ -20,7 +20,7 @@
 package io.securecodebox.scanprocess.test;
 
 import io.securecodebox.constants.DefaultFields;
-import ${package}.SummaryGeneratorDelegate;
+import io.securecodebox.scanprocess.delegate.SummaryGeneratorDelegate;
 import org.camunda.bpm.engine.ExternalTaskService;
 import org.camunda.bpm.engine.delegate.DelegateTask;
 import org.camunda.bpm.engine.delegate.Expression;
@@ -72,7 +72,7 @@
  */
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@Deployment(resources = "bpmn/__processName__-process.bpmn")
+@Deployment(resources = "bpmn/${processName}_process.bpmn")
 public class ${processName}Test {
 
     //Define the Process Activity IDs
@@ -91,7 +91,7 @@ public class ${processName}Test {
     private ProcessScenario process;
 
     @Mock
-    SummaryGeneratorDelegate delegate;
+    private SummaryGeneratorDelegate summeryGeneratorDelegate;
 
     /**
      * Executed before every test-case
@@ -125,7 +125,7 @@ If you have the path to your executable code (the class for delegate) as delegat
         then this guide is helpful:
         https://blog.akquinet.de/2016/11/04/camunda-bpm-test-your-processes-based-on-plain-old-java-delegates/
          */
-        autoMock("bpmn/_processname_ .bpmn");
+        autoMock("bpmn/${processName}_process.bpmn");
 
         /*
         Here we define a default behaviour for all the tasks in the BPMN model.