Commit ea733211 authored by Damien Fournier's avatar Damien Fournier
Browse files

* Move examples group id's and imported packages to org.ow2.frascati.factory

* Fix naming error for used source code generator in factory
* Fix value returned by getFactoryMainClass() in org.ow2.frascati.factory.Factory class
parent 285e8cd2
......@@ -23,12 +23,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.scorware.assembly.bench</groupId>
<groupId>org.ow2.frascati.factory.bench</groupId>
<artifactId>parent</artifactId>
<version>0.5-SNAPSHOT</version>
</parent>
<groupId>org.scorware.assembly.bench</groupId>
<groupId>org.ow2.frascati.factory.bench</groupId>
<artifactId>bench-components</artifactId>
<version>0.5-SNAPSHOT</version>
......@@ -49,7 +49,7 @@
<build>
<plugins>
<plugin>
<groupId>org.scorware.assembly</groupId>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>frascati-factory-tools</artifactId>
<version>${project.version}</version>
<executions>
......@@ -99,7 +99,7 @@
</executions>
<configuration>
<argument>-Xmx512m</argument>
<mainClass>org.scorware.assembly.bench.FrascatiClient</mainClass>
<mainClass>org.ow2.frascati.factory.bench.FrascatiClient</mainClass>
<systemProperties>
<systemProperty>
<key>java.util.logging.config.file</key>
......@@ -131,7 +131,7 @@
</executions>
<configuration>
<argument>-Xmx512m</argument>
<mainClass>org.scorware.assembly.bench.TuscanyClient</mainClass>
<mainClass>org.ow2.frascati.factory.bench.TuscanyClient</mainClass>
<systemProperties>
<systemProperty>
<key>java.util.logging.config.file</key>
......
......@@ -29,13 +29,13 @@
<version>0.5-SNAPSHOT</version>
</parent>
<groupId>org.scorware.assembly.bench</groupId>
<groupId>org.ow2.frascati.factory.bench</groupId>
<artifactId>chain-bench</artifactId>
<version>0.5-SNAPSHOT</version>
<packaging>jar</packaging>
<name>SCOrWare FraSCAti Assembly Factory Benchmark: Chain</name>
<name>FraSCAti Assembly Factory Benchmark: Chain</name>
<description>
Simple performance test for FraSCAti, allow to generate a composite
......@@ -62,7 +62,7 @@
</execution>
</executions>
<configuration>
<mainClass>org.scorware.assembly.bench.ChainGenerator</mainClass>
<mainClass>org.ow2.frascati.factory.bench.ChainGenerator</mainClass>
<!-- Comment this to generate several composites -->
<arguments>
<argument>10</argument>
......@@ -115,7 +115,7 @@
</executions>
<configuration>
<argument>-Xmx512m</argument>
<mainClass>org.scorware.assembly.bench.FrascatiClient</mainClass>
<mainClass>org.ow2.frascati.factory.bench.FrascatiClient</mainClass>
<systemProperties>
<systemProperty>
<key>java.util.logging.config.file</key>
......@@ -147,7 +147,7 @@
</executions>
<configuration>
<argument>-Xmx512m</argument>
<mainClass>org.scorware.assembly.bench.TuscanyClient</mainClass>
<mainClass>org.ow2.frascati.factory.bench.TuscanyClient</mainClass>
<systemProperties>
<systemProperty>
<key>java.util.logging.config.file</key>
......@@ -181,14 +181,14 @@
<!-- benchmark components. -->
<dependency>
<groupId>org.scorware.assembly.bench</groupId>
<groupId>org.ow2.frascati.factory.bench</groupId>
<artifactId>bench-components</artifactId>
<version>${project.version}</version>
</dependency>
<!-- generator utils. -->
<dependency>
<groupId>org.scorware.assembly.bench</groupId>
<groupId>org.ow2.frascati.factory.bench</groupId>
<artifactId>generators</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
......
......@@ -23,18 +23,18 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.scorware.assembly.bench</groupId>
<groupId>org.ow2.frascati.factory.bench</groupId>
<artifactId>parent</artifactId>
<version>0.5-SNAPSHOT</version>
</parent>
<groupId>org.scorware.assembly.bench</groupId>
<groupId>org.ow2.frascati.factory.bench</groupId>
<artifactId>generators</artifactId>
<version>0.5-SNAPSHOT</version>
<packaging>jar</packaging>
<name>SCOrWare FraSCAti Assembly Factory Benchmark: Generators</name>
<name>FraSCAti Assembly Factory Benchmark: Generators</name>
<description>
Simple performance test for FraSCAti, allow to generate a composite
......
......@@ -25,16 +25,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.scorware.assembly</groupId>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>parent</artifactId>
<version>0.5-SNAPSHOT</version>
</parent>
<groupId>org.scorware.assembly.bench</groupId>
<groupId>org.ow2.frascati.factory.bench</groupId>
<artifactId>parent</artifactId>
<packaging>pom</packaging>
<name>SCOrWare FraSCAti Assembly Factory Bechmark: Parent Module</name>
<name>FraSCAti Assembly Factory Bechmark: Parent Module</name>
<!-- ============= -->
<!-- Dependencies. -->
......@@ -44,7 +44,7 @@
<!-- The SCOrWare Assembly Factory Core Module. -->
<dependency>
<groupId>org.scorware.assembly</groupId>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>frascati-af-runtime</artifactId>
<version>${project.version}</version>
</dependency>
......
......@@ -35,7 +35,7 @@
<packaging>jar</packaging>
<name>SCOrWare FraSCAti Assembly Factory Benchmark: Tree</name>
<name>FraSCAti Assembly Factory Benchmark: Tree</name>
<description>
Simple performance test for FraSCAti, allow to generate a composite
......
......@@ -23,24 +23,24 @@
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.scorware.assembly.examples</groupId>
<groupId>org.ow2.frascati.factory.examples</groupId>
<artifactId>parent</artifactId>
<version>0.5-SNAPSHOT</version>
</parent>
<groupId>org.scorware.assembly.examples</groupId>
<groupId>org.ow2.frascati.factory.examples</groupId>
<artifactId>chat</artifactId>
<packaging>jar</packaging>
<properties>
<example.main.composite> </example.main.composite>
<!-- <example.main.class>examples.chat.HelloWorldRMI</example.main.class>-->
</properties>
<name>SCOrWare FraSCAti Assembly Factory Examples: Chat</name>
<name>FraSCAti Assembly Factory Examples: Chat</name>
<description> Chat example showing interactions between several clients and a server.
This example runs on FraSCAti Runtime 0.4-SNAPSHOT </description>
<dependencies>
<dependency>
<groupId>org.scorware.assembly</groupId>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>frascati-af-runtime</artifactId>
<version>${project.version}</version>
</dependency>
......@@ -81,7 +81,7 @@
<!-- We have to generate stuff for the client composite because the AssemblyFactory is called from the client GUI. -->
<plugin>
<groupId>org.scorware.assembly</groupId>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>frascati-factory-tools</artifactId>
<version>${project.version}</version>
<executions>
......@@ -114,7 +114,7 @@
<defaultGoal>compile</defaultGoal>
<plugins>
<plugin>
<groupId>org.scorware.assembly</groupId>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>frascati-factory-tools</artifactId>
<executions>
<execution>
......
......@@ -26,8 +26,8 @@ import org.jdesktop.application.Application;
import org.jdesktop.application.SingleFrameApplication;
import org.objectweb.fractal.api.Component;
import org.objectweb.fractal.api.NoSuchInterfaceException;
import org.scorware.assembly.AssemblyFactory;
import org.scorware.tinfi.TinfiDomain;
import org.ow2.frascati.factory.AssemblyFactory;
import org.ow2.frascati.tinfi.TinfiDomain;
import examples.chat.client.ChatClient;
......
......@@ -19,17 +19,19 @@
package examples.chat.client.gui;
import org.jdesktop.application.Action;
import org.jdesktop.application.ResourceMap;
import org.jdesktop.application.SingleFrameApplication;
import org.jdesktop.application.FrameView;
import org.jdesktop.application.TaskMonitor;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.Timer;
import javax.swing.Icon;
import javax.swing.JDialog;
import javax.swing.JFrame;
import javax.swing.Timer;
import org.jdesktop.application.Action;
import org.jdesktop.application.FrameView;
import org.jdesktop.application.ResourceMap;
import org.jdesktop.application.SingleFrameApplication;
import org.jdesktop.application.TaskMonitor;
/**
* The application's main frame.
......
......@@ -19,7 +19,9 @@
package examples.chat.server;
import org.osoa.sca.annotations.*;
import org.osoa.sca.annotations.Property;
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
/**
* The chat Server implementation.
......
......@@ -4,11 +4,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.scorware.assembly.examples</groupId>
<groupId>org.ow2.frascati.factory.examples</groupId>
<artifactId>parent</artifactId>
<version>0.5-SNAPSHOT</version>
</parent>
<groupId>org.scorware.assembly.example</groupId>
<groupId>org.ow2.frascati.factory.example</groupId>
<artifactId>forge-assembly</artifactId>
<packaging>jar</packaging>
<name>Assembly Factory Examples: Forge</name>
......
......@@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.scorware.assembly.examples</groupId>
<groupId>org.ow2.frascati.factory.examples</groupId>
<artifactId>helloworld-bin</artifactId>
<version>0.5-SNAPSHOT</version>
</parent>
<groupId>org.scorware.assembly.examples</groupId>
<groupId>org.ow2.frascati.factory.examples</groupId>
<artifactId>helloworld-bin-assembly</artifactId>
<packaging>jar</packaging>
......@@ -18,16 +18,16 @@
<example.main.composite>helloworld.composite</example.main.composite>
</properties>
<name>SCOrWare FraSCAti Assembly Factory Examples: HelloWorld Binary - runtime</name>
<name>FraSCAti Assembly Factory Examples: HelloWorld Binary - runtime</name>
<dependencies>
<dependency>
<groupId>org.scorware.assembly</groupId>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>frascati-af-runtime</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.scorware.assembly.examples</groupId>
<groupId>org.ow2.frascati.factory.examples</groupId>
<artifactId>helloworld-bin-code</artifactId>
<version>${project.version}</version>
</dependency>
......
......@@ -24,8 +24,8 @@
package example.hw;
import org.objectweb.fractal.api.Component;
import org.scorware.assembly.Factory;
import org.scorware.tinfi.TinfiDomain;
import org.ow2.frascati.factory.Factory;
import org.ow2.frascati.tinfi.TinfiDomain;
public class Client {
......
package example.hw;
import static org.junit.Assert.*;
import static org.junit.Assert.assertNotNull;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.scorware.assembly.Factory;
import org.scorware.tinfi.TinfiDomain;
import org.objectweb.fractal.api.Component;
import org.ow2.frascati.factory.Factory;
import org.ow2.frascati.tinfi.TinfiDomain;
public class HelloWorldBinTestCase {
......
......@@ -4,15 +4,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.scorware.assembly.examples</groupId>
<groupId>org.ow2.frascati.factory.examples</groupId>
<artifactId>helloworld-bin</artifactId>
<version>0.5-SNAPSHOT</version>
</parent>
<groupId>org.scorware.assembly.examples</groupId>
<groupId>org.ow2.frascati.factory.examples</groupId>
<artifactId>helloworld-bin-code</artifactId>
<packaging>jar</packaging>
<name>SCOrWare FraSCAti Assembly Factory Examples: HelloWorld Binary - java</name>
<name>FraSCAti Assembly Factory Examples: HelloWorld Binary - java</name>
</project>
......@@ -4,16 +4,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.scorware.assembly.examples</groupId>
<groupId>org.ow2.frascati.factory.examples</groupId>
<artifactId>parent</artifactId>
<version>0.5-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<groupId>org.scorware.assembly.examples</groupId>
<groupId>org.ow2.frascati.factory.examples</groupId>
<artifactId>helloworld-bin</artifactId>
<name>SCOrWare FraSCAti Assembly Factory Examples: HelloWorld Binary</name>
<name>FraSCAti Assembly Factory Examples: HelloWorld Binary</name>
<modules>
<module>code</module>
......
......@@ -24,21 +24,21 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.scorware.assembly.examples</groupId>
<groupId>org.ow2.frascati.factory.examples</groupId>
<artifactId>parent</artifactId>
<version>0.5-SNAPSHOT</version>
</parent>
<groupId>org.scorware.assembly.examples</groupId>
<groupId>org.ow2.frascati.factory.examples</groupId>
<artifactId>helloworld-composite</artifactId>
<packaging>jar</packaging>
<name>SCOrWare FraSCAti Assembly Factory Examples: HelloWorld Composite</name>
<name>FraSCAti Assembly Factory Examples: HelloWorld Composite</name>
<!-- Compile the ${example.main.composite} SCA composite with the SCOrWare Generate Factory.-->
<build>
<plugins>
<plugin>
<groupId>org.scorware.assembly</groupId>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>frascati-factory-tools</artifactId>
<version>${project.version}</version>
<executions>
......@@ -69,12 +69,12 @@
<dependencies>
<dependency>
<groupId>org.scorware.assembly.examples</groupId>
<groupId>org.ow2.frascati.factory.examples</groupId>
<artifactId>helloworld-bin-code</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.scorware.assembly</groupId>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>frascati-af-runtime</artifactId>
<version>${project.version}</version>
</dependency>
......
......@@ -24,8 +24,8 @@
package example.hw;
import org.objectweb.fractal.api.Component;
import org.scorware.assembly.Factory;
import org.scorware.tinfi.TinfiDomain;
import org.ow2.frascati.factory.Factory;
import org.ow2.frascati.tinfi.TinfiDomain;
public class ClientComposite {
......
package example.hw;
import static org.junit.Assert.*;
import static org.junit.Assert.assertNotNull;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.scorware.assembly.Factory;
import org.scorware.tinfi.TinfiDomain;
import org.objectweb.fractal.api.Component;
import org.ow2.frascati.factory.Factory;
import org.ow2.frascati.tinfi.TinfiDomain;
public class HelloWorldCompositeTestCase {
......
......@@ -24,15 +24,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.scorware.assembly.examples</groupId>
<groupId>org.ow2.frascati.factory.examples</groupId>
<artifactId>parent</artifactId>
<version>0.5-SNAPSHOT</version>
</parent>
<groupId>org.scorware.assembly.examples</groupId>
<groupId>org.ow2.frascati.factory.examples</groupId>
<artifactId>helloworld-fractal</artifactId>
<packaging>jar</packaging>
<name>SCOrWare FraSCAti Assembly Factory Examples: HelloWorld with Fractal Implementation</name>
<name>FraSCAti Assembly Factory Examples: HelloWorld with Fractal Implementation</name>
<properties>
<example.main.composite>helloworld-fractal.composite</example.main.composite>
......@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.scorware.assembly</groupId>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>frascati-af-runtime</artifactId>
<version>${project.version}</version>
</dependency>
......
package example.hw;
import static org.junit.Assert.*;
import static org.junit.Assert.assertNotNull;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.scorware.assembly.Factory;
import org.scorware.tinfi.TinfiDomain;
import org.objectweb.fractal.api.Component;
import org.ow2.frascati.factory.Factory;
import org.ow2.frascati.tinfi.TinfiDomain;
public class HelloWorldFractalTestCase {
......
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