diff options
| -rw-r--r-- | osgi-karaf-integration/pom.xml | 66 | ||||
| -rw-r--r-- | osgi-karaf-integration/src/main/feature/feature.xml | 22 | ||||
| -rw-r--r-- | pom.xml | 1 | ||||
| -rw-r--r-- | test/servlet-containers/karaf/karaf-run/pom.xml | 4 | ||||
| -rw-r--r-- | vaadin-feature.xml | 5 |
5 files changed, 95 insertions, 3 deletions
diff --git a/osgi-karaf-integration/pom.xml b/osgi-karaf-integration/pom.xml new file mode 100644 index 0000000000..d3e0bf0a96 --- /dev/null +++ b/osgi-karaf-integration/pom.xml @@ -0,0 +1,66 @@ +<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> + <artifactId>vaadin-osgi-karaf-integration</artifactId> + <packaging>pom</packaging> + <url>https://vaadin.com/</url> + <description>Karaf OSGi Integration</description> + + <parent> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-root</artifactId> + <version>8.2-SNAPSHOT</version> + </parent> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + + <build> + <resources> + <resource> + <directory>${project.basedir}/src/main/feature</directory> + <filtering>true</filtering> + <targetPath>${project.build.directory}/feature</targetPath> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>resources</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>target/feature/feature.xml</file> + <classifier>features</classifier> + <type>xml</type> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> diff --git a/osgi-karaf-integration/src/main/feature/feature.xml b/osgi-karaf-integration/src/main/feature/feature.xml new file mode 100644 index 0000000000..333c48a4c3 --- /dev/null +++ b/osgi-karaf-integration/src/main/feature/feature.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<features name="vaadin-osgi" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0"> + <feature name="vaadin-osgi-deps" version="${osgi.bundle.version}"> + <bundle>mvn:org.jsoup/jsoup/${jsoup.version}</bundle> + <bundle>mvn:com.vaadin.external/gentyref/1.2.0.vaadin1</bundle> + </feature> + <feature name="vaadin-osgi-core" version="${osgi.bundle.version}"> + <feature>http-whiteboard</feature> + <feature>vaadin-osgi-deps</feature> + <bundle>mvn:com.vaadin/vaadin-shared/${project.version}</bundle> + <bundle>mvn:com.vaadin/vaadin-server/${project.version}</bundle> + <bundle>mvn:com.vaadin/vaadin-osgi-integration/${project.version}</bundle> + <bundle>mvn:com.vaadin/vaadin-client-compiled/${project.version}</bundle> + <bundle>mvn:com.vaadin/vaadin-themes/${project.version}</bundle> + </feature> + <feature name="vaadin-osgi-push" version="${osgi.bundle.version}"> + <feature>vaadin-osgi-core</feature> + <bundle>mvn:com.vaadin/vaadin-push/${project.version}</bundle> + <bundle>mvn:com.vaadin.external.atmosphere/atmosphere-runtime/${atmosphere.runtime.version}</bundle> + <bundle>mvn:com.vaadin.external.slf4j/vaadin-slf4j-jdk14/1.6.1</bundle> + </feature> +</features> @@ -626,6 +626,7 @@ <module>liferay</module> <module>liferay-integration</module> <module>osgi-integration</module> + <module>osgi-karaf-integration</module> <module>all</module> <module>compatibility-server</module> <module>compatibility-server-gae</module> diff --git a/test/servlet-containers/karaf/karaf-run/pom.xml b/test/servlet-containers/karaf/karaf-run/pom.xml index 38fa9558aa..08f9ebdeac 100644 --- a/test/servlet-containers/karaf/karaf-run/pom.xml +++ b/test/servlet-containers/karaf/karaf-run/pom.xml @@ -66,7 +66,9 @@ <command>shutdown -f +10</command> <command>feature:install http</command> <command>feature:install http-whiteboard</command> - <command>feature:repo-add file:C:/work/framework/vaadin-feature.xml</command> + <!--<command>feature:repo-add file:C:/work/framework/vaadin-feature.xml</command>--> + <command>feature:repo-add mvn:com.vaadin/vaadin-osgi-karaf-integration/${project.version}-feature.xml</command> + bundle:install -s mvn:org.jsoup/jsoup/1.8.3 <command>feature:install vaadin-osgi-core</command> <command> <![CDATA[bundle:install -s file:./../vaadin-karaf-bundle1/target/vaadin-karaf-bundle1-${project.version}.jar]]></command> diff --git a/vaadin-feature.xml b/vaadin-feature.xml index 2a6385cf8e..55f7a2b226 100644 --- a/vaadin-feature.xml +++ b/vaadin-feature.xml @@ -1,4 +1,5 @@ -<features name="vaadin-osgi" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0"> +<!--TODO remove--> +<aaafeatures name="vaadin-osgi" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0"> <feature name="vaadin-osgi-deps" version="8.2.0"> <bundle>mvn:org.jsoup/jsoup/1.8.3</bundle> <bundle>mvn:com.vaadin.external/gentyref/1.2.0.vaadin1</bundle> @@ -18,4 +19,4 @@ <bundle>mvn:com.vaadin.external.atmosphere/atmosphere-runtime/2.4.11.vaadin2</bundle> <bundle>mvn:com.vaadin.external.slf4j/vaadin-slf4j-jdk14/1.6.1</bundle> </feature> -</features> +</aaafeatures> |