Moved the samples to a separate package.

@@ -3,7 +3,7 @@ package org.onlab.onos.cli;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
-import org.onlab.onos.net.GreetService;
+import org.onlab.onos.GreetService;
 
 
 /**
 /**
  * Simple command example to demonstrate use of Karaf shell extensions; shows
  * Simple command example to demonstrate use of Karaf shell extensions; shows

@@ -2,7 +2,7 @@ package org.onlab.onos.cli;
 
 
 import org.apache.karaf.shell.console.Completer;
 import org.apache.karaf.shell.console.Completer;
 import org.apache.karaf.shell.console.completer.StringsCompleter;
 import org.apache.karaf.shell.console.completer.StringsCompleter;
-import org.onlab.onos.net.GreetService;
+import org.onlab.onos.GreetService;
 
 
 import java.util.Iterator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.List;

-package org.onlab.onos.net;
+package org.onlab.onos;
 
 
 /**
 /**
  * Example of a simple service that provides greetings and it
  * Example of a simple service that provides greetings and it

-package org.onlab.onos.net.trivial.impl;
+package org.onlab.onos.impl;
 
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSet;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
 import org.apache.felix.scr.annotations.Deactivate;
 import org.apache.felix.scr.annotations.Service;
 import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.net.GreetService;
+import org.onlab.onos.GreetService;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 

-package org.onlab.onos.net.trivial.impl;
+package org.onlab.onos.impl;
 
 
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
 import org.apache.felix.scr.annotations.Deactivate;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.onlab.onos.net.GreetService;
+import org.onlab.onos.GreetService;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 

-package org.onlab.onos.net.trivial.impl;
+package org.onlab.onos.impl;
 
 
 import org.junit.Test;
 import org.junit.Test;
-import org.onlab.onos.net.GreetService;
+import org.onlab.onos.GreetService;
 
 
 import java.util.Iterator;
 import java.util.Iterator;
 
 

@@ -2,7 +2,7 @@ package org.onlab.onos.rest;
 
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.onlab.onos.net.GreetService;
+import org.onlab.onos.GreetService;
 import org.onlab.rest.BaseResource;
 import org.onlab.rest.BaseResource;
 
 
 import javax.ws.rs.DefaultValue;
 import javax.ws.rs.DefaultValue;

@@ -4,8 +4,8 @@ import com.sun.jersey.api.client.WebResource;
 import com.sun.jersey.test.framework.JerseyTest;
 import com.sun.jersey.test.framework.JerseyTest;
 import org.junit.BeforeClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.Test;
-import org.onlab.onos.net.GreetService;
-import org.onlab.onos.net.trivial.impl.GreetManager;
+import org.onlab.onos.GreetService;
+import org.onlab.onos.impl.GreetManager;
 import org.onlab.osgi.ServiceDirectory;
 import org.onlab.osgi.ServiceDirectory;
 import org.onlab.osgi.TestServiceDirectory;
 import org.onlab.osgi.TestServiceDirectory;
 
 

 package org.onlab.onos.gui;
 package org.onlab.onos.gui;
 
 
-import org.onlab.onos.net.GreetService;
+import org.onlab.onos.GreetService;
 import org.onlab.rest.BaseResource;
 import org.onlab.rest.BaseResource;
 
 
 import javax.ws.rs.DefaultValue;
 import javax.ws.rs.DefaultValue;

@@ -100,9 +100,8 @@
                             com.sun.jersey.server.impl.container.servlet,
                             com.sun.jersey.server.impl.container.servlet,
                             com.fasterxml.jackson.databind,
                             com.fasterxml.jackson.databind,
                             com.fasterxml.jackson.databind.node,
                             com.fasterxml.jackson.databind.node,
-                            org.onlab.osgi.*,
                             org.onlab.rest.*,
                             org.onlab.rest.*,
-                            org.onlab.onos.net.*
+                            org.onlab.onos.*
                         </Import-Package>
                         </Import-Package>
                         <Web-ContextPath>${web.context}</Web-ContextPath>
                         <Web-ContextPath>${web.context}</Web-ContextPath>
                     </instructions>
                     </instructions>