Commit f4b4c706 authored by Munilla Christophe's avatar Munilla Christophe
Browse files

- add binding-gcs FraSCAti in OSGi bundle

- add binding-upnp FraSCAti in OSGi bundle
- add some tests for FraSCAti in OSGi frascati-modules
parent 6b3c1bb1
......@@ -30,7 +30,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.ow2.frascati.osgi.fio</groupId>
<artifactId>frascati-modules</artifactId>
<artifactId>frascati-osgi-bundles</artifactId>
<version>1.5-SNAPSHOT</version>
</parent>
......@@ -38,7 +38,7 @@
<name>FraSCAti in OSGi Core Bundle</name>
<properties>
<frascati.modules.basedir>../../../../../modules</frascati.modules.basedir>
<frascati.modules.basedir>../../../../modules</frascati.modules.basedir>
</properties>
<dependencies>
......@@ -83,10 +83,8 @@
<dependency><groupId>org.ow2.frascati.osgi</groupId><artifactId>frascati-osgi-core</artifactId><version>${project.version}</version><scope>runtime</scope></dependency>
<dependency><groupId>org.ow2.frascati.osgi</groupId><artifactId>frascati-starter</artifactId><version>${project.version}</version><scope>runtime</scope></dependency>
<!--<dependency><groupId>org.ow2.frascati.osgi</groupId><artifactId>frascati-osgi-api</artifactId><version>${project.version}</version><scope>runtime</scope></dependency>-->
<dependency><groupId>org.ow2.frascati.osgi</groupId><artifactId>frascati-osgi-util</artifactId><version>${project.version}</version><scope>runtime</scope></dependency>
<!--<dependency><groupId>org.ow2.frascati.osgi</groupId><artifactId>frascati-osgi-resources-loader</artifactId><version>${project.version}</version><scope>runtime</scope></dependency>-->
<!-- TODO: the bundle-tracker doesn't work for all implementation -->
<!-- USE the Tracker SCA Component instead -->
<dependency><groupId>org.ow2.frascati.osgi</groupId><artifactId>frascati-osgi-tracker</artifactId><version>${project.version}</version><scope>runtime</scope></dependency>
......@@ -182,9 +180,14 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<outputDirectory>${project.build.directory}</outputDirectory>
<unpackBundle>false</unpackBundle>
<instructions>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-Transitive>false</Embed-Transitive>
<DynamicImport-Package>
com.p6spy.engine.logging.appender,
com.sun.codemodel,
......
......@@ -31,7 +31,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.ow2.frascati.osgi.fio</groupId>
<artifactId>frascati-modules</artifactId>
<artifactId>frascati-osgi-bundles</artifactId>
<version>1.5-SNAPSHOT</version>
</parent>
......@@ -168,7 +168,13 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<outputDirectory>${project.build.directory}</outputDirectory>
<unpackBundle>false</unpackBundle>
<instructions>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-Transitive>false</Embed-Transitive>
<Bundle-ClassPath>.,{maven-dependencies}</Bundle-ClassPath>
<Import-Package></Import-Package>
<Frascati-Fragment>true</Frascati-Fragment>
</instructions>
......@@ -183,4 +189,5 @@
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
<?xml version="1.0"?>
<!--
* OW2 FraSCAti OSGi
*
* Copyright (c) 2011 - 2012 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: Christophe Munilla
*
* 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.osgi.fio.test</groupId>
<artifactId>frascati-binding-gcs-test</artifactId>
<version>1.5-SNAPSHOT</version>
</parent>
<artifactId>frascati-binding-gcs-test-equinox</artifactId>
<name>FraSCAti in OSGi - Test Binding JGroups Bundle in Equinox</name>
<dependencies>
<dependency>
<groupId>org.ow2.frascati.osgi.fio.test</groupId>
<artifactId>frascati-binding-gcs-test-framework</artifactId>
<version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.ow2.frascati.osgi.fio</groupId>
<artifactId>frascati-osgi-equinox</artifactId>
<version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
<version>1.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<excludes>
<exclude> **/*.jar</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</project>
/**
* OW2 FraSCAti OSGi
* Copyright (c) 2011 - 2012 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: Christophe Munilla
*
* Contributor(s):
*
*/
package org.ow2.frascati.osgi.test;
/**
* Test in Eclipse Equinox
*/
public class FraSCAtiInEquinoxTest extends FraSCAtiInOSGiBindingJGroupsTest
{
}
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties>
<entry key="SYSTEM_PACKAGE_BASE">
javax.activation,
javax.annotation,
javax.accessibility,
javax.imageio,
javax.imageio.stream,
javax.mail;version=1.5,
javax.mail.internet;version=1.5,
javax.management,
javax.management.modelmbean,
javax.management.remote,
javax.naming,
javax.naming.spi,
javax.net.ssl,
javax.jms,
javax.jnlp,
javax.jws,
javax.jws.soap,
javax.security.auth,
javax.security.auth.callback,
javax.security.auth.login,
javax.security.auth.x500,
javax.security.cert,
javax.servlet;version=2.6,
javax.servlet.http;version=2.6,
javax.swing.border,
javax.swing,
javax.swing.border,
javax.swing.event,
javax.swing.table,
javax.swing.text,
javax.swing.text.html,
javax.swing.tree,
javax.swing.plaf,
javax.swing.plaf.metal,
javax.swing.plaf.basic,
javax.swing.filechooser,
javax.swing.undo,
javax.transaction.xa,
javax.wsdl,
javax.wsdl.extensions,
javax.wsdl.extensions.http,
javax.wsdl.extensions.mime,
javax.wsdl.extensions.schema,
javax.wsdl.extensions.soap,
javax.wsdl.extensions.soap12,
javax.wsdl.factory,
javax.wsdl.xml,
javax.xml.bind,
javax.xml.bind.annotation,
javax.xml.bind.annotation.adapters,
javax.xml.bind.attachment,
javax.xml.bind.helpers,
javax.xml.bind.util,
javax.xml.datatype,
javax.xml.namespace,
javax.xml.soap,
javax.xml.stream,
javax.xml.stream.events,
javax.xml.stream.util,
javax.xml.transform,
javax.xml.transform.dom,
javax.xml.transform.sax,
javax.xml.transform.stream,
javax.xml.parsers,
javax.xml.validation,
javax.xml.ws,
javax.xml.ws.handler,
javax.xml.ws.handler.soap,
javax.xml.ws.http,
javax.xml.ws.soap,
javax.xml.ws.spi,
javax.xml.ws.wsaddressing,
javax.xml.xpath,
org.ietf.jgss,
org.osgi.framework;version=1.5,
org.osgi.framework.launch;version=1.0,
org.osgi.framework.hooks.service;version=1.0,
org.osgi.util.url;version=1.0,
org.osgi.service.packageadmin;version=1.2,
org.osgi.service.permissionadmin;version=1.2,
org.osgi.service.startlevel;version=1.1.0,
org.osgi.service.log;version=1.2,
org.w3c.dom,
org.w3c.dom.events,
org.w3c.dom.bootstrap,
org.w3c.dom.ls,
org.xml.sax,
org.xml.sax.ext,
org.xml.sax.helpers,
com.sun.java.swing.plaf.windows,
com.thoughtworks.xstream,
com.thoughtworks.xstream.io,
com.thoughtworks.xstream.io.xml,
sun.net.util
</entry>
</properties>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties>
<entry key="w">bundle-frascati-api.jar:true</entry>
<entry key="v">bundle-frascati-explorer.jar:false</entry>
<entry key="u">bundle-frascati-eclipse.jar:true</entry>
<entry key="t">bundle-frascati-binding-http.jar:false</entry>
<entry key="s">bundle-frascati-binding-rmi.jar:false</entry>
<entry key="r">bundle-frascati-binding-jsonrpc.jar:false</entry>
<entry key="q">bundle-frascati-binding-ws.jar:false</entry>
<entry key="p">bundle-frascati-binding-rest.jar:false</entry>
<entry key="o">bundle-frascati-binding-jms.jar:false</entry>
<entry key="n">bundle-frascati-binding-upnp.jar:false</entry>
<entry key="m">bundle-frascati-binding-gcs.jar:true</entry>
<entry key="l">bundle-frascati-web-explorer.jar:false</entry>
<entry key="k">bundle-frascati-introspection.jar:false</entry>
<entry key="j">bundle-frascati-introspection-fscript.jar:false</entry>
<entry key="i">bundle-frascati-fscript.jar:false</entry>
<entry key="h">bundle-frascati-implementation-bpel.jar:false</entry>
<entry key="g">bundle-frascati-implementation-scripts.jar:false</entry>
<entry key="f">bundle-frascati-implementation-xquery.jar:false</entry>
<entry key="e">bundle-frascati-implementation-spring.jar:false</entry>
<entry key="d">bundle-frascati-implementation-velocity.jar:false</entry>
<entry key="c">bundle-frascati-cxf-libs.jar:true</entry>
<entry key="b">bundle-frascati-resources.jar:true</entry>
<entry key="a">bundle-frascati-core.jar:true</entry>
</properties>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties>
<entry key="6">org.apache.felix.log.jar:true</entry>
<!--<entry key="5">bundle-log.jar:false</entry>
<entry key="4">bundle-frascati-introspector.jar:true</entry>-->
<entry key="3">bundle-frascati-activator.jar:true</entry>
<!--<entry key="2">bundle-frascati-tracker.jar:true</entry>-->
<entry key="1">frascati-osgi-dynamic-bundle.jar:false</entry>
</properties>
\ No newline at end of file
<?xml version="1.0"?>
<!--
* OW2 FraSCAti OSGi
*
* Copyright (c) 2011 - 2012 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: Christophe Munilla
*
* 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.osgi.fio.test</groupId>
<artifactId>frascati-binding-gcs-test</artifactId>
<version>1.5-SNAPSHOT</version>
</parent>
<artifactId>frascati-binding-gcs-test-felix</artifactId>
<name>FraSCAti in OSGi - Test Binding JGroups Bundle in Apache Felix</name>
<dependencies>
<dependency>
<groupId>org.ow2.frascati.osgi.fio.test</groupId>
<artifactId>frascati-binding-gcs-test-framework</artifactId>
<version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.ow2.frascati.osgi.fio</groupId>
<artifactId>frascati-osgi-felix</artifactId>
<version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
<version>1.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<excludes>
<exclude> **/*.jar</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</project>
/**
* OW2 FraSCAti OSGi
* Copyright (c) 2011 - 2012 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: Christophe Munilla
*
* Contributor(s):
*
*/
package org.ow2.frascati.osgi.test;
/**
* Test in Apache Felix
*/
public class FraSCAtiInFelixTest extends FraSCAtiInOSGiBindingJGroupsTest
{
}
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties>
<entry key="SYSTEM_PACKAGE_BASE">
javax.activation,
javax.annotation,
javax.accessibility,
javax.imageio,
javax.imageio.stream,
javax.mail;version=1.5,
javax.mail.internet;version=1.5,
javax.management,
javax.management.modelmbean,
javax.management.remote,
javax.naming,
javax.naming.spi,
javax.net.ssl,
javax.jms,
javax.jnlp,
javax.jws,
javax.jws.soap,
javax.security.auth,
javax.security.auth.callback,
javax.security.auth.login,
javax.security.auth.x500,
javax.security.cert,
javax.servlet;version=2.6,
javax.servlet.http;version=2.6,
javax.swing.border,
javax.swing,
javax.swing.border,
javax.swing.event,
javax.swing.table,
javax.swing.text,
javax.swing.text.html,
javax.swing.tree,
javax.swing.plaf,
javax.swing.plaf.metal,
javax.swing.plaf.basic,
javax.swing.filechooser,
javax.swing.undo,
javax.transaction.xa,
javax.wsdl,
javax.wsdl.extensions,
javax.wsdl.extensions.http,
javax.wsdl.extensions.mime,
javax.wsdl.extensions.schema,
javax.wsdl.extensions.soap,
javax.wsdl.extensions.soap12,
javax.wsdl.factory,
javax.wsdl.xml,
javax.xml.bind,
javax.xml.bind.annotation,
javax.xml.bind.annotation.adapters,
javax.xml.bind.attachment,
javax.xml.bind.helpers,
javax.xml.bind.util,
javax.xml.datatype,
javax.xml.namespace,
javax.xml.soap,
javax.xml.stream,
javax.xml.stream.events,
javax.xml.stream.util,
javax.xml.transform,
javax.xml.transform.dom,
javax.xml.transform.sax,
javax.xml.transform.stream,
javax.xml.parsers,
javax.xml.validation,
javax.xml.ws,
javax.xml.ws.handler,
javax.xml.ws.handler.soap,
javax.xml.ws.http,
javax.xml.ws.soap,
javax.xml.ws.spi,
javax.xml.ws.wsaddressing,
javax.xml.xpath,
org.ietf.jgss,
org.osgi.framework;version=1.5,
org.osgi.framework.launch;version=1.0,
org.osgi.framework.hooks.service;version=1.0,
org.osgi.util.url;version=1.0,
org.osgi.service.packageadmin;version=1.2,
org.osgi.service.permissionadmin;version=1.2,
org.osgi.service.startlevel;version=1.1.0,
org.osgi.service.log;version=1.2,
org.w3c.dom,
org.w3c.dom.events,
org.w3c.dom.bootstrap,
org.w3c.dom.ls,
org.xml.sax,
org.xml.sax.ext,
org.xml.sax.helpers,
com.sun.java.swing.plaf.windows,
com.thoughtworks.xstream,
com.thoughtworks.xstream.io,
com.thoughtworks.xstream.io.xml,
sun.net.util
</entry>
</properties>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties>
<entry key="w">bundle-frascati-api.jar:true</entry>
<entry key="v">bundle-frascati-explorer.jar:false</entry>
<entry key="u">bundle-frascati-eclipse.jar:true</entry>
<entry key="t">bundle-frascati-binding-http.jar:false</entry>
<entry key="s">bundle-frascati-binding-rmi.jar:false</entry>
<entry key="r">bundle-frascati-binding-jsonrpc.jar:false</entry>
<entry key="q">bundle-frascati-binding-ws.jar:false</entry>
<entry key="p">bundle-frascati-binding-rest.jar:false</entry>
<entry key="o">bundle-frascati-binding-jms.jar:false</entry>
<