Commit 34b72e48 authored by Philippe Merle's avatar Philippe Merle

* Moved to Apache CXF 2.5.4

  This is required by the ANR SocEDA project.
* Moved to SLF4J 1.6.2
  This is required to ensure compatibility between SOAP and JSON-RPC bindings.
* Move from groupId org.objectweb.fractal.bf to org.ow2.fractal.bf
  to use last Fractal Binding Factory artefacts.
parent 8b0e0606
......@@ -12,8 +12,8 @@ OW2 FraSCAti 1.5
* Added support for Apache CXF configuration when running OW2 FraSCAti Explorer.
* Moved to:
- Apache CXF 2.4.1
- Eclipse Jetty 7.4.2.v20110526
- Apache CXF 2.5.4
- Eclipse Jetty 7.5.4.v20111024
- OW2 Fractal Binding Factory 0.10-SNAPSHOT
- Spring Framework 3.0.5.RELEASE
......
......@@ -290,7 +290,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.5.5</version>
<version>${slf4j.version}</version>
</dependency>
<!-- OW2 FraSCAti Implementation Velocity Module. -->
......
......@@ -54,7 +54,7 @@
<!-- OW2 Fractal Binding Factory. -->
<dependency>
<groupId>org.objectweb.fractal.bf.connectors</groupId>
<groupId>org.ow2.fractal.bf.connectors</groupId>
<artifactId>fractal-bf-connectors-common</artifactId>
<version>${fractal-bf.version}</version>
<scope>provided</scope>
......
......@@ -104,7 +104,7 @@
<!-- OW2 Fractal Binding Factory. -->
<dependency>
<groupId>org.objectweb.fractal.bf.connectors</groupId>
<groupId>org.ow2.fractal.bf.connectors</groupId>
<artifactId>fractal-bf-connectors-common</artifactId>
<version>${fractal-bf.version}</version>
<exclusions>
......
......@@ -131,13 +131,13 @@
Currently, the code of the Fractal JMS Connector is contained in this module.
<dependency>
<groupId>org.objectweb.fractal.bf.connectors</groupId>
<groupId>org.ow2.fractal.bf.connectors</groupId>
<artifactId>fractal-bf-connectors-jms</artifactId>
<version>${fractal-bf.version}</version>
</dependency>
-->
<dependency>
<groupId>org.objectweb.fractal.bf.connectors</groupId>
<groupId>org.ow2.fractal.bf.connectors</groupId>
<artifactId>fractal-bf-connectors-common</artifactId>
<version>${fractal-bf.version}</version>
</dependency>
......
......@@ -2,7 +2,7 @@
<!--
* OW2 FraSCAti: SCA Binding JSON-RPC
*
* Copyright (c) 2010 INRIA
* Copyright (c) 2010-2012 Inria, University Lille I
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -116,7 +116,7 @@
<!-- OW2 Fractal JSON-RPC Connector Module. -->
<dependency>
<groupId>org.objectweb.fractal.bf.connectors</groupId>
<groupId>org.ow2.fractal.bf.connectors</groupId>
<artifactId>fractal-bf-connectors-json-rpc</artifactId>
<version>${fractal-bf.version}</version>
</dependency>
......
......@@ -2,7 +2,7 @@
<!--
* OW2 FraSCAti: SCA Binding RESTful
*
* Copyright (c) 2010 INRIA
* Copyright (c) 2010-2012 Inria, University of Lille I
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -116,7 +116,7 @@
<!-- OW2 Fractal REST Connector Module. -->
<dependency>
<groupId>org.objectweb.fractal.bf.connectors</groupId>
<groupId>org.ow2.fractal.bf.connectors</groupId>
<artifactId>fractal-bf-connectors-rest-cxf</artifactId>
<version>${fractal-bf.version}</version>
</dependency>
......
......@@ -2,7 +2,7 @@
<!--
* OW2 FraSCAti: SCA Binding Java RMI
*
* Copyright (c) 2010 INRIA
* Copyright (c) 2010-2012 Inria, University of Lille I
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -116,7 +116,7 @@
<!-- OW2 Fractal Java RMI Connector Module. -->
<dependency>
<groupId>org.objectweb.fractal.bf.connectors</groupId>
<groupId>org.ow2.fractal.bf.connectors</groupId>
<artifactId>fractal-bf-connectors-rmi</artifactId>
<version>${fractal-bf.version}</version>
</dependency>
......
......@@ -2,7 +2,7 @@
<!--
* OW2 FraSCAti: SCA Binding Web Service
*
* Copyright (c) 2010 INRIA, USTL
* Copyright (c) 2010-2012 Inria, University of Lille I
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -121,7 +121,7 @@
<!-- OW2 Fractal Web Services Connector Module. -->
<dependency>
<groupId>org.objectweb.fractal.bf.connectors</groupId>
<groupId>org.ow2.fractal.bf.connectors</groupId>
<artifactId>fractal-bf-connectors-soap-cxf</artifactId>
<version>${fractal-bf.version}</version>
<exclusions>
......
<?xml version="1.0"?>
<!--
* OW2 FraSCAti Explorer
* Copyright (c) 2008-2010 INRIA
* Copyright (c) 2008-2012 Inria, University of Lille I
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -132,22 +132,22 @@
<!-- Bindings support -->
<dependency>
<groupId>org.objectweb.fractal.bf.connectors</groupId>
<groupId>org.ow2.fractal.bf.connectors</groupId>
<artifactId>fractal-bf-connectors-soap-cxf</artifactId>
<version>${fractal-bf.version}</version>
</dependency>
<dependency>
<groupId>org.objectweb.fractal.bf.connectors</groupId>
<groupId>org.ow2.fractal.bf.connectors</groupId>
<artifactId>fractal-bf-connectors-rmi</artifactId>
<version>${fractal-bf.version}</version>
</dependency>
<dependency>
<groupId>org.objectweb.fractal.bf.connectors</groupId>
<groupId>org.ow2.fractal.bf.connectors</groupId>
<artifactId>fractal-bf-connectors-rest-cxf</artifactId>
<version>${fractal-bf.version}</version>
</dependency>
<dependency>
<groupId>org.objectweb.fractal.bf.connectors</groupId>
<groupId>org.ow2.fractal.bf.connectors</groupId>
<artifactId>fractal-bf-connectors-json-rpc</artifactId>
<version>${fractal-bf.version}</version>
</dependency>
......
<?xml version="1.0"?>
<!--
* OW2 FraSCAti FScript
* Copyright (c) 2009-2011 INRIA, University of Lille 1
* Copyright (c) 2009-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
......@@ -52,17 +52,17 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.objectweb.fractal.bf.connectors</groupId>
<groupId>org.ow2.fractal.bf.connectors</groupId>
<artifactId>fractal-bf-connectors-soap-cxf</artifactId>
<version>${fractal-bf.version}</version>
</dependency>
<dependency>
<groupId>org.objectweb.fractal.bf.connectors</groupId>
<groupId>org.ow2.fractal.bf.connectors</groupId>
<artifactId>fractal-bf-connectors-rmi</artifactId>
<version>${fractal-bf.version}</version>
</dependency>
<dependency>
<groupId>org.objectweb.fractal.bf.connectors</groupId>
<groupId>org.ow2.fractal.bf.connectors</groupId>
<artifactId>fractal-bf-connectors-rest-cxf</artifactId>
<version>${fractal-bf.version}</version>
</dependency>
......
......@@ -2,7 +2,7 @@
<!--
* OW2 FraSCAti: SCA Binding UPnP
*
* Copyright (c) 2010 INRIA
* Copyright (c) 2010-2012 INRIA
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -102,7 +102,7 @@
<!-- OW2 Fractal UPnP Connector Module. -->
<dependency>
<groupId>org.objectweb.fractal.bf.connectors</groupId>
<groupId>org.ow2.fractal.bf.connectors</groupId>
<artifactId>fractal-bf-connectors-upnp</artifactId>
<version>${fractal-bf.version}</version>
<exclusions>
......
......@@ -41,7 +41,7 @@
<artifactId>frascati-runtime-factory</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependency>
<dependency>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-pojo</artifactId>
......
......@@ -111,7 +111,7 @@
<artifactItem><groupId>org.eclipse.emf.ecore</groupId><artifactId>xmi</artifactId><version>2.4.0</version></artifactItem>
<artifactItem><groupId>org.eclipse.emf</groupId><artifactId>common</artifactId><version>2.4.0</version></artifactItem>
<artifactItem><groupId>org.ow2.frascati</groupId><artifactId>frascati-binding-factory</artifactId><version>${project.version}</version></artifactItem>
<artifactItem><groupId>org.objectweb.fractal.bf</groupId><artifactId>fractal-bf-core</artifactId><version>0.10-SNAPSHOT</version></artifactItem>
<artifactItem><groupId>org.ow2.fractal.bf</groupId><artifactId>fractal-bf-core</artifactId><version>0.10-SNAPSHOT</version></artifactItem>
<artifactItem><groupId>org.objectweb.fractal.julia</groupId><artifactId>julia-asm</artifactId><version>2.5.2</version></artifactItem>
<artifactItem><groupId>asm</groupId><artifactId>asm</artifactId><version>3.1</version></artifactItem>
<artifactItem><groupId>asm</groupId><artifactId>asm-util</artifactId><version>3.1</version></artifactItem>
......@@ -124,7 +124,7 @@
<artifactItem><groupId>org.objectweb.fractal.fractaladl</groupId><artifactId>task-framework</artifactId><version>2.3.1</version></artifactItem>
<artifactItem><groupId>org.objectweb.fractal.fractaladl</groupId><artifactId>task-deployment</artifactId><version>2.3.1</version></artifactItem>
<artifactItem><groupId>org.objectweb.fractal</groupId><artifactId>fractal-util</artifactId><version>1.1.2</version></artifactItem>
<artifactItem><groupId>org.objectweb.fractal.bf.connectors</groupId><artifactId>fractal-bf-connectors-common</artifactId><version>0.10-SNAPSHOT</version></artifactItem>
<artifactItem><groupId>org.ow2.fractal.bf.connectors</groupId><artifactId>fractal-bf-connectors-common</artifactId><version>0.10-SNAPSHOT</version></artifactItem>
<artifactItem><groupId>org.ow2.frascati.model</groupId><artifactId>frascati-model</artifactId><version>2.0.1.3</version></artifactItem>
<!-- Artifact for test -->
<artifactItem>
......
......@@ -334,8 +334,8 @@
<artifactItem><groupId>org.objectweb.fractal.juliac</groupId><artifactId>juliac-jdt</artifactId><version>2.4</version></artifactItem>
<artifactItem><groupId>org.objectweb.fractal.julia</groupId><artifactId>julia-mixins</artifactId><version>2.5.2</version></artifactItem>
<artifactItem><groupId>org.objectweb.fractal.julia</groupId><artifactId>julia-asm</artifactId><version>2.5.2</version></artifactItem>
<artifactItem><groupId>org.objectweb.fractal.bf</groupId><artifactId>fractal-bf-core</artifactId><version>0.10-SNAPSHOT</version></artifactItem>
<artifactItem><groupId>org.objectweb.fractal.bf.connectors</groupId><artifactId>fractal-bf-connectors-common</artifactId><version>0.10-SNAPSHOT</version></artifactItem>
<artifactItem><groupId>org.ow2.fractal.bf</groupId><artifactId>fractal-bf-core</artifactId><version>0.10-SNAPSHOT</version></artifactItem>
<artifactItem><groupId>org.ow2.fractal.bf.connectors</groupId><artifactId>fractal-bf-connectors-common</artifactId><version>0.10-SNAPSHOT</version></artifactItem>
<artifactItem><groupId>org.objectweb.fractal.fraclet.java</groupId><artifactId>fraclet-annotations</artifactId><version>3.3</version></artifactItem>
<artifactItem><groupId>org.objectweb.fractal.fractaladl</groupId><artifactId>fractal-adl</artifactId><version>2.3.1</version></artifactItem>
<artifactItem><groupId>org.objectweb.fractal.fractaladl</groupId><artifactId>ast-core</artifactId><version>2.3.1</version></artifactItem>
......@@ -370,7 +370,7 @@
<artifactItem><groupId>org.ow2.frascati</groupId><artifactId>frascati-binding-http</artifactId><version>${project.version}</version></artifactItem>
<artifactItem><groupId>org.ow2.frascati</groupId><artifactId>frascati-binding-ws</artifactId><version>${project.version}</version></artifactItem>
<artifactItem><groupId>org.ow2.frascati</groupId><artifactId>frascati-servlet-cxf</artifactId><version>${project.version}</version></artifactItem>
<artifactItem><groupId>org.objectweb.fractal.bf.connectors</groupId><artifactId>fractal-bf-connectors-soap-cxf</artifactId><version>0.10-SNAPSHOT</version></artifactItem>
<artifactItem><groupId>org.ow2.fractal.bf.connectors</groupId><artifactId>fractal-bf-connectors-soap-cxf</artifactId><version>0.10-SNAPSHOT</version></artifactItem>
</artifactItems>
</configuration>
......
......@@ -45,7 +45,7 @@
</properties>
<dependencies>
<dependency>
<groupId>org.objectweb.fractal.bf.connectors</groupId>
<groupId>org.ow2.fractal.bf.connectors</groupId>
<artifactId>fractal-bf-connectors-common</artifactId>
<version>${fractal-bf.version}</version>
</dependency>
......@@ -56,7 +56,7 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.objectweb.fractal.bf.testing</groupId>
<groupId>org.ow2.fractal.bf.testing</groupId>
<artifactId>fractal-bf-testing-fixtures</artifactId>
<version>${fractal-bf.version}</version>
<scope>test</scope>
......
......@@ -49,8 +49,8 @@
<dependency><groupId>org.objectweb.fractal.fractalrmi</groupId><artifactId>fractal-rmi</artifactId><version>${fractal-rmi.version}</version><scope>runtime</scope></dependency>
<dependency><groupId>org.objectweb.fractal.bf</groupId><artifactId>fractal-bf-core</artifactId><version>${fractal-bf.version}</version><scope>runtime</scope></dependency>
<dependency><groupId>org.objectweb.fractal.bf.connectors</groupId><artifactId>fractal-bf-connectors-common</artifactId><version>${fractal-bf.version}</version><scope>runtime</scope></dependency>
<dependency><groupId>org.ow2.fractal.bf</groupId><artifactId>fractal-bf-core</artifactId><version>${fractal-bf.version}</version><scope>runtime</scope></dependency>
<dependency><groupId>org.ow2.fractal.bf.connectors</groupId><artifactId>fractal-bf-connectors-common</artifactId><version>${fractal-bf.version}</version><scope>runtime</scope></dependency>
<dependency><groupId>org.objectweb.fractal.fractaladl</groupId><artifactId>fractal-adl</artifactId><version>${fractal-adl.version}</version><scope>runtime</scope></dependency>
<dependency><groupId>org.objectweb.monolog</groupId><artifactId>monolog-api</artifactId><version>${monolog.version}</version><scope>runtime</scope></dependency>
......
......@@ -41,7 +41,7 @@
<dependencies>
<dependency>
<groupId>org.objectweb.fractal.bf.connectors</groupId>
<groupId>org.ow2.fractal.bf.connectors</groupId>
<artifactId>fractal-bf-connectors-json-rpc</artifactId>
<version>${fractal-bf.version}</version>
</dependency>
......
......@@ -42,7 +42,7 @@
<dependencies>
<dependency>
<groupId>org.objectweb.fractal.bf.connectors</groupId>
<groupId>org.ow2.fractal.bf.connectors</groupId>
<artifactId>fractal-bf-connectors-rest-cxf</artifactId>
<version>${fractal-bf.version}</version>
</dependency>
......
......@@ -41,7 +41,7 @@
<dependencies>
<dependency>
<groupId>org.objectweb.fractal.bf.connectors</groupId>
<groupId>org.ow2.fractal.bf.connectors</groupId>
<artifactId>fractal-bf-connectors-rmi</artifactId>
<version>${fractal-bf.version}</version>
</dependency>
......
......@@ -49,7 +49,7 @@
<dependency><groupId>org.ow2.fractal.bf.binjiu.description</groupId><artifactId>java2upnp</artifactId><version>0.2-SNAPSHOT</version></dependency>
<dependency><groupId>org.ow2.frascati.upnp</groupId><artifactId>frascati-metamodel-upnp</artifactId><version>${project.version}</version></dependency>
<dependency><groupId>org.ow2.frascati.upnp</groupId><artifactId>frascati-binding-upnp</artifactId><version>${project.version}</version></dependency>
<dependency><groupId>org.objectweb.fractal.bf.connectors</groupId><artifactId>fractal-bf-connectors-upnp</artifactId><version>${fractal-bf.version}</version></dependency>
<dependency><groupId>org.ow2.fractal.bf.connectors</groupId><artifactId>fractal-bf-connectors-upnp</artifactId><version>${fractal-bf.version}</version></dependency>
<dependency><groupId>xerces</groupId><artifactId>xercesImpl</artifactId><version>2.9.1</version></dependency>
</dependencies>
......
......@@ -41,7 +41,7 @@
<dependencies>
<dependency>
<groupId>org.objectweb.fractal.bf.connectors</groupId>
<groupId>org.ow2.fractal.bf.connectors</groupId>
<artifactId>fractal-bf-connectors-soap-cxf</artifactId>
<version>${fractal-bf.version}</version>
</dependency>
......
......@@ -58,7 +58,7 @@
<org.ow2.frascati.binding.uri.base>http://localhost:8765</org.ow2.frascati.binding.uri.base>
<fractal-adl.version>2.3.1</fractal-adl.version>
<cxf.version>2.4.2</cxf.version>
<cxf.version>2.5.4</cxf.version>
<xerces.version>2.9.1</xerces.version>
<org.eclipse.stp.sca.version>2.0.1.3</org.eclipse.stp.sca.version>
</properties>
......
......@@ -68,7 +68,6 @@
<asm.version>3.1</asm.version>
<monolog.version>1.8</monolog.version>
<mortbay-jetty.version>6.1.21</mortbay-jetty.version>
<slf4j.version>1.5.0</slf4j.version>
<!-- EXPLORER PROPERTIES -->
<org.objectweb.util.version>1.0</org.objectweb.util.version>
<explorer.version>1.0</explorer.version>
......
......@@ -243,14 +243,15 @@
<fractal-bf.version>0.10-SNAPSHOT</fractal-bf.version>
<fractal-api.version>2.0.2</fractal-api.version>
<fscript.version>2.1.3</fscript.version>
<cxf.version>2.4.2</cxf.version>
<jetty.version>7.4.5.v20110725</jetty.version>
<cxf.version>2.5.4</cxf.version>
<jetty.version>7.5.4.v20111024</jetty.version>
<spring.version>3.0.5.RELEASE</spring.version>
<xerces.version>2.9.1</xerces.version>
<jaxb.version>2.1.13</jaxb.version>
<velocity.version>1.7</velocity.version>
<jgroups.version>2.12.1.Final</jgroups.version>
<jaxb2.version>0.6.0</jaxb2.version>
<slf4j.version>1.6.2</slf4j.version>
</properties>
<!-- ======================= -->
......
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