From 2b195618c6aaba95e6e7352b34c78bed9b44aa44 Mon Sep 17 00:00:00 2001 From: prabathabey Date: Wed, 13 May 2015 19:54:23 +0530 Subject: [PATCH 1/2] Making components in carbon-devicemgt repository use Carbon kernel 4.4.0 based dependencies --- pom.xml | 52 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index 66efc3f230..b60609f367 100644 --- a/pom.xml +++ b/pom.xml @@ -1078,29 +1078,40 @@ false + + wso2-staging + WSO2 Staging Repository + http://maven.wso2.org/nexus/content/repositories/orgwso2carbonapimgt-004/ + + true + daily + ignore + + 6.1.1 - 4.3.0 + 4.4.0 1.5.4 1.3 [1.6.1.wso2v11, 1.7.0) 1.6.1.wso2v11 + 1.1.0-wso2v10 1.0.0.Final 1.5.4 - - 0.9.0 - 1.0.0 - 1.2.0 - 1.1.0 - 1.1.0 + + 0.10.0 + 1.3.0 + 1.3.0 + 1.3.0 + 1.3.0 - + 4.3.1 4.3.0 6.8 @@ -1118,32 +1129,31 @@ 7.0.34.wso2v2 - 4.3.1 + 4.4.0 - - 4.3.3 + + 4.4.0 + + 4.4.0 - - 4.3.3 + + 4.4.1 - - 4.3.0 + + 4.4.1 - - 4.3.0 - - 1.1.0-wso2v10 + 1.2.11-wso2v5 [1.2.11.wso2v5, 1.3.0) 1.2.11.wso2v5 - + 0.9.2-SNAPSHOT 4.3.6 - 1.3.1 + 1.4.0 2.6.1 From d76501cf15a2f0e16f4fea5577bc79e984c903b5 Mon Sep 17 00:00:00 2001 From: prabathabey Date: Wed, 13 May 2015 20:14:26 +0530 Subject: [PATCH 2/2] Fixing startup issues caused by not properly updating the Carbon-commons version in the parent pom of carbon-devicemgt repository --- .../src/main/resources/conf/cdm-config.xml | 35 ------------- .../main/resources/conf/license-config.xml | 50 ------------------- .../resources/conf/notification-messages.xml | 32 ------------ .../conf/user-api-publisher-config.xml | 30 ----------- .../src/main/resources/p2.inf | 7 +-- pom.xml | 6 ++- 6 files changed, 5 insertions(+), 155 deletions(-) delete mode 100644 features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/cdm-config.xml delete mode 100644 features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/license-config.xml delete mode 100644 features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/notification-messages.xml delete mode 100644 features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/user-api-publisher-config.xml diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/cdm-config.xml b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/cdm-config.xml deleted file mode 100644 index 0991207a54..0000000000 --- a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/cdm-config.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - jdbc/DM_DS - - - - 8 - 100 - 20 - 1000 - - - - diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/license-config.xml b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/license-config.xml deleted file mode 100644 index e182e58bb9..0000000000 --- a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/license-config.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - wso2 - android - 1.0.0 - 1.0.0 - 01-01-2014 - 31-12-2035 - - - - wso2 - ios - 1.0.0 - 1.0.0 - 01-01-2014 - 31-12-2035 - - - - wso2 - windows - 1.0.0 - 1.0.0 - 01-01-2014 - 31-12-2035 - - - - \ No newline at end of file diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/notification-messages.xml b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/notification-messages.xml deleted file mode 100644 index 563b4a58c0..0000000000 --- a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/notification-messages.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - -
Dear {title} {user-name},
- You have been registered to the WSO2 MDM. Below is the link to enroll. - {downloadUrl} -
-Best Regards, -WSO2 Carbon Team -http://www.wso2.com -
- Enrol your device with WSO2 MDM -
-
\ No newline at end of file diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/user-api-publisher-config.xml b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/user-api-publisher-config.xml deleted file mode 100644 index 3221092ae9..0000000000 --- a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/user-api-publisher-config.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - appmanager - admin - enrollment - 1.0.0 - http://localhost:9763/ - http,https - - - diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/p2.inf b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/p2.inf index 36ac4e31ef..a7f67523c6 100644 --- a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/p2.inf +++ b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/p2.inf @@ -1,7 +1,2 @@ instructions.configure = \ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/conf/cdm-config.xml,target:${installFolder}/../../conf/cdm-config.xml,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/conf/notification-messages.xml,target:${installFolder}/../../conf/notification-messages.xml,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/conf/license-config.xml,target:${installFolder}/../../conf/etc/license-config.xml,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/conf/user-api-publisher-config.xml,target:${installFolder}/../../conf/etc/user-api-publisher-config.xml,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/dbscripts/cdm,target:${installFolder}/../../../dbscripts/cdm,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/rxts/license.rxt,target:${installFolder}/../../../repository/resources/rxts/license.rxt,overwrite:true);\ \ No newline at end of file +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/conf/webapp-authenticator-config.xml,target:${installFolder}/../../conf/etc/webapp-authenticator-config.xml,overwrite:true);\ \ No newline at end of file diff --git a/pom.xml b/pom.xml index b60609f367..a325bcaede 100644 --- a/pom.xml +++ b/pom.xml @@ -1150,9 +1150,11 @@ 0.9.2-SNAPSHOT - 4.3.6 - + + 4.4.0 + + 1.4.0