diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 724539a0..3ec70f9c 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -161,37 +161,6 @@
-
-
- create-social-db-schema
- package
-
- run
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
3-extract-docs-from-components
package
@@ -396,25 +365,6 @@ d
-
-
- replace-for-api-publisher
- prepare-package
-
- replace
-
-
-
- ${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/api-publisher/site/conf/site.json
-
-
-
- (/publisher)
- /api-publisher
-
-
-
-
replace-for-api-store
prepare-package
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index db7463cb..f779b3fa 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -472,21 +472,7 @@
-
-
-
- ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/api-publisher/
-
- ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/api-publisher
-
-
- publisherLogo/**
- publisherTheme/**
- publisherSite/**
- footer/**
- localstyles.css
-
-
+
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/api-store/
@@ -756,22 +742,6 @@
755
-
-
- ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-android-agent.war
-
- ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
-
- 755
-
-
-
- ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-windows-agent.war
-
- ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
-
- 755
-
src/repository/conf/synapse.properties
@@ -927,6 +897,13 @@
${pom.artifactId}-${pom.version}/repository/conf
644
+
+
+
+ src/repository/resources/lifecycles/APILifeCycle.xml
+ ${pom.artifactId}-${pom.version}/repository/resources/lifecycles
+ 644
+
src/repository/conf/broker.xml
@@ -951,15 +928,6 @@
true
644
-
-
-
- ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/remote-appmanager-config.xml
-
- ${pom.artifactId}-${pom.version}/repository/conf/etc
- true
- 644
-
@@ -1005,15 +973,6 @@
${pom.artifactId}-${pom.version}/repository/conf/etc/
644
-
-
-
- ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/app-manager.xml
-
- ${pom.artifactId}-${pom.version}/repository/conf
- true
- 644
-
@@ -1052,16 +1011,6 @@
644
-
-
- ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/mobile-config.xml
-
-
- ${pom.artifactId}-${pom.version}/repository/conf/etc/device-mgt-plugin-configs/mobile
-
- true
- 644
-
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml
@@ -1107,24 +1056,6 @@
AndroidSenseDM_DB.h2.db
644
-
-
-
- ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/AndroidSenseDM_DB.h2.db
-
- ${pom.artifactId}-${pom.version}/repository/database
- AndroidSenseDM_DB.h2.db
- 644
-
-
-
-
- ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileWindows_DB.h2.db
-
- ${pom.artifactId}-${pom.version}/repository/database
- WSO2MobileWindows_DB.h2.db
- 644
-
@@ -1152,24 +1083,6 @@
VirtualFireAlarmDM_DB.h2.db
644
-
-
-
- ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileAndroid_DB.h2.db
-
- ${pom.artifactId}-${pom.version}/repository/database
- WSO2MobileAndroid_DB.h2.db
- 644
-
-
-
-
- ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileWindows_DB.h2.db
-
- ${pom.artifactId}-${pom.version}/repository/database
- WSO2MobileWindows_DB.h2.db
- 644
-
src/repository/conf/carbon.xml
diff --git a/modules/distribution/src/repository/resources/lifecycles/APILifeCycle.xml b/modules/distribution/src/repository/resources/lifecycles/APILifeCycle.xml
new file mode 100644
index 00000000..1818a7ad
--- /dev/null
+++ b/modules/distribution/src/repository/resources/lifecycles/APILifeCycle.xml
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+ -
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 36dbc5e7..ae57779c 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -141,18 +141,6 @@
-
-
- org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.feature:${carbon.device.mgt.plugin.version}
-
-
- org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.android.feature:${carbon.device.mgt.plugin.version}
-
-
- org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:${carbon.device.mgt.plugin.version}
-
-
-
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.feature:${carbon.device.mgt.plugin.version}
@@ -212,9 +200,6 @@
org.jaggeryjs.modules:i18n.feature:${jaggery.extensions.version}
-
- org.jaggeryjs.modules:jaggery-test.feature:${jaggery.extensions.test.version}
-
org.jaggeryjs.modules:ws.feature:${jaggery.extensions.version}
@@ -336,6 +321,28 @@
org.wso2.carbon.identity:org.wso2.carbon.identity.xacml.server.feature:${carbon.identity.version}
+
+
+
+ org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.requestpath.basicauth.server.feature:${carbon.identity.version}
+
+
+ org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.requestpath.oauth.server.feature:${carbon.identity.version}
+
+
+ org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.basicauth.server.feature:${carbon.identity.version}
+
+
+ org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.samlsso.server.feature:${carbon.identity.version}
+
+
+ org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.saml2.sso.feature:${carbon.identity.version}
+
+
+ org.wso2.carbon.identity:org.wso2.carbon.identity.thrift.authentication.feature:${carbon.identity.version}
+
+
+ org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.mutualssl.feature:${carbon.identity.version}
@@ -427,48 +434,6 @@
-
-
- org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.core.feature:${appmgt.feature.version}
-
-
-
-
-
-
-
- org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.wso2emm.feature:${appmgt.feature.version}
-
-
-
- org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.wso2mdm.feature:${appmgt.feature.version}
-
-
-
- org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mobile.feature:${appmgt.feature.version}
-
-
-
- org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.publisher.feature:${appmgt.feature.version}
-
-
-
- org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.services.api.feature:${appmgt.feature.version}
-
-
-
- org.wso2.carbon.store:org.wso2.store.feature:${carbon.store.version}
-
-
-
- org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.store.feature:${appmgt.feature.version}
-
-
-
- org.wso2.carbon.store:org.wso2.carbon.social.feature:${carbon.store.version}
-
-
-
org.wso2.carbon.commons:org.wso2.carbon.event.feature:${carbon.commons.version}
@@ -552,24 +517,15 @@
-
- org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.publisher.feature:${carbon.api.mgt.version}
-
org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.store.feature:${carbon.api.mgt.version}
-
- org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.startup.publisher.feature:${carbon.api.mgt.version}
-
org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.authenticator.oidc.feature:${carbon.api.mgt.version}
org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.hostobjects.oidc.feature:${carbon.api.mgt.version}
-
-
-
@@ -624,9 +580,6 @@
org.wso2.carbon.analytics:org.wso2.carbon.analytics.core.feature:${carbon.analytics.version}
-
- org.wso2.carbon.analytics:org.wso2.carbon.analytics.core.server.feature:${carbon.analytics.version}
-
org.wso2.carbon.analytics:org.wso2.carbon.analytics.datasource.feature:${carbon.analytics.version}
@@ -732,15 +685,8 @@
org.wso2.carbon.analytics-common:org.wso2.carbon.event.execution.manager.feature:${carbon.analytics.common.version}
-
-
- org.wso2.carbon.commons:org.wso2.carbon.tryit.feature:${carbon.commons.version}
-
-
- org.wso2.carbon.event-processing:org.wso2.carbon.siddhi.tryit.feature:${carbon.event-processing.version}
-
-
-
+
+
org.wso2.carbon.commons:org.wso2.carbon.deployment.synchronizer.feature:${carbon.commons.version}
@@ -846,19 +792,6 @@
-
- org.wso2.carbon.device.mgt.mobile.feature.group
- ${carbon.device.mgt.plugin.version}
-
-
- org.wso2.carbon.device.mgt.mobile.android.feature.group
- ${carbon.device.mgt.plugin.version}
-
-
- org.wso2.carbon.device.mgt.mobile.windows.feature.group
- ${carbon.device.mgt.plugin.version}
-
-
org.wso2.carbon.device.mgt.iot.feature.group
${carbon.device.mgt.plugin.version}
@@ -931,10 +864,6 @@
org.jaggeryjs.modules.i18n.feature.group
${jaggery.extensions.version}
-
- org.jaggeryjs.modules.jaggery-test.feature.group
- ${jaggery.extensions.test.version}
-
org.jaggeryjs.modules.ws.feature.group
${jaggery.extensions.version}
@@ -1104,6 +1033,30 @@
${carbon.identity.version}
+
+
+ org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group
+
+ ${carbon.identity.version}
+
+
+
+ org.wso2.carbon.identity.application.authenticator.requestpath.basicauth.server.feature.group
+
+ ${carbon.identity.version}
+
+
+
+ org.wso2.carbon.identity.application.authenticator.requestpath.oauth.server.feature.group
+
+ ${carbon.identity.version}
+
+
+
+ org.wso2.carbon.identity.application.authenticator.samlsso.server.feature.group
+
+ ${carbon.identity.version}
+
@@ -1205,50 +1158,6 @@
-
-
-
- org.wso2.carbon.appmgt.core.feature.group
- ${appmgt.feature.version}
-
-
-
- org.wso2.carbon.store.feature.group
- ${carbon.store.version}
-
-
- org.wso2.carbon.appmgt.mdm.wso2emm.feature.group
- ${appmgt.feature.version}
-
-
- org.wso2.carbon.appmgt.mdm.wso2mdm.feature.group
- ${appmgt.feature.version}
-
-
- org.wso2.carbon.appmgt.mobile.feature.group
- ${appmgt.feature.version}
-
-
- org.wso2.carbon.appmgt.publisher.feature.group
- ${appmgt.feature.version}
-
-
- org.wso2.carbon.appmgt.services.api.feature.group
- ${appmgt.feature.version}
-
-
-
-
- org.wso2.carbon.appmgt.store.feature.group
- ${appmgt.feature.version}
-
-
-
-
-
- org.wso2.carbon.social.feature.group
- ${carbon.store.version}
-
@@ -1354,19 +1263,10 @@
-
- org.wso2.carbon.apimgt.publisher.feature.group
- ${carbon.api.mgt.version}
-
org.wso2.carbon.apimgt.store.feature.group
${carbon.api.mgt.version}
-
- org.wso2.carbon.apimgt.startup.publisher.feature.group
- ${carbon.api.mgt.version}
-
-
org.wso2.carbon.apimgt.authenticator.oidc.feature.group
${carbon.api.mgt.version}
@@ -1420,10 +1320,6 @@
org.wso2.carbon.analytics.core.feature.group
${carbon.analytics.version}
-
- org.wso2.carbon.analytics.core.server.feature.group
- ${carbon.analytics.version}
-
org.wso2.carbon.analytics.datasource.feature.group
${carbon.analytics.version}
@@ -1556,16 +1452,6 @@
-
-
- org.wso2.carbon.tryit.feature.group
- ${carbon.commons.version}
-
-
- org.wso2.carbon.siddhi.tryit.feature.group
- ${carbon.event-processing.version}
-
-
org.wso2.carbon.dashboards.shindig.feature.group
${carbon.dashboard.version}
diff --git a/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/ControllerService.java b/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/ControllerService.java
index d71780ef..f6968246 100644
--- a/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/ControllerService.java
+++ b/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/ControllerService.java
@@ -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
diff --git a/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/transport/MQTTConnector.java b/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/transport/MQTTConnector.java
index 5015cc18..495f9dc5 100644
--- a/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/transport/MQTTConnector.java
+++ b/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/transport/MQTTConnector.java
@@ -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";