charithag
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins

Browse Source
revert-dabc3590
Rasika Perera 8 years ago
parent 91cc0baaf5 86327ab870
commit 07984e4b6e
6 changed files with 179 additions and 170 deletions
Show Stats Download Patch File Download Diff File

1
components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.extension/pom.xml
Unescape View File

@ -53,5 +53,4 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

4
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/pom.xml
Unescape View File

@ -35,6 +35,10 @@
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId> <artifactId>maven-scr-plugin</artifactId>

5
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/gcm/GCMUtil.java
Unescape View File

@ -27,6 +27,7 @@ import org.wso2.carbon.device.mgt.common.DeviceManagementException;
import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry; import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry;
import org.wso2.carbon.device.mgt.common.configuration.mgt.TenantConfiguration; import org.wso2.carbon.device.mgt.common.configuration.mgt.TenantConfiguration;
import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService; import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
import org.wso2.carbon.device.mgt.mobile.impl.android.AndroidDeviceManagementService;
import org.wso2.carbon.device.mgt.mobile.impl.android.util.AndroidPluginConstants; import org.wso2.carbon.device.mgt.mobile.impl.android.util.AndroidPluginConstants;
import org.wso2.carbon.device.mgt.mobile.internal.MobileDeviceManagementDataHolder; import org.wso2.carbon.device.mgt.mobile.internal.MobileDeviceManagementDataHolder;
@ -153,12 +154,12 @@ public class GCMUtil {
} }
public static String getConfigurationProperty(String property) { public static String getConfigurationProperty(String property) {
DeviceManagementService androidDMService = MobileDeviceManagementDataHolder.getInstance(). DeviceManagementService androidDMService = new AndroidDeviceManagementService();
getAndroidDeviceManagementService();
try { try {
//Get the TenantConfiguration from cache if not we'll get it from DM service //Get the TenantConfiguration from cache if not we'll get it from DM service
TenantConfiguration tenantConfiguration = getTenantConfigurationFromCache(); TenantConfiguration tenantConfiguration = getTenantConfigurationFromCache();
if (tenantConfiguration == null) { if (tenantConfiguration == null) {
androidDMService.init();
tenantConfiguration = androidDMService.getDeviceManager().getConfiguration(); tenantConfiguration = androidDMService.getDeviceManager().getConfiguration();
if (tenantConfiguration != null) { if (tenantConfiguration != null) {
addTenantConfigurationToCache(tenantConfiguration); addTenantConfigurationToCache(tenantConfiguration);

327
features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.adapter.feature/pom.xml
Unescape View File

@ -18,164 +18,179 @@
~ under the License. ~ under the License.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId> <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>iot-base-plugin-feature</artifactId> <artifactId>iot-base-plugin-feature</artifactId>
<version>2.1.1-SNAPSHOT</version> <version>2.1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.device.mgt.iot.adapter.feature</artifactId> <artifactId>org.wso2.carbon.device.mgt.iot.adapter.feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>2.1.1-SNAPSHOT</version> <version>2.1.1-SNAPSHOT</version>
<name>WSO2 Carbon - IoT Device Management Feature</name> <name>WSO2 Carbon - IoT Device Management Feature</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>
<description>This feature contains the adapter bundles required for IoT Server</description> <description>This feature contains the adapter bundles required for IoT Server</description>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId> <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>org.wso2.carbon.device.mgt.iot.output.adapter.mqtt</artifactId> <artifactId>org.wso2.carbon.device.mgt.iot.output.adapter.mqtt</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId> <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>org.wso2.carbon.device.mgt.iot.output.adapter.xmpp</artifactId> <artifactId>org.wso2.carbon.device.mgt.iot.output.adapter.xmpp</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId> <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>org.wso2.carbon.device.mgt.iot.output.adapter.ui</artifactId> <artifactId>org.wso2.carbon.device.mgt.iot.output.adapter.ui</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId> <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>org.wso2.carbon.device.mgt.iot.input.adapter.extension</artifactId> <artifactId>org.wso2.carbon.device.mgt.iot.input.adapter.extension</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId> <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>org.wso2.carbon.device.mgt.iot.input.adapter.http</artifactId> <artifactId>org.wso2.carbon.device.mgt.iot.input.adapter.http</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId> <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>org.wso2.carbon.device.mgt.iot.input.adapter.mqtt</artifactId> <artifactId>org.wso2.carbon.device.mgt.iot.input.adapter.mqtt</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId> <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>org.wso2.carbon.device.mgt.iot.input.adapter.xmpp</artifactId> <artifactId>org.wso2.carbon.device.mgt.iot.input.adapter.xmpp</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>copy</id> <id>copy</id>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>copy</goal> <goal>copy</goal>
</goals> </goals>
<configuration> <configuration>
<artifactItems> <artifactItems>
<artifactItem> <artifactItem>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId> <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>org.wso2.carbon.device.mgt.iot.output.adapter.ui.endpoint</artifactId> <artifactId>org.wso2.carbon.device.mgt.iot.output.adapter.ui.endpoint</artifactId>
<version>${carbon.devicemgt.plugins.version}</version> <version>${carbon.devicemgt.plugins.version}</version>
<type>war</type> <type>war</type>
<overWrite>true</overWrite> <overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/maven-shared-archive-resources/webapps/</outputDirectory> <outputDirectory>
<destFileName>secured-outputui.war</destFileName> ${project.build.directory}/maven-shared-archive-resources/webapps/
</artifactItem> </outputDirectory>
</artifactItems> <destFileName>secured-outputui.war</destFileName>
</configuration> </artifactItem>
</execution> </artifactItems>
</executions> </configuration>
</plugin> </execution>
<plugin> </executions>
<artifactId>maven-resources-plugin</artifactId> </plugin>
<executions> <plugin>
<execution> <artifactId>maven-resources-plugin</artifactId>
<id>copy-resources</id> <executions>
<phase>generate-resources</phase> <execution>
<goals> <id>copy-resources</id>
<goal>copy-resources</goal> <phase>generate-resources</phase>
</goals> <goals>
<configuration> <goal>copy-resources</goal>
<outputDirectory>src/main/resources</outputDirectory> </goals>
<resources> <configuration>
<resource> <outputDirectory>src/main/resources</outputDirectory>
<directory>resources</directory> <resources>
<includes> <resource>
<include>build.properties</include> <directory>resources</directory>
<include>p2.inf</include> <includes>
</includes> <include>build.properties</include>
</resource> <include>p2.inf</include>
</resources> </includes>
</configuration> </resource>
</execution> </resources>
</executions> </configuration>
</plugin> </execution>
<plugin> </executions>
<groupId>org.wso2.maven</groupId> </plugin>
<artifactId>carbon-p2-plugin</artifactId> <plugin>
<version>${carbon.p2.plugin.version}</version> <groupId>org.wso2.maven</groupId>
<executions> <artifactId>carbon-p2-plugin</artifactId>
<execution> <version>${carbon.p2.plugin.version}</version>
<id>p2-feature-generation</id> <executions>
<phase>package</phase> <execution>
<goals> <id>p2-feature-generation</id>
<goal>p2-feature-gen</goal> <phase>package</phase>
</goals> <goals>
<configuration> <goal>p2-feature-gen</goal>
<id>org.wso2.carbon.device.mgt.iot.adapter</id> </goals>
<propertiesFile>../../../features/etc/feature.properties</propertiesFile> <configuration>
<adviceFile> <id>org.wso2.carbon.device.mgt.iot.adapter</id>
<properties> <propertiesFile>../../../features/etc/feature.properties</propertiesFile>
<propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef> <adviceFile>
<propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef> <properties>
</properties> <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
</adviceFile> <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
<bundles> </properties>
<bundleDef> </adviceFile>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.output.adapter.mqtt:${carbon.devicemgt.plugins.version} <bundles>
</bundleDef> <bundleDef>
<bundleDef> org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.output.adapter.mqtt:${carbon.devicemgt.plugins.version}
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.output.adapter.xmpp:${carbon.devicemgt.plugins.version} </bundleDef>
</bundleDef> <bundleDef>
<bundleDef> org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.output.adapter.xmpp:${carbon.devicemgt.plugins.version}
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.input.adapter.extension:${carbon.devicemgt.plugins.version} </bundleDef>
</bundleDef> <bundleDef>
<bundleDef> org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.input.adapter.extension:${carbon.devicemgt.plugins.version}
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.input.adapter.http:${carbon.devicemgt.plugins.version} </bundleDef>
</bundleDef> <bundleDef>
<bundleDef> org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.input.adapter.http:${carbon.devicemgt.plugins.version}
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.input.adapter.mqtt:${carbon.devicemgt.plugins.version} </bundleDef>
</bundleDef> <bundleDef>
<bundleDef> org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.input.adapter.mqtt:${carbon.devicemgt.plugins.version}
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.input.adapter.xmpp:${carbon.devicemgt.plugins.version} </bundleDef>
</bundleDef> <bundleDef>
<bundleDef> org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.input.adapter.xmpp:${carbon.devicemgt.plugins.version}
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.output.adapter.ui:${carbon.devicemgt.plugins.version} </bundleDef>
</bundleDef> <bundleDef>
</bundles> org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.output.adapter.ui:${carbon.devicemgt.plugins.version}
<importFeatures> </bundleDef>
<importFeatureDef> <bundleDef>
org.wso2.carbon.event.output.adapter.server:${carbon.analytics.common.version} org.eclipse.paho:org.eclipse.paho.client.mqttv3:${eclipse.paho.version}
</importFeatureDef> </bundleDef>
<importFeatureDef> <bundleDef>
org.wso2.carbon.event.input.adapter.server:${carbon.analytics.common.version} org.igniterealtime.smack.wso2:smack:${smack.wso2.version}
</importFeatureDef> </bundleDef>
<importFeatureDef> <bundleDef>
org.wso2.carbon.identity.jwt.client.extension:${carbon.devicemgt.version} org.igniterealtime.smack.wso2:smackx:${smackx.wso2.version}
</importFeatureDef> </bundleDef>
</importFeatures> <bundleDef>
</configuration> org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.stub:${carbon.identity.version}
</execution> </bundleDef>
</executions> </bundles>
</plugin> <importFeatures>
</plugins> <importFeatureDef>
</build> org.wso2.carbon.event.output.adapter.server:${carbon.analytics.common.version}
</importFeatureDef>
<importFeatureDef>
org.wso2.carbon.event.input.adapter.server:${carbon.analytics.common.version}
</importFeatureDef>
<importFeatureDef>
org.wso2.carbon.identity.jwt.client.extension:${carbon.devicemgt.version}
</importFeatureDef>
</importFeatures>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project> </project>

9
features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.feature/pom.xml
Unescape View File

@ -137,15 +137,6 @@
<bundleDef> <bundleDef>
org.json.wso2:json:${commons-json.version} org.json.wso2:json:${commons-json.version}
</bundleDef> </bundleDef>
<bundleDef>
org.eclipse.paho:org.eclipse.paho.client.mqttv3:${eclipse.paho.version}
</bundleDef>
<bundleDef>
org.igniterealtime.smack.wso2:smack:${smack.wso2.version}
</bundleDef>
<bundleDef>
org.igniterealtime.smack.wso2:smackx:${smackx.wso2.version}
</bundleDef>
</bundles> </bundles>
<importFeatures> <importFeatures>
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version} <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}

3
features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/p2.inf
Unescape View File

@ -1,6 +1,5 @@
instructions.configure = \ instructions.configure = \
org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${feature.version}/webapps/mdm-android-agent.war,target:${installFolder}/../../deployment/server/webapps/mdm-android-agent.war,overwrite:true);\
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${feature.version}/webapps/,target:${installFolder}/../../deployment/server/webapps/,overwrite:true);\
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${feature.version}/jaggeryapps/,target:${installFolder}/../../deployment/server/jaggeryapps/,overwrite:true);\ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${feature.version}/jaggeryapps/,target:${installFolder}/../../deployment/server/jaggeryapps/,overwrite:true);\
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${feature.version}/conf/mobile-config.xml,target:${installFolder}/../../conf/mobile-config.xml,overwrite:true);\ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${feature.version}/conf/mobile-config.xml,target:${installFolder}/../../conf/mobile-config.xml,overwrite:true);\
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${feature.version}/dbscripts/plugins/,target:${installFolder}/../../../dbscripts/cdm/plugins/android,overwrite:true);\ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${feature.version}/dbscripts/plugins/,target:${installFolder}/../../../dbscripts/cdm/plugins/android,overwrite:true);\

Write Preview
Loading…
Cancel
Save