commit 37691eb75be5ee295279bb3633bcefeb7166b444
author pierventre <pier@opennetworking.org> Tue Apr 13 12:46:10 2021 +0200
committer pierventre <pier@opennetworking.org> Wed Apr 14 08:55:58 2021 +0200
tree 440066db63ddb3c07ba850ee38d420ee49ada249
parent 010cd8cc77fea25b2129ca7a2d97d589f7404f31

[AETHER-1529] Nodes not READY due to gui/gui2 bundles being in WAITING

In particular gui2 bundle does not get activated due to the missing UiExtensionManager.cfgdef.
This patch manually copy the cfgdef generated for gui bundle into the final jar of gui2

Change-Id: I27fea43faa06f70bc8c0570c53a1dbf5cfd23e89

web/gui2/BUILD

diff --git a/web/gui2/BUILD b/web/gui2/BUILD
index 7087334..5fcc3f9 100644
--- a/web/gui2/BUILD
+++ b/web/gui2/BUILD
@@ -91,6 +91,7 @@
         ":_onos-gui2-base-jar",
         "//web/gui:onos-gui-lion-for-gui2",
         "//web/gui2/src/main/webapp:WEB-INF/web.xml",
+        "//web/gui:onos-gui-jar_cfgdef.jar",
     ],
     outs = ["onos-gui2.jar"],
     cmd = " ROOT=`pwd` &&" +
@@ -101,6 +102,7 @@
           " mv web/gui/src/main/resources/org/onosproject/ui/lion* WEB-INF/classes/org/onosproject/ui/ &&" +
           " cp -R $$ROOT/$(location //web/gui2/src/main/webapp:prodapp)/* WEB-INF/classes/ &&" +
           " mv $$ROOT/$(location //web/gui2/src/main/webapp:WEB-INF/web.xml) WEB-INF &&" +
+          " (cd WEB-INF/classes && jar xf $$ROOT/$(location //web/gui:onos-gui-jar_cfgdef.jar)) &&" +
           " find . -type f -exec touch -t 202001010001 {} \\; &&" +
           " jar cmf META-INF/MANIFEST.MF $$ROOT/$@ WEB-INF/web.xml WEB-INF/classes OSGI-INF/*.xml",
     output_to_bindir = 1,