From ff211708a1f673bbfc215f49d45c788e74057a45 Mon Sep 17 00:00:00 2001 From: Harshan Liyanage Date: Tue, 9 May 2017 19:07:35 +0530 Subject: [PATCH] Added application-mgt features. --- .../pom.xml | 3 +- .../pom.xml | 4 +- components/application-mgt/pom.xml | 4 +- .../pom.xml | 122 ++++++++++++++++++ .../src/main/resources/build.properties | 1 + .../src/main/resources/p2.inf | 3 + .../pom.xml | 87 +++++++++++++ .../pom.xml | 118 +++++++++++++++++ .../src/main/resources/build.properties | 1 + .../application-mgt-datasources.xml | 47 +++++++ .../dbscripts/cdm/application-mgt/h2.sql | 44 +++++++ .../dbscripts/cdm/application-mgt/mssql.sql | 44 +++++++ .../dbscripts/cdm/application-mgt/mysql.sql | 44 +++++++ .../dbscripts/cdm/application-mgt/oracle.sql | 44 +++++++ .../cdm/application-mgt/postgresql.sql | 44 +++++++ .../src/main/resources/p2.inf | 3 + features/application-mgt/pom.xml | 42 ++++++ pom.xml | 26 +++- 18 files changed, 675 insertions(+), 6 deletions(-) create mode 100644 features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/pom.xml create mode 100644 features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/src/main/resources/build.properties create mode 100644 features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/src/main/resources/p2.inf create mode 100644 features/application-mgt/org.wso2.carbon.device.application.mgt.feature/pom.xml create mode 100644 features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/pom.xml create mode 100644 features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/build.properties create mode 100644 features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf/datasources/application-mgt-datasources.xml create mode 100644 features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql create mode 100644 features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mssql.sql create mode 100644 features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mysql.sql create mode 100644 features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/oracle.sql create mode 100644 features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/postgresql.sql create mode 100644 features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/p2.inf create mode 100644 features/application-mgt/pom.xml diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.api/pom.xml b/components/application-mgt/org.wso2.carbon.device.application.mgt.api/pom.xml index 7332606e59..40747d1341 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.api/pom.xml +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.api/pom.xml @@ -22,12 +22,13 @@ application-mgt org.wso2.carbon.devicemgt - 2.0.45-SNAPSHOT + 2.0.63-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.application.mgt.api + 2.0.63-SNAPSHOT war WSO2 Carbon - Mobile Application Management API WSO2 Carbon - Mobile Application Management API diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/pom.xml b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/pom.xml index 5a7933cd2d..46a9c6e7dc 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/pom.xml +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/pom.xml @@ -21,13 +21,13 @@ org.wso2.carbon.devicemgt application-mgt - 2.0.45-SNAPSHOT + 2.0.63-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.application.mgt.core - 2.0.45-SNAPSHOT + 2.0.63-SNAPSHOT bundle WSO2 Carbon - Application Management Core WSO2 Carbon - Application Management Core diff --git a/components/application-mgt/pom.xml b/components/application-mgt/pom.xml index 1823e25fbb..158a54d665 100644 --- a/components/application-mgt/pom.xml +++ b/components/application-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 2.0.45-SNAPSHOT + 2.0.63-SNAPSHOT ../../pom.xml @@ -30,7 +30,7 @@ application-mgt org.wso2.carbon.devicemgt pom - WSO2 Carbon - Device Application Management Component + WSO2 Carbon - Application Management Component WSO2 Carbon - Application Management Component http://wso2.org diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/pom.xml b/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/pom.xml new file mode 100644 index 0000000000..968740c38b --- /dev/null +++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/pom.xml @@ -0,0 +1,122 @@ + + + + + + + org.wso2.carbon.devicemgt + application-mgt-feature + 2.0.63-SNAPSHOT + ../pom.xml + + + 4.0.0 + org.wso2.carbon.device.application.mgt.api.feature + 2.0.63-SNAPSHOT + pom + WSO2 Carbon - Application Management API Feature + http://wso2.org + This feature contains the APIs required for Application Management console UI + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy + package + + copy + + + + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.application.mgt.api + + ${project.version} + war + true + + ${project.build.directory}/maven-shared-archive-resources/webapps + + api#application-mgt#v1.0.war + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + + + copy-resources + generate-resources + + copy-resources + + + src/main/resources + + + resources + + build.properties + p2.inf + + + + + + + + + org.wso2.maven + carbon-p2-plugin + + + p2-feature-generation + package + + p2-feature-gen + + + org.wso2.carbon.device.mgt.api + ../../../features/etc/feature.properties + + + + org.wso2.carbon.p2.category.type:server + + org.eclipse.equinox.p2.type.group:false + + + + + + + + + + + diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/src/main/resources/build.properties b/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/src/main/resources/build.properties new file mode 100644 index 0000000000..9c86577d76 --- /dev/null +++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/src/main/resources/build.properties @@ -0,0 +1 @@ +custom = true diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/src/main/resources/p2.inf b/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..2a0bb7342f --- /dev/null +++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/src/main/resources/p2.inf @@ -0,0 +1,3 @@ +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.application.mgt.api_${feature.version}/webapps/api#application-mgt#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#application-mgt#v1.0.war,overwrite:true);\ \ No newline at end of file diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.feature/pom.xml b/features/application-mgt/org.wso2.carbon.device.application.mgt.feature/pom.xml new file mode 100644 index 0000000000..74b8303137 --- /dev/null +++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.feature/pom.xml @@ -0,0 +1,87 @@ + + + + + + + org.wso2.carbon.devicemgt + application-mgt-feature + 2.0.63-SNAPSHOT + ../pom.xml + + + 4.0.0 + org.wso2.carbon.device.application.mgt.feature + 2.0.63-SNAPSHOT + pom + WSO2 Carbon - Application Management Aggregate Feature + http://wso2.org + This feature contains all the bundles required for application management related functionalities + + + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.application.mgt.server.feature + zip + + + javax.servlet.jsp + javax.servlet.jsp-api + + + org.wso2.orbit.org.scannotation + scannotation + + + + + + + org.wso2.maven + carbon-p2-plugin + + + p2-feature-generation + package + + p2-feature-gen + + + org.wso2.carbon.device.application.mgt + ../../../etc/feature.properties + + + org.eclipse.equinox.p2.type.group:true + + + + org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.server.feature:${carbon.device.mgt.version} + + + javax.servlet.jsp:javax.servlet.jsp-api + org.wso2.orbit.org.scannotation:scannotation:${scannotation.version} + + + + + + + + + diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/pom.xml b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/pom.xml new file mode 100644 index 0000000000..c69b51b1c4 --- /dev/null +++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/pom.xml @@ -0,0 +1,118 @@ + + + + + + + org.wso2.carbon.devicemgt + application-mgt-feature + 2.0.63-SNAPSHOT + ../pom.xml + + + 4.0.0 + org.wso2.carbon.device.application.mgt.server.feature + pom + 2.0.63-SNAPSHOT + WSO2 Carbon - Application Management Server Feature + http://wso2.org + This feature contains the core bundles required for Back-end Application Management functionality + + + + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.application.mgt.core + + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.application.mgt.api.feature + zip + + + + + + + maven-resources-plugin + 2.6 + + + copy-resources + generate-resources + + copy-resources + + + src/main/resources + + + resources + + build.properties + p2.inf + + + + + + + + + org.wso2.maven + carbon-p2-plugin + ${carbon.p2.plugin.version} + + + p2-feature-generation + package + + p2-feature-gen + + + org.wso2.carbon.device.application.mgt.server + ../../../features/etc/feature.properties + + + org.wso2.carbon.p2.category.type:server + org.eclipse.equinox.p2.type.group:false + + + + + org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.api.feature:${carbon.device.mgt.version} + + + + + org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.core:${carbon.device.mgt.version} + + + + + + org.wso2.carbon.core.server:${carbon.kernel.version} + + + + + + + + diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/build.properties b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/build.properties new file mode 100644 index 0000000000..9c86577d76 --- /dev/null +++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/build.properties @@ -0,0 +1 @@ +custom = true diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf/datasources/application-mgt-datasources.xml b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf/datasources/application-mgt-datasources.xml new file mode 100644 index 0000000000..e773738c3b --- /dev/null +++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf/datasources/application-mgt-datasources.xml @@ -0,0 +1,47 @@ + + + + + org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader + + + + + APPM_DS + The datasource used for CDM Application Management + + jdbc/APPM_DS + + + + jdbc:h2:repository/database/WSO2DM_APPM_DB;DB_CLOSE_ON_EXIT=FALSE + wso2carbon + wso2carbon + org.h2.Driver + 50 + 60000 + true + SELECT 1 + 30000 + + + + + + diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql new file mode 100644 index 0000000000..d512eafa36 --- /dev/null +++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql @@ -0,0 +1,44 @@ +CREATE TABLE IF NOT EXISTS APPM_APPLICATION_TYPE ( + ID INTEGER AUTO_INCREMENT, + NAME VARCHAR (255), + DESCRIPTION TEXT, + CODE VARCHAR (255), + PARAMTERS LONGTEXT, + PRIMARY KEY (ID) +)ENGINE INNODB; + +CREATE TABLE IF NOT EXISTS APPM_APPLICATION_CATEGORY ( + ID INTEGER AUTO_INCREMENT, + NAME VARCHAR (255), + DESCRIPTION TEXT, + PRIMARY KEY (ID) +)ENGINE INNODB; + + +CREATE TABLE IF NOT EXISTS APPM_APPLICATION ( + ID INTEGER AUTO_INCREMENT, + NAME VARCHAR (255), + UUID VARCHAR (255), + DESCRIPTION MEDIUMTEXT, + ICON_NAME VARCHAR (255), + BANNER_NAME VARCHAR (255), + VIDEO_NAME VARCHAR (255), + SCREENSHOTS TEXT, + TAGS TEXT, + APPLICATION_TYPE_ID INTEGER, + CATEGORY_ID INTEGER, + CREATED_AT DATETIME, + MODIFIED_AT DATETIME, + PRIMARY KEY (ID), + FOREIGN KEY (CATEGORY_ID) REFERENCES APPM_APPLICATION_CATEGORY(ID), + FOREIGN KEY (APPLICATION_TYPE_ID) REFERENCES APPM_APPLICATION_TYPE(ID) +)ENGINE INNODB; + + +CREATE TABLE IF NOT EXISTS APPM_APPLICATION_PROPERTIES ( + PROP_KEY VARCHAR (255), + PROP_VAL MEDIUMTEXT, + APPLICATION_ID INTEGER, + PRIMARY KEY (APPLICATION_ID, PROP_KEY), + FOREIGN KEY (APPLICATION_ID) REFERENCES APPM_APPLICATION(ID) +)ENGINE INNODB; \ No newline at end of file diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mssql.sql b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mssql.sql new file mode 100644 index 0000000000..d512eafa36 --- /dev/null +++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mssql.sql @@ -0,0 +1,44 @@ +CREATE TABLE IF NOT EXISTS APPM_APPLICATION_TYPE ( + ID INTEGER AUTO_INCREMENT, + NAME VARCHAR (255), + DESCRIPTION TEXT, + CODE VARCHAR (255), + PARAMTERS LONGTEXT, + PRIMARY KEY (ID) +)ENGINE INNODB; + +CREATE TABLE IF NOT EXISTS APPM_APPLICATION_CATEGORY ( + ID INTEGER AUTO_INCREMENT, + NAME VARCHAR (255), + DESCRIPTION TEXT, + PRIMARY KEY (ID) +)ENGINE INNODB; + + +CREATE TABLE IF NOT EXISTS APPM_APPLICATION ( + ID INTEGER AUTO_INCREMENT, + NAME VARCHAR (255), + UUID VARCHAR (255), + DESCRIPTION MEDIUMTEXT, + ICON_NAME VARCHAR (255), + BANNER_NAME VARCHAR (255), + VIDEO_NAME VARCHAR (255), + SCREENSHOTS TEXT, + TAGS TEXT, + APPLICATION_TYPE_ID INTEGER, + CATEGORY_ID INTEGER, + CREATED_AT DATETIME, + MODIFIED_AT DATETIME, + PRIMARY KEY (ID), + FOREIGN KEY (CATEGORY_ID) REFERENCES APPM_APPLICATION_CATEGORY(ID), + FOREIGN KEY (APPLICATION_TYPE_ID) REFERENCES APPM_APPLICATION_TYPE(ID) +)ENGINE INNODB; + + +CREATE TABLE IF NOT EXISTS APPM_APPLICATION_PROPERTIES ( + PROP_KEY VARCHAR (255), + PROP_VAL MEDIUMTEXT, + APPLICATION_ID INTEGER, + PRIMARY KEY (APPLICATION_ID, PROP_KEY), + FOREIGN KEY (APPLICATION_ID) REFERENCES APPM_APPLICATION(ID) +)ENGINE INNODB; \ No newline at end of file diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mysql.sql b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mysql.sql new file mode 100644 index 0000000000..d512eafa36 --- /dev/null +++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mysql.sql @@ -0,0 +1,44 @@ +CREATE TABLE IF NOT EXISTS APPM_APPLICATION_TYPE ( + ID INTEGER AUTO_INCREMENT, + NAME VARCHAR (255), + DESCRIPTION TEXT, + CODE VARCHAR (255), + PARAMTERS LONGTEXT, + PRIMARY KEY (ID) +)ENGINE INNODB; + +CREATE TABLE IF NOT EXISTS APPM_APPLICATION_CATEGORY ( + ID INTEGER AUTO_INCREMENT, + NAME VARCHAR (255), + DESCRIPTION TEXT, + PRIMARY KEY (ID) +)ENGINE INNODB; + + +CREATE TABLE IF NOT EXISTS APPM_APPLICATION ( + ID INTEGER AUTO_INCREMENT, + NAME VARCHAR (255), + UUID VARCHAR (255), + DESCRIPTION MEDIUMTEXT, + ICON_NAME VARCHAR (255), + BANNER_NAME VARCHAR (255), + VIDEO_NAME VARCHAR (255), + SCREENSHOTS TEXT, + TAGS TEXT, + APPLICATION_TYPE_ID INTEGER, + CATEGORY_ID INTEGER, + CREATED_AT DATETIME, + MODIFIED_AT DATETIME, + PRIMARY KEY (ID), + FOREIGN KEY (CATEGORY_ID) REFERENCES APPM_APPLICATION_CATEGORY(ID), + FOREIGN KEY (APPLICATION_TYPE_ID) REFERENCES APPM_APPLICATION_TYPE(ID) +)ENGINE INNODB; + + +CREATE TABLE IF NOT EXISTS APPM_APPLICATION_PROPERTIES ( + PROP_KEY VARCHAR (255), + PROP_VAL MEDIUMTEXT, + APPLICATION_ID INTEGER, + PRIMARY KEY (APPLICATION_ID, PROP_KEY), + FOREIGN KEY (APPLICATION_ID) REFERENCES APPM_APPLICATION(ID) +)ENGINE INNODB; \ No newline at end of file diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/oracle.sql b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/oracle.sql new file mode 100644 index 0000000000..d512eafa36 --- /dev/null +++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/oracle.sql @@ -0,0 +1,44 @@ +CREATE TABLE IF NOT EXISTS APPM_APPLICATION_TYPE ( + ID INTEGER AUTO_INCREMENT, + NAME VARCHAR (255), + DESCRIPTION TEXT, + CODE VARCHAR (255), + PARAMTERS LONGTEXT, + PRIMARY KEY (ID) +)ENGINE INNODB; + +CREATE TABLE IF NOT EXISTS APPM_APPLICATION_CATEGORY ( + ID INTEGER AUTO_INCREMENT, + NAME VARCHAR (255), + DESCRIPTION TEXT, + PRIMARY KEY (ID) +)ENGINE INNODB; + + +CREATE TABLE IF NOT EXISTS APPM_APPLICATION ( + ID INTEGER AUTO_INCREMENT, + NAME VARCHAR (255), + UUID VARCHAR (255), + DESCRIPTION MEDIUMTEXT, + ICON_NAME VARCHAR (255), + BANNER_NAME VARCHAR (255), + VIDEO_NAME VARCHAR (255), + SCREENSHOTS TEXT, + TAGS TEXT, + APPLICATION_TYPE_ID INTEGER, + CATEGORY_ID INTEGER, + CREATED_AT DATETIME, + MODIFIED_AT DATETIME, + PRIMARY KEY (ID), + FOREIGN KEY (CATEGORY_ID) REFERENCES APPM_APPLICATION_CATEGORY(ID), + FOREIGN KEY (APPLICATION_TYPE_ID) REFERENCES APPM_APPLICATION_TYPE(ID) +)ENGINE INNODB; + + +CREATE TABLE IF NOT EXISTS APPM_APPLICATION_PROPERTIES ( + PROP_KEY VARCHAR (255), + PROP_VAL MEDIUMTEXT, + APPLICATION_ID INTEGER, + PRIMARY KEY (APPLICATION_ID, PROP_KEY), + FOREIGN KEY (APPLICATION_ID) REFERENCES APPM_APPLICATION(ID) +)ENGINE INNODB; \ No newline at end of file diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/postgresql.sql b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/postgresql.sql new file mode 100644 index 0000000000..d512eafa36 --- /dev/null +++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/postgresql.sql @@ -0,0 +1,44 @@ +CREATE TABLE IF NOT EXISTS APPM_APPLICATION_TYPE ( + ID INTEGER AUTO_INCREMENT, + NAME VARCHAR (255), + DESCRIPTION TEXT, + CODE VARCHAR (255), + PARAMTERS LONGTEXT, + PRIMARY KEY (ID) +)ENGINE INNODB; + +CREATE TABLE IF NOT EXISTS APPM_APPLICATION_CATEGORY ( + ID INTEGER AUTO_INCREMENT, + NAME VARCHAR (255), + DESCRIPTION TEXT, + PRIMARY KEY (ID) +)ENGINE INNODB; + + +CREATE TABLE IF NOT EXISTS APPM_APPLICATION ( + ID INTEGER AUTO_INCREMENT, + NAME VARCHAR (255), + UUID VARCHAR (255), + DESCRIPTION MEDIUMTEXT, + ICON_NAME VARCHAR (255), + BANNER_NAME VARCHAR (255), + VIDEO_NAME VARCHAR (255), + SCREENSHOTS TEXT, + TAGS TEXT, + APPLICATION_TYPE_ID INTEGER, + CATEGORY_ID INTEGER, + CREATED_AT DATETIME, + MODIFIED_AT DATETIME, + PRIMARY KEY (ID), + FOREIGN KEY (CATEGORY_ID) REFERENCES APPM_APPLICATION_CATEGORY(ID), + FOREIGN KEY (APPLICATION_TYPE_ID) REFERENCES APPM_APPLICATION_TYPE(ID) +)ENGINE INNODB; + + +CREATE TABLE IF NOT EXISTS APPM_APPLICATION_PROPERTIES ( + PROP_KEY VARCHAR (255), + PROP_VAL MEDIUMTEXT, + APPLICATION_ID INTEGER, + PRIMARY KEY (APPLICATION_ID, PROP_KEY), + FOREIGN KEY (APPLICATION_ID) REFERENCES APPM_APPLICATION(ID) +)ENGINE INNODB; \ No newline at end of file diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/p2.inf b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..51c8838ca6 --- /dev/null +++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/p2.inf @@ -0,0 +1,3 @@ +instructions.configure = \ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.application.mgt.server_${feature.version}/conf/datasources/application-mgt-datasources.xml,target:${installFolder}/../../conf/datasources/application-mgt-datasources.xml,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.application.mgt.server_${feature.version}/dbscripts/cdm/application-mgt,target:${installFolder}/../../../dbscripts/cdm/application-mgt,overwrite:true);\ \ No newline at end of file diff --git a/features/application-mgt/pom.xml b/features/application-mgt/pom.xml new file mode 100644 index 0000000000..b103aa5ecc --- /dev/null +++ b/features/application-mgt/pom.xml @@ -0,0 +1,42 @@ + + + + + + + org.wso2.carbon.devicemgt + carbon-devicemgt + 2.0.63-SNAPSHOT + ../../pom.xml + + + 4.0.0 + org.wso2.carbon.devicemgt + application-mgt-feature + 2.0.63-SNAPSHOT + pom + WSO2 Carbon - Application Management Feature + http://wso2.org + + + org.wso2.carbon.device.application.mgt.api.feature + org.wso2.carbon.device.application.mgt.feature + org.wso2.carbon.device.application.mgt.server.feature + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3e4403169f..685d253959 100644 --- a/pom.xml +++ b/pom.xml @@ -39,13 +39,14 @@ components/device-mgt-extensions components/identity-extensions components/apimgt-extensions + components/application-mgt components/policy-mgt components/certificate-mgt - components/application-mgt components/webapp-authenticator-framework components/email-sender features/device-mgt features/apimgt-extensions + features/application-mgt features/policy-mgt features/webapp-authenticator-framework features/certificate-mgt @@ -176,6 +177,11 @@ org.wso2.carbon.device.application.mgt.core ${carbon.device.mgt.version} + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.application.mgt.api + ${carbon.device.mgt.version} + org.wso2.carbon.devicemgt org.wso2.carbon.policy.mgt.common @@ -328,6 +334,24 @@ org.wso2.carbon.apimgt.handlers ${carbon.device.mgt.version} + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.application.mgt.server.feature + zip + ${carbon.device.mgt.version} + + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.application.mgt.api.feature + zip + ${carbon.device.mgt.version} + + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.application.mgt.feature + zip + ${carbon.device.mgt.version} +