community
/
product-iots
10
0
Fork 4
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MQTT profile commented, apim.integration.feature added to base profile, apim-integration.xml copy logic added

Browse Source
merge-requests/1/head
susinda 8 years ago
parent 7b4dfaf98f
commit 43c13ff7fb
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File

8
modules/core/distribution/src/assembly/bin.xml
Unescape View File

@ -1228,5 +1228,13 @@
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!-- Copying apim-integration.xml -->
<file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/apim-integration.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
<destName>apim-integration.xml</destName>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
</files> </files>
</assembly> </assembly>

22
modules/core/p2-profile-gen/pom.xml
Unescape View File

@ -206,6 +206,9 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.apimgt:org.wso2.carbon.forum.server.feature:${carbon.api.mgt.version} org.wso2.carbon.apimgt:org.wso2.carbon.forum.server.feature:${carbon.api.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.apim.integration.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<!-- End of API Management Features --> <!-- End of API Management Features -->
<!-- Carbon Commons Features --> <!-- Carbon Commons Features -->
@ -844,6 +847,10 @@
<id>org.wso2.carbon.apimgt.webapp.publisher.feature.group</id> <id>org.wso2.carbon.apimgt.webapp.publisher.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.apimgt.apim.integration.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.oauth.extensions.feature.group</id> <id>org.wso2.carbon.device.mgt.oauth.extensions.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
@ -941,6 +948,8 @@
<id>org.wso2.carbon.forum.server.feature.group</id> <id>org.wso2.carbon.forum.server.feature.group</id>
<version>${carbon.api.mgt.version}</version> <version>${carbon.api.mgt.version}</version>
</feature> </feature>
<!-- End of API Management Features --> <!-- End of API Management Features -->
<!-- Carbon Analytics Common Features --> <!-- Carbon Analytics Common Features -->
@ -1401,7 +1410,7 @@
</features> </features>
</configuration> </configuration>
</execution> </execution>
<!--MQTT profile--> <!--MQTT profile>
<execution> <execution>
<id>4-p2-profile-generation</id> <id>4-p2-profile-generation</id>
<phase>package</phase> <phase>package</phase>
@ -1417,13 +1426,10 @@
</destination> </destination>
<deleteOldProfileFiles>true</deleteOldProfileFiles> <deleteOldProfileFiles>true</deleteOldProfileFiles>
<features> <features>
<!-- IoTServer Features -->
<feature> <feature>
<id>org.wso2.iot.core.styles.feature.group</id> <id>org.wso2.iot.core.styles.feature.group</id>
<version>${product.iot.version}</version> <version>${product.iot.version}</version>
</feature> </feature>
<!-- End of IoTServer Features -->
<!-- App management features-->
<feature> <feature>
<id>org.wso2.carbon.appmgt.core.feature.group</id> <id>org.wso2.carbon.appmgt.core.feature.group</id>
<version>${appmgt.feature.version}</version> <version>${appmgt.feature.version}</version>
@ -1448,7 +1454,6 @@
<id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id> <id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<!-- End of app management features-->
<feature> <feature>
<id>org.wso2.carbon.logging.mgt.feature.group</id> <id>org.wso2.carbon.logging.mgt.feature.group</id>
<version>${carbon.commons.version}</version> <version>${carbon.commons.version}</version>
@ -1497,7 +1502,6 @@
<id>org.wso2.carbon.registry.ws.feature.group</id> <id>org.wso2.carbon.registry.ws.feature.group</id>
<version>${carbon.registry.version}</version> <version>${carbon.registry.version}</version>
</feature> </feature>
<!--required for context.xml-->
<feature> <feature>
<id>org.wso2.carbon.webapp.mgt.feature.group</id> <id>org.wso2.carbon.webapp.mgt.feature.group</id>
<version>${carbon.deployment.version}</version> <version>${carbon.deployment.version}</version>
@ -1522,9 +1526,6 @@
<id>org.wso2.carbon.device.mgt.oauth.extensions.feature.group</id> <id>org.wso2.carbon.device.mgt.oauth.extensions.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<!--end required for context.xml-->
<!-- Features required for axis2.xml-->
<feature> <feature>
<id>org.apache.synapse.wso2.feature.group</id> <id>org.apache.synapse.wso2.feature.group</id>
<version>${carbon.mediation.version}</version> <version>${carbon.mediation.version}</version>
@ -1557,7 +1558,6 @@
<id>org.wso2.carbon.mediation.admin.feature.group</id> <id>org.wso2.carbon.mediation.admin.feature.group</id>
<version>${carbon.mediation.version}</version> <version>${carbon.mediation.version}</version>
</feature> </feature>
<!-- End of Mediation Features -->
<feature> <feature>
<id>org.wso2.carbon.tenant.common.feature.group</id> <id>org.wso2.carbon.tenant.common.feature.group</id>
<version>${carbon.multitenancy.version}</version> <version>${carbon.multitenancy.version}</version>
@ -1592,7 +1592,7 @@
</feature> </feature>
</features> </features>
</configuration> </configuration>
</execution> </execution-->
<!--Http Gateway Profile--> <!--Http Gateway Profile-->
<execution> <execution>
<id>5-p2-profile-generation</id> <id>5-p2-profile-generation</id>

Write Preview
Loading…
Cancel
Save