commit 171b89a5e82c309801c4e7a050136a5edc4a9a92
author Ray Milkey <ray@onlab.us> Thu Jul 28 15:22:26 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Jul 28 23:13:00 2016 +0000
tree 7a290fad91a552254ca432d59c8abad410ab6bca
parent faa7c6727fbab02ee54e37435558f5ab73f4e695

Refactor bucklets to share ONOS buck definition files

Change-Id: Ifb4bc87b264eea9c660f0e053c27822bb9922b78

bucklets/onos.bucklet

diff --git a/bucklets/onos.bucklet b/bucklets/onos.bucklet
index 109b7dd..89976f5 100644
--- a/bucklets/onos.bucklet
+++ b/bucklets/onos.bucklet
@@ -9,10 +9,7 @@
 RESOURCES_ROOT = 'src/main/resources/'
 TEST_RESOURCES_ROOT = 'src/test/resources/'
 
-
-ONOS_GROUP_ID = 'org.onosproject'
-ONOS_VERSION = '1.7.0-SNAPSHOT'
-ONOS_ARTIFACT_BASE = 'onos-'
+include_defs('//onos.defs')
 
 def _get_name():
     base_path = get_base_path()

bucklets/onos_app.bucklet

diff --git a/bucklets/onos_app.bucklet b/bucklets/onos_app.bucklet
index a50b200..20c6ce5 100644
--- a/bucklets/onos_app.bucklet
+++ b/bucklets/onos_app.bucklet
@@ -1,9 +1,6 @@
-ONOS_ORIGIN = 'ON.Lab'
-ONOS_GROUP_ID = 'org.onosproject'
-ONOS_VERSION = '1.7.0-SNAPSHOT'
+include_defs('//onos.defs')
+
 DEFAULT_APP_CATEGORY = 'Utility'
-ONOS_ARTIFACT_BASE = 'onos-'
-APP_PREFIX = ONOS_GROUP_ID + '.'
 
 import os.path
 

onos.defs

diff --git a/onos.defs b/onos.defs
index 2a659e2..54cfcdd 100644
--- a/onos.defs
+++ b/onos.defs
@@ -1,4 +1,3 @@
-#FIXME - these should be shared with bucklets
 ONOS_ORIGIN = 'ON.Lab'
 ONOS_GROUP_ID = 'org.onosproject'
 ONOS_VERSION = '1.7.0-SNAPSHOT'