Merge pull request #240 from geethkokila/master

Adding the ios gateway support for the iot server
application-manager-new
Rasika Perera 8 years ago committed by GitHub
commit 452950c7e5

@ -1255,5 +1255,15 @@
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot-api-config.xml
</source>
<outputDirectory>
${pom.artifactId}-${pom.version}/repository/conf/
</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
</files> </files>
</assembly> </assembly>

@ -152,6 +152,14 @@
<!-- for different message format serializations in Axis2. These message formats are --> <!-- for different message format serializations in Axis2. These message formats are -->
<!-- expected to be resolved based on the content type. --> <!-- expected to be resolved based on the content type. -->
<messageFormatters> <messageFormatters>
<messageFormatter contentType="application/x-apple-aspen-mdm"
class="org.apache.axis2.format.PlainTextFormatter"/>
<messageFormatter contentType="application/x-apple-aspen-config"
class="org.apache.axis2.format.PlainTextFormatter"/>
<messageFormatter contentType="application/pkcs7-signature"
class="org.apache.axis2.format.PlainTextFormatter"/>
<messageFormatter contentType="application/x-www-form-urlencoded" <messageFormatter contentType="application/x-www-form-urlencoded"
class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/> class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
<messageFormatter contentType="multipart/form-data" <messageFormatter contentType="multipart/form-data"
@ -220,6 +228,15 @@
<!-- different message formats in Axis2. These message formats are expected to be --> <!-- different message formats in Axis2. These message formats are expected to be -->
<!-- resolved based on the content type. --> <!-- resolved based on the content type. -->
<messageBuilders> <messageBuilders>
<messageBuilder contentType="application/x-apple-aspen-mdm"
class="org.apache.axis2.format.PlainTextBuilder"/>
<messageBuilder contentType="application/x-apple-aspen-config"
class="org.apache.axis2.format.PlainTextBuilder"/>
<messageBuilder contentType="application/pkcs7-signature"
class="org.apache.axis2.format.PlainTextBuilder"/>
<messageBuilder contentType="application/xml" <messageBuilder contentType="application/xml"
class="org.apache.axis2.builder.ApplicationXMLBuilder"/> class="org.apache.axis2.builder.ApplicationXMLBuilder"/>
<messageBuilder contentType="text/html" <messageBuilder contentType="text/html"
@ -322,6 +339,7 @@
<Password>wso2carbon</Password> <Password>wso2carbon</Password>
</TrustStore> </TrustStore>
</parameter> </parameter>
<parameter name="HostnameVerifier">AllowAll</parameter>
<!--<parameter name="SSLVerifyClient">require</parameter> <!--<parameter name="SSLVerifyClient">require</parameter>
supports optional|require or defaults to none --> supports optional|require or defaults to none -->
</transportReceiver> </transportReceiver>

@ -146,6 +146,9 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.application.extension.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.application.extension.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.handler.server.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.email.sender.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.email.sender.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
@ -891,6 +894,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.handler.server.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>
@ -1818,6 +1825,10 @@
<id>org.wso2.carbon.apimgt.gateway.feature.group</id> <id>org.wso2.carbon.apimgt.gateway.feature.group</id>
<version>${carbon.api.mgt.version}</version> <version>${carbon.api.mgt.version}</version>
</feature> </feature>
<!--<feature>-->
<!--<id>org.wso2.carbon.apimgt.handler.server.feature.group</id>-->
<!--<version>${carbon.device.mgt.version}</version>-->
<!--</feature>-->
<feature> <feature>
<id>org.wso2.carbon.policy.mgt.server.feature.group</id> <id>org.wso2.carbon.policy.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>

Loading…
Cancel
Save