Commit 7a02f2f1 authored by Christophe Demarey's avatar Christophe Demarey

WIP: AF pom refactoring

parent f0d0f00d
This diff is collapsed.
......@@ -36,7 +36,7 @@
<name>FraSCAti Assembly Factory: Generate Factory Module</name>
<packaging>jar</packaging>
<url>http://www.scorware.org</url>
<url>http://frascati.ow2.org</url>
<inceptionYear>2007</inceptionYear>
<developers>
<developer>
......@@ -75,31 +75,8 @@
<plugin>
<groupId>org.objectweb.fractal.juliac</groupId>
<artifactId>maven-juliac-plugin</artifactId>
<version>${juliac.version}</version>
<executions>
<execution>
<id>juliac-compile</id>
<phase>generate-sources</phase>
<goals><goal>compile</goal></goals>
</execution>
</executions>
<configuration>
<srcs><src>src/main/java</src></srcs>
<opts>
<opt>org.ow2.frascati.tinfi.emf.EMFParserSourceCodeGenerator</opt>
<opt>org.ow2.frascati.tinfi.opt.oo.FCOOCtrlSourceCodeGenerator</opt>
<opt>OO</opt>
</opts>
<mixins>
<mixin>org.ow2.frascati.tinfi:frascati-tinfi-mixins:${tinfi.version}:sources</mixin>
<mixin>org.objectweb.fractal.julia:julia-mixins:${julia-mixins.version}:sources</mixin>
</mixins>
<adls><adl>org.ow2.frascati.factory.FrascatiGenerate</adl></adls>
<modules>
<module>org.ow2.frascati.tinfi:frascati-tinfi-oo:${tinfi.version}</module>
<module>org.ow2.frascati.tinfi:frascati-tinfi-emf:${tinfi.version}</module>
</modules>
<compileGenerated>false</compileGenerated>
<adls><adl>org.ow2.frascati.factory.FrascatiGenerate</adl></adls>
</configuration>
</plugin>
......@@ -108,16 +85,10 @@
<!-- GraphViz software (http://www.graphviz.org ) -->
<!--
TODO: Commented as this plugin seems imcompatible with the production of a Maven plugin.
TODO: Commented as this plugin seems imcompatible with the production of a Maven plugin.
<plugin>
<groupId>ch.elca.el4j.maven.plugins</groupId>
<artifactId>maven-depgraph-plugin</artifactId>
<configuration>
<outDir>target/site/images</outDir>
<outFile>${pom.artifactId}.png</outFile>
</configuration>
<version>1.1</version>
<groupId>ch.elca.el4j.maven.plugins</groupId>
<artifactId>maven-depgraph-plugin</artifactId>
</plugin>
-->
......@@ -125,77 +96,13 @@
</build>
<!-- ======== -->
<!-- Profiles -->
<!-- ======== -->
<profiles>
<!-- Profile for running with assembly factory -->
<!-- Start a java application using the provided main class -->
<profile>
<id>factory:run</id>
<build>
<defaultGoal>compile</defaultGoal>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>java</goal>
</goals>
</execution>
</executions>
<configuration>
<mainClass>${main}</mainClass>
<systemProperties>
<systemProperty>
<key>java.util.logging.config.file</key>
<value>src/main/conf/logging.properties</value>
</systemProperty>
</systemProperties>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>frascati-af-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.objectweb.fractal.bf.connectors</groupId>
<artifactId>soap-cxf</artifactId>
<version>${fractal-bf.version}</version>
</dependency>
<dependency>
<groupId>org.objectweb.fractal.bf</groupId>
<artifactId>core</artifactId>
<version>${fractal-bf.version}</version>
</dependency>
<dependency>
<groupId>org.objectweb.fractal.bf</groupId>
<artifactId>adl</artifactId>
<version>${fractal-bf.version}</version>
</dependency>
</dependencies>
</profile>
</profiles>
<!-- ============ -->
<!-- Dependencies -->
<!-- ============ -->
<dependencies>
<!-- The SCOrWare Assembly Factory Core Module. -->
<!-- The FraSCAti Assembly Factory Core Module. -->
<dependency>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>frascati-af-core</artifactId>
......@@ -205,48 +112,13 @@
<dependency>
<groupId>org.ow2.frascati.tinfi</groupId>
<artifactId>frascati-tinfi-oo</artifactId>
<version>${tinfi.version}</version>
</dependency>
<dependency>
<groupId>org.objectweb.fractal.juliac.osgi</groupId>
<artifactId>juliac-osgi-opt-oo</artifactId>
<version>${juliac.version}</version>
</dependency>
<!-- The SCOrWare Tinfi compiler. -->
<!-- <dependency>-->
<!-- <groupId>org.ow2.frascati.tinfi</groupId>-->
<!-- <artifactId>frascati-tinfi-compiler</artifactId>-->
<!-- <version>${tinfi.version}</version>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>org.objectweb.fractal.juliac</groupId>-->
<!-- <artifactId>juliac-core</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->
</dependencies>
<!-- ============= -->
<!-- Repositories -->
<!-- ============= -->
<!--
TODO: Commented as this plugin seems imcompatible with the production of a Maven plugin.
<pluginRepositories>
<pluginRepository>
<id>elca-services</id>
<url>http://el4.elca-services.ch/el4j/maven2repository</url>
<releases>
<enabled>true</enabled>
</releases>
</pluginRepository>
</pluginRepositories>
-->
</project>
......@@ -21,45 +21,43 @@
-->
<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>parent</artifactId>
<groupId>org.ow2.frascati.factory</groupId>
<version>1.2-SNAPSHOT</version>
</parent>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>frascati-contribution-plugin</artifactId>
<name>FraSCAti Assembly Maven Plugins: Contribution </name>
<description>
Maven plugin module which allow to create contribution package for FraSCAti
</description>
<version>1.2-SNAPSHOT</version>
<url>http://frascati.ow2.org</url>
<packaging>maven-plugin</packaging>
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>parent</artifactId>
<groupId>org.ow2.frascati.factory</groupId>
<version>1.2-SNAPSHOT</version>
</parent>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>frascati-contribution-plugin</artifactId>
<name>FraSCAti Assembly Maven Plugins: Contribution </name>
<description>
Maven plugin module which allow to create contribution package for FraSCAti
</description>
<version>1.2-SNAPSHOT</version>
<url>http://frascati.ow2.org</url>
<packaging>maven-plugin</packaging>
<!-- ============ -->
<!-- Dependencies -->
<!-- ============ -->
<dependencies>
<!-- This module is a Maven plugin. -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
<version>2.0</version>
</dependency>
</dependencies>
<dependencies>
<!-- This module is a Maven plugin. -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
......@@ -21,28 +21,28 @@
-->
<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>parent</artifactId>
<groupId>org.ow2.frascati.factory</groupId>
<version>1.2-SNAPSHOT</version>
</parent>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>frascati-factory-plugin</artifactId>
<name>FraSCAti Assembly Maven Plugins: FraSCAti Factory</name>
<description>
Maven plugin module which allow to generate/compile SCA assembly for FraSCAti
</description>
<version>1.2-SNAPSHOT</version>
<url>http://frascati.ow2.org</url>
<packaging>maven-plugin</packaging>
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>parent</artifactId>
<groupId>org.ow2.frascati.factory</groupId>
<version>1.2-SNAPSHOT</version>
</parent>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>frascati-factory-plugin</artifactId>
<name>FraSCAti Assembly Maven Plugins: FraSCAti Factory</name>
<description>
Maven plugin module which allow to generate/compile SCA assembly for FraSCAti
</description>
<version>1.2-SNAPSHOT</version>
<url>http://frascati.ow2.org</url>
<packaging>maven-plugin</packaging>
<!-- ======= -->
<!-- Build -->
......@@ -51,48 +51,38 @@
<!-- ============ -->
<!-- Dependencies -->
<!-- ============ -->
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>frascati-af-runtime</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>frascati-factory-tools</artifactId>
<version>${project.version}</version>
</dependency>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>frascati-af-runtime</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>frascati-factory-tools</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Apache commons CLI required library to use FraSCAti factories. -->
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</dependency>
<!-- This module is a Maven plugin. -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
<version>2.0</version>
</dependency>
<dependency>
<groupId>org.objectweb.fractal.juliac</groupId>
<artifactId>juliac-core</artifactId>
<version>${juliac.version}</version>
</dependency>
</dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
......@@ -21,48 +21,47 @@
-->
<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>
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.factory</groupId>
<artifactId>parent</artifactId>
<version>1.2-SNAPSHOT</version>
</parent>
<parent>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>parent</artifactId>
<version>1.2-SNAPSHOT</version>
</parent>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>maven-plugins-parent</artifactId>
<packaging>pom</packaging>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>maven-plugins-parent</artifactId>
<packaging>pom</packaging>
<name>FraSCAti Assembly Maven Plugins: Parent Module</name>
<name>FraSCAti Assembly Maven Plugins: Parent Module</name>
<!-- ====== -->
<!-- Build. -->
<!-- ====== -->
<build>
<!--Skip this artifact during deployement -->
<!--Since plugins depends on assembly factory parent pom -->
<plugins>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.4</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
<build>
<!--Skip this artifact during deployment -->
<!--Since plugins depends on assembly factory parent pom -->
<plugins>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
<!-- ======= -->
<!-- Modules -->
<!-- ======= -->
<!-- ======= -->
<!-- Modules -->
<!-- ======= -->
<modules>
<module>frascati-factory</module>
<module>contribution</module>
</modules>
<modules>
<module>frascati-factory</module>
<module>contribution</module>
</modules>
</project>
\ No newline at end of file
......@@ -19,6 +19,32 @@
mvn install
</description>
<developers>
<developer>
<id>seinturier</id>
<name>Lionel Seinturier</name>
<email>Lionel.Seinturier@univ-lille1.fr</email>
<organization>University of Lille</organization>
<organizationUrl>http://www.univ-lille1.fr</organizationUrl>
<roles>
<role>Architect</role>
<role>Developer</role>
</roles>
</developer>
<developer>
<id>fournier</id>
<name>Damien Fournier</name>
<email>Dmaine.Fournier@inria.fr</email>
<organization>INRIA</organization>
<organizationUrl>http://www.inria.fr</organizationUrl>
<roles>
<role>Architect</role>
<role>Developer</role>
</roles>
</developer>
</developers>
<!-- === -->
<!-- SCM -->
<!-- === -->
......@@ -112,32 +138,6 @@
</plugins>
</build>
<developers>
<developer>
<id>seinturier</id>
<name>Lionel Seinturier</name>
<email>Lionel.Seinturier@univ-lille1.fr</email>
<organization>University of Lille</organization>
<organizationUrl>http://www.univ-lille1.fr</organizationUrl>
<roles>
<role>Architect</role>
<role>Developer</role>
</roles>
</developer>
<developer>
<id>fournier</id>
<name>Damien Fournier</name>
<email>Dmaine.Fournier@inria.fr</email>
<organization>INRIA</organization>
<organizationUrl>http://www.inria.fr</organizationUrl>
<roles>
<role>Architect</role>
<role>Developer</role>
</roles>
</developer>
</developers>
<!-- ============ -->
<!-- Dependencies -->
<!-- ============ -->
......@@ -171,9 +171,9 @@
</dependency>
<dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>resources</artifactId>
<version>3.4.0</version>
<groupId>org.eclipse.core</groupId>
<artifactId>resources</artifactId>
<version>3.4.0</version>
</dependency>
<dependency>
......
......@@ -41,9 +41,7 @@
<!-- ====== -->
<build>
<defaultGoal>install</defaultGoal>
</build>
<!-- ======= -->
......@@ -64,11 +62,11 @@
<!-- ============ -->
<repositories>
<repository>
<id>eclipse</id>
<name>Eclipse EMF Mirror</name>
<url>http://www.openarchitectureware.org/m2</url>
</repository>
<repository>
<id>eclipse</id>
<name>Eclipse EMF Mirror</name>
<url>http://www.openarchitectureware.org/m2</url>
</repository>
</repositories>
<properties>
......
......@@ -21,8 +21,8 @@
-->
<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>
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.factory</groupId>
......@@ -30,30 +30,30 @@
<version>1.2-SNAPSHOT</version>
</parent>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>frascati-af-parser</artifactId>
<version>1.2-SNAPSHOT</version>
<!-- ===================== -->
<!-- General Information -->
<!-- ===================== -->
<name>FraSCAti Assembly Factory: Parser Component</name>
<description>Parse SCA composite definition</description>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>frascati-af-parser</artifactId>
<version>1.2-SNAPSHOT</version>
<developers>
<developer>
<id>fournier</id>
<name>Damien Fournier</name>
<email>Damien.Fournier@inria.fr</email>
<organization>INRIA</organization>
<organizationUrl>http://www.inria.fr</organizationUrl>
<roles>
<role>Architect</role>
<role>Developer</role>
</roles>
</developer>
</developers>
<!-- ===================== -->
<!-- General Information -->
<!-- ===================== -->
<name>FraSCAti Assembly Factory: Parser Component</name>
<description>Parse SCA composite definition</description>
<developers>
<developer>
<id>fournier</id>
<name>Damien Fournier</name>
<email>Damien.Fournier@inria.fr</email>
<organization>INRIA</organization>
<organizationUrl>http://www.inria.fr</organizationUrl>
<roles>
<role>Architect</role>
<role>Developer</role>
</roles>
</developer>
</developers>
<!-- ======= -->
<!-- Build -->
......@@ -67,34 +67,24 @@
<!-- Dependencies -->
<!-- ============ -->
<dependencies>
<dependency>
<groupId>org.eclipse.stp.sca.osoa.java</groupId>
<artifactId>osoa-java-api</artifactId>
<version>1.0</version>
</dependency>
<!-- STP SCA model located into the private repository. -->
<dependencies>
<dependency>
<groupId>org.eclipse.stp.sca</groupId>
<artifactId>sca-model</artifactId>
<version>${sca.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.stp.sca.osoa.java</groupId>
<artifactId>osoa-java-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.stp.sca.domainmodel</groupId>
<artifactId>frascati-model</artifactId>
<version>${sca.version}</version>
</dependency>
<!-- STP SCA model -->
<dependency>
<groupId>org.eclipse.stp.sca</groupId>
<artifactId>sca-model</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.stp.sca.domainmodel</groupId>
<artifactId>tuscany-model</artifactId>
<version>${sca.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.stp.sca.domainmodel</groupId>
<artifactId>frascati-model</artifactId>
</dependency>
</dependencies>
</dependencies>
</project>
This diff is collapsed.
......@@ -26,12 +26,14 @@
<groupId>org.ow2.frascati.factory</groupId>
<version>1.2-SNAPSHOT</version>
</parent>
<name>FraSCAti Assembly Factory: Runtime Factory Module</name>
<modelVersion>4.0.0</modelVersion>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>frascati-af-runtime</artifactId>
<url>http://www.scorware.org</url>
<url>http://frascati.ow2.org</url>
<inceptionYear>2007</inceptionYear>
<developers>
<developer>
<id>fournier</id>
......@@ -64,49 +66,26 @@
<!-- </plugin>-->
<!-- Compile the Fractal architecture of the SCOrWare assembly factory with JuliaC. -->
<plugin>
<groupId>org.objectweb.fractal.juliac</groupId>
<artifactId>maven-juliac-plugin</artifactId>
<version>${juliac.version}</version>
<executions>
<execution>
<id>juliac-compile</id>
<phase>generate-sources</phase>
<goals><goal>compile</goal></goals>
</execution>
</executions>
<configuration>
<srcs><src>src/main/java</src></srcs>
<opts>
<opt>org.ow2.frascati.tinfi.emf.EMFParserSourceCodeGenerator</opt>
<opt>org.ow2.frascati.tinfi.opt.oo.FCOOCtrlSourceCodeGenerator</opt>
<opt>OO</opt>
</opts>
<mixins>