From b40e5b4bb187d4e3eb2f706daefc20397dc7709e Mon Sep 17 00:00:00 2001 From: GPrathap Date: Thu, 5 May 2016 22:23:26 +0530 Subject: [PATCH 01/10] corrected subscribe topic format --- .../__rootArtifactId__/api/transport/MQTTConnector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"; From 384c1f35b32aa2f97c24bb809513559a32790719 Mon Sep 17 00:00:00 2001 From: GPrathap Date: Thu, 5 May 2016 22:24:16 +0530 Subject: [PATCH 02/10] removed unused code --- .../api/ControllerService.java | 23 ------------------- 1 file changed, 23 deletions(-) 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 From ee304f1724008246afb6e5b82e82d8d6abfa3fb8 Mon Sep 17 00:00:00 2001 From: GPrathap Date: Fri, 6 May 2016 21:01:20 +0530 Subject: [PATCH 03/10] added SAML2 Web SSO federated authenticator --- modules/p2-profile-gen/pom.xml | 46 ++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index da918ec5..ffb503fd 100644 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -333,6 +333,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} @@ -1090,6 +1112,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} + From a98849b20f8e0858da182993e543aa358048ea53 Mon Sep 17 00:00:00 2001 From: prabathabey Date: Tue, 10 May 2016 21:30:15 +0530 Subject: [PATCH 04/10] Removing API-mgt publisher feature --- modules/p2-profile-gen/pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index ffb503fd..3d08c07a 100644 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -568,9 +568,6 @@ - - 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} @@ -1386,10 +1383,6 @@ - - org.wso2.carbon.apimgt.publisher.feature.group - ${carbon.api.mgt.version} - org.wso2.carbon.apimgt.store.feature.group ${carbon.api.mgt.version} From 9548b88dadda06aff8c47d7ea4801e3929079c1b Mon Sep 17 00:00:00 2001 From: prabathabey Date: Tue, 10 May 2016 22:12:25 +0530 Subject: [PATCH 05/10] Removing app-mgt dependencies --- modules/distribution/pom.xml | 50 ------------- modules/distribution/src/assembly/bin.xml | 34 +-------- modules/p2-profile-gen/pom.xml | 86 ----------------------- 3 files changed, 1 insertion(+), 169 deletions(-) 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 420c9152..181617b1 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/ @@ -951,15 +937,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 +982,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 - diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index 3d08c07a..b0c7c2c5 100644 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -443,48 +443,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} @@ -1234,50 +1192,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} - From 125e398dab469c7c04b16293c1ac6dacd623a650 Mon Sep 17 00:00:00 2001 From: prabathabey Date: Tue, 10 May 2016 22:21:56 +0530 Subject: [PATCH 06/10] Removing all mobile related dependencies --- modules/distribution/src/assembly/bin.xml | 62 ----------------------- modules/p2-profile-gen/pom.xml | 25 --------- 2 files changed, 87 deletions(-) diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 181617b1..3606e9ce 100644 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -742,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 @@ -1020,16 +1004,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 @@ -1075,24 +1049,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 - @@ -1120,24 +1076,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/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index b0c7c2c5..3adfe908 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} @@ -813,19 +801,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} From 1e3454dc46f0ac5d98d73144479cca87f4e5da89 Mon Sep 17 00:00:00 2001 From: prabathabey Date: Tue, 10 May 2016 22:29:28 +0530 Subject: [PATCH 07/10] Removing jaggery-test dependency --- modules/p2-profile-gen/pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index 3adfe908..ffb63972 100644 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -197,9 +197,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} @@ -869,10 +866,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} From ab32e91501d6854c4441214edf03b96b21d9a1bd Mon Sep 17 00:00:00 2001 From: prabathabey Date: Tue, 10 May 2016 22:42:17 +0530 Subject: [PATCH 08/10] Removing try-it and Siddhi try-it features --- modules/p2-profile-gen/pom.xml | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index ffb63972..a79a7355 100644 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -523,9 +523,6 @@ org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.hostobjects.oidc.feature:${carbon.api.mgt.version} - - - @@ -688,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} @@ -1463,16 +1453,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} From 18c3f1dfd5142a2a67a4ea25eb6007b4d7627d32 Mon Sep 17 00:00:00 2001 From: prabathabey Date: Tue, 10 May 2016 22:44:49 +0530 Subject: [PATCH 09/10] Removing api-mgt startup publisher feature and other redundant feature definitions --- modules/p2-profile-gen/pom.xml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index a79a7355..f6670e3d 100644 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -514,9 +514,6 @@ 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} @@ -577,9 +574,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} @@ -1259,11 +1253,6 @@ 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} @@ -1317,10 +1306,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} From cacd5bf5ae8c00aec650c2baf657c3a02c22c1bc Mon Sep 17 00:00:00 2001 From: prabathabey Date: Wed, 11 May 2016 16:56:40 +0530 Subject: [PATCH 10/10] Adding APILifeCycle.xml --- modules/distribution/src/assembly/bin.xml | 7 + .../resources/lifecycles/APILifeCycle.xml | 123 ++++++++++++++++++ 2 files changed, 130 insertions(+) create mode 100644 modules/distribution/src/repository/resources/lifecycles/APILifeCycle.xml diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 3606e9ce..fd1d311a 100644 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -897,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 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