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

- FraSCAti in OSGi tests : factorization of configuration files

- javax.script.xx package(s) : use frameworks' exported packages declaration instead of bundle-frascati-core's embedded dependency
- fix bug : frascati-fscript for FraSCAti in OSGi is available
- add frascati-fscript-test module
parent aa15b807
......@@ -99,7 +99,7 @@
<!-- -->
<dependency><groupId>org.beanshell</groupId><artifactId>bsh</artifactId><version>2.0b5</version><scope>runtime</scope></dependency>
<dependency><groupId>com.google.guava</groupId><artifactId>guava</artifactId><version>r07</version><scope>runtime</scope></dependency>
<dependency><groupId>javax.script</groupId><artifactId>script-api</artifactId><version>1.0</version><scope>runtime</scope></dependency>
<!--<dependency><groupId>javax.script</groupId><artifactId>script-api</artifactId><version>1.0</version><scope>runtime</scope></dependency>-->
<dependency><groupId>jdom</groupId><artifactId>jdom</artifactId><version>1.0</version><scope>runtime</scope></dependency>
<dependency><groupId>org.jvnet.jaxb2_commons</groupId><artifactId>runtime</artifactId><version>0.4.1.5</version><scope>runtime</scope></dependency>
<dependency><groupId>org.jvnet.jaxb2_commons</groupId><artifactId>jaxb2-basics-runtime</artifactId><version>0.5.0</version><scope>runtime</scope></dependency>
......@@ -211,6 +211,7 @@
javax.security.cert,
javax.servlet;version="[2.5,3)",
javax.servlet.http;version="[2.5,3)",
javax.script,
javax.swing,
javax.swing.border,
javax.swing.event,
......
<!--
* FraSCAti in OSGi TESTS
*
* 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):
*
-->
TODO :
- FIX TESTS IN ERROR :
implementation-velocity-test for all frameworks (??)
frascati-fscript-test with JBoss OSGi Framework
frascati-web-explorer-test with JBoss OSGi Framework
- improve AbstractResource search process
- improve handling of the JBoss OSGi's virtual file system
\ 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="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" 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="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>
#
# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
#
# System Packages
org.osgi.framework.system.packages=\
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.openmbean,javax.management.remote,javax.management.remote.rmi,javax.naming,javax.naming.spi,javax.net,javax.net.ssl,\
javax.jms,javax.jnlp,javax.jws,javax.sql,javax.crypto,javax.crypto.spec,\
javax.jws.soap,javax.security.auth,javax.security.auth.callback,javax.security.auth.login,javax.security.auth.x500,javax.security.cert,javax.servlet,\
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.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,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
# Extra System Packages
org.osgi.framework.system.packages.extra=\
org.jboss.osgi.deployment.deployer;version=1.0.10,\
org.jboss.osgi.deployment.interceptor;version=1.0.10,\
org.jboss.osgi.testing;version=1.0.0,\
org.jboss.vfs;version=3.0.0.CR5,\
org.jboss.vfs.protocol;version=3.0.0.CR5,\
org.jboss.vfs.protocol.file;version=3.0.0.CR5,\
org.jboss.vfs.protocol.vfs;version=3.0.0.CR5,\
org.jboss.vfs.spi;version=3.0.0.CR5,\
org.jboss.vfs.util;version=3.0.0.CR5,\
org.jboss.vfs.util.automount;version=3.0.0.CR5,\
org.jboss.osgi.vfs;version=1.0.6,\
org.jboss.osgi.xml;version=2.9
\ 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="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" 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
......@@ -48,9 +48,8 @@
<modules>
<module>framework</module>
<module>felix</module>
<!-- test are made using Apache Felix -->
<!-- Uncomment to use another Framework -->
<!--
<!-- tests are made using Apache Felix -->
<!-- Uncomment to use another Framework
<module>equinox</module>
<module>knopflerfish</module>
<module>jboss</module>
......
<
<?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,