Skip to content

Commit 3d431fd

Browse files
JakobHaastertSBJakobHaastertSB
authored
Merge pull request #1 from JakobHaastertSB/dev/haastert
added many spviz-osgi functionalities
2 parents ff8f1f4 + fa86fdb commit 3d431fd

File tree

14 files changed

+1184
-758
lines changed

14 files changed

+1184
-758
lines changed

‎osgi/de.cau.cs.kieler.spviz.osgi.generate/.project‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
<projects>
66
</projects>
77
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
813
<buildCommand>
914
<name>org.eclipse.jdt.core.javabuilder</name>
1015
<arguments>
@@ -17,7 +22,8 @@
1722
</buildCommand>
1823
</buildSpec>
1924
<natures>
20-
<nature>org.eclipse.m2e.core.maven2Nature</nature>
2125
<nature>org.eclipse.jdt.core.javanature</nature>
26+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
27+
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
2228
</natures>
2329
</projectDescription>

‎osgi/de.cau.cs.kieler.spviz.osgi.generate/.settings/org.eclipse.jdt.apt.core.prefs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.apt.aptEnabled=true
3+
org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations
4+
org.eclipse.jdt.apt.genTestSrcDir=target/generated-test-sources/test-annotations

‎osgi/osgi.spviz‎ renamed to ‎osgi/de.cau.cs.kieler.spviz.osgi.generate/osgi.spviz‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,32 @@ SPViz OSGiViz {
1414
connect OSGi.ServiceComponent.Required via OSGi.Bundle in Services
1515
connect OSGi.ServiceInterface.ProvidedBy via OSGi.Bundle in Services
1616
}
17+
1718
BundleDependencies {
1819
show OSGi.Bundle
1920
connect OSGi.Bundle.Dependency
20-
// connect OSGi.Bundle via OSGi.Bundle.PackageDependency
2121
}
22+
23+
PackageDependencies {
24+
show OSGi.Bundle
25+
show OSGi.Package
26+
connect OSGi.Bundle.PackageExportDependency
27+
connect OSGi.Bundle.PackageImportDependency
28+
connect OSGi.Bundle.PackageDependency
29+
}
30+
31+
AllDependencies {
32+
show OSGi.Bundle
33+
connect OSGi.Bundle.Dependency
34+
connect OSGi.Bundle.PackageDependency
35+
}
36+
2237
Products {
2338
show OSGi.Product
24-
// connect OSGi.Bundle.Dependency via OSGi.Product>OSGi.Feature>OSGi.Bundle
2539
}
2640
Features {
2741
show OSGi.Feature
2842
connect OSGi.Bundle.Dependency via OSGi.Feature in BundleDependencies
29-
// connect Feature to Feature via source Feature>Bundle and target Feature>Bundle >Dep
3043
}
3144

3245
OSGi.Product shows {

‎osgi/osgi.spvizmodel‎ renamed to ‎osgi/de.cau.cs.kieler.spviz.osgi.generate/osgi.spvizmodel‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,20 @@ SPVizModel OSGi {
1010
}
1111
Bundle {
1212
Dependency connects Bundle
13-
PackageDependency connects Package
13+
PackageExportDependency connects Package
14+
PackageImportDependency connects Package
15+
PackageDependency connects Bundle
16+
contains Package
1417
contains ServiceInterface
1518
contains ServiceComponent
16-
contains Package
1719
}
1820
ServiceInterface {
1921
ProvidedBy connects ServiceComponent
2022
}
2123
ServiceComponent {
2224
Required connects ServiceInterface
2325
}
24-
Package
26+
Package {
27+
ImportedBy connects Bundle
28+
}
2529
}

‎osgi/de.cau.cs.kieler.spviz.osgi.generate/pom.xml‎

Lines changed: 48 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,34 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0"
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4-
4+
55
<parent>
6-
<groupId>de.cau.cs.kieler.spviz</groupId>
7-
<artifactId>parent</artifactId>
8-
<version>0.1.0-SNAPSHOT</version>
9-
<relativePath>../spviz.build/pom.xml</relativePath> <!-- Only works like this if the parent will be generated at this relative path
10-
(so, if the generator is next to the other generated bundles). Adapt this path for other use cases. -->
6+
<groupId>de.cau.cs.kieler.spviz</groupId>
7+
<artifactId>parent</artifactId>
8+
<version>0.1.0-SNAPSHOT</version>
9+
<relativePath>../spviz.build/pom.xml</relativePath> <!-- Only works like
10+
this if the parent will be generated at this relative path
11+
(so, if the generator is next to the other generated bundles). Adapt this path
12+
for other use cases. -->
1113
</parent>
12-
14+
1315
<modelVersion>4.0.0</modelVersion>
1416
<groupId>de.cau.cs.kieler.spviz.osgi.generate</groupId>
1517
<artifactId>de.cau.cs.kieler.spviz.osgi.generate</artifactId>
1618
<version>0.0.1-SNAPSHOT</version>
19+
<packaging>maven-plugin</packaging>
1720

1821
<dependencies>
22+
<dependency>
23+
<groupId>org.apache.maven</groupId>
24+
<artifactId>maven-plugin-api</artifactId>
25+
<version>3.9.6</version>
26+
</dependency>
27+
<dependency>
28+
<groupId>org.apache.maven.plugin-tools</groupId>
29+
<artifactId>maven-plugin-annotations</artifactId>
30+
<version>3.9.0</version>
31+
</dependency>
1932
<dependency>
2033
<groupId>org.eclipse.emf</groupId>
2134
<artifactId>org.eclipse.emf.ecore.xmi</artifactId>
@@ -31,11 +44,11 @@
3144
<artifactId>picocli</artifactId>
3245
<version>4.6.3</version>
3346
</dependency>
34-
<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
47+
<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
3548
<dependency>
36-
<groupId>commons-io</groupId>
37-
<artifactId>commons-io</artifactId>
38-
<version>2.11.0</version>
49+
<groupId>commons-io</groupId>
50+
<artifactId>commons-io</artifactId>
51+
<version>2.11.0</version>
3952
</dependency>
4053
</dependencies>
4154

@@ -50,6 +63,14 @@
5063
</resource>
5164
</resources>
5265
<plugins>
66+
<plugin>
67+
<groupId>org.apache.maven.plugins</groupId>
68+
<artifactId>maven-plugin-plugin</artifactId>
69+
<version>3.6.4</version>
70+
<configuration>
71+
<goalPrefix>generate-spviz-osgi</goalPrefix>
72+
</configuration>
73+
</plugin>
5374
<plugin>
5475
<artifactId>maven-compiler-plugin</artifactId>
5576
<version>3.10.0</version>
@@ -66,27 +87,29 @@
6687
<execution>
6788
<phase>package</phase>
6889
<goals>
69-
<goal>shade</goal>
90+
<goal>shade</goal>
7091
</goals>
7192
<configuration>
7293
<transformers>
73-
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
74-
<mainClass>de.cau.cs.kieler.spviz.osgi.generate.ConfigAndExecuteCli</mainClass>
94+
<transformer
95+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
96+
<mainClass>
97+
de.cau.cs.kieler.spviz.osgi.generate.ConfigAndExecuteCli</mainClass>
7598
</transformer>
7699
</transformers>
77100
<filters>
78101
<filter>
79-
<artifact>*:*</artifact>
80-
<excludes>
81-
<exclude>META-INF/*.SF</exclude>
82-
<exclude>META-INF/*.DSA</exclude>
83-
<exclude>META-INF/*.RSA</exclude>
84-
<exclude>META-INF/MANIFEST.MF</exclude>
85-
<exclude>schema/*.exsd</exclude>
86-
<exclude>about.*</exclude>
87-
<exclude>modeling32.png</exclude>
88-
<exclude>plugin.*</exclude>
89-
</excludes>
102+
<artifact>*:*</artifact>
103+
<excludes>
104+
<exclude>META-INF/*.SF</exclude>
105+
<exclude>META-INF/*.DSA</exclude>
106+
<exclude>META-INF/*.RSA</exclude>
107+
<exclude>META-INF/MANIFEST.MF</exclude>
108+
<exclude>schema/*.exsd</exclude>
109+
<exclude>about.*</exclude>
110+
<exclude>modeling32.png</exclude>
111+
<exclude>plugin.*</exclude>
112+
</excludes>
90113
</filter>
91114
</filters>
92115
<createDependencyReducedPom>false</createDependencyReducedPom>

0 commit comments

Comments
 (0)