1 files changed, 14 insertions, 3 deletions

diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/about/AboutHttpServlet.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/about/AboutHttpServlet.java
index 81b9645fe..fd6be82db 100644
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/about/AboutHttpServlet.java
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/about/AboutHttpServlet.java
@@ -73,7 +73,7 @@ public class AboutHttpServlet extends HttpServlet {
     private static final String README_FILE = "README.md";
     private static final String NO_DEVICEMANAGERS_RUNNING_MESSAGE = null;
 
-    private final String groupId = "org.onap.ccsdk.features.sdnr.wt";
+    private final String groupId = this.getGroupIdOrDefault("org.onap.ccsdk.features.sdnr.wt");
     private final String artifactId = "sdnr-wt-data-provider-provider";
 
     private final Map<Integer,String> BUNDLESTATE_LUT;
@@ -97,7 +97,18 @@ public class AboutHttpServlet extends HttpServlet {
 
     }
 
-    //	public void setBundleService(BundleService bundleService) {
+    protected String getGroupIdOrDefault(String def) {
+		String symbolicName = this.getManifestValue("Bundle-SymbolicName");
+		if(symbolicName!=null) {
+			int idx =  symbolicName.indexOf(this.artifactId);
+			if(idx>0) {
+				return symbolicName.substring(0, idx-1);
+			}
+		}
+		return def;
+	}
+
+	//	public void setBundleService(BundleService bundleService) {
     //		this.bundleService = bundleService;
     //	}
 
@@ -199,7 +210,7 @@ public class AboutHttpServlet extends HttpServlet {
      * @param key
      * @return
      */
-    private String getManifestValue(String key) {
+    protected String getManifestValue(String key) {
         URL url = Resources.getUrlForRessource(AboutHttpServlet.class, "/META-INF/MANIFEST.MF");
         if (url == null) {
             return null;