diff options
Diffstat (limited to 'src/main')
21 files changed, 1708 insertions, 636 deletions
diff --git a/src/main/java/org/onap/clamp/clds/config/sdc/BlueprintParserFilesConfiguration.java b/src/main/java/org/onap/clamp/clds/config/sdc/BlueprintParserFilesConfiguration.java new file mode 100644 index 000000000..10306b433 --- /dev/null +++ b/src/main/java/org/onap/clamp/clds/config/sdc/BlueprintParserFilesConfiguration.java @@ -0,0 +1,52 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP CLAMP + * ================================================================================ + * Copyright (C) 2018 AT&T Intellectual Property. All rights + * reserved. + * ================================================================================ + * 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. + * ============LICENSE_END============================================ + * =================================================================== + * ECOMP is a trademark and service mark of AT&T Intellectual Property. + */ + +package org.onap.clamp.clds.config.sdc; + +/** + * This class is used to decode the configuration found in + * application.properties, this is related to the blueprint mapping + * configuration that is used to create data in database, according to the + * blueprint content coming from SDC. + */ +public class BlueprintParserFilesConfiguration { + + private String svgXmlFilePath; + private String bpmnXmlFilePath; + + public String getBpmnXmlFilePath() { + return bpmnXmlFilePath; + } + + public void setBpmnXmlFilePath(String bpmnXmlFilePath) { + this.bpmnXmlFilePath = bpmnXmlFilePath; + } + + public String getSvgXmlFilePath() { + return svgXmlFilePath; + } + + public void setSvgXmlFilePath(String svgXmlFilePath) { + this.svgXmlFilePath = svgXmlFilePath; + } +} diff --git a/src/main/java/org/onap/clamp/clds/config/sdc/BlueprintParserMappingConfiguration.java b/src/main/java/org/onap/clamp/clds/config/sdc/BlueprintParserMappingConfiguration.java new file mode 100644 index 000000000..a78e895f7 --- /dev/null +++ b/src/main/java/org/onap/clamp/clds/config/sdc/BlueprintParserMappingConfiguration.java @@ -0,0 +1,70 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP CLAMP + * ================================================================================ + * Copyright (C) 2018 AT&T Intellectual Property. All rights + * reserved. + * ================================================================================ + * 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. + * ============LICENSE_END============================================ + * =================================================================== + * ECOMP is a trademark and service mark of AT&T Intellectual Property. + */ + +package org.onap.clamp.clds.config.sdc; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; + +import java.io.IOException; +import java.io.InputStream; +import java.util.List; + +/** + * This class is used to decode the configuration found in + * application.properties, this is related to the blueprint mapping + * configuration that is used to create data in database, according to the + * blueprint content coming from SDC. + */ +public class BlueprintParserMappingConfiguration { + + private String blueprintKey; + private boolean dcaeDeployable; + private BlueprintParserFilesConfiguration files; + + public String getBlueprintKey() { + return blueprintKey; + } + + public void setBlueprintKey(String blueprintKey) { + this.blueprintKey = blueprintKey; + } + + public BlueprintParserFilesConfiguration getFiles() { + return files; + } + + public void setFiles(BlueprintParserFilesConfiguration filesConfig) { + this.files = filesConfig; + } + + public boolean isDcaeDeployable() { + return dcaeDeployable; + } + + public static List<BlueprintParserMappingConfiguration> createFromJson(InputStream json) throws IOException { + TypeReference<List<BlueprintParserMappingConfiguration>> mapType = new TypeReference<List<BlueprintParserMappingConfiguration>>() { + }; + return new ObjectMapper().readValue(json, mapType); + } +} diff --git a/src/main/java/org/onap/clamp/clds/config/sdc/SdcControllersConfiguration.java b/src/main/java/org/onap/clamp/clds/config/sdc/SdcControllersConfiguration.java index f1a961840..f5c658cf8 100644 --- a/src/main/java/org/onap/clamp/clds/config/sdc/SdcControllersConfiguration.java +++ b/src/main/java/org/onap/clamp/clds/config/sdc/SdcControllersConfiguration.java @@ -39,14 +39,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.ApplicationContext; import org.springframework.core.io.Resource; -import org.springframework.stereotype.Component; /** * This class maps the SDC config JSON file. This JSON can have multiple * sdc-controller config. So the json is loaded in a static way and the instance * must specify the controller name that it represents. */ -@Component public class SdcControllersConfiguration { private static final EELFLogger logger = EELFManager.getInstance().getLogger(SdcControllersConfiguration.class); diff --git a/src/main/java/org/onap/clamp/clds/config/spring/CldsSdcControllerConfiguration.java b/src/main/java/org/onap/clamp/clds/config/spring/CldsSdcControllerConfiguration.java new file mode 100644 index 000000000..09d4d6332 --- /dev/null +++ b/src/main/java/org/onap/clamp/clds/config/spring/CldsSdcControllerConfiguration.java @@ -0,0 +1,92 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP CLAMP + * ================================================================================ + * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights + * reserved. + * ================================================================================ + * 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. + * ============LICENSE_END============================================ + * =================================================================== + * ECOMP is a trademark and service mark of AT&T Intellectual Property. + */ + +package org.onap.clamp.clds.config.spring; + +import com.att.eelf.configuration.EELFLogger; +import com.att.eelf.configuration.EELFManager; + +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; + +import org.onap.clamp.clds.config.ClampProperties; +import org.onap.clamp.clds.config.sdc.SdcControllersConfiguration; +import org.onap.clamp.clds.exception.sdc.controller.SdcControllerException; +import org.onap.clamp.clds.sdc.controller.SdcSingleController; +import org.onap.clamp.clds.sdc.controller.installer.CsarInstaller; +import org.onap.clamp.clds.sdc.controller.installer.CsarInstallerImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; + +@Configuration +@Profile("clamp-sdc-controller") +public class CldsSdcControllerConfiguration { + + private static final EELFLogger logger = EELFManager.getInstance().getLogger(CldsSdcControllerConfiguration.class); + private List<SdcSingleController> sdcControllersList = new ArrayList<>(); + @Autowired + private ClampProperties clampProp; + @Autowired + protected CsarInstaller csarInstaller; + + @PostConstruct + public void loadSdcControllers() { + SdcControllersConfiguration sdcControllersConfig = getSdcControllersConfiguration(); + sdcControllersConfig.getAllDefinedControllers().forEach((k, v) -> { + logger.info("Instantiating controller :" + k); + SdcSingleController sdcController = new SdcSingleController(clampProp, csarInstaller, v, true); + try { + sdcController.initSdc(); + } catch (SdcControllerException e) { + logger.error("Exception caught during initialization of sdc controller", e); + } + sdcControllersList.add(sdcController); + }); + } + + @PreDestroy + public void killSdcControllers() { + sdcControllersList.forEach(e -> { + try { + e.closeSdc(); + } catch (SdcControllerException e1) { + logger.error("Exception caught during initialization of sdc controller", e); + } + }); + } + + @Bean(name = "csarInstaller") + public CsarInstaller getCsarInstaller() { + return new CsarInstallerImpl(); + } + + @Bean(name = "sdcControllersConfiguration") + public SdcControllersConfiguration getSdcControllersConfiguration() { + return new SdcControllersConfiguration(); + } +}
\ No newline at end of file diff --git a/src/main/java/org/onap/clamp/clds/model/CldsModel.java b/src/main/java/org/onap/clamp/clds/model/CldsModel.java index 02c70cae0..34876bbc0 100644 --- a/src/main/java/org/onap/clamp/clds/model/CldsModel.java +++ b/src/main/java/org/onap/clamp/clds/model/CldsModel.java @@ -43,33 +43,36 @@ import org.onap.clamp.clds.dao.CldsDao; */ public class CldsModel { - private static final EELFLogger logger = EELFManager.getInstance().getLogger(CldsModel.class); - private static final int UUID_LENGTH = 36; - private static final String STATUS_DESIGN = "DESIGN"; - private static final String STATUS_DISTRIBUTED = "DISTRIBUTED"; - private static final String STATUS_ACTIVE = "ACTIVE"; - private static final String STATUS_STOPPED = "STOPPED"; - private static final String STATUS_DELETING = "DELETING"; - private static final String STATUS_ERROR = "ERROR"; - private static final String STATUS_UNKNOWN = "UNKNOWN"; - private String id; - private String templateId; - private String templateName; - private String name; - private String controlNamePrefix; - private String controlNameUuid; - private String bpmnText; - private String propText; - private String imageText; - private String docText; - private String blueprintText; - private CldsEvent event; - private String status; - private List<String> permittedActionCd; + private static final EELFLogger logger = EELFManager.getInstance().getLogger(CldsModel.class); + private static final int UUID_LENGTH = 36; + private static final String STATUS_DESIGN = "DESIGN"; + private static final String STATUS_DISTRIBUTED = "DISTRIBUTED"; + private static final String STATUS_ACTIVE = "ACTIVE"; + private static final String STATUS_STOPPED = "STOPPED"; + private static final String STATUS_DELETING = "DELETING"; + private static final String STATUS_ERROR = "ERROR"; + private static final String STATUS_UNKNOWN = "UNKNOWN"; + private String id; + private String templateId; + private String templateName; + private String name; + private String controlNamePrefix; + private String controlNameUuid; + private String bpmnText; + private String propText; + private String imageText; + private String docText; + private String blueprintText; + private CldsEvent event; + private String status; + private List<String> permittedActionCd; private List<CldsModelInstance> cldsModelInstanceList; - private String typeId; - private String typeName; - private String deploymentId; + /** + * The service type Id received from DCAE by querying it + */ + private String typeId; + private String typeName; + private String deploymentId; /** * Construct empty model. @@ -95,7 +98,6 @@ public class CldsModel { public boolean canInventoryCall() { boolean canCall = false; /* Below checks the clds event is submit/resubmit */ - if ((event.isActionCd(CldsEvent.ACTION_SUBMIT) || event.isActionCd(CldsEvent.ACTION_RESUBMIT) || event.isActionCd(CldsEvent.ACTION_SUBMITDCAE))) { canCall = true; @@ -116,7 +118,6 @@ public class CldsModel { * set the status in the model */ private void determineStatus() { - status = STATUS_UNKNOWN; if (event == null || event.getActionCd() == null) { status = STATUS_DESIGN; @@ -141,7 +142,6 @@ public class CldsModel { } else if (event.isActionAndStateCd(CldsEvent.ACTION_STOP, CldsEvent.ACTION_STATE_ANY)) { status = STATUS_STOPPED; } - } /** @@ -491,5 +491,4 @@ public class CldsModel { public List<String> getPermittedActionCd() { return permittedActionCd; } - } diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/SdcSingleController.java b/src/main/java/org/onap/clamp/clds/sdc/controller/SdcSingleController.java new file mode 100644 index 000000000..f8fef3943 --- /dev/null +++ b/src/main/java/org/onap/clamp/clds/sdc/controller/SdcSingleController.java @@ -0,0 +1,317 @@ +/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2018 AT&T Intellectual Property. All rights
+ * reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+package org.onap.clamp.clds.sdc.controller;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+
+import java.util.Date;
+
+import org.onap.clamp.clds.config.ClampProperties;
+import org.onap.clamp.clds.config.sdc.SdcSingleControllerConfiguration;
+import org.onap.clamp.clds.exception.sdc.controller.CsarHandlerException;
+import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
+import org.onap.clamp.clds.exception.sdc.controller.SdcControllerException;
+import org.onap.clamp.clds.exception.sdc.controller.SdcDownloadException;
+import org.onap.clamp.clds.exception.sdc.controller.SdcParametersException;
+import org.onap.clamp.clds.sdc.controller.installer.CsarHandler;
+import org.onap.clamp.clds.sdc.controller.installer.CsarInstaller;
+import org.onap.clamp.clds.util.LoggingUtils;
+import org.openecomp.sdc.api.IDistributionClient;
+import org.openecomp.sdc.api.consumer.IDistributionStatusMessage;
+import org.openecomp.sdc.api.consumer.INotificationCallback;
+import org.openecomp.sdc.api.notification.IArtifactInfo;
+import org.openecomp.sdc.api.notification.INotificationData;
+import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
+import org.openecomp.sdc.api.results.IDistributionClientResult;
+import org.openecomp.sdc.impl.DistributionClientFactory;
+import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
+import org.openecomp.sdc.utils.DistributionActionResultEnum;
+import org.openecomp.sdc.utils.DistributionStatusEnum;
+
+/**
+ * This class handles one sdc controller defined in the config.
+ */
+public class SdcSingleController {
+
+ private static final EELFLogger logger = EELFManager.getInstance().getLogger(SdcSingleController.class);
+ protected boolean isAsdcClientAutoManaged = false;
+ protected CsarInstaller csarInstaller;
+ protected ClampProperties refProp;
+ public static final String CONFIG_SDC_FOLDER = "sdc.csarFolder";
+
+ /**
+ * Inner class for Notification callback
+ */
+ private final class ASDCNotificationCallBack implements INotificationCallback {
+
+ private SdcSingleController asdcController;
+
+ ASDCNotificationCallBack(SdcSingleController controller) {
+ asdcController = controller;
+ }
+
+ /**
+ * This method can be called multiple times at the same moment. The
+ * controller must be thread safe !
+ */
+ @Override
+ public void activateCallback(INotificationData iNotif) {
+ Date startTime = new Date();
+ String event = "Receive a callback notification in ASDC, nb of resources: " + iNotif.getResources().size();
+ logger.debug(event);
+ asdcController.treatNotification(iNotif);
+ LoggingUtils.setTimeContext(startTime, new Date());
+ LoggingUtils.setResponseContext("0", "SDC Notification received and processed successfully",
+ this.getClass().getName());
+ }
+ }
+
+ // ***** Controller STATUS code
+ protected int nbOfNotificationsOngoing = 0;
+
+ public int getNbOfNotificationsOngoing() {
+ return nbOfNotificationsOngoing;
+ }
+
+ private SdcSingleControllerStatus controllerStatus = SdcSingleControllerStatus.STOPPED;
+
+ protected final synchronized void changeControllerStatus(SdcSingleControllerStatus newControllerStatus) {
+ switch (newControllerStatus) {
+ case BUSY:
+ ++this.nbOfNotificationsOngoing;
+ this.controllerStatus = newControllerStatus;
+ break;
+ case IDLE:
+ if (this.nbOfNotificationsOngoing > 1) {
+ --this.nbOfNotificationsOngoing;
+ } else {
+ this.nbOfNotificationsOngoing = 0;
+ this.controllerStatus = newControllerStatus;
+ }
+ break;
+ default:
+ this.controllerStatus = newControllerStatus;
+ break;
+ }
+ }
+
+ public final synchronized SdcSingleControllerStatus getControllerStatus() {
+ return this.controllerStatus;
+ }
+
+ // ***** END of Controller STATUS code
+ protected SdcSingleControllerConfiguration sdcConfig;
+ private IDistributionClient distributionClient;
+
+ public SdcSingleController(ClampProperties clampProp, CsarInstaller csarInstaller,
+ SdcSingleControllerConfiguration sdcSingleConfig, boolean isClientAutoManaged) {
+ this.isAsdcClientAutoManaged = isClientAutoManaged;
+ this.sdcConfig = sdcSingleConfig;
+ this.refProp = clampProp;
+ this.csarInstaller = csarInstaller;
+ }
+
+ /**
+ * This method initializes the SDC Controller and the SDC Client.
+ *
+ * @throws SdcControllerException
+ * It throws an exception if the SDC Client cannot be
+ * instantiated or if an init attempt is done when already
+ * initialized
+ * @throws SdcParametersException
+ * If there is an issue with the parameters provided
+ */
+ public void initSdc() throws SdcControllerException {
+ logger.debug("Attempt to initialize the SDC Controller");
+ if (this.getControllerStatus() != SdcSingleControllerStatus.STOPPED) {
+ throw new SdcControllerException("The controller is already initialized, call the closeSDC method first");
+ }
+ if (this.distributionClient == null) {
+ distributionClient = DistributionClientFactory.createDistributionClient();
+ }
+ IDistributionClientResult result = this.distributionClient.init(sdcConfig, new ASDCNotificationCallBack(this));
+ if (!result.getDistributionActionResult().equals(DistributionActionResultEnum.SUCCESS)) {
+ logger.error("ASDC distribution client init failed with reason:" + result.getDistributionMessageResult());
+ this.changeControllerStatus(SdcSingleControllerStatus.STOPPED);
+ throw new SdcControllerException("Initialization of the SDC Controller failed with reason: "
+ + result.getDistributionMessageResult());
+ }
+ result = this.distributionClient.start();
+ if (!result.getDistributionActionResult().equals(DistributionActionResultEnum.SUCCESS)) {
+ logger.debug("SDC distribution client start failed with reason:" + result.getDistributionMessageResult());
+ this.changeControllerStatus(SdcSingleControllerStatus.STOPPED);
+ throw new SdcControllerException(
+ "Startup of the SDC Controller failed with reason: " + result.getDistributionMessageResult());
+ }
+ this.changeControllerStatus(SdcSingleControllerStatus.IDLE);
+ }
+
+ /**
+ * This method closes the SDC Controller and the SDC Client.
+ *
+ * @throws SdcControllerException
+ * It throws an exception if the SDC Client cannot be closed
+ * because it's currently BUSY in processing notifications.
+ */
+ public void closeSdc() throws SdcControllerException {
+ if (this.getControllerStatus() == SdcSingleControllerStatus.BUSY) {
+ throw new SdcControllerException("Cannot close the ASDC controller as it's currently in BUSY state");
+ }
+ if (this.distributionClient != null) {
+ this.distributionClient.stop();
+ // If auto managed we can set it to Null, SdcController controls it.
+ // In the other case the client of this class has specified it, so
+ // we can't reset it
+ if (isAsdcClientAutoManaged) {
+ // Next init will initialize it with a new Sdc Client
+ this.distributionClient = null;
+ }
+ }
+ this.changeControllerStatus(SdcSingleControllerStatus.STOPPED);
+ }
+
+ /**
+ * This method processes the notification received from Sdc.
+ *
+ * @param iNotif
+ * The INotificationData
+ */
+ public void treatNotification(INotificationData iNotif) {
+ CsarHandler csar = null;
+ try {
+ logger.info("Notification received for service UUID:" + iNotif.getServiceUUID());
+ this.changeControllerStatus(SdcSingleControllerStatus.BUSY);
+ csar = new CsarHandler(iNotif, this.sdcConfig.getSdcControllerName(),
+ refProp.getStringValue(CONFIG_SDC_FOLDER));
+ if (csarInstaller.isCsarAlreadyDeployed(csar)) {
+ csar.save(downloadTheArtifact(csar.getArtifactElement()));
+ this.sendASDCNotification(NotificationType.DOWNLOAD, csar.getArtifactElement().getArtifactURL(),
+ sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.DOWNLOAD_OK, null,
+ System.currentTimeMillis());
+ csarInstaller.installTheCsar(csar);
+ this.sendASDCNotification(NotificationType.DEPLOY, csar.getArtifactElement().getArtifactURL(),
+ sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.DEPLOY_OK, null,
+ System.currentTimeMillis());
+ } else {
+ this.sendASDCNotification(NotificationType.DOWNLOAD, csar.getArtifactElement().getArtifactURL(),
+ sdcConfig.getConsumerID(), iNotif.getDistributionID(),
+ DistributionStatusEnum.ALREADY_DOWNLOADED, null, System.currentTimeMillis());
+ this.sendASDCNotification(NotificationType.DOWNLOAD, csar.getArtifactElement().getArtifactURL(),
+ sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.ALREADY_DEPLOYED,
+ null, System.currentTimeMillis());
+ }
+ } catch (SdcArtifactInstallerException e) {
+ logger.error("SdcArtifactInstallerException exception caught during the notification processing", e);
+ this.sendASDCNotification(NotificationType.DEPLOY, csar.getArtifactElement().getArtifactURL(),
+ sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.DEPLOY_ERROR,
+ e.getMessage(), System.currentTimeMillis());
+ } catch (SdcDownloadException e) {
+ logger.error("SdcDownloadException exception caught during the notification processing", e);
+ this.sendASDCNotification(NotificationType.DOWNLOAD, csar.getArtifactElement().getArtifactURL(),
+ sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.DOWNLOAD_ERROR,
+ e.getMessage(), System.currentTimeMillis());
+ } catch (CsarHandlerException e) {
+ logger.error("CsarHandlerException exception caught during the notification processing", e);
+ this.sendASDCNotification(NotificationType.DOWNLOAD, csar.getArtifactElement().getArtifactURL(),
+ sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.DOWNLOAD_ERROR,
+ e.getMessage(), System.currentTimeMillis());
+ } catch (SdcToscaParserException e) {
+ this.sendASDCNotification(NotificationType.DEPLOY, csar.getArtifactElement().getArtifactURL(),
+ sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.DEPLOY_ERROR,
+ e.getMessage(), System.currentTimeMillis());
+ } catch (RuntimeException e) {
+ logger.error("Unexpected exception caught during the notification processing", e);
+ } finally {
+ this.changeControllerStatus(SdcSingleControllerStatus.IDLE);
+ }
+ }
+
+ private enum NotificationType {
+ DOWNLOAD, DEPLOY
+ }
+
+ private IDistributionClientDownloadResult downloadTheArtifact(IArtifactInfo artifact) throws SdcDownloadException {
+ logger.debug("Trying to download the artifact : " + artifact.getArtifactURL() + " UUID: "
+ + artifact.getArtifactUUID());
+ IDistributionClientDownloadResult downloadResult;
+ try {
+ downloadResult = distributionClient.download(artifact);
+ if (null == downloadResult) {
+ logger.info("downloadResult is Null for: " + artifact.getArtifactUUID());
+ return null;
+ }
+ } catch (RuntimeException e) {
+ throw new SdcDownloadException("Exception caught when downloading the artifact", e);
+ }
+ if (DistributionActionResultEnum.SUCCESS.equals(downloadResult.getDistributionActionResult())) {
+ logger.info("Successfully downloaded the artifact " + artifact.getArtifactURL() + " UUID "
+ + artifact.getArtifactUUID() + "Size of payload " + downloadResult.getArtifactPayload().length);
+ } else {
+ throw new SdcDownloadException("Artifact " + artifact.getArtifactName()
+ + " could not be downloaded from ASDC URL " + artifact.getArtifactURL() + " UUID "
+ + artifact.getArtifactUUID() + ")" + System.lineSeparator() + "Error message is "
+ + downloadResult.getDistributionMessageResult() + System.lineSeparator());
+ }
+ return downloadResult;
+ }
+
+ private void sendASDCNotification(NotificationType notificationType, String artifactURL, String consumerID,
+ String distributionID, DistributionStatusEnum status, String errorReason, long timestamp) {
+ String event = "Sending " + notificationType.name() + "(" + status.name() + ")"
+ + " notification to ASDC for artifact:" + artifactURL;
+ if (errorReason != null) {
+ event = event + "(" + errorReason + ")";
+ }
+ logger.info(event);
+ String action = "";
+ try {
+ IDistributionStatusMessage message = new DistributionStatusMessage(artifactURL, consumerID, distributionID,
+ status, timestamp);
+ switch (notificationType) {
+ case DOWNLOAD:
+ if (errorReason != null) {
+ this.distributionClient.sendDownloadStatus(message, errorReason);
+ } else {
+ this.distributionClient.sendDownloadStatus(message);
+ }
+ action = "sendDownloadStatus";
+ break;
+ case DEPLOY:
+ if (errorReason != null) {
+ this.distributionClient.sendDeploymentStatus(message, errorReason);
+ } else {
+ this.distributionClient.sendDeploymentStatus(message);
+ }
+ action = "sendDeploymentdStatus";
+ break;
+ default:
+ break;
+ }
+ } catch (RuntimeException e) {
+ logger.warn("Unable to send the Sdc Notification (" + action + ") due to an exception", e);
+ }
+ logger.info("Sdc Notification sent successfully(" + action + ")");
+ }
+}
diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarHandler.java b/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarHandler.java index 270286bcb..b11385239 100644 --- a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarHandler.java +++ b/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarHandler.java @@ -23,48 +23,60 @@ package org.onap.clamp.clds.sdc.controller.installer; +import com.att.aft.dme2.internal.apache.commons.io.IOUtils; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Enumeration; import java.util.List; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; import org.onap.clamp.clds.exception.sdc.controller.CsarHandlerException; import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException; import org.openecomp.sdc.api.notification.IArtifactInfo; import org.openecomp.sdc.api.notification.INotificationData; +import org.openecomp.sdc.api.notification.IResourceInstance; import org.openecomp.sdc.api.results.IDistributionClientDownloadResult; import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper; import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException; import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory; /** - * CsarDescriptor that will be used to deploy in CLAMP. + * CsarDescriptor that will be used to deploy file in CLAMP file system. Some + * methods can also be used to get some data from it. */ public class CsarHandler { private static final EELFLogger logger = EELFManager.getInstance().getLogger(CsarHandler.class); private IArtifactInfo artifactElement; - private String filePath; + private String csarFilePath; private String controllerName; private SdcToscaParserFactory factory = SdcToscaParserFactory.getInstance(); private ISdcCsarHelper sdcCsarHelper; + private String dcaeBlueprint; + private String blueprintArtifactName; + private String blueprintInvariantResourceUuid; + private String blueprintInvariantServiceUuid; public static final String CSAR_TYPE = "TOSCA_CSAR"; - private String csarPath; + private INotificationData sdcNotification; - public CsarHandler(INotificationData iNotif, String controller, String sdcCsarPath) throws CsarHandlerException { - this.csarPath = sdcCsarPath; + public CsarHandler(INotificationData iNotif, String controller, String clampCsarPath) throws CsarHandlerException { + this.sdcNotification = iNotif; this.controllerName = controller; this.artifactElement = searchForUniqueCsar(iNotif); - this.filePath = buildFilePathForCsar(artifactElement); + this.csarFilePath = buildFilePathForCsar(artifactElement, clampCsarPath); } - private String buildFilePathForCsar(IArtifactInfo artifactElement) { - return csarPath + "/" + controllerName + "/" + artifactElement.getArtifactName(); + private String buildFilePathForCsar(IArtifactInfo artifactElement, String clampCsarPath) { + return clampCsarPath + "/" + controllerName + "/" + artifactElement.getArtifactName(); } private IArtifactInfo searchForUniqueCsar(INotificationData iNotif) throws CsarHandlerException { @@ -77,21 +89,56 @@ public class CsarHandler { throw new CsarHandlerException("Unable to find a CSAR in the Sdc Notification"); } - public void save(IDistributionClientDownloadResult resultArtifact) + public synchronized void save(IDistributionClientDownloadResult resultArtifact) throws SdcArtifactInstallerException, SdcToscaParserException { try { logger.info("Writing CSAR file : " + artifactElement.getArtifactURL() + " UUID " + artifactElement.getArtifactUUID() + ")"); - Path path = Paths.get(filePath); + Path path = Paths.get(csarFilePath); Files.createDirectories(path.getParent()); Files.createFile(path); - try (FileOutputStream outFile = new FileOutputStream(filePath)) { + try (FileOutputStream outFile = new FileOutputStream(csarFilePath)) { outFile.write(resultArtifact.getArtifactPayload(), 0, resultArtifact.getArtifactPayload().length); } - sdcCsarHelper = factory.getSdcCsarHelper(filePath); + sdcCsarHelper = factory.getSdcCsarHelper(csarFilePath); + this.loadDcaeBlueprint(); + this.loadBlueprintArtifactDetails(); } catch (IOException e) { throw new SdcArtifactInstallerException( - "Exception caught when trying to write the CSAR on the file system to " + filePath, e); + "Exception caught when trying to write the CSAR on the file system to " + csarFilePath, e); + } + } + + private void loadBlueprintArtifactDetails() { + blueprintInvariantServiceUuid = this.getSdcNotification().getServiceInvariantUUID(); + for (IResourceInstance resource : this.getSdcNotification().getResources()) { + if ("VF".equals(resource.getResourceType())) { + for (IArtifactInfo artifact : resource.getArtifacts()) { + if ("DCAE_INVENTORY_BLUEPRINT".equals(artifact.getArtifactType())) { + blueprintArtifactName = artifact.getArtifactName(); + blueprintInvariantResourceUuid = resource.getResourceInvariantUUID(); + } + } + } + } + } + + private void loadDcaeBlueprint() throws IOException, SdcArtifactInstallerException { + List<ZipEntry> listEntries = new ArrayList<>(); + try (ZipFile zipFile = new ZipFile(csarFilePath)) { + Enumeration<? extends ZipEntry> entries = zipFile.entries(); + while (entries.hasMoreElements()) { + ZipEntry entry = entries.nextElement(); + if (entry.getName().contains("DCAE_INVENTORY_BLUEPRINT")) { + listEntries.add(entry); + } + } + if (listEntries.size() > 1) { + throw new SdcArtifactInstallerException("There are multiple entries in the DCAE inventory"); + } + try (InputStream stream = zipFile.getInputStream(listEntries.get(0))) { + this.dcaeBlueprint = IOUtils.toString(stream); + } } } @@ -100,10 +147,30 @@ public class CsarHandler { } public String getFilePath() { - return filePath; + return csarFilePath; } - public ISdcCsarHelper getSdcCsarHelper() { + public synchronized ISdcCsarHelper getSdcCsarHelper() { return sdcCsarHelper; } + + public synchronized String getDcaeBlueprint() { + return dcaeBlueprint; + } + + public INotificationData getSdcNotification() { + return sdcNotification; + } + + public String getBlueprintArtifactName() { + return blueprintArtifactName; + } + + public String getBlueprintInvariantResourceUuid() { + return blueprintInvariantResourceUuid; + } + + public String getBlueprintInvariantServiceUuid() { + return blueprintInvariantServiceUuid; + } } diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstaller.java b/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstaller.java new file mode 100644 index 000000000..739fc06d0 --- /dev/null +++ b/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstaller.java @@ -0,0 +1,33 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP CLAMP + * ================================================================================ + * Copyright (C) 2018 AT&T Intellectual Property. All rights + * reserved. + * ================================================================================ + * 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. + * ============LICENSE_END============================================ + * =================================================================== + * ECOMP is a trademark and service mark of AT&T Intellectual Property. + */ + +package org.onap.clamp.clds.sdc.controller.installer; + +import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException; + +public interface CsarInstaller { + + boolean isCsarAlreadyDeployed(CsarHandler csar) throws SdcArtifactInstallerException; + + public void installTheCsar(CsarHandler csar) throws SdcArtifactInstallerException; +} diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstallerImpl.java b/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstallerImpl.java new file mode 100644 index 000000000..cb100725b --- /dev/null +++ b/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstallerImpl.java @@ -0,0 +1,197 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP CLAMP + * ================================================================================ + * Copyright (C) 2018 AT&T Intellectual Property. All rights + * reserved. + * ================================================================================ + * 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. + * ============LICENSE_END============================================ + * =================================================================== + * ECOMP is a trademark and service mark of AT&T Intellectual Property. + */ + +package org.onap.clamp.clds.sdc.controller.installer; + +import com.att.aft.dme2.internal.apache.commons.io.IOUtils; +import com.att.eelf.configuration.EELFLogger; +import com.att.eelf.configuration.EELFManager; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.annotation.PostConstruct; + +import org.json.simple.parser.ParseException; +import org.onap.clamp.clds.client.DcaeInventoryServices; +import org.onap.clamp.clds.config.sdc.BlueprintParserFilesConfiguration; +import org.onap.clamp.clds.config.sdc.BlueprintParserMappingConfiguration; +import org.onap.clamp.clds.dao.CldsDao; +import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException; +import org.onap.clamp.clds.model.CldsModel; +import org.onap.clamp.clds.model.CldsTemplate; +import org.onap.clamp.clds.service.CldsService; +import org.onap.clamp.clds.service.CldsTemplateService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.ApplicationContext; +import org.yaml.snakeyaml.Yaml; + +/** + * This class will be instantiated by spring config, and used by Sdc Controller. + * There is no state kept by the bean. It's used to deploy the csar/notification + * received from SDC in DB. + */ +public class CsarInstallerImpl implements CsarInstaller { + + private static final EELFLogger logger = EELFManager.getInstance().getLogger(CsarInstallerImpl.class); + private Map<String, BlueprintParserFilesConfiguration> bpmnMapping = new HashMap<>(); + public static final String TEMPLATE_NAME_PREFIX = "DCAE-Designer-ClosedLoopTemplate-"; + public static final String MODEL_NAME_PREFIX = "ClosedLoop-"; + /** + * The file name that will be loaded by Spring. + */ + @Value("${clamp.config.sdc.blueprint.parser.mapping:'classpath:/clds/blueprint-parser-mapping.json'}") + protected String blueprintMappingFile; + @Autowired + protected ApplicationContext appContext; + @Autowired + private CldsDao cldsDao; + @Autowired + CldsTemplateService cldsTemplateService; + @Autowired + CldsService cldsService; + @Autowired + DcaeInventoryServices dcaeInventoryService; + + @PostConstruct + public void loadConfiguration() throws IOException { + BlueprintParserMappingConfiguration + .createFromJson(appContext.getResource(blueprintMappingFile).getInputStream()).stream() + .forEach(e -> bpmnMapping.put(e.getBlueprintKey(), e.getFiles())); + } + + @Override + public boolean isCsarAlreadyDeployed(CsarHandler csar) throws SdcArtifactInstallerException { + return (CldsModel.retrieve(cldsDao, csar.getSdcCsarHelper().getServiceMetadata().getValue("name"), + false) != null) ? true : false; + } + + @Override + public void installTheCsar(CsarHandler csar) throws SdcArtifactInstallerException { + try { + String serviceTypeId = queryDcaeToGetServiceTypeId(csar); + createFakeCldsModel(csar, createFakeCldsTemplate(csar, this.searchForRightMapping(csar)), serviceTypeId); + } catch (IOException e) { + throw new SdcArtifactInstallerException("Exception caught during the Csar installation in database", e); + } catch (ParseException e) { + throw new SdcArtifactInstallerException("Exception caught during the Dcae query to get ServiceTypeId", e); + } + } + + private BlueprintParserFilesConfiguration searchForRightMapping(CsarHandler csar) + throws SdcArtifactInstallerException { + List<BlueprintParserFilesConfiguration> listConfig = new ArrayList<>(); + Yaml yaml = new Yaml(); + Map<String, Object> templateNodes = ((Map<String, Object>) ((Map<String, Object>) yaml + .load(csar.getDcaeBlueprint())).get("node_templates")); + bpmnMapping.entrySet().forEach(e -> { + if (templateNodes.keySet().stream().anyMatch(t -> t.contains(e.getKey()))) { + listConfig.add(e.getValue()); + } + }); + if (listConfig.size() > 1) { + throw new SdcArtifactInstallerException( + "The code does not currently support multiple MicroServices in the blueprint"); + } else if (listConfig.isEmpty()) { + throw new SdcArtifactInstallerException("There is no recognized MicroService found in the blueprint"); + } + return listConfig.get(0); + } + + private String searchForPolicyName(CsarHandler csar) throws SdcArtifactInstallerException { + String policyName = null; + Yaml yaml = new Yaml(); + List<String> policyNameList = new ArrayList<>(); + Map<String, Object> templateNodes = ((Map<String, Object>) ((Map<String, Object>) yaml + .load(csar.getDcaeBlueprint())).get("node_templates")); + templateNodes.entrySet().stream().filter(e -> e.getKey().contains("policy_")).forEach(ef -> { + String filteredPolicyName = (String) ((Map<String, Object>) ((Map<String, Object>) ef.getValue()) + .get("properties")).get("policy_filter"); + if (policyName != null) { + policyNameList.add(filteredPolicyName); + } else { + String inputPolicyName = (String) ((Map<String, Object>) ((Map<String, Object>) ((Map<String, Object>) ef + .getValue()).get("properties")).get("policy_id")).get("get_input"); + if (inputPolicyName != null) { + policyNameList.add("get_input"); + } + } + }); + if (policyNameList.size() > 1) { + throw new SdcArtifactInstallerException( + "The code does not currently support multiple Policy MicroServices in the blueprint"); + } else if (policyNameList.isEmpty()) { + throw new SdcArtifactInstallerException( + "There is no recognized Policy MicroService found in the blueprint"); + } + return policyNameList.get(0); + } + + private String queryDcaeToGetServiceTypeId(CsarHandler csar) throws IOException, ParseException { + return dcaeInventoryService.getDcaeInformation(csar.getBlueprintArtifactName(), + csar.getBlueprintInvariantServiceUuid(), csar.getBlueprintInvariantResourceUuid()); + } + + private CldsTemplate createFakeCldsTemplate(CsarHandler csar, BlueprintParserFilesConfiguration configFiles) + throws IOException, SdcArtifactInstallerException { + CldsTemplate template = new CldsTemplate(); + template.setBpmnId("Sdc-Generated"); + template.setBpmnText( + IOUtils.toString(appContext.getResource(configFiles.getBpmnXmlFilePath()).getInputStream())); + template.setPropText("{\"global\":[{\"name\":\"service\",\"value\":[\"" + csar.getDcaeBlueprint() + "\"]}]}"); + template.setImageText( + IOUtils.toString(appContext.getResource(configFiles.getSvgXmlFilePath()).getInputStream())); + template.setName(TEMPLATE_NAME_PREFIX + csar.getSdcCsarHelper().getServiceMetadata().getValue("name")); + template.save(cldsDao, null); + return template; + } + + private CldsModel createFakeCldsModel(CsarHandler csar, CldsTemplate cldsTemplate, String serviceTypeId) + throws SdcArtifactInstallerException { + CldsModel cldsModel = new CldsModel(); + String policyName = searchForPolicyName(csar); + if (policyName.contains("*")) { + // It's a filter must add a specific prefix + cldsModel.setControlNamePrefix(policyName); + } else { + cldsModel.setControlNamePrefix(MODEL_NAME_PREFIX); + } + cldsModel.setName(csar.getSdcCsarHelper().getServiceMetadata().getValue("name")); + cldsModel.setBlueprintText(csar.getDcaeBlueprint()); + cldsModel.setTemplateName(cldsTemplate.getName()); + cldsModel.setTemplateId(cldsTemplate.getId()); + // cldsModel.setDocText(cldsTemplate.getPropText()); + cldsModel.setPropText("{\"global\":[{\"name\":\"service\",\"value\":[\"" + + csar.getSdcNotification().getServiceInvariantUUID() + "\"]},{\"name\":\"vf\",\"value\":[\"" + + csar.getBlueprintInvariantResourceUuid() + + "\"]},{\"name\":\"actionSet\",\"value\":[\"vnfRecipe\"]},{\"name\":\"location\",\"value\":[\"DC1\"]}]}"); + cldsModel.setBpmnText(cldsTemplate.getBpmnText()); + cldsModel.setTypeId(serviceTypeId); + cldsModel.save(cldsDao, null); + return cldsModel; + } +} diff --git a/src/main/java/org/onap/clamp/clds/service/CldsService.java b/src/main/java/org/onap/clamp/clds/service/CldsService.java index 675f3cfe5..c23d2ec87 100644 --- a/src/main/java/org/onap/clamp/clds/service/CldsService.java +++ b/src/main/java/org/onap/clamp/clds/service/CldsService.java @@ -68,13 +68,13 @@ import org.onap.clamp.clds.dao.CldsDao; import org.onap.clamp.clds.exception.CldsConfigException; import org.onap.clamp.clds.exception.policy.PolicyClientException; import org.onap.clamp.clds.exception.sdc.SdcCommunicationException; -import org.onap.clamp.clds.model.CldsMonitoringDetails; import org.onap.clamp.clds.model.CldsDbServiceCache; import org.onap.clamp.clds.model.CldsEvent; import org.onap.clamp.clds.model.CldsHealthCheck; import org.onap.clamp.clds.model.CldsInfo; import org.onap.clamp.clds.model.CldsModel; import org.onap.clamp.clds.model.CldsModelProp; +import org.onap.clamp.clds.model.CldsMonitoringDetails; import org.onap.clamp.clds.model.CldsServiceData; import org.onap.clamp.clds.model.CldsTemplate; import org.onap.clamp.clds.model.DcaeEvent; @@ -412,10 +412,8 @@ public class CldsService extends SecureServiceBase { isAuthorizedForVf(model); String userId = getUserId(); String actionStateCd = CldsEvent.ACTION_STATE_INITIATED; - String processDefinitionKey = "clds-process-action-wf"; logger.info("PUT actionCd={}", actionCd); logger.info("PUT actionStateCd={}", actionStateCd); - logger.info("PUT processDefinitionKey={}", processDefinitionKey); logger.info("PUT modelName={}", modelName); logger.info("PUT test={}", test); logger.info("PUT bpmnText={}", model.getBpmnText()); @@ -806,8 +804,8 @@ public class CldsService extends SecureServiceBase { @Path("/deploy/{modelName}") @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) - public Response deployModel(@PathParam("action") String action, @PathParam("modelName") String modelName, - @QueryParam("test") String test, CldsModel model) { + public Response deployModel(@PathParam("modelName") String modelName, + CldsModel model) { Date startTime = new Date(); LoggingUtils.setRequestContext("CldsService: Deploy model", getPrincipalName()); Boolean errorCase = false; @@ -874,8 +872,8 @@ public class CldsService extends SecureServiceBase { @Path("/undeploy/{modelName}") @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) - public Response unDeployModel(@PathParam("action") String action, @PathParam("modelName") String modelName, - @QueryParam("test") String test, CldsModel model) { + public Response unDeployModel(@PathParam("modelName") String modelName, + CldsModel model) { Date startTime = new Date(); LoggingUtils.setRequestContext("CldsService: Undeploy model", getPrincipalName()); diff --git a/src/main/java/org/onap/clamp/clds/service/CldsTemplateService.java b/src/main/java/org/onap/clamp/clds/service/CldsTemplateService.java index 1b03922d1..7a9ee70e5 100644 --- a/src/main/java/org/onap/clamp/clds/service/CldsTemplateService.java +++ b/src/main/java/org/onap/clamp/clds/service/CldsTemplateService.java @@ -38,7 +38,6 @@ import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import javax.xml.transform.TransformerException; import org.onap.clamp.clds.dao.CldsDao; import org.onap.clamp.clds.model.CldsTemplate; @@ -156,8 +155,7 @@ public class CldsTemplateService extends SecureServiceBase { @Path("/template/{templateName}") @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) - public CldsTemplate putTemplate(@PathParam("templateName") String templateName, CldsTemplate cldsTemplate) - throws TransformerException, IOException { + public CldsTemplate putTemplate(@PathParam("templateName") String templateName, CldsTemplate cldsTemplate) { Date startTime = new Date(); LoggingUtils.setRequestContext("CldsTemplateService: PUT template", getPrincipalName()); isAuthorized(permissionUpdateTemplate); @@ -166,15 +164,6 @@ public class CldsTemplateService extends SecureServiceBase { logger.info("PUT propText=" + cldsTemplate.getPropText()); logger.info("PUT imageText=" + cldsTemplate.getImageText()); cldsTemplate.setName(templateName); - String bpmnText = cldsTemplate.getBpmnText(); - String imageText = cldsTemplate.getImageText(); - String propText = cldsTemplate.getPropText(); - cldsTemplate.setBpmnText(bpmnText); - cldsTemplate.setImageText(imageText); - cldsTemplate.setPropText(propText); - logger.info(" bpmnText : " + cldsTemplate.getBpmnText()); - logger.info(" Image Text : " + cldsTemplate.getImageText()); - logger.info(" Prop Text : " + cldsTemplate.getPropText()); cldsTemplate.save(cldsDao, null); // audit log LoggingUtils.setTimeContext(startTime, new Date()); diff --git a/src/main/resources/META-INF/resources/designer/css/jquery.dataTables_themeroller.css b/src/main/resources/META-INF/resources/designer/css/jquery.dataTables_themeroller.css deleted file mode 100644 index 5a56d9799..000000000 --- a/src/main/resources/META-INF/resources/designer/css/jquery.dataTables_themeroller.css +++ /dev/null @@ -1,330 +0,0 @@ -/* - * Table styles - */ -table.dataTable { - width: 100%; - margin: 0 auto; - clear: both; - border-collapse: separate; - border-spacing: 0; - /* - * Header and footer styles - */ - /* - * Body styles - */ -} -table.dataTable thead th, -table.dataTable thead td, -table.dataTable tfoot th, -table.dataTable tfoot td { - padding: 4px 10px; -} -table.dataTable thead th, -table.dataTable tfoot th { - font-weight: bold; -} -table.dataTable thead th:active, -table.dataTable thead td:active { - outline: none; -} -table.dataTable thead .sorting_asc, -table.dataTable thead .sorting_desc, -table.dataTable thead .sorting { - cursor: pointer; - *cursor: hand; -} -table.dataTable thead th div.DataTables_sort_wrapper { - position: relative; - padding-right: 10px; -} -table.dataTable thead th div.DataTables_sort_wrapper span { - position: absolute; - top: 50%; - margin-top: -8px; - right: -5px; -} -table.dataTable thead th.ui-state-default { - border-right-width: 0; -} -table.dataTable thead th.ui-state-default:last-child { - border-right-width: 1px; -} -table.dataTable tbody tr { - background-color: white; -} -table.dataTable tbody tr.selected { - background-color: #b0bed9; -} -table.dataTable tbody th, -table.dataTable tbody td { - padding: 8px 10px; -} -table.dataTable th.center, -table.dataTable td.center, -table.dataTable td.dataTables_empty { - text-align: center; -} -table.dataTable th.right, -table.dataTable td.right { - text-align: right; -} -table.dataTable.row-border tbody th, table.dataTable.row-border tbody td, table.dataTable.display tbody th, table.dataTable.display tbody td { - border-top: 1px solid #dddddd; -} -table.dataTable.row-border tbody tr:first-child th, -table.dataTable.row-border tbody tr:first-child td, table.dataTable.display tbody tr:first-child th, -table.dataTable.display tbody tr:first-child td { - border-top: none; -} -table.dataTable.cell-border tbody th, table.dataTable.cell-border tbody td { - border-top: 1px solid #dddddd; - border-right: 1px solid #dddddd; -} -table.dataTable.cell-border tbody tr th:first-child, -table.dataTable.cell-border tbody tr td:first-child { - border-left: 1px solid #dddddd; -} -table.dataTable.cell-border tbody tr:first-child th, -table.dataTable.cell-border tbody tr:first-child td { - border-top: none; -} -table.dataTable.stripe tbody tr.odd, table.dataTable.display tbody tr.odd { - background-color: #f9f9f9; -} -table.dataTable.stripe tbody tr.odd.selected, table.dataTable.display tbody tr.odd.selected { - background-color: #abb9d3; -} -table.dataTable.hover tbody tr:hover, -table.dataTable.hover tbody tr.odd:hover, -table.dataTable.hover tbody tr.even:hover, table.dataTable.display tbody tr:hover, -table.dataTable.display tbody tr.odd:hover, -table.dataTable.display tbody tr.even:hover { - background-color: whitesmoke; -} -table.dataTable.hover tbody tr:hover.selected, -table.dataTable.hover tbody tr.odd:hover.selected, -table.dataTable.hover tbody tr.even:hover.selected, table.dataTable.display tbody tr:hover.selected, -table.dataTable.display tbody tr.odd:hover.selected, -table.dataTable.display tbody tr.even:hover.selected { - background-color: #a9b7d1; -} -table.dataTable.order-column tbody tr > .sorting_1, -table.dataTable.order-column tbody tr > .sorting_2, -table.dataTable.order-column tbody tr > .sorting_3, table.dataTable.display tbody tr > .sorting_1, -table.dataTable.display tbody tr > .sorting_2, -table.dataTable.display tbody tr > .sorting_3 { - background-color: #f9f9f9; -} -table.dataTable.order-column tbody tr.selected > .sorting_1, -table.dataTable.order-column tbody tr.selected > .sorting_2, -table.dataTable.order-column tbody tr.selected > .sorting_3, table.dataTable.display tbody tr.selected > .sorting_1, -table.dataTable.display tbody tr.selected > .sorting_2, -table.dataTable.display tbody tr.selected > .sorting_3 { - background-color: #acbad4; -} -table.dataTable.display tbody tr.odd > .sorting_1, table.dataTable.order-column.stripe tbody tr.odd > .sorting_1 { - background-color: #f1f1f1; -} -table.dataTable.display tbody tr.odd > .sorting_2, table.dataTable.order-column.stripe tbody tr.odd > .sorting_2 { - background-color: #f3f3f3; -} -table.dataTable.display tbody tr.odd > .sorting_3, table.dataTable.order-column.stripe tbody tr.odd > .sorting_3 { - background-color: whitesmoke; -} -table.dataTable.display tbody tr.odd.selected > .sorting_1, table.dataTable.order-column.stripe tbody tr.odd.selected > .sorting_1 { - background-color: #a6b3cd; -} -table.dataTable.display tbody tr.odd.selected > .sorting_2, table.dataTable.order-column.stripe tbody tr.odd.selected > .sorting_2 { - background-color: #a7b5ce; -} -table.dataTable.display tbody tr.odd.selected > .sorting_3, table.dataTable.order-column.stripe tbody tr.odd.selected > .sorting_3 { - background-color: #a9b6d0; -} -table.dataTable.display tbody tr.even > .sorting_1, table.dataTable.order-column.stripe tbody tr.even > .sorting_1 { - background-color: #f9f9f9; -} -table.dataTable.display tbody tr.even > .sorting_2, table.dataTable.order-column.stripe tbody tr.even > .sorting_2 { - background-color: #fbfbfb; -} -table.dataTable.display tbody tr.even > .sorting_3, table.dataTable.order-column.stripe tbody tr.even > .sorting_3 { - background-color: #fdfdfd; -} -table.dataTable.display tbody tr.even.selected > .sorting_1, table.dataTable.order-column.stripe tbody tr.even.selected > .sorting_1 { - background-color: #acbad4; -} -table.dataTable.display tbody tr.even.selected > .sorting_2, table.dataTable.order-column.stripe tbody tr.even.selected > .sorting_2 { - background-color: #adbbd6; -} -table.dataTable.display tbody tr.even.selected > .sorting_3, table.dataTable.order-column.stripe tbody tr.even.selected > .sorting_3 { - background-color: #afbdd8; -} -table.dataTable.display tbody tr:hover > .sorting_1, -table.dataTable.display tbody tr.odd:hover > .sorting_1, -table.dataTable.display tbody tr.even:hover > .sorting_1, table.dataTable.order-column.hover tbody tr:hover > .sorting_1, -table.dataTable.order-column.hover tbody tr.odd:hover > .sorting_1, -table.dataTable.order-column.hover tbody tr.even:hover > .sorting_1 { - background-color: #eaeaea; -} -table.dataTable.display tbody tr:hover > .sorting_2, -table.dataTable.display tbody tr.odd:hover > .sorting_2, -table.dataTable.display tbody tr.even:hover > .sorting_2, table.dataTable.order-column.hover tbody tr:hover > .sorting_2, -table.dataTable.order-column.hover tbody tr.odd:hover > .sorting_2, -table.dataTable.order-column.hover tbody tr.even:hover > .sorting_2 { - background-color: #ebebeb; -} -table.dataTable.display tbody tr:hover > .sorting_3, -table.dataTable.display tbody tr.odd:hover > .sorting_3, -table.dataTable.display tbody tr.even:hover > .sorting_3, table.dataTable.order-column.hover tbody tr:hover > .sorting_3, -table.dataTable.order-column.hover tbody tr.odd:hover > .sorting_3, -table.dataTable.order-column.hover tbody tr.even:hover > .sorting_3 { - background-color: #eeeeee; -} -table.dataTable.display tbody tr:hover.selected > .sorting_1, -table.dataTable.display tbody tr.odd:hover.selected > .sorting_1, -table.dataTable.display tbody tr.even:hover.selected > .sorting_1, table.dataTable.order-column.hover tbody tr:hover.selected > .sorting_1, -table.dataTable.order-column.hover tbody tr.odd:hover.selected > .sorting_1, -table.dataTable.order-column.hover tbody tr.even:hover.selected > .sorting_1 { - background-color: #a1aec7; -} -table.dataTable.display tbody tr:hover.selected > .sorting_2, -table.dataTable.display tbody tr.odd:hover.selected > .sorting_2, -table.dataTable.display tbody tr.even:hover.selected > .sorting_2, table.dataTable.order-column.hover tbody tr:hover.selected > .sorting_2, -table.dataTable.order-column.hover tbody tr.odd:hover.selected > .sorting_2, -table.dataTable.order-column.hover tbody tr.even:hover.selected > .sorting_2 { - background-color: #a2afc8; -} -table.dataTable.display tbody tr:hover.selected > .sorting_3, -table.dataTable.display tbody tr.odd:hover.selected > .sorting_3, -table.dataTable.display tbody tr.even:hover.selected > .sorting_3, table.dataTable.order-column.hover tbody tr:hover.selected > .sorting_3, -table.dataTable.order-column.hover tbody tr.odd:hover.selected > .sorting_3, -table.dataTable.order-column.hover tbody tr.even:hover.selected > .sorting_3 { - background-color: #a4b2cb; -} - -table.dataTable, -table.dataTable th, -table.dataTable td { - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; -} - -/* - * Control feature layout - */ -.dataTables_wrapper { - position: relative; - clear: both; - *zoom: 1; - zoom: 1; -} -.dataTables_wrapper .dataTables_length { - float: left; -} -.dataTables_wrapper .dataTables_filter { - float: right; - text-align: right; -} -.dataTables_wrapper .dataTables_filter input { - margin-left: 0.5em; -} -.dataTables_wrapper .dataTables_info { - clear: both; - float: left; - padding-top: 0.55em; -} -.dataTables_wrapper .dataTables_paginate { - float: right; - text-align: right; -} -.dataTables_wrapper .dataTables_paginate .fg-button { - box-sizing: border-box; - display: inline-block; - min-width: 1.5em; - padding: 0.5em; - margin-left: 2px; - text-align: center; - text-decoration: none !important; - cursor: pointer; - *cursor: hand; - color: #333333 !important; - border: 1px solid transparent; -} -.dataTables_wrapper .dataTables_paginate .fg-button:active { - outline: none; -} -.dataTables_wrapper .dataTables_paginate .fg-button:first-child { - border-top-left-radius: 3px; - border-bottom-left-radius: 3px; -} -.dataTables_wrapper .dataTables_paginate .fg-button:last-child { - border-top-right-radius: 3px; - border-bottom-right-radius: 3px; -} -.dataTables_wrapper .dataTables_processing { - position: absolute; - top: 50%; - left: 50%; - width: 100%; - height: 40px; - margin-left: -50%; - margin-top: -25px; - padding-top: 20px; - text-align: center; - font-size: 1.2em; - background-color: white; - background: -webkit-gradient(linear, left top, right top, color-stop(0%, rgba(255, 255, 255, 0)), color-stop(25%, rgba(255, 255, 255, 0.9)), color-stop(75%, rgba(255, 255, 255, 0.9)), color-stop(100%, rgba(255, 255, 255, 0))); - /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%); - /* Chrome10+,Safari5.1+ */ - background: -moz-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%); - /* FF3.6+ */ - background: -ms-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%); - /* IE10+ */ - background: -o-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%); - /* Opera 11.10+ */ - background: linear-gradient(to right, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%); - /* W3C */ -} -.dataTables_wrapper .dataTables_length, -.dataTables_wrapper .dataTables_filter, -.dataTables_wrapper .dataTables_info, -.dataTables_wrapper .dataTables_processing, -.dataTables_wrapper .dataTables_paginate { - color: #333333; -} -.dataTables_wrapper .dataTables_scroll { - clear: both; -} -.dataTables_wrapper .dataTables_scrollBody { - *margin-top: -1px; - -webkit-overflow-scrolling: touch; -} -.dataTables_wrapper .ui-widget-header { - font-weight: normal; -} -.dataTables_wrapper .ui-toolbar { - padding: 8px; -} -.dataTables_wrapper:after { - visibility: hidden; - display: block; - content: ""; - clear: both; - height: 0; -} - -@media screen and (max-width: 767px) { - .dataTables_wrapper .dataTables_length, - .dataTables_wrapper .dataTables_filter, - .dataTables_wrapper .dataTables_info, - .dataTables_wrapper .dataTables_paginate { - float: none; - text-align: center; - } - .dataTables_wrapper .dataTables_filter, - .dataTables_wrapper .dataTables_paginate { - margin-top: 0.5em; - } -} diff --git a/src/main/resources/META-INF/resources/designer/css/plugins/dataTables.bootstrap.css b/src/main/resources/META-INF/resources/designer/css/plugins/dataTables.bootstrap.css deleted file mode 100644 index c07dac9a6..000000000 --- a/src/main/resources/META-INF/resources/designer/css/plugins/dataTables.bootstrap.css +++ /dev/null @@ -1,233 +0,0 @@ -div.dataTables_length label { - float: left; - text-align: left; - font-weight: normal; -} - -div.dataTables_length select { - width: 75px; -} - -div.dataTables_filter label { - float: right; - font-weight: normal; -} - -div.dataTables_filter input { - width: 16em; -} - -div.dataTables_info { - padding-top: 8px; -} - -div.dataTables_paginate { - float: right; - margin: 0; -} - -div.dataTables_paginate ul.pagination { - margin: 2px 0; - white-space: nowrap; -} - -table.dataTable, -table.dataTable td, -table.dataTable th { - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; -} - -table.dataTable { - clear: both; - margin-top: 6px !important; - margin-bottom: 6px !important; - max-width: none !important; -} - -table.dataTable thead .sorting, -table.dataTable thead .sorting_asc, -table.dataTable thead .sorting_desc, -table.dataTable thead .sorting_asc_disabled, -table.dataTable thead .sorting_desc_disabled { - cursor: pointer; -} - -table.dataTable thead .sorting { - background: url('../images/sort_both.png') no-repeat center right; -} - -table.dataTable thead .sorting_asc { - background: url('../images/sort_asc.png') no-repeat center right; -} - -table.dataTable thead .sorting_desc { - background: url('../images/sort_desc.png') no-repeat center right; -} - -table.dataTable thead .sorting_asc_disabled { - background: url('../images/sort_asc_disabled.png') no-repeat center right; -} - -table.dataTable thead .sorting_desc_disabled { - background: url('../images/sort_desc_disabled.png') no-repeat center right; -} - -table.dataTable th:active { - outline: none; -} - -/* Scrolling */ - -div.dataTables_scrollHead table { - margin-bottom: 0 !important; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; -} - -div.dataTables_scrollHead table thead tr:last-child th:first-child, -div.dataTables_scrollHead table thead tr:last-child td:first-child { - border-bottom-left-radius: 0 !important; - border-bottom-right-radius: 0 !important; -} - -div.dataTables_scrollBody table { - margin-top: 0 !important; - margin-bottom: 0 !important; - border-top: none; -} - -div.dataTables_scrollBody tbody tr:first-child th, -div.dataTables_scrollBody tbody tr:first-child td { - border-top: none; -} - -div.dataTables_scrollFoot table { - margin-top: 0 !important; - border-top: none; -} - -/* - * TableTools styles - */ - -.table tbody tr.active td, -.table tbody tr.active th { - color: white; - background-color: #08C; -} - -.table tbody tr.active:hover td, -.table tbody tr.active:hover th { - background-color: #0075b0 !important; -} - -.table tbody tr.active a { - color: white; -} - -.table-striped tbody tr.active:nth-child(odd) td, -.table-striped tbody tr.active:nth-child(odd) th { - background-color: #017ebc; -} - -table.DTTT_selectable tbody tr { - cursor: pointer; -} - -div.DTTT .btn { - font-size: 12px; - color: #333 !important; -} - -div.DTTT .btn:hover { - text-decoration: none !important; -} - -ul.DTTT_dropdown.dropdown-menu { - z-index: 2003; -} - -ul.DTTT_dropdown.dropdown-menu a { - color: #333 !important; /* needed only when demo_page.css is included */ -} - -ul.DTTT_dropdown.dropdown-menu li { - position: relative; -} - -ul.DTTT_dropdown.dropdown-menu li:hover a { - color: white !important; - background-color: #0088cc; -} - -div.DTTT_collection_background { - z-index: 2002; -} - -/* TableTools information display */ - -div.DTTT_print_info.modal { - height: 150px; - margin-top: -75px; - text-align: center; -} - -div.DTTT_print_info h6 { - margin: 1em; - font-size: 28px; - font-weight: normal; - line-height: 28px; -} - -div.DTTT_print_info p { - font-size: 14px; - line-height: 20px; -} - -/* - * FixedColumns styles - */ - -div.DTFC_LeftHeadWrapper table, -div.DTFC_LeftFootWrapper table, -div.DTFC_RightHeadWrapper table, -div.DTFC_RightFootWrapper table, -table.DTFC_Cloned tr.even { - background-color: white; -} - -div.DTFC_RightHeadWrapper table, -div.DTFC_LeftHeadWrapper table { - margin-bottom: 0 !important; - border-top-right-radius: 0 !important; - border-bottom-left-radius: 0 !important; - border-bottom-right-radius: 0 !important; -} - -div.DTFC_RightHeadWrapper table thead tr:last-child th:first-child, -div.DTFC_RightHeadWrapper table thead tr:last-child td:first-child, -div.DTFC_LeftHeadWrapper table thead tr:last-child th:first-child, -div.DTFC_LeftHeadWrapper table thead tr:last-child td:first-child { - border-bottom-left-radius: 0 !important; - border-bottom-right-radius: 0 !important; -} - -div.DTFC_RightBodyWrapper table, -div.DTFC_LeftBodyWrapper table { - margin-bottom: 0 !important; - border-top: none; -} - -div.DTFC_RightBodyWrapper tbody tr:first-child th, -div.DTFC_RightBodyWrapper tbody tr:first-child td, -div.DTFC_LeftBodyWrapper tbody tr:first-child th, -div.DTFC_LeftBodyWrapper tbody tr:first-child td { - border-top: none; -} - -div.DTFC_RightFootWrapper table, -div.DTFC_LeftFootWrapper table { - border-top: none; -} diff --git a/src/main/resources/META-INF/resources/designer/index.html b/src/main/resources/META-INF/resources/designer/index.html index 5e0c72504..8e2300f6a 100644 --- a/src/main/resources/META-INF/resources/designer/index.html +++ b/src/main/resources/META-INF/resources/designer/index.html @@ -49,13 +49,8 @@ <!-- DataTables CSS --> -<link href="css/dataTables.bootstrap.css" rel="stylesheet"> <link href="css/jquery.dataTables.css" rel="stylesheet"> -<link href="css/dataTables.tableTools.css" rel="stylesheet"> -<link href="css/dataTables.fixedColumns.css" rel="stylesheet"> - - <link href="css/loading-bar.css" rel="stylesheet"> <link href="css/navmenu.css" rel="stylesheet"> <link href="css/dialogs.css" rel="stylesheet"> diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index f626e1af1..5f6a0d659 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -62,7 +62,7 @@ server.port=8080 server.contextPath=/
#Modified engine-rest applicationpath
-spring.profiles.active=clamp-default,clamp-spring-authentication
+spring.profiles.active=clamp-default,clamp-spring-authentication,clamp-sdc-controller
#The max number of active threads in this pool
server.tomcat.max-threads=200
@@ -178,6 +178,7 @@ clamp.config.sdc.InstanceID=X-ECOMP-InstanceID clamp.config.sdc.header.requestId = X-ECOMP-RequestID
#
clamp.config.sdc.csarFolder = /tmp/sdc-controllers
+clamp.config.sdc.blueprint.parser.mapping = classpath:/clds/blueprint-parser-mapping.json
#
clamp.config.ui.location.default=classpath:/clds/templates/ui-location-default.json
clamp.config.ui.alarm.default=classpath:/clds/templates/ui-alarm-default.json
diff --git a/src/main/resources/clds/blueprint-parser-mapping.json b/src/main/resources/clds/blueprint-parser-mapping.json new file mode 100644 index 000000000..a16ef0cbc --- /dev/null +++ b/src/main/resources/clds/blueprint-parser-mapping.json @@ -0,0 +1,16 @@ +[ + { + "blueprintKey": "tca_", + "files": { + "bpmnXmlFilePath": "classpath:/clds/templates/bpmn/tca-template.xml", + "svgXmlFilePath": "classpath:/clds/templates/bpmn/tca-img.xml" + } + }, + { + "blueprintKey": "holmes_", + "files": { + "bpmnXmlFilePath": "classpath:/clds/templates/bpmn/holmes-template.xml", + "svgXmlFilePath": "classpath:/clds/templates/bpmn/holmes-img.xml" + } + } +] diff --git a/src/main/resources/clds/camel/flexible-flow.xml b/src/main/resources/clds/camel/flexible-flow.xml index 7a3ebdb0a..b2a728d14 100644 --- a/src/main/resources/clds/camel/flexible-flow.xml +++ b/src/main/resources/clds/camel/flexible-flow.xml @@ -4,7 +4,6 @@ <choice> <when> <simple> ${exchangeProperty.actionCd} == 'SUBMIT' || ${exchangeProperty.actionCd} == 'RESUBMIT'</simple> - <to uri="bean:org.onap.clamp.clds.client.SdcSendReqDelegate" /> <to uri="bean:org.onap.clamp.clds.client.TcaPolicyDelegate" /> <to uri="bean:org.onap.clamp.clds.client.HolmesPolicyDelegate" /> <to uri="bean:org.onap.clamp.clds.client.OperationalPolicyDelegate" /> diff --git a/src/main/resources/clds/templates/bpmn/holmes-img.xml b/src/main/resources/clds/templates/bpmn/holmes-img.xml new file mode 100644 index 000000000..f84b6a10e --- /dev/null +++ b/src/main/resources/clds/templates/bpmn/holmes-img.xml @@ -0,0 +1,315 @@ +<?xml version="1.0" encoding="utf-8"?> +\n<!-- created with bpmn-js / http://bpmn.io --> +\n<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +\n +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" + width="900" height="92" viewBox="44 134 900 92" version="1.1"> + <defs> + <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" + orient="auto" refX="11" refY="10" id="markerSjdype4kmbu"> + <path d="M 1 5 L 11 10 L 1 15 Z" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="20" markerHeight="20" + orient="auto" refX="6" refY="6" id="markerSjdype4kmbw"> + <circle cx="6" cy="6" r="3.5" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#ffffff" stroke="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="20" markerHeight="20" + orient="auto" refX="8.5" refY="5" id="markerSjdype4kmby"> + <path d="m 1 5 l 0 -3 l 7 3 l -7 3 z" + style="stroke-width: 1; stroke-linecap: butt; stroke-dasharray: 10000, 1;" + fill="#ffffff" stroke="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" + orient="auto" refX="11" refY="10" id="markerSjdype4kmc0"> + <path d="M 1 5 L 11 10 L 1 15" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#ffffff" stroke="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" + orient="auto" refX="-1" refY="10" id="markerSjdype4kmc2"> + <path d="M 0 10 L 8 6 L 16 10 L 8 14 Z" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#ffffff" stroke="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" + orient="auto" refX="-5" refY="10" id="markerSjdype4kmc4"> + <path d="M 1 4 L 5 16" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#000000" stroke="#000000" /> + </marker> + </defs> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="StartEvent_1" + transform="matrix(1,0,0,1,50,162)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="48" + height="48"></rect> + <g class="djs-visual"> + <circle cx="18" cy="18" r="18" style="stroke-width: 2;" + stroke="#000000" fill="#ffffff"></circle> + </g> + <rect x="0" y="0" width="36" height="36" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="StartEvent_1_label" + transform="matrix(1,0,0,1,23,198)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="Holmes_0bsv00m" + transform="matrix(1,0,0,1,438,140)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="132" + height="92"></rect> + <g class="djs-visual"> + <rect x="0" y="0" width="120" height="80" rx="0" ry="0" + style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect> + <circle cx="15" cy="15" r="10" style="stroke-width: 1;" + stroke="#000000" fill="#ffffff"></circle> + <text style="font-family: Arial,sans-serif; font-size: 12px;"> + <tspan x="11" y="20">H</tspan> + </text> + <text style="font-family: Arial,sans-serif; font-size: 12px;" + class=" djs-label"> + <tspan x="39" y="43.5">Holmes</tspan> + </text> + </g> + <rect x="0" y="0" width="120" height="80" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="VesCollector_1ljyqg8" + transform="matrix(1,0,0,1,213,140)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="132" + height="92"></rect> + <g class="djs-visual"> + <rect x="0" y="0" width="120" height="80" rx="0" ry="0" + style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect> + <polyline points="120,80 120,20 " style="stroke-width: 2;" + fill="none" stroke="#000000"></polyline> + <polyline points="20,0 20,80 " style="stroke-width: 2;" + fill="none" stroke="#000000"></polyline> + <text style="font-family: Arial,sans-serif; font-size: 12px;"> + <tspan x="5" y="14">V</tspan> + </text> + <text style="font-family: Arial,sans-serif; font-size: 12px;"> + <tspan x="5" y="26">E</tspan> + </text> + <text style="font-family: Arial,sans-serif; font-size: 12px;"> + <tspan x="5" y="38">S</tspan> + </text> + <text style="font-family: Arial,sans-serif; font-size: 12px;" + class=" djs-label"> + <tspan x="25.5" y="43.5">VesCollector</tspan> + </text> + </g> + <rect x="0" y="0" width="120" height="80" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="Policy_114xo8j" + transform="matrix(1,0,0,1,678,140)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="132" + height="92"></rect> + <g class="djs-visual"> + <rect x="0" y="0" width="120" height="80" rx="0" ry="0" + style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect> + <polyline points="0,40 60,0 " style="stroke-width: 2;" + fill="none" stroke="#000000"></polyline> + <text style="font-family: Arial,sans-serif; font-size: 12px;" + class=" djs-label"> + <tspan x="43.5" y="43.5">Policy</tspan> + </text> + </g> + <rect x="0" y="0" width="120" height="80" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape selected" data-element-id="EndEvent_0b4m6bk" + transform="matrix(1,0,0,1,901,162)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="48" + height="48"></rect> + <g class="djs-visual"> + <circle cx="18" cy="18" r="18" style="stroke-width: 4;" + stroke="#000000" fill="#ffffff"></circle> + </g> + <rect x="0" y="0" width="36" height="36" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + <g class=" djs-resizer djs-resizer-nw" transform="matrix(1,0,0,1,0,0)"> + <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect> + <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect> + </g> + <g class=" djs-resizer djs-resizer-ne" transform="matrix(0,1,-1,0,36,0)"> + <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect> + <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect> + </g> + <g class=" djs-resizer djs-resizer-se" transform="matrix(-1,0,0,-1,36,36)"> + <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect> + <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect> + </g> + <g class=" djs-resizer djs-resizer-sw" transform="matrix(0,-1,1,0,0,36)"> + <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect> + <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect> + </g> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="EndEvent_0b4m6bk_label" + transform="matrix(1,0,0,1,874,198)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-connection" data-element-id="SequenceFlow_1c9hzec" + style="display: block;"> + <rect fill="none" class="djs-outline" x="80" y="174" width="139" + height="12"></rect> + <g class="djs-visual"> + <path d="m 86,180L213,180 " + style="stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmbu");" + fill="none" stroke="#000000"></path> + </g> + <polyline points="86,180 213,180 " style="stroke-opacity: 0; stroke-width: 15;" + fill="none" stroke="#ffffff" class="djs-hit"></polyline> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="SequenceFlow_1c9hzec_label" + transform="matrix(1,0,0,1,104.5,170)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-connection" data-element-id="SequenceFlow_1ig3gix" + style="display: block;"> + <rect fill="none" class="djs-outline" x="327" y="174" width="117" + height="12"></rect> + <g class="djs-visual"> + <path d="m 333,180L438,180 " + style="stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmbu");" + fill="none" stroke="#000000"></path> + </g> + <polyline points="333,180 438,180 " style="stroke-opacity: 0; stroke-width: 15;" + fill="none" stroke="#ffffff" class="djs-hit"></polyline> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="SequenceFlow_1ig3gix_label" + transform="matrix(1,0,0,1,340.5,170)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-connection" data-element-id="SequenceFlow_0zwbn2r" + style="display: block;"> + <rect fill="none" class="djs-outline" x="552" y="174" width="132" + height="12"></rect> + <g class="djs-visual"> + <path d="m 558,180L678,180 " + style="stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmbu");" + fill="none" stroke="#000000"></path> + </g> + <polyline points="558,180 678,180 " style="stroke-opacity: 0; stroke-width: 15;" + fill="none" stroke="#ffffff" class="djs-hit"></polyline> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="SequenceFlow_0zwbn2r_label" + transform="matrix(1,0,0,1,573,170)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-connection" data-element-id="SequenceFlow_0ox6r95" + style="display: block;"> + <rect fill="none" class="djs-outline" x="792" y="174" width="115" + height="12"></rect> + <g class="djs-visual"> + <path d="m 798,180L901,180 " + style="stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmbu");" + fill="none" stroke="#000000"></path> + </g> + <polyline points="798,180 901,180 " style="stroke-opacity: 0; stroke-width: 15;" + fill="none" stroke="#ffffff" class="djs-hit"></polyline> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="SequenceFlow_0ox6r95_label" + transform="matrix(1,0,0,1,804.5,170)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> +</svg>
\ No newline at end of file diff --git a/src/main/resources/clds/templates/bpmn/holmes-template.xml b/src/main/resources/clds/templates/bpmn/holmes-template.xml new file mode 100644 index 000000000..0ea1587ce --- /dev/null +++ b/src/main/resources/clds/templates/bpmn/holmes-template.xml @@ -0,0 +1,93 @@ +<?xml version="1.0" encoding="UTF-8"?> +<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" + xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" + xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn"> + <bpmn:process id="Process_1" isExecutable="false"> + <bpmn:startEvent id="StartEvent_1"> + <bpmn:outgoing>SequenceFlow_1c9hzec</bpmn:outgoing> + </bpmn:startEvent> + <bpmn:holmes id="Holmes_0bsv00m"> + <bpmn:incoming>SequenceFlow_1ig3gix</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_0zwbn2r</bpmn:outgoing> + </bpmn:holmes> + <bpmn:vesCollector id="VesCollector_1ljyqg8"> + <bpmn:incoming>SequenceFlow_1c9hzec</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1ig3gix</bpmn:outgoing> + </bpmn:vesCollector> + <bpmn:policy id="Policy_114xo8j"> + <bpmn:incoming>SequenceFlow_0zwbn2r</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_0ox6r95</bpmn:outgoing> + </bpmn:policy> + <bpmn:endEvent id="EndEvent_0b4m6bk"> + <bpmn:incoming>SequenceFlow_0ox6r95</bpmn:incoming> + </bpmn:endEvent> + <bpmn:sequenceFlow id="SequenceFlow_1c9hzec" + sourceRef="StartEvent_1" targetRef="VesCollector_1ljyqg8" /> + <bpmn:sequenceFlow id="SequenceFlow_1ig3gix" + sourceRef="VesCollector_1ljyqg8" targetRef="Holmes_0bsv00m" /> + <bpmn:sequenceFlow id="SequenceFlow_0zwbn2r" + sourceRef="Holmes_0bsv00m" targetRef="Policy_114xo8j" /> + <bpmn:sequenceFlow id="SequenceFlow_0ox6r95" + sourceRef="Policy_114xo8j" targetRef="EndEvent_0b4m6bk" /> + </bpmn:process> + <bpmndi:BPMNDiagram id="BPMNDiagram_1"> + <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1"> + <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" + bpmnElement="StartEvent_1"> + <dc:Bounds x="50" y="162" width="36" height="36" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="Holmes_0bsv00m_di" + bpmnElement="Holmes_0bsv00m"> + <dc:Bounds x="438" y="140" width="120" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="VesCollector_1ljyqg8_di" + bpmnElement="VesCollector_1ljyqg8"> + <dc:Bounds x="213" y="140" width="120" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="Policy_114xo8j_di" + bpmnElement="Policy_114xo8j"> + <dc:Bounds x="678" y="140" width="120" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="EndEvent_0b4m6bk_di" + bpmnElement="EndEvent_0b4m6bk"> + <dc:Bounds x="901" y="162" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="874" y="198" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1c9hzec_di" + bpmnElement="SequenceFlow_1c9hzec"> + <di:waypoint xsi:type="dc:Point" x="86" y="180" /> + <di:waypoint xsi:type="dc:Point" x="213" y="180" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="104.5" y="170" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1ig3gix_di" + bpmnElement="SequenceFlow_1ig3gix"> + <di:waypoint xsi:type="dc:Point" x="333" y="180" /> + <di:waypoint xsi:type="dc:Point" x="438" y="180" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="340.5" y="170" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0zwbn2r_di" + bpmnElement="SequenceFlow_0zwbn2r"> + <di:waypoint xsi:type="dc:Point" x="558" y="180" /> + <di:waypoint xsi:type="dc:Point" x="678" y="180" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="573" y="170" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0ox6r95_di" + bpmnElement="SequenceFlow_0ox6r95"> + <di:waypoint xsi:type="dc:Point" x="798" y="180" /> + <di:waypoint xsi:type="dc:Point" x="901" y="180" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="804.5" y="170" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + </bpmndi:BPMNPlane> + </bpmndi:BPMNDiagram> +</bpmn:definitions>
\ No newline at end of file diff --git a/src/main/resources/clds/templates/bpmn/tca-img.xml b/src/main/resources/clds/templates/bpmn/tca-img.xml new file mode 100644 index 000000000..a2ec5af23 --- /dev/null +++ b/src/main/resources/clds/templates/bpmn/tca-img.xml @@ -0,0 +1,309 @@ +<?xml version="1.0" encoding="utf-8"?><!-- created with bpmn-js / http://bpmn.io --><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" + width="924" height="92" viewBox="44 134 924 92" version="1.1"> + <defs> + <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" + orient="auto" refX="11" refY="10" id="markerSjdype4kmnw"> + <path d="M 1 5 L 11 10 L 1 15 Z" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="20" markerHeight="20" + orient="auto" refX="6" refY="6" id="markerSjdype4kmny"> + <circle cx="6" cy="6" r="3.5" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#ffffff" stroke="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="20" markerHeight="20" + orient="auto" refX="8.5" refY="5" id="markerSjdype4kmo0"> + <path d="m 1 5 l 0 -3 l 7 3 l -7 3 z" + style="stroke-width: 1; stroke-linecap: butt; stroke-dasharray: 10000, 1;" + fill="#ffffff" stroke="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" + orient="auto" refX="11" refY="10" id="markerSjdype4kmo2"> + <path d="M 1 5 L 11 10 L 1 15" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#ffffff" stroke="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" + orient="auto" refX="-1" refY="10" id="markerSjdype4kmo4"> + <path d="M 0 10 L 8 6 L 16 10 L 8 14 Z" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#ffffff" stroke="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" + orient="auto" refX="-5" refY="10" id="markerSjdype4kmo6"> + <path d="M 1 4 L 5 16" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#000000" stroke="#000000" /> + </marker> + </defs> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="StartEvent_1" + transform="matrix(1,0,0,1,50,162)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="48" + height="48"></rect> + <g class="djs-visual"> + <circle cx="18" cy="18" r="18" style="stroke-width: 2;" + stroke="#000000" fill="#ffffff"></circle> + </g> + <rect x="0" y="0" width="36" height="36" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="StartEvent_1_label" + transform="matrix(1,0,0,1,23,198)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="VesCollector_1g9cmz0" + transform="matrix(1,0,0,1,207,140)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="132" + height="92"></rect> + <g class="djs-visual"> + <rect x="0" y="0" width="120" height="80" rx="0" ry="0" + style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect> + <polyline points="120,80 120,20 " style="stroke-width: 2;" + fill="none" stroke="#000000"></polyline> + <polyline points="20,0 20,80 " style="stroke-width: 2;" + fill="none" stroke="#000000"></polyline> + <text style="font-family: Arial,sans-serif; font-size: 12px;"> + <tspan x="5" y="14">V</tspan> + </text> + <text style="font-family: Arial,sans-serif; font-size: 12px;"> + <tspan x="5" y="26">E</tspan> + </text> + <text style="font-family: Arial,sans-serif; font-size: 12px;"> + <tspan x="5" y="38">S</tspan> + </text> + <text style="font-family: Arial,sans-serif; font-size: 12px;" + class=" djs-label"> + <tspan x="25.5" y="43.5">VesCollector</tspan> + </text> + </g> + <rect x="0" y="0" width="120" height="80" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="TCA_1d13unw" + transform="matrix(1,0,0,1,453,140)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="132" + height="92"></rect> + <g class="djs-visual"> + <rect x="0" y="0" width="120" height="80" rx="0" ry="0" + style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect> + <polyline points="0,60 120,60 " style="stroke-width: 2;" + fill="none" stroke="#000000"></polyline> + <text style="font-family: Arial,sans-serif; font-size: 12px;" + class=" djs-label"> + <tspan x="48" y="43.5">TCA</tspan> + </text> + </g> + <rect x="0" y="0" width="120" height="80" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="Policy_12lup3h" + transform="matrix(1,0,0,1,687,140)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="132" + height="92"></rect> + <g class="djs-visual"> + <rect x="0" y="0" width="120" height="80" rx="0" ry="0" + style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect> + <polyline points="0,40 60,0 " style="stroke-width: 2;" + fill="none" stroke="#000000"></polyline> + <text style="font-family: Arial,sans-serif; font-size: 12px;" + class=" djs-label"> + <tspan x="43.5" y="43.5">Policy</tspan> + </text> + </g> + <rect x="0" y="0" width="120" height="80" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape selected" data-element-id="EndEvent_16kg9fx" + transform="matrix(1,0,0,1,925,162)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="48" + height="48"></rect> + <g class="djs-visual"> + <circle cx="18" cy="18" r="18" style="stroke-width: 4;" + stroke="#000000" fill="#ffffff"></circle> + </g> + <rect x="0" y="0" width="36" height="36" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + <g class=" djs-resizer djs-resizer-nw" transform="matrix(1,0,0,1,0,0)"> + <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect> + <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect> + </g> + <g class=" djs-resizer djs-resizer-ne" transform="matrix(0,1,-1,0,36,0)"> + <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect> + <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect> + </g> + <g class=" djs-resizer djs-resizer-se" transform="matrix(-1,0,0,-1,36,36)"> + <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect> + <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect> + </g> + <g class=" djs-resizer djs-resizer-sw" transform="matrix(0,-1,1,0,0,36)"> + <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect> + <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect> + </g> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="EndEvent_16kg9fx_label" + transform="matrix(1,0,0,1,898,198)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-connection" data-element-id="SequenceFlow_1ahk7jg" + style="display: block;"> + <rect fill="none" class="djs-outline" x="80" y="174" width="133" + height="12"></rect> + <g class="djs-visual"> + <path d="m 86,180L207,180 " + style="stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmnw");" + fill="none" stroke="#000000"></path> + </g> + <polyline points="86,180 207,180 " style="stroke-opacity: 0; stroke-width: 15;" + fill="none" stroke="#ffffff" class="djs-hit"></polyline> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="SequenceFlow_1ahk7jg_label" + transform="matrix(1,0,0,1,101.5,170)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-connection" data-element-id="SequenceFlow_18ahat1" + style="display: block;"> + <rect fill="none" class="djs-outline" x="321" y="174" width="138" + height="12"></rect> + <g class="djs-visual"> + <path d="m 327,180L453,180 " + style="stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmnw");" + fill="none" stroke="#000000"></path> + </g> + <polyline points="327,180 453,180 " style="stroke-opacity: 0; stroke-width: 15;" + fill="none" stroke="#ffffff" class="djs-hit"></polyline> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="SequenceFlow_18ahat1_label" + transform="matrix(1,0,0,1,345,170)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-connection" data-element-id="SequenceFlow_1mo9gxb" + style="display: block;"> + <rect fill="none" class="djs-outline" x="567" y="174" width="126" + height="12"></rect> + <g class="djs-visual"> + <path d="m 573,180L687,180 " + style="stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmnw");" + fill="none" stroke="#000000"></path> + </g> + <polyline points="573,180 687,180 " style="stroke-opacity: 0; stroke-width: 15;" + fill="none" stroke="#ffffff" class="djs-hit"></polyline> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="SequenceFlow_1mo9gxb_label" + transform="matrix(1,0,0,1,585,170)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-connection" data-element-id="SequenceFlow_1dgtrrq" + style="display: block;"> + <rect fill="none" class="djs-outline" x="801" y="174" width="130" + height="12"></rect> + <g class="djs-visual"> + <path d="m 807,180L925,180 " + style="stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmnw");" + fill="none" stroke="#000000"></path> + </g> + <polyline points="807,180 925,180 " style="stroke-opacity: 0; stroke-width: 15;" + fill="none" stroke="#ffffff" class="djs-hit"></polyline> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="SequenceFlow_1dgtrrq_label" + transform="matrix(1,0,0,1,821,170)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> +</svg>
\ No newline at end of file diff --git a/src/main/resources/clds/templates/bpmn/tca-template.xml b/src/main/resources/clds/templates/bpmn/tca-template.xml new file mode 100644 index 000000000..cc942ef9d --- /dev/null +++ b/src/main/resources/clds/templates/bpmn/tca-template.xml @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" + xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" + xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn"> + <bpmn:process id="Process_1" isExecutable="false"> + <bpmn:startEvent id="StartEvent_1"> + <bpmn:outgoing>SequenceFlow_1ahk7jg</bpmn:outgoing> + </bpmn:startEvent> + <bpmn:vesCollector id="VesCollector_1g9cmz0"> + <bpmn:incoming>SequenceFlow_1ahk7jg</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_18ahat1</bpmn:outgoing> + </bpmn:vesCollector> + <bpmn:tCA id="TCA_1d13unw"> + <bpmn:incoming>SequenceFlow_18ahat1</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1mo9gxb</bpmn:outgoing> + </bpmn:tCA> + <bpmn:policy id="Policy_12lup3h"> + <bpmn:incoming>SequenceFlow_1mo9gxb</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1dgtrrq</bpmn:outgoing> + </bpmn:policy> + <bpmn:endEvent id="EndEvent_16kg9fx"> + <bpmn:incoming>SequenceFlow_1dgtrrq</bpmn:incoming> + </bpmn:endEvent> + <bpmn:sequenceFlow id="SequenceFlow_1ahk7jg" + sourceRef="StartEvent_1" targetRef="VesCollector_1g9cmz0" /> + <bpmn:sequenceFlow id="SequenceFlow_18ahat1" + sourceRef="VesCollector_1g9cmz0" targetRef="TCA_1d13unw" /> + <bpmn:sequenceFlow id="SequenceFlow_1mo9gxb" + sourceRef="TCA_1d13unw" targetRef="Policy_12lup3h" /> + <bpmn:sequenceFlow id="SequenceFlow_1dgtrrq" + sourceRef="Policy_12lup3h" targetRef="EndEvent_16kg9fx" /> + </bpmn:process> + <bpmndi:BPMNDiagram id="BPMNDiagram_1"> + <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1"> + <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" + bpmnElement="StartEvent_1"> + <dc:Bounds x="50" y="162" width="36" height="36" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="VesCollector_1g9cmz0_di" + bpmnElement="VesCollector_1g9cmz0"> + <dc:Bounds x="207" y="140" width="120" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="TCA_1d13unw_di" + bpmnElement="TCA_1d13unw"> + <dc:Bounds x="453" y="140" width="120" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="Policy_12lup3h_di" + bpmnElement="Policy_12lup3h"> + <dc:Bounds x="687" y="140" width="120" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="EndEvent_16kg9fx_di" + bpmnElement="EndEvent_16kg9fx"> + <dc:Bounds x="925" y="162" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="898" y="198" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1ahk7jg_di" + bpmnElement="SequenceFlow_1ahk7jg"> + <di:waypoint xsi:type="dc:Point" x="86" y="180" /> + <di:waypoint xsi:type="dc:Point" x="207" y="180" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="101.5" y="170" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_18ahat1_di" + bpmnElement="SequenceFlow_18ahat1"> + <di:waypoint xsi:type="dc:Point" x="327" y="180" /> + <di:waypoint xsi:type="dc:Point" x="453" y="180" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="345" y="170" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1mo9gxb_di" + bpmnElement="SequenceFlow_1mo9gxb"> + <di:waypoint xsi:type="dc:Point" x="573" y="180" /> + <di:waypoint xsi:type="dc:Point" x="687" y="180" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="585" y="170" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1dgtrrq_di" + bpmnElement="SequenceFlow_1dgtrrq"> + <di:waypoint xsi:type="dc:Point" x="807" y="180" /> + <di:waypoint xsi:type="dc:Point" x="925" y="180" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="821" y="170" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + </bpmndi:BPMNPlane> + </bpmndi:BPMNDiagram> + +</bpmn:definitions>
\ No newline at end of file |