Commit 2f7843ef authored by Philippe Merle's avatar Philippe Merle

* Moved 'equinox', 'felix' and 'knopflerfish' directories into the 'osgi' directory.

* Simplified pom.xml files of their three modules by moving common parts into osgi/pom.xml.
parent e7ed6bfe
......@@ -34,9 +34,9 @@ Eclipse Equinox and Knopflerfish.
The directory 'bundles' contains three OSGi bundles (api, server, and client).
The directory 'sca' contains an SCA composite embedding the three OSGi bundles,
see sca/src/main/resources/helloworld-osgi.composite
The directory 'equinox' contains the pom.xml to run the SCA composite with Eclipse Equinox.
The directory 'felix' contains the pom.xml to run the SCA composite with Apache Felix.
The directory 'knopflerfish' contains the pom.xml to run the SCA composite with Knopflerfish.
The directory 'osgi/felix' contains the pom.xml to run the SCA composite with Apache Felix.
The directory 'osgi/equinox' contains the pom.xml to run the SCA composite with Eclipse Equinox.
The directory 'osgi/knopflerfish' contains the pom.xml to run the SCA composite with Knopflerfish.
Compilation with Maven:
-----------------------
......@@ -45,28 +45,31 @@ Compilation with Maven:
Execution with Maven:
---------------------
With Apache Felix:
cd felix; mvn -Prun (standalone execution)
cd felix; mvn -Pexplorer (with FraSCAti Explorer)
cd felix; mvn -Pexplorer-fscript (with FraSCAti Explorer and FScript plugin)
cd felix; mvn -Pfscript-console (with FraSCAti FScript Console)
cd felix; mvn -Pfscript-console-explorer (with FraSCAti Explorer and FScript Console)
cd felix; mvn -Pexplorer-jdk6 (with FraSCAti Explorer and JDK6)
cd osgi/felix
mvn -Prun (standalone execution)
mvn -Pexplorer (with FraSCAti Explorer)
mvn -Pexplorer-fscript (with FraSCAti Explorer and FScript plugin)
mvn -Pfscript-console (with FraSCAti FScript Console)
mvn -Pfscript-console-explorer (with FraSCAti Explorer and FScript Console)
mvn -Pexplorer-jdk6 (with FraSCAti Explorer and JDK6)
With Eclipse Equinox:
cd equinox; mvn -Prun (standalone execution)
cd equinox; mvn -Pexplorer (with FraSCAti Explorer)
cd equinox; mvn -Pexplorer-fscript (with FraSCAti Explorer and FScript plugin)
cd equinox; mvn -Pfscript-console (with FraSCAti FScript Console)
cd equinox; mvn -Pfscript-console-explorer (with FraSCAti Explorer and FScript Console)
cd equinox; mvn -Pexplorer-jdk6 (with FraSCAti Explorer and JDK6)
cd osgi/equinox
mvn -Prun (standalone execution)
mvn -Pexplorer (with FraSCAti Explorer)
mvn -Pexplorer-fscript (with FraSCAti Explorer and FScript plugin)
mvn -Pfscript-console (with FraSCAti FScript Console)
mvn -Pfscript-console-explorer (with FraSCAti Explorer and FScript Console)
mvn -Pexplorer-jdk6 (with FraSCAti Explorer and JDK6)
With Knopflerfish:
cd knopflerfish; mvn -Prun (standalone execution)
cd knopflerfish; mvn -Pexplorer (with FraSCAti Explorer)
cd knopflerfish; mvn -Pexplorer-fscript (with FraSCAti Explorer and FScript plugin)
cd knopflerfish; mvn -Pfscript-console (with FraSCAti FScript Console)
cd knopflerfish; mvn -Pfscript-console-explorer (with FraSCAti Explorer and FScript Console)
cd knopflerfish; mvn -Pexplorer-jdk6 (with FraSCAti Explorer and JDK6)
cd osgi/knopflerfish
mvn -Prun (standalone execution)
mvn -Pexplorer (with FraSCAti Explorer)
mvn -Pexplorer-fscript (with FraSCAti Explorer and FScript plugin)
mvn -Pfscript-console (with FraSCAti FScript Console)
mvn -Pfscript-console-explorer (with FraSCAti Explorer and FScript Console)
mvn -Pexplorer-jdk6 (with FraSCAti Explorer and JDK6)
Execution with the FraSCAti script:
-----------------------------------
......
......@@ -2,7 +2,7 @@
<!--
* OW2 FraSCAti Examples: HelloWorld OSGi
*
* Copyright (c) 2010 INRIA, University of Lille 1
* Copyright (c) 2010-2011 INRIA, University of Lille 1
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -31,7 +31,7 @@
<parent>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-parent</artifactId>
<artifactId>helloworld-osgi-runtime-parent</artifactId>
<version>1.4-SNAPSHOT</version>
</parent>
......@@ -40,79 +40,25 @@
<packaging>jar</packaging>
<name>OW2 FraSCAti Examples: HelloWorld OSGi with Eclipse Equinox</name>
<properties>
<composite.file>helloworld-osgi</composite.file>
<service.name>r</service.name>
<method.name>run</method.name>
</properties>
<dependencies>
<!-- For helloworld-osgi.composite -->
<dependency>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-sca</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Support for <frascati:implementation.osgi> with Eclipse Equinox. -->
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-osgi-equinox</artifactId>
<version>${project.version}</version>
</dependency>
<!-- For testing. -->
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<plugins>
<!-- ================================================ -->
<!-- Copy used OSGi bundles into target/classes -->
<!-- ================================================ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.0</version>
<executions>
<execution>
<id>copy-bundles</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<stripVersion>true</stripVersion> <!-- Remove version number -->
<artifactItems>
<artifactItem>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-api</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-client</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-server</artifactId>
<version>${project.version}</version>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
......@@ -2,7 +2,7 @@
<!--
* OW2 FraSCAti Examples: HelloWorld OSGi
*
* Copyright (c) 2010 INRIA, University of Lille 1
* Copyright (c) 2010-2011 INRIA, University of Lille 1
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -31,7 +31,7 @@
<parent>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-parent</artifactId>
<artifactId>helloworld-osgi-runtime-parent</artifactId>
<version>1.4-SNAPSHOT</version>
</parent>
......@@ -39,80 +39,26 @@
<artifactId>helloworld-osgi-felix</artifactId>
<packaging>jar</packaging>
<name>OW2 FraSCAti Examples: HelloWorld OSGi with Apache Felix</name>
<properties>
<composite.file>helloworld-osgi</composite.file>
<service.name>r</service.name>
<method.name>run</method.name>
</properties>
<dependencies>
<!-- For helloworld-osgi.composite -->
<dependency>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-sca</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Support for <frascati:implementation.osgi> with Apache Felix. -->
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-osgi-felix</artifactId>
<version>${project.version}</version>
</dependency>
<!-- For testing. -->
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<plugins>
<!-- ================================================ -->
<!-- Copy used OSGi bundles into target/classes -->
<!-- ================================================ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.0</version>
<executions>
<execution>
<id>copy-bundles</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<stripVersion>true</stripVersion> <!-- Remove version number -->
<artifactItems>
<artifactItem>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-api</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-client</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-server</artifactId>
<version>${project.version}</version>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
......@@ -22,101 +22,42 @@
*
* Author: Christophe Munilla
*
* Contributor(s):
* Contributor(s): Philippe Merle
*
-->
<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">
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>helloworld-osgi-parent</artifactId>
<artifactId>helloworld-osgi-runtime-parent</artifactId>
<groupId>org.ow2.frascati.examples</groupId>
<version>1.4-SNAPSHOT</version>
</parent>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-knopflerfish</artifactId>
<version>1.4-SNAPSHOT</version>
<name>OW2 FraSCAti Examples: HelloWorld OSGi with Knopflerfish</name>
<properties>
<composite.file>helloworld-osgi</composite.file>
<service.name>r</service.name>
<method.name>run</method.name>
</properties>
<dependencies>
<!-- For helloworld-osgi.composite -->
<dependency>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-sca</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Support for <frascati:implementation.osgi> with Knopflerfish. -->
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-osgi-knopflerfish</artifactId>
<version>${project.version}</version>
</dependency>
<!-- For testing. -->
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<plugins>
<!-- ================================================ -->
<!-- Copy used OSGi bundles into target/classes -->
<!-- ================================================ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.0</version>
<executions>
<execution>
<id>copy-bundles</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<stripVersion>true</stripVersion> <!-- Remove version number -->
<artifactItems>
<artifactItem>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-api</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-client</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-server</artifactId>
<version>${project.version}</version>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
<?xml version="1.0"?>
<!--
* OW2 FraSCAti Examples: HelloWorld OSGi
*
* Copyright (c) 2011 INRIA, University of Lille 1
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Contact: frascati@ow2.org
*
* Author: Philippe Merle
*
* Contributor(s):
*
-->
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-parent</artifactId>
<version>1.4-SNAPSHOT</version>
</parent>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-runtime-parent</artifactId>
<packaging>pom</packaging>
<name>OW2 FraSCAti Examples: HelloWorld OSGi Runtime Parent</name>
<modules>
<module>equinox</module>
<module>felix</module>
<module>knopflerfish</module>
</modules>
<properties>
<config.directory>../../..</config.directory>
<composite.file>helloworld-osgi</composite.file>
<service.name>r</service.name>
<method.name>run</method.name>
</properties>
<dependencies>
<!-- For helloworld-osgi.composite -->
<dependency>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-sca</artifactId>
<version>${project.version}</version>
</dependency>
<!-- For testing. -->
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
<!-- ================================================ -->
<!-- Copy used OSGi bundles into target/classes -->
<!-- ================================================ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.0</version>
<executions>
<execution>
<id>copy-bundles</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<stripVersion>true</stripVersion> <!-- Remove version number -->
<artifactItems>
<artifactItem>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-api</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-client</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-server</artifactId>
<version>${project.version}</version>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
......@@ -39,18 +39,12 @@
<artifactId>helloworld-osgi-parent</artifactId>
<packaging>pom</packaging>
<name>OW2 FraSCAti Examples: HelloWorld OSGi</name>
<properties>
<config.directory>../..</config.directory>
</properties>
<name>OW2 FraSCAti Examples: HelloWorld OSGi Parent</name>
<modules>
<module>bundles</module>
<module>sca</module>
<module>equinox</module>
<module>felix</module>
<module>knopflerfish</module>
<module>osgi</module>
</modules>
</project>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment