Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions osgi/de.cau.cs.kieler.spviz.osgi.generate/.project
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
<arguments>
</arguments>
</buildCommand>
Comment on lines +8 to +12
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these XtextBuilder and -nature now necessary due to the Maven Mojo you added or what do you need this for?

<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
Expand All @@ -19,5 +24,6 @@
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
</natures>
</projectDescription>
27 changes: 27 additions & 0 deletions osgi/de.cau.cs.kieler.spviz.osgi.generate/dependencies.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
de.cau.cs.kieler.spviz.osgi.generate:de.cau.cs.kieler.spviz.osgi.generate:maven-plugin:0.0.1-SNAPSHOT
+- org.apache.maven:maven-plugin-api:jar:3.9.6:compile
| +- org.apache.maven:maven-model:jar:3.9.6:compile
| +- org.apache.maven:maven-artifact:jar:3.9.6:compile
| | \- org.apache.commons:commons-lang3:jar:3.12.0:compile
| +- org.eclipse.sisu:org.eclipse.sisu.plexus:jar:0.9.0.M2:compile
| | +- javax.annotation:javax.annotation-api:jar:1.2:compile
| | +- org.eclipse.sisu:org.eclipse.sisu.inject:jar:0.9.0.M2:compile
| | \- org.codehaus.plexus:plexus-component-annotations:jar:2.1.0:compile
| +- org.codehaus.plexus:plexus-utils:jar:3.5.1:compile
| \- org.codehaus.plexus:plexus-classworlds:jar:2.7.0:compile
+- org.apache.maven.plugin-tools:maven-plugin-annotations:jar:3.9.0:compile
+- org.eclipse.emf:org.eclipse.emf.ecore.xmi:jar:2.16.0:compile
| \- org.eclipse.emf:org.eclipse.emf.ecore:jar:2.38.0:compile (version selected from constraint [2.18.0,3.0.0))
| \- org.eclipse.emf:org.eclipse.emf.common:jar:2.40.0:compile (version selected from constraint [2.40.0,3.0.0))
+- de.cau.cs.kieler.spviz.osgi:de.cau.cs.kieler.spviz.osgi.model:jar:0.1.0-SNAPSHOT:compile
| +- com.google.guava:guava:jar:32.1.3-jre:compile
| | +- com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava:compile
| | +- com.google.code.findbugs:jsr305:jar:3.0.2:compile
| | +- org.checkerframework:checker-qual:jar:3.37.0:compile
| | +- com.google.errorprone:error_prone_annotations:jar:2.21.1:compile
| | \- com.google.j2objc:j2objc-annotations:jar:2.8:compile
| +- com.google.guava:failureaccess:jar:1.0.2:compile
| \- org.osgi:org.osgi.service.prefs:jar:1.1.2:compile
| \- org.osgi:osgi.annotation:jar:8.0.1:compile
+- info.picocli:picocli:jar:4.6.3:compile
\- commons-io:commons-io:jar:2.11.0:compile
45 changes: 38 additions & 7 deletions osgi/osgi.spviz → ....cs.kieler.spviz.osgi.generate/osgi.spviz
Original file line number Diff line number Diff line change
Expand Up @@ -14,35 +14,66 @@ SPViz OSGiViz {
connect OSGi.ServiceComponent.Required via OSGi.Bundle in Services
connect OSGi.ServiceInterface.ProvidedBy via OSGi.Bundle in Services
}
BundleDependencies {

RequireBundleDependencies {
show OSGi.Bundle
connect OSGi.Bundle.Dependency
}

BundlePackageDependencies {
show OSGi.Bundle
show OSGi.Package
connect OSGi.Bundle.PackageExportDependency
connect OSGi.Bundle.PackageImportDependency
connect OSGi.Bundle.PackageDependency
}

AllDependencies {
show OSGi.Bundle
connect OSGi.Bundle.Dependency
// connect OSGi.Bundle via OSGi.Bundle.PackageDependency
connect OSGi.Bundle.PackageDependency
}

Products {
show OSGi.Product
// connect OSGi.Bundle.Dependency via OSGi.Product>OSGi.Feature>OSGi.Bundle
}
Features {
show OSGi.Feature
connect OSGi.Bundle.Dependency via OSGi.Feature in BundleDependencies
// connect Feature to Feature via source Feature>Bundle and target Feature>Bundle >Dep
connect OSGi.Bundle.Dependency via OSGi.Feature in RequireBundleDependencies
}

OSGi.Product shows {
Services with {
OSGi.ServiceInterface from OSGi.Product>OSGi.Bundle>OSGi.ServiceInterface
OSGi.ServiceComponent from OSGi.Product>OSGi.Bundle>OSGi.ServiceComponent
}
BundleDependencies with {
RequireBundleDependencies with {
OSGi.Bundle from OSGi.Product>OSGi.Bundle
}
BundlePackageDependencies with {
OSGi.Bundle from OSGi.Product>OSGi.Bundle
OSGi.Package from OSGi.Product>OSGi.Package
}
AllDependencies with {
OSGi.Bundle from OSGi.Product>OSGi.Bundle
}
Features with {
OSGi.Feature from OSGi.Product>OSGi.Feature
}
}

OSGi.Feature shows {
BundleDependencies with {
RequireBundleDependencies with {
OSGi.Bundle from OSGi.Feature>OSGi.Bundle
}
BundlePackageDependencies with {
OSGi.Bundle from OSGi.Feature>OSGi.Bundle
OSGi.Package from OSGi.Feature>OSGi.Bundle>OSGi.Package
}
AllDependencies with {
OSGi.Bundle from OSGi.Feature>OSGi.Bundle
}

}

OSGi.Bundle shows {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,19 @@ SPVizModel OSGi {
Product {
contains Feature
contains Bundle
contains Package
}
Feature {
contains Bundle
}
Bundle {
Dependency connects Bundle
PackageDependency connects Package
PackageExportDependency connects Package
PackageImportDependency connects Package
PackageDependency connects Bundle
contains Package
contains ServiceInterface
contains ServiceComponent
contains Package
}
ServiceInterface {
ProvidedBy connects ServiceComponent
Expand Down
30 changes: 30 additions & 0 deletions osgi/de.cau.cs.kieler.spviz.osgi.generate/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,24 @@
<groupId>de.cau.cs.kieler.spviz.osgi.generate</groupId>
<artifactId>de.cau.cs.kieler.spviz.osgi.generate</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>maven-plugin</packaging>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>3.9.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.9.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.ecore.xmi</artifactId>
<version>2.16.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.ecore.xmi</artifactId>
Expand Down Expand Up @@ -50,6 +66,20 @@
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.9.0</version>
<executions>
<execution>
<id>default-descriptor</id>
<phase>process-classes</phase>
<goals>
<goal>descriptor</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.0</version>
Expand Down
Loading