commit 49cf4d209f5297481246f81614b2cba2b836566c
author HIGUCHI Yuta <y-higuchi@onlab.us> Mon Jun 17 12:15:17 2013 -0700
committer HIGUCHI Yuta <y-higuchi@onlab.us> Mon Jun 17 15:39:39 2013 -0700
tree 7e29e07452b20a0b4f89d18f171682389591fbec
parent 3d96f65bb41fbffb6ee35dcc4fe392ce64f510e6

Main for ONOS

build.xml

diff --git a/build.xml b/build.xml
index c7b6449..22461dd 100644
--- a/build.xml
+++ b/build.xml
@@ -38,7 +38,7 @@
     <property name="source-test" location="src/test/java"/>
     <property name="python-src" location="src/main/python"/>
     <property name="docs" location="${target}/docs"/>
-    <property name="main-class" value="net.floodlightcontroller.core.Main"/>
+    <property name="main-class" value="net.onrc.onos.ofcontroller.core.Main"/>
     <property name="floodlight-jar" location="${target}/floodlight.jar"/>
     <property name="floodlight-test-jar" location="${target}/floodlight-test.jar"/>
     <property name="floodlight-only-jar" location="${target}/floodlight-only.jar"/>

pom.xml

diff --git a/pom.xml b/pom.xml
index f39e7c2..b9b666f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,7 @@
         <artifactId>exec-maven-plugin</artifactId>
         <version>1.2.1</version>
         <configuration>
-          <mainClass>net.floodlightcontroller.core.Main</mainClass>
+          <mainClass>net.onrc.onos.ofcontroller.core.Main</mainClass>
         </configuration>
         <executions>
         </executions>

src/main/java/net/onrc/onos/ofcontroller/core/Main.java

diff --git a/src/main/java/net/floodlightcontroller/core/Main.java b/src/main/java/net/onrc/onos/ofcontroller/core/Main.java
similarity index 92%
rename from src/main/java/net/floodlightcontroller/core/Main.java
rename to src/main/java/net/onrc/onos/ofcontroller/core/Main.java
index 91b317a..a80ac36 100644
--- a/src/main/java/net/floodlightcontroller/core/Main.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/core/Main.java
@@ -1,8 +1,9 @@
-package net.floodlightcontroller.core;
+package net.onrc.onos.ofcontroller.core;
 
 import org.kohsuke.args4j.CmdLineException;
 import org.kohsuke.args4j.CmdLineParser;
 
+import net.floodlightcontroller.core.IFloodlightProviderService;
 import net.floodlightcontroller.core.internal.CmdLineSettings;
 import net.floodlightcontroller.core.module.FloodlightModuleException;
 import net.floodlightcontroller.core.module.FloodlightModuleLoader;
@@ -10,7 +11,7 @@
 import net.floodlightcontroller.restserver.IRestApiService;
 
 /**
- * Host for the Floodlight main method
+ * Host for the ONOS main method
  * @author alexreimers
  */
 public class Main {

start-onos-embedded.sh

diff --git a/start-onos-embedded.sh b/start-onos-embedded.sh
index 2f1584e..b71d4d9 100755
--- a/start-onos-embedded.sh
+++ b/start-onos-embedded.sh
@@ -26,7 +26,7 @@
 # Set classpath to include titan libs
 #CLASSPATH=`echo ${FL_HOME}/lib/*.jar ${FL_HOME}/lib/titan/*.jar | sed 's/ /:/g'`
 CLASSPATH="${FL_ONLY_JAR}:${FL_HOME}/lib/*:${FL_HOME}/lib/titan/*"
-MAIN_CLASS="net.floodlightcontroller.core.Main"
+MAIN_CLASS="net.onrc.onos.ofcontroller.core.Main"
 
 #<logger name="net.floodlightcontroller.linkdiscovery.internal" level="TRACE"/>
 #<appender-ref ref="STDOUT" />

start-onos.sh

diff --git a/start-onos.sh b/start-onos.sh
index 0a59701..d4ea834 100755
--- a/start-onos.sh
+++ b/start-onos.sh
@@ -22,7 +22,7 @@
 # Set classpath to include titan libs
 #CLASSPATH=`echo ${FL_HOME}/lib/*.jar ${FL_HOME}/lib/titan/*.jar | sed 's/ /:/g'`
 CLASSPATH="${FL_ONLY_JAR}:${FL_HOME}/lib/*:${FL_HOME}/lib/titan/*"
-MAIN_CLASS="net.floodlightcontroller.core.Main"
+MAIN_CLASS="net.onrc.onos.ofcontroller.core.Main"
 
 #<logger name="net.floodlightcontroller.linkdiscovery.internal" level="TRACE"/>
 #<appender-ref ref="STDOUT" />