Commit 6edb4126 authored by Philippe Merle's avatar Philippe Merle

Updated all pom.xml files in examples/ directory:

* added profile 'all'.
* defined property <frascati.version> and used it instead of <project.version>.
* moved property <fractal-adl.version> to helloworld-fractal/pom.xml.
* moved property <cxf.version> to ws-parent/pom.xml.
* removed <groupId> when it is equals to the parent <groupId>.
* removed empty <build>, <repositories>, etc.
* cosmetic updates of headers: copyright date, INRIA -> Inria, etc.

In bpel-parent/pom.xml:
* removed unneeded <pluginManagement> and <profiles>.
parent 06e09331
......@@ -2,7 +2,7 @@
<!--
* OW2 FraSCAti Examples: Availability Intent
*
* Copyright (C) 2010 INRIA, University of Lille 1
* Copyright (C) 2010-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
......@@ -16,7 +16,8 @@
*
* 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
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* Contact: frascati@ow2.org
*
......@@ -27,18 +28,17 @@
<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>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>frascati-availability-intent</artifactId>
<packaging>jar</packaging>
<name>OW2 FraSCAti Examples: Availability Intent</name>
<parent>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>parent</artifactId>
<version>1.5-SNAPSHOT</version>
</parent>
<artifactId>frascati-availability-intent</artifactId>
<packaging>jar</packaging>
<name>OW2 FraSCAti Examples: Availability Intent</name>
<properties>
<composite.file>availability</composite.file>
</properties>
......@@ -48,7 +48,7 @@
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${project.version}</version>
<version>${frascati.version}</version>
<scope>test</scope>
</dependency>
......
......@@ -2,7 +2,7 @@
<!--
* OW2 FraSCAti Examples: BPEL Parent
*
* Copyright (c) 2010-2011 INRIA, University of Lille 1
* Copyright (c) 2010-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
......@@ -16,7 +16,8 @@
*
* 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
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* Contact: frascati@ow2.org
*
......@@ -33,7 +34,6 @@
<version>1.5-SNAPSHOT</version>
</parent>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>bpel-parent</artifactId>
<packaging>pom</packaging>
......@@ -49,30 +49,6 @@
<artifactId>frascati-compiler-plugin</artifactId>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<!-- Execute Java. -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<!-- Use version 1.1.1 instead of 1.2 to be sure that provided artifacts are added to the classpath. -->
<version>1.1.1</version>
<configuration>
<!-- Following configures if EasyBPEL/Viper Explorer is launched at boot time. -->
<!--
<systemProperties>
<systemProperty>
<key>easybpel.explorer</key>
<value>false</value>
</systemProperty>
</systemProperties>
-->
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<dependencies>
......@@ -80,58 +56,16 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-bpel</artifactId>
<version>${project.version}</version>
<version>${frascati.version}</version>
</dependency>
<!-- For JUnit testing. -->
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${project.version}</version>
<version>${frascati.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<!-- To execute an SCA composite type 'mvn -Prun'. -->
<profile>
<id>run</id>
<build>
<defaultGoal>org.ow2.frascati.mojo:frascati-launcher-plugin:exec</defaultGoal>
<plugins>
<plugin>
<groupId>org.ow2.frascati.mojo</groupId>
<artifactId>frascati-launcher-plugin</artifactId>
<!-- Dependency needed to avoid org.apache.xerces.impl.dv.DVFactoryException, CXF issue -->
<dependencies>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>${xerces.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</profile>
<!-- To execute an SCA composite with FraSCAti Explorer type 'mvn -Pexplorer'. -->
<profile>
<id>explorer</id>
<build>
<defaultGoal>exec:java</defaultGoal>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<!-- Use version 1.1.1 instead of 1.2 to be sure that provided artifacts are added to the classpath. -->
<version>1.1.1</version>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
......@@ -2,7 +2,7 @@
<!--
* OW2 FraSCAti Examples: Calculator Client
*
* Copyright (c) 2009-2010 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
......@@ -16,7 +16,8 @@
*
* 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
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* Contact: frascati@ow2.org
*
......@@ -29,18 +30,17 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>calculator-client</artifactId>
<packaging>jar</packaging>
<name>OW2 FraSCAti Examples: Calculator Client</name>
<parent>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>calculator-parent</artifactId>
<version>1.5-SNAPSHOT</version>
</parent>
<artifactId>calculator-client</artifactId>
<packaging>jar</packaging>
<name>OW2 FraSCAti Examples: Calculator Client</name>
<properties>
<wsdl.file>src/main/wsdl/Calculator.wsdl</wsdl.file>
<composite.file>calc-client</composite.file>
......
......@@ -2,7 +2,7 @@
<!--
* OW2 FraSCAti Examples: Calculator
*
* Copyright (c) 2009-2010 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
......@@ -16,7 +16,8 @@
*
* 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
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* Contact: frascati@ow2.org
*
......@@ -29,12 +30,6 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>calculator-parent</artifactId>
<packaging>pom</packaging>
<name>OW2 FraSCAti Examples: Calculator</name>
<parent>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>ws-parent</artifactId>
......@@ -42,6 +37,11 @@
<relativePath>../ws-parent/pom.xml</relativePath>
</parent>
<artifactId>calculator-parent</artifactId>
<packaging>pom</packaging>
<name>OW2 FraSCAti Examples: Calculator</name>
<properties>
<config.directory>../..</config.directory>
</properties>
......
......@@ -2,7 +2,7 @@
<!--
* OW2 FraSCAti Examples: Calculator Server
*
* Copyright (c) 2009-2010 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
......@@ -16,7 +16,8 @@
*
* 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
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* Contact: frascati@ow2.org
*
......@@ -29,18 +30,17 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>calculator-server</artifactId>
<packaging>jar</packaging>
<name>OW2 FraSCAti Examples: Calculator Server</name>
<parent>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>calculator-parent</artifactId>
<version>1.5-SNAPSHOT</version>
</parent>
<artifactId>calculator-server</artifactId>
<packaging>jar</packaging>
<name>OW2 FraSCAti Examples: Calculator Server</name>
<properties>
<composite.file>soap-calc</composite.file>
</properties>
......
......@@ -2,7 +2,7 @@
<!--
* OW2 FraSCAti Examples: Callback
*
* Copyright (c) 2009-2010 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
......@@ -16,7 +16,8 @@
*
* 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
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* Contact: frascati@ow2.org
*
......@@ -34,7 +35,6 @@
<version>1.5-SNAPSHOT</version>
</parent>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>callback</artifactId>
<packaging>jar</packaging>
......@@ -47,13 +47,6 @@
<method.params>HelloWorld</method.params>
</properties>
<!-- ===== -->
<!-- Build -->
<!-- ===== -->
<build>
</build>
<!-- ============= -->
<!-- Dependencies -->
<!-- ============= -->
......@@ -66,16 +59,9 @@
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${project.version}</version>
<version>${frascati.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<!-- ============= -->
<!-- Repositories -->
<!-- ============= -->
<repositories>
</repositories>
</project>
......@@ -2,7 +2,7 @@
<!--
* OW2 FraSCAti Examples: Chat client.
*
* 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
......@@ -16,7 +16,8 @@
*
* 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
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* Contact: frascati@ow2.org
*
......@@ -34,7 +35,6 @@
<version>1.5-SNAPSHOT</version>
</parent>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>chat-client</artifactId>
<packaging>jar</packaging>
<name>OW2 FraSCAti Examples: Chat client</name>
......
......@@ -2,7 +2,7 @@
<!--
* OW2 FraSCAti Examples: Chat
*
* Copyright (c) 2009-2010 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
......@@ -16,7 +16,8 @@
*
* 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
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* Contact: frascati@ow2.org
*
......@@ -29,24 +30,23 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>chat-parent</artifactId>
<packaging>pom</packaging>
<name>OW2 FraSCAti Examples: Chat application</name>
<parent>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>parent</artifactId>
<version>1.5-SNAPSHOT</version>
</parent>
<artifactId>chat-parent</artifactId>
<packaging>pom</packaging>
<name>OW2 FraSCAti Examples: Chat application</name>
<dependencies>
<!-- OW2 FraSCAti Java RMI Binding. -->
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-rmi</artifactId>
<version>${project.version}</version>
<version>${frascati.version}</version>
</dependency>
</dependencies>
......
......@@ -2,7 +2,7 @@
<!--
* OW2 FraSCAti Examples: Chat.
*
* Copyright (c) 2009-2010 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
......@@ -16,7 +16,8 @@
*
* 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
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
-->
<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>
......@@ -26,7 +27,6 @@
<version>1.5-SNAPSHOT</version>
</parent>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>chat-server</artifactId>
<packaging>jar</packaging>
......
......@@ -2,7 +2,7 @@
<!--
* OW2 FraSCAti Examples: Comanche Application
*
* 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
......@@ -16,7 +16,8 @@
*
* 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
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* Contact: frascati@ow2.org
*
......@@ -26,6 +27,7 @@
* Pierre Carton
* Nicolas Dolet
* 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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
......@@ -35,7 +37,6 @@
<version>1.5-SNAPSHOT</version>
</parent>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>comanche</artifactId>
<packaging>jar</packaging>
......@@ -48,19 +49,12 @@
</properties>
<dependencies>
<dependency>
<groupId>org.ow2.frascati.model</groupId>
<artifactId>osoa-java-api</artifactId>
<version>${org.eclipse.stp.sca.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${project.version}</version>
<version>${frascati.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
......@@ -2,7 +2,7 @@
<!--
* OW2 FraSCAti Examples: RESTful Counter Client
*
* Copyright (c) 2009-2010 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
......@@ -16,31 +16,32 @@
*
* 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
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* Contact: frascati@ow2.org
*
* Author: Nicolas Dolet
*
* 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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>counter-client</artifactId>
<packaging>jar</packaging>
<name>OW2 FraSCAti Examples: RESTful Counter Client</name>
<parent>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>counter-parent</artifactId>
<version>1.5-SNAPSHOT</version>
</parent>
<artifactId>counter-client</artifactId>
<packaging>jar</packaging>
<name>OW2 FraSCAti Examples: RESTful Counter Client</name>
<properties>
<composite.file>counter-client</composite.file>
<service.name>r</service.name>
......
......@@ -2,7 +2,7 @@
<!--
* OW2 FraSCAti Examples: RESTful Counter contribution package
*
* Copyright (c) 2010-2011 INRIA, University of Lille 1
* Copyright (c) 2010-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
......@@ -16,32 +16,32 @@
*
* 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
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* Contact: frascati@ow2.org
*
* Author: Damien Fournier
*
* Contributor(s): Philippe Merle, Nicolas Dolet
*
-->
<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>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>counter-contribution</artifactId>
<packaging>pom</packaging>
<version>1.5-SNAPSHOT</version>
<name>OW2 FraSCAti Examples: RESTful Counter Contribution package</name>
<parent>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>counter-parent</artifactId>
<version>1.5-SNAPSHOT</version>
</parent>
<artifactId>counter-contribution</artifactId>
<packaging>pom</packaging>
<name>OW2 FraSCAti Examples: RESTful Counter Contribution package</name>
<properties>
<composite.file>target/counter-contribution.zip</composite.file>
</properties>
......@@ -52,7 +52,7 @@
<plugin>
<groupId>org.ow2.frascati.mojo</groupId>
<artifactId>frascati-contribution-plugin</artifactId>
<version>${project.version}</version>
<version>${frascati.version}</version>
<executions>
<execution>
<id>frascati-contribution</id>
......
......@@ -2,7 +2,7 @@
<!--
* OW2 FraSCAti Examples: RESTful Counter
*
* Copyright (c) 2009-2010 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
......@@ -16,7 +16,8 @@
*
* 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
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* Contact: frascati@ow2.org
*
......@@ -28,18 +29,17 @@
<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>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>counter-parent</artifactId>
<packaging>pom</packaging>
<name>OW2 FraSCAti Examples: RESTful Counter</name>