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

WIP: AF pom refactoring

parent f0d0f00d
......@@ -29,16 +29,19 @@
<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-af-core</artifactId>
<name>FraSCAti Assembly Factory: Core Factory Module</name>
<url>http://frascati.ow2.org/</url>
<inceptionYear>2007</inceptionYear>
<developers>
<developer>
<id>fournier</id>
......@@ -61,59 +64,23 @@
<defaultGoal>install</defaultGoal>
<plugins>
<!-- To compile ${java.version} source code. -->
<!-- To compile source code. -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<!--
Compile the architecture of the FraSCAti assembly
factory with JuliaC.
-->
<plugin>
<groupId>org.objectweb.fractal.juliac</groupId>
<artifactId>maven-juliac-plugin</artifactId>
<configuration>
<fork>true</fork>
<meminitial>64m</meminitial>
<maxmem>512m</maxmem>
<source>1.5</source>
<target>1.5</target>
<systemProperties>
<property>
<name>java.util.logging.config.file</name>
<value>src/main/conf/logging.properties</value>
</property>
</systemProperties>
<adls><adl>org.ow2.frascati.factory.Frascati</adl></adls>
</configuration>
</plugin>
<!--
Compile the 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>
<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.Frascati</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>
</configuration>
</plugin>
<!-- Plugin for image generation representing the dependencies graph -->
<!-- To use this plugin, type: 'mvn depgraph:depgraph' -->
<!-- This plugin requires the 'dot' library, provided by the -->
......@@ -121,18 +88,12 @@
<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>
</plugin>
<!-- Build the binary assembly. -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<version>2.2-beta-1</version>
<configuration>
<descriptors>
<descriptor>assembly-bin.xml</descriptor>
......@@ -142,15 +103,6 @@
</plugins>
</build>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
</plugins>
</reporting>
<!-- ============ -->
<!-- Dependencies -->
<!-- ============ -->
......@@ -159,247 +111,110 @@
<dependency>
<groupId>org.objectweb.fractal.juliac</groupId>
<artifactId>juliac-runtime</artifactId>
<!-- artifactId>juliac-membranes-julia-oo</artifactId -->
<version>${juliac.version}</version>
</dependency>
<dependency>
<groupId>org.objectweb.fractal</groupId>
<artifactId>fractal-util</artifactId>
<version>1.1.2</version>
</dependency>
<!-- The SCOrWare Tinfi runtime. -->
<!-- The FraSCAti Tinfi runtime. -->
<dependency>
<groupId>org.ow2.frascati.tinfi</groupId>
<artifactId>frascati-tinfi-membranes-oo</artifactId>
<version>${tinfi.version}</version>
<exclusions>
<!--
TODO: Why Tinfi runtime depends on Koch? <exclusion>
<groupId>org.objectweb.fractal.julia</groupId>
<artifactId>koch-runtime</artifactId> </exclusion>
-->
<!-- Exclude the Koch Compiler as not required. -->
<exclusion>
<groupId>org.objectweb.fractal.julia</groupId>
<artifactId>koch-mc</artifactId>
</exclusion>
<!-- Exclude ObjectWeb Monolog -->
<exclusion>
<groupId>org.objectweb.monolog</groupId>
<artifactId>monolog</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- TODO : Enable OSGI support -->
<dependency>
<groupId>org.ow2.frascati.tinfi</groupId>
<artifactId>frascati-tinfi-runtime</artifactId>
</dependency>
<!-- TODO : Enable OSGI support -->
<dependency>
<groupId>org.objectweb.fractal.juliac.osgi</groupId>
<artifactId>juliac-osgi-membranes-oo</artifactId>
<version>${juliac.version}</version>
<exclusions>
<!-- Servlet APIs are already available in javax.servlet:servlet-api -->
<exclusion>
<groupId>org.apache.felix</groupId>
<artifactId>javax.servlet</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.objectweb.fractal.juliac.osgi</groupId>
<artifactId>juliac-osgi-runtime-felix</artifactId>
<version>${juliac.version}</version>
<exclusions>
<!-- Servlet APIs are already available in javax.servlet:servlet-api -->
<exclusion>
<groupId>org.apache.felix</groupId>
<artifactId>javax.servlet</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.objectweb.fractal.juliac.osgi</groupId>-->
<!-- <artifactId>juliac-osgi-compiler</artifactId>-->
<!-- <version>${juliac.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>org.objectweb.fractal.juliac.osgi</groupId>
<artifactId>juliac-osgi-bootstrap</artifactId>
<version>${juliac.version}</version>
<exclusions>
<!-- Servlet APIs are already available in javax.servlet:servlet-api -->
<exclusion>
<groupId>org.apache.felix</groupId>
<artifactId>javax.servlet</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.ow2.frascati.tinfi</groupId>
<artifactId>frascati-tinfi-runtime</artifactId>
<version>${tinfi.version}</version>
</dependency>
<!-- <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>-->
<dependency>
<groupId>org.objectweb.fractal.juliac</groupId>
<artifactId>juliac-jdt</artifactId>
<!-- artifactId>juliac-membranes-julia-oo</artifactId -->
<version>${juliac.version}</version>
</dependency>
<!-- The Fractal Binding Factory. -->
<dependency>
<groupId>org.objectweb.fractal.bf</groupId>
<artifactId>fractal-bf-core</artifactId>
<version>${fractal-bf.version}</version>
<exclusions>
<!-- Exclude ASM All -->
<exclusion>
<groupId>asm</groupId>
<artifactId>asm-all</artifactId>
</exclusion>
<!--
Exclude Fractal ADL <exclusion>
<groupId>org.objectweb.fractal.fractaladl</groupId>
<artifactId>fractal-adl</artifactId> </exclusion>
-->
<!-- Exclude Fractal ADL -->
<exclusion>
<groupId>org.objectweb.fractal.fractaladl</groupId>
<artifactId>task-framework</artifactId>
</exclusion>
<!-- Exclude ObjectWeb Monolog -->
<exclusion>
<groupId>org.objectweb.monolog</groupId>
<artifactId>monolog</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.objectweb.fractal.bf.connectors</groupId>
<artifactId>fractal-bf-connectors-soap-cxf</artifactId>
<version>${fractal-bf.version}</version>
<exclusions>
<!--
Exclude Fractal ADL <exclusion>
<groupId>org.objectweb.fractal.fractaladl</groupId>
<artifactId>fractal-adl</artifactId> </exclusion>
-->
<!-- Exclude Fractal ADL -->
<exclusion>
<groupId>org.objectweb.fractal.fractaladl</groupId>
<artifactId>task-framework</artifactId>
</exclusion>
<!-- Exclude Ant -->
<exclusion>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</exclusion>
<!-- Exclude JAXB Compiler -->
<exclusion>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
</exclusion>
<!-- Exclude Velocity -->
<exclusion>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.objectweb.fractal.bf.connectors</groupId>
<artifactId>fractal-bf-connectors-rmi</artifactId>
<version>${fractal-bf.version}</version>
</dependency>
<dependency>
<groupId>org.objectweb.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>
<artifactId>fractal-bf-connectors-json-rpc</artifactId>
<version>${fractal-bf.version}</version>
</dependency>
<!-- Required for using the binding factory -->
<dependency>
<groupId>org.objectweb.fractal.fractaladl</groupId>
<artifactId>task-deployment</artifactId>
<version>2.3</version>
</dependency>
<!-- Spring dependencies. -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
</dependency>
<!-- STP SCA model located into the private repository. -->
<!-- STP SCA model -->
<dependency>
<groupId>org.eclipse.stp.sca</groupId>
<artifactId>sca-model</artifactId>
<version>${sca.version}</version>
</dependency>
<!-- Required to compile FraSCAti with Java 1.5 -->
<dependency>
<groupId>javax.script</groupId>
<artifactId>script-api</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.stp.sca.domainmodel</groupId>
<artifactId>frascati-model</artifactId>
<version>${sca.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.stp.sca.introspection</groupId>
<artifactId>sca-model-introspection</artifactId>
<version>${sca.version}</version>
</dependency>
<!-- EMF required library. When activating validation -->
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>common</artifactId>
<version>3.3.0-v20070426</version>
</dependency>
<!-- the Assembly Factory parser -->
<dependency>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>frascati-af-parser</artifactId>
......@@ -412,6 +227,13 @@
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<!-- Required to compile FraSCAti with Java 1.5 -->
<dependency>
<groupId>javax.script</groupId>
<artifactId>script-api</artifactId>
<version>1.0</version>
</dependency>
</dependencies>
<!-- ============= -->
......@@ -419,8 +241,7 @@
<!-- ============= -->
<!-- This repository contains the script-api artifact -->
<repositories>
<repositories>
<repository>
<id>ibiblio-mule</id>
<name>Ibiblio dependencies</name>
......@@ -431,32 +252,7 @@
<repository>
<id>tuscany</id>
<url>http://svn.apache.org/repos/asf/tuscany/maven</url>
</repository>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>ibiblio-miror</id>
<name>Ibiblio Miror</name>
<url>http://mirrors.ibiblio.org/pub/mirrors/maven2/</url>
</pluginRepository>
<pluginRepository>
<id>elca-services</id>
<url>http://el4.elca-services.ch/el4j/maven2repository</url>
<releases>
<enabled>true</enabled>
</releases>
</pluginRepository>
</pluginRepositories>
<!-- =========== -->
<!-- Properties -->
<!-- =========== -->
<properties>
<!-- Spring Artifacts version -->
<spring.version>2.5.5</spring.version>
</properties>
</project>
......@@ -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>