sinthuja
|
41bc7b038c
|
Removing some unnecessary sources from the broker module.
|
8 years ago |
|
sinthuja
|
2e1dd12a68
|
Merge remote-tracking branch 'origin/IoTS-1.0.0' into IoTS-1.0.0
|
8 years ago |
charitha
|
2c17afe789
|
Merge branch 'master' of https://github.com/wso2/product-iot-server into IoTS-1.0.0
# Conflicts:
# modules/distribution/src/assembly/bin.xml
# modules/iot-extensions/components/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/pom.xml
# modules/iot-extensions/components/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/DeviceAccessBasedMQTTAuthorizer.java
# modules/p2-profile-gen/pom.xml
# pom.xml
|
8 years ago |
|
charitha
|
d303243e35
|
Merge branch 'master' of https://github.com/wso2/product-iot-server into IoTS-1.0.0
# Conflicts:
# modules/distribution/src/assembly/bin.xml
# modules/iot-extensions/components/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/pom.xml
# modules/iot-extensions/components/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/DeviceAccessBasedMQTTAuthorizer.java
# modules/p2-profile-gen/pom.xml
# pom.xml
|
8 years ago |
|
sinthuja
|
6d1c377ab2
|
Merge remote-tracking branch 'origin/IoTS-1.0.0' into IoTS-1.0.0
|
8 years ago |
|
sinthuja
|
e6d6c5f178
|
Removing some unnecessary sources from the analytics module.
|
8 years ago |
|
charitha
|
a8f8d8bde4
|
Merge remote-tracking branch 'upstream/IoTS-1.0.0' into IoTS-1.0.0
|
8 years ago |
|
charitha
|
669ab894f9
|
Update component versions for IoTS-1.0.0 release
|
8 years ago |
susinda
|
359eabde49
|
reverting commit 'MQTT profile commented, apim.integration.feature added'
|
8 years ago |
|
susinda
|
43c13ff7fb
|
MQTT profile commented, apim.integration.feature added to base profile, apim-integration.xml copy logic added
|
8 years ago |
|
sinthuja
|
7b4dfaf98f
|
Merging the conflicts with IoT-1.0.0 branch.
|
8 years ago |
|
sinthuja
|
4e29b177f0
|
Merge branch 'iot-product-restructure' into IoTS-1.0.0-fresh2
# Conflicts:
# modules/core/iot-extensions/components/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/DeviceAccessBasedMQTTAuthorizer.java
# modules/core/iot-extensions/components/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/internal/AuthorizationDataHolder.java
# modules/core/iot-extensions/components/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/internal/AuthorizationServiceComponent.java
# modules/core/iot-extensions/components/mb-extensions/pom.xml
# modules/core/iot-extensions/features/mb-extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/src/main/resources/build.properties
# modules/core/iot-extensions/features/mb-extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/src/main/resources/p2.inf
# modules/core/iot-extensions/features/mb-extensions-feature/pom.xml
# modules/distribution/src/samples-deployer.xml
# pom.xml
|
8 years ago |
|
sinthuja
|
617699693e
|
Changing the JVM startup order, and adding trap for stoping the servers.
|
8 years ago |
|
sinthuja
|
3349db1757
|
Changing the JVM startup order
|
8 years ago |
|
sinthuja
|
15a4f4dd4f
|
Fixing some issues in the broker distribution, and the analytics distribution.
|
8 years ago |
|
sinthuja
|
2992d9e098
|
adding samples to the root location.
|
8 years ago |
|
sinthuja
|
5ca98782fd
|
Fixing issues in the sample integration.
|
8 years ago |
|
sinthuja
|
3bf2f21711
|
Adding back the device-analytics-config.xml, and modifying log4j configs.
|
8 years ago |
|
sinthuja
|
227779c2ad
|
adding broker distribution and some logging configuration changes.
|
8 years ago |
|
sinthuja
|
3b8fe71f02
|
Merge pull request #200 from GPrathap/iot-product-restructure
init commit: adding wso2 mb as wso2iot- broker
|
8 years ago |
GPrathap
|
0ce49684fc
|
init commit: adding wso2 mb as wso2iot- broker
|
8 years ago |
ayyoob
|
8de788097a
|
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/product-iots into IoTS-1.0.0
|
8 years ago |
|
ayyoob
|
21bf103e6e
|
added android feature
|
8 years ago |
|
sinthuja
|
da7929c5a3
|
some more fixes to the startup script.
|
8 years ago |
|
sinthuja
|
37b2cb01ff
|
Adding bin scripts.
|
8 years ago |
Chatura Dilan
|
878c38ad8e
|
Merge pull request #199 from GPrathap/IoTS-1.0.0
removing mb mqtt authorization extension.
|
8 years ago |
|
GPrathap
|
401ad2846c
|
removing mb mqtt authorization extension. This has been moved to https://github.com/wso2/carbon-device-mgt-plugins/pull/403
|
8 years ago |
|
sinthuja
|
e0b29d4f08
|
Moving geo dashboard related files to src/repo/resources.
|
8 years ago |
|
sinthuja
|
5fb6db5c7a
|
Renaming the analytics modules to follow the naming structure.
|
8 years ago |
|
sinthuja
|
9704c0b51f
|
Adding empty distribution module.
|
8 years ago |
|
sinthuja
|
21ab784b44
|
removing the distro
|
8 years ago |
|
sinthuja
|
f551b4447a
|
Removing the distribution dir.
|
8 years ago |
|
sinthuja
|
81030f5d22
|
Removing old modules, and creating empty skeleton for broker and distro.
|
8 years ago |
|
sinthuja
|
0e959da763
|
First cut of iot-pack restructuring.
|
8 years ago |
Ruwan
|
1139b7f31c
|
Merge pull request #198 from ayyoob/IoTS-1.0.0
disabled mobile feature installation
|
8 years ago |
|
ayyoob
|
4a4412b927
|
disabled mobile feature installation
|
8 years ago |
|
Ayyoob Hamza
|
42fc5b1f4b
|
Merge pull request #197 from ruwany/merge-prod
removing common/base modules & refactoring
|
8 years ago |
|
Ace
|
2e15f2767d
|
merging with upstream
|
8 years ago |
|
Ace
|
c9c717af1c
|
removing common/base modules & refactoring
|
8 years ago |
|
sinthuja
|
8f7529a106
|
Merge pull request #196 from GPrathap/IoTS-1.0.0
removing MB related features
|
8 years ago |
|
GPrathap
|
ffa6a9cf59
|
removing mb features and related configurations
|
8 years ago |
|
GPrathap
|
56ec6b1e96
|
removing cdmf devicetype archetype. This has been moved to https://github.com/wso2/carbon-device-mgt-maven-plugin
|
8 years ago |
|
charitha
|
7562734282
|
Merge remote-tracking branch 'upstream/IoTS-1.0.0' into IoTS-1.0.0
|
8 years ago |
|
sinthuja
|
b86694cc93
|
Merge remote-tracking branch 'origin/IoTS-1.0.0' into IoTS-1.0.0-fresh
|
8 years ago |
|
sinthuja
|
c992e68ec7
|
Revert: removing MB references from IOTserver pack (1fe9a80102)
|
8 years ago |
|
sinthuja
|
52a584caa2
|
changing carbon analytics common version to 5.1.4.
|
8 years ago |
|
charitha
|
be5d946794
|
Merge remote-tracking branch 'upstream/IoTS-1.0.0' into IoTS-1.0.0
# Conflicts:
# modules/distribution/src/samples-deployer.xml
|
8 years ago |
|
sinthuja
|
4ff880f57f
|
Merge pull request #192 from hastef88/removeMBReferences
removing MB references from IOTserver pack
|
8 years ago |
|
sinthuja
|
7424caa74f
|
Merge branch 'removeMBReferences' of https://github.com/hastef88/product-iots into IoTS-1.0.0-fresh
|
8 years ago |
|
Susinda Perera
|
8a59ae4f68
|
Merge pull request #195 from susinda/master
Adding certMgt to dbscripts folder
|
8 years ago |
