Skip to content

Commit 8b73350

Browse files
committed
Initial Vaadin 14+ NPM mode support
1 parent b1b36eb commit 8b73350

File tree

39 files changed

+770
-6862
lines changed

39 files changed

+770
-6862
lines changed

.gitignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,12 @@
66
/orgchart-addon-demo/.settings
77
/orgchart-addon-demo/target
88
/orgchart-addon-demo/.classpath
9+
/.project
10+
/.settings
11+
/target
12+
/package.json
13+
/webpack.config.js
14+
/webpack.generated.js
15+
/node_modules
16+
/package-lock.json
17+
/.classpath

LICENSE

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
1-
Apache License
1+
All parts, except the contents of the documentation module, are licenced
2+
under Apache License v2.0. See the license text below.
3+
4+
The documentation is licensed under Creative Commons CC-BY-ND 2.0
5+
(http://creativecommons.org/licenses/by-nd/2.0/legalcode).
6+
7+
8+
-----------------------------------------------------------------------------
9+
10+
Apache License
211
Version 2.0, January 2004
312
http://www.apache.org/licenses/
413

README.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
[![Build Status](https://jenkins.flowingcode.com/job/OrgChart-addon/badge/icon)](https://jenkins.flowingcode.com/job/OrgChart-addon)
1+
[![Published on Vaadin Directory](https://img.shields.io/badge/Vaadin%20Directory-published-00b4f0.svg)](https://vaadin.com/directory/component/orgchart-add-on)
2+
[![Stars on vaadin.com/directory](https://img.shields.io/vaadin-directory/star/orgchart-add-on.svg)](https://vaadin.com/directory/component/orgchart-add-on)
3+
[![Build Status](https://jenkins.flowingcode.com/job/OrgChart-14-addon/badge/icon)](https://jenkins.flowingcode.com/job/OrgChart-14-addon/)
24

3-
# OrgChart Add-On for Vaadin 8.x
5+
# OrgChart Add-On
46

5-
OrgChart Add-On is a Vaadin integration with the JQuery library [OrgChart](https://github.com/dabeng/OrgChart).
7+
OrgChart Add-On is a Vaadin 14+ NPM mode integration of the library [OrgChart](https://github.com/dabeng/OrgChart).
68

79
## Features
810

@@ -28,7 +30,7 @@ OrgChart Add-On is a Vaadin integration with the JQuery library [OrgChart](https
2830

2931
## Online demo
3032

31-
Try the add-on demo at http://addons.flowingcode.com/orgchart
33+
Try the add-on demo at http://addonsv14.flowingcode.com/orgchart
3234

3335
## Download release
3436

@@ -59,6 +61,8 @@ To see the demo, navigate to http://localhost:8080/
5961
- Update jackson-databind dependency because of security vulnerabilities [(#7)](https://github.com/FlowingCode/OrgChartAddon/issues/7)
6062
### Version 2.0.4
6163
- Add support for click events [(#4)](https://github.com/FlowingCode/OrgChartAddon/issues/4) and tooltips in orgchart nodes [(#9)](https://github.com/FlowingCode/OrgChartAddon/issues/9)
64+
### Version 4.0.0
65+
- Initial release for Vaadin 14+ (npm mode)
6266

6367
## Roadmap
6468

assembly/MANIFEST.MF

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Manifest-Version: 1.0
2+
Vaadin-Package-Version: 1
3+
Vaadin-Addon: ${project.build.finalName}.${project.packaging}
4+
Implementation-Vendor: ${organization.name}
5+
Implementation-Title: ${project.name}
6+
Implementation-Version: ${project.version}

assembly/assembly.xml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<assembly
3+
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
6+
<id>game-card</id>
7+
8+
<formats>
9+
<format>zip</format>
10+
</formats>
11+
12+
<!-- Do not use because we must put META-INF/MANIFEST.MF there. -->
13+
<includeBaseDirectory>false</includeBaseDirectory>
14+
15+
<fileSets>
16+
<fileSet>
17+
<directory>..</directory>
18+
<includes>
19+
<include>LICENSE</include>
20+
<include>README.md</include>
21+
</includes>
22+
</fileSet>
23+
<fileSet>
24+
<directory>target</directory>
25+
<outputDirectory></outputDirectory>
26+
<includes>
27+
<include>*.jar</include>
28+
<include>*.pdf</include>
29+
</includes>
30+
</fileSet>
31+
</fileSets>
32+
33+
<files>
34+
<!-- This is vaadin.com/directory related manifest needed in the
35+
zip package -->
36+
<file>
37+
<source>assembly/MANIFEST.MF</source>
38+
<outputDirectory>META-INF</outputDirectory>
39+
<filtered>true</filtered>
40+
</file>
41+
</files>
42+
</assembly>

orgchart-addon-demo/LICENSE.txt

Lines changed: 0 additions & 201 deletions
This file was deleted.

0 commit comments

Comments
 (0)