Skip to content

Commit

Permalink
switched to maven / blueprint and added a feature.xml plus kar for ka…
Browse files Browse the repository at this point in the history
…raf deployment
  • Loading branch information
ANierbeck committed Apr 23, 2012
1 parent 119d87f commit 45013db
Show file tree
Hide file tree
Showing 13 changed files with 305 additions and 27 deletions.
5 changes: 4 additions & 1 deletion com.siemens.ct.osgi.vaadin.pm.bundleview/pom.xml
Expand Up @@ -19,6 +19,7 @@
<groupId>com.vaadin</groupId>
<artifactId>vaadin</artifactId>
<version>6.7.7</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -32,11 +33,13 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${dependency.osgi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>${dependency.osgi.version}</version>
<scope>provided</scope>
</dependency>

<!-- Internal dependencies -->
Expand All @@ -62,4 +65,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
5 changes: 4 additions & 1 deletion com.siemens.ct.osgi.vaadin.pm.printaction/pom.xml
Expand Up @@ -19,6 +19,7 @@
<groupId>com.vaadin</groupId>
<artifactId>vaadin</artifactId>
<version>6.7.7</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -32,11 +33,13 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${dependency.osgi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>${dependency.osgi.version}</version>
<scope>provided</scope>
</dependency>

<!-- Internal dependencies -->
Expand All @@ -62,4 +65,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
5 changes: 4 additions & 1 deletion com.siemens.ct.osgi.vaadin.pm.reindeeraction/pom.xml
Expand Up @@ -19,6 +19,7 @@
<groupId>com.vaadin</groupId>
<artifactId>vaadin</artifactId>
<version>6.7.7</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -32,11 +33,13 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${dependency.osgi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>${dependency.osgi.version}</version>
<scope>provided</scope>
</dependency>

<!-- Internal dependencies -->
Expand All @@ -62,4 +65,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
5 changes: 4 additions & 1 deletion com.siemens.ct.osgi.vaadin.pm.runoaction/pom.xml
Expand Up @@ -19,6 +19,7 @@
<groupId>com.vaadin</groupId>
<artifactId>vaadin</artifactId>
<version>6.7.7</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -32,11 +33,13 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${dependency.osgi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>${dependency.osgi.version}</version>
<scope>provided</scope>
</dependency>

<!-- Internal dependencies -->
Expand All @@ -62,4 +65,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
5 changes: 4 additions & 1 deletion com.siemens.ct.osgi.vaadin.pm.saveaction/pom.xml
Expand Up @@ -19,6 +19,7 @@
<groupId>com.vaadin</groupId>
<artifactId>vaadin</artifactId>
<version>6.7.7</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -32,11 +33,13 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${dependency.osgi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>${dependency.osgi.version}</version>
<scope>provided</scope>
</dependency>

<!-- Internal dependencies -->
Expand All @@ -62,4 +65,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
10 changes: 9 additions & 1 deletion com.siemens.ct.osgi.vaadin.pm.tableview/pom.xml
Expand Up @@ -19,6 +19,7 @@
<groupId>com.vaadin</groupId>
<artifactId>vaadin</artifactId>
<version>6.7.7</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -32,11 +33,13 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${dependency.osgi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>${dependency.osgi.version}</version>
<scope>provided</scope>
</dependency>

<!-- Internal dependencies -->
Expand All @@ -45,6 +48,11 @@
<artifactId>main</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.siemens.ct.pm</groupId>
<artifactId>model</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
Expand All @@ -62,4 +70,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
7 changes: 0 additions & 7 deletions com.siemens.ct.osgi.vaadin.pm.theme/.classpath

This file was deleted.

15 changes: 2 additions & 13 deletions com.siemens.ct.osgi.vaadin.pm.theme/pom.xml
Expand Up @@ -19,6 +19,7 @@
<groupId>com.vaadin</groupId>
<artifactId>vaadin</artifactId>
<version>6.7.7</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -27,18 +28,6 @@
<version>${dependency.slf4j}</version>
</dependency>

<!-- OSGi dependencies -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${dependency.osgi.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>${dependency.osgi.version}</version>
</dependency>

<!-- Internal dependencies -->
<dependency>
<groupId>com.siemens.ct.osgi.vaadin.pm</groupId>
Expand All @@ -63,4 +52,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
5 changes: 4 additions & 1 deletion com.siemens.ct.osgi.vaadin.pm.treeview/pom.xml
Expand Up @@ -19,6 +19,7 @@
<groupId>com.vaadin</groupId>
<artifactId>vaadin</artifactId>
<version>6.7.7</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -32,11 +33,13 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${dependency.osgi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>${dependency.osgi.version}</version>
<scope>provided</scope>
</dependency>

<!-- Internal dependencies -->
Expand Down Expand Up @@ -67,4 +70,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
98 changes: 98 additions & 0 deletions de.nierbeck.ct.osgi.vaadin.feature/pom.xml
@@ -0,0 +1,98 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>base</artifactId>
<groupId>com.siemens.ct</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>

<groupId>de.nierbeck</groupId>
<artifactId>de.nierbeck.ct.osgi.vaadin.feature</artifactId>
<packaging>pom</packaging>
<name>de.nierbeck.ct.osgi.vaadin.feature feature</name>
<description>Create a feature with the defined dependencies set.</description>

<dependencies>
<dependency>
<groupId>com.siemens.ct.osgi.vaadin.pm</groupId>
<artifactId>main</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.siemens.ct.osgi.vaadin.pm</groupId>
<artifactId>bundleview</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.siemens.ct.osgi.vaadin.pm</groupId>
<artifactId>printaction</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.siemens.ct.osgi.vaadin.pm</groupId>
<artifactId>reindeeraction</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.siemens.ct.osgi.vaadin.pm</groupId>
<artifactId>runoaction</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.siemens.ct.osgi.vaadin.pm</groupId>
<artifactId>saveaction</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.siemens.ct.osgi.vaadin.pm</groupId>
<artifactId>tableview</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.siemens.ct.osgi.vaadin.pm</groupId>
<artifactId>theme</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.siemens.ct.osgi.vaadin.pm</groupId>
<artifactId>treeview</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.siemens.ct.pm</groupId>
<artifactId>model</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.siemens.ct.pm</groupId>
<artifactId>model.basic</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>features-maven-plugin</artifactId>
<version>2.2.6</version>
<executions>
<execution>
<id>generate-features-file</id>
<goals>
<goal>generate-features-file</goal>
</goals>
<configuration>
<karafVersion>2.2.6</karafVersion>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>

0 comments on commit 45013db

Please sign in to comment.