Browse Source

8.0.8 release

Gaudenz Alder 7 years ago
parent
commit
850e813d6b
42 changed files with 22963 additions and 3865 deletions
  1. 5 0
      ChangeLog
  2. 1 1
      VERSION
  3. 83 1
      src/main/java/com/mxgraph/io/gliffy/importer/GliffyDiagramConverter.java
  4. 25 0
      src/main/java/com/mxgraph/io/gliffy/model/GliffyLayer.java
  5. 2 0
      src/main/java/com/mxgraph/io/gliffy/model/GliffyObject.java
  6. 10 0
      src/main/java/com/mxgraph/io/gliffy/model/Stage.java
  7. 1 1
      src/main/webapp/cache.manifest
  8. 1 1
      src/main/webapp/connect/confluence/connect-dev.json
  9. 13 11
      src/main/webapp/connect/confluence/viewer2.html
  10. 1 1
      src/main/webapp/connect/jira/connect-dev.json
  11. 3 2
      src/main/webapp/connect/jira/fullScreenViewer2.html
  12. BIN
      src/main/webapp/images/aui-wait.gif
  13. 20 0
      src/main/webapp/images/drawlogo-gray.svg
  14. BIN
      src/main/webapp/images/sidebar-mscae.png
  15. BIN
      src/main/webapp/images/youtube.png
  16. 5 12
      src/main/webapp/index.html
  17. 526 412
      src/main/webapp/js/app.min.js
  18. 117 115
      src/main/webapp/js/atlas-viewer.min.js
  19. 889 775
      src/main/webapp/js/atlas.min.js
  20. 34 13
      src/main/webapp/js/diagramly/Dialogs.js
  21. 11 1
      src/main/webapp/js/diagramly/EditorUi.js
  22. 577 72
      src/main/webapp/js/diagramly/sidebar/Sidebar-MSCAE.js
  23. 1 1
      src/main/webapp/js/diagramly/sidebar/Sidebar.js
  24. 12 12
      src/main/webapp/js/embed-static.min.js
  25. 15 13
      src/main/webapp/js/mxgraph/Format.js
  26. 12 12
      src/main/webapp/js/reader.min.js
  27. 12 8
      src/main/webapp/js/stencils.min.js
  28. 117 115
      src/main/webapp/js/viewer.min.js
  29. 881 93
      src/main/webapp/stencils/azure.xml
  30. 6308 43
      src/main/webapp/stencils/mscae/cloud.xml
  31. 902 1
      src/main/webapp/stencils/mscae/deprecated.xml
  32. 2150 63
      src/main/webapp/stencils/mscae/enterprise.xml
  33. 598 420
      src/main/webapp/stencils/mscae/general.xml
  34. 587 0
      src/main/webapp/stencils/mscae/general_symbols.xml
  35. 1708 1157
      src/main/webapp/stencils/mscae/intune.xml
  36. 1458 0
      src/main/webapp/stencils/mscae/oms.xml
  37. 2900 0
      src/main/webapp/stencils/mscae/opsmanager.xml
  38. 719 303
      src/main/webapp/stencils/mscae/other.xml
  39. 284 204
      src/main/webapp/stencils/mscae/system_center.xml
  40. 1949 0
      src/main/webapp/stencils/mscae/vm.xml
  41. 25 1
      src/main/webapp/styles/dark.css
  42. 1 1
      src/main/webapp/styles/grapheditor.css

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+08-FEB-2018: 8.0.8
+
+- Fixes plantUML SVG insert in IE11
+- Adds cors URL parameter
+
 06-FEB-2018: 8.0.7
 
 - Adds recent/search in Confluence connect

+ 1 - 1
VERSION

@@ -1 +1 @@
-8.0.7
+8.0.8

+ 83 - 1
src/main/java/com/mxgraph/io/gliffy/importer/GliffyDiagramConverter.java

@@ -26,6 +26,7 @@ import com.mxgraph.io.gliffy.model.Constraint.ConstraintData;
 import com.mxgraph.io.gliffy.model.Constraints;
 import com.mxgraph.io.gliffy.model.Diagram;
 import com.mxgraph.io.gliffy.model.EmbeddedResources.Resource;
+import com.mxgraph.io.gliffy.model.GliffyLayer;
 import com.mxgraph.io.gliffy.model.GliffyObject;
 import com.mxgraph.io.gliffy.model.GliffyText;
 import com.mxgraph.io.gliffy.model.Graphic;
@@ -40,7 +41,6 @@ import com.mxgraph.online.Utils;
 import com.mxgraph.util.mxDomUtils;
 import com.mxgraph.util.mxPoint;
 import com.mxgraph.util.mxXmlUtils;
-import com.mxgraph.view.mxGraph;
 import com.mxgraph.view.mxGraphHeadless;
 
 /**
@@ -67,6 +67,8 @@ public class GliffyDiagramConverter
 
 	private Map<Integer, GliffyObject> vertices;
 	
+	private Map<String, GliffyLayer> layers;
+	
 	private Pattern rotationPattern = Pattern.compile("rotation=(\\-?\\w+)");
 
 	/**
@@ -77,6 +79,7 @@ public class GliffyDiagramConverter
 	public GliffyDiagramConverter(String gliffyDiagramString)
 	{
 		vertices = new LinkedHashMap<Integer, GliffyObject>();
+		layers = new  LinkedHashMap<String, GliffyLayer>();
 		this.diagramString = gliffyDiagramString;
 		drawioDiagram = new mxGraphHeadless();
 		//Disable parent (groups) auto extend feature as it miss with the coordinates of vsdx format
@@ -92,6 +95,9 @@ public class GliffyDiagramConverter
 		// creates a diagram object from the JSON string
 		this.gliffyDiagram = new GsonBuilder().registerTypeAdapterFactory(new PostDeserializer()).create().fromJson(diagramString, Diagram.class);
 
+		
+		collectLayersAndConvert(layers, gliffyDiagram.stage.getLayers());
+		
 		collectVerticesAndConvert(vertices, gliffyDiagram.stage.getObjects(), null);
 
 		//sort objects by the order specified in the Gliffy diagram
@@ -101,6 +107,8 @@ public class GliffyDiagramConverter
 
 		try
 		{
+			importLayers();
+			
 			for (GliffyObject obj : gliffyDiagram.stage.getObjects())
 			{
 				importObject(obj, obj.parent);
@@ -113,6 +121,26 @@ public class GliffyDiagramConverter
 
 	}
 
+	/**
+	 * Imports the layers into the draw.io diagram after sorting them by their order. 
+	 */
+	private void importLayers()
+	{
+		Object root = drawioDiagram.getModel().getRoot();
+		
+		List<GliffyLayer> layers = gliffyDiagram.stage.getLayers();
+		
+		if (layers != null)
+		{
+			sortLayersByOrder(layers);
+			
+			for (GliffyLayer layer : layers)
+			{
+				drawioDiagram.addCell(layer.mxObject, root);
+			}
+		}
+	}
+	
 	/**
 	 * Imports the objects into the draw.io diagram. Recursively adds the children 
 	 */
@@ -120,6 +148,15 @@ public class GliffyDiagramConverter
 	{
 		mxCell parent = gliffyParent != null ? gliffyParent.mxObject : null;
 
+		//add a layer as a parent only if the object is not a child object
+		if (parent == null && obj.layerId != null)
+		{
+			GliffyLayer layer = layers.get(obj.layerId);
+			
+			if (layer != null)
+				parent = layer.mxObject;
+		}
+		
 		drawioDiagram.addCell(obj.mxObject, parent);
 
 		if (obj.hasChildren())
@@ -184,6 +221,20 @@ public class GliffyDiagramConverter
 		Collections.sort((List<GliffyObject>) values, c); 
 	}
 
+	private void sortLayersByOrder(List<GliffyLayer> values)
+	{
+		Comparator<GliffyLayer> c = new Comparator<GliffyLayer>()
+		{
+			public int compare(GliffyLayer o1, GliffyLayer o2)
+			{
+				return o1.order - o2.order;
+			}
+		};
+		
+		Collections.sort(values, c); 
+	}
+
+	
 	private mxCell getTerminalCell(GliffyObject gliffyEdge, boolean start)
 	{
 		Constraints cons = gliffyEdge.getConstraints();
@@ -279,6 +330,37 @@ public class GliffyDiagramConverter
 
 	}
 
+	/**
+	 * Creates a map of all layers so they can be easily accessed when looking
+	 * up cells layers
+	 */
+	private void collectLayersAndConvert(Map<String, GliffyLayer> layersMap,
+			Collection<GliffyLayer> layers)
+	{
+		if (layers == null)
+			return;
+		
+		for (GliffyLayer layer : layers)
+		{
+			mxCell layerCell = new mxCell();
+
+			layerCell.setVisible(layer.visible);
+
+			if (layer.locked)
+			{
+				layerCell.setStyle("locked=1;");
+			}
+			
+//			layer.active //How can we set the active layer in draw.io?
+//			layer.nodeIndex //??
+			
+			layerCell.setValue(layer.name);
+			
+			layer.mxObject = layerCell;
+			
+			layersMap.put(layer.guid, layer);
+		}
+	}
 	/**
 	 * Creates a map of all vertices so they can be easily accessed when looking
 	 * up terminal cells for edges

+ 25 - 0
src/main/java/com/mxgraph/io/gliffy/model/GliffyLayer.java

@@ -0,0 +1,25 @@
+package com.mxgraph.io.gliffy.model;
+
+import com.mxgraph.model.mxCell;
+
+public class GliffyLayer {
+	public String guid;
+
+	public int order;
+
+	public String name;
+
+	public boolean active;
+	
+	public boolean locked;
+	
+	public boolean visible;
+
+	public int nodeIndex;
+
+	public mxCell mxObject;// the mxCell this gliffy layer got converted into
+	
+	public GliffyLayer() 
+	{
+	}
+}

+ 2 - 0
src/main/java/com/mxgraph/io/gliffy/model/GliffyObject.java

@@ -49,6 +49,8 @@ public class GliffyObject implements PostDeserializable
 
 	public boolean lockshape;
 
+	public String layerId;
+	
 	public Graphic graphic;
 
 	public List<GliffyObject> children;

+ 10 - 0
src/main/java/com/mxgraph/io/gliffy/model/Stage.java

@@ -18,6 +18,8 @@ public class Stage
 	private boolean drawingGuidesOn;
 
 	private List<GliffyObject> objects;
+	
+	private List<GliffyLayer> layers;
 
 	public Stage()
 	{
@@ -92,4 +94,12 @@ public class Stage
 	{
 		this.objects = objects;
 	}
+
+	public List<GliffyLayer> getLayers() {
+		return layers;
+	}
+
+	public void setLayers(List<GliffyLayer> layers) {
+		this.layers = layers;
+	}
 }

+ 1 - 1
src/main/webapp/cache.manifest

@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 02/06/2018 06:05 PM
+# 02/08/2018 05:08 PM
 
 app.html
 index.html?offline=1

+ 1 - 1
src/main/webapp/connect/confluence/connect-dev.json

@@ -2,7 +2,7 @@
     "name": "Draw.io gaudenz",
     "description": "Draw.io add-on for Confluence",
     "key": "com.mxgraph.confluence.plugins.diagramly",
-    "baseUrl": "https://3f145265.ngrok.io",
+    "baseUrl": "https://0d961297.ngrok.io/",
     "vendor": 
     {
         "name": "JGraph Ltd.",

+ 13 - 11
src/main/webapp/connect/confluence/viewer2.html

@@ -10,9 +10,10 @@ html, body {
 }
 body {
 	background-color:#ffffff;
-	background-image:url(/images/logo-flat.png);
+	background-image:url(/images/drawlogo-gray.svg);
 	background-repeat:no-repeat;
-	background-position:center;
+	background-position:center top;
+	background-size: 64px;
 	font-family:Arial,sans-serif;
 	width:100%;
 	margin:0;
@@ -34,14 +35,6 @@ function getUrlParam(param)
 	return null;
 };
 
-var lightbox = getUrlParam('lightbox') == '1';
-
-if (!lightbox)
-{
-	document.body.style.backgroundImage = 'url(/images/drawlogo256.png)';
-	document.body.style.backgroundSize = 'auto 100%';
-}
-
 // Sets global environment variables
 RESOURCE_BASE = '/resources/dia';
 STENCIL_PATH = '/stencils';
@@ -49,6 +42,14 @@ SHAPES_PATH = '/shapes';
 
 // Overrides browser language with Confluence user language
 var lang = getUrlParam('loc');
+var lightbox = getUrlParam('lightbox') == '1';
+
+if (lightbox)
+{
+	document.body.style.backgroundImage = 'url(/images/drawlogo-text-bottom.svg)';
+	document.body.style.backgroundPosition = 'center 30%';
+	document.body.style.backgroundSize = '128px';
+}
 
 // Language is in the Connect URL
 if (lang != null)
@@ -95,8 +96,9 @@ if (lang != null)
 	
 	if (!lightbox)
 	{
+		document.body.style.backgroundImage = 'url(/images/aui-wait.gif)';
+		document.body.style.backgroundPosition = 'left top';
 		document.body.style.backgroundSize = 'auto auto';
-		document.body.style.backgroundImage = 'url(/images/ajax-loader.gif)';
 	}
 	
 	function main()

+ 1 - 1
src/main/webapp/connect/jira/connect-dev.json

@@ -2,7 +2,7 @@
      "name": "Draw.io gaudenz",
      "description": "Draw.io add-on for JIRA",
      "key": "com.mxgraph.jira.plugins.drawio.gaudenz",
-     "baseUrl": "https://7a8b3ef9.ngrok.io",
+     "baseUrl": "https://0d961297.ngrok.io/",
      "vendor": {
          "name": "JGraph Ltd.",
          "url": "https://www.jgraph.com"

+ 3 - 2
src/main/webapp/connect/jira/fullScreenViewer2.html

@@ -10,9 +10,10 @@ html, body {
 }
 body {
 	background-color:#ffffff;
-	background-image:url(/images/logo-flat.png);
+	background-image:url(/images/drawlogo-text-bottom.svg);
+	background-position:center 30%;
 	background-repeat:no-repeat;
-	background-position:center;
+	background-size: 128px;
 	font-family:Arial,sans-serif;
 	width:100%;
 	margin:0;

BIN
src/main/webapp/images/aui-wait.gif


+ 20 - 0
src/main/webapp/images/drawlogo-gray.svg

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 250 250" style="enable-background:new 0 0 250 250;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#a2a2a2;}
+	.st1{fill:#8e8e8e;}
+	.st2{fill:#FFFFFF;}
+</style>
+<title>Zeichenfläche 1</title>
+<path class="st0" d="M237.5,227.9c0,5.3-4.3,9.6-9.5,9.6c0,0,0,0,0,0H22.1c-5.3,0-9.6-4.3-9.6-9.5c0,0,0,0,0,0V22.1
+	c0-5.3,4.3-9.6,9.5-9.6c0,0,0,0,0,0h205.9c5.3,0,9.6,4.3,9.6,9.5c0,0,0,0,0,0V227.9z"/>
+<path class="st1" d="M237.5,227.9c0,5.3-4.3,9.6-9.5,9.6c0,0,0,0,0,0H89.6L44.8,192l27.9-45.5l82.7-102.7l82.1,84.5V227.9z"/>
+<path class="st2" d="M197.1,138.3h-23.7l-25-42.7c5.7-1.2,9.8-6.2,9.7-12V51.5c0-6.8-5.4-12.3-12.2-12.3c0,0-0.1,0-0.1,0h-41.7
+	c-6.8,0-12.3,5.4-12.3,12.2c0,0,0,0.1,0,0.1v32.1c0,5.8,4,10.8,9.7,12l-25,42.7H52.9c-6.8,0-12.3,5.4-12.3,12.2c0,0,0,0.1,0,0.1
+	v32.1c0,6.8,5.4,12.3,12.2,12.3c0,0,0.1,0,0.1,0h41.7c6.8,0,12.3-5.4,12.3-12.2c0,0,0-0.1,0-0.1v-32.1c0-6.8-5.4-12.3-12.2-12.3
+	c0,0-0.1,0-0.1,0h-4l24.8-42.4h19.3l24.9,42.4h-4.1c-6.8,0-12.3,5.4-12.3,12.2c0,0,0,0.1,0,0.1v32.1c0,6.8,5.4,12.3,12.2,12.3
+	c0,0,0.1,0,0.1,0h41.7c6.8,0,12.3-5.4,12.3-12.2c0,0,0-0.1,0-0.1v-32.1c0-6.8-5.4-12.3-12.2-12.3
+	C197.2,138.3,197.2,138.3,197.1,138.3z"/>
+</svg>

BIN
src/main/webapp/images/sidebar-mscae.png


BIN
src/main/webapp/images/youtube.png


+ 5 - 12
src/main/webapp/index.html

@@ -198,20 +198,13 @@
 		}
 		.geFooterContainer div.geSocialFooter a img {
 			margin-top:10px;
-			opacity:0.8;
+			opacity:0.5;
 		}
 		.geFooterContainer div.geSocialFooter a img:hover {
 			opacity:1;
 		}
-		#geFooterItem1 {
-			background-color: #cdcdcd;
-		}
-		#geFooterItem1:hover {
-			background-color: #b0b0b0;
-		}
-		.geFooterContainer>div>img {
+		.geFooterContainer>div#geFooter>img {
 			opacity:0.5;
-			background:#e5e5e5;
 			border:1px solid transparent;
 			cusor:pointer;
 			margin-top:3px;
@@ -222,7 +215,7 @@
 			padding:1px;
 			cursor:pointer;
 		}
-		.geFooterContainer>div>img:hover {
+		.geFooterContainer>div#geFooter>img:hover {
 			opacity: 1;
 		}
 	</style>
@@ -404,12 +397,12 @@
 	</div>
 	<table align="center" height="100%">
 		<tr>
-			<td id="geFooterItem2" align="center" style="width:246px;">
+			<td id="geFooterItem2" align="center" style="width:280px;transition: all 1s ease;">
 				<a title="Quick Start Video" href="https://www.youtube.com/watch?v=Z0D96ZikMkc" target="_blank">
 					<img border="0" align="absmiddle" style="margin-top:-2px;padding-right:8px;"
 						width="26" height="26" src="images/youtube.png"/>Quick Start Video</a>
 			</td>
-			<td id="geFooterItem1" align="center" style="width:282px;">
+			<td id="geFooterItem1" align="center" style="width:260px;">
 				<a id="geFooterLink1" title="#1 Rated Confluence Add-on" target="_blank"
 					href="https://about.draw.io/integrations/confluence-integration/">
 					<img border="0" width="24" height="24" align="absmiddle" style="padding-right:10px;"

File diff suppressed because it is too large
+ 526 - 412
src/main/webapp/js/app.min.js


File diff suppressed because it is too large
+ 117 - 115
src/main/webapp/js/atlas-viewer.min.js


File diff suppressed because it is too large
+ 889 - 775
src/main/webapp/js/atlas.min.js


+ 34 - 13
src/main/webapp/js/diagramly/Dialogs.js

@@ -2173,19 +2173,39 @@ var ParseDialog = function(editorUi, title)
 				  if (this.status >= 200 && this.status < 300)
 				  {
 				    var reader = new FileReader();
-				    reader.readAsDataURL(this.response); 
+				    reader.readAsDataURL(this.response);
+				    
 				    reader.onload = function(e) 
 				    {
-				    	var img = new Image();
-				    	img.onload = function()
-				    	{
-				    		editorUi.spinner.stop();
-				    		
-				    		graph.getModel().beginUpdate();
+					    	var img = new Image();
+					    	
+					    	img.onload = function()
+					    	{
+					    		editorUi.spinner.stop();
+					    		var w = img.width;
+					    		var h = img.height;
+					    		
+					    		// Workaround for 0 image size in IE11
+					    		if (w == 0 && h == 0)
+					    		{
+						    		var data = e.target.result;
+						    		var comma = data.indexOf(',');
+			    					var svgText = decodeURIComponent(escape(atob(data.substring(comma + 1))));
+			    					var root = mxUtils.parseXml(svgText);
+		    						var svgs = root.getElementsByTagName('svg');
+		    						
+		    						if (svgs.length > 0)
+		    						{
+		    							w = parseFloat(svgs[0].getAttribute('width'));
+		    							h = parseFloat(svgs[0].getAttribute('height'));
+		    						}
+					    		}
+					    		
+					    		graph.getModel().beginUpdate();
 							try
 							{
-					    		cell = graph.insertVertex(null, null, text, insertPoint.x, insertPoint.y,
-									img.width, img.height, 'shape=image;noLabel=1;verticalAlign=top;aspect=fixed;imageAspect=0;' +
+					    			cell = graph.insertVertex(null, null, text, insertPoint.x, insertPoint.y,
+									w, h, 'shape=image;noLabel=1;verticalAlign=top;aspect=fixed;imageAspect=0;' +
 									'image=' + editorUi.convertDataUri(e.target.result) + ';');
 							}
 							finally
@@ -2195,12 +2215,14 @@ var ParseDialog = function(editorUi, title)
 							
 							graph.setSelectionCell(cell);
 				           	graph.scrollCellToVisible(graph.getSelectionCell());
-				    	};
-				    	img.src = e.target.result;
+					    	};
+					    	
+					    	img.src = e.target.result;
 				    };
+				    
 				    reader.onerror = function(e)
 				    {
-				    	editorUi.handleError(e);
+				    		editorUi.handleError(e);
 				    };
 				  }
 				  else 
@@ -2638,7 +2660,6 @@ var NewDialog = function(editorUi, compact, showName, callback, createOnly, canc
 	rightHighlightBorder = (rightHighlightBorder != null) ? rightHighlightBorder : '1px solid #ccd9ea';
 	templateFile = (templateFile != null) ? templateFile : TEMPLATE_PATH + '/index.xml';
 	
-	
 	var outer = document.createElement('div');
 	outer.style.height = '100%';
 	

+ 11 - 1
src/main/webapp/js/diagramly/EditorUi.js

@@ -2311,6 +2311,10 @@
 			Graph.prototype.defaultPageBackgroundColor = '#2a2a2a';
 			Graph.prototype.defaultGraphBackground = null;
 			Graph.prototype.defaultPageBorderColor = '#505759';
+		    Graph.prototype.svgShadowColor = '#e0e0e0';
+		    Graph.prototype.svgShadowOpacity = '0.6';
+		    Graph.prototype.svgShadowSize = '0.8';
+		    Graph.prototype.svgShadowBlur = '1.4';
 			Format.prototype.inactiveTabBackgroundColor = 'black';
 			BaseFormatPanel.prototype.buttonBackgroundColor = '#2a2a2a';
 			Sidebar.prototype.dragPreviewBorder = '1px dashed #cccccc';
@@ -5199,7 +5203,13 @@
 	 */
 	EditorUi.prototype.isCorsEnabledForUrl = function(url)
 	{
-		return url.substring(0, 34) === 'https?://raw.githubusercontent.com/' ||
+		if (urlParams['cors'] != null && this.corsRegExp == null)
+		{
+			this.corsRegExp = new RegExp(decodeURIComponent(urlParams['cors']));
+		}
+		
+		return (this.corsRegExp != null && this.corsRegExp.test(url)) ||
+			url.substring(0, 34) === 'https?://raw.githubusercontent.com/' ||
 			/^https?:\/\/.*\.github\.io\//.test(url) ||
 			/^https?:\/\/(.*\.)?rawgit\.com\//.test(url);
 	};

File diff suppressed because it is too large
+ 577 - 72
src/main/webapp/js/diagramly/sidebar/Sidebar-MSCAE.js


+ 1 - 1
src/main/webapp/js/diagramly/sidebar/Sidebar.js

@@ -119,7 +119,7 @@
 	                                   {id: 'android', prefix: 'android', libs: [''/*prefix is library*/]}, {id: 'aws3d'},
 	                                   {id: 'flowchart'}, {id: 'basic'}, {id: 'arrows'}, {id: 'arrows2'}, {id: 'lean_mapping'}, {id: 'citrix'}, {id: 'azure'}, {id: 'network'}, {id: 'sitemap'},
 	                                   
-	                                   {id: 'mscae', prefix: 'mscae', libs: ['Cloud', 'Enterprise', 'General', 'Intune', 'Other', 'System Center', 'Deprecated']},
+	                                   {id: 'mscae', prefix: 'mscae', libs: ['Cloud', 'Enterprise', 'General', 'General Symbols', 'Intune', 'OMS', 'OpsManager', 'Other', 'System Center', 'Virtual Machine', 'Deprecated']},
 	                                   
 	                                   {id: 'bpmn', prefix: 'bpmn', libs: [''/*prefix is library*/, 'Gateways', 'Events']},
 	                                   {id: 'clipart', prefix: null, libs: ['computer', 'finance', 'clipart', 'networking', 'people', 'telco']},

File diff suppressed because it is too large
+ 12 - 12
src/main/webapp/js/embed-static.min.js


+ 15 - 13
src/main/webapp/js/mxgraph/Format.js

@@ -3041,7 +3041,7 @@ TextFormatPanel.prototype.addFont = function(container)
 		        this.editorUi.toolbar.addButton('geSprite-horizontalrule', mxResources.get('insertHorizontalRule'),
 				function()
 				{
-					document.execCommand('inserthorizontalrule', false, null);
+					document.execCommand('inserthorizontalrule', false);
 				}, insertPanel),				
 				this.editorUi.toolbar.addMenuFunctionInContainer(insertPanel, 'geSprite-table', mxResources.get('table'), false, mxUtils.bind(this, function(menu)
 				{
@@ -3071,10 +3071,10 @@ TextFormatPanel.prototype.addFont = function(container)
 				{
 					try
 					{
-			        	if (currentTable != null)
-			        	{
-			        		graph.selectNode(graph.insertColumn(currentTable, (tableCell != null) ? tableCell.cellIndex : 0));
-			        	}
+				        	if (currentTable != null)
+				        	{
+				        		graph.selectNode(graph.insertColumn(currentTable, (tableCell != null) ? tableCell.cellIndex : 0));
+				        	}
 					}
 					catch (e)
 					{
@@ -3087,9 +3087,9 @@ TextFormatPanel.prototype.addFont = function(container)
 					try
 					{
 						if (currentTable != null)
-			        	{
-							graph.selectNode(graph.insertColumn(currentTable, (tableCell != null) ? tableCell.cellIndex + 1 : -1));
-			        	}
+				        	{
+								graph.selectNode(graph.insertColumn(currentTable, (tableCell != null) ? tableCell.cellIndex + 1 : -1));
+				        	}
 					}
 					catch (e)
 					{
@@ -4225,14 +4225,14 @@ StyleFormatPanel.prototype.addStroke = function(container)
 	var solid = document.createElement('div');
 	solid.style.width = '85px';
 	solid.style.height = '1px';
-	solid.style.borderBottom = '1px solid black';
+	solid.style.borderBottom = '1px solid ' + this.defaultStrokeColor;
 	solid.style.marginBottom = '9px';
 	symbol.appendChild(solid);
 	
 	var altSolid = document.createElement('div');
 	altSolid.style.width = '23px';
 	altSolid.style.height = '1px';
-	altSolid.style.borderBottom = '1px solid black';
+	altSolid.style.borderBottom = '1px solid ' + this.defaultStrokeColor;
 	altSolid.style.marginBottom = '9px';
 	altSymbol.appendChild(altSolid);
 
@@ -4379,16 +4379,16 @@ StyleFormatPanel.prototype.addStroke = function(container)
 		{
 			if (mxUtils.getValue(ss.style, mxConstants.STYLE_DASH_PATTERN, null) == null)
 			{
-				solid.style.borderBottom = '1px dashed black';
+				solid.style.borderBottom = '1px dashed ' + this.defaultStrokeColor;
 			}
 			else
 			{
-				solid.style.borderBottom = '1px dotted black';
+				solid.style.borderBottom = '1px dotted ' + this.defaultStrokeColor;
 			}
 		}
 		else
 		{
-			solid.style.borderBottom = '1px solid black';
+			solid.style.borderBottom = '1px solid ' + this.defaultStrokeColor;
 		}
 		
 		altSolid.style.borderBottom = solid.style.borderBottom;
@@ -4475,6 +4475,8 @@ StyleFormatPanel.prototype.addStroke = function(container)
 				markerDiv.style.verticalAlign = 'top';
 				markerDiv.style.marginTop = '5px';
 				markerDiv.style.fontSize = '10px';
+				markerDiv.style.filter = 'none';
+				markerDiv.style.color = this.defaultStrokeColor;
 				markerDiv.nextSibling.style.marginTop = '0px';
 			}
 			

File diff suppressed because it is too large
+ 12 - 12
src/main/webapp/js/reader.min.js


File diff suppressed because it is too large
+ 12 - 8
src/main/webapp/js/stencils.min.js


File diff suppressed because it is too large
+ 117 - 115
src/main/webapp/js/viewer.min.js


File diff suppressed because it is too large
+ 881 - 93
src/main/webapp/stencils/azure.xml


File diff suppressed because it is too large
+ 6308 - 43
src/main/webapp/stencils/mscae/cloud.xml


+ 902 - 1
src/main/webapp/stencils/mscae/deprecated.xml

@@ -1,6 +1,15 @@
 <shapes name="mxgraph.mscae.deprecated">
 <shape aspect="variable" h="66.4" name="Application" strokewidth="inherit" w="99.6">
-    <connections/>
+    <connections>
+        <constraint name="N" perimeter="0" x="0.5" y="0"/>
+        <constraint name="S" perimeter="0" x="0.5" y="1"/>
+        <constraint name="W" perimeter="0" x="0" y="0.5"/>
+        <constraint name="E" perimeter="0" x="1" y="0.5"/>
+        <constraint name="NE" perimeter="0" x="1" y="0"/>
+        <constraint name="NW" perimeter="0" x="0" y="0"/>
+        <constraint name="SE" perimeter="0" x="1" y="1"/>
+        <constraint name="SW" perimeter="0" x="0" y="1"/>
+    </connections>
     <foreground>
         <path>
             <move x="0" y="66.4"/>
@@ -42,4 +51,896 @@
         <fillstroke/>
     </foreground>
 </shape>
+<shape aspect="variable" h="50" name="Application Gateway" strokewidth="inherit" w="50.1">
+    <connections>
+        <constraint name="N" perimeter="0" x="0.5" y="0"/>
+        <constraint name="S" perimeter="0" x="0.5" y="1"/>
+        <constraint name="W" perimeter="0" x="0" y="0.5"/>
+        <constraint name="E" perimeter="0" x="1" y="0.5"/>
+        <constraint name="NE" perimeter="0" x="0.77" y="0.23"/>
+        <constraint name="NW" perimeter="0" x="0.23" y="0.23"/>
+        <constraint name="SE" perimeter="0" x="0.77" y="0.77"/>
+        <constraint name="SW" perimeter="0" x="0.23" y="0.77"/>
+    </connections>
+    <foreground>
+        <path>
+            <move x="21" y="25"/>
+            <line x="14.4" y="18.4"/>
+            <line x="14.4" y="23"/>
+            <line x="5.4" y="23"/>
+            <line x="5.4" y="27"/>
+            <line x="14.4" y="27"/>
+            <line x="14.4" y="31.6"/>
+            <close/>
+            <move x="27.1" y="25"/>
+            <line x="33.7" y="31.6"/>
+            <line x="33.7" y="27"/>
+            <line x="42.6" y="27"/>
+            <line x="42.6" y="23"/>
+            <line x="33.7" y="23"/>
+            <line x="33.7" y="18.4"/>
+            <close/>
+            <move x="24" y="45.6"/>
+            <line x="30.6" y="39"/>
+            <line x="25.9" y="39"/>
+            <line x="25.9" y="29.6"/>
+            <line x="22" y="29.6"/>
+            <line x="22" y="39"/>
+            <line x="17.4" y="39"/>
+            <close/>
+            <move x="24" y="4.4"/>
+            <line x="17.4" y="11"/>
+            <line x="22.1" y="11"/>
+            <line x="22.1" y="20.6"/>
+            <line x="26" y="20.6"/>
+            <line x="26" y="11"/>
+            <line x="30.6" y="11"/>
+            <close/>
+            <move x="25" y="50"/>
+            <curve x1="23.8" x2="22.6" x3="21.7" y1="50" y2="49.5" y3="48.6"/>
+            <line x="1.4" y="28.3"/>
+            <curve x1="0.5" x2="0" x3="0" y1="27.4" y2="26.2" y3="25"/>
+            <curve x1="0" x2="0.5" x3="1.4" y1="23.8" y2="22.6" y3="21.7"/>
+            <line x="21.7" y="1.4"/>
+            <curve x1="22.6" x2="23.8" x3="25" y1="0.5" y2="0" y3="0"/>
+            <curve x1="26.2" x2="27.4" x3="28.3" y1="0" y2="0.5" y3="1.4"/>
+            <line x="48.7" y="21.8"/>
+            <curve x1="49.6" x2="50.1" x3="50.1" y1="22.7" y2="23.8" y3="25.1"/>
+            <curve x1="50.1" x2="49.6" x3="48.7" y1="26.3" y2="27.5" y3="28.4"/>
+            <line x="28.3" y="48.6"/>
+            <curve x1="27.4" x2="26.2" x3="25" y1="49.5" y2="50" y3="50"/>
+        </path>
+        <fillstroke/>
+    </foreground>
+</shape>
+<shape aspect="variable" h="80.98" name="Azure" strokewidth="inherit" w="130.56">
+    <connections>
+        <constraint name="N" perimeter="0" x="0.5" y="0.02"/>
+        <constraint name="S" perimeter="0" x="0.5" y="1"/>
+        <constraint name="W" perimeter="0" x="0.025" y="0.5"/>
+        <constraint name="E" perimeter="0" x="0.875" y="0.5"/>
+        <constraint name="NE" perimeter="0" x="0.81" y="0.19"/>
+        <constraint name="NW" perimeter="0" x="0.19" y="0.33"/>
+        <constraint name="SE" perimeter="0" x="0.9" y="1"/>
+        <constraint name="SW" perimeter="0" x="0.19" y="1"/>
+    </connections>
+    <foreground>
+        <path>
+            <move x="36.43" y="49.9"/>
+            <line x="38.76" y="42.24"/>
+            <line x="41.04" y="49.9"/>
+            <close/>
+            <move x="47.79" y="57.02"/>
+            <line x="41.16" y="39.02"/>
+            <line x="36.43" y="39.02"/>
+            <line x="29.74" y="57.02"/>
+            <line x="34.31" y="57.02"/>
+            <line x="35.54" y="52.99"/>
+            <line x="41.92" y="52.99"/>
+            <line x="43.4" y="57.02"/>
+            <close/>
+            <move x="59.8" y="57.02"/>
+            <line x="59.8" y="54.11"/>
+            <line x="53.6" y="54.11"/>
+            <line x="59.76" y="46.13"/>
+            <line x="59.76" y="44.11"/>
+            <line x="48.82" y="44.11"/>
+            <line x="48.82" y="47.12"/>
+            <line x="54.58" y="47.12"/>
+            <line x="48.27" y="55.38"/>
+            <line x="48.27" y="57.02"/>
+            <close/>
+            <move x="74.29" y="57.02"/>
+            <line x="74.29" y="44.11"/>
+            <line x="70.35" y="44.11"/>
+            <line x="70.35" y="51.78"/>
+            <curve x1="70.35" x2="69.28" x3="67.96" y1="53.24" y2="54.36" y3="54.36"/>
+            <curve x1="66.56" x2="65.8" x3="65.8" y1="54.36" y2="53.4" y3="51.65"/>
+            <line x="65.8" y="44.11"/>
+            <line x="61.92" y="44.11"/>
+            <line x="61.92" y="52.63"/>
+            <curve x1="61.92" x2="62.99" x3="66.16" y1="55.19" y2="57.36" y3="57.36"/>
+            <curve x1="68.07" x2="69.36" x3="70.35" y1="57.5" y2="56.48" y3="55.03"/>
+            <line x="70.35" y="57.02"/>
+            <close/>
+            <move x="86.12" y="47.51"/>
+            <line x="86.12" y="44.14"/>
+            <curve x1="84.46" x2="82.87" x3="81.68" y1="43.59" y2="43.96" y3="46.38"/>
+            <line x="81.68" y="44.11"/>
+            <line x="77.67" y="44.11"/>
+            <line x="77.67" y="57.02"/>
+            <line x="81.68" y="57.02"/>
+            <line x="81.68" y="50.36"/>
+            <curve x1="81.68" x2="83.72" x3="86.12" y1="47.92" y2="46.75" y3="47.51"/>
+            <close/>
+            <move x="91.13" y="49.16"/>
+            <curve x1="91.53" x2="92.27" x3="93.75" y1="47.72" y2="46.36" y3="46.38"/>
+            <curve x1="95.53" x2="95.88" x3="95.81" y1="46.5" y2="48.1" y3="49.12"/>
+            <close/>
+            <move x="98.46" y="53.39"/>
+            <curve x1="97.27" x2="95.59" x3="93.25" y1="54.21" y2="54.8" y3="54.36"/>
+            <curve x1="92.11" x2="91.27" x3="91.13" y1="53.98" y2="53.27" y3="51.71"/>
+            <line x="99.56" y="51.74"/>
+            <curve x1="99.65" x2="99.57" x3="99.06" y1="49.87" y2="48.6" y3="47.26"/>
+            <curve x1="98.38" x2="96.99" x3="93.66" y1="45.44" y2="43.98" y3="43.79"/>
+            <curve x1="91.35" x2="88.76" x3="87.69" y1="43.58" y2="45.15" y3="47.99"/>
+            <curve x1="86.49" x2="88" x3="90.22" y1="52.95" y2="55.4" y3="56.61"/>
+            <curve x1="92.6" x2="97.24" x3="98.46" y1="58.02" y2="57.19" y3="56.45"/>
+            <close/>
+            <move x="26.2" y="80.98"/>
+            <curve x1="13.79" x2="0" x3="0" y1="80.98" y2="70.16" y3="53.32"/>
+            <curve x1="0.5" x2="13.65" x3="23.68" y1="36.76" y2="27.87" y3="26.68"/>
+            <curve x1="27.84" x2="32.38" x3="36.3" y1="26.05" y2="26.53" y3="27.82"/>
+            <curve x1="40.21" x2="53.76" x3="75.57" y1="15.81" y2="0" y3="0.67"/>
+            <curve x1="91.87" x2="113.26" x3="114.27" y1="0.67" y2="13.89" y3="39.56"/>
+            <curve x1="114.48" x2="114.08" x3="112.82" y1="43.21" y2="47" y3="51.18"/>
+            <curve x1="117.85" x2="123.26" x3="127.47" y1="50.5" y2="52.14" y3="58"/>
+            <curve x1="130.56" x2="130.39" x3="126.84" y1="63.6" y2="70.41" y3="74.85"/>
+            <curve x1="124.13" x2="119.76" x3="115.98" y1="78.38" y2="80.98" y3="80.98"/>
+            <close/>
+        </path>
+        <fillstroke/>
+    </foreground>
+</shape>
+<shape aspect="variable" h="41.1" name="Batch" strokewidth="inherit" w="42.5">
+    <connections>
+        <constraint name="N" perimeter="0" x="0.5" y="0"/>
+        <constraint name="S" perimeter="0" x="0.5" y="0.55"/>
+        <constraint name="W" perimeter="0" x="0" y="0.5"/>
+        <constraint name="E" perimeter="0" x="0.79" y="0.5"/>
+        <constraint name="NE" perimeter="0" x="0.75" y="0.27"/>
+        <constraint name="NW" perimeter="0" x="0" y="0"/>
+        <constraint name="SE" perimeter="0" x="1" y="1"/>
+    </connections>
+    <foreground>
+        <path>
+            <move x="41.9" y="29.7"/>
+            <line x="41" y="29.7"/>
+            <line x="41" y="32.5"/>
+            <line x="41" y="39.6"/>
+            <line x="32.5" y="39.6"/>
+            <line x="31.2" y="39.6"/>
+            <line x="31.2" y="40.5"/>
+            <curve x1="31.2" x2="31.5" x3="31.8" y1="40.8" y2="41.1" y3="41.1"/>
+            <line x="41.9" y="41.1"/>
+            <curve x1="42.2" x2="42.5" x3="42.5" y1="41.1" y2="40.8" y3="40.5"/>
+            <line x="42.5" y="30.4"/>
+            <curve x1="42.5" x2="42.2" x3="41.9" y1="30" y2="29.7" y3="29.7"/>
+            <close/>
+            <move x="39.1" y="26.9"/>
+            <line x="38.2" y="26.9"/>
+            <line x="38.2" y="29.7"/>
+            <line x="38.2" y="36.8"/>
+            <line x="29.7" y="36.8"/>
+            <line x="28.3" y="36.8"/>
+            <line x="28.3" y="37.7"/>
+            <curve x1="28.3" x2="28.6" x3="28.9" y1="38" y2="38.3" y3="38.3"/>
+            <line x="39" y="38.3"/>
+            <curve x1="39.3" x2="39.6" x3="39.6" y1="38.3" y2="38" y3="37.7"/>
+            <line x="39.6" y="27.6"/>
+            <curve x1="39.7" x2="39.4" x3="39.1" y1="27.2" y2="26.9" y3="26.9"/>
+            <close/>
+            <move x="33" y="17"/>
+            <curve x1="33" x2="34" x3="26.9" y1="17" y2="9.3" y3="7.8"/>
+            <curve x1="26.9" x2="26.2" x3="25.3" y1="7.8" y2="7.8" y3="7.8"/>
+            <curve x1="24.4" x2="24" x3="24" y1="7.8" y2="8.1" y3="8.1"/>
+            <line x="24" y="11.2"/>
+            <curve x1="24" x2="24.3" x3="25.4" y1="11.2" y2="10.9" y3="10.9"/>
+            <curve x1="26.1" x2="26.7" x3="26.8" y1="10.9" y2="10.9" y3="11"/>
+            <curve x1="28.5" x2="30.1" x3="29.8" y1="11.6" y2="12.7" y3="17"/>
+            <line x="26.8" y="17"/>
+            <line x="31.6" y="23"/>
+            <line x="36.3" y="17"/>
+            <line x="33" y="17"/>
+            <line x="33" y="17"/>
+            <close/>
+            <move x="28.3" y="28.3"/>
+            <line x="34" y="28.3"/>
+            <line x="34" y="29.7"/>
+            <line x="28.3" y="29.7"/>
+            <close/>
+            <move x="36.8" y="24.6"/>
+            <curve x1="36.8" x2="36.5" x3="36.2" y1="24.3" y2="24" y3="24"/>
+            <line x="26.2" y="24"/>
+            <curve x1="25.9" x2="25.6" x3="25.6" y1="24" y2="24.3" y3="24.6"/>
+            <line x="25.6" y="34.7"/>
+            <curve x1="25.6" x2="25.9" x3="26.2" y1="35" y2="35.3" y3="35.3"/>
+            <line x="36.3" y="35.3"/>
+            <curve x1="36.6" x2="36.9" x3="36.9" y1="35.3" y2="35" y3="34.7"/>
+            <line x="36.8" y="24.6"/>
+            <line x="36.8" y="24.6"/>
+            <close/>
+            <move x="35.4" y="34"/>
+            <line x="26.9" y="34"/>
+            <line x="26.9" y="26.9"/>
+            <line x="35.4" y="26.9"/>
+            <line x="35.4" y="34"/>
+            <close/>
+            <move x="22.7" y="1.7"/>
+            <curve x1="22.7" x2="21.7" x3="21" y1="1" y2="0" y3="0"/>
+            <line x="1.1" y="0"/>
+            <curve x1="0.4" x2="0" x3="0" y1="0" y2="1" y3="1.7"/>
+            <line x="0" y="21.5"/>
+            <curve x1="0" x2="0.4" x3="1.1" y1="22.1" y2="22.6" y3="22.6"/>
+            <line x="21.1" y="22.6"/>
+            <curve x1="21.8" x2="22.7" x3="22.7" y1="22.6" y2="22" y3="21.5"/>
+            <line x="22.7" y="1.7"/>
+            <close/>
+            <move x="19.8" y="19.8"/>
+            <line x="2.8" y="19.8"/>
+            <line x="2.8" y="5.6"/>
+            <line x="19.8" y="5.6"/>
+            <line x="19.8" y="19.8"/>
+            <close/>
+            <move x="4.2" y="15.5"/>
+            <line x="18.4" y="15.5"/>
+            <line x="18.4" y="18.3"/>
+            <line x="4.2" y="18.3"/>
+            <close/>
+            <move x="4.2" y="11.3"/>
+            <line x="18.4" y="11.3"/>
+            <line x="18.4" y="14.1"/>
+            <line x="4.2" y="14.1"/>
+            <close/>
+            <move x="4.2" y="7"/>
+            <line x="18.4" y="7"/>
+            <line x="18.4" y="9.8"/>
+            <line x="4.2" y="9.8"/>
+            <close/>
+        </path>
+        <fillstroke/>
+    </foreground>
+</shape>
+<shape aspect="variable" h="30.9" name="Bot" strokewidth="inherit" w="30.9">
+    <connections>
+        <constraint name="N" perimeter="0" x="0.5" y="0"/>
+        <constraint name="S" perimeter="0" x="0.5" y="1"/>
+        <constraint name="W" perimeter="0" x="0" y="0.5"/>
+        <constraint name="E" perimeter="0" x="1" y="0.5"/>
+        <constraint name="NE" perimeter="0" x="0.855" y="0.145"/>
+        <constraint name="NW" perimeter="0" x="0.145" y="0.145"/>
+        <constraint name="SE" perimeter="0" x="0.855" y="0.145"/>
+        <constraint name="SW" perimeter="0" x="0.145" y="0.855"/>
+    </connections>
+    <foreground>
+        <path>
+            <move x="19.31" y="15.45"/>
+            <arc large-arc-flag="1" rx="1.45" ry="1.45" sweep-flag="0" x="16.41" x-axis-rotation="0" y="15.45"/>
+            <arc large-arc-flag="1" rx="1.45" ry="1.45" sweep-flag="0" x="19.31" x-axis-rotation="0" y="15.45"/>
+            <close/>
+            <move x="23.78" y="19"/>
+            <line x="23.78" y="8.08"/>
+            <arc large-arc-flag="0" rx="0.97" ry="0.97" sweep-flag="0" x="22.81" x-axis-rotation="0" y="7.12"/>
+            <line x="11.89" y="7.11"/>
+            <line x="11.89" y="9.04"/>
+            <line x="21.85" y="9.04"/>
+            <line x="21.85" y="19"/>
+            <line x="23.78" y="19"/>
+            <close/>
+            <move x="14.48" y="15.45"/>
+            <arc large-arc-flag="1" rx="1.45" ry="1.45" sweep-flag="0" x="11.59" x-axis-rotation="0" y="15.45"/>
+            <arc large-arc-flag="1" rx="1.45" ry="1.45" sweep-flag="0" x="14.48" x-axis-rotation="0" y="15.45"/>
+            <close/>
+            <move x="19" y="23.78"/>
+            <line x="19" y="21.85"/>
+            <line x="9.04" y="21.85"/>
+            <line x="9.04" y="11.89"/>
+            <line x="7.11" y="11.89"/>
+            <line x="7.11" y="22.82"/>
+            <arc large-arc-flag="0" rx="0.97" ry="0.97" sweep-flag="0" x="8.07" x-axis-rotation="0" y="23.79"/>
+            <line x="19" y="23.78"/>
+            <close/>
+            <move x="15.45" y="0"/>
+            <arc large-arc-flag="1" rx="15.45" ry="15.45" sweep-flag="0" x="30.9" x-axis-rotation="0" y="15.45"/>
+            <arc large-arc-flag="0" rx="15.45" ry="15.45" sweep-flag="0" x="15.45" x-axis-rotation="0" y="0"/>
+            <close/>
+            <move x="15.45" y="1.93"/>
+            <arc large-arc-flag="1" rx="13.52" ry="13.52" sweep-flag="1" x="1.93" x-axis-rotation="0" y="15.45"/>
+            <arc large-arc-flag="0" rx="13.53" ry="13.53" sweep-flag="1" x="15.45" x-axis-rotation="0" y="1.93"/>
+            <close/>
+        </path>
+        <fillstroke/>
+    </foreground>
+</shape>
+<shape aspect="variable" h="24.3" name="Compute" strokewidth="inherit" w="33.28">
+    <connections>
+        <constraint name="N" perimeter="0" x="0.5" y="0.1"/>
+        <constraint name="S" perimeter="0" x="0.5" y="0.9"/>
+        <constraint name="W" perimeter="0" x="0" y="0.5"/>
+        <constraint name="E" perimeter="0" x="1" y="0.5"/>
+        <constraint name="NE" perimeter="0" x="1" y="0"/>
+        <constraint name="NW" perimeter="0" x="0" y="0"/>
+        <constraint name="SE" perimeter="0" x="1" y="1"/>
+        <constraint name="SW" perimeter="0" x="0" y="1"/>
+    </connections>
+    <foreground>
+        <path>
+            <move x="21.02" y="12.28"/>
+            <line x="13.22" y="21.08"/>
+            <curve x1="13.12" x2="13.02" x3="12.82" y1="21.18" y2="21.28" y3="21.28"/>
+            <line x="12.62" y="21.28"/>
+            <line x="12.52" y="21.08"/>
+            <curve x1="12.32" x2="12.42" x3="12.52" y1="20.88" y2="20.48" y3="20.38"/>
+            <line x="14.82" y="14.58"/>
+            <line x="12.72" y="14.58"/>
+            <curve x1="12.52" x2="12.32" x3="12.12" y1="14.58" y2="14.68" y3="14.48"/>
+            <curve x1="12.02" x2="12.02" x3="12.02" y1="14.28" y2="14.18" y3="13.98"/>
+            <line x="15.02" y="5.88"/>
+            <curve x1="15.12" x2="15.52" x3="15.92" y1="5.58" y2="5.38" y3="5.38"/>
+            <line x="20.52" y="5.38"/>
+            <curve x1="20.72" x2="21.02" x3="21.12" y1="5.38" y2="5.48" y3="5.68"/>
+            <curve x1="21.22" x2="21.22" x3="21.12" y1="5.88" y2="6.08" y3="6.28"/>
+            <line x="18.12" y="11.28"/>
+            <line x="20.72" y="11.28"/>
+            <curve x1="21.02" x2="21.22" x3="21.32" y1="11.28" y2="11.38" y3="11.58"/>
+            <curve x1="21.22" x2="21.22" x3="21.02" y1="11.88" y2="12.08" y3="12.28"/>
+            <close/>
+            <move x="15.72" y="2.38"/>
+            <curve x1="12.12" x2="12.12" x3="9.32" y1="2.38" y2="2.08" y3="1.58"/>
+            <line x="9.32" y="22.48"/>
+            <curve x1="11.32" x2="12.22" x3="15.72" y1="22.28" y2="21.98" y3="21.98"/>
+            <curve x1="19.32" x2="21.22" x3="23.92" y1="21.98" y2="22.18" y3="22.48"/>
+            <line x="23.92" y="1.58"/>
+            <curve x1="21.22" x2="19.42" x3="15.72" y1="1.98" y2="2.38" y3="2.38"/>
+            <close/>
+            <move x="3.98" y="0.75"/>
+            <line x="3.98" y="23.25"/>
+            <curve x1="5.28" x2="6.68" x3="7.98" y1="23.05" y2="22.85" y3="22.65"/>
+            <line x="7.98" y="1.25"/>
+            <curve x1="6.68" x2="5.28" x3="3.98" y1="1.25" y2="1.05" y3="0.75"/>
+            <close/>
+            <move x="2.7" y="0.5"/>
+            <line x="2.7" y="23.7"/>
+            <curve x1="1.4" x2="1.2" x3="0" y1="23.9" y2="24.1" y3="24.3"/>
+            <line x="0" y="0"/>
+            <curve x1="1.1" x2="1.3" x3="2.7" y1="0.1" y2="0.3" y3="0.5"/>
+            <close/>
+            <move x="30.58" y="0.5"/>
+            <line x="30.58" y="23.7"/>
+            <curve x1="31.88" x2="32.08" x3="33.28" y1="23.9" y2="24.1" y3="24.3"/>
+            <line x="33.28" y="0"/>
+            <curve x1="32.08" x2="31.88" x3="30.58" y1="0.1" y2="0.3" y3="0.5"/>
+            <close/>
+            <move x="25.24" y="1.35"/>
+            <line x="25.24" y="22.75"/>
+            <curve x1="26.54" x2="27.94" x3="29.24" y1="22.95" y2="23.15" y3="23.35"/>
+            <line x="29.24" y="0.85"/>
+            <curve x1="27.94" x2="26.54" x3="25.24" y1="1.05" y2="1.25" y3="1.35"/>
+            <close/>
+        </path>
+        <fillstroke/>
+    </foreground>
+</shape>
+<shape aspect="variable" h="32" name="Data Lake" strokewidth="inherit" w="24.8">
+    <connections>
+        <constraint name="N" perimeter="0" x="0.5" y="0"/>
+        <constraint name="S" perimeter="0" x="0.5" y="1"/>
+        <constraint name="W" perimeter="0" x="0" y="0.5"/>
+        <constraint name="E" perimeter="0" x="1" y="0.5"/>
+        <constraint name="NE" perimeter="0" x="1" y="0.15"/>
+        <constraint name="NW" perimeter="0" x="0" y="0.15"/>
+        <constraint name="SE" perimeter="0" x="1" y="0.86"/>
+        <constraint name="SW" perimeter="0" x="0" y="0.86"/>
+    </connections>
+    <foreground>
+        <path>
+            <move x="12.3" y="0"/>
+            <curve x1="5.5" x2="0" x3="0" y1="0" y2="2.3" y3="4.7"/>
+            <line x="0" y="13.4"/>
+            <line x="0" y="17.2"/>
+            <curve x1="0.9" x2="2.1" x3="3.4" y1="18" y2="18.5" y3="18.5"/>
+            <curve x1="5.3" x2="7" x3="7.9" y1="18.5" y2="17.4" y3="15.8"/>
+            <curve x1="8.8" x2="10.4" x3="12.4" y1="17.4" y2="18.5" y3="18.5"/>
+            <curve x1="14.4" x2="16" x3="16.9" y1="18.5" y2="17.4" y3="15.8"/>
+            <curve x1="17.8" x2="19.4" x3="21.4" y1="17.4" y2="18.5" y3="18.5"/>
+            <curve x1="22.7" x2="23.9" x3="24.8" y1="18.5" y2="18" y3="17.2"/>
+            <line x="24.8" y="13.4"/>
+            <line x="24.8" y="4.9"/>
+            <curve x1="24.6" x2="19.1" x3="12.3" y1="2.4" y2="0" y3="0"/>
+            <close/>
+            <move x="12.3" y="1.8"/>
+            <curve x1="17.1" x2="21.1" x3="21.1" y1="1.8" y2="3" y3="4.4"/>
+            <curve x1="21.1" x2="17.1" x3="12.3" y1="5.8" y2="7" y3="7"/>
+            <curve x1="7.5" x2="3.5" x3="3.5" y1="7" y2="5.8" y3="4.4"/>
+            <curve x1="3.5" x2="7.4" x3="12.3" y1="3" y2="1.8" y3="1.8"/>
+            <close/>
+            <move x="16.95" y="17.8"/>
+            <curve x1="16.05" x2="14.45" x3="12.45" y1="19.4" y2="20.5" y3="20.5"/>
+            <curve x1="10.45" x2="8.85" x3="7.95" y1="20.5" y2="19.4" y3="17.8"/>
+            <curve x1="7.05" x2="5.45" x3="3.45" y1="19.4" y2="20.5" y3="20.5"/>
+            <curve x1="2.15" x2="0.95" x3="0.05" y1="20.5" y2="20" y3="19.2"/>
+            <line x="0.05" y="27.1"/>
+            <curve x1="0.15" x2="5.65" x3="12.45" y1="29.7" y2="32" y3="32"/>
+            <curve x1="19.25" x2="24.75" x3="24.75" y1="32" y2="29.8" y3="27.3"/>
+            <line x="24.75" y="19.2"/>
+            <curve x1="23.85" x2="22.65" x3="21.35" y1="20" y2="20.5" y3="20.5"/>
+            <curve x1="19.45" x2="17.75" x3="16.95" y1="20.5" y2="19.4" y3="17.8"/>
+            <close/>
+        </path>
+        <fillstroke/>
+    </foreground>
+</shape>
+<shape aspect="variable" h="24" name="Data Lake Analytics" strokewidth="inherit" w="24">
+    <connections>
+        <constraint name="N" perimeter="0" x="0.4" y="0"/>
+        <constraint name="S" perimeter="0" x="0.5" y="1"/>
+        <constraint name="W" perimeter="0" x="0" y="0.5"/>
+        <constraint name="E" perimeter="0" x="1" y="0.5"/>
+        <constraint name="NE" perimeter="0" x="0.78" y="0.15"/>
+        <constraint name="NW" perimeter="0" x="0" y="0.15"/>
+        <constraint name="SE" perimeter="0" x="1" y="1"/>
+        <constraint name="SW" perimeter="0" x="0" y="0.86"/>
+    </connections>
+    <foreground>
+        <path>
+            <move x="2.7" y="3.3"/>
+            <curve x1="2.7" x2="5.63" x3="9.3" y1="2.25" y2="1.35" y3="1.35"/>
+            <curve x1="12.9" x2="15.9" x3="15.9" y1="1.35" y2="2.25" y3="3.3"/>
+            <curve x1="15.9" x2="12.9" x3="9.3" y1="4.35" y2="5.25" y3="5.25"/>
+            <curve x1="5.7" x2="2.7" x3="2.7" y1="5.25" y2="4.35" y3="3.3"/>
+            <close/>
+            <move x="11.54" y="12.61"/>
+            <curve x1="11.59" x2="11.64" x3="11.69" y1="12.61" y2="12.62" y3="12.62"/>
+            <line x="13.74" y="11.11"/>
+            <curve x1="14.1" x2="15.15" x3="16.39" y1="9.99" y2="9.17" y3="9.17"/>
+            <curve x1="17.34" x2="18.18" x3="18.68" y1="9.17" y2="9.65" y3="10.39"/>
+            <line x="18.68" y="3.67"/>
+            <curve x1="18.53" x2="14.4" x3="9.3" y1="1.8" y2="0" y3="0"/>
+            <curve x1="4.2" x2="0.07" x3="0.07" y1="0" y2="1.72" y3="3.52"/>
+            <line x="0.07" y="12.9"/>
+            <curve x1="0.75" x2="1.65" x3="2.63" y1="13.5" y2="13.87" y3="13.87"/>
+            <curve x1="4.05" x2="5.33" x3="6" y1="13.87" y2="13.05" y3="11.85"/>
+            <curve x1="6.65" x2="7.8" x3="9.22" y1="13.01" y2="13.81" y3="13.86"/>
+            <curve x1="9.72" x2="10.57" x3="11.54" y1="13.11" y2="12.61" y3="12.61"/>
+            <close/>
+            <move x="9.12" y="17.25"/>
+            <line x="9.12" y="16.72"/>
+            <curve x1="8.9" x2="8.77" x3="8.77" y1="16.32" y2="15.87" y3="15.38"/>
+            <curve x1="8.77" x2="8.77" x3="8.77" y1="15.37" y2="15.35" y3="15.34"/>
+            <curve x1="7.52" x2="6.52" x3="5.93" y1="15.17" y2="14.4" y3="13.35"/>
+            <curve x1="5.25" x2="4.05" x3="2.55" y1="14.55" y2="15.37" y3="15.37"/>
+            <curve x1="1.57" x2="0.68" x3="0" y1="15.37" y2="15" y3="14.4"/>
+            <line x="0" y="20.32"/>
+            <curve x1="0.07" x2="4.11" x3="9.12" y1="22.25" y2="23.96" y3="24"/>
+            <line x="9.12" y="17.25"/>
+            <close/>
+            <move x="11" y="24"/>
+            <line x="13.35" y="24"/>
+            <line x="13.35" y="17.25"/>
+            <line x="11" y="17.25"/>
+            <line x="11" y="24"/>
+            <close/>
+            <move x="14.49" y="24"/>
+            <line x="16.84" y="24"/>
+            <line x="16.84" y="15.66"/>
+            <line x="14.49" y="15.66"/>
+            <line x="14.49" y="24"/>
+            <close/>
+            <move x="17.98" y="24"/>
+            <line x="20.34" y="24"/>
+            <line x="20.34" y="18.33"/>
+            <line x="17.98" y="18.33"/>
+            <line x="17.98" y="24"/>
+            <close/>
+            <move x="21.48" y="24"/>
+            <line x="23.83" y="24"/>
+            <line x="23.83" y="16.31"/>
+            <line x="21.48" y="16.31"/>
+            <line x="21.48" y="24"/>
+            <close/>
+            <move x="23.11" y="11.17"/>
+            <curve x1="22.61" x2="22.21" x3="22.21" y1="11.17" y2="11.57" y3="12.07"/>
+            <curve x1="22.21" x2="22.24" x3="22.27" y1="12.17" y2="12.27" y3="12.37"/>
+            <line x="19.4" y="14.88"/>
+            <curve x1="19.26" x2="19.11" x3="18.93" y1="14.79" y2="14.73" y3="14.73"/>
+            <curve x1="18.88" x2="18.82" x3="18.77" y1="14.73" y2="14.75" y3="14.77"/>
+            <line x="17.14" y="12.4"/>
+            <curve x1="17.22" x2="17.28" x3="17.28" y1="12.26" y2="12.11" y3="11.94"/>
+            <curve x1="17.28" x2="16.88" x3="16.38" y1="11.45" y2="11.05" y3="11.05"/>
+            <curve x1="15.89" x2="15.49" x3="15.49" y1="11.05" y2="11.45" y3="11.94"/>
+            <curve x1="15.49" x2="15.51" x3="15.53" y1="12.01" y2="12.06" y3="12.12"/>
+            <line x="12.05" y="14.68"/>
+            <curve x1="11.91" x2="11.73" x3="11.53" y1="14.57" y2="14.49" y3="14.49"/>
+            <curve x1="11.04" x2="10.64" x3="10.64" y1="14.49" y2="14.89" y3="15.38"/>
+            <curve x1="10.64" x2="11.04" x3="11.53" y1="15.88" y2="16.28" y3="16.28"/>
+            <curve x1="12.03" x2="12.43" x3="12.43" y1="16.28" y2="15.88" y3="15.38"/>
+            <curve x1="12.43" x2="12.4" x3="12.39" y1="15.31" y2="15.24" y3="15.17"/>
+            <line x="15.84" y="12.63"/>
+            <curve x1="15.99" x2="16.18" x3="16.38" y1="12.75" y2="12.84" y3="12.84"/>
+            <curve x1="16.49" x2="16.58" x3="16.68" y1="12.84" y2="12.81" y3="12.78"/>
+            <line x="18.25" y="15.07"/>
+            <curve x1="18.12" x2="18.04" x3="18.04" y1="15.22" y2="15.41" y3="15.63"/>
+            <curve x1="18.04" x2="18.44" x3="18.93" y1="16.12" y2="16.52" y3="16.52"/>
+            <curve x1="19.43" x2="19.83" x3="19.83" y1="16.52" y2="16.12" y3="15.63"/>
+            <curve x1="19.83" x2="19.8" x3="19.77" y1="15.53" y2="15.43" y3="15.34"/>
+            <line x="22.66" y="12.82"/>
+            <curve x1="22.79" x2="22.94" x3="23.11" y1="12.9" y2="12.96" y3="12.96"/>
+            <curve x1="23.6" x2="24" x3="24" y1="12.96" y2="12.56" y3="12.07"/>
+            <curve x1="24" x2="23.6" x3="23.11" y1="11.57" y2="11.17" y3="11.17"/>
+            <close/>
+        </path>
+        <fillstroke/>
+    </foreground>
+</shape>
+<shape aspect="variable" h="24" name="Data Lake Store" strokewidth="inherit" w="24">
+    <connections>
+        <constraint name="N" perimeter="0" x="0.4" y="0"/>
+        <constraint name="S" perimeter="0" x="0.5" y="1"/>
+        <constraint name="W" perimeter="0" x="0" y="0.5"/>
+        <constraint name="E" perimeter="0" x="0.98" y="0.54"/>
+        <constraint name="NE" perimeter="0" x="0.78" y="0.15"/>
+        <constraint name="NW" perimeter="0" x="0" y="0.15"/>
+        <constraint name="SE" perimeter="0" x="0.995" y="0.99"/>
+        <constraint name="SW" perimeter="0" x="0" y="0.86"/>
+    </connections>
+    <foreground>
+        <path>
+            <move x="2.7" y="3.3"/>
+            <curve x1="2.7" x2="5.63" x3="9.3" y1="2.25" y2="1.35" y3="1.35"/>
+            <curve x1="12.9" x2="15.9" x3="15.9" y1="1.35" y2="2.25" y3="3.3"/>
+            <curve x1="15.9" x2="12.9" x3="9.3" y1="4.35" y2="5.25" y3="5.25"/>
+            <curve x1="5.7" x2="2.7" x3="2.7" y1="5.25" y2="4.35" y3="3.3"/>
+            <close/>
+            <move x="8.29" y="11.25"/>
+            <line x="8.29" y="9.37"/>
+            <line x="15.36" y="9.37"/>
+            <line x="17" y="11.02"/>
+            <line x="18.68" y="11.02"/>
+            <line x="18.68" y="3.67"/>
+            <curve x1="18.53" x2="14.4" x3="9.3" y1="1.8" y2="0" y3="0"/>
+            <curve x1="4.2" x2="0.08" x3="0.08" y1="0" y2="1.72" y3="3.52"/>
+            <line x="0.08" y="12.9"/>
+            <curve x1="0.75" x2="1.65" x3="2.63" y1="13.5" y2="13.87" y3="13.87"/>
+            <curve x1="4.05" x2="5.33" x3="6" y1="13.87" y2="13.05" y3="11.85"/>
+            <curve x1="6.5" x2="7.3" x3="8.29" y1="12.74" y2="13.43" y3="13.72"/>
+            <line x="8.29" y="11.25"/>
+            <close/>
+            <move x="23.47" y="13.99"/>
+            <line x="23.47" y="12.89"/>
+            <line x="16.23" y="12.89"/>
+            <line x="14.58" y="11.25"/>
+            <line x="10.17" y="11.25"/>
+            <line x="10.17" y="23.34"/>
+            <curve x1="10.17" x2="10.46" x3="10.82" y1="23.71" y2="24" y3="24"/>
+            <line x="23.34" y="24"/>
+            <curve x1="23.71" x2="24" x3="24" y1="24" y2="23.71" y3="23.34"/>
+            <line x="24" y="13.99"/>
+            <line x="23.47" y="13.99"/>
+            <close/>
+            <move x="8.29" y="23.34"/>
+            <line x="8.29" y="15.24"/>
+            <curve x1="7.26" x2="6.44" x3="5.92" y1="14.96" y2="14.27" y3="13.35"/>
+            <curve x1="5.25" x2="4.05" x3="2.55" y1="14.55" y2="15.37" y3="15.37"/>
+            <curve x1="1.58" x2="0.68" x3="0" y1="15.37" y2="15" y3="14.4"/>
+            <line x="0" y="20.32"/>
+            <curve x1="0.07" x2="3.71" x3="8.38" y1="22.16" y2="23.79" y3="23.98"/>
+            <curve x1="8.33" x2="8.29" x3="8.29" y1="23.78" y2="23.56" y3="23.34"/>
+            <close/>
+        </path>
+        <fillstroke/>
+    </foreground>
+</shape>
+<shape aspect="variable" h="34.5" name="Data Services" strokewidth="inherit" w="26.6">
+    <connections>
+        <constraint name="N" perimeter="0" x="0.5" y="0"/>
+        <constraint name="S" perimeter="0" x="0.5" y="1"/>
+        <constraint name="W" perimeter="0" x="0" y="0.5"/>
+        <constraint name="E" perimeter="0" x="1" y="0.5"/>
+        <constraint name="NE" perimeter="0" x="1" y="0.14"/>
+        <constraint name="NW" perimeter="0" x="0" y="0.14"/>
+        <constraint name="SE" perimeter="0" x="1" y="0.86"/>
+        <constraint name="SW" perimeter="0" x="0" y="0.86"/>
+    </connections>
+    <foreground>
+        <path>
+            <move x="13.3" y="7.5"/>
+            <curve x1="8.1" x2="3.8" x3="3.8" y1="7.5" y2="6.2" y3="4.7"/>
+            <curve x1="3.8" x2="8" x3="13.3" y1="3.1" y2="1.9" y3="1.9"/>
+            <curve x1="18.5" x2="22.8" x3="22.8" y1="1.9" y2="3.2" y3="4.7"/>
+            <curve x1="22.8" x2="18.5" x3="13.3" y1="6.3" y2="7.5" y3="7.5"/>
+            <close/>
+            <move x="20.6" y="17.3"/>
+            <curve x1="20.1" x2="19.6" x3="18.9" y1="17.7" y2="17.9" y3="17.9"/>
+            <curve x1="18.5" x2="18.1" x3="17.7" y1="17.9" y2="17.8" y3="17.8"/>
+            <curve x1="17.3" x2="17" x3="16.7" y1="17.7" y2="17.6" y3="17.5"/>
+            <curve x1="16.6" x2="16.4" x3="16.1" y1="17.6" y2="17.8" y3="18.1"/>
+            <curve x1="15.9" x2="15.6" x3="15.2" y1="18.4" y2="18.8" y3="19.2"/>
+            <curve x1="15.5" x2="15.7" x3="15.9" y1="20.4" y2="21.3" y3="21.9"/>
+            <curve x1="16.1" x2="16.2" x3="16.4" y1="22.4" y2="22.9" y3="23.5"/>
+            <curve x1="16.5" x2="16.7" x3="17" y1="23.9" y2="24.3" y3="24.5"/>
+            <curve x1="17.3" x2="17.7" x3="18.3" y1="24.7" y2="24.9" y3="24.9"/>
+            <curve x1="18.5" x2="18.8" x3="19.1" y1="24.9" y2="24.9" y3="24.8"/>
+            <curve x1="19.4" x2="19.7" x3="19.9" y1="24.7" y2="24.6" y3="24.6"/>
+            <line x="19.6" y="25.7"/>
+            <curve x1="18.8" x2="18.1" x3="17.5" y1="26" y2="26.3" y3="26.5"/>
+            <curve x1="16.9" x2="16.4" x3="15.9" y1="26.7" y2="26.7" y3="26.7"/>
+            <curve x1="15.6" x2="15.2" x3="14.9" y1="26.7" y2="26.7" y3="26.6"/>
+            <curve x1="14.6" x2="14.3" x3="14" y1="26.5" y2="26.4" y3="26.3"/>
+            <curve x1="13.7" x2="13.4" x3="13.2" y1="26.1" y2="25.9" y3="25.6"/>
+            <curve x1="13" x2="12.8" x3="12.7" y1="25.3" y2="24.9" y3="24.5"/>
+            <curve x1="12.6" x2="12.5" x3="12.4" y1="24.2" y2="23.8" y3="23.5"/>
+            <curve x1="12.3" x2="12.2" x3="12.1" y1="23.1" y2="22.8" y3="22.5"/>
+            <line x="11.6" y="23.3"/>
+            <line x="11.1" y="24"/>
+            <curve x1="10.4" x2="9.9" x3="9.4" y1="25" y2="25.7" y3="26.1"/>
+            <curve x1="8.9" x2="8.4" x3="7.7" y1="26.5" y2="26.7" y3="26.7"/>
+            <curve x1="7.2" x2="6.8" x3="6.4" y1="26.7" y2="26.5" y3="26.2"/>
+            <curve x1="6.1" x2="5.9" x3="5.9" y1="25.9" y2="25.4" y3="24.9"/>
+            <curve x1="5.9" x2="6.1" x3="6.6" y1="24.2" y2="23.6" y3="23.2"/>
+            <curve x1="7.1" x2="7.6" x3="8.3" y1="22.8" y2="22.6" y3="22.6"/>
+            <curve x1="8.7" x2="9.1" x3="9.4" y1="22.6" y2="22.6" y3="22.7"/>
+            <curve x1="9.8" x2="10.1" x3="10.4" y1="22.8" y2="22.9" y3="23"/>
+            <curve x1="10.5" x2="10.7" x3="11" y1="22.9" y2="22.7" y3="22.4"/>
+            <curve x1="11.2" x2="11.5" x3="11.8" y1="22.1" y2="21.7" y3="21.3"/>
+            <curve x1="11.5" x2="11.3" x3="11.1" y1="20.2" y2="19.4" y3="18.8"/>
+            <line x="10.6" y="17.1"/>
+            <curve x1="10.5" x2="10.2" x3="10" y1="16.7" y2="16.3" y3="16.1"/>
+            <curve x1="9.7" x2="9.3" x3="8.7" y1="15.9" y2="15.7" y3="15.7"/>
+            <curve x1="8.5" x2="8.2" x3="7.9" y1="15.7" y2="15.7" y3="15.8"/>
+            <curve x1="7.6" x2="7.4" x3="7.1" y1="15.9" y2="16" y3="16"/>
+            <line x="7.4" y="14.9"/>
+            <curve x1="8.1" x2="8.8" x3="9.5" y1="14.6" y2="14.3" y3="14.2"/>
+            <curve x1="10.2" x2="10.7" x3="11.2" y1="14" y2="14" y3="14"/>
+            <curve x1="11.6" x2="11.9" x3="12.2" y1="14" y2="14" y3="14.1"/>
+            <curve x1="12.5" x2="12.8" x3="13.1" y1="14.2" y2="14.3" y3="14.5"/>
+            <curve x1="13.4" x2="13.6" x3="13.9" y1="14.7" y2="14.9" y3="15.2"/>
+            <curve x1="14.1" x2="14.3" x3="14.4" y1="15.5" y2="15.9" y3="16.3"/>
+            <curve x1="14.5" x2="14.6" x3="14.7" y1="16.6" y2="17" y3="17.3"/>
+            <line x="14.9" y="18.2"/>
+            <line x="15.4" y="17.4"/>
+            <curve x1="15.6" x2="15.7" x3="15.9" y1="17.1" y2="16.9" y3="16.7"/>
+            <curve x1="16.5" x2="17.1" x3="17.6" y1="15.7" y2="15" y3="14.6"/>
+            <curve x1="18.1" x2="18.7" x3="19.3" y1="14.2" y2="14" y3="14"/>
+            <curve x1="19.8" x2="20.2" x3="20.6" y1="14" y2="14.2" y3="14.5"/>
+            <curve x1="20.9" x2="21.1" x3="21.1" y1="14.8" y2="15.3" y3="15.8"/>
+            <curve x1="21.3" x2="21" x3="20.6" y1="16.3" y2="16.8" y3="17.3"/>
+            <close/>
+            <move x="13.3" y="0"/>
+            <curve x1="6" x2="0" x3="0" y1="0" y2="2.4" y3="5.1"/>
+            <line x="0" y="29.3"/>
+            <curve x1="0" x2="5.9" x3="13.3" y1="32" y2="34.5" y3="34.5"/>
+            <curve x1="20.6" x2="26.6" x3="26.6" y1="34.5" y2="32.1" y3="29.4"/>
+            <line x="26.6" y="5.2"/>
+            <curve x1="26.6" x2="20.6" x3="13.3" y1="2.6" y2="0" y3="0"/>
+            <close/>
+        </path>
+        <fillstroke/>
+    </foreground>
+</shape>
+<shape aspect="variable" h="123.32" name="Poster Arrow" strokewidth="inherit" w="49.01">
+    <connections>
+        <constraint name="N" perimeter="0" x="0.47" y="0"/>
+        <constraint name="S" perimeter="0" x="0.5" y="1"/>
+        <constraint name="W" perimeter="0" x="0.37" y="0.5"/>
+        <constraint name="E" perimeter="0" x="0.58" y="0.5"/>
+        <constraint name="SE" perimeter="0" x="1" y="0.78"/>
+        <constraint name="SW" perimeter="0" x="0" y="0.78"/>
+    </connections>
+    <foreground>
+        <path>
+            <move x="24.68" y="123.32"/>
+            <line x="0" y="96.84"/>
+            <line x="0" y="80.79"/>
+            <line x="18.26" y="100.74"/>
+            <line x="18.26" y="0"/>
+            <line x="28.3" y="0"/>
+            <line x="28.3" y="100.74"/>
+            <line x="49.01" y="80.79"/>
+            <line x="49.01" y="96.84"/>
+            <close/>
+        </path>
+        <fillstroke/>
+    </foreground>
+</shape>
+<shape aspect="variable" h="32" name="SQL Data Warehouse" strokewidth="inherit" w="28.2">
+    <connections>
+        <constraint name="N" perimeter="0" x="0.5" y="0"/>
+        <constraint name="S" perimeter="0" x="0.5" y="1"/>
+        <constraint name="W" perimeter="0" x="0" y="0.5"/>
+        <constraint name="E" perimeter="0" x="1" y="0.5"/>
+        <constraint name="NE" perimeter="0" x="1" y="0.26"/>
+        <constraint name="NW" perimeter="0" x="0" y="0.26"/>
+        <constraint name="SE" perimeter="0" x="1" y="1"/>
+        <constraint name="SW" perimeter="0" x="0" y="1"/>
+    </connections>
+    <foreground>
+        <path>
+            <move x="14.6" y="19.4"/>
+            <curve x1="14.1" x2="13.8" x3="13.6" y1="19.4" y2="19.6" y3="19.9"/>
+            <curve x1="13.3" x2="13.2" x3="13.2" y1="20.3" y2="20.7" y3="21.2"/>
+            <curve x1="13.2" x2="13.3" x3="13.6" y1="21.7" y2="22.2" y3="22.5"/>
+            <curve x1="13.9" x2="14.1" x3="14.6" y1="22.9" y2="23" y3="23"/>
+            <curve x1="15.1" x2="15.4" x3="15.6" y1="23" y2="22.8" y3="22.5"/>
+            <curve x1="15.9" x2="16" x3="16" y1="22.2" y2="21.7" y3="21.2"/>
+            <curve x1="16" x2="15.9" x3="15.6" y1="20.7" y2="20.2" y3="19.9"/>
+            <curve x1="15.4" x2="15.1" x3="14.6" y1="19.6" y2="19.4" y3="19.4"/>
+            <close/>
+            <move x="14.1" y="7.8"/>
+            <curve x1="8.9" x2="4.9" x3="4.9" y1="7.8" y2="9.6" y3="11.4"/>
+            <line x="4.9" y="28.2"/>
+            <curve x1="4.9" x2="9" x3="14.1" y1="30.2" y2="32" y3="32"/>
+            <curve x1="19.2" x2="23.3" x3="23.3" y1="32" y2="30.3" y3="28.4"/>
+            <line x="23.3" y="11.6"/>
+            <curve x1="23.3" x2="19.3" x3="14.1" y1="9.6" y2="7.8" y3="7.8"/>
+            <close/>
+            <move x="14.2" y="9.1"/>
+            <curve x1="17.8" x2="20.8" x3="20.8" y1="9.1" y2="10" y3="11.2"/>
+            <curve x1="20.8" x2="17.8" x3="14.2" y1="12.4" y2="13.3" y3="13.3"/>
+            <curve x1="10.6" x2="7.6" x3="7.6" y1="13.3" y2="12.4" y3="11.2"/>
+            <curve x1="7.6" x2="10.6" x3="14.2" y1="10" y2="9.1" y3="9.1"/>
+            <close/>
+            <move x="10.7" y="23.7"/>
+            <curve x1="10.3" x2="9.8" x3="9.1" y1="24" y2="24.2" y3="24.2"/>
+            <curve x1="8.6" x2="7.9" x3="7.6" y1="24.2" y2="24.1" y3="23.9"/>
+            <line x="7.6" y="22.7"/>
+            <curve x1="8" x2="8.5" x3="9.1" y1="23.1" y2="23.2" y3="23.2"/>
+            <curve x1="9.4" x2="9.6" x3="9.6" y1="23.2" y2="23.1" y3="23"/>
+            <curve x1="9.8" x2="9.8" x3="9.8" y1="22.9" y2="22.7" y3="22.6"/>
+            <curve x1="9.8" x2="9.7" x3="9.6" y1="22.4" y2="22.3" y3="22.1"/>
+            <curve x1="9.5" x2="9.2" x3="8.8" y1="22" y2="21.8" y3="21.6"/>
+            <curve x1="8" x2="7.5" x3="7.5" y1="21.2" y2="20.7" y3="19.9"/>
+            <curve x1="7.5" x2="7.7" x3="8" y1="19.4" y2="19" y3="18.7"/>
+            <curve x1="8.3" x2="8.8" x3="9.5" y1="18.4" y2="18.2" y3="18.2"/>
+            <curve x1="10" x2="10.4" x3="10.8" y1="18.2" y2="18.3" y3="18.4"/>
+            <line x="10.8" y="19.6"/>
+            <curve x1="10.4" x2="10" x3="9.5" y1="19.3" y2="19.2" y3="19.2"/>
+            <curve x1="9.2" x2="9" x3="9" y1="19.2" y2="19.3" y3="19.4"/>
+            <curve x1="8.8" x2="8.8" x3="8.8" y1="19.5" y2="19.7" y3="19.8"/>
+            <curve x1="8.8" x2="8.9" x3="9" y1="20" y2="20.1" y3="20.3"/>
+            <curve x1="9.1" x2="9.4" x3="9.8" y1="20.4" y2="20.6" y3="20.8"/>
+            <curve x1="10.3" x2="10.7" x3="11" y1="21.1" y2="21.3" y3="21.6"/>
+            <curve x1="11.3" x2="11.4" x3="11.4" y1="21.9" y2="22.1" y3="22.5"/>
+            <curve x1="11.3" x2="11.1" x3="10.7" y1="23" y2="23.4" y3="23.7"/>
+            <close/>
+            <move x="17.2" y="25.4"/>
+            <line x="15.5" y="25.4"/>
+            <line x="14.3" y="24.1"/>
+            <curve x1="13.8" x2="13.4" x3="13" y1="24.1" y2="24" y3="23.7"/>
+            <curve x1="12.6" x2="12.2" x3="12.1" y1="23.4" y2="23.2" y3="22.7"/>
+            <curve x1="12" x2="11.7" x3="11.7" y1="22.2" y2="21.8" y3="21.3"/>
+            <curve x1="11.7" x2="11.8" x3="12.1" y1="20.8" y2="20.1" y3="19.7"/>
+            <curve x1="12.4" x2="12.6" x3="13.1" y1="19.2" y2="18.9" y3="18.7"/>
+            <curve x1="13.6" x2="14" x3="14.6" y1="18.4" y2="18.3" y3="18.3"/>
+            <curve x1="15.2" x2="15.5" x3="16" y1="18.3" y2="18.4" y3="18.7"/>
+            <curve x1="16.4" x2="16.8" x3="16.9" y1="19" y2="19.2" y3="19.7"/>
+            <curve x1="17.1" x2="17.3" x3="17.3" y1="20.2" y2="20.6" y3="21.2"/>
+            <curve x1="17.3" x2="17.1" x3="16.8" y1="21.9" y2="22.4" y3="22.9"/>
+            <curve x1="16.5" x2="16" x3="15.5" y1="23.4" y2="23.7" y3="23.9"/>
+            <line x="17.2" y="25.4"/>
+            <close/>
+            <move x="21.5" y="24.1"/>
+            <line x="18.1" y="24.1"/>
+            <line x="18.1" y="18.4"/>
+            <line x="19.4" y="18.4"/>
+            <line x="19.4" y="23"/>
+            <line x="21.5" y="23"/>
+            <line x="21.5" y="24.1"/>
+            <line x="21.5" y="24.1"/>
+            <close/>
+            <move x="26.2" y="9.4"/>
+            <line x="14.1" y="2.3"/>
+            <line x="2" y="9.4"/>
+            <line x="2" y="32"/>
+            <line x="0" y="32"/>
+            <line x="0" y="8.2"/>
+            <line x="14.1" y="0"/>
+            <line x="28.2" y="8.2"/>
+            <line x="28.2" y="32"/>
+            <line x="26.2" y="32"/>
+            <close/>
+        </path>
+        <fillstroke/>
+    </foreground>
+</shape>
+<shape aspect="variable" h="32" name="SQL Server Stretch DB" strokewidth="inherit" w="32">
+    <connections>
+        <constraint name="N" perimeter="0" x="0.5" y="0"/>
+        <constraint name="S" perimeter="0" x="0.5" y="1"/>
+        <constraint name="W" perimeter="0" x="0.09" y="0.5"/>
+        <constraint name="E" perimeter="0" x="0.91" y="0.5"/>
+        <constraint name="NE" perimeter="0" x="1" y="0.15"/>
+        <constraint name="NW" perimeter="0" x="0" y="0.15"/>
+        <constraint name="SE" perimeter="0" x="0.995" y="0.875"/>
+        <constraint name="SW" perimeter="0" x="0.01" y="0.875"/>
+    </connections>
+    <foreground>
+        <path>
+            <move x="16" y="14.9"/>
+            <curve x1="15.5" x2="15.1" x3="14.8" y1="14.9" y2="15.1" y3="15.5"/>
+            <curve x1="14.5" x2="14.3" x3="14.3" y1="15.9" y2="16.4" y3="17"/>
+            <curve x1="14.3" x2="14.4" x3="14.7" y1="17.6" y2="18.1" y3="18.5"/>
+            <curve x1="15" x2="15.4" x3="15.9" y1="18.9" y2="19.1" y3="19.1"/>
+            <curve x1="16.4" x2="16.8" x3="17.1" y1="19.1" y2="18.9" y3="18.6"/>
+            <curve x1="17.4" x2="17.5" x3="17.5" y1="18.2" y2="17.7" y3="17.1"/>
+            <curve x1="17.5" x2="17.4" x3="17.1" y1="16.4" y2="15.9" y3="15.6"/>
+            <curve x1="16.9" x2="16.5" x3="16" y1="15.1" y2="14.9" y3="14.9"/>
+            <close/>
+            <move x="32" y="4.8"/>
+            <curve x1="31.9" x2="24.9" x3="16" y1="2.3" y2="0" y3="0"/>
+            <curve x1="7" x2="0" x3="0" y1="0" y2="2.3" y3="4.7"/>
+            <curve x1="0.1" x2="0.1" x3="0.2" y1="4.9" y2="5" y3="5.2"/>
+            <curve x1="1.9" x2="3" x3="3" y1="8.3" y2="12.3" y3="16.6"/>
+            <curve x1="3" x2="2" x3="0.3" y1="20.9" y2="24.8" y3="27.9"/>
+            <curve x1="1.5" x2="8.1" x3="16.1" y1="30.2" y2="32" y3="32"/>
+            <curve x1="24.1" x2="30.7" x3="31.9" y1="32" y2="30.2" y3="28"/>
+            <curve x1="30.2" x2="29.1" x3="29.1" y1="24.9" y2="20.9" y3="16.6"/>
+            <curve x1="29" x2="30.1" x3="32" y1="12.1" y2="8" y3="4.8"/>
+            <close/>
+            <move x="11.5" y="19.8"/>
+            <curve x1="11.1" x2="10.4" x3="9.7" y1="20.1" y2="20.3" y3="20.3"/>
+            <curve x1="9" x2="8.5" x3="8" y1="20.3" y2="20.2" y3="19.9"/>
+            <line x="8" y="18.5"/>
+            <curve x1="8.5" x2="9.1" x3="9.7" y1="18.9" y2="19.2" y3="19.2"/>
+            <curve x1="10" x2="10.2" x3="10.4" y1="19.2" y2="19.1" y3="19"/>
+            <curve x1="10.6" x2="10.6" x3="10.6" y1="18.9" y2="18.7" y3="18.5"/>
+            <curve x1="10.6" x2="10.5" x3="10.4" y1="18.3" y2="18.1" y3="18"/>
+            <curve x1="10.2" x2="9.9" x3="9.4" y1="17.9" y2="17.7" y3="17.4"/>
+            <curve x1="8.4" x2="7.9" x3="7.9" y1="16.9" y2="16.3" y3="15.5"/>
+            <curve x1="7.9" x2="8.1" x3="8.5" y1="14.9" y2="14.5" y3="14.1"/>
+            <curve x1="8.9" x2="9.5" x3="10.2" y1="13.8" y2="13.6" y3="13.6"/>
+            <curve x1="10.8" x2="11.3" x3="11.8" y1="13.6" y2="13.7" y3="13.8"/>
+            <line x="11.8" y="15.1"/>
+            <curve x1="11.4" x2="10.9" x3="10.3" y1="14.8" y2="14.7" y3="14.7"/>
+            <curve x1="10" x2="9.8" x3="9.6" y1="14.7" y2="14.8" y3="14.9"/>
+            <curve x1="9.4" x2="9.4" x3="9.4" y1="15" y2="15.2" y3="15.4"/>
+            <curve x1="9.4" x2="9.5" x3="9.6" y1="15.6" y2="15.8" y3="15.9"/>
+            <curve x1="9.7" x2="10" x3="10.4" y1="16" y2="16.2" y3="16.4"/>
+            <curve x1="11" x2="11.4" x3="11.7" y1="16.7" y2="17" y3="17.3"/>
+            <curve x1="12" x2="12.1" x3="12.1" y1="17.6" y2="18" y3="18.4"/>
+            <curve x1="12.2" x2="12" x3="11.5" y1="19" y2="19.5" y3="19.8"/>
+            <close/>
+            <move x="19" y="21.8"/>
+            <line x="17.1" y="21.8"/>
+            <line x="15.8" y="20.3"/>
+            <curve x1="15.2" x2="14.7" x3="14.3" y1="20.3" y2="20.1" y3="19.8"/>
+            <curve x1="13.8" x2="13.5" x3="13.2" y1="19.5" y2="19.1" y3="18.6"/>
+            <curve x1="12.9" x2="12.8" x3="12.8" y1="18.1" y2="17.6" y3="17"/>
+            <curve x1="12.8" x2="12.9" x3="13.2" y1="16.3" y2="15.7" y3="15.2"/>
+            <curve x1="13.5" x2="13.9" x3="14.3" y1="14.7" y2="14.3" y3="14"/>
+            <curve x1="14.8" x2="15.4" x3="16" y1="13.7" y2="13.6" y3="13.6"/>
+            <curve x1="16.6" x2="17.1" x3="17.6" y1="13.6" y2="13.7" y3="14"/>
+            <curve x1="18.1" x2="18.4" x3="18.7" y1="14.3" y2="14.7" y3="15.2"/>
+            <curve x1="19" x2="19.1" x3="19.1" y1="15.7" y2="16.3" y3="16.9"/>
+            <curve x1="19.1" x2="18.9" x3="18.6" y1="17.7" y2="18.3" y3="18.9"/>
+            <curve x1="18.3" x2="17.8" x3="17.1" y1="19.5" y2="19.8" y3="20.1"/>
+            <line x="19" y="21.8"/>
+            <close/>
+            <move x="24" y="20.2"/>
+            <line x="20.2" y="20.2"/>
+            <line x="20.2" y="13.8"/>
+            <line x="21.6" y="13.8"/>
+            <line x="21.6" y="19.1"/>
+            <line x="24" y="19.1"/>
+            <curve x1="24" x2="24" x3="24" y1="19" y2="20.2" y3="20.2"/>
+            <close/>
+            <move x="16.1" y="7.1"/>
+            <curve x1="9.8" x2="4.5" x3="4.5" y1="7.1" y2="5.9" y3="4.4"/>
+            <curve x1="4.5" x2="9.7" x3="16.1" y1="2.9" y2="1.7" y3="1.7"/>
+            <curve x1="22.5" x2="27.5" x3="27.5" y1="1.7" y2="2.9" y3="4.4"/>
+            <curve x1="27.5" x2="22.3" x3="16.1" y1="5.9" y2="7.1" y3="7.1"/>
+            <close/>
+        </path>
+        <fillstroke/>
+    </foreground>
+</shape>
 </shapes>

File diff suppressed because it is too large
+ 2150 - 63
src/main/webapp/stencils/mscae/enterprise.xml


File diff suppressed because it is too large
+ 598 - 420
src/main/webapp/stencils/mscae/general.xml


+ 587 - 0
src/main/webapp/stencils/mscae/general_symbols.xml

@@ -0,0 +1,587 @@
+<shapes name="mxgraph.mscae.general_symbols">
+<shape aspect="variable" h="11.9" name="Attachments" strokewidth="inherit" w="7.2">
+    <connections>
+        <constraint name="N" perimeter="0" x="0.38" y="0"/>
+        <constraint name="S" perimeter="0" x="0.5" y="1"/>
+        <constraint name="W" perimeter="0" x="0" y="0.5"/>
+        <constraint name="E" perimeter="0" x="1" y="0.5"/>
+        <constraint name="NE" perimeter="0" x="0.7" y="0.11"/>
+        <constraint name="NW" perimeter="0" x="0.08" y="0.08"/>
+        <constraint name="SE" perimeter="0" x="0.88" y="0.9"/>
+        <constraint name="SW" perimeter="0" x="0.12" y="0.9"/>
+    </connections>
+    <foreground>
+        <path>
+            <move x="3.6" y="11.9"/>
+            <curve x1="1.7" x2="0" x3="0" y1="11.9" y2="10.4" y3="8.6"/>
+            <line x="0" y="2.7"/>
+            <curve x1="0" x2="1.2" x3="2.7" y1="1.2" y2="0" y3="0"/>
+            <curve x1="4.2" x2="5.4" x3="5.4" y1="0" y2="1.2" y3="2.7"/>
+            <line x="5.4" y="7.7"/>
+            <curve x1="5.4" x2="4.6" x3="3.6" y1="8.7" y2="9.5" y3="9.5"/>
+            <curve x1="2.6" x2="1.8" x3="1.8" y1="9.5" y2="8.7" y3="7.7"/>
+            <line x="1.8" y="3.6"/>
+            <line x="3" y="3.6"/>
+            <line x="3" y="7.7"/>
+            <curve x1="3" x2="3.3" x3="3.6" y1="8" y2="8.3" y3="8.3"/>
+            <curve x1="3.9" x2="4.2" x3="4.2" y1="8.3" y2="8.1" y3="7.8"/>
+            <line x="4.2" y="2.8"/>
+            <curve x1="4.2" x2="3.6" x3="2.7" y1="1.9" y2="1.3" y3="1.3"/>
+            <curve x1="1.8" x2="1.3" x3="1.3" y1="1.3" y2="1.9" y3="2.7"/>
+            <line x="1.3" y="8.6"/>
+            <curve x1="1.3" x2="2.6" x3="3.7" y1="9.8" y2="10.7" y3="10.7"/>
+            <curve x1="4.8" x2="6.1" x3="6.1" y1="10.7" y2="9.8" y3="8.6"/>
+            <line x="6.1" y="3.6"/>
+            <line x="7.2" y="3.6"/>
+            <line x="7.2" y="8.6"/>
+            <curve x1="7.2" x2="5.5" x3="3.6" y1="10.4" y2="11.9" y3="11.9"/>
+            <close/>
+        </path>
+        <fillstroke/>
+    </foreground>
+</shape>
+<shape aspect="variable" h="99.94" name="Clock Time" strokewidth="inherit" w="100.01">
+    <connections>
+        <constraint name="N" perimeter="0" x="0.5" y="0.0"/>
+        <constraint name="S" perimeter="0" x="0.5" y="1.0"/>
+        <constraint name="W" perimeter="0" x="0.0" y="0.5"/>
+        <constraint name="E" perimeter="0" x="1.0" y="0.5"/>
+        <constraint name="NE" perimeter="0" x="0.855" y="0.145"/>
+        <constraint name="NW" perimeter="0" x="0.145" y="0.145"/>
+        <constraint name="SE" perimeter="0" x="0.855" y="0.855"/>
+        <constraint name="SW" perimeter="0" x="0.145" y="0.855"/>
+    </connections>
+    <foreground>
+        <path>
+            <move x="54.63" y="50.46"/>
+            <line x="66.64" y="62.82"/>
+            <curve x1="68.44" x2="68.53" x3="66.14" y1="64.66" y2="67.34" y3="68.97"/>
+            <curve x1="63.72" x2="61.16" x3="58.5" y1="70.7" y2="70.04" y3="67.84"/>
+            <line x="43.54" y="53.41"/>
+            <line x="43.54" y="31.19"/>
+            <curve x1="43.57" x2="46.9" x3="48.96" y1="28.49" y2="27.12" y3="27.12"/>
+            <curve x1="51.13" x2="54.63" x3="54.63" y1="27.12" y2="28.69" y3="31.35"/>
+            <close/>
+            <move x="85.99" y="46.44"/>
+            <curve x1="87.81" x2="89.59" x3="89.59" y1="46.44" y2="48.01" y3="50.1"/>
+            <curve x1="89.59" x2="88.39" x3="85.8" y1="51.62" y2="53.6" y3="53.6"/>
+            <curve x1="84.31" x2="82.3" x3="82.3" y1="53.6" y2="52.16" y3="50.0"/>
+            <curve x1="82.3" x2="83.97" x3="85.99" y1="48.13" y2="46.44" y3="46.44"/>
+            <close/>
+            <move x="49.96" y="17.93"/>
+            <curve x1="48.17" x2="46.34" x3="46.34" y1="17.93" y2="16.31" y3="14.38"/>
+            <curve x1="46.34" x2="47.89" x3="50.15" y1="12.31" y2="10.69" y3="10.69"/>
+            <curve x1="51.98" x2="53.7" x3="53.69" y1="10.69" y2="12.28" y3="14.43"/>
+            <curve x1="53.69" x2="51.6" x3="49.96" y1="16.6" y2="17.93" y3="17.93"/>
+            <close/>
+            <move x="13.92" y="53.7"/>
+            <curve x1="12.0" x2="10.42" x3="10.42" y1="53.7" y2="51.88" y3="50.0"/>
+            <curve x1="10.42" x2="12.25" x3="14.11" y1="47.88" y2="46.47" y3="46.47"/>
+            <curve x1="16.01" x2="17.74" x3="17.74" y1="46.47" y2="47.89" y3="50.13"/>
+            <curve x1="17.74" x2="16.28" x3="13.92" y1="51.78" y2="53.7" y3="53.7"/>
+            <close/>
+            <move x="50.08" y="89.42"/>
+            <curve x1="48.6" x2="46.37" x3="46.37" y1="89.42" y2="88.24" y3="85.76"/>
+            <curve x1="46.37" x2="48.58" x3="50.01" y1="83.54" y2="82.15" y3="82.15"/>
+            <curve x1="52.43" x2="53.59" x3="53.59" y1="82.15" y2="84.04" y3="85.87"/>
+            <curve x1="53.59" x2="51.7" x3="50.08" y1="88.16" y2="89.42" y3="89.42"/>
+            <close/>
+            <move x="49.75" y="96.34"/>
+            <curve x1="75.75" x2="95.92" x3="95.92" y1="96.34" y2="75.45" y3="49.63"/>
+            <curve x1="95.92" x2="76.26" x3="49.75" y1="25.49" y2="4.04" y3="4.04"/>
+            <curve x1="21.53" x2="3.85" x3="3.85" y1="4.04" y2="28.61" y3="49.43"/>
+            <curve x1="3.85" x2="24.22" x3="49.75" y1="75.59" y2="96.34" y3="96.34"/>
+            <close/>
+            <move x="49.72" y="99.94"/>
+            <curve x1="24.31" x2="0.0" x3="0.0" y1="99.94" y2="80.67" y3="48.55"/>
+            <curve x1="0.0" x2="23.71" x3="49.5" y1="22.54" y2="0.0" y3="0.0"/>
+            <curve x1="78.42" x2="100.01" x3="100.01" y1="0.0" y2="23.92" y3="49.09"/>
+            <curve x1="100.01" x2="78.59" x3="49.72" y1="77.47" y2="99.94" y3="99.94"/>
+            <close/>
+        </path>
+        <fillstroke/>
+    </foreground>
+</shape>
+<shape aspect="variable" h="12.7" name="Ellipses" strokewidth="inherit" w="99.94">
+    <connections>
+        <constraint name="N" perimeter="0" x="0.5" y="0.01"/>
+        <constraint name="S" perimeter="0" x="0.5" y="1.0"/>
+        <constraint name="W" perimeter="0" x="0.0" y="0.5"/>
+        <constraint name="E" perimeter="0" x="1.0" y="0.5"/>
+        <constraint name="NE" perimeter="0" x="0.93" y="0.01"/>
+        <constraint name="NW" perimeter="0" x="0.07" y="0.0"/>
+        <constraint name="SE" perimeter="0" x="0.93" y="0.99"/>
+        <constraint name="SW" perimeter="0" x="0.07" y="0.99"/>
+    </connections>
+    <foreground>
+        <path>
+            <move x="92.8" y="12.65"/>
+            <curve x1="88.82" x2="85.74" x3="85.74" y1="12.65" y2="9.66" y3="6.23"/>
+            <curve x1="85.74" x2="88.28" x3="93.07" y1="3.28" y2="0.13" y3="0.13"/>
+            <curve x1="97.12" x2="99.89" x3="99.94" y1="0.13" y2="2.56" y3="6.53"/>
+            <curve x1="99.94" x2="96.95" x3="92.8" y1="9.88" y2="12.68" y3="12.65"/>
+            <close/>
+            <move x="49.98" y="12.7"/>
+            <curve x1="47.24" x2="42.84" x3="42.84" y1="12.7" y2="10.62" y3="6.43"/>
+            <curve x1="42.84" x2="45.92" x3="49.98" y1="2.96" y2="0.08" y3="0.08"/>
+            <curve x1="54.04" x2="56.99" x3="56.99" y1="0.08" y2="2.56" y3="6.43"/>
+            <curve x1="56.99" x2="53.28" x3="49.98" y1="10.61" y2="12.7" y3="12.7"/>
+            <close/>
+            <move x="6.92" y="12.64"/>
+            <curve x1="3.99" x2="0.21" x3="0.0" y1="12.64" y2="10.86" y3="6.35"/>
+            <curve x1="0.0" x2="3.41" x3="6.92" y1="2.76" y2="0.0" y3="0.0"/>
+            <curve x1="10.97" x2="14.15" x3="14.15" y1="0.0" y2="2.71" y3="6.35"/>
+            <curve x1="14.15" x2="11.19" x3="6.92" y1="9.94" y2="12.64" y3="12.64"/>
+            <close/>
+        </path>
+        <fillstroke/>
+    </foreground>
+</shape>
+<shape aspect="variable" h="20.0" name="Favorite" strokewidth="inherit" w="14.0">
+    <connections>
+        <constraint name="N" perimeter="0" x="0.5" y="0.0"/>
+        <constraint name="S" perimeter="0" x="0.5" y="0.75"/>
+        <constraint name="W" perimeter="0" x="0.0" y="0.5"/>
+        <constraint name="E" perimeter="0" x="1.0" y="0.5"/>
+        <constraint name="NE" perimeter="0" x="1.0" y="0.0"/>
+        <constraint name="NW" perimeter="0" x="0.0" y="0.0"/>
+        <constraint name="SE" perimeter="0" x="1.0" y="1.0"/>
+        <constraint name="SW" perimeter="0" x="0.0" y="1.0"/>
+    </connections>
+    <foreground>
+        <path>
+            <move x="0.0" y="0.0"/>
+            <line x="0.0" y="20.0"/>
+            <line x="7.0" y="15.0"/>
+            <line x="14.0" y="20.0"/>
+            <line x="14.0" y="0.0"/>
+            <line x="0.0" y="0.0"/>
+            <close/>
+            <move x="10.71" y="13.21"/>
+            <line x="7.0" y="10.63"/>
+            <line x="3.29" y="13.21"/>
+            <line x="4.6" y="8.88"/>
+            <line x="1.0" y="6.15"/>
+            <line x="5.52" y="6.06"/>
+            <line x="7.0" y="1.79"/>
+            <line x="8.48" y="6.06"/>
+            <line x="13.0" y="6.15"/>
+            <line x="9.4" y="8.88"/>
+            <line x="10.71" y="13.21"/>
+            <close/>
+        </path>
+        <fillstroke/>
+    </foreground>
+</shape>
+<shape aspect="variable" h="44.62" name="Gears" strokewidth="inherit" w="53.28">
+    <connections>
+        <constraint name="N" perimeter="0" x="0.5" y="0.32"/>
+        <constraint name="S" perimeter="0" x="0.5" y="0.9"/>
+        <constraint name="W" perimeter="0" x="0.08" y="0.5"/>
+        <constraint name="E" perimeter="0" x="1.0" y="0.56"/>
+        <constraint name="NW" perimeter="0" x="0.07" y="0.08"/>
+        <constraint name="SE" perimeter="0" x="0.71" y="1.0"/>
+    </connections>
+    <foreground>
+        <path>
+            <move x="35.78" y="32.92"/>
+            <curve x1="32.68" x2="30.18" x3="30.18" y1="32.92" y2="30.42" y3="27.32"/>
+            <curve x1="30.18" x2="32.68" x3="35.78" y1="24.22" y2="21.72" y3="21.72"/>
+            <curve x1="38.88" x2="41.28" x3="41.28" y1="21.72" y2="24.22" y3="27.32"/>
+            <curve x1="41.38" x2="38.88" x3="35.78" y1="30.42" y2="32.92" y3="32.92"/>
+            <close/>
+            <move x="46.68" y="13.52"/>
+            <line x="42.18" y="15.82"/>
+            <line x="39.48" y="14.72"/>
+            <line x="37.78" y="9.92"/>
+            <line x="33.78" y="9.92"/>
+            <line x="32.28" y="14.72"/>
+            <line x="29.48" y="15.82"/>
+            <line x="24.88" y="13.62"/>
+            <line x="22.08" y="16.42"/>
+            <line x="24.38" y="20.92"/>
+            <line x="23.28" y="23.62"/>
+            <line x="18.48" y="25.32"/>
+            <line x="18.48" y="29.32"/>
+            <line x="23.28" y="30.92"/>
+            <line x="24.48" y="33.62"/>
+            <line x="22.28" y="38.22"/>
+            <line x="25.08" y="41.02"/>
+            <line x="29.58" y="38.72"/>
+            <line x="32.28" y="39.82"/>
+            <line x="33.98" y="44.62"/>
+            <line x="37.98" y="44.62"/>
+            <line x="39.58" y="39.82"/>
+            <line x="42.28" y="38.72"/>
+            <line x="46.88" y="40.92"/>
+            <line x="49.68" y="38.12"/>
+            <line x="47.38" y="33.62"/>
+            <line x="48.48" y="30.82"/>
+            <line x="53.28" y="29.12"/>
+            <line x="53.28" y="25.12"/>
+            <line x="48.48" y="23.52"/>
+            <line x="47.38" y="20.82"/>
+            <line x="49.58" y="16.22"/>
+            <line x="46.68" y="13.52"/>
+            <close/>
+            <move x="12.4" y="16.3"/>
+            <curve x1="10.2" x2="8.4" x3="8.4" y1="16.3" y2="14.5" y3="12.3"/>
+            <curve x1="8.4" x2="10.2" x3="12.4" y1="10.1" y2="8.4" y3="8.4"/>
+            <curve x1="14.5" x2="16.3" x3="16.3" y1="8.4" y2="10.2" y3="12.3"/>
+            <curve x1="16.3" x2="14.5" x3="12.4" y1="14.5" y2="16.3" y3="16.3"/>
+            <close/>
+            <move x="20.0" y="2.6"/>
+            <line x="16.8" y="4.2"/>
+            <line x="14.9" y="3.4"/>
+            <line x="13.7" y="0.0"/>
+            <line x="10.9" y="0.0"/>
+            <line x="9.8" y="3.4"/>
+            <line x="7.9" y="4.2"/>
+            <line x="4.6" y="2.7"/>
+            <line x="2.6" y="4.7"/>
+            <line x="4.2" y="7.9"/>
+            <line x="3.4" y="9.8"/>
+            <line x="0.0" y="11.0"/>
+            <line x="0.0" y="13.8"/>
+            <line x="3.4" y="14.9"/>
+            <line x="4.2" y="16.8"/>
+            <line x="2.6" y="20.1"/>
+            <line x="4.6" y="22.1"/>
+            <line x="7.8" y="20.5"/>
+            <line x="9.7" y="21.3"/>
+            <line x="10.9" y="24.7"/>
+            <line x="13.7" y="24.7"/>
+            <line x="14.8" y="21.3"/>
+            <line x="16.7" y="20.5"/>
+            <line x="20.0" y="22.0"/>
+            <line x="22.0" y="20.0"/>
+            <line x="20.4" y="16.8"/>
+            <line x="21.2" y="14.8"/>
+            <line x="24.6" y="13.6"/>
+            <line x="24.6" y="10.8"/>
+            <line x="21.2" y="9.7"/>
+            <line x="20.4" y="7.8"/>
+            <line x="22.0" y="4.5"/>
+            <line x="20.0" y="2.6"/>
+            <close/>
+        </path>
+        <fillstroke/>
+    </foreground>
+</shape>
+<shape aspect="variable" h="100.0" name="Num label rotate" strokewidth="inherit" w="100.0">
+    <connections>
+        <constraint name="N" perimeter="0" x="0.5" y="0.0"/>
+        <constraint name="S" perimeter="0" x="0.5" y="1.0"/>
+        <constraint name="W" perimeter="0" x="0.0" y="0.5"/>
+        <constraint name="E" perimeter="0" x="1.0" y="0.5"/>
+        <constraint name="NE" perimeter="0" x="0.855" y="0.145"/>
+        <constraint name="NW" perimeter="0" x="0.145" y="0.145"/>
+        <constraint name="SE" perimeter="0" x="1.0" y="1.0"/>
+        <constraint name="SW" perimeter="0" x="0.145" y="0.855"/>
+    </connections>
+    <foreground>
+        <path>
+            <move x="50.0" y="100.0"/>
+            <arc large-arc-flag="0.0" rx="50.0" ry="50.0" sweep-flag="1.0" x="0.0" x-axis-rotation="0.0" y="50.0"/>
+            <arc large-arc-flag="0.0" rx="50.0" ry="50.0" sweep-flag="1.0" x="50.0" x-axis-rotation="0.0" y="0.0"/>
+            <arc large-arc-flag="0.0" rx="50.0" ry="50.0" sweep-flag="1.0" x="100.0" x-axis-rotation="0.0" y="50.0"/>
+            <line x="100.0" y="100.0"/>
+            <close/>
+        </path>
+        <fillstroke/>
+    </foreground>
+</shape>
+<shape aspect="variable" h="11.4" name="Premium Star" strokewidth="inherit" w="12.0">
+    <connections>
+        <constraint name="N" perimeter="0" x="0.5" y="0.0"/>
+        <constraint name="S" perimeter="0" x="0.5" y="0.775"/>
+        <constraint name="W" perimeter="0" x="0.3" y="0.62"/>
+        <constraint name="E" perimeter="0" x="0.7" y="0.62"/>
+        <constraint name="NE" perimeter="0" x="1.0" y="0.385"/>
+        <constraint name="NW" perimeter="0" x="0.0" y="0.385"/>
+        <constraint name="SE" perimeter="0" x="0.81" y="1.0"/>
+        <constraint name="SW" perimeter="0" x="0.19" y="1.0"/>
+    </connections>
+    <foreground>
+        <path>
+            <move x="9.7" y="11.4"/>
+            <line x="6.0" y="8.8"/>
+            <line x="2.3" y="11.4"/>
+            <line x="3.6" y="7.1"/>
+            <line x="0.0" y="4.4"/>
+            <line x="4.5" y="4.3"/>
+            <line x="6.0" y="0.0"/>
+            <line x="7.5" y="4.3"/>
+            <line x="12.0" y="4.4"/>
+            <line x="8.4" y="7.1"/>
+            <line x="9.7" y="11.4"/>
+            <close/>
+        </path>
+        <fillstroke/>
+    </foreground>
+</shape>
+<shape aspect="variable" h="29.92" name="Slider Bar Horz" strokewidth="inherit" w="80.56">
+    <connections>
+        <constraint name="N" perimeter="0" x="0.5" y="0.4"/>
+        <constraint name="S" perimeter="0" x="0.5" y="0.64"/>
+        <constraint name="W" perimeter="0" x="0.0" y="0.52"/>
+        <constraint name="E" perimeter="0" x="1.0" y="0.52"/>
+        <constraint name="NE" perimeter="0" x="0.865" y="0.0"/>
+        <constraint name="SE" perimeter="0" x="0.865" y="1.0"/>
+    </connections>
+    <foreground>
+        <path>
+            <move x="0.0" y="19.03"/>
+            <line x="0.0" y="12.07"/>
+            <line x="64.52" y="12.07"/>
+            <line x="64.52" y="0.0"/>
+            <line x="69.67" y="0.0"/>
+            <line x="69.67" y="12.07"/>
+            <line x="80.56" y="12.07"/>
+            <line x="80.56" y="19.03"/>
+            <line x="69.67" y="19.03"/>
+            <line x="69.67" y="29.92"/>
+            <line x="64.52" y="29.92"/>
+            <line x="64.52" y="19.03"/>
+            <close/>
+        </path>
+        <fillstroke/>
+    </foreground>
+</shape>
+<shape aspect="variable" h="79.57" name="Slider Bar Vert" strokewidth="inherit" w="34.88">
+    <connections>
+        <constraint name="N" perimeter="0" x="0.34" y="0.0"/>
+        <constraint name="S" perimeter="0" x="0.34" y="1.0"/>
+        <constraint name="W" perimeter="0" x="0.245" y="0.5"/>
+        <constraint name="E" perimeter="0" x="1.0" y="0.5"/>
+        <constraint name="NE" perimeter="0" x="1.0" y="0.0"/>
+        <constraint name="NW" perimeter="0" x="0.0" y="0.25"/>
+        <constraint name="SE" perimeter="0" x="1.0" y="1.0"/>
+    </connections>
+    <foreground>
+        <path>
+            <move x="26.85" y="79.57"/>
+            <line x="26.85" y="78.4"/>
+            <line x="30.37" y="78.4"/>
+            <line x="30.37" y="74.66"/>
+            <line x="26.85" y="74.66"/>
+            <line x="26.85" y="73.49"/>
+            <line x="30.37" y="73.49"/>
+            <line x="30.37" y="69.78"/>
+            <line x="26.85" y="69.78"/>
+            <line x="26.85" y="68.61"/>
+            <line x="30.37" y="68.61"/>
+            <line x="30.37" y="64.87"/>
+            <line x="26.85" y="64.87"/>
+            <line x="26.85" y="63.7"/>
+            <line x="30.37" y="63.7"/>
+            <line x="30.37" y="59.98"/>
+            <line x="26.85" y="59.98"/>
+            <line x="26.85" y="58.82"/>
+            <line x="30.37" y="58.82"/>
+            <line x="30.37" y="55.11"/>
+            <line x="26.85" y="55.11"/>
+            <line x="26.85" y="53.93"/>
+            <line x="30.37" y="53.93"/>
+            <line x="30.37" y="50.35"/>
+            <line x="26.85" y="50.35"/>
+            <line x="26.85" y="49.19"/>
+            <line x="30.37" y="49.19"/>
+            <line x="30.37" y="45.45"/>
+            <line x="26.85" y="45.45"/>
+            <line x="26.85" y="44.31"/>
+            <line x="30.37" y="44.31"/>
+            <line x="30.37" y="40.54"/>
+            <line x="26.85" y="40.54"/>
+            <line x="26.85" y="39.39"/>
+            <line x="30.37" y="39.39"/>
+            <line x="30.37" y="35.66"/>
+            <line x="26.85" y="35.66"/>
+            <line x="26.85" y="34.51"/>
+            <line x="30.37" y="34.51"/>
+            <line x="30.37" y="30.65"/>
+            <line x="26.85" y="30.65"/>
+            <line x="26.85" y="29.5"/>
+            <line x="30.37" y="29.5"/>
+            <line x="30.37" y="25.73"/>
+            <line x="26.85" y="25.73"/>
+            <line x="26.85" y="24.6"/>
+            <line x="30.37" y="24.6"/>
+            <line x="30.37" y="21.0"/>
+            <line x="26.85" y="21.0"/>
+            <line x="26.85" y="19.85"/>
+            <line x="30.37" y="19.85"/>
+            <line x="30.37" y="16.09"/>
+            <line x="26.85" y="16.09"/>
+            <line x="26.85" y="14.97"/>
+            <line x="30.37" y="14.97"/>
+            <line x="30.37" y="11.22"/>
+            <line x="26.85" y="11.22"/>
+            <line x="26.85" y="10.07"/>
+            <line x="30.37" y="10.07"/>
+            <line x="30.37" y="6.33"/>
+            <line x="26.85" y="6.33"/>
+            <line x="26.85" y="5.17"/>
+            <line x="30.37" y="5.17"/>
+            <line x="30.37" y="1.42"/>
+            <line x="26.85" y="1.42"/>
+            <line x="26.85" y="0.28"/>
+            <line x="34.88" y="0.28"/>
+            <line x="34.88" y="1.42"/>
+            <line x="31.55" y="1.42"/>
+            <line x="31.55" y="5.17"/>
+            <line x="34.88" y="5.17"/>
+            <line x="34.88" y="6.33"/>
+            <line x="31.55" y="6.33"/>
+            <line x="31.55" y="10.07"/>
+            <line x="34.88" y="10.07"/>
+            <line x="34.88" y="11.22"/>
+            <line x="31.55" y="11.22"/>
+            <line x="31.55" y="14.97"/>
+            <line x="34.88" y="14.97"/>
+            <line x="34.88" y="16.09"/>
+            <line x="31.55" y="16.09"/>
+            <line x="31.55" y="19.85"/>
+            <line x="34.88" y="19.85"/>
+            <line x="34.88" y="21.0"/>
+            <line x="31.55" y="21.0"/>
+            <line x="31.55" y="24.6"/>
+            <line x="34.88" y="24.6"/>
+            <line x="34.88" y="25.73"/>
+            <line x="31.55" y="25.73"/>
+            <line x="31.55" y="29.5"/>
+            <line x="34.88" y="29.5"/>
+            <line x="34.88" y="30.65"/>
+            <line x="31.55" y="30.65"/>
+            <line x="31.55" y="34.51"/>
+            <line x="34.88" y="34.51"/>
+            <line x="34.88" y="35.66"/>
+            <line x="31.55" y="35.66"/>
+            <line x="31.55" y="39.39"/>
+            <line x="34.88" y="39.39"/>
+            <line x="34.88" y="40.54"/>
+            <line x="31.55" y="40.54"/>
+            <line x="31.55" y="44.31"/>
+            <line x="34.88" y="44.31"/>
+            <line x="34.88" y="45.45"/>
+            <line x="31.55" y="45.45"/>
+            <line x="31.55" y="49.19"/>
+            <line x="34.88" y="49.19"/>
+            <line x="34.88" y="50.35"/>
+            <line x="31.55" y="50.35"/>
+            <line x="31.55" y="53.93"/>
+            <line x="34.88" y="53.93"/>
+            <line x="34.88" y="55.11"/>
+            <line x="31.55" y="55.11"/>
+            <line x="31.55" y="58.82"/>
+            <line x="34.88" y="58.82"/>
+            <line x="34.88" y="59.98"/>
+            <line x="31.55" y="59.98"/>
+            <line x="31.55" y="63.7"/>
+            <line x="34.88" y="63.7"/>
+            <line x="34.88" y="64.87"/>
+            <line x="31.55" y="64.87"/>
+            <line x="31.55" y="68.61"/>
+            <line x="34.88" y="68.61"/>
+            <line x="34.88" y="69.78"/>
+            <line x="31.55" y="69.78"/>
+            <line x="31.55" y="73.49"/>
+            <line x="34.88" y="73.49"/>
+            <line x="34.88" y="74.66"/>
+            <line x="31.55" y="74.66"/>
+            <line x="31.55" y="78.4"/>
+            <line x="34.88" y="78.4"/>
+            <line x="34.88" y="79.57"/>
+            <close/>
+            <move x="8.63" y="79.32"/>
+            <line x="8.63" y="23.33"/>
+            <line x="0.0" y="23.33"/>
+            <line x="0.0" y="16.5"/>
+            <line x="8.63" y="16.5"/>
+            <line x="8.63" y="0.0"/>
+            <line x="11.86" y="0.0"/>
+            <line x="11.86" y="16.5"/>
+            <line x="14.29" y="16.5"/>
+            <line x="14.29" y="14.23"/>
+            <line x="20.11" y="19.93"/>
+            <line x="14.29" y="25.81"/>
+            <line x="14.29" y="23.33"/>
+            <line x="11.86" y="23.33"/>
+            <line x="11.86" y="79.32"/>
+            <close/>
+        </path>
+        <fillstroke/>
+    </foreground>
+</shape>
+<shape aspect="variable" h="99.89" name="Waiting" strokewidth="inherit" w="91.9">
+    <connections>
+        <constraint name="N" perimeter="0" x="0.5" y="0.0"/>
+        <constraint name="S" perimeter="0" x="0.5" y="1.0"/>
+        <constraint name="W" perimeter="0" x="0.48" y="0.5"/>
+        <constraint name="E" perimeter="0" x="0.52" y="0.5"/>
+        <constraint name="NE" perimeter="0" x="0.99" y="0.01"/>
+        <constraint name="NW" perimeter="0" x="0.01" y="0.01"/>
+        <constraint name="SE" perimeter="0" x="0.99" y="0.99"/>
+        <constraint name="SW" perimeter="0" x="0.01" y="0.99"/>
+    </connections>
+    <foreground>
+        <path>
+            <move x="46.03" y="48.94"/>
+            <line x="83.61" y="8.5"/>
+            <line x="8.36" y="8.5"/>
+            <close/>
+            <move x="8.31" y="90.92"/>
+            <line x="83.57" y="90.92"/>
+            <line x="46.04" y="50.5"/>
+            <close/>
+            <move x="4.47" y="99.89"/>
+            <curve x1="2.02" x2="0.0" x3="0.13" y1="99.89" y2="97.95" y3="95.35"/>
+            <curve x1="0.38" x2="3.06" x3="4.93" y1="91.96" y2="90.92" y3="90.92"/>
+            <line x="6.95" y="90.92"/>
+            <line x="45.28" y="49.72"/>
+            <line x="6.96" y="8.5"/>
+            <line x="4.66" y="8.5"/>
+            <curve x1="1.91" x2="0.13" x3="0.13" y1="8.5" y2="6.88" y3="4.25"/>
+            <curve x1="0.13" x2="1.58" x3="5.04" y1="2.09" y2="0.0" y3="0.0"/>
+            <line x="87.6" y="0.0"/>
+            <curve x1="89.99" x2="91.9" x3="91.9" y1="0.0" y2="2.25" y3="4.3"/>
+            <curve x1="91.9" x2="90.15" x3="87.77" y1="6.32" y2="8.5" y3="8.5"/>
+            <line x="85.0" y="8.5"/>
+            <line x="46.78" y="49.73"/>
+            <line x="84.95" y="90.92"/>
+            <line x="86.78" y="90.92"/>
+            <curve x1="89.84" x2="91.8" x3="91.8" y1="90.92" y2="93.04" y3="95.32"/>
+            <curve x1="91.87" x2="90.03" x3="87.64" y1="98.08" y2="99.89" y3="99.89"/>
+            <close/>
+        </path>
+        <fillstroke/>
+        <strokecolor color="none"/>
+        <fillcolor color="#7f7f7f"/>
+        <path>
+            <move x="45.9" y="57.63"/>
+            <curve x1="45.33" x2="44.32" x3="44.32" y1="57.63" y2="57.0" y3="55.92"/>
+            <curve x1="44.32" x2="45.16" x3="45.99" y1="55.11" y2="54.24" y3="54.24"/>
+            <curve x1="47.0" x2="47.58" x3="47.58" y1="54.24" y2="55.12" y3="55.98"/>
+            <curve x1="47.58" x2="46.74" x3="45.9" y1="56.83" y2="57.63" y3="57.63"/>
+            <close/>
+            <move x="45.98" y="63.98"/>
+            <curve x1="45.32" x2="44.33" x3="44.33" y1="63.98" y2="63.28" y3="62.38"/>
+            <curve x1="44.33" x2="45.1" x3="45.99" y1="61.64" y2="60.77" y3="60.77"/>
+            <curve x1="46.89" x2="47.57" x3="47.57" y1="60.77" y2="61.75" y3="62.4"/>
+            <curve x1="47.57" x2="46.76" x3="45.98" y1="63.28" y2="63.98" y3="63.98"/>
+            <close/>
+            <move x="9.3" y="89.96"/>
+            <curve x1="19.12" x2="26.38" x3="32.44" y1="87.29" y2="83.97" y3="80.43"/>
+            <curve x1="38.57" x2="46.0" x3="46.04" y1="77.02" y2="70.99" y3="65.64"/>
+            <curve x1="46.04" x2="53.8" x3="61.24" y1="71.03" y2="77.31" y3="81.43"/>
+            <curve x1="68.48" x2="75.6" x3="82.66" y1="85.4" y2="88.07" y3="89.96"/>
+            <close/>
+            <move x="46.03" y="46.2"/>
+            <line x="25.08" y="23.61"/>
+            <line x="67.0" y="23.61"/>
+            <close/>
+        </path>
+        <fill/>
+    </foreground>
+</shape>
+</shapes>

File diff suppressed because it is too large
+ 1708 - 1157
src/main/webapp/stencils/mscae/intune.xml


File diff suppressed because it is too large
+ 1458 - 0
src/main/webapp/stencils/mscae/oms.xml


File diff suppressed because it is too large
+ 2900 - 0
src/main/webapp/stencils/mscae/opsmanager.xml


File diff suppressed because it is too large
+ 719 - 303
src/main/webapp/stencils/mscae/other.xml


+ 284 - 204
src/main/webapp/stencils/mscae/system_center.xml

@@ -1,6 +1,15 @@
 <shapes name="mxgraph.mscae.system_center">
 <shape aspect="variable" h="72.1" name="Admin Console" strokewidth="inherit" w="99.5">
-    <connections/>
+    <connections>
+        <constraint name="N" perimeter="0" x="0.5" y="0"/>
+        <constraint name="S" perimeter="0" x="0.55" y="1"/>
+        <constraint name="W" perimeter="0" x="0" y="0.5"/>
+        <constraint name="E" perimeter="0" x="0.88" y="0.5"/>
+        <constraint name="NE" perimeter="0" x="0.79" y="0.01"/>
+        <constraint name="NW" perimeter="0" x="0.01" y="0.01"/>
+        <constraint name="SE" perimeter="0" x="1" y="1"/>
+        <constraint name="SW" perimeter="0" x="0.18" y="0.92"/>
+    </connections>
     <foreground>
         <path>
             <move x="4" y="51.9"/>
@@ -49,17 +58,26 @@
     </foreground>
 </shape>
 <shape aspect="variable" h="99.95" name="Central Administration Site SQL" strokewidth="inherit" w="75.57">
-    <connections/>
+    <connections>
+        <constraint name="N" perimeter="0" x="0.5" y="0.0"/>
+        <constraint name="S" perimeter="0" x="0.5" y="0.95"/>
+        <constraint name="W" perimeter="0" x="0.0" y="0.5"/>
+        <constraint name="E" perimeter="0" x="1.0" y="0.57"/>
+        <constraint name="NE" perimeter="0" x="0.635" y="0.3"/>
+        <constraint name="NW" perimeter="0" x="0.02" y="0.02"/>
+        <constraint name="SE" perimeter="0" x="0.995" y="0.93"/>
+        <constraint name="SW" perimeter="0" x="0.0" y="0.925"/>
+    </connections>
     <foreground>
         <path>
-            <move x="0" y="92.62"/>
-            <line x="0" y="6.02"/>
-            <arc large-arc-flag="0" rx="6" ry="6" sweep-flag="1" x="6" x-axis-rotation="0" y="0.02"/>
+            <move x="0.0" y="92.62"/>
+            <line x="0.0" y="6.02"/>
+            <arc large-arc-flag="0.0" rx="6.0" ry="6.0" sweep-flag="1.0" x="6.0" x-axis-rotation="0.0" y="0.02"/>
             <line x="41.82" y="0.02"/>
-            <arc large-arc-flag="0" rx="6" ry="6" sweep-flag="1" x="47.9" x-axis-rotation="0" y="6.02"/>
+            <arc large-arc-flag="0.0" rx="6.0" ry="6.0" sweep-flag="1.0" x="47.9" x-axis-rotation="0.0" y="6.02"/>
             <line x="47.9" y="47.02"/>
-            <arc large-arc-flag="0" rx="18" ry="9" sweep-flag="0" x="38.7" x-axis-rotation="0" y="49.52"/>
-            <arc large-arc-flag="0" rx="18" ry="9" sweep-flag="0" x="33.2" x-axis-rotation="0" y="56.32"/>
+            <arc large-arc-flag="0.0" rx="18.0" ry="9.0" sweep-flag="0.0" x="38.7" x-axis-rotation="0.0" y="49.52"/>
+            <arc large-arc-flag="0.0" rx="18.0" ry="9.0" sweep-flag="0.0" x="33.2" x-axis-rotation="0.0" y="56.32"/>
             <line x="33.2" y="66.02"/>
             <line x="9.4" y="66.02"/>
             <line x="9.4" y="70.02"/>
@@ -76,49 +94,49 @@
             <line x="9.32" y="11.82"/>
             <close/>
             <move x="36.9" y="61.32"/>
-            <arc large-arc-flag="0" rx="22" ry="8" sweep-flag="0" x="48.7" x-axis-rotation="0" y="65.12"/>
-            <arc large-arc-flag="0" rx="22" ry="8" sweep-flag="0" x="65.4" x-axis-rotation="0" y="64.92"/>
-            <arc large-arc-flag="0" rx="22" ry="8" sweep-flag="0" x="75" x-axis-rotation="0" y="61.52"/>
-            <line x="75" y="92.82"/>
-            <arc large-arc-flag="0" rx="19" ry="8" sweep-flag="1" x="71.2" x-axis-rotation="0" y="97.12"/>
-            <arc large-arc-flag="0" rx="19" ry="8" sweep-flag="1" x="57.4" x-axis-rotation="0" y="99.62"/>
-            <arc large-arc-flag="0" rx="19" ry="8" sweep-flag="1" x="41.4" x-axis-rotation="0" y="97.32"/>
-            <arc large-arc-flag="0" rx="19" ry="8" sweep-flag="1" x="36.9" x-axis-rotation="0" y="92.82"/>
+            <arc large-arc-flag="0.0" rx="22.0" ry="8.0" sweep-flag="0.0" x="48.7" x-axis-rotation="0.0" y="65.12"/>
+            <arc large-arc-flag="0.0" rx="22.0" ry="8.0" sweep-flag="0.0" x="65.4" x-axis-rotation="0.0" y="64.92"/>
+            <arc large-arc-flag="0.0" rx="22.0" ry="8.0" sweep-flag="0.0" x="75.0" x-axis-rotation="0.0" y="61.52"/>
+            <line x="75.0" y="92.82"/>
+            <arc large-arc-flag="0.0" rx="19.0" ry="8.0" sweep-flag="1.0" x="71.2" x-axis-rotation="0.0" y="97.12"/>
+            <arc large-arc-flag="0.0" rx="19.0" ry="8.0" sweep-flag="1.0" x="57.4" x-axis-rotation="0.0" y="99.62"/>
+            <arc large-arc-flag="0.0" rx="19.0" ry="8.0" sweep-flag="1.0" x="41.4" x-axis-rotation="0.0" y="97.32"/>
+            <arc large-arc-flag="0.0" rx="19.0" ry="8.0" sweep-flag="1.0" x="36.9" x-axis-rotation="0.0" y="92.82"/>
             <close/>
             <move x="41.6" y="85.02"/>
-            <arc large-arc-flag="0" rx="10" ry="10" sweep-flag="0" x="45.8" x-axis-rotation="0" y="85.52"/>
-            <arc large-arc-flag="0" rx="4" ry="4" sweep-flag="0" x="49.3" x-axis-rotation="0" y="84.02"/>
-            <arc large-arc-flag="0" rx="3" ry="3" sweep-flag="0" x="49.9" x-axis-rotation="0" y="80.32"/>
-            <arc large-arc-flag="0" rx="5" ry="5" sweep-flag="0" x="46.9" x-axis-rotation="0" y="78.52"/>
-            <arc large-arc-flag="0" rx="3" ry="3" sweep-flag="1" x="45.7" x-axis-rotation="0" y="77.82"/>
-            <arc large-arc-flag="0" rx="0.8" ry="0.8" sweep-flag="1" x="46.6" x-axis-rotation="0" y="76.72"/>
-            <arc large-arc-flag="0" rx="5" ry="5" sweep-flag="1" x="49.5" x-axis-rotation="0" y="77.52"/>
+            <arc large-arc-flag="0.0" rx="10.0" ry="10.0" sweep-flag="0.0" x="45.8" x-axis-rotation="0.0" y="85.52"/>
+            <arc large-arc-flag="0.0" rx="4.0" ry="4.0" sweep-flag="0.0" x="49.3" x-axis-rotation="0.0" y="84.02"/>
+            <arc large-arc-flag="0.0" rx="3.0" ry="3.0" sweep-flag="0.0" x="49.9" x-axis-rotation="0.0" y="80.32"/>
+            <arc large-arc-flag="0.0" rx="5.0" ry="5.0" sweep-flag="0.0" x="46.9" x-axis-rotation="0.0" y="78.52"/>
+            <arc large-arc-flag="0.0" rx="3.0" ry="3.0" sweep-flag="1.0" x="45.7" x-axis-rotation="0.0" y="77.82"/>
+            <arc large-arc-flag="0.0" rx="0.8" ry="0.8" sweep-flag="1.0" x="46.6" x-axis-rotation="0.0" y="76.72"/>
+            <arc large-arc-flag="0.0" rx="5.0" ry="5.0" sweep-flag="1.0" x="49.5" x-axis-rotation="0.0" y="77.52"/>
             <line x="49.5" y="74.62"/>
-            <arc large-arc-flag="0" rx="5" ry="5" sweep-flag="0" x="46.9" x-axis-rotation="0" y="74.22"/>
-            <arc large-arc-flag="0" rx="8" ry="8" sweep-flag="0" x="43.7" x-axis-rotation="0" y="74.62"/>
-            <arc large-arc-flag="0" rx="3" ry="3" sweep-flag="0" x="42" x-axis-rotation="0" y="76.82"/>
-            <arc large-arc-flag="0" rx="3.5" ry="3.5" sweep-flag="0" x="42.7" x-axis-rotation="0" y="80.12"/>
-            <arc large-arc-flag="0" rx="8" ry="8" sweep-flag="0" x="45.7" x-axis-rotation="0" y="81.82"/>
-            <arc large-arc-flag="0" rx="0.7" ry="0.7" sweep-flag="1" x="45.7" x-axis-rotation="0" y="83.12"/>
-            <arc large-arc-flag="0" rx="4" ry="4" sweep-flag="1" x="43.5" x-axis-rotation="0" y="82.82"/>
-            <arc large-arc-flag="0" rx="5" ry="5" sweep-flag="1" x="41.7" x-axis-rotation="0" y="81.82"/>
-            <close/>
-            <move x="59" y="87.12"/>
+            <arc large-arc-flag="0.0" rx="5.0" ry="5.0" sweep-flag="0.0" x="46.9" x-axis-rotation="0.0" y="74.22"/>
+            <arc large-arc-flag="0.0" rx="8.0" ry="8.0" sweep-flag="0.0" x="43.7" x-axis-rotation="0.0" y="74.62"/>
+            <arc large-arc-flag="0.0" rx="3.0" ry="3.0" sweep-flag="0.0" x="42.0" x-axis-rotation="0.0" y="76.82"/>
+            <arc large-arc-flag="0.0" rx="3.5" ry="3.5" sweep-flag="0.0" x="42.7" x-axis-rotation="0.0" y="80.12"/>
+            <arc large-arc-flag="0.0" rx="8.0" ry="8.0" sweep-flag="0.0" x="45.7" x-axis-rotation="0.0" y="81.82"/>
+            <arc large-arc-flag="0.0" rx="0.7" ry="0.7" sweep-flag="1.0" x="45.7" x-axis-rotation="0.0" y="83.12"/>
+            <arc large-arc-flag="0.0" rx="4.0" ry="4.0" sweep-flag="1.0" x="43.5" x-axis-rotation="0.0" y="82.82"/>
+            <arc large-arc-flag="0.0" rx="5.0" ry="5.0" sweep-flag="1.0" x="41.7" x-axis-rotation="0.0" y="81.82"/>
+            <close/>
+            <move x="59.0" y="87.12"/>
             <line x="63.5" y="87.12"/>
             <line x="60.4" y="84.22"/>
-            <arc large-arc-flag="0" rx="5.5" ry="5.7" sweep-flag="0" x="62" x-axis-rotation="0" y="79.82"/>
-            <arc large-arc-flag="0" rx="5" ry="5" sweep-flag="0" x="59.4" x-axis-rotation="0" y="75.32"/>
-            <arc large-arc-flag="0" rx="5.5" ry="5.7" sweep-flag="0" x="54.5" x-axis-rotation="0" y="74.72"/>
-            <arc large-arc-flag="0" rx="5.5" ry="5.7" sweep-flag="0" x="51.3" x-axis-rotation="0" y="77.82"/>
-            <arc large-arc-flag="0" rx="5.5" ry="5.7" sweep-flag="0" x="51.7" x-axis-rotation="0" y="83.42"/>
-            <arc large-arc-flag="0" rx="5.5" ry="5.7" sweep-flag="0" x="54.7" x-axis-rotation="0" y="85.52"/>
-            <arc large-arc-flag="0" rx="5.5" ry="5.7" sweep-flag="0" x="57.5" x-axis-rotation="0" y="85.52"/>
+            <arc large-arc-flag="0.0" rx="5.5" ry="5.7" sweep-flag="0.0" x="62.0" x-axis-rotation="0.0" y="79.82"/>
+            <arc large-arc-flag="0.0" rx="5.0" ry="5.0" sweep-flag="0.0" x="59.4" x-axis-rotation="0.0" y="75.32"/>
+            <arc large-arc-flag="0.0" rx="5.5" ry="5.7" sweep-flag="0.0" x="54.5" x-axis-rotation="0.0" y="74.72"/>
+            <arc large-arc-flag="0.0" rx="5.5" ry="5.7" sweep-flag="0.0" x="51.3" x-axis-rotation="0.0" y="77.82"/>
+            <arc large-arc-flag="0.0" rx="5.5" ry="5.7" sweep-flag="0.0" x="51.7" x-axis-rotation="0.0" y="83.42"/>
+            <arc large-arc-flag="0.0" rx="5.5" ry="5.7" sweep-flag="0.0" x="54.7" x-axis-rotation="0.0" y="85.52"/>
+            <arc large-arc-flag="0.0" rx="5.5" ry="5.7" sweep-flag="0.0" x="57.5" x-axis-rotation="0.0" y="85.52"/>
             <close/>
             <move x="56.2" y="82.52"/>
-            <arc large-arc-flag="0" rx="2" ry="3" sweep-flag="1" x="54.3" x-axis-rotation="0" y="79.32"/>
-            <arc large-arc-flag="0" rx="2" ry="3" sweep-flag="1" x="56.2" x-axis-rotation="0" y="77.02"/>
-            <arc large-arc-flag="0" rx="2" ry="3" sweep-flag="1" x="58.2" x-axis-rotation="0" y="79.32"/>
-            <arc large-arc-flag="0" rx="2" ry="3" sweep-flag="1" x="56.2" x-axis-rotation="0" y="82.52"/>
+            <arc large-arc-flag="0.0" rx="2.0" ry="3.0" sweep-flag="1.0" x="54.3" x-axis-rotation="0.0" y="79.32"/>
+            <arc large-arc-flag="0.0" rx="2.0" ry="3.0" sweep-flag="1.0" x="56.2" x-axis-rotation="0.0" y="77.02"/>
+            <arc large-arc-flag="0.0" rx="2.0" ry="3.0" sweep-flag="1.0" x="58.2" x-axis-rotation="0.0" y="79.32"/>
+            <arc large-arc-flag="0.0" rx="2.0" ry="3.0" sweep-flag="1.0" x="56.2" x-axis-rotation="0.0" y="82.52"/>
             <move x="63.3" y="85.32"/>
             <line x="70.6" y="85.32"/>
             <line x="70.6" y="82.62"/>
@@ -126,36 +144,45 @@
             <line x="66.7" y="74.22"/>
             <line x="63.3" y="74.22"/>
             <close/>
-            <move x="37" y="56.32"/>
-            <arc large-arc-flag="0" rx="19" ry="6" sweep-flag="1" x="55.2" x-axis-rotation="0" y="50.82"/>
-            <arc large-arc-flag="0" rx="19" ry="6" sweep-flag="1" x="75.2" x-axis-rotation="0" y="56.32"/>
-            <arc large-arc-flag="0" rx="19" ry="6" sweep-flag="1" x="55.2" x-axis-rotation="0" y="62.72"/>
-            <arc large-arc-flag="0" rx="19" ry="6" sweep-flag="1" x="37" x-axis-rotation="0" y="56.32"/>
+            <move x="37.0" y="56.32"/>
+            <arc large-arc-flag="0.0" rx="19.0" ry="6.0" sweep-flag="1.0" x="55.2" x-axis-rotation="0.0" y="50.82"/>
+            <arc large-arc-flag="0.0" rx="19.0" ry="6.0" sweep-flag="1.0" x="75.2" x-axis-rotation="0.0" y="56.32"/>
+            <arc large-arc-flag="0.0" rx="19.0" ry="6.0" sweep-flag="1.0" x="55.2" x-axis-rotation="0.0" y="62.72"/>
+            <arc large-arc-flag="0.0" rx="19.0" ry="6.0" sweep-flag="1.0" x="37.0" x-axis-rotation="0.0" y="56.32"/>
             <close/>
         </path>
         <fillstroke/>
     </foreground>
 </shape>
 <shape aspect="variable" h="99.6" name="Cloud Distribution Point" strokewidth="inherit" w="92.94">
-    <connections/>
+    <connections>
+        <constraint name="N" perimeter="0" x="0.47" y="0.0"/>
+        <constraint name="S" perimeter="0" x="0.5" y="1.0"/>
+        <constraint name="W" perimeter="0" x="0.0" y="0.5"/>
+        <constraint name="E" perimeter="0" x="0.95" y="0.5"/>
+        <constraint name="NE" perimeter="0" x="0.9" y="0.16"/>
+        <constraint name="NW" perimeter="0" x="0.02" y="0.02"/>
+        <constraint name="SE" perimeter="0" x="0.95" y="1.0"/>
+        <constraint name="SW" perimeter="0" x="0.0" y="0.92"/>
+    </connections>
     <foreground>
         <path>
-            <move x="0" y="91.7"/>
-            <line x="0" y="6"/>
-            <arc large-arc-flag="0" rx="6" ry="6" sweep-flag="1" x="6" x-axis-rotation="0" y="0"/>
-            <line x="42.3" y="0"/>
-            <arc large-arc-flag="0" rx="6" ry="6" sweep-flag="1" x="47.1" x-axis-rotation="0" y="6"/>
+            <move x="0.0" y="91.7"/>
+            <line x="0.0" y="6.0"/>
+            <arc large-arc-flag="0.0" rx="6.0" ry="6.0" sweep-flag="1.0" x="6.0" x-axis-rotation="0.0" y="0.0"/>
+            <line x="42.3" y="0.0"/>
+            <arc large-arc-flag="0.0" rx="6.0" ry="6.0" sweep-flag="1.0" x="47.1" x-axis-rotation="0.0" y="6.0"/>
             <line x="47.1" y="6.4"/>
-            <arc large-arc-flag="0" rx="10" ry="10" sweep-flag="1" x="51.6" x-axis-rotation="0" y="6.5"/>
-            <arc large-arc-flag="0" rx="13" ry="13" sweep-flag="1" x="66.2" x-axis-rotation="0" y="2.5"/>
-            <arc large-arc-flag="0" rx="13" ry="13" sweep-flag="1" x="74.7" x-axis-rotation="0" y="11.9"/>
-            <arc large-arc-flag="0" rx="11" ry="11" sweep-flag="1" x="81.3" x-axis-rotation="0" y="15.4"/>
-            <arc large-arc-flag="0" rx="12.5" ry="12.5" sweep-flag="1" x="92.4" x-axis-rotation="0" y="29.8"/>
-            <arc large-arc-flag="0" rx="12.5" ry="12.5" sweep-flag="1" x="81" x-axis-rotation="0" y="41"/>
-            <line x="47.3" y="41"/>
+            <arc large-arc-flag="0.0" rx="10.0" ry="10.0" sweep-flag="1.0" x="51.6" x-axis-rotation="0.0" y="6.5"/>
+            <arc large-arc-flag="0.0" rx="13.0" ry="13.0" sweep-flag="1.0" x="66.2" x-axis-rotation="0.0" y="2.5"/>
+            <arc large-arc-flag="0.0" rx="13.0" ry="13.0" sweep-flag="1.0" x="74.7" x-axis-rotation="0.0" y="11.9"/>
+            <arc large-arc-flag="0.0" rx="11.0" ry="11.0" sweep-flag="1.0" x="81.3" x-axis-rotation="0.0" y="15.4"/>
+            <arc large-arc-flag="0.0" rx="12.5" ry="12.5" sweep-flag="1.0" x="92.4" x-axis-rotation="0.0" y="29.8"/>
+            <arc large-arc-flag="0.0" rx="12.5" ry="12.5" sweep-flag="1.0" x="81.0" x-axis-rotation="0.0" y="41.0"/>
+            <line x="47.3" y="41.0"/>
             <line x="47.3" y="52.4"/>
             <line x="33.3" y="52.4"/>
-            <arc large-arc-flag="0" rx="8" ry="8" sweep-flag="0" x="26.3" x-axis-rotation="0" y="59"/>
+            <arc large-arc-flag="0.0" rx="8.0" ry="8.0" sweep-flag="0.0" x="26.3" x-axis-rotation="0.0" y="59.0"/>
             <line x="26.3" y="65.6"/>
             <line x="9.3" y="65.6"/>
             <line x="9.3" y="69.4"/>
@@ -169,12 +196,12 @@
             <close/>
             <move x="47.3" y="37.3"/>
             <line x="81.1" y="37.3"/>
-            <arc large-arc-flag="0" rx="9.5" ry="9.5" sweep-flag="0" x="89" x-axis-rotation="0" y="28.3"/>
-            <arc large-arc-flag="0" rx="9" ry="9" sweep-flag="0" x="80" x-axis-rotation="0" y="19.2"/>
-            <arc large-arc-flag="0" rx="8" ry="8" sweep-flag="0" x="72" x-axis-rotation="0" y="15.7"/>
-            <arc large-arc-flag="0" rx="11" ry="11" sweep-flag="0" x="63.8" x-axis-rotation="0" y="5.7"/>
-            <arc large-arc-flag="0" rx="10" ry="10" sweep-flag="0" x="53.4" x-axis-rotation="0" y="11.2"/>
-            <arc large-arc-flag="0" rx="9" ry="9" sweep-flag="0" x="47.3" x-axis-rotation="0" y="10.3"/>
+            <arc large-arc-flag="0.0" rx="9.5" ry="9.5" sweep-flag="0.0" x="89.0" x-axis-rotation="0.0" y="28.3"/>
+            <arc large-arc-flag="0.0" rx="9.0" ry="9.0" sweep-flag="0.0" x="80.0" x-axis-rotation="0.0" y="19.2"/>
+            <arc large-arc-flag="0.0" rx="8.0" ry="8.0" sweep-flag="0.0" x="72.0" x-axis-rotation="0.0" y="15.7"/>
+            <arc large-arc-flag="0.0" rx="11.0" ry="11.0" sweep-flag="0.0" x="63.8" x-axis-rotation="0.0" y="5.7"/>
+            <arc large-arc-flag="0.0" rx="10.0" ry="10.0" sweep-flag="0.0" x="53.4" x-axis-rotation="0.0" y="11.2"/>
+            <arc large-arc-flag="0.0" rx="9.0" ry="9.0" sweep-flag="0.0" x="47.3" x-axis-rotation="0.0" y="10.3"/>
             <close/>
             <move x="38.3" y="15.8"/>
             <line x="38.3" y="11.6"/>
@@ -182,7 +209,7 @@
             <line x="9.4" y="15.8"/>
             <close/>
             <move x="30.5" y="60.3"/>
-            <arc large-arc-flag="0" rx="4" ry="4" sweep-flag="1" x="34.4" x-axis-rotation="0" y="56.3"/>
+            <arc large-arc-flag="0.0" rx="4.0" ry="4.0" sweep-flag="1.0" x="34.4" x-axis-rotation="0.0" y="56.3"/>
             <line x="88.1" y="56.3"/>
             <line x="88.1" y="99.6"/>
             <line x="30.5" y="99.6"/>
@@ -190,7 +217,7 @@
             <move x="61.5" y="53.9"/>
             <line x="68.8" y="47.2"/>
             <line x="84.8" y="47.2"/>
-            <arc large-arc-flag="0" rx="4" ry="4" sweep-flag="1" x="88.1" x-axis-rotation="0" y="50.3"/>
+            <arc large-arc-flag="0.0" rx="4.0" ry="4.0" sweep-flag="1.0" x="88.1" x-axis-rotation="0.0" y="50.3"/>
             <line x="88.1" y="53.9"/>
             <close/>
         </path>
@@ -198,18 +225,26 @@
     </foreground>
 </shape>
 <shape aspect="variable" h="99.6" name="Distribution Point" strokewidth="inherit" w="88.1">
-    <connections/>
+    <connections>
+        <constraint name="N" perimeter="0" x="0.49" y="0.0"/>
+        <constraint name="S" perimeter="0" x="0.5" y="1.0"/>
+        <constraint name="W" perimeter="0" x="0.0" y="0.5"/>
+        <constraint name="E" perimeter="0" x="1.0" y="0.5"/>
+        <constraint name="NW" perimeter="0" x="0.02" y="0.02"/>
+        <constraint name="SE" perimeter="0" x="1.0" y="1.0"/>
+        <constraint name="SW" perimeter="0" x="0.0" y="0.92"/>
+    </connections>
     <foreground>
         <path>
-            <move x="0" y="91.7"/>
-            <line x="0" y="6"/>
-            <arc large-arc-flag="0" rx="6" ry="6" sweep-flag="1" x="6" x-axis-rotation="0" y="0"/>
-            <line x="42.3" y="0"/>
-            <arc large-arc-flag="0" rx="6" ry="6" sweep-flag="1" x="47.1" x-axis-rotation="0" y="6"/>
-            <line x="47.3" y="41"/>
+            <move x="0.0" y="91.7"/>
+            <line x="0.0" y="6.0"/>
+            <arc large-arc-flag="0.0" rx="6.0" ry="6.0" sweep-flag="1.0" x="6.0" x-axis-rotation="0.0" y="0.0"/>
+            <line x="42.3" y="0.0"/>
+            <arc large-arc-flag="0.0" rx="6.0" ry="6.0" sweep-flag="1.0" x="47.1" x-axis-rotation="0.0" y="6.0"/>
+            <line x="47.3" y="41.0"/>
             <line x="47.3" y="52.4"/>
             <line x="33.3" y="52.4"/>
-            <arc large-arc-flag="0" rx="8" ry="8" sweep-flag="0" x="26.3" x-axis-rotation="0" y="59"/>
+            <arc large-arc-flag="0.0" rx="8.0" ry="8.0" sweep-flag="0.0" x="26.3" x-axis-rotation="0.0" y="59.0"/>
             <line x="26.3" y="65.6"/>
             <line x="9.3" y="65.6"/>
             <line x="9.3" y="69.4"/>
@@ -226,7 +261,7 @@
             <line x="9.4" y="15.8"/>
             <close/>
             <move x="30.5" y="60.3"/>
-            <arc large-arc-flag="0" rx="4" ry="4" sweep-flag="1" x="34.4" x-axis-rotation="0" y="56.3"/>
+            <arc large-arc-flag="0.0" rx="4.0" ry="4.0" sweep-flag="1.0" x="34.4" x-axis-rotation="0.0" y="56.3"/>
             <line x="88.1" y="56.3"/>
             <line x="88.1" y="99.6"/>
             <line x="30.5" y="99.6"/>
@@ -234,7 +269,7 @@
             <move x="61.5" y="53.9"/>
             <line x="68.8" y="47.2"/>
             <line x="84.8" y="47.2"/>
-            <arc large-arc-flag="0" rx="4" ry="4" sweep-flag="1" x="88.1" x-axis-rotation="0" y="50.3"/>
+            <arc large-arc-flag="0.0" rx="4.0" ry="4.0" sweep-flag="1.0" x="88.1" x-axis-rotation="0.0" y="50.3"/>
             <line x="88.1" y="53.9"/>
             <close/>
         </path>
@@ -242,64 +277,73 @@
     </foreground>
 </shape>
 <shape aspect="variable" h="99.6" name="Management Point" strokewidth="inherit" w="96.8">
-    <connections/>
+    <connections>
+        <constraint name="N" perimeter="0" x="0.5" y="0.005"/>
+        <constraint name="S" perimeter="0" x="0.5" y="1.0"/>
+        <constraint name="W" perimeter="0" x="0.0" y="0.5"/>
+        <constraint name="E" perimeter="0" x="1.0" y="0.73"/>
+        <constraint name="NE" perimeter="0" x="0.53" y="0.5"/>
+        <constraint name="NW" perimeter="0" x="0.02" y="0.02"/>
+        <constraint name="SE" perimeter="0" x="1.0" y="1.0"/>
+        <constraint name="SW" perimeter="0" x="0.0" y="1.0"/>
+    </connections>
     <foreground>
         <path>
-            <move x="0" y="99.6"/>
-            <line x="0" y="6"/>
-            <arc large-arc-flag="0" rx="6" ry="6" sweep-flag="1" x="6" x-axis-rotation="0" y="0"/>
-            <line x="45.1" y="0"/>
-            <arc large-arc-flag="0" rx="6" ry="6" sweep-flag="1" x="51.1" x-axis-rotation="0" y="6"/>
+            <move x="0.0" y="99.6"/>
+            <line x="0.0" y="6.0"/>
+            <arc large-arc-flag="0.0" rx="6.0" ry="6.0" sweep-flag="1.0" x="6.0" x-axis-rotation="0.0" y="0.0"/>
+            <line x="45.1" y="0.0"/>
+            <arc large-arc-flag="0.0" rx="6.0" ry="6.0" sweep-flag="1.0" x="51.1" x-axis-rotation="0.0" y="6.0"/>
             <line x="51.1" y="62.5"/>
             <line x="41.1" y="62.5"/>
-            <arc large-arc-flag="0" rx="12" ry="12" sweep-flag="0" x="31.5" x-axis-rotation="0" y="71.1"/>
+            <arc large-arc-flag="0.0" rx="12.0" ry="12.0" sweep-flag="0.0" x="31.5" x-axis-rotation="0.0" y="71.1"/>
             <line x="9.6" y="71.1"/>
             <line x="9.6" y="75.6"/>
             <line x="31.1" y="75.6"/>
-            <line x="31.1" y="84"/>
-            <line x="9.6" y="84"/>
+            <line x="31.1" y="84.0"/>
+            <line x="9.6" y="84.0"/>
             <line x="9.6" y="88.2"/>
             <line x="31.1" y="88.2"/>
             <line x="31.1" y="99.6"/>
             <close/>
             <move x="9.7" y="17.3"/>
-            <line x="41" y="17.3"/>
-            <line x="41" y="12.9"/>
+            <line x="41.0" y="17.3"/>
+            <line x="41.0" y="12.9"/>
             <line x="9.7" y="12.9"/>
             <close/>
             <move x="35.6" y="99.6"/>
             <line x="35.6" y="78.1"/>
             <line x="48.4" y="78.1"/>
-            <line x="48.4" y="81"/>
-            <arc large-arc-flag="1" rx="2" ry="1.5" sweep-flag="0" x="52.6" x-axis-rotation="0" y="81"/>
+            <line x="48.4" y="81.0"/>
+            <arc large-arc-flag="1.0" rx="2.0" ry="1.5" sweep-flag="0.0" x="52.6" x-axis-rotation="0.0" y="81.0"/>
             <line x="52.6" y="78.1"/>
             <line x="79.7" y="78.1"/>
-            <line x="79.7" y="81"/>
-            <arc large-arc-flag="1" rx="2" ry="1.5" sweep-flag="0" x="84" x-axis-rotation="0" y="81"/>
-            <line x="84" y="78.1"/>
+            <line x="79.7" y="81.0"/>
+            <arc large-arc-flag="1.0" rx="2.0" ry="1.5" sweep-flag="0.0" x="84.0" x-axis-rotation="0.0" y="81.0"/>
+            <line x="84.0" y="78.1"/>
             <line x="96.8" y="78.1"/>
             <line x="96.8" y="99.6"/>
             <close/>
             <close/>
             <move x="35.6" y="75.6"/>
             <line x="35.6" y="72.8"/>
-            <arc large-arc-flag="0" rx="7" ry="7" sweep-flag="1" x="42.3" x-axis-rotation="0" y="66.7"/>
+            <arc large-arc-flag="0.0" rx="7.0" ry="7.0" sweep-flag="1.0" x="42.3" x-axis-rotation="0.0" y="66.7"/>
             <line x="55.6" y="66.7"/>
             <line x="55.6" y="62.1"/>
-            <arc large-arc-flag="0" rx="2.5" ry="2.5" sweep-flag="1" x="58.1" x-axis-rotation="0" y="59.6"/>
+            <arc large-arc-flag="0.0" rx="2.5" ry="2.5" sweep-flag="1.0" x="58.1" x-axis-rotation="0.0" y="59.6"/>
             <line x="74.4" y="59.6"/>
-            <arc large-arc-flag="0" rx="2.5" ry="2.5" sweep-flag="1" x="76.9" x-axis-rotation="0" y="62.1"/>
+            <arc large-arc-flag="0.0" rx="2.5" ry="2.5" sweep-flag="1.0" x="76.9" x-axis-rotation="0.0" y="62.1"/>
             <line x="76.9" y="66.8"/>
             <line x="90.3" y="66.8"/>
-            <arc large-arc-flag="0" rx="7" ry="7" sweep-flag="1" x="96.7" x-axis-rotation="0" y="72.8"/>
+            <arc large-arc-flag="0.0" rx="7.0" ry="7.0" sweep-flag="1.0" x="96.7" x-axis-rotation="0.0" y="72.8"/>
             <line x="96.7" y="75.6"/>
             <line x="83.9" y="75.6"/>
-            <line x="83.9" y="74"/>
-            <arc large-arc-flag="0" rx="2" ry="1.3" sweep-flag="0" x="79.7" x-axis-rotation="0" y="74"/>
+            <line x="83.9" y="74.0"/>
+            <arc large-arc-flag="0.0" rx="2.0" ry="1.3" sweep-flag="0.0" x="79.7" x-axis-rotation="0.0" y="74.0"/>
             <line x="79.7" y="75.6"/>
             <line x="52.6" y="75.6"/>
-            <line x="52.6" y="74"/>
-            <arc large-arc-flag="0" rx="2" ry="1.3" sweep-flag="0" x="48.2" x-axis-rotation="0" y="74"/>
+            <line x="52.6" y="74.0"/>
+            <arc large-arc-flag="0.0" rx="2.0" ry="1.3" sweep-flag="0.0" x="48.2" x-axis-rotation="0.0" y="74.0"/>
             <line x="48.2" y="75.6"/>
             <close/>
             <move x="58.4" y="66.7"/>
@@ -311,24 +355,33 @@
         <fillstroke/>
     </foreground>
 </shape>
-<shape aspect="variable" h="99.71" name="Primary Site" strokewidth="inherit" w="75">
-    <connections/>
+<shape aspect="variable" h="99.71" name="Primary Site" strokewidth="inherit" w="75.0">
+    <connections>
+        <constraint name="N" perimeter="0" x="0.5" y="0.0"/>
+        <constraint name="S" perimeter="0" x="0.5" y="0.95"/>
+        <constraint name="W" perimeter="0" x="0.0" y="0.5"/>
+        <constraint name="E" perimeter="0" x="1.0" y="0.56"/>
+        <constraint name="NE" perimeter="0" x="0.63" y="0.3"/>
+        <constraint name="NW" perimeter="0" x="0.02" y="0.02"/>
+        <constraint name="SE" perimeter="0" x="1.0" y="0.94"/>
+        <constraint name="SW" perimeter="0" x="0.0" y="0.925"/>
+    </connections>
     <foreground>
         <path>
-            <move x="0" y="92.2"/>
-            <line x="0" y="6"/>
-            <arc large-arc-flag="0" rx="6" ry="6" sweep-flag="1" x="6" x-axis-rotation="0" y="0"/>
-            <line x="41.4" y="0"/>
-            <arc large-arc-flag="0" rx="6" ry="6" sweep-flag="1" x="47.4" x-axis-rotation="0" y="6"/>
+            <move x="0.0" y="92.2"/>
+            <line x="0.0" y="6.0"/>
+            <arc large-arc-flag="0.0" rx="6.0" ry="6.0" sweep-flag="1.0" x="6.0" x-axis-rotation="0.0" y="0.0"/>
+            <line x="41.4" y="0.0"/>
+            <arc large-arc-flag="0.0" rx="6.0" ry="6.0" sweep-flag="1.0" x="47.4" x-axis-rotation="0.0" y="6.0"/>
             <line x="47.4" y="47.2"/>
-            <arc large-arc-flag="0" rx="22" ry="10" sweep-flag="0" x="36.5" x-axis-rotation="0" y="50.6"/>
-            <arc large-arc-flag="0" rx="22" ry="10" sweep-flag="0" x="32.9" x-axis-rotation="0" y="56"/>
-            <line x="32.9" y="66"/>
-            <line x="9.2" y="66"/>
+            <arc large-arc-flag="0.0" rx="22.0" ry="10.0" sweep-flag="0.0" x="36.5" x-axis-rotation="0.0" y="50.6"/>
+            <arc large-arc-flag="0.0" rx="22.0" ry="10.0" sweep-flag="0.0" x="32.9" x-axis-rotation="0.0" y="56.0"/>
+            <line x="32.9" y="66.0"/>
+            <line x="9.2" y="66.0"/>
             <line x="9.2" y="70.1"/>
             <line x="32.8" y="70.1"/>
-            <line x="32.8" y="78"/>
-            <line x="9.2" y="78"/>
+            <line x="32.8" y="78.0"/>
+            <line x="9.2" y="78.0"/>
             <line x="9.2" y="82.1"/>
             <line x="32.8" y="82.1"/>
             <line x="32.8" y="92.2"/>
@@ -345,107 +398,116 @@
         <fillcolor color="#0079d6"/>
         <path>
             <move x="36.9" y="61.5"/>
-            <arc large-arc-flag="0" rx="20" ry="6" sweep-flag="0" x="74.8" x-axis-rotation="0" y="61.5"/>
+            <arc large-arc-flag="0.0" rx="20.0" ry="6.0" sweep-flag="0.0" x="74.8" x-axis-rotation="0.0" y="61.5"/>
             <line x="74.8" y="92.8"/>
-            <arc large-arc-flag="0" rx="19" ry="7" sweep-flag="1" x="70.8" x-axis-rotation="0" y="97.1"/>
-            <arc large-arc-flag="0" rx="19" ry="7" sweep-flag="1" x="56.5" x-axis-rotation="0" y="99.6"/>
-            <arc large-arc-flag="0" rx="19" ry="7" sweep-flag="1" x="41" x-axis-rotation="0" y="97.1"/>
-            <arc large-arc-flag="0" rx="19" ry="7" sweep-flag="1" x="36.9" x-axis-rotation="0" y="92.8"/>
+            <arc large-arc-flag="0.0" rx="19.0" ry="7.0" sweep-flag="1.0" x="70.8" x-axis-rotation="0.0" y="97.1"/>
+            <arc large-arc-flag="0.0" rx="19.0" ry="7.0" sweep-flag="1.0" x="56.5" x-axis-rotation="0.0" y="99.6"/>
+            <arc large-arc-flag="0.0" rx="19.0" ry="7.0" sweep-flag="1.0" x="41.0" x-axis-rotation="0.0" y="97.1"/>
+            <arc large-arc-flag="0.0" rx="19.0" ry="7.0" sweep-flag="1.0" x="36.9" x-axis-rotation="0.0" y="92.8"/>
             <close/>
             <move x="36.7" y="56.3"/>
-            <arc large-arc-flag="0" rx="17" ry="4.7" sweep-flag="1" x="75" x-axis-rotation="0" y="56.3"/>
-            <arc large-arc-flag="0" rx="17" ry="5.8" sweep-flag="1" x="36.7" x-axis-rotation="0" y="56.3"/>
+            <arc large-arc-flag="0.0" rx="17.0" ry="4.7" sweep-flag="1.0" x="75.0" x-axis-rotation="0.0" y="56.3"/>
+            <arc large-arc-flag="0.0" rx="17.0" ry="5.8" sweep-flag="1.0" x="36.7" x-axis-rotation="0.0" y="56.3"/>
             <close/>
         </path>
         <fill/>
     </foreground>
 </shape>
 <shape aspect="variable" h="99.8" name="Roles" strokewidth="inherit" w="84.64">
-    <connections/>
+    <connections>
+        <constraint name="N" perimeter="0" x="0.5" y="0.0"/>
+        <constraint name="S" perimeter="0" x="0.5" y="0.94"/>
+        <constraint name="W" perimeter="0" x="0.0" y="0.5"/>
+        <constraint name="E" perimeter="0" x="1.0" y="0.69"/>
+        <constraint name="NE" perimeter="0" x="0.57" y="0.3"/>
+        <constraint name="NW" perimeter="0" x="0.02" y="0.02"/>
+        <constraint name="SE" perimeter="0" x="0.86" y="0.98"/>
+        <constraint name="SW" perimeter="0" x="0.0" y="0.94"/>
+    </connections>
     <foreground>
         <path>
             <move x="42.8" y="79.21"/>
-            <arc large-arc-flag="0" rx="18" ry="18" sweep-flag="1" x="42.8" x-axis-rotation="0" y="72.69"/>
+            <arc large-arc-flag="0.0" rx="18.0" ry="18.0" sweep-flag="1.0" x="42.8" x-axis-rotation="0.0" y="72.69"/>
             <line x="37.53" y="70.44"/>
-            <arc large-arc-flag="0" rx="1.5" ry="1.5" sweep-flag="1" x="36.81" x-axis-rotation="0" y="69.05"/>
+            <arc large-arc-flag="0.0" rx="1.5" ry="1.5" sweep-flag="1.0" x="36.81" x-axis-rotation="0.0" y="69.05"/>
             <line x="38.97" y="63.98"/>
-            <arc large-arc-flag="0" rx="1.5" ry="1.5" sweep-flag="1" x="40.65" x-axis-rotation="0" y="63.59"/>
+            <arc large-arc-flag="0.0" rx="1.5" ry="1.5" sweep-flag="1.0" x="40.65" x-axis-rotation="0.0" y="63.59"/>
             <line x="45.72" y="65.6"/>
-            <arc large-arc-flag="0" rx="18" ry="18" sweep-flag="1" x="50.32" x-axis-rotation="0" y="61.05"/>
+            <arc large-arc-flag="0.0" rx="18.0" ry="18.0" sweep-flag="1.0" x="50.32" x-axis-rotation="0.0" y="61.05"/>
             <line x="48.31" y="55.88"/>
-            <arc large-arc-flag="0" rx="1.5" ry="1.5" sweep-flag="1" x="48.98" x-axis-rotation="0" y="54.06"/>
+            <arc large-arc-flag="0.0" rx="1.5" ry="1.5" sweep-flag="1.0" x="48.98" x-axis-rotation="0.0" y="54.06"/>
             <line x="53.67" y="52.15"/>
-            <arc large-arc-flag="0" rx="1.5" ry="1.5" sweep-flag="1" x="55.21" x-axis-rotation="0" y="52.82"/>
+            <arc large-arc-flag="0.0" rx="1.5" ry="1.5" sweep-flag="1.0" x="55.21" x-axis-rotation="0.0" y="52.82"/>
             <line x="57.41" y="58.09"/>
-            <arc large-arc-flag="0" rx="18" ry="18" sweep-flag="1" x="63.92" x-axis-rotation="0" y="58.09"/>
+            <arc large-arc-flag="0.0" rx="18.0" ry="18.0" sweep-flag="1.0" x="63.92" x-axis-rotation="0.0" y="58.09"/>
             <line x="66.12" y="52.96"/>
-            <arc large-arc-flag="0" rx="1.5" ry="1.5" sweep-flag="1" x="67.66" x-axis-rotation="0" y="52.15"/>
+            <arc large-arc-flag="0.0" rx="1.5" ry="1.5" sweep-flag="1.0" x="67.66" x-axis-rotation="0.0" y="52.15"/>
             <line x="72.64" y="54.25"/>
-            <arc large-arc-flag="0" rx="1.5" ry="1.5" sweep-flag="1" x="73.21" x-axis-rotation="0" y="55.55"/>
+            <arc large-arc-flag="0.0" rx="1.5" ry="1.5" sweep-flag="1.0" x="73.21" x-axis-rotation="0.0" y="55.55"/>
             <line x="71.01" y="60.96"/>
-            <arc large-arc-flag="0" rx="18" ry="18" sweep-flag="1" x="75.61" x-axis-rotation="0" y="65.6"/>
+            <arc large-arc-flag="0.0" rx="18.0" ry="18.0" sweep-flag="1.0" x="75.61" x-axis-rotation="0.0" y="65.6"/>
             <line x="80.78" y="63.5"/>
-            <arc large-arc-flag="0" rx="1.5" ry="1.5" sweep-flag="1" x="82.5" x-axis-rotation="0" y="64.26"/>
+            <arc large-arc-flag="0.0" rx="1.5" ry="1.5" sweep-flag="1.0" x="82.5" x-axis-rotation="0.0" y="64.26"/>
             <line x="84.32" y="68.57"/>
-            <arc large-arc-flag="0" rx="1.5" ry="1.5" sweep-flag="1" x="83.85" x-axis-rotation="0" y="70.44"/>
+            <arc large-arc-flag="0.0" rx="1.5" ry="1.5" sweep-flag="1.0" x="83.85" x-axis-rotation="0.0" y="70.44"/>
             <line x="78.58" y="72.55"/>
-            <arc large-arc-flag="0" rx="18" ry="18" sweep-flag="1" x="78.58" x-axis-rotation="0" y="79.25"/>
+            <arc large-arc-flag="0.0" rx="18.0" ry="18.0" sweep-flag="1.0" x="78.58" x-axis-rotation="0.0" y="79.25"/>
             <line x="83.75" y="81.41"/>
-            <arc large-arc-flag="0" rx="1.5" ry="1.5" sweep-flag="1" x="84.52" x-axis-rotation="0" y="82.94"/>
+            <arc large-arc-flag="0.0" rx="1.5" ry="1.5" sweep-flag="1.0" x="84.52" x-axis-rotation="0.0" y="82.94"/>
             <line x="82.41" y="87.83"/>
-            <arc large-arc-flag="0" rx="1.5" ry="1.5" sweep-flag="1" x="80.78" x-axis-rotation="0" y="88.35"/>
+            <arc large-arc-flag="0.0" rx="1.5" ry="1.5" sweep-flag="1.0" x="80.78" x-axis-rotation="0.0" y="88.35"/>
             <line x="75.66" y="86.29"/>
-            <arc large-arc-flag="0" rx="18" ry="18" sweep-flag="1" x="71.01" x-axis-rotation="0" y="90.99"/>
+            <arc large-arc-flag="0.0" rx="18.0" ry="18.0" sweep-flag="1.0" x="71.01" x-axis-rotation="0.0" y="90.99"/>
             <line x="73.07" y="95.97"/>
-            <arc large-arc-flag="0" rx="1.5" ry="1.5" sweep-flag="1" x="72.64" x-axis-rotation="0" y="97.64"/>
+            <arc large-arc-flag="0.0" rx="1.5" ry="1.5" sweep-flag="1.0" x="72.64" x-axis-rotation="0.0" y="97.64"/>
             <line x="67.37" y="99.8"/>
-            <arc large-arc-flag="0" rx="1.5" ry="1.5" sweep-flag="1" x="66.12" x-axis-rotation="0" y="99.03"/>
+            <arc large-arc-flag="0.0" rx="1.5" ry="1.5" sweep-flag="1.0" x="66.12" x-axis-rotation="0.0" y="99.03"/>
             <line x="64.02" y="93.86"/>
-            <arc large-arc-flag="0" rx="18" ry="18" sweep-flag="1" x="57.46" x-axis-rotation="0" y="93.86"/>
+            <arc large-arc-flag="0.0" rx="18.0" ry="18.0" sweep-flag="1.0" x="57.46" x-axis-rotation="0.0" y="93.86"/>
             <line x="55.21" y="98.94"/>
-            <arc large-arc-flag="0" rx="1.5" ry="1.5" sweep-flag="1" x="53.62" x-axis-rotation="0" y="99.66"/>
+            <arc large-arc-flag="0.0" rx="1.5" ry="1.5" sweep-flag="1.0" x="53.62" x-axis-rotation="0.0" y="99.66"/>
             <line x="48.6" y="97.64"/>
-            <arc large-arc-flag="0" rx="1.5" ry="1.5" sweep-flag="1" x="48.12" x-axis-rotation="0" y="96.35"/>
+            <arc large-arc-flag="0.0" rx="1.5" ry="1.5" sweep-flag="1.0" x="48.12" x-axis-rotation="0.0" y="96.35"/>
             <line x="50.32" y="90.99"/>
-            <arc large-arc-flag="0" rx="18" ry="18" sweep-flag="1" x="45.67" x-axis-rotation="0" y="86.29"/>
+            <arc large-arc-flag="0.0" rx="18.0" ry="18.0" sweep-flag="1.0" x="45.67" x-axis-rotation="0.0" y="86.29"/>
             <line x="40.74" y="88.31"/>
-            <arc large-arc-flag="0" rx="1.5" ry="1.5" sweep-flag="1" x="38.87" x-axis-rotation="0" y="87.83"/>
+            <arc large-arc-flag="0.0" rx="1.5" ry="1.5" sweep-flag="1.0" x="38.87" x-axis-rotation="0.0" y="87.83"/>
             <line x="37.01" y="83.04"/>
-            <arc large-arc-flag="0" rx="1.5" ry="1.5" sweep-flag="1" x="37.68" x-axis-rotation="0" y="81.36"/>
+            <arc large-arc-flag="0.0" rx="1.5" ry="1.5" sweep-flag="1.0" x="37.68" x-axis-rotation="0.0" y="81.36"/>
             <close/>
             <close/>
             <move x="47.97" y="75.95"/>
-            <arc large-arc-flag="0" rx="12.8" ry="12.8" sweep-flag="0" x="60.67" x-axis-rotation="0" y="88.64"/>
-            <arc large-arc-flag="0" rx="12.8" ry="12.8" sweep-flag="0" x="73.36" x-axis-rotation="0" y="75.95"/>
-            <arc large-arc-flag="0" rx="12.8" ry="12.8" sweep-flag="0" x="60.67" x-axis-rotation="0" y="63.26"/>
-            <arc large-arc-flag="0" rx="12.8" ry="12.8" sweep-flag="0" x="47.97" x-axis-rotation="0" y="75.95"/>
-            <close/>
-            <move x="0" y="93.4"/>
-            <line x="0" y="4.7"/>
-            <arc large-arc-flag="0" rx="6" ry="6" sweep-flag="1" x="6" x-axis-rotation="0" y="0.2"/>
-            <line x="42.8" y="0"/>
-            <arc large-arc-flag="0" rx="6" ry="6" sweep-flag="1" x="48" x-axis-rotation="0" y="6.2"/>
-            <line x="48" y="51.3"/>
-            <arc large-arc-flag="0" rx="4" ry="4" sweep-flag="0" x="45.9" x-axis-rotation="0" y="56.4"/>
+            <arc large-arc-flag="0.0" rx="12.8" ry="12.8" sweep-flag="0.0" x="60.67" x-axis-rotation="0.0" y="88.64"/>
+            <arc large-arc-flag="0.0" rx="12.8" ry="12.8" sweep-flag="0.0" x="73.36" x-axis-rotation="0.0" y="75.95"/>
+            <arc large-arc-flag="0.0" rx="12.8" ry="12.8" sweep-flag="0.0" x="60.67" x-axis-rotation="0.0" y="63.26"/>
+            <arc large-arc-flag="0.0" rx="12.8" ry="12.8" sweep-flag="0.0" x="47.97" x-axis-rotation="0.0" y="75.95"/>
+            <close/>
+            <move x="0.0" y="93.4"/>
+            <line x="0.0" y="4.7"/>
+            <arc large-arc-flag="0.0" rx="6.0" ry="6.0" sweep-flag="1.0" x="6.0" x-axis-rotation="0.0" y="0.2"/>
+            <line x="42.8" y="0.0"/>
+            <arc large-arc-flag="0.0" rx="6.0" ry="6.0" sweep-flag="1.0" x="48.0" x-axis-rotation="0.0" y="6.2"/>
+            <line x="48.0" y="51.3"/>
+            <arc large-arc-flag="0.0" rx="4.0" ry="4.0" sweep-flag="0.0" x="45.9" x-axis-rotation="0.0" y="56.4"/>
             <line x="47.5" y="59.7"/>
             <line x="44.6" y="62.5"/>
             <line x="40.5" y="60.8"/>
-            <arc large-arc-flag="0" rx="4" ry="4" sweep-flag="0" x="36.5" x-axis-rotation="0" y="62.4"/>
-            <line x="34.6" y="67"/>
-            <line x="9.2" y="67"/>
-            <line x="9.2" y="71"/>
-            <line x="34.8" y="71"/>
-            <arc large-arc-flag="0" rx="4" ry="4" sweep-flag="0" x="37.3" x-axis-rotation="0" y="72.9"/>
-            <line x="40" y="73.9"/>
-            <line x="40" y="77.7"/>
+            <arc large-arc-flag="0.0" rx="4.0" ry="4.0" sweep-flag="0.0" x="36.5" x-axis-rotation="0.0" y="62.4"/>
+            <line x="34.6" y="67.0"/>
+            <line x="9.2" y="67.0"/>
+            <line x="9.2" y="71.0"/>
+            <line x="34.8" y="71.0"/>
+            <arc large-arc-flag="0.0" rx="4.0" ry="4.0" sweep-flag="0.0" x="37.3" x-axis-rotation="0.0" y="72.9"/>
+            <line x="40.0" y="73.9"/>
+            <line x="40.0" y="77.7"/>
             <line x="37.1" y="78.9"/>
             <line x="9.2" y="78.9"/>
-            <line x="9.2" y="83"/>
-            <line x="34" y="83"/>
-            <line x="36.3" y="89"/>
-            <arc large-arc-flag="0" rx="4" ry="4" sweep-flag="0" x="40.5" x-axis-rotation="0" y="90.9"/>
+            <line x="9.2" y="83.0"/>
+            <line x="34.0" y="83.0"/>
+            <line x="36.3" y="89.0"/>
+            <arc large-arc-flag="0.0" rx="4.0" ry="4.0" sweep-flag="0.0" x="40.5" x-axis-rotation="0.0" y="90.9"/>
             <line x="44.6" y="89.2"/>
-            <line x="47" y="91.8"/>
+            <line x="47.0" y="91.8"/>
             <line x="46.5" y="93.5"/>
             <close/>
             <move x="9.1" y="16.6"/>
@@ -458,17 +520,26 @@
     </foreground>
 </shape>
 <shape aspect="variable" h="99.6" name="Secondary Site" strokewidth="inherit" w="82.9">
-    <connections/>
+    <connections>
+        <constraint name="N" perimeter="0" x="0.5" y="0.0"/>
+        <constraint name="S" perimeter="0" x="0.5" y="1.0"/>
+        <constraint name="W" perimeter="0" x="0.0" y="0.5"/>
+        <constraint name="E1" perimeter="0" x="0.62" y="0.5"/>
+        <constraint name="E2" perimeter="0" x="1.0" y="0.58"/>
+        <constraint name="NW" perimeter="0" x="0.02" y="0.02"/>
+        <constraint name="SE" perimeter="0" x="0.99" y="0.99"/>
+        <constraint name="SW" perimeter="0" x="0.0" y="1.0"/>
+    </connections>
     <foreground>
         <path>
-            <move x="0" y="99.2"/>
-            <line x="0" y="6"/>
-            <arc large-arc-flag="0" rx="6" ry="6" sweep-flag="1" x="6" x-axis-rotation="0" y="0"/>
-            <line x="45" y="0"/>
-            <arc large-arc-flag="0" rx="6" ry="6" sweep-flag="1" x="51" x-axis-rotation="0" y="6"/>
-            <line x="51" y="51.1"/>
+            <move x="0.0" y="99.2"/>
+            <line x="0.0" y="6.0"/>
+            <arc large-arc-flag="0.0" rx="6.0" ry="6.0" sweep-flag="1.0" x="6.0" x-axis-rotation="0.0" y="0.0"/>
+            <line x="45.0" y="0.0"/>
+            <arc large-arc-flag="0.0" rx="6.0" ry="6.0" sweep-flag="1.0" x="51.0" x-axis-rotation="0.0" y="6.0"/>
+            <line x="51.0" y="51.1"/>
             <line x="30.5" y="51.1"/>
-            <arc large-arc-flag="0" rx="7" ry="7" sweep-flag="0" x="23.5" x-axis-rotation="0" y="58.1"/>
+            <arc large-arc-flag="0.0" rx="7.0" ry="7.0" sweep-flag="0.0" x="23.5" x-axis-rotation="0.0" y="58.1"/>
             <line x="23.5" y="70.7"/>
             <line x="9.9" y="70.7"/>
             <line x="9.9" y="75.1"/>
@@ -478,21 +549,21 @@
             <line x="9.9" y="87.8"/>
             <line x="23.5" y="87.8"/>
             <line x="23.5" y="97.3"/>
-            <arc large-arc-flag="0" rx="7" ry="7" sweep-flag="0" x="24.2" x-axis-rotation="0" y="99.2"/>
+            <arc large-arc-flag="0.0" rx="7.0" ry="7.0" sweep-flag="0.0" x="24.2" x-axis-rotation="0.0" y="99.2"/>
             <close/>
             <move x="9.9" y="17.2"/>
-            <line x="41" y="17.2"/>
-            <line x="41" y="12.8"/>
+            <line x="41.0" y="17.2"/>
+            <line x="41.0" y="12.8"/>
             <line x="9.9" y="12.8"/>
             <close/>
             <move x="30.5" y="99.6"/>
-            <arc large-arc-flag="0" rx="3" ry="3" sweep-flag="1" x="27.5" x-axis-rotation="0" y="96.6"/>
+            <arc large-arc-flag="0.0" rx="3.0" ry="3.0" sweep-flag="1.0" x="27.5" x-axis-rotation="0.0" y="96.6"/>
             <line x="27.5" y="58.6"/>
-            <arc large-arc-flag="0" rx="3" ry="3" sweep-flag="1" x="30.5" x-axis-rotation="0" y="55.6"/>
+            <arc large-arc-flag="0.0" rx="3.0" ry="3.0" sweep-flag="1.0" x="30.5" x-axis-rotation="0.0" y="55.6"/>
             <line x="79.9" y="55.6"/>
-            <arc large-arc-flag="0" rx="3" ry="3" sweep-flag="1" x="82.9" x-axis-rotation="0" y="58.6"/>
+            <arc large-arc-flag="0.0" rx="3.0" ry="3.0" sweep-flag="1.0" x="82.9" x-axis-rotation="0.0" y="58.6"/>
             <line x="82.9" y="96.6"/>
-            <arc large-arc-flag="0" rx="3" ry="3" sweep-flag="1" x="79.9" x-axis-rotation="0" y="99.6"/>
+            <arc large-arc-flag="0.0" rx="3.0" ry="3.0" sweep-flag="1.0" x="79.9" x-axis-rotation="0.0" y="99.6"/>
             <close/>
             <move x="30.4" y="96.7"/>
             <line x="80.2" y="96.7"/>
@@ -519,17 +590,26 @@
     </foreground>
 </shape>
 <shape aspect="variable" h="86.5" name="Software Update Point" strokewidth="inherit" w="99.6">
-    <connections/>
+    <connections>
+        <constraint name="N" perimeter="0" x="0.4" y="0.01"/>
+        <constraint name="S" perimeter="0" x="0.5" y="0.945"/>
+        <constraint name="W" perimeter="0" x="0.0" y="0.5"/>
+        <constraint name="E" perimeter="0" x="0.87" y="0.5"/>
+        <constraint name="NE" perimeter="0" x="0.6" y="0.4"/>
+        <constraint name="NW" perimeter="0" x="0.02" y="0.02"/>
+        <constraint name="SE" perimeter="0" x="0.9" y="0.94"/>
+        <constraint name="SW" perimeter="0" x="0.0" y="0.94"/>
+    </connections>
     <foreground>
         <path>
-            <move x="0" y="81.4"/>
-            <line x="0" y="5.3"/>
-            <arc large-arc-flag="0" rx="5" ry="5" sweep-flag="1" x="5" x-axis-rotation="0" y="0.3"/>
-            <line x="36.7" y="0"/>
-            <arc large-arc-flag="0" rx="5" ry="5" sweep-flag="1" x="41.7" x-axis-rotation="0" y="5.3"/>
+            <move x="0.0" y="81.4"/>
+            <line x="0.0" y="5.3"/>
+            <arc large-arc-flag="0.0" rx="5.0" ry="5.0" sweep-flag="1.0" x="5.0" x-axis-rotation="0.0" y="0.3"/>
+            <line x="36.7" y="0.0"/>
+            <arc large-arc-flag="0.0" rx="5.0" ry="5.0" sweep-flag="1.0" x="41.7" x-axis-rotation="0.0" y="5.3"/>
             <line x="41.7" y="31.4"/>
             <line x="30.1" y="31.4"/>
-            <arc large-arc-flag="0" rx="7" ry="7" sweep-flag="0" x="24.3" x-axis-rotation="0" y="37.1"/>
+            <arc large-arc-flag="0.0" rx="7.0" ry="7.0" sweep-flag="0.0" x="24.3" x-axis-rotation="0.0" y="37.1"/>
             <line x="24.3" y="58.2"/>
             <line x="8.2" y="58.2"/>
             <line x="8.2" y="61.8"/>
@@ -539,7 +619,7 @@
             <line x="8.2" y="72.2"/>
             <line x="24.2" y="72.2"/>
             <line x="24.2" y="78.5"/>
-            <arc large-arc-flag="0" rx="7" ry="7" sweep-flag="0" x="25.3" x-axis-rotation="0" y="81.4"/>
+            <arc large-arc-flag="0.0" rx="7.0" ry="7.0" sweep-flag="0.0" x="25.3" x-axis-rotation="0.0" y="81.4"/>
             <close/>
             <move x="8.2" y="14.5"/>
             <line x="33.7" y="14.5"/>
@@ -547,17 +627,17 @@
             <line x="8.2" y="10.9"/>
             <close/>
             <move x="31.2" y="81.7"/>
-            <arc large-arc-flag="0" rx="4" ry="4" sweep-flag="1" x="27.2" x-axis-rotation="0" y="78.7"/>
+            <arc large-arc-flag="0.0" rx="4.0" ry="4.0" sweep-flag="1.0" x="27.2" x-axis-rotation="0.0" y="78.7"/>
             <line x="27.2" y="38.4"/>
-            <arc large-arc-flag="0" rx="4" ry="4" sweep-flag="1" x="31.2" x-axis-rotation="0" y="34.4"/>
+            <arc large-arc-flag="0.0" rx="4.0" ry="4.0" sweep-flag="1.0" x="31.2" x-axis-rotation="0.0" y="34.4"/>
             <line x="82.5" y="34.4"/>
-            <arc large-arc-flag="0" rx="4" ry="4" sweep-flag="1" x="86.5" x-axis-rotation="0" y="38.4"/>
+            <arc large-arc-flag="0.0" rx="4.0" ry="4.0" sweep-flag="1.0" x="86.5" x-axis-rotation="0.0" y="38.4"/>
             <line x="86.5" y="50.2"/>
             <line x="83.7" y="52.9"/>
             <line x="83.7" y="43.7"/>
             <line x="29.9" y="43.7"/>
             <line x="29.9" y="77.4"/>
-            <arc large-arc-flag="0" rx="1.5" ry="1.5" sweep-flag="0" x="31.4" x-axis-rotation="0" y="78.9"/>
+            <arc large-arc-flag="0.0" rx="1.5" ry="1.5" sweep-flag="0.0" x="31.4" x-axis-rotation="0.0" y="78.9"/>
             <line x="76.2" y="78.9"/>
             <line x="76.2" y="81.7"/>
             <close/>
@@ -577,7 +657,7 @@
             <line x="80.9" y="37.2"/>
             <close/>
             <move x="79.2" y="81.1"/>
-            <arc large-arc-flag="0" rx="10" ry="10" sweep-flag="0" x="86.7" x-axis-rotation="0" y="73"/>
+            <arc large-arc-flag="0.0" rx="10.0" ry="10.0" sweep-flag="0.0" x="86.7" x-axis-rotation="0.0" y="73.0"/>
             <line x="86.7" y="61.3"/>
             <line x="79.1" y="68.6"/>
             <line x="79.1" y="61.8"/>
@@ -586,7 +666,7 @@
             <line x="99.6" y="68.9"/>
             <line x="92.1" y="61.4"/>
             <line x="92.1" y="73.5"/>
-            <arc large-arc-flag="0" rx="14" ry="14" sweep-flag="1" x="79.2" x-axis-rotation="0" y="86.5"/>
+            <arc large-arc-flag="0.0" rx="14.0" ry="14.0" sweep-flag="1.0" x="79.2" x-axis-rotation="0.0" y="86.5"/>
             <close/>
         </path>
         <fillstroke/>

File diff suppressed because it is too large
+ 1949 - 0
src/main/webapp/stencils/mscae/vm.xml


+ 25 - 1
src/main/webapp/styles/dark.css

@@ -1,10 +1,13 @@
-html body .geDiagramContainer, html body div.geMenubarContainer, html body .geFooterContainer>div>img, html body div.mxPopupMenu,  html body td.mxPopupMenuIcon, html body .geFormatContainer {
+html body .geDiagramContainer, html body div.geMenubarContainer, html body div.mxPopupMenu,  html body td.mxPopupMenuIcon, html body .geFormatContainer {
 	background-color:#2a2a2a;
 }
 html body .geFooterContainer, html body #geFooterItem1, html body textarea, html body .mxWindowTitle, html body .geDialogTitle, html body .geDialogFooter {
 	background:#2a2a2a;
 	color:#cccccc;
 }
+html body .geFooterContainer a {
+	color:#337ab7;
+}
 html body div.mxRubberband {
 	border:1px dashed #ffffff !important; background:#505759 !important;
 }
@@ -85,3 +88,24 @@ html body .geDialog, html body div.mxWindow {
 	box-shadow:none;
 	color:#cccccc;
 }
+.geHint {
+	-webkit-box-shadow: 1px 1px 1px 0px #ccc;
+	-moz-box-shadow: 1px 1px 1px 0px #ccc;
+	box-shadow: 1px 1px 1px 0px #ccc;
+}
+.geEditor ::-webkit-scrollbar-corner {
+	background-color: #2a2a2a;
+}
+.geEditor ::-webkit-scrollbar-track {
+	background-color: #000;
+}
+.geEditor ::-webkit-scrollbar-thumb {
+	background-color: #505759;
+	border:#000 solid 3px;
+}
+.geEditor ::-webkit-scrollbar-thumb:hover {
+	background:#b5b5b5;
+}
+.geHsplit:hover, .geVsplit:hover {
+	background-color:#b5b5b5;
+}

+ 1 - 1
src/main/webapp/styles/grapheditor.css

@@ -416,7 +416,7 @@ div.mxWindow .geButton {
 	box-sizing:border-box;
 	width:100%;
 	height:100%;
-	padding:12px 38px 11px 38px;
+	padding:12px 10px 0px 10px;
 	white-space:nowrap;
 }
 .geHsplit {