Commit 4738dc1e authored by Christophe Demarey's avatar Christophe Demarey
Browse files

Move sunspot code in a separate module.

parent 0e557b59
......@@ -2,8 +2,8 @@
<component name="calendarComponent">
<property name="login">christophe.demarey@inria.fr</property>
<property name="password">starburst</property>
<property name="login">login</property>
<property name="password">pwd</property>
<implementation.java class="org.ow2.frascati.demo.homeautomation.calendar.GcalServiceImpl"/>
......
......@@ -8,7 +8,6 @@
<include name="gui"/>
<include name="patientDAO"/>
<include name="accesscode"/>
<include name="sunspot"/>
<component name="Mediator">
......@@ -48,7 +47,7 @@
<interface.java interface="org.ow2.frascati.demo.homeautomation.api.RFIDService"/>
</reference>
<reference name="sunspotService" target="sunspotMockComponent/sunspotMockService">
<reference name="sunspotService">
<interface.java interface="org.ow2.frascati.demo.homeautomation.api.SunSpotService"/>
</reference>
......
......@@ -41,6 +41,11 @@
<artifactId>home-automation-knx-mock</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.frascati.demo</groupId>
<artifactId>home-automation-sunspot-mock</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<!-- ======== -->
......
......@@ -133,6 +133,8 @@
<module>comm-orange</module>
<module>knx</module>
<module>knx-mock</module>
<module>sunspot</module>
<module>sunspot-mock</module>
</modules>
......
<?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 Sunspot Mock module</name>
<groupId>org.ow2.frascati.demo</groupId>
<artifactId>home-automation-sunspot-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>${project.version}</version>
</dependency>
</dependencies>
</project>
......@@ -23,7 +23,7 @@
* Contributor(s):
*/
package org.ow2.frascati.demo.homeautomation.lib;
package org.ow2.frascati.demo.homeautomation.sunspot;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
......
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="home-automation">
<component name="sunspotMockComponent" >
<!-- health emergency service phone number -->
<property name="hesNumber">0699121314</property>
<implementation.java class="org.ow2.frascati.demo.homeautomation.sunspot.SunSpotServiceMockImpl"/>
<service name="sunspotMockService" requires="qos">
<interface.java interface="org.ow2.frascati.demo.homeautomation.api.SunSpotService"/>
</service>
<reference name="mediator" target="Mediator/mediatorService">
<interface.java interface="org.ow2.frascati.demo.homeautomation.api.IMediator"/>
</reference>
</component>
<wire source="Mediator/sunspotService" target="sunspotMockComponent/sunspotMockService"/>
</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 Sunspot module</name>
<groupId>org.ow2.frascati.demo</groupId>
<artifactId>home-automation-sunspot</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>
</dependencies>
</project>
......@@ -23,7 +23,7 @@
* Contributor(s):
*/
package org.ow2.frascati.demo.homeautomation.lib;
package org.ow2.frascati.demo.homeautomation.sunspot;
import java.util.logging.Level;
import java.util.logging.Logger;
......
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="sunspot">
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="home-automation">
<component name="sunspotComponent">
<!-- health emergency service phone number -->
<property name="hesNumber">0699121314</property>
<implementation.java class="org.ow2.frascati.demo.homeautomation.lib.SunSpotServiceImpl"/>
<implementation.java class="org.ow2.frascati.demo.homeautomation.sunspot.SunSpotServiceImpl"/>
<service name="sunspotService" requires="qos">
<interface.java interface="org.ow2.frascati.demo.homeautomation.api.SunSpotService"/>
......@@ -14,24 +13,8 @@
<reference name="mediator" target="Mediator/mediatorService">
<interface.java interface="org.ow2.frascati.demo.homeautomation.api.IMediator"/>
</reference>
</component>
<component name="sunspotMockComponent" >
<!-- health emergency service phone number -->
<property name="hesNumber">0699121314</property>
<implementation.java class="org.ow2.frascati.demo.homeautomation.lib.SunSpotServiceMockImpl"/>
<service name="sunspotMockService" requires="qos">
<interface.java interface="org.ow2.frascati.demo.homeautomation.api.SunSpotService"/>
</service>
<reference name="mediator" target="Mediator/mediatorService">
<interface.java interface="org.ow2.frascati.demo.homeautomation.api.IMediator"/>
</reference>
<wire source="Mediator/sunspotService" target="sunspotComponent/sunspotService"/>
</component>
</composite>
\ No newline at end of file
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