Skip to content

Commit

Permalink
MOving components back to server
Browse files Browse the repository at this point in the history
  • Loading branch information
@robmoffat
robmoffat committed Jul 29, 2022
1 parent 1a918eb commit 54c8954
Show file tree
Hide file tree
Showing 67 changed files with 142 additions and 142 deletions.
8 changes: 4 additions & 4 deletions ...java/src/main/java/com/kite9/server/persistence/github/AbstractGithubEntityConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public String getTitle() {

@Override
public String getIcon() {
return "/github/kite9-org/kite9/templates/admin/icons/github.png?v=v0.13";
return "/github/kite9-org/kite9/templates/admin/icons/github.png?v=v0.14";
}

@Override
Expand Down Expand Up @@ -89,7 +89,7 @@ public String getTitle() {

@Override
public String getIcon() {
return "/github/kite9-org/kite9/templates/admin/icons/github.png?v=v0.13";
return "/github/kite9-org/kite9/templates/admin/icons/github.png?v=v0.14";
}

@Override
Expand Down Expand Up @@ -281,9 +281,9 @@ private String getIconUrl(Link l, GHContent c) {
if (fs.getFormatFor(c.getName()) instanceof DiagramFileFormat) {
return l.getHref();
} else if (hasIcon(c.getName())) {
return "/github/kite9-org/kite9/templates/admin/icons/"+getExtension(c.getName())+".svg?v=v0.13";
return "/github/kite9-org/kite9/templates/admin/icons/"+getExtension(c.getName())+".svg?v=v0.14";
} else {
return "/github/kite9-org/kite9/templates/admin/icons/unknown.svg?v=v0.13";
return "/github/kite9-org/kite9/templates/admin/icons/unknown.svg?v=v0.14";
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...-java/src/main/java/com/kite9/server/persistence/local/AbstractPublicEntityConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,9 @@ private String getExtension(String name) {
@Override
public String getIcon() {
if (hasIcon(d.getFilename())) {
return "/github/kite9-org/kite9/templates/admin/icons/"+getExtension(d.getFilename())+".svg?v=v0.13";
return "/github/kite9-org/kite9/templates/admin/icons/"+getExtension(d.getFilename())+".svg?v=v0.14";
} else {
return "/github/kite9-org/kite9/templates/admin/icons/unknown.svg?v=v0.13";
return "/github/kite9-org/kite9/templates/admin/icons/unknown.svg?v=v0.14";
}
}

Expand Down
2 changes: 1 addition & 1 deletion server/kite9-server-java/src/main/java/com/kite9/server/web/HateoasADLHttpMessageWriter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ protected Document generateRestXML(RepresentationModel<?> t) throws XMLStreamExc
}

private void handleTemplateNaming(Document out) {
out.getDocumentElement().setAttributeNS(Kite9Namespaces.XSL_TEMPLATE_NAMESPACE, "xslt:template", "/github/kite9-org/kite9/templates/admin/admin-template.xsl?v=v0.13");
out.getDocumentElement().setAttributeNS(Kite9Namespaces.XSL_TEMPLATE_NAMESPACE, "xslt:template", "/github/kite9-org/kite9/templates/admin/admin-template.xsl?v=v0.14");
}

/**
Expand Down
4 changes: 2 additions & 2 deletions server/kite9-server-java/src/main/resources/page-template.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<meta property="og:title" content="Kite9 Diagrams" />
<meta property="og:description"
content="Kite9 draws diagrams, automatically. UML, Risk-First, Templated, SVG, Flow-Charts, System Diagrams." />
<meta property="og:image" content="https://www.kite9.org/github/kite9-org/kite9/templates/admin/kite9-preview.png?v=v0.13" />
<meta property="og:image" content="https://www.kite9.org/github/kite9-org/kite9/templates/admin/kite9-preview.png?v=v0.14" />
<meta property="og:image:type" content="image/png" />
<meta property="og:image:width" content="718" />
<meta property="og:image:height" content="372" />
Expand All @@ -18,7 +18,7 @@
<meta property="twitter:title" content="Kite9" />
<meta property="twitter:description"
content="Kite9 draws diagrams, automatically. UML, Risk-First, Templated, SVG, Flow-Charts, System Diagrams." />
<meta property="twitter:image:src" content="https://www.kite9.org/github/kite9-org/kite9/templates/admin/kite9-preview.png?v=v0.13" />
<meta property="twitter:image:src" content="https://www.kite9.org/github/kite9-org/kite9/templates/admin/kite9-preview.png?v=v0.14" />
<meta property="twitter:image:width" content="718" />
<meta property="twitter:image:height" content="372" />
<meta charset="UTF-8" />
Expand Down
2 changes: 1 addition & 1 deletion ...er/kite9-server-java/src/main/resources/static/public/behaviours/updatable/adlResolver.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export function createAdlToSVGResolver(transition, command, metadata) {

const XSL_TEMPLATE_NAMESPACE = "http://www.kite9.org/schema/xslt";
const ADL_NAMESPACE = "http://www.kite9.org/schema/adl";
const DEFAULT_TEMPLATE = "/github/kite9-org/kite9/templates/basic/basic-template.xsl?v=v0.13";
const DEFAULT_TEMPLATE = "/github/kite9-org/kite9/templates/basic/basic-template.xsl?v=v0.14";
const META_NAMESPACE = "http://www.kite9.org/schema/metadata";


Expand Down
2 changes: 1 addition & 1 deletion server/kite9-server-java/src/main/resources/static/public/examples/basic.adl
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<diagram xslt:template="/github/kite9-org/kite9/templates/basic/basic-template.xsl?v=v0.13"
<diagram xslt:template="/github/kite9-org/kite9/templates/basic/basic-template.xsl?v=v0.14"
xmlns="http://www.kite9.org/schema/adl"
xmlns:xslt="http://www.kite9.org/schema/xslt" id="dia">

Expand Down
2 changes: 1 addition & 1 deletion server/kite9-server-java/src/main/resources/static/public/examples/formats.adl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<svg:defs>
<svg:style type="text/css">
@import url('/github/kite9-org/kite9/templates/formats/formats-textures.css?v=v0.13');
@import url('/github/kite9-org/kite9/templates/formats/formats-textures.css?v=v0.14');
</svg:style>
</svg:defs>

Expand Down
2 changes: 1 addition & 1 deletion server/kite9-server-java/src/main/resources/static/public/templates/containers/containers.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

import { once } from '/public/bundles/ensure.js'

import { command, metadata, dragger, contextMenu, layout, containment, palette } from '/github/kite9-org/kite9/templates/editor/editor.js?v=v0.13'
import { command, metadata, dragger, contextMenu, layout, containment, palette } from '/public/templates/editor/editor.js'

//Containers
import { initInsertPaletteCallback, initInsertContextMenuCallback, initInsertDragLocator } from '/public/behaviours/containers/insert/containers-insert.js'
Expand Down
6 changes: 3 additions & 3 deletions server/kite9-server-java/src/main/resources/static/public/templates/editor/editor.css
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import url('/github/kite9-org/kite9/templates/editor/dragable.css?v=v0.13');
@import url('/github/kite9-org/kite9/templates/highlight/highlight.css?v=v0.13');
@import url('/github/kite9-org/kite9/templates/editor/contradictions.css?v=v0.13');
@import url('/public/templates/editor/dragable.css');
@import url('/public/templates/highlight/highlight.css');
@import url('/public/templates/editor/contradictions.css');

/*
* ensures enough space to drag in when using the editor
Expand Down
2 changes: 1 addition & 1 deletion server/kite9-server-java/src/main/resources/static/public/templates/editor/editor.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import { once } from '/public/bundles/ensure.js'
* These are the global variables containing all of the classes used by the editor, and can be extended by other scripts using the
* plugin/behaviour system.
*/
import { command, metadata, transition, instrumentation, dragger, contextMenu, palette } from '/github/kite9-org/kite9/templates/adl/adl.js?v=v0.13'
import { command, metadata, transition, instrumentation, dragger, contextMenu, palette } from '/public/templates/adl/adl.js'

const
containment = new Containment(),
Expand Down
2 changes: 1 addition & 1 deletion server/kite9-server-java/src/main/resources/static/public/templates/grid/grid.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { initGridLayoutPropertyFormCallback, initGridLayoutPropertySetCallback }
import { initCellCreator } from '/public/behaviours/grid/create/create.js'


import { command, metadata, dragger, contextMenu, layout, palette, containment } from '/github/kite9-org/kite9/templates/editor/editor.js?v=v0.13'
import { command, metadata, dragger, contextMenu, layout, palette, containment } from '/public/templates/editor/editor.js'

export function initGrid() {

Expand Down
2 changes: 1 addition & 1 deletion server/kite9-server-java/src/main/resources/static/public/templates/labels/labels.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { once } from '/public/bundles/ensure.js'
import { initLabelContextMenuCallback } from '/public/behaviours/labels/label.js'
import { command, metadata, contextMenu } from '/github/kite9-org/kite9/templates/adl/adl.js?v=v0.13'
import { command, metadata, contextMenu } from '/public/templates/adl/adl.js'

function initLabels() {

Expand Down
2 changes: 1 addition & 1 deletion server/kite9-server-java/src/main/resources/static/public/templates/links/links.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { once } from '/public/bundles/ensure.js'
import { Linker } from '/public/classes/linker/linker.js'


import { command, metadata, instrumentation, dragger, contextMenu, containment, palette } from '/github/kite9-org/kite9/templates/editor/editor.js?v=v0.13'
import { command, metadata, instrumentation, dragger, contextMenu, containment, palette } from '/public/templates/editor/editor.js'

// Links
import { initLinkable, updateLink, initLinkerDropCallback } from '/public/behaviours/links/linkable.js'
Expand Down
2 changes: 1 addition & 1 deletion server/kite9-server-java/src/test/java/com/kite9/server/adl/PrivateGithubIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
@ContextConfiguration
public class PrivateGithubIT extends AbstractRestIT {

public static final String JS = "/github/kite9-org/examples/some.js?v=v0.13";
public static final String JS = "/github/kite9-org/examples/some.js?v=v0.14";
public static final String DIR = "/github/kite9-org/examples";


Expand Down
2 changes: 1 addition & 1 deletion .../kite9-server-java/src/test/resources/rendering/post/testESVGRender/diagram.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion server/kite9-server-java/src/test/resources/rendering/post/testHTMLRender/diagram.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
};
</script>
<script xlink:actuate="onLoad" xlink:type="simple" xlink:show="other" type="module" xmlns:xlink="http://www.w3.org/1999/xlink">
import '/github/kite9-org/kite9/templates/risk-first/risk-first.js?v=v0.13'
import '/github/kite9-org/kite9/templates/risk-first/risk-first.js?v=v0.14'
</script>
</defs>
</svg>
Expand Down
2 changes: 1 addition & 1 deletion ...kite9-server-java/src/test/resources/rendering/post/testSVGRender/diagram-2.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ...r/kite9-server-java/src/test/resources/rendering/post/testSVGRender/diagram.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions ...te9-server-java/src/test/resources/rendering/public/testExampleESVG/diagram.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions server/kite9-server-java/src/test/resources/rendering/public/testExampleHTML/diagram.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:pp="http://www.kite9.org/schema/post-processor" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:adl="http://www.kite9.org/schema/adl" xmlns:exslt="http://exslt.org/common" contentScriptType="text/ecmascript" zoomAndPan="magnify" contentStyleType="text/css" version="1.0" width="692" pp:width="$width" preserveAspectRatio="xMidYMid meet" height="745" pp:height="$height">
<metadata xmlns:md="http://www.kite9.org/schema/metadata">
<md:role>editor</md:role>
<md:self>http://localhost:39000/public/templates/risk-first/examples/minimal.adl?format=html</md:self>
<md:self>http://localhost:39000/public/templates/risk-first/examples/minimal.adlformat=html</md:self>
<md:title>minimal</md:title>
</metadata>
<defs>
Expand Down Expand Up @@ -170,7 +170,7 @@
};
</script>
<script xlink:actuate="onLoad" xlink:type="simple" xlink:show="other" type="module" xmlns:xlink="http://www.w3.org/1999/xlink">
import '/github/kite9-org/kite9/templates/risk-first/risk-first.js?v=v0.13'
import '/github/kite9-org/kite9/templates/risk-first/risk-first.js?v=v0.14'
</script>
</defs>
</svg>
Expand Down
4 changes: 2 additions & 2 deletions ...ite9-server-java/src/test/resources/rendering/public/testExampleSVG/diagram.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions .../resources/rendering/public/testExampleSVG/public/templates/admin/index.adl.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions ...esources/rendering/public/testExampleSVG/public/templates/basic/example.adl.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions ...esources/rendering/public/testExampleSVG/public/templates/basic/palette.adl.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions ...resources/rendering/public/testExampleSVG/public/templates/bpmn/example.adl.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 54c8954

Please sign in to comment.