Commit ef6b0c2b authored by Philippe Merle's avatar Philippe Merle
Browse files

* Moved to OW2 FraSCAti 1.5-SNAPSHOT

* Moved groupId from org.ow2.frascati.demo to org.ow2.frascati.demo.home-automation
* Added OW2 FraSCAti to POM's <name>
* Moved <plugin><groupId>org.apache.maven.plugins</groupId><artifactId>maven-compiler-plugin</artifactId> to the root POM
* Updated <groupId>, <artifactId>, and <repositories> to access external JARs
* Added a README file
* Added header to pom.xml files
* Updated the way sound files are found
parent 30f0f4d5
1) build the demo
$ mvn clean install
2) run the demo
$ cd demo
$ mvn -Prun
3) Unsupported modules
- knx: calimero 2.0a4 required
- qos: Inria Tuvalu artefacts not available anymore
<?xml version="1.0" encoding="UTF-8" ?>
<!-- OW2 FraSCAti: Home Automation Demonstration -->
<!-- Copyright (C) 2010-2012 Inria, IRISA, University of Lille 1 -->
<!-- -->
<!-- This library is free software; you can redistribute it and/or -->
<!-- modify it under the terms of the GNU Lesser General Public -->
<!-- License as published by the Free Software Foundation; either -->
<!-- version 2 of the License, or (at your option) any later version. -->
<!-- -->
<!-- This library is distributed in the hope that it will be useful, -->
<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of -->
<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -->
<!-- Lesser General Public License for more details. -->
<!-- -->
<!-- You should have received a copy of the GNU Lesser General Public -->
<!-- License along with this library; if not, write to the Free Software -->
<!-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -->
<!-- USA -->
<!-- -->
<!-- Contact: frascati@ow2.org -->
<!-- -->
<!-- Authors: Grégory Nain, Mahmoud Ben Hassine -->
<!-- Contributors: Christophe Demarey, Philippe Merle -->
<!-- -->
<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 Calendar Mock module</name>
<groupId>org.ow2.frascati.demo</groupId>
<name>OW2 FraSCAti: Home Automation Demonstration Calendar Mock module</name>
<groupId>org.ow2.frascati.demo.home-automation</groupId>
<artifactId>home-automation-calendar-mock</artifactId>
<version>1.4-SNAPSHOT</version>
<packaging>jar</packaging>
<parent>
<groupId>org.ow2.frascati.demo</groupId>
<groupId>org.ow2.frascati.demo.home-automation</groupId>
<artifactId>home-automation-parent</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-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>
<groupId>org.ow2.frascati.demo.home-automation</groupId>
<artifactId>home-automation-core</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
<?xml version="1.0" encoding="UTF-8" ?>
<!-- OW2 FraSCAti: Home Automation Demonstration -->
<!-- Copyright (C) 2010-2012 Inria, IRISA, University of Lille 1 -->
<!-- -->
<!-- This library is free software; you can redistribute it and/or -->
<!-- modify it under the terms of the GNU Lesser General Public -->
<!-- License as published by the Free Software Foundation; either -->
<!-- version 2 of the License, or (at your option) any later version. -->
<!-- -->
<!-- This library is distributed in the hope that it will be useful, -->
<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of -->
<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -->
<!-- Lesser General Public License for more details. -->
<!-- -->
<!-- You should have received a copy of the GNU Lesser General Public -->
<!-- License along with this library; if not, write to the Free Software -->
<!-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -->
<!-- USA -->
<!-- -->
<!-- Contact: frascati@ow2.org -->
<!-- -->
<!-- Authors: Grégory Nain, Mahmoud Ben Hassine -->
<!-- Contributors: Christophe Demarey, Philippe Merle -->
<!-- -->
<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 Calendar module</name>
<groupId>org.ow2.frascati.demo</groupId>
<name>OW2 FraSCAti: Home Automation Demonstration Calendar module</name>
<groupId>org.ow2.frascati.demo.home-automation</groupId>
<artifactId>home-automation-calendar</artifactId>
<version>1.4-SNAPSHOT</version>
<packaging>jar</packaging>
<parent>
<groupId>org.ow2.frascati.demo</groupId>
<groupId>org.ow2.frascati.demo.home-automation</groupId>
<artifactId>home-automation-parent</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-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>
<groupId>org.ow2.frascati.demo.home-automation</groupId>
<artifactId>home-automation-core</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Google -->
<dependency>
<groupId>com.github.dcarter.gdata-java-client</groupId>
<groupId>com.google.gdata</groupId>
<artifactId>gdata-calendar-2.0</artifactId>
</dependency>
<dependency>
<groupId>com.github.dcarter.gdata-java-client</groupId>
<groupId>com.google.gdata</groupId>
<artifactId>gdata-client-1.0</artifactId>
<version>${gdata.java.client.version}</version>
</dependency>
</dependencies>
</project>
<?xml version="1.0" encoding="UTF-8" ?>
<!-- OW2 FraSCAti: Home Automation Demonstration -->
<!-- Copyright (C) 2010-2012 Inria, IRISA, University of Lille 1 -->
<!-- -->
<!-- This library is free software; you can redistribute it and/or -->
<!-- modify it under the terms of the GNU Lesser General Public -->
<!-- License as published by the Free Software Foundation; either -->
<!-- version 2 of the License, or (at your option) any later version. -->
<!-- -->
<!-- This library is distributed in the hope that it will be useful, -->
<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of -->
<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -->
<!-- Lesser General Public License for more details. -->
<!-- -->
<!-- You should have received a copy of the GNU Lesser General Public -->
<!-- License along with this library; if not, write to the Free Software -->
<!-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -->
<!-- USA -->
<!-- -->
<!-- Contact: frascati@ow2.org -->
<!-- -->
<!-- Authors: Grégory Nain, Mahmoud Ben Hassine -->
<!-- Contributors: Christophe Demarey, Philippe Merle -->
<!-- -->
<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 Communication API module</name>
<groupId>org.ow2.frascati.demo</groupId>
<name>OW2 FraSCAti: Home Automation Demonstration Communication API module</name>
<groupId>org.ow2.frascati.demo.home-automation</groupId>
<artifactId>home-automation-comm-api</artifactId>
<version>1.4-SNAPSHOT</version>
<packaging>jar</packaging>
<parent>
<groupId>org.ow2.frascati.demo</groupId>
<groupId>org.ow2.frascati.demo.home-automation</groupId>
<artifactId>home-automation-parent</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>
<!-- ============= -->
<!-- Properties -->
<!-- ============= -->
<properties>
<felix.mojo.version>2.0.1</felix.mojo.version>
</properties>
<!-- ===== -->
<!-- Build -->
<!-- ===== -->
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
......
<?xml version="1.0" encoding="UTF-8" ?>
<!-- OW2 FraSCAti: Home Automation Demonstration -->
<!-- Copyright (C) 2010-2012 Inria, IRISA, University of Lille 1 -->
<!-- -->
<!-- This library is free software; you can redistribute it and/or -->
<!-- modify it under the terms of the GNU Lesser General Public -->
<!-- License as published by the Free Software Foundation; either -->
<!-- version 2 of the License, or (at your option) any later version. -->
<!-- -->
<!-- This library is distributed in the hope that it will be useful, -->
<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of -->
<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -->
<!-- Lesser General Public License for more details. -->
<!-- -->
<!-- You should have received a copy of the GNU Lesser General Public -->
<!-- License along with this library; if not, write to the Free Software -->
<!-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -->
<!-- USA -->
<!-- -->
<!-- Contact: frascati@ow2.org -->
<!-- -->
<!-- Authors: Grégory Nain, Mahmoud Ben Hassine -->
<!-- Contributors: Christophe Demarey, Philippe Merle -->
<!-- -->
<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 Orange Communication module</name>
<groupId>org.ow2.frascati.demo</groupId>
<name>OW2 FraSCAti: Home Automation Demonstration Orange Communication module</name>
<groupId>org.ow2.frascati.demo.home-automation</groupId>
<artifactId>home-automation-comm-orange</artifactId>
<version>1.4-SNAPSHOT</version>
<packaging>jar</packaging>
<parent>
<groupId>org.ow2.frascati.demo</groupId>
<groupId>org.ow2.frascati.demo.home-automation</groupId>
<artifactId>home-automation-parent</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-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>
<groupId>org.ow2.frascati.demo.home-automation</groupId>
<artifactId>home-automation-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.frascati.demo</groupId>
<groupId>org.ow2.frascati.demo.home-automation</groupId>
<artifactId>home-automation-comm-api</artifactId>
<version>${project.version}</version>
</dependency>
......
<?xml version="1.0" encoding="UTF-8" ?>
<!-- OW2 FraSCAti: Home Automation Demonstration -->
<!-- Copyright (C) 2010-2012 Inria, IRISA, University of Lille 1 -->
<!-- -->
<!-- This library is free software; you can redistribute it and/or -->
<!-- modify it under the terms of the GNU Lesser General Public -->
<!-- License as published by the Free Software Foundation; either -->
<!-- version 2 of the License, or (at your option) any later version. -->
<!-- -->
<!-- This library is distributed in the hope that it will be useful, -->
<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of -->
<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -->
<!-- Lesser General Public License for more details. -->
<!-- -->
<!-- You should have received a copy of the GNU Lesser General Public -->
<!-- License along with this library; if not, write to the Free Software -->
<!-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -->
<!-- USA -->
<!-- -->
<!-- Contact: frascati@ow2.org -->
<!-- -->
<!-- Authors: Grégory Nain, Mahmoud Ben Hassine -->
<!-- Contributors: Christophe Demarey, Philippe Merle -->
<!-- -->
<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 Skype Communication Mock module</name>
<groupId>org.ow2.frascati.demo</groupId>
<name>OW2 FraSCAti: Home Automation Demonstration Skype Communication Mock module</name>
<groupId>org.ow2.frascati.demo.home-automation</groupId>
<artifactId>home-automation-comm-skype-mock</artifactId>
<version>1.4-SNAPSHOT</version>
<packaging>jar</packaging>
<parent>
<groupId>org.ow2.frascati.demo</groupId>
<groupId>org.ow2.frascati.demo.home-automation</groupId>
<artifactId>home-automation-parent</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>
<!-- ===== -->
......@@ -23,11 +43,6 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
......@@ -54,21 +69,13 @@
</plugins>
</build>
<!-- ============= -->
<!-- Properties -->
<!-- ============= -->
<properties>
<felix.mojo.version>2.0.1</felix.mojo.version>
</properties>
<!-- ============ -->
<!-- Dependencies -->
<!-- ============ -->
<dependencies>
<dependency>
<groupId>org.ow2.frascati.demo</groupId>
<groupId>org.ow2.frascati.demo.home-automation</groupId>
<artifactId>home-automation-comm-api</artifactId>
<version>${project.version}</version>
</dependency>
......
<?xml version="1.0" encoding="UTF-8" ?>
<!-- OW2 FraSCAti: Home Automation Demonstration -->
<!-- Copyright (C) 2010-2012 Inria, IRISA, University of Lille 1 -->
<!-- -->
<!-- This library is free software; you can redistribute it and/or -->
<!-- modify it under the terms of the GNU Lesser General Public -->
<!-- License as published by the Free Software Foundation; either -->
<!-- version 2 of the License, or (at your option) any later version. -->
<!-- -->
<!-- This library is distributed in the hope that it will be useful, -->
<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of -->
<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -->
<!-- Lesser General Public License for more details. -->
<!-- -->
<!-- You should have received a copy of the GNU Lesser General Public -->
<!-- License along with this library; if not, write to the Free Software -->
<!-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -->
<!-- USA -->
<!-- -->
<!-- Contact: frascati@ow2.org -->
<!-- -->
<!-- Authors: Grégory Nain, Mahmoud Ben Hassine -->
<!-- Contributors: Christophe Demarey, Philippe Merle -->
<!-- -->
<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 Skype Communication module</name>
<groupId>org.ow2.frascati.demo</groupId>
<name>OW2 FraSCAti: Home Automation Demonstration Skype Communication module</name>
<groupId>org.ow2.frascati.demo.home-automation</groupId>
<artifactId>home-automation-comm-skype</artifactId>
<version>1.4-SNAPSHOT</version>
<packaging>jar</packaging>
<parent>
<groupId>org.ow2.frascati.demo</groupId>
<groupId>org.ow2.frascati.demo.home-automation</groupId>
<artifactId>home-automation-parent</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>
<!-- ===== -->
<!-- Build -->
<!-- ===== -->
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
</plugins>
</build>
<!-- ============= -->
<!-- Properties -->
<!-- Repositories -->
<!-- ============= -->
<properties>
</properties>
<repositories>
<repository>
<id>atlassian</id>
<url>https://maven.atlassian.com/content/groups/public</url>
</repository>
</repositories>
<!-- ============ -->
<!-- Dependencies -->
<!-- ============ -->
<dependencies>
<dependency>
<groupId>org.ow2.frascati.demo</groupId>
<groupId>org.ow2.frascati.demo.home-automation</groupId>
<artifactId>home-automation-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.frascati.demo</groupId>
<groupId>org.ow2.frascati.demo.home-automation</groupId>
<artifactId>home-automation-comm-api</artifactId>
<version>${project.version}</version>
</dependency>
</dependency>
<dependency>
<groupId>tmp.demo.homeautomation</groupId>
<artifactId>skype</artifactId>
<groupId>com.skype</groupId>
<artifactId>skypefull</artifactId>
<version>1.0</version>
</dependency>
</dependencies>
......
<?xml version="1.0" encoding="UTF-8" ?>
<!-- OW2 FraSCAti: Home Automation Demonstration -->
<!-- Copyright (C) 2010-2012 Inria, IRISA, University of Lille 1 -->
<!-- -->
<!-- This library is free software; you can redistribute it and/or -->
<!-- modify it under the terms of the GNU Lesser General Public -->
<!-- License as published by the Free Software Foundation; either -->
<!-- version 2 of the License, or (at your option) any later version. -->
<!-- -->
<!-- This library is distributed in the hope that it will be useful, -->
<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of -->
<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -->
<!-- Lesser General Public License for more details. -->
<!-- -->
<!-- You should have received a copy of the GNU Lesser General Public -->
<!-- License along with this library; if not, write to the Free Software -->
<!-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -->
<!-- USA -->
<!-- -->
<!-- Contact: frascati@ow2.org -->
<!-- -->
<!-- Authors: Grégory Nain, Mahmoud Ben Hassine -->
<!-- Contributors: Christophe Demarey, Philippe Merle -->
<!-- -->
<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 Core module</name>
<groupId>org.ow2.frascati.demo</groupId>
<name>OW2 FraSCAti: Home Automation Demonstration Core module</name>
<groupId>org.ow2.frascati.demo.home-automation</groupId>
<artifactId>home-automation-core</artifactId>
<version>1.4-SNAPSHOT</version>
<packaging>jar</packaging>
<parent>
<groupId>org.ow2.frascati.demo</groupId>
<groupId>org.ow2.frascati.demo.home-automation</groupId>
<artifactId>home-automation-parent</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>
<!-- ===== -->
<!-- Build -->
<!-- ===== -->
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
</plugins>
</build>
<!-- ============= -->
<!-- Properties -->
<!-- ============= -->
<properties>
</properties>
<!-- ============= -->
<!-- Repositories. -->
<!-- ============= -->
<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>