community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Geeth Munasinghe 2015-01-23 22:22:31 +05:30
commit c93f99d970
2 changed files with 49 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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>

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

@ -259,12 +259,18 @@
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.governance.lifecycle.management.feature:${carbon.platform.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.self.registration.feature:${carbon.platform.version}
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.self.registration.server.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