inosh
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
revert-dabc3590
Geeth Munasinghe 10 years ago
parent 57482a7ae3 dec7419e41
commit c93f99d970
2 changed files with 49 additions and 12 deletions
Show Stats Download Patch File Download Diff File

27
product/modules/distribution/src/assembly/bin.xml
Unescape View File

@ -216,13 +216,38 @@
<outputDirectory>${project.artifactId}-${project.version}/repository/resources <outputDirectory>${project.artifactId}-${project.version}/repository/resources
</outputDirectory> </outputDirectory>
</fileSet> </fileSet>
<!-- copy cdm jaggery app -->
<!-- Copying CDM Jaggery app -->
<fileSet> <fileSet>
<directory>src/repository/jaggeryapps</directory> <directory>src/repository/jaggeryapps</directory>
<outputDirectory>wso2mdm-${project.version}/repository/deployment/server/jaggeryapps <outputDirectory>wso2mdm-${project.version}/repository/deployment/server/jaggeryapps
</outputDirectory> </outputDirectory>
<fileMode>755</fileMode> <fileMode>755</fileMode>
</fileSet> </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> </fileSets>
<dependencySets> <dependencySets>

34
product/modules/p2-profile-gen/pom.xml
Unescape View File

@ -259,12 +259,18 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.governance.lifecycle.management.feature:${carbon.platform.version} org.wso2.carbon:org.wso2.carbon.governance.lifecycle.management.feature:${carbon.platform.version}
</featureArtifactDef> </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> </featureArtifactDef>
<!-- SSO --> <!-- SSO -->
<featureArtifactDef> <featureArtifactDef>
@ -301,8 +307,6 @@
</featureArtifactDef> </featureArtifactDef>
<!-- End of SSO Fixes --> <!-- End of SSO Fixes -->
</featureArtifacts> </featureArtifacts>
</configuration> </configuration>
</execution> </execution>
@ -465,14 +469,12 @@
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
</feature> </feature>
<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> <version>${carbon.platform.version}</version>
</feature> </feature>
<!-- registry features --> <!-- registry features -->
<feature> <feature>
<id>org.wso2.carbon.registry.core.feature.group</id> <id>org.wso2.carbon.registry.core.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
@ -531,7 +533,17 @@
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
</feature> </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> <feature>
<id> <id>
org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group

Write Preview
Loading…
Cancel
Save