Commit 061db883 authored by Christophe Demarey's avatar Christophe Demarey
Browse files

Move RFID code in a separate module.

parent 4f6e18e4
......@@ -18,21 +18,14 @@
</parent>
<!-- ===== -->
<!-- Build. -->
<!-- Build -->
<!-- ===== -->
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins
</groupId>
<artifactId>maven-compiler-plugin
</artifactId>
<inherited>true</inherited>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
......@@ -47,7 +40,8 @@
<sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
<wsdlOptions>
<wsdlOption>
<wsdl>http://www.webservicex.net/globalweather.asmx?wsdl</wsdl>
<wsdl>file:///home/chris/adam/frascati/frascati-svn/demo/home-automation/core/src/main/wsdl/globalweather.wsdl</wsdl>
<!--<wsdl>http://www.webservicex.net/globalweather.asmx?wsdl</wsdl>-->
</wsdlOption>
</wsdlOptions>
</configuration>
......@@ -170,14 +164,15 @@
<version>1.0</version>
</dependency>
<!-- RFID -->
<!-- TTS -->
<dependency>
<groupId>com.sun.jna</groupId>
<artifactId>jna</artifactId>
<version>3.0.9</version>
</dependency>
<!-- TTS -->
<dependency>
<groupId>tmp.demo.homeautomation</groupId>
<artifactId>nabaztagComApi</artifactId>
</dependency>
<dependency>
<groupId>de.huxhorn.sulky</groupId>
<artifactId>de.huxhorn.sulky.3rdparty.jlayer</artifactId>
......@@ -219,11 +214,11 @@
<artifactId>calimero-ng</artifactId>
<version>2.0a4</version>
</dependency>
<dependency>
<!-- <dependency>
<groupId>tmp.demo.homeautomation</groupId>
<artifactId>nabaztagComApi</artifactId>
<version>1.0</version>
</dependency>
</dependency> -->
<dependency>
<groupId>tmp.demo.homeautomation</groupId>
<artifactId>swingx-beaninfo</artifactId>
......@@ -236,66 +231,5 @@
</dependency>
</dependencies>
<!-- ======= -->
<!-- Modules -->
<!-- ======= -->
<!-- ======== -->
<!-- Profiles -->
<!-- ======== -->
<profiles>
<!-- To execute an SCA composite type 'mvn -Prun'. -->
<profile>
<id>run</id>
<build>
<defaultGoal>exec:java</defaultGoal>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>java</goal>
</goals>
</execution>
</executions>
<configuration>
<mainClass>org.ow2.frascati.demo.homeautomation.util.Launcher</mainClass>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<!-- To execute an SCA composite with FraSCAti Explorer type 'mvn -Pexplorer'. -->
<profile>
<id>explorer</id>
<build>
<defaultGoal>exec:exec</defaultGoal>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
<executable>java</executable>
<arguments>
<argument>-Dfractal.provider=org.objectweb.fractal.julia.Julia</argument>
<argument>-Djava.security.policy=/tmp/frascati.policy</argument>
<argument>-cp</argument>
<classpath />
<argument>org.ow2.frascati.explorer.FrascatiExplorerLauncher</argument>
<argument>orchestration</argument>
</arguments>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
......@@ -25,7 +25,7 @@
package org.ow2.frascati.demo.homeautomation.api;
import org.ow2.frascati.demo.homeautomation.util.MirrorCallBack;
//import org.ow2.frascati.demo.homeautomation.util.MirrorCallBack;
/**
* RFID Service
......@@ -34,7 +34,7 @@ import org.ow2.frascati.demo.homeautomation.util.MirrorCallBack;
* @version 1.0
*/
public interface RFIDService extends MirrorCallBack {
public interface RFIDService /*extends MirrorCallBack*/ {
/**
* Initialize the RFID service
......
......@@ -47,7 +47,7 @@ public class Launcher {
Factory factory = new Factory();
// Creates a new SCA composite
Component scaComposite = factory.getComposite("orchestration.composite");
Component scaComposite = factory.getComposite("home-automation");//"orchestration.composite");
//start the demo
IMediator m = null;
......
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="home-automation">
<service name="mediatorService" promote="Mediator/mediatorService"/>
<include name="knx"/>
<include name="calendar"/>
<include name="map"/>
<include name="tts"/>
<include name="weather"/>
<include name="communication"/>
<include name="gui"/>
<include name="patientDAO"/>
<include name="accesscode"/>
<include name="sunspot"/>
<component name="Mediator">
<property name="mode">no-tts</property>
<implementation.java class="org.ow2.frascati.demo.homeautomation.lib.Mediator"/>
<service name="mediatorService">
<interface.java interface="org.ow2.frascati.demo.homeautomation.api.IMediator"/>
</service>
<reference name="guiService" target="userUIComponent/GUIService">
<interface.java interface="org.ow2.frascati.demo.homeautomation.api.GUIService"/>
</reference>
<reference name="weatherService" target="weatherComponent/weatherService">
<interface.java interface="org.ow2.frascati.demo.homeautomation.api.WeatherService"/>
</reference>
<reference name="ttsService" target="ttsComponent/ttsService">
<interface.java interface="org.ow2.frascati.demo.homeautomation.api.TTSService"/>
</reference>
<reference name="communicationService" target="communicationMockComponent/communicationMockService">
<interface.java interface="org.ow2.frascati.demo.homeautomation.api.CommunicationService"/>
</reference>
<reference name="calendarService" target="calendarMockComponent/calendarMockService">
<interface.java interface="org.ow2.frascati.demo.homeautomation.api.GoogleService"/>
</reference>
<reference name="knxService" target="knxMockComponent/knxMockService">
<interface.java interface="org.ow2.frascati.demo.homeautomation.api.KnxService"/>
</reference>
<reference name="rfidService">
<interface.java interface="org.ow2.frascati.demo.homeautomation.api.RFIDService"/>
</reference>
<reference name="sunspotService" target="sunspotMockComponent/sunspotMockService">
<interface.java interface="org.ow2.frascati.demo.homeautomation.api.SunSpotService"/>
</reference>
<reference name="patientDataAccessService" target="patientDAOComponent/patientDAO">
<interface.java interface="org.ow2.frascati.demo.homeautomation.api.PatientDAO"/>
</reference>
<reference name="accessCodeService" target="accesscodeComponent/accesscodeService">
<interface.java interface="org.ow2.frascati.demo.homeautomation.api.AccessCodeService"/>
</reference>
</component>
</composite>
<?xml version="1.0" encoding="UTF-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>
<name>Home Automation Demonstration</name>
<groupId>org.ow2.frascati.demo</groupId>
<artifactId>home-automation-demo</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<!-- ============ -->
<!-- Dependencies -->
<!-- ============ -->
<dependencies>
<dependency>
<groupId>org.ow2.frascati.demo</groupId>
<artifactId>home-automation-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.frascati.demo</groupId>
<artifactId>home-automation-rfid</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<!-- ======== -->
<!-- Profiles -->
<!-- ======== -->
<profiles>
<!-- To execute an SCA composite type 'mvn -Prun'. -->
<profile>
<id>run</id>
<build>
<defaultGoal>exec:java</defaultGoal>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>java</goal>
</goals>
</execution>
</executions>
<configuration>
<mainClass>org.ow2.frascati.demo.homeautomation.util.Launcher</mainClass>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<!-- To execute an SCA composite with FraSCAti Explorer type 'mvn -Pexplorer'. -->
<profile>
<id>explorer</id>
<build>
<defaultGoal>exec:exec</defaultGoal>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
<executable>java</executable>
<arguments>
<argument>-Dfractal.provider=org.objectweb.fractal.julia.Julia</argument>
<argument>-Djava.security.policy=/tmp/frascati.policy</argument>
<argument>-cp</argument>
<classpath />
<argument>org.ow2.frascati.explorer.FrascatiExplorerLauncher</argument>
<argument>orchestration</argument>
</arguments>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
......@@ -48,59 +48,32 @@
<!-- ============= -->
<repositories>
<repository>
<id>inria-galaxy-repository</id>
<name>INRIA Galaxy Maven Repository</name>
<url>http://galaxy.gforge.inria.fr/repository/maven2</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>ow2-snapshot</id>
<url>http://maven.ow2.org//maven2-snapshot</url>
</repository>
<repository>
<id>apache.incubator</id>
<url>http://people.apache.org/repo/m2-incubating-repository</url>
</repository>
<!-- for Google artefacts -->
<repository>
<releases>
<enabled>false</enabled>
<checksumPolicy>fail</checksumPolicy>
</releases>
<snapshots>
<enabled>true</enabled>
<checksumPolicy>fail</checksumPolicy>
</snapshots>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
<!-- for mp3spi -->
<repository>
<id>softlab</id>
<url>http://softlab.tsukuba-bunko.org/maven/repository/</url>
</repository>
<!-- for tritonus -->
<repository>
<id>pppnetmedia</id>
<url>http://ppnetmedia.com/repository</url>
</repository>
</repositories>
<!-- ============ -->
<!-- Dependencies -->
<!-- ============ -->
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.sun.jna</groupId>
<artifactId>jna</artifactId>
<version>3.0.9</version>
</dependency>
<dependency>
<groupId>tmp.demo.homeautomation</groupId>
<artifactId>nabaztagComApi</artifactId>
<version>1.0</version>
</dependency>
</dependencies>
</dependencyManagement>
<!-- ======= -->
<!-- Modules -->
<!-- ======= -->
......@@ -108,6 +81,8 @@
<modules>
<module>core</module>
<module>qos</module>
<module>rfid</module>
<module>rfid-mock</module>
</modules>
......
......@@ -24,15 +24,8 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins
</groupId>
<artifactId>maven-compiler-plugin
</artifactId>
<inherited>true</inherited>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
</plugins>
</build>
......
<?xml version="1.0" encoding="UTF-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>
<name>Home Automation Demonstration RFID Mock module</name>
<groupId>org.ow2.frascati.demo</groupId>
<artifactId>home-automation-rfid-mock</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<parent>
<groupId>org.ow2.frascati.demo</groupId>
<artifactId>home-automation-parent</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<!-- ===== -->
<!-- Build -->
<!-- ===== -->
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
</plugins>
</build>
<!-- ============= -->
<!-- Properties -->
<!-- ============= -->
<properties>
</properties>
<!-- ============ -->
<!-- Dependencies -->
<!-- ============ -->
<dependencies>
<dependency>
<groupId>org.ow2.frascati.demo</groupId>
<artifactId>home-automation-core</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
......@@ -23,7 +23,7 @@
* Contributor(s):
*/
package org.ow2.frascati.demo.homeautomation.lib;
package org.ow2.frascati.demo.homeautomation.rfid;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
......
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="home-automation">
<component name="rfidMockComponent" >
<implementation.java class="org.ow2.frascati.demo.homeautomation.rfid.RFIDServiceMockImpl"/>
<service name="rfidMockService" requires="qos">
<interface.java interface="org.ow2.frascati.demo.homeautomation.api.RFIDService"/>
</service>
<reference name="expertUIService" target="expertUIComponent/expertUIService">
<interface.java interface="org.ow2.frascati.demo.homeautomation.api.StaffUIService"/>
</reference>
<reference name="nurseUIService" target="nurseUIComponent/nurseUIService">
<interface.java interface="org.ow2.frascati.demo.homeautomation.api.StaffUIService"/>
</reference>
<reference name="mediator" target="Mediator/mediatorService">
<interface.java interface="org.ow2.frascati.demo.homeautomation.api.IMediator"/>
</reference>
</component>
<wire source="Mediator/rfidService" target="rfidMockComponent/rfidMockService/"/>
</composite>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-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>
<name>Home Automation Demonstration RFID module</name>
<groupId>org.ow2.frascati.demo</groupId>
<artifactId>home-automation-rfid</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<parent>
<groupId>org.ow2.frascati.demo</groupId>
<artifactId>home-automation-parent</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<!-- ===== -->
<!-- Build -->
<!-- ===== -->
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
</plugins>
</build>
<!-- ============= -->
<!-- Properties -->
<!-- ============= -->
<properties>
</properties>
<!-- ============ -->
<!-- Dependencies -->
<!-- ============ -->
<dependencies>
<dependency>
<groupId>org.ow2.frascati.demo</groupId>
<artifactId>home-automation-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jna</groupId>
<artifactId>jna</artifactId>
</dependency>
<dependency>
<groupId>tmp.demo.homeautomation</groupId>
<artifactId>nabaztagComApi</artifactId>
</dependency>
</dependencies>
</project>
......@@ -23,7 +23,7 @@
* Contributor(s):
*/
package org.ow2.frascati.demo.homeautomation.util;
package org.ow2.frascati.demo.homeautomation.rfid;
import com.sun.jna.Callback;
/**
......
......@@ -23,7 +23,7 @@
* Contributor(s):
*/
package org.ow2.frascati.demo.homeautomation.util;
package org.ow2.frascati.demo.homeautomation.rfid;
import com.sun.jna.Library;
import com.sun.jna.Native;
......
......@@ -23,7 +23,7 @@
* Contributor(s):
*/
package org.ow2.frascati.demo.homeautomation.lib;
package org.ow2.frascati.demo.homeautomation.rfid;
//import java.util.Map;
import java.util.logging.Level;
......@@ -36,7 +36,7 @@ import org.osoa.sca.annotations.Scope;
import org.ow2.frascati.demo.homeautomation.api.IMediator;
import org.ow2.frascati.demo.homeautomation.api.RFIDService;
import org.ow2.frascati.demo.homeautomation.api.StaffUIService;
import org.ow2.frascati.demo.homeautomation.util.MirrorLibrary;
import org.ow2.frascati.demo.homeautomation.rfid.MirrorLibrary;