From fe2e4c853733988d7134a7b8fce18b1df49ca15f Mon Sep 17 00:00:00 2001
From: Priyanka <priyankahdp@gmail.com>
Date: Fri, 10 Nov 2017 10:22:37 +0530
Subject: [PATCH 1/2] workflow core OSGI & Feature

---
 modules/p2-profile/product/pom.xml | 47 ++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/modules/p2-profile/product/pom.xml b/modules/p2-profile/product/pom.xml
index db31092f..43ee31b9 100644
--- a/modules/p2-profile/product/pom.xml
+++ b/modules/p2-profile/product/pom.xml
@@ -133,6 +133,11 @@
                                 <featureArtifactDef>
                                     com.wso2telco.dep:com.wso2telco.dep.operatorservice.feature:${com.wso2telco.dep.version}
                                 </featureArtifactDef>
+
+                                <featureArtifactDef>
+                                    com.wso2telco.dep:com.wso2telco.dep.workflow.core.feature:${com.wso2telco.dep.version}
+                                </featureArtifactDef>
+
                                 <featureArtifactDef>
                                     com.wso2telco.dep:com.wso2telco.dep.oneapivalidation.feature:${com.wso2telco.dep.version}
                                 </featureArtifactDef>
@@ -883,6 +888,12 @@
                                     <id>com.wso2telco.dep.operatorservice.feature.group</id>
                                     <version>${com.wso2telco.dep.version}</version>
                                 </feature>
+
+                                <feature>
+                                    <id>com.wso2telco.dep.workflow.core.feature.group</id>
+                                    <version>${com.wso2telco.dep.version}</version>
+                                </feature>
+
                                 <feature>
                                     <id>com.wso2telco.core.dbutils.feature.group</id>
                                     <version>${com.wso2telco.core.version}</version>
@@ -1537,6 +1548,12 @@
                                     <id>com.wso2telco.dep.operatorservice.feature.group</id>
                                     <version>${com.wso2telco.dep.version}</version>
                                 </feature>
+
+                                <feature>
+                                    <id>com.wso2telco.dep.workflow.core.feature.group</id>
+                                    <version>${com.wso2telco.dep.version}</version>
+                                </feature>
+
                                 <feature>
                                     <id>com.wso2telco.core.dbutils.feature.group</id>
                                     <version>${com.wso2telco.core.version}</version>
@@ -1968,6 +1985,12 @@
                                     <id>com.wso2telco.dep.operatorservice.feature.group</id>
                                     <version>${com.wso2telco.dep.version}</version>
                                 </feature>
+
+                                <feature>
+                                    <id>com.wso2telco.dep.workflow.core.feature.group</id>
+                                    <version>${com.wso2telco.dep.version}</version>
+                                </feature>
+
                                 <feature>
                                     <id>com.wso2telco.core.dbutils.feature.group</id>
                                     <version>${com.wso2telco.core.version}</version>
@@ -2417,6 +2440,12 @@
                                     <id>com.wso2telco.dep.operatorservice.feature.group</id>
                                     <version>${com.wso2telco.dep.version}</version>
                                 </feature>
+
+                                <feature>
+                                    <id>com.wso2telco.dep.workflow.core.feature.group</id>
+                                    <version>${com.wso2telco.dep.version}</version>
+                                </feature>
+
                                 <feature>
                                     <id>com.wso2telco.core.dbutils.feature.group</id>
                                     <version>${com.wso2telco.core.version}</version>
@@ -2965,6 +2994,12 @@
                                     <id>com.wso2telco.dep.operatorservice.feature.group</id>
                                     <version>${com.wso2telco.dep.version}</version>
                                 </feature>
+
+                                <feature>
+                                    <id>com.wso2telco.dep.workflow.core.feature.group</id>
+                                    <version>${com.wso2telco.dep.version}</version>
+                                </feature>
+
                                 <feature>
                                     <id>com.wso2telco.core.dbutils.feature.group</id>
                                     <version>${com.wso2telco.core.version}</version>
@@ -3509,6 +3544,12 @@
                                     <id>com.wso2telco.dep.operatorservice.feature.group</id>
                                     <version>${com.wso2telco.dep.version}</version>
                                 </feature>
+
+                                <feature>
+                                    <id>com.wso2telco.dep.workflow.core.feature.group</id>
+                                    <version>${com.wso2telco.dep.version}</version>
+                                </feature>
+
                                 <feature>
                                     <id>com.wso2telco.core.dbutils.feature.group</id>
                                     <version>${com.wso2telco.core.version}</version>
@@ -3989,6 +4030,12 @@
                                     <id>com.wso2telco.dep.operatorservice.feature.group</id>
                                     <version>${com.wso2telco.dep.version}</version>
                                 </feature>
+
+                                <feature>
+                                    <id>com.wso2telco.dep.workflow.core.feature.group</id>
+                                    <version>${com.wso2telco.dep.version}</version>
+                                </feature>
+
                                 <feature>
                                     <id>com.wso2telco.core.dbutils.feature.group</id>
                                     <version>${com.wso2telco.core.version}</version>

From 66222304780d0fbfb788b2196be7b87076ed8cfd Mon Sep 17 00:00:00 2001
From: Priyanka <priyankahdp@gmail.com>
Date: Wed, 29 Nov 2017 11:56:31 +0530
Subject: [PATCH 2/2] admin Jaggery bundling

---
 modules/p2-profile/product/pom.xml | 78 ++++++++++++------------------
 1 file changed, 31 insertions(+), 47 deletions(-)

diff --git a/modules/p2-profile/product/pom.xml b/modules/p2-profile/product/pom.xml
index 43ee31b9..9b11c4fd 100644
--- a/modules/p2-profile/product/pom.xml
+++ b/modules/p2-profile/product/pom.xml
@@ -133,11 +133,6 @@
                                 <featureArtifactDef>
                                     com.wso2telco.dep:com.wso2telco.dep.operatorservice.feature:${com.wso2telco.dep.version}
                                 </featureArtifactDef>
-
-                                <featureArtifactDef>
-                                    com.wso2telco.dep:com.wso2telco.dep.workflow.core.feature:${com.wso2telco.dep.version}
-                                </featureArtifactDef>
-
                                 <featureArtifactDef>
                                     com.wso2telco.dep:com.wso2telco.dep.oneapivalidation.feature:${com.wso2telco.dep.version}
                                 </featureArtifactDef>
@@ -173,6 +168,9 @@
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     com.wso2telco.dep:com.wso2telco.dep.publisher.ui.feature:${com.wso2telco.dep.version}
+                                </featureArtifactDef>
+								<featureArtifactDef>
+                                    com.wso2telco.dep:com.wso2telco.dep.admin.ui.feature:${com.wso2telco.dep.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     com.wso2telco.dep:com.wso2telco.dep.sandbox.ui.feature:${com.wso2telco.dep.version}
@@ -888,12 +886,6 @@
                                     <id>com.wso2telco.dep.operatorservice.feature.group</id>
                                     <version>${com.wso2telco.dep.version}</version>
                                 </feature>
-
-                                <feature>
-                                    <id>com.wso2telco.dep.workflow.core.feature.group</id>
-                                    <version>${com.wso2telco.dep.version}</version>
-                                </feature>
-
                                 <feature>
                                     <id>com.wso2telco.core.dbutils.feature.group</id>
                                     <version>${com.wso2telco.core.version}</version>
@@ -953,6 +945,10 @@
                                 <feature>
                                     <id>com.wso2telco.dep.publisher.ui.feature.group</id>
                                     <version>${com.wso2telco.dep.version}</version>
+                                </feature>
+								<feature>
+                                    <id>com.wso2telco.dep.admin.ui.feature.group</id>
+                                    <version>${com.wso2telco.dep.version}</version>
                                 </feature>
                                 <feature>
                                     <id>com.wso2telco.dep.sandbox.ui.feature.group</id>
@@ -1548,12 +1544,6 @@
                                     <id>com.wso2telco.dep.operatorservice.feature.group</id>
                                     <version>${com.wso2telco.dep.version}</version>
                                 </feature>
-
-                                <feature>
-                                    <id>com.wso2telco.dep.workflow.core.feature.group</id>
-                                    <version>${com.wso2telco.dep.version}</version>
-                                </feature>
-
                                 <feature>
                                     <id>com.wso2telco.core.dbutils.feature.group</id>
                                     <version>${com.wso2telco.core.version}</version>
@@ -1613,6 +1603,10 @@
                                 <feature>
                                     <id>com.wso2telco.dep.publisher.ui.feature.group</id>
                                     <version>${com.wso2telco.dep.version}</version>
+                                </feature>
+								<feature>
+                                    <id>com.wso2telco.dep.admin.ui.feature.group</id>
+                                    <version>${com.wso2telco.dep.version}</version>
                                 </feature>
                                 <feature>
                                     <id>com.wso2telco.dep.sandbox.ui.feature.group</id>
@@ -1985,12 +1979,6 @@
                                     <id>com.wso2telco.dep.operatorservice.feature.group</id>
                                     <version>${com.wso2telco.dep.version}</version>
                                 </feature>
-
-                                <feature>
-                                    <id>com.wso2telco.dep.workflow.core.feature.group</id>
-                                    <version>${com.wso2telco.dep.version}</version>
-                                </feature>
-
                                 <feature>
                                     <id>com.wso2telco.core.dbutils.feature.group</id>
                                     <version>${com.wso2telco.core.version}</version>
@@ -2050,6 +2038,10 @@
                                 <feature>
                                     <id>com.wso2telco.dep.publisher.ui.feature.group</id>
                                     <version>${com.wso2telco.dep.version}</version>
+                                </feature>
+								<feature>
+                                    <id>com.wso2telco.dep.admin.ui.feature.group</id>
+                                    <version>${com.wso2telco.dep.version}</version>
                                 </feature>
                                 <feature>
                                     <id>com.wso2telco.dep.sandbox.ui.feature.group</id>
@@ -2440,12 +2432,6 @@
                                     <id>com.wso2telco.dep.operatorservice.feature.group</id>
                                     <version>${com.wso2telco.dep.version}</version>
                                 </feature>
-
-                                <feature>
-                                    <id>com.wso2telco.dep.workflow.core.feature.group</id>
-                                    <version>${com.wso2telco.dep.version}</version>
-                                </feature>
-
                                 <feature>
                                     <id>com.wso2telco.core.dbutils.feature.group</id>
                                     <version>${com.wso2telco.core.version}</version>
@@ -2501,6 +2487,10 @@
                                 <feature>
                                     <id>com.wso2telco.dep.publisher.ui.feature.group</id>
                                     <version>${com.wso2telco.dep.version}</version>
+                                </feature>
+								<feature>
+                                    <id>com.wso2telco.dep.admin.ui.feature.group</id>
+                                    <version>${com.wso2telco.dep.version}</version>
                                 </feature>
                                 <feature>
                                     <id>com.wso2telco.dep.sandbox.ui.feature.group</id>
@@ -2994,12 +2984,6 @@
                                     <id>com.wso2telco.dep.operatorservice.feature.group</id>
                                     <version>${com.wso2telco.dep.version}</version>
                                 </feature>
-
-                                <feature>
-                                    <id>com.wso2telco.dep.workflow.core.feature.group</id>
-                                    <version>${com.wso2telco.dep.version}</version>
-                                </feature>
-
                                 <feature>
                                     <id>com.wso2telco.core.dbutils.feature.group</id>
                                     <version>${com.wso2telco.core.version}</version>
@@ -3059,6 +3043,10 @@
                                 <feature>
                                     <id>com.wso2telco.dep.publisher.ui.feature.group</id>
                                     <version>${com.wso2telco.dep.version}</version>
+                                </feature>
+								<feature>
+                                    <id>com.wso2telco.dep.admin.ui.feature.group</id>
+                                    <version>${com.wso2telco.dep.version}</version>
                                 </feature>
                                 <feature>
                                     <id>com.wso2telco.dep.sandbox.ui.feature.group</id>
@@ -3544,12 +3532,6 @@
                                     <id>com.wso2telco.dep.operatorservice.feature.group</id>
                                     <version>${com.wso2telco.dep.version}</version>
                                 </feature>
-
-                                <feature>
-                                    <id>com.wso2telco.dep.workflow.core.feature.group</id>
-                                    <version>${com.wso2telco.dep.version}</version>
-                                </feature>
-
                                 <feature>
                                     <id>com.wso2telco.core.dbutils.feature.group</id>
                                     <version>${com.wso2telco.core.version}</version>
@@ -3605,6 +3587,10 @@
                                 <feature>
                                     <id>com.wso2telco.dep.publisher.ui.feature.group</id>
                                     <version>${com.wso2telco.dep.version}</version>
+                                </feature>
+								<feature>
+                                    <id>com.wso2telco.dep.admin.ui.feature.group</id>
+                                    <version>${com.wso2telco.dep.version}</version>
                                 </feature>
                                 <feature>
                                     <id>com.wso2telco.dep.sandbox.ui.feature.group</id>
@@ -4030,12 +4016,6 @@
                                     <id>com.wso2telco.dep.operatorservice.feature.group</id>
                                     <version>${com.wso2telco.dep.version}</version>
                                 </feature>
-
-                                <feature>
-                                    <id>com.wso2telco.dep.workflow.core.feature.group</id>
-                                    <version>${com.wso2telco.dep.version}</version>
-                                </feature>
-
                                 <feature>
                                     <id>com.wso2telco.core.dbutils.feature.group</id>
                                     <version>${com.wso2telco.core.version}</version>
@@ -4095,6 +4075,10 @@
                                 <feature>
                                     <id>com.wso2telco.dep.publisher.ui.feature.group</id>
                                     <version>${com.wso2telco.dep.version}</version>
+                                </feature>
+								<feature>
+                                    <id>com.wso2telco.dep.admin.ui.feature.group</id>
+                                    <version>${com.wso2telco.dep.version}</version>
                                 </feature>
                                 <feature>
                                     <id>com.wso2telco.dep.sandbox.ui.feature.group</id>