Merge remote-tracking branch 'origin/master'
diff --git a/core/net/pom.xml b/core/net/pom.xml
new file mode 100644
index 0000000..807e032
--- /dev/null
+++ b/core/net/pom.xml
@@ -0,0 +1,39 @@
+<?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>
+
+ <parent>
+ <groupId>org.onlab.onos</groupId>
+ <artifactId>onos-core</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>onos-core-net</artifactId>
+ <packaging>bundle</packaging>
+
+ <description>ONOS network control core subsystems</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.onlab.onos</groupId>
+ <artifactId>onos-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/core/net/src/main/java/org/onlab/onos/net/DeleteMe.java b/core/net/src/main/java/org/onlab/onos/net/DeleteMe.java
new file mode 100644
index 0000000..431ec13
--- /dev/null
+++ b/core/net/src/main/java/org/onlab/onos/net/DeleteMe.java
@@ -0,0 +1,7 @@
+package org.onlab.onos.net;
+
+/**
+ * Created by tom on 9/19/14.
+ */
+public class DeleteMe {
+}
diff --git a/core/pom.xml b/core/pom.xml
index 272b76b..fc603df 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -18,6 +18,8 @@
<modules>
<module>api</module>
+ <module>net</module>
+ <module>store</module>
<module>trivial</module>
</modules>
diff --git a/core/store/pom.xml b/core/store/pom.xml
new file mode 100644
index 0000000..cf01c5a
--- /dev/null
+++ b/core/store/pom.xml
@@ -0,0 +1,39 @@
+<?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>
+
+ <parent>
+ <groupId>org.onlab.onos</groupId>
+ <artifactId>onos-core</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>onos-core-store</artifactId>
+ <packaging>bundle</packaging>
+
+ <description>ONOS distributed store subsystems</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.onlab.onos</groupId>
+ <artifactId>onos-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/core/store/src/main/java/org/onlab/onos/store/device/impl/DeleteMe.java b/core/store/src/main/java/org/onlab/onos/store/device/impl/DeleteMe.java
new file mode 100644
index 0000000..4622053
--- /dev/null
+++ b/core/store/src/main/java/org/onlab/onos/store/device/impl/DeleteMe.java
@@ -0,0 +1,7 @@
+package org.onlab.onos.store.device.impl;
+
+/**
+ * Created by tom on 9/19/14.
+ */
+public class DeleteMe {
+}
diff --git a/tools/test/bin/onos-install b/tools/test/bin/onos-install
index d8e0522..1b4e579 100755
--- a/tools/test/bin/onos-install
+++ b/tools/test/bin/onos-install
@@ -55,7 +55,7 @@
$onos cluster:feature-install onos onos-api 1>>$LOG 2>&1
$onos cluster:feature-install onos onos-core 1>>$LOG 2>&1
$onos cluster:feature-install onos onos-openflow 1>>$LOG 2>&1
- $onos cluster:feature-install onoe onos-cli 1>>$LOG 2>&1
+ $onos cluster:feature-install onos onos-cli 1>>$LOG 2>&1
# $onos cluster:feature-install onos onos-gui 1>>$LOG 2>&1
# $onos cluster:feature-install onos onos-rest 1>>$LOG 2>&1
$onos cluster:feature-install onos onos-app-tvue 1>>$LOG 2>&1