community
/
product-iots
10
0
Fork 4
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Few changes on Android Sense

Browse Source
merge-requests/1/head
ayyoob 10 years ago
parent 98dde99da1
commit c50c7b36dc
5 changed files with 45 additions and 129 deletions
Show Stats Download Patch File Download Diff File

90
modules/distribution/pom.xml
Unescape View File

@ -122,89 +122,7 @@
</tasks> </tasks>
</configuration> </configuration>
</execution> </execution>
<!--execution-->
<!-- Creating IOS Mobile Plugin Management schema -->
<!--id>create-ios-mobile-plugin-mgt-schema</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<echo message="########### Create IOS Mobile plugin Management 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}/WSO2MobileIOS_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/cdm/plugins/h2_ios.sql" />
</sql>
<echo message="##################### END ####################" />
</tasks>
</configuration>
</execution-->
<!--execution-->
<!-- Creating Android Mobile Plugin Management schema -->
<!--id>create-mobile-android-plugin-mgt-schema</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<echo message="########### Create ANDROID Mobile plugin Management 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}/WSO2MobileAndroid_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/cdm/plugins/h2_android.sql" />
</sql>
<echo message="##################### END ####################" />
</tasks>
</configuration>
</execution-->
<!--execution-->
<!-- Creating Windows Mobile Plugin Management schema -->
<!--id>create-mobile-windows-plugin-mgt-schema</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<echo message="########### Create WINDOWS Mobile plugin Management 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}/WSO2MobileWindows_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/cdm/plugins/h2_windows.sql" />
</sql>
<echo message="##################### END ####################" />
</tasks>
</configuration>
</execution-->
<execution> <execution>
<!-- Creating IDP Management schema --> <!-- Creating IDP Management schema -->
<id>create-idp-mgt-schema</id> <id>create-idp-mgt-schema</id>
@ -345,7 +263,7 @@
<execution> <execution>
<!-- Creating IOT Management schema --> <!-- Creating IOT Management schema -->
<id>create-android-schema</id> <id>create-android-sense-schema</id>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>run</goal> <goal>run</goal>
@ -357,13 +275,13 @@
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" /> <property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
<property name="userid" value="wso2carbon" /> <property name="userid" value="wso2carbon" />
<property name="password" value="wso2carbon" /> <property name="password" value="wso2carbon" />
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/AndroidDM_DB;DB_CLOSE_ON_EXIT=FALSE" /> <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/AndroidSenseDM_DB;DB_CLOSE_ON_EXIT=FALSE" />
<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue"> <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
<classpath refid="maven.dependency.classpath" /> <classpath refid="maven.dependency.classpath" />
<classpath refid="maven.compile.classpath" /> <classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" /> <classpath refid="maven.runtime.classpath" />
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_android.sql" /> <fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_android_sense.sql" />
</sql> </sql>
<echo message="##################### END ####################" /> <echo message="##################### END ####################" />
</tasks> </tasks>
@ -419,7 +337,7 @@
<classpath refid="maven.compile.classpath" /> <classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" /> <classpath refid="maven.runtime.classpath" />
<!--fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_raspberry.sql" /--> <!--fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_raspberry.sql" /-->
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_digitaldisplay.sql" /> <fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_digital_display.sql" />
</sql> </sql>
<echo message="##################### END ####################" /> <echo message="##################### END ####################" />
</tasks> </tasks>

2
modules/distribution/src/assembly/bin.xml
Unescape View File

@ -280,7 +280,7 @@
<include>devicecloud.war</include> <include>devicecloud.war</include>
<include>firealarm.war</include> <include>firealarm.war</include>
<include>arduino.war</include> <include>arduino.war</include>
<include>android.war</include> <include>android_sense.war</include>
<include>sensebot.war</include> <include>sensebot.war</include>
<include>raspberrypi.war</include> <include>raspberrypi.war</include>
<include>digitaldisplay.war</include> <include>digitaldisplay.war</include>

6
modules/distribution/src/repository/conf/datasources/master-datasources.xml
Unescape View File

@ -141,14 +141,14 @@
</datasource> </datasource>
<datasource> <datasource>
<name>AndroidDM_DS</name> <name>AndroidSenseDM_DB</name>
<description>The datasource used for Android database</description> <description>The datasource used for Android database</description>
<jndiConfig> <jndiConfig>
<name>jdbc/AndroidDM_DB</name> <name>jdbc/AndroidSenseDM_DB</name>
</jndiConfig> </jndiConfig>
<definition type="RDBMS"> <definition type="RDBMS">
<configuration> <configuration>
<url>jdbc:h2:repository/database/AndroidDM_DB;DB_CLOSE_ON_EXIT=FALSE</url> <url>jdbc:h2:repository/database/AndroidSenseDM_DB;DB_CLOSE_ON_EXIT=FALSE</url>
<username>wso2carbon</username> <username>wso2carbon</username>
<password>wso2carbon</password> <password>wso2carbon</password>
<driverClassName>org.h2.Driver</driverClassName> <driverClassName>org.h2.Driver</driverClassName>

72
modules/distribution/user-api-publisher-config.xml
Unescape View File

@ -16,39 +16,39 @@
~ specific language governing permissions and limitations ~ specific language governing permissions and limitations
~ under the License. ~ under the License.
--> -->
<APIPublisherConfig> <!--<APIPublisherConfig>-->
<APIs> <!--<APIs>-->
<API> <!--<API>-->
<Name>appmanager</Name> <!--<Name>appmanager</Name>-->
<Owner>admin</Owner> <!--<Owner>admin</Owner>-->
<Context>/devices</Context> <!--<Context>/devices</Context>-->
<Version>1.0.0</Version> <!--<Version>1.0.0</Version>-->
<Endpoint>http://localhost:9763/test/app</Endpoint> <!--<Endpoint>http://localhost:9763/test/app</Endpoint>-->
<Transports>http,https</Transports> <!--<Transports>http,https</Transports>-->
</API> <!--</API>-->
<API> <!--<API>-->
<Name>enrol</Name> <!--<Name>enrol</Name>-->
<Owner>admin</Owner> <!--<Owner>admin</Owner>-->
<Context>/enroll</Context> <!--<Context>/enroll</Context>-->
<Version>1.0.0</Version> <!--<Version>1.0.0</Version>-->
<Endpoint>http://localhost:9763/cdm-android-api/enrollment</Endpoint> <!--<Endpoint>http://localhost:9763/cdm-android-api/enrollment</Endpoint>-->
<Transports>http,https</Transports> <!--<Transports>http,https</Transports>-->
</API> <!--</API>-->
<API> <!--<API>-->
<Name>license</Name> <!--<Name>license</Name>-->
<Owner>admin</Owner> <!--<Owner>admin</Owner>-->
<Context>/license</Context> <!--<Context>/license</Context>-->
<Version>1.0.0</Version> <!--<Version>1.0.0</Version>-->
<Endpoint>http://localhost:9763/cdm-android-api/devices/license</Endpoint> <!--<Endpoint>http://localhost:9763/cdm-android-api/devices/license</Endpoint>-->
<Transports>http,https</Transports> <!--<Transports>http,https</Transports>-->
</API> <!--</API>-->
<API> <!--<API>-->
<Name>operation</Name> <!--<Name>operation</Name>-->
<Owner>admin</Owner> <!--<Owner>admin</Owner>-->
<Context>/operation</Context> <!--<Context>/operation</Context>-->
<Version>1.0.0</Version> <!--<Version>1.0.0</Version>-->
<Endpoint>http://localhost:9763/cdm-android-ap/operation</Endpoint> <!--<Endpoint>http://localhost:9763/cdm-android-ap/operation</Endpoint>-->
<Transports>http,https</Transports> <!--<Transports>http,https</Transports>-->
</API> <!--</API>-->
</APIs> <!--</APIs>-->
</APIPublisherConfig> <!--</APIPublisherConfig>-->

4
pom.xml
Unescape View File

@ -374,7 +374,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.iot</groupId> <groupId>org.wso2.carbon.iot</groupId>
<artifactId>org.wso2.carbon.device.mgt.iot.android.impl</artifactId> <artifactId>org.wso2.carbon.device.mgt.iot.android.sense.impl</artifactId>
<version>${carbon.iot.device.mgt.version}</version> <version>${carbon.iot.device.mgt.version}</version>
</dependency> </dependency>
<dependency> <dependency>
@ -785,9 +785,7 @@
<orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version> <orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version>
<orbit.tomcat.jdbc.pooling.version>7.0.34.wso2v2</orbit.tomcat.jdbc.pooling.version> <orbit.tomcat.jdbc.pooling.version>7.0.34.wso2v2</orbit.tomcat.jdbc.pooling.version>
<!--MDM android Agent-->
<mdm.android.agent.archetype.version>1.0.0-SNAPSHOT</mdm.android.agent.archetype.version>
<!--CXF properties--> <!--CXF properties-->
<cxf.version>2.6.1</cxf.version> <cxf.version>2.6.1</cxf.version>

Write Preview
Loading…
Cancel
Save