Skip to content

Commit 420e93a

Browse files
seidewitzseidewitz
authored
Merge pull request #92 from ModelDriven/ST6RI-179
ST6RI-179 Build Eclipse repository for update site.
2 parents 433d7be + 60d693a commit 420e93a

10 files changed

Lines changed: 207 additions & 41 deletions

File tree

‎org.omg.sysml.feature/feature.xml‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,32 @@
22
<feature
33
id="org.omg.sysml.feature"
44
label="SysML v2 Feature"
5-
version="0.2.0.qualifier"
5+
version="0.3.0.qualifier"
66
provider-name="SysML v2 Submission Team">
77

88
<description url="http://www.example.com/description">
99
UI plugins for the SysML v2 pilot implementation of editors for the textual notation for the Kernel Model Language (KerML) and the Systems Modeling Language (SysML).
1010
</description>
1111

1212
<copyright>
13-
Copyright (c) 2019 Model Drive Solutions, Inc.
14-
Copyright (c) 2019 California Institute of Technology (Jet Propulsion Laboratory)
15-
Copyright (c) 2019 IncQuery Labs Ltd.
16-
Copyright (c) 2019 Itemis
13+
Copyright (c) 2019-2020 Model Driven Solutions, Inc.
14+
Copyright (c) 2019-2020 California Institute of Technology (Jet Propulsion
15+
Laboratory)
16+
Copyright (c) 2019-2020 IncQuery Labs Ltd.
17+
Copyright (c) 2019-2020 Itemis
18+
Copyright (c) 2019-2020 Maplesoft (Waterloo Maple, Inc.)
19+
Copyright (c) 2019-2020 Mgnite Inc.
1720
</copyright>
1821

1922
<license url="">
20-
Copyright (c) 2019 Model Drive Solutions, Inc.
21-
Copyright (c) 2019 California Institute of Technology (Jet Propulsion Laboratory)
22-
Copyright (c) 2019 IncQuery Labs Ltd.
23-
Copyright (c) 2019 Itemis
23+
SysML v2 Pilot Implementation Licensing Agreement
24+
25+
Copyright (c) 2019-2020 Model Driven Solutions, Inc.
26+
Copyright (c) 2019-2020 California Institute of Technology (Jet Propulsion Laboratory)
27+
Copyright (c) 2019-2020 IncQuery Labs Ltd.
28+
Copyright (c) 2019-2020 Itemis
29+
Copyright (c) 2019-2020 Maplesoft (Waterloo Maple, Inc.)
30+
Copyright (c) 2019-2020 Mgnite Inc.
2431

2532
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &quot;Software&quot;), to use and redistribute the Software and to permit persons to whom the Software is furnished to do so, subject to the conditions that the above copyright notice and this permission notice shall be included in all copies of the Software. No permission is granted to modify, merge, and/or sell copies of the Software, or to create derivative works based on the Software.
2633

‎org.omg.sysml.interactive/sysmli.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<include name="*/plugin.properties"/>
2020
</fileset>
2121
</concat>
22-
<jar destfile="${jar.file}">
22+
<jar destfile="${jar.file}" update="true">
2323
<manifest>
2424
<attribute name="Main-Class" value="${main.class}" />
2525
</manifest>

‎org.omg.sysml.plantuml.feature/.project‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>org.omg.sysml.plantuml.feature</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.pde.FeatureBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.pde.FeatureNature</nature>
16+
</natures>
17+
</projectDescription>

‎org.omg.sysml.plantuml.feature/build.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bin.includes = feature.xml

‎org.omg.sysml.plantuml.feature/feature.xml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<feature
3+
id="org.omg.sysml.plantuml.feature"
4+
label="SysML v2 PlantUML Visualization Feature"
5+
version="0.3.0.qualifier"
6+
provider-name="SysML v2 Submission Team">
7+
8+
<description url="http://www.example.com/description">
9+
PlantUML Visualization plugins for the SysML v2 pilot implementation of editors for the textual notation for the Kernel Model Language (KerML) and the Systems Modeling Language (SysML).
10+
</description>
11+
12+
<copyright>
13+
Copyright (c) 2019-2020 Model Driven Solutions, Inc.
14+
Copyright (c) 2019-2020 California Institute of Technology (Jet
15+
Propulsion Laboratory)
16+
Copyright (c) 2019-2020 IncQuery Labs Ltd.
17+
Copyright (c) 2019-2020 Itemis
18+
Copyright (c) 2019-2020 Maplesoft (Waterloo Maple, Inc.)
19+
Copyright (c) 2019-2020 Mgnite Inc.
20+
</copyright>
21+
22+
<license url="">
23+
SysML v2 Pilot Implementation Licensing Agreement
24+
25+
Copyright (c) 2019-2020 Model Driven Solutions, Inc.
26+
Copyright (c) 2019-2020 California Institute of Technology (Jet Propulsion Laboratory)
27+
Copyright (c) 2019-2020 IncQuery Labs Ltd.
28+
Copyright (c) 2019-2020 Itemis
29+
Copyright (c) 2019-2020 Maplesoft (Waterloo Maple, Inc.)
30+
Copyright (c) 2019-2020 Mgnite Inc.
31+
32+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &quot;Software&quot;), to use and redistribute the Software and to permit persons to whom the Software is furnished to do so, subject to the conditions that the above copyright notice and this permission notice shall be included in all copies of the Software. No permission is granted to modify, merge, and/or sell copies of the Software, or to create derivative works based on the Software.
33+
34+
THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
35+
</license>
36+
37+
<plugin
38+
id="org.omg.sysml.plantuml"
39+
download-size="0"
40+
install-size="0"
41+
version="0.0.0"
42+
unpack="false"/>
43+
44+
<plugin
45+
id="org.omg.sysml.plantuml.eclipse"
46+
download-size="0"
47+
install-size="0"
48+
version="0.0.0"
49+
unpack="false"/>
50+
51+
</feature>

‎org.omg.sysml.site/README.md‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
# Eclipse Installation
1+
# SysML v2 Release 2020-03 Eclipse Installation
22

3-
Requirements: Eclipse 2019-06 (4.12) or later, with Java Development Kit
3+
**Requirements:** Eclipse 2019-12 (4.14) or later, with Java Development Kit
44

55
## Installing the plugins
66

77
1. Open an Eclipse workspace.
88

99
2. Select `Help > Install New Software`.
1010

11-
3. Select `Add...` and then, in the add dialog, select `Local...` .
11+
3. Select `Add...` and then, in the add dialog, select `Archive...` .
1212

13-
4. Navigate to the `org.omg.sysml.site` directory and select it. (You can give it a name if you wish.)
13+
4. Navigate to the `org.omg.sysml.site-0.3.0.zip` archive and select it. (You can give it a name if you wish.)
1414

1515
5. In the Install window, select the `KerML and SysML Editors` category and click `Next`.
1616

@@ -32,19 +32,30 @@ Requirements: Eclipse 2019-06 (4.12) or later, with Java Development Kit
3232

3333
**Important Note:** Import the `kerml` and `sysml` projects *only* after importing and building the `sysml.library` project.
3434

35+
After installation is complete, if you wish to turn `Build Automatically` back on, first go to `Preferences > General > Workspace > Build`
36+
and make sure that `sysml.library` is before `kerml` and `sysml` in the build order.
37+
3538
## Creating model files
3639

3740
1. Create Kernel Modeling Language (KerML) files in the `kerml/src` directory. The extension for a KerML file is `.kerml`.
3841

3942
2. Create Systems Modeling Language (SysML) files in the `sysml/src` directory. The extension for a SysML fiile is `.sysml`.
4043

4144
3. You can view the model library files in the `sysml.library` project, but *do not change them*.
45+
46+
**Release Note:** In the current implementation, there are cases in which the processing of a file with several name resolution errors can take a very long time,
47+
particularly if the `Quantities and Units` library is being used. This will be fixed in a future release.
4248

43-
3. After installation is complete, you can turn `Build Automatically` back on if you wish. However, if you ever experience excessive build times in either the KerML or SysML projects, do the following:
49+
## Graphical visualization
50+
51+
This release includes a prototype graphical visualization capability with diagrams rendered using the open source [PlantUML](https://plantuml.com) tooling.
52+
53+
1. PlantUML visualization requires that [GraphViz](https://www.graphviz.org) be installed. Visit [ https://www.graphviz.org/download/](https://www.graphviz.org/download/)
54+
and download the appropriate package for your environment.
55+
56+
2. If Eclipse cannot automatically find the path to the GraphViz executable, you can set it by going to `Preferences > PlantUML`.
57+
For details, visit [ https://plantuml.com/en/eclipse](https://plantuml.com/en/eclipse).
58+
59+
3. To show SysML diagrams, in `Window > Show View > Other...` select the PlantUML view. The diagram rendered in the view is relative to the text selected
60+
in the active SysML editor view. Basic block definition (class) and state machine diagrams are currently supported.
4461

45-
* Cancel any ongoing build.
46-
* Turn `Build Automatically` off.
47-
* Click on the `sysml.library` project and select `Project > Build Project`.
48-
* Similarly rebuild the `kerml` and/or `sysml` projects as necessary.
49-
50-
**Release Note:** In the current implementation, there are cases in which the processing of a file with several name resolution errors can take a very long time, particularly if the `Quantities and Units` library is being used. This will be fixed in a future release.

‎org.omg.sysml.site/README.pdf‎

3.04 KB
Binary file not shown.

org.omg.sysml.site/site.xml renamed to org.omg.sysml.site/category.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@
33
<description name="SysML v2 Pilot Implementation Update Site">
44
This site contains feature and plugin versions for the Eclipse-based pilot implementation of SysML v2, as developed by the SysML v2 Submission Team.
55
</description>
6-
<feature url="features/org.omg.sysml.feature_0.2.0.202002041715.jar" id="org.omg.sysml.feature" version="0.2.0.202002041715">
6+
<repository-reference location="http://download.eclipse.org/releases/2019-12" enabled="true" />
7+
<repository-reference location="http://hallvard.github.io/plantuml/" enabled="true" />
8+
9+
<feature id="org.omg.sysml.feature">
10+
<category name="KerML and SysML Editors"/>
11+
</feature>
12+
<feature id="org.omg.sysml.plantuml.feature">
713
<category name="KerML and SysML Editors"/>
814
</feature>
915
<category-def name="KerML and SysML Editors" label="KerML and SysML Editors">

‎org.omg.sysml.site/pom.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
2+
xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4+
<modelVersion>4.0.0</modelVersion>
5+
<parent>
6+
<!-- <relativePath>../pom.xml</relativePath> -->
7+
<groupId>org.omg.sysml</groupId>
8+
<artifactId>org.omg.sysml.parent</artifactId>
9+
<version>0.3.0</version>
10+
</parent>
11+
<groupId>org.omg.sysml</groupId>
12+
<artifactId>org.omg.sysml.site</artifactId>
13+
14+
<packaging>eclipse-repository</packaging>
15+
16+
</project>

‎pom.xml‎

Lines changed: 76 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,26 @@
1111
<module>org.omg.sysml</module>
1212
<module>org.omg.kerml.xtext</module>
1313
<module>org.omg.sysml.xtext</module>
14-
<module>org.omg.sysml.plantuml</module>
14+
<module>org.omg.kerml.xtext.ui</module>
15+
<module>org.omg.sysml.xtext.ui</module>
16+
<module>org.omg.kerml.xtext.ide</module>
17+
<module>org.omg.sysml.xtext.ide</module>
1518
<module>org.omg.sysml.interactive</module>
19+
<module>org.omg.sysml.feature</module>
20+
<module>org.omg.sysml.plantuml</module>
21+
<module>org.omg.sysml.plantuml.eclipse</module>
22+
<module>org.omg.sysml.plantuml.feature</module>
23+
<module>org.omg.sysml.site</module>
1624
</modules>
1725

1826
<properties>
1927
<tycho-version>1.6.0</tycho-version>
2028
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
21-
<eclipse-repository>http://download.eclipse.org/releases/2019-12</eclipse-repository>
29+
<eclipse-repository>https://download.eclipse.org/releases/2019-12</eclipse-repository>
30+
<plantuml-repository>https://hallvard.github.io/plantuml</plantuml-repository>
2231
<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
32+
<maven.compiler.target>1.8</maven.compiler.target>
33+
<maven.compiler.source>1.8</maven.compiler.source>
2334
</properties>
2435

2536
<repositories>
@@ -28,24 +39,70 @@
2839
<url>${eclipse-repository}</url>
2940
<layout>p2</layout>
3041
</repository>
42+
<repository>
43+
<id>plantuml-eclipse</id>
44+
<url>${plantuml-repository}</url>
45+
<layout>p2</layout>
46+
</repository>
3147
</repositories>
3248

3349
<build>
34-
<plugins>
35-
<plugin>
36-
<groupId>org.eclipse.tycho</groupId>
37-
<artifactId>tycho-maven-plugin</artifactId>
38-
<version>${tycho-version}</version>
39-
<extensions>true</extensions>
40-
</plugin>
41-
<plugin>
42-
<groupId>org.eclipse.tycho</groupId>
43-
<artifactId>tycho-packaging-plugin</artifactId>
44-
<version>${tycho-version}</version>
45-
<configuration>
46-
<strictVersions>false</strictVersions>
47-
</configuration>
48-
</plugin>
49-
</plugins>
50-
</build>
50+
<plugins>
51+
<plugin>
52+
<groupId>org.eclipse.tycho</groupId>
53+
<artifactId>tycho-maven-plugin</artifactId>
54+
<version>${tycho-version}</version>
55+
<extensions>true</extensions>
56+
</plugin>
57+
58+
<plugin>
59+
<groupId>org.eclipse.tycho</groupId>
60+
<artifactId>tycho-p2-repository-plugin</artifactId>
61+
<version>${tycho-version}</version>
62+
<configuration>
63+
<includeAllDependencies>false</includeAllDependencies>
64+
</configuration>
65+
</plugin>
66+
67+
<plugin>
68+
<groupId>org.eclipse.tycho.extras</groupId>
69+
<artifactId>tycho-source-feature-plugin</artifactId>
70+
<version>${tycho-version}</version>
71+
<executions>
72+
<execution>
73+
<id>source-feature</id>
74+
<phase>package</phase>
75+
<goals>
76+
<goal>source-feature</goal>
77+
</goals>
78+
</execution>
79+
</executions>
80+
<configuration>
81+
<excludes/>
82+
</configuration>
83+
</plugin>
84+
<plugin>
85+
<groupId>org.eclipse.tycho</groupId>
86+
<artifactId>tycho-source-plugin</artifactId>
87+
<version>${tycho-version}</version>
88+
<executions>
89+
<execution>
90+
<id>plugin-source</id>
91+
<goals>
92+
<goal>plugin-source</goal>
93+
</goals>
94+
</execution>
95+
</executions>
96+
</plugin>
97+
98+
<plugin>
99+
<groupId>org.eclipse.tycho</groupId>
100+
<artifactId>tycho-packaging-plugin</artifactId>
101+
<version>${tycho-version}</version>
102+
<configuration>
103+
<strictVersions>false</strictVersions>
104+
</configuration>
105+
</plugin>
106+
</plugins>
107+
</build>
51108
</project>

0 commit comments

Comments
 (0)