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

reverting commit 'MQTT profile commented, apim.integration.feature added'

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

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

@ -1228,13 +1228,5 @@
<filtered>true</filtered>
<fileMode>644</fileMode>
</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>
</assembly>

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

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

Write Preview
Loading…
Cancel
Save