mirror of
https://repository.entgra.net/community/product-iots.git
synced 2025-09-16 23:32:19 +00:00
Merge branch 'master' of https://github.com/wso2/product-iots into das-ext
This commit is contained in:
ayyoob
commit
a5be8acd45
@ -161,37 +161,6 @@
|
||||
</tasks>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<!-- Creating Social DB schema -->
|
||||
<id>create-social-db-schema</id>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>run</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<tasks>
|
||||
<echo message="########### Create Social Plugin H2 Schema ###########"/>
|
||||
|
||||
<property name="db.dir"
|
||||
value="target/wso2carbon-core-${carbon.kernel.version}/repository/database"/>
|
||||
<property name="userid" value="wso2carbon"/>
|
||||
<property name="password" value="wso2carbon"/>
|
||||
<property name="dbURL"
|
||||
value="jdbc:h2:file:${basedir}/${db.dir}/WSO2_SOCIAL_DB;DB_CLOSE_ON_EXIT=FALSE"/>
|
||||
|
||||
<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}"
|
||||
autocommit="true" onerror="continue">
|
||||
<classpath refid="maven.dependency.classpath"/>
|
||||
<classpath refid="maven.compile.classpath"/>
|
||||
<classpath refid="maven.runtime.classpath"/>
|
||||
|
||||
<fileset
|
||||
file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social/h2/resource.sql"/>
|
||||
</sql>
|
||||
<echo message="##################### END ####################"/>
|
||||
</tasks>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>3-extract-docs-from-components</id>
|
||||
<phase>package</phase>
|
||||
@ -396,25 +365,6 @@ d <exclude name="**/shindig.properties" /
|
||||
</replacements>
|
||||
</configuration>
|
||||
</execution>
|
||||
|
||||
<execution>
|
||||
<id>replace-for-api-publisher</id>
|
||||
<phase>prepare-package</phase>
|
||||
<goals>
|
||||
<goal>replace</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<file>
|
||||
${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/api-publisher/site/conf/site.json
|
||||
</file>
|
||||
<replacements>
|
||||
<replacement>
|
||||
<token>(/publisher)</token>
|
||||
<value>/api-publisher</value>
|
||||
</replacement>
|
||||
</replacements>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>replace-for-api-store</id>
|
||||
<phase>prepare-package</phase>
|
||||
|
||||
@ -472,21 +472,7 @@
|
||||
</excludes>
|
||||
</fileSet>
|
||||
|
||||
<!-- Copying API Manager Publisher and Store Jaggery apps -->
|
||||
<fileSet>
|
||||
<directory>
|
||||
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/api-publisher/
|
||||
</directory>
|
||||
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/api-publisher
|
||||
</outputDirectory>
|
||||
<excludes>
|
||||
<exclude>publisherLogo/**</exclude>
|
||||
<exclude>publisherTheme/**</exclude>
|
||||
<exclude>publisherSite/**</exclude>
|
||||
<exclude>footer/**</exclude>
|
||||
<exclude>localstyles.css</exclude>
|
||||
</excludes>
|
||||
</fileSet>
|
||||
<!-- Copying API Manager Store Jaggery app -->
|
||||
<fileSet>
|
||||
<directory>
|
||||
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/api-store/
|
||||
@ -756,22 +742,6 @@
|
||||
<fileMode>755</fileMode>
|
||||
</file>
|
||||
<!-- End of "portal" app specific modifications -->
|
||||
<file>
|
||||
<source>
|
||||
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-android-agent.war
|
||||
</source>
|
||||
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
|
||||
</outputDirectory>
|
||||
<fileMode>755</fileMode>
|
||||
</file>
|
||||
<file>
|
||||
<source>
|
||||
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-windows-agent.war
|
||||
</source>
|
||||
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
|
||||
</outputDirectory>
|
||||
<fileMode>755</fileMode>
|
||||
</file>
|
||||
<!-- Copying synapse.properties file -->
|
||||
<file>
|
||||
<source>src/repository/conf/synapse.properties</source>
|
||||
@ -927,6 +897,13 @@
|
||||
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
|
||||
<fileMode>644</fileMode>
|
||||
</file>
|
||||
|
||||
<!-- Copy APILifeCycle.xml -->
|
||||
<file>
|
||||
<source>src/repository/resources/lifecycles/APILifeCycle.xml</source>
|
||||
<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/lifecycles</outputDirectory>
|
||||
<fileMode>644</fileMode>
|
||||
</file>
|
||||
<!-- Copying broker.xml -->
|
||||
<file>
|
||||
<source>src/repository/conf/broker.xml</source>
|
||||
@ -951,15 +928,6 @@
|
||||
<filtered>true</filtered>
|
||||
<fileMode>644</fileMode>
|
||||
</file>
|
||||
<!-- Copying remote-appmanager-config.xml -->
|
||||
<file>
|
||||
<source>
|
||||
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/remote-appmanager-config.xml
|
||||
</source>
|
||||
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
|
||||
<filtered>true</filtered>
|
||||
<fileMode>644</fileMode>
|
||||
</file>
|
||||
<!--certificate config file-->
|
||||
<file>
|
||||
<source>
|
||||
@ -1005,15 +973,6 @@
|
||||
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/</outputDirectory>
|
||||
<fileMode>644</fileMode>
|
||||
</file>
|
||||
<!--app management config file-->
|
||||
<file>
|
||||
<source>
|
||||
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/app-manager.xml
|
||||
</source>
|
||||
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
|
||||
<filtered>true</filtered>
|
||||
<fileMode>644</fileMode>
|
||||
</file>
|
||||
<!--License Config file-->
|
||||
<file>
|
||||
<source>
|
||||
@ -1052,16 +1011,6 @@
|
||||
<fileMode>644</fileMode>
|
||||
</file>
|
||||
<!--cdm plugin config file-->
|
||||
<file>
|
||||
<source>
|
||||
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/mobile-config.xml
|
||||
</source>
|
||||
<outputDirectory>
|
||||
${pom.artifactId}-${pom.version}/repository/conf/etc/device-mgt-plugin-configs/mobile
|
||||
</outputDirectory>
|
||||
<filtered>true</filtered>
|
||||
<fileMode>644</fileMode>
|
||||
</file>
|
||||
<file>
|
||||
<source>
|
||||
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml
|
||||
@ -1107,24 +1056,6 @@
|
||||
<destName>AndroidSenseDM_DB.h2.db</destName>
|
||||
<fileMode>644</fileMode>
|
||||
</file>
|
||||
<!-- Copying ANDROID SENSE H2 database -->
|
||||
<file>
|
||||
<source>
|
||||
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/AndroidSenseDM_DB.h2.db
|
||||
</source>
|
||||
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
|
||||
<destName>AndroidSenseDM_DB.h2.db</destName>
|
||||
<fileMode>644</fileMode>
|
||||
</file>
|
||||
<!-- Copying MOBILE-WINDOWS H2 database -->
|
||||
<file>
|
||||
<source>
|
||||
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileWindows_DB.h2.db
|
||||
</source>
|
||||
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
|
||||
<destName>WSO2MobileWindows_DB.h2.db</destName>
|
||||
<fileMode>644</fileMode>
|
||||
</file>
|
||||
<!-- Copying ARDUINO H2 database -->
|
||||
<file>
|
||||
<source>
|
||||
@ -1152,24 +1083,6 @@
|
||||
<destName>VirtualFireAlarmDM_DB.h2.db</destName>
|
||||
<fileMode>644</fileMode>
|
||||
</file>
|
||||
<!-- Copying MOBILE-ANDROID H2 database -->
|
||||
<file>
|
||||
<source>
|
||||
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileAndroid_DB.h2.db
|
||||
</source>
|
||||
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
|
||||
<destName>WSO2MobileAndroid_DB.h2.db</destName>
|
||||
<fileMode>644</fileMode>
|
||||
</file>
|
||||
<!-- Copying MOBILE-WINDOWS H2 database -->
|
||||
<file>
|
||||
<source>
|
||||
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileWindows_DB.h2.db
|
||||
</source>
|
||||
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
|
||||
<destName>WSO2MobileWindows_DB.h2.db</destName>
|
||||
<fileMode>644</fileMode>
|
||||
</file>
|
||||
<file>
|
||||
<source>src/repository/conf/carbon.xml
|
||||
</source>
|
||||
|
||||
@ -0,0 +1,123 @@
|
||||
<!--
|
||||
~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||
~
|
||||
~ WSO2 Inc. licenses this file to you under the Apache License,
|
||||
~ Version 2.0 (the "License"); you may not use this file except
|
||||
~ in compliance with the License.
|
||||
~ You may obtain a copy of the License at
|
||||
~
|
||||
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||
~
|
||||
~ Unless required by applicable law or agreed to in writing,
|
||||
~ software distributed under the License is distributed on an
|
||||
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
~ KIND, either express or implied. See the License for the
|
||||
~ specific language governing permissions and limitations
|
||||
~ under the License.
|
||||
-->
|
||||
<aspect name="APILifeCycle" class="org.wso2.carbon.governance.registry.extensions.aspects.DefaultLifeCycle">
|
||||
<configuration type="literal">
|
||||
<lifecycle>
|
||||
<scxml xmlns="http://www.w3.org/2005/07/scxml"
|
||||
version="1.0"
|
||||
initialstate="Created">
|
||||
|
||||
<state id="Created">
|
||||
<datamodel>
|
||||
|
||||
<data name="checkItems">
|
||||
<item name="Deprecate Old Versions" forEvent="">
|
||||
</item>
|
||||
<item name="Require Re-Subscription" forEvent="">
|
||||
</item>
|
||||
</data>
|
||||
|
||||
<data name="transitionExecution">
|
||||
<execution forEvent="Deploy as a Prototype"
|
||||
class="org.wso2.carbon.apimgt.impl.executors.APIExecutor">
|
||||
</execution>
|
||||
<execution forEvent="Publish"
|
||||
class="org.wso2.carbon.apimgt.impl.executors.APIExecutor">
|
||||
</execution>
|
||||
</data>
|
||||
</datamodel>
|
||||
<transition event="Publish" target="Published"/>
|
||||
<transition event="Deploy as a Prototype" target="Prototyped"/>
|
||||
|
||||
</state>
|
||||
|
||||
<state id="Prototyped">
|
||||
<datamodel>
|
||||
<data name="transitionExecution">
|
||||
<execution forEvent="Publish"
|
||||
class="org.wso2.carbon.apimgt.impl.executors.APIExecutor">
|
||||
</execution>
|
||||
<execution forEvent="Demote to Created"
|
||||
class="org.wso2.carbon.apimgt.impl.executors.APIExecutor">
|
||||
</execution>
|
||||
</data>
|
||||
</datamodel>
|
||||
<transition event="Publish" target="Published"/>
|
||||
<transition event="Demote to Created" target="Created"/>
|
||||
</state>
|
||||
|
||||
|
||||
<state id="Published">
|
||||
|
||||
<datamodel>
|
||||
|
||||
<data name="transitionExecution">
|
||||
<execution forEvent="Block"
|
||||
class="org.wso2.carbon.apimgt.impl.executors.APIExecutor">
|
||||
</execution>
|
||||
<execution forEvent="Deprecate"
|
||||
class="org.wso2.carbon.apimgt.impl.executors.APIExecutor">
|
||||
</execution>
|
||||
<execution forEvent="Demote to Created"
|
||||
class="org.wso2.carbon.apimgt.impl.executors.APIExecutor">
|
||||
</execution>
|
||||
<execution forEvent="Deploy as a Prototype"
|
||||
class="org.wso2.carbon.apimgt.impl.executors.APIExecutor">
|
||||
</execution>
|
||||
|
||||
</data>
|
||||
</datamodel>
|
||||
<transition event="Block" target="Blocked"/>
|
||||
<transition event="Deploy as a Prototype" target="Prototyped"/>
|
||||
<transition event="Demote to Created" target="Created"/>
|
||||
<transition event="Deprecate" target="Deprecated"/>
|
||||
<transition event="Publish" target="Published"/>
|
||||
</state>
|
||||
|
||||
<state id="Blocked">
|
||||
<datamodel>
|
||||
<data name="transitionExecution">
|
||||
<execution forEvent="Re-Publish"
|
||||
class="org.wso2.carbon.apimgt.impl.executors.APIExecutor">
|
||||
</execution>
|
||||
<execution forEvent="Deprecate"
|
||||
class="org.wso2.carbon.apimgt.impl.executors.APIExecutor">
|
||||
</execution>
|
||||
</data>
|
||||
</datamodel>
|
||||
<transition event="Deprecate" target="Deprecated"/>
|
||||
<transition event="Re-Publish" target="Published"/>
|
||||
</state>
|
||||
|
||||
<state id="Deprecated">
|
||||
<datamodel>
|
||||
<data name="transitionExecution">
|
||||
<execution forEvent="Retire"
|
||||
class="org.wso2.carbon.apimgt.impl.executors.APIExecutor">
|
||||
</execution>
|
||||
</data>
|
||||
</datamodel>
|
||||
<transition event="Retire" target="Retired"/>
|
||||
</state>
|
||||
|
||||
<state id="Retired">
|
||||
</state>
|
||||
</scxml>
|
||||
</lifecycle>
|
||||
</configuration>
|
||||
</aspect>
|
||||
@ -141,18 +141,6 @@
|
||||
</featureArtifactDef>
|
||||
<!-- End of Device Management Features -->
|
||||
|
||||
<!-- Mobile Device Management Features -->
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.feature:${carbon.device.mgt.plugin.version}
|
||||
</featureArtifactDef>
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.android.feature:${carbon.device.mgt.plugin.version}
|
||||
</featureArtifactDef>
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:${carbon.device.mgt.plugin.version}
|
||||
</featureArtifactDef>
|
||||
<!-- Mobile Device Management Features -->
|
||||
|
||||
<!-- IoT Device Management Features -->
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.feature:${carbon.device.mgt.plugin.version}
|
||||
@ -212,9 +200,6 @@
|
||||
<featureArtifactDef>
|
||||
org.jaggeryjs.modules:i18n.feature:${jaggery.extensions.version}
|
||||
</featureArtifactDef>
|
||||
<featureArtifactDef>
|
||||
org.jaggeryjs.modules:jaggery-test.feature:${jaggery.extensions.test.version}
|
||||
</featureArtifactDef>
|
||||
<featureArtifactDef>
|
||||
org.jaggeryjs.modules:ws.feature:${jaggery.extensions.version}
|
||||
</featureArtifactDef>
|
||||
@ -336,6 +321,28 @@
|
||||
</featureArtifactDef>
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.identity:org.wso2.carbon.identity.xacml.server.feature:${carbon.identity.version}
|
||||
</featureArtifactDef>
|
||||
<!-- Authenticators -->
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.requestpath.basicauth.server.feature:${carbon.identity.version}
|
||||
</featureArtifactDef>
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.requestpath.oauth.server.feature:${carbon.identity.version}
|
||||
</featureArtifactDef>
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.basicauth.server.feature:${carbon.identity.version}
|
||||
</featureArtifactDef>
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.samlsso.server.feature:${carbon.identity.version}
|
||||
</featureArtifactDef>
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.saml2.sso.feature:${carbon.identity.version}
|
||||
</featureArtifactDef>
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.identity:org.wso2.carbon.identity.thrift.authentication.feature:${carbon.identity.version}
|
||||
</featureArtifactDef>
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.mutualssl.feature:${carbon.identity.version}
|
||||
</featureArtifactDef>
|
||||
<!-- End of Identity Features -->
|
||||
|
||||
@ -427,48 +434,6 @@
|
||||
<!-- End of Mediation Features -->
|
||||
|
||||
<!-- App Manager features-->
|
||||
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.core.feature:${appmgt.feature.version}
|
||||
</featureArtifactDef>
|
||||
|
||||
<!--<featureArtifactDef>-->
|
||||
<!--org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.feature:${appmgt..feature.version}-->
|
||||
<!--</featureArtifactDef>-->
|
||||
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.wso2emm.feature:${appmgt.feature.version}
|
||||
</featureArtifactDef>
|
||||
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.wso2mdm.feature:${appmgt.feature.version}
|
||||
</featureArtifactDef>
|
||||
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mobile.feature:${appmgt.feature.version}
|
||||
</featureArtifactDef>
|
||||
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.publisher.feature:${appmgt.feature.version}
|
||||
</featureArtifactDef>
|
||||
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.services.api.feature:${appmgt.feature.version}
|
||||
</featureArtifactDef>
|
||||
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.store:org.wso2.store.feature:${carbon.store.version}
|
||||
</featureArtifactDef>
|
||||
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.store.feature:${appmgt.feature.version}
|
||||
</featureArtifactDef>
|
||||
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.store:org.wso2.carbon.social.feature:${carbon.store.version}
|
||||
</featureArtifactDef>
|
||||
|
||||
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.commons:org.wso2.carbon.event.feature:${carbon.commons.version}
|
||||
</featureArtifactDef>
|
||||
@ -552,24 +517,15 @@
|
||||
</featureArtifactDef>
|
||||
|
||||
<!-- API Management Features -->
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.publisher.feature:${carbon.api.mgt.version}
|
||||
</featureArtifactDef>
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.store.feature:${carbon.api.mgt.version}
|
||||
</featureArtifactDef>
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.startup.publisher.feature:${carbon.api.mgt.version}
|
||||
</featureArtifactDef>
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.authenticator.oidc.feature:${carbon.api.mgt.version}
|
||||
</featureArtifactDef>
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.hostobjects.oidc.feature:${carbon.api.mgt.version}
|
||||
</featureArtifactDef>
|
||||
<!--<featureArtifactDef>-->
|
||||
<!--org.wso2.carbon.apimgt:org.wso2.carbon.forum.server.feature:${carbon.api.mgt.version}-->
|
||||
<!--</featureArtifactDef>-->
|
||||
<!-- End of API Management Features -->
|
||||
|
||||
<!--- TCP Transport -->
|
||||
@ -624,9 +580,6 @@
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.analytics:org.wso2.carbon.analytics.core.feature:${carbon.analytics.version}
|
||||
</featureArtifactDef>
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.analytics:org.wso2.carbon.analytics.core.server.feature:${carbon.analytics.version}
|
||||
</featureArtifactDef>
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.analytics:org.wso2.carbon.analytics.datasource.feature:${carbon.analytics.version}
|
||||
</featureArtifactDef>
|
||||
@ -732,15 +685,8 @@
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.analytics-common:org.wso2.carbon.event.execution.manager.feature:${carbon.analytics.common.version}
|
||||
</featureArtifactDef>
|
||||
<!-- START - Tools -->
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.commons:org.wso2.carbon.tryit.feature:${carbon.commons.version}
|
||||
</featureArtifactDef>
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.event-processing:org.wso2.carbon.siddhi.tryit.feature:${carbon.event-processing.version}
|
||||
</featureArtifactDef>
|
||||
<!-- END - Tools -->
|
||||
<featureArtifactDef>
|
||||
|
||||
<featureArtifactDef>
|
||||
org.wso2.carbon.commons:org.wso2.carbon.deployment.synchronizer.feature:${carbon.commons.version}
|
||||
</featureArtifactDef>
|
||||
<!--End of DAS Feature-->
|
||||
@ -846,19 +792,6 @@
|
||||
</feature>
|
||||
<!-- End of Device Management Features -->
|
||||
|
||||
<feature>
|
||||
<id>org.wso2.carbon.device.mgt.mobile.feature.group</id>
|
||||
<version>${carbon.device.mgt.plugin.version}</version>
|
||||
</feature>
|
||||
<feature>
|
||||
<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
|
||||
<version>${carbon.device.mgt.plugin.version}</version>
|
||||
</feature>
|
||||
<feature>
|
||||
<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
|
||||
<version>${carbon.device.mgt.plugin.version}</version>
|
||||
</feature>
|
||||
|
||||
<feature>
|
||||
<id>org.wso2.carbon.device.mgt.iot.feature.group</id>
|
||||
<version>${carbon.device.mgt.plugin.version}</version>
|
||||
@ -931,10 +864,6 @@
|
||||
<id>org.jaggeryjs.modules.i18n.feature.group</id>
|
||||
<version>${jaggery.extensions.version}</version>
|
||||
</feature>
|
||||
<feature>
|
||||
<id>org.jaggeryjs.modules.jaggery-test.feature.group</id>
|
||||
<version>${jaggery.extensions.test.version}</version>
|
||||
</feature>
|
||||
<feature>
|
||||
<id>org.jaggeryjs.modules.ws.feature.group</id>
|
||||
<version>${jaggery.extensions.version}</version>
|
||||
@ -1104,6 +1033,30 @@
|
||||
</id>
|
||||
<version>${carbon.identity.version}</version>
|
||||
</feature>
|
||||
<feature>
|
||||
<id>
|
||||
org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group
|
||||
</id>
|
||||
<version>${carbon.identity.version}</version>
|
||||
</feature>
|
||||
<feature>
|
||||
<id>
|
||||
org.wso2.carbon.identity.application.authenticator.requestpath.basicauth.server.feature.group
|
||||
</id>
|
||||
<version>${carbon.identity.version}</version>
|
||||
</feature>
|
||||
<feature>
|
||||
<id>
|
||||
org.wso2.carbon.identity.application.authenticator.requestpath.oauth.server.feature.group
|
||||
</id>
|
||||
<version>${carbon.identity.version}</version>
|
||||
</feature>
|
||||
<feature>
|
||||
<id>
|
||||
org.wso2.carbon.identity.application.authenticator.samlsso.server.feature.group
|
||||
</id>
|
||||
<version>${carbon.identity.version}</version>
|
||||
</feature>
|
||||
<!-- End of Identity Features -->
|
||||
|
||||
<!-- Registry Features -->
|
||||
@ -1205,50 +1158,6 @@
|
||||
</feature>
|
||||
<!-- End of Mediation Features -->
|
||||
|
||||
<!-- App management features-->
|
||||
|
||||
<feature>
|
||||
<id>org.wso2.carbon.appmgt.core.feature.group</id>
|
||||
<version>${appmgt.feature.version}</version>
|
||||
</feature>
|
||||
|
||||
<feature>
|
||||
<id>org.wso2.carbon.store.feature.group</id>
|
||||
<version>${carbon.store.version}</version>
|
||||
</feature>
|
||||
<feature>
|
||||
<id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
|
||||
<version>${appmgt.feature.version}</version>
|
||||
</feature>
|
||||
<feature>
|
||||
<id>org.wso2.carbon.appmgt.mdm.wso2mdm.feature.group</id>
|
||||
<version>${appmgt.feature.version}</version>
|
||||
</feature>
|
||||
<feature>
|
||||
<id>org.wso2.carbon.appmgt.mobile.feature.group</id>
|
||||
<version>${appmgt.feature.version}</version>
|
||||
</feature>
|
||||
<feature>
|
||||
<id>org.wso2.carbon.appmgt.publisher.feature.group</id>
|
||||
<version>${appmgt.feature.version}</version>
|
||||
</feature>
|
||||
<feature>
|
||||
<id>org.wso2.carbon.appmgt.services.api.feature.group</id>
|
||||
<version>${appmgt.feature.version}</version>
|
||||
</feature>
|
||||
|
||||
|
||||
<feature>
|
||||
<id>org.wso2.carbon.appmgt.store.feature.group</id>
|
||||
<version>${appmgt.feature.version}</version>
|
||||
</feature>
|
||||
|
||||
<!-- End of app management features-->
|
||||
|
||||
<feature>
|
||||
<id>org.wso2.carbon.social.feature.group</id>
|
||||
<version>${carbon.store.version}</version>
|
||||
</feature>
|
||||
<!-- Cipher tool feature -->
|
||||
|
||||
<feature>
|
||||
@ -1354,19 +1263,10 @@
|
||||
<!-- End of Governance Features -->
|
||||
|
||||
<!-- API Manager Publisher and Store Features -->
|
||||
<feature>
|
||||
<id>org.wso2.carbon.apimgt.publisher.feature.group</id>
|
||||
<version>${carbon.api.mgt.version}</version>
|
||||
</feature>
|
||||
<feature>
|
||||
<id>org.wso2.carbon.apimgt.store.feature.group</id>
|
||||
<version>${carbon.api.mgt.version}</version>
|
||||
</feature>
|
||||
<feature>
|
||||
<id>org.wso2.carbon.apimgt.startup.publisher.feature.group</id>
|
||||
<version>${carbon.api.mgt.version}</version>
|
||||
</feature>
|
||||
|
||||
<feature>
|
||||
<id>org.wso2.carbon.apimgt.authenticator.oidc.feature.group</id>
|
||||
<version>${carbon.api.mgt.version}</version>
|
||||
@ -1420,10 +1320,6 @@
|
||||
<id>org.wso2.carbon.analytics.core.feature.group</id>
|
||||
<version>${carbon.analytics.version}</version>
|
||||
</feature>
|
||||
<feature>
|
||||
<id>org.wso2.carbon.analytics.core.server.feature.group</id>
|
||||
<version>${carbon.analytics.version}</version>
|
||||
</feature>
|
||||
<feature>
|
||||
<id>org.wso2.carbon.analytics.datasource.feature.group</id>
|
||||
<version>${carbon.analytics.version}</version>
|
||||
@ -1556,16 +1452,6 @@
|
||||
</feature>
|
||||
|
||||
<!-- ************** END - EVENT PROCESSING FEATURES ************ -->
|
||||
<!--START - Tools-->
|
||||
<feature>
|
||||
<id>org.wso2.carbon.tryit.feature.group</id>
|
||||
<version>${carbon.commons.version}</version>
|
||||
</feature>
|
||||
<feature>
|
||||
<id>org.wso2.carbon.siddhi.tryit.feature.group</id>
|
||||
<version>${carbon.event-processing.version}</version>
|
||||
</feature>
|
||||
<!--END - Tools-->
|
||||
<feature>
|
||||
<id>org.wso2.carbon.dashboards.shindig.feature.group</id>
|
||||
<version>${carbon.dashboard.version}</version>
|
||||
|
||||
@ -63,29 +63,6 @@ public interface ControllerService {
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
Response registerDevice(final DeviceJSON agentInfo);
|
||||
|
||||
/**
|
||||
* @param deviceId unique identifier for given device type
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
/*@Path("device/{deviceId}/read-current-status")
|
||||
@GET
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
@Feature(code = "read-current-status", name = "Read current status of sensor On or Off", type = "monitor",
|
||||
description = "Request current status of sensor from device")
|
||||
public Response readCurrentStatus(@PathParam("deviceId") String deviceId,
|
||||
@Context HttpServletResponse response);*/
|
||||
|
||||
/**
|
||||
* @param agentInfo receive current status of sensor and device metadata
|
||||
* @param response
|
||||
*/
|
||||
/*@Path("controller/push-sensor-value")
|
||||
@POST
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
public void pushData(final DeviceJSON agentInfo, @Context HttpServletResponse response) ;*/
|
||||
|
||||
/**
|
||||
* @param deviceId unique identifier for given device type
|
||||
* @param state change status of sensor: on/off
|
||||
|
||||
@ -55,7 +55,7 @@ public class MQTTConnector extends MQTTTransportHandler {
|
||||
|
||||
private static final String publisherContext = "publisher";
|
||||
private static final String subscriberContext = "subscriber";
|
||||
private static final String subscribeTopic = "wso2/" + DeviceTypeConstants.DEVICE_TYPE + "/+/" + publisherContext;
|
||||
private static final String subscribeTopic = "wso2/+/"+ DeviceTypeConstants.DEVICE_TYPE + "/+/" + publisherContext;
|
||||
private static final String KEY_TYPE = "PRODUCTION";
|
||||
private static final String EMPTY_STRING = "";
|
||||
private static final String JSON_SERIAL_KEY = "SerialNumber";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user