Merge pull request #511 from y-higuchi/prepopulate_local_repo
Pre-populate repo dir to remove setup-local-maven.sh
diff --git a/start-onos-embedded.sh b/start-onos-embedded.sh
index 12346ba..0e9af68 100755
--- a/start-onos-embedded.sh
+++ b/start-onos-embedded.sh
@@ -166,6 +166,6 @@
echo "$n instance of onos running"
;;
*)
- echo "Usage: $0 {start|stop|restart|status|startifdown}"
+ echo "Usage: $0 {start|stop|status|startifdown}"
exit 1
esac
diff --git a/start-onos-jacoco.sh b/start-onos-jacoco.sh
index 23c4bfa..2d1adf4 100755
--- a/start-onos-jacoco.sh
+++ b/start-onos-jacoco.sh
@@ -182,6 +182,6 @@
echo "$n instance of onos running"
;;
*)
- echo "Usage: $0 {start|stop|restart|status|startifdown}"
+ echo "Usage: $0 {start|stop|status|startifdown}"
exit 1
esac
diff --git a/start-onos.sh b/start-onos.sh
index e10dfbe..1eb6831 100755
--- a/start-onos.sh
+++ b/start-onos.sh
@@ -185,6 +185,6 @@
echo "$n instance of onos running"
;;
*)
- echo "Usage: $0 {start|stop|restart|status|startifdown}"
+ echo "Usage: $0 {start|stop|status|startifdown}"
exit 1
esac
diff --git a/start-rest.sh b/start-rest.sh
index 01e7638..910eb41 100755
--- a/start-rest.sh
+++ b/start-rest.sh
@@ -73,6 +73,6 @@
status
;;
*)
- echo "Usage: $0 {start|stop|restart|status}"
+ echo "Usage: $0 {start|stop|status}"
exit 1
esac
diff --git a/web/floodlight/js/controller-status.js b/web/js/controller-status.js
similarity index 100%
rename from web/floodlight/js/controller-status.js
rename to web/js/controller-status.js
diff --git a/web/floodlight/js/jquery-1.7.2.min.js b/web/js/jquery-1.7.2.min.js
similarity index 100%
rename from web/floodlight/js/jquery-1.7.2.min.js
rename to web/js/jquery-1.7.2.min.js
diff --git a/web/floodlight/js/onos-topology-route.js b/web/js/onos-topology-route.js
similarity index 100%
rename from web/floodlight/js/onos-topology-route.js
rename to web/js/onos-topology-route.js
diff --git a/web/floodlight/js/onos-topology.js b/web/js/onos-topology.js
similarity index 100%
rename from web/floodlight/js/onos-topology.js
rename to web/js/onos-topology.js
diff --git a/web/onos-topology.html b/web/onos-topology.html
index d72c0e1..5834521 100644
--- a/web/onos-topology.html
+++ b/web/onos-topology.html
@@ -24,7 +24,7 @@
<button id="more">more</button>
<button id="less">less</button>
--!>
-<svg width="4in" height="2in"
+<svg width="0.1in" height="0.1in"
viewBox="0 0 4000 2000" version="1.1"
xmlns="http://www.w3.org/2000/svg">
<defs>