commit abafb50f58363c90e525873a96a1d14cc2449200
author Brian O'Connor <bocon@onlab.us> Tue Dec 02 22:26:20 2014 -0800
committer Brian O'Connor <bocon@onlab.us> Tue Dec 02 22:26:20 2014 -0800
tree 71bd9a07c79945746e29ae8311ab5f768aa1640b
parent 03defe793917884eedd233a39b82dafe14ebedd5

Changing org.onlab.onos package to org.onosproject

Change-Id: Ic81421faa27acdcff045add47d9e0a715cd4f575

tools/test/bin/onos-install

diff --git a/tools/test/bin/onos-install b/tools/test/bin/onos-install
index c13b8b9..7c7d3fe 100755
--- a/tools/test/bin/onos-install
+++ b/tools/test/bin/onos-install
@@ -44,8 +44,8 @@
     echo 'export ONOS_OPTS=debug' > $ONOS_INSTALL_DIR/options
 
     # Remove any previous ON.Lab bits from ~/.m2 repo and re-stage it.
-    rm -fr ~/.m2/repository/org/onlab
-    cp -r $ONOS_INSTALL_DIR/$KARAF_DIST/system/org/onlab ~/.m2/repository/org/onlab
+    rm -fr ~/.m2/repository/org/onosproject
+    cp -r $ONOS_INSTALL_DIR/$KARAF_DIST/system/org/onosproject ~/.m2/repository/org/onosproject
 
     # Drop log level for the console
     echo "log4j.logger.org.apache.sshd = WARN" \

tools/test/bin/onos-oecfg

diff --git a/tools/test/bin/onos-oecfg b/tools/test/bin/onos-oecfg
index e97449f..e709ce3 100755
--- a/tools/test/bin/onos-oecfg
+++ b/tools/test/bin/onos-oecfg
@@ -7,6 +7,6 @@
 . $ONOS_ROOT/tools/build/envDefaults
 
 APP=onos-app-oecfg
-JAR=$M2_REPO/org/onlab/onos/$APP/$ONOS_POM_VERSION/$APP-$ONOS_POM_VERSION.jar
+JAR=$M2_REPO/org/onosproject/$APP/$ONOS_POM_VERSION/$APP-$ONOS_POM_VERSION.jar
 
 java -jar $JAR < $1 | python -mjson.tool

tools/test/bin/onos-push-update-bundle

diff --git a/tools/test/bin/onos-push-update-bundle b/tools/test/bin/onos-push-update-bundle
index f8d682a..85fa27b 100755
--- a/tools/test/bin/onos-push-update-bundle
+++ b/tools/test/bin/onos-push-update-bundle
@@ -7,7 +7,7 @@
 . $ONOS_ROOT/tools/build/envDefaults
 
 cd ~/.m2/repository
-jar=$(find org/onlab -type f -name '*.jar' | grep -e $1 | grep -v -e -tests | head -n 1)
+jar=$(find org/onosproject -type f -name '*.jar' | grep -e $1 | grep -v -e -tests | head -n 1)
 
 [ -z "$jar" ] && echo "No bundle $1 found for" && exit 1
 

tools/test/bin/onos-update-bundle

diff --git a/tools/test/bin/onos-update-bundle b/tools/test/bin/onos-update-bundle
index 6f6422a..9e9e08b 100755
--- a/tools/test/bin/onos-update-bundle
+++ b/tools/test/bin/onos-update-bundle
@@ -7,7 +7,7 @@
 . $ONOS_ROOT/tools/build/envDefaults
 
 cd ~/.m2/repository
-jar=$(find org/onlab -type f -name '*.jar' | grep -e $1 | grep -v -e -tests | head -n 1)
+jar=$(find org/onosproject -type f -name '*.jar' | grep -e $1 | grep -v -e -tests | head -n 1)
 
 [ -z "$jar" ] && echo "No bundle $1 found for" && exit 1
 

tools/test/topos/onos.py

diff --git a/tools/test/topos/onos.py b/tools/test/topos/onos.py
index 6dca835..d385112 100755
--- a/tools/test/topos/onos.py
+++ b/tools/test/topos/onos.py
@@ -62,7 +62,7 @@
    
     def start( self ):
         if self.inNamespace:
-            instanceOpts = ( '-furl mvn:org.onlab.onos/onos-features/1.0.0-SNAPSHOT/xml/features '
+            instanceOpts = ( '-furl mvn:org.onosproject/onos-features/1.0.0-SNAPSHOT/xml/features '
                              '-s 8101' )
             if self.ip is not None:
                 instanceOpts += (' -a %s' % self.IP() )