Merge branch 'master' of https://github.com/wso2/product-mdm

product/modules/distribution/src/assembly/bin.xml

@@ -216,13 +216,38 @@
             <outputDirectory>${project.artifactId}-${project.version}/repository/resources
             </outputDirectory>
         </fileSet>
-        <!-- copy cdm jaggery app -->
+
+        <!-- Copying CDM Jaggery app -->
         <fileSet>
             <directory>src/repository/jaggeryapps</directory>
             <outputDirectory>wso2mdm-${project.version}/repository/deployment/server/jaggeryapps
             </outputDirectory>
             <fileMode>755</fileMode>
         </fileSet>
+
+	<!-- Copying API Manager Publisher and Store Jaggery apps -->
+	<fileSet>
+             <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.platform.version}/repository/deployment/server/jaggeryapps/publisher/</directory>
+             <outputDirectory>wso2am-${pom.version}/repository/deployment/server/jaggeryapps/publisher</outputDirectory>
+             <excludes>
+                <exclude>publisherLogo/**</exclude>
+                <exclude>publisherTheme/**</exclude>
+                <exclude>publisherSite/**</exclude>
+                <exclude>footer/**</exclude>
+                <exclude>localstyles.css</exclude>
+             </excludes>
+         </fileSet>
+         <fileSet>
+             <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.platform.version}/repository/deployment/server/jaggeryapps/store/</directory>
+             <outputDirectory>wso2am-${pom.version}/repository/deployment/server/jaggeryapps/store</outputDirectory>
+             <excludes>
+                <exclude>storeLogo/**</exclude>
+                <exclude>storeSite/**</exclude>
+                <exclude>base-page/**</exclude>
+                <exclude>login/**</exclude>
+                <exclude>styles-layout.css</exclude>
+             </excludes>
+         </fileSet>
     </fileSets>
     
     <dependencySets>

product/modules/p2-profile-gen/pom.xml

@@ -260,11 +260,17 @@
                                     org.wso2.carbon:org.wso2.carbon.governance.lifecycle.management.feature:${carbon.platform.version}
                                 </featureArtifactDef>
                                 
-
+				<featureArtifactDef>
-                                <featureArtifactDef>
+                                    org.wso2.carbon:org.wso2.carbon.identity.self.registration.server.feature:${carbon.platform.version}
-                                    org.wso2.carbon:org.wso2.carbon.identity.self.registration.feature:${carbon.platform.version}
                                 </featureArtifactDef>
 				
+				<!-- API Manager Publisher and Store Features -->
+				<featureArtifactDef>
+                                    org.wso2.carbon:org.wso2.carbon.apimgt.publisher.feature:${carbon.platform.version}
+                                </featureArtifactDef>
+				<featureArtifactDef>
+                                    org.wso2.carbon:org.wso2.carbon.apimgt.store.feature:${carbon.platform.version}
+                                </featureArtifactDef>
 
                                 <!-- SSO -->
                                 <featureArtifactDef>
@@ -301,8 +307,6 @@
                                 </featureArtifactDef>
                                 <!-- End of SSO Fixes -->
 
-
-
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -465,14 +469,12 @@
                                     <version>${carbon.platform.version}</version>
                                 </feature>
 
-
                                 <feature>
-                                    <id>org.wso2.carbon.identity.self.registration.feature.group</id>
+                                    <id>org.wso2.carbon.identity.self.registration.server.feature.group</id>
                                     <version>${carbon.platform.version}</version>
                                 </feature>
 
                                 <!-- registry features -->
-
                                 <feature>
                                     <id>org.wso2.carbon.registry.core.feature.group</id>
                                     <version>${carbon.platform.version}</version>
@@ -531,7 +533,17 @@
                                     <version>${carbon.platform.version}</version>
                                 </feature>
 
-                                <!-- sso -->
+				<!-- API Manager Publisher and Store Features -->
+				<feature>
+                                    <id>org.wso2.carbon.apimgt.publisher.feature.group</id>
+                                    <version>${carbon.platform.version}</version>
+                                </feature>
+				<feature>
+                                    <id>org.wso2.carbon.apimgt.store.feature.group</id>
+                                    <version>${carbon.platform.version}</version>
+                                </feature>
+                                
+				<!-- SSO Features -->
                                 <feature>
                                     <id>
                                         org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group