From 7f0558448e3c8db88fea378180cb2ebb4ef33abb Mon Sep 17 00:00:00 2001 From: Geeth Munasinghe Date: Thu, 5 Feb 2015 12:35:47 +0530 Subject: [PATCH 1/5] [maven-release-plugin] prepare release 1.0.0 --- .../org.wso2.carbon.device.mgt.common/pom.xml | 8 +- .../org.wso2.carbon.device.mgt.core/pom.xml | 7 +- components/device-mgt/pom.xml | 8 +- .../org.wso2.carbon.policy.evalutor/pom.xml | 7 +- .../org.wso2.carbon.policy.mgt.common/pom.xml | 7 +- .../org.wso2.carbon.policy.mgt.core/pom.xml | 7 +- components/policy-mgt/pom.xml | 8 +- .../pom.xml | 8 +- features/device-mgt/pom.xml | 8 +- .../pom.xml | 8 +- features/policy-mgt/pom.xml | 8 +- pom.xml | 10 +- product/modules/distribution/pom.xml | 175 +++++++----------- product/modules/integration/pom.xml | 6 +- .../tests-common/admin-clients/pom.xml | 6 +- .../integration-test-utils/pom.xml | 6 +- .../modules/integration/tests-common/pom.xml | 6 +- .../integration/tests-common/ui-pages/pom.xml | 6 +- product/modules/p2-profile-gen/pom.xml | 11 +- product/pom.xml | 6 +- 20 files changed, 125 insertions(+), 191 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml index bce3acf7f14..c450bc99853 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml @@ -1,17 +1,15 @@ - + device-mgt org.wso2.carbon.cdm - 1.0.0-SNAPSHOT + 1.0.0 ../pom.xml 4.0.0 org.wso2.carbon.device.mgt.common - 1.0.0-SNAPSHOT + 1.0.0 bundle WSO2 Carbon - Device Management Commons WSO2 Carbon - Device Management Commons diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml index 3c28bb751eb..d4bd82ade30 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml @@ -17,19 +17,18 @@ ~ under the License. --> - + org.wso2.carbon.cdm device-mgt - 1.0.0-SNAPSHOT + 1.0.0 ../pom.xml 4.0.0 org.wso2.carbon.cdm org.wso2.carbon.device.mgt.core - 1.0.0-SNAPSHOT + 1.0.0 bundle WSO2 Carbon - Device Management Core WSO2 Carbon - Device Management Core diff --git a/components/device-mgt/pom.xml b/components/device-mgt/pom.xml index a368a879f9f..cfe11645462 100644 --- a/components/device-mgt/pom.xml +++ b/components/device-mgt/pom.xml @@ -17,21 +17,19 @@ ~ under the License. --> - + org.wso2.carbon.cdm wso2cdm-parent - 1.0.0-SNAPSHOT + 1.0.0 ../../pom.xml 4.0.0 org.wso2.carbon.cdm device-mgt - 1.0.0-SNAPSHOT + 1.0.0 pom WSO2 Carbon - Device Management Component http://wso2.org diff --git a/components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml index 970248a0258..bd4013f9a14 100644 --- a/components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml @@ -16,19 +16,18 @@ ~ limitations under the License. --> - + org.wso2.carbon.cdm policy-mgt - 1.0.0-SNAPSHOT + 1.0.0 ../pom.xml 4.0.0 org.wso2.carbon.cdm org.wso2.carbon.policy.evaluator - 1.0.0-SNAPSHOT + 1.0.0 bundle WSO2 Carbon - Policy Decision Point WSO2 Carbon - Policy Decision Point diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml index 896da05d1f7..665f9cec5e9 100644 --- a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml @@ -16,19 +16,18 @@ ~ limitations under the License. --> - + org.wso2.carbon.cdm policy-mgt - 1.0.0-SNAPSHOT + 1.0.0 ../pom.xml 4.0.0 org.wso2.carbon.cdm org.wso2.carbon.policy.mgt.common - 1.0.0-SNAPSHOT + 1.0.0 bundle WSO2 Carbon - Policy Management Common WSO2 Carbon - Policy Management Common diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml index 694e8f2a1d6..61d55cd1638 100644 --- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml @@ -16,19 +16,18 @@ ~ limitations under the License. --> - + org.wso2.carbon.cdm policy-mgt - 1.0.0-SNAPSHOT + 1.0.0 ../pom.xml 4.0.0 org.wso2.carbon.cdm org.wso2.carbon.policy.mgt.core - 1.0.0-SNAPSHOT + 1.0.0 bundle WSO2 Carbon - Policy Management Core WSO2 Carbon - Policy Management Core diff --git a/components/policy-mgt/pom.xml b/components/policy-mgt/pom.xml index 7fde904c103..84b7d8706dc 100644 --- a/components/policy-mgt/pom.xml +++ b/components/policy-mgt/pom.xml @@ -16,21 +16,19 @@ ~ limitations under the License. --> - + org.wso2.carbon.cdm wso2cdm-parent - 1.0.0-SNAPSHOT + 1.0.0 ../../pom.xml 4.0.0 org.wso2.carbon.cdm policy-mgt - 1.0.0-SNAPSHOT + 1.0.0 pom WSO2 Carbon - Policy Management Component http://wso2.org diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml index 12256cd6b6a..de689a33fbd 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml @@ -15,21 +15,19 @@ ~ limitations under the License. --> - + org.wso2.carbon.cdm device-mgt-feature - 1.0.0-SNAPSHOT + 1.0.0 ../pom.xml 4.0.0 org.wso2.carbon.device.mgt.server.feature pom - 1.0.0-SNAPSHOT + 1.0.0 WSO2 Carbon - Device Management Server Feature http://wso2.org This feature contains the core bundles required for Back-end Devvice Management functionality diff --git a/features/device-mgt/pom.xml b/features/device-mgt/pom.xml index 91d2b35f04a..d85499574c2 100644 --- a/features/device-mgt/pom.xml +++ b/features/device-mgt/pom.xml @@ -17,21 +17,19 @@ ~ under the License. --> - + org.wso2.carbon.cdm wso2cdm-parent - 1.0.0-SNAPSHOT + 1.0.0 ../../pom.xml 4.0.0 org.wso2.carbon.cdm device-mgt-feature - 1.0.0-SNAPSHOT + 1.0.0 pom WSO2 Carbon - Device Management Feature http://wso2.org diff --git a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml b/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml index cb30ba77120..f6ac3978f2f 100644 --- a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml +++ b/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml @@ -16,21 +16,19 @@ ~ limitations under the License. --> - + org.wso2.carbon.cdm policy-mgt-feature - 1.0.0-SNAPSHOT + 1.0.0 ../pom.xml 4.0.0 org.wso2.carbon.policy.mgt.server.feature pom - 1.0.0-SNAPSHOT + 1.0.0 WSO2 Carbon - Policy Management Server Feature http://wso2.org This feature contains the core bundles required for Back-end Devvice Management functionality diff --git a/features/policy-mgt/pom.xml b/features/policy-mgt/pom.xml index 1129d79b275..66419f04fbf 100644 --- a/features/policy-mgt/pom.xml +++ b/features/policy-mgt/pom.xml @@ -16,21 +16,19 @@ ~ limitations under the License. --> - + org.wso2.carbon.cdm wso2cdm-parent - 1.0.0-SNAPSHOT + 1.0.0 ../../pom.xml 4.0.0 org.wso2.carbon.cdm policy-mgt-feature - 1.0.0-SNAPSHOT + 1.0.0 pom WSO2 Carbon - Policy Management Feature http://wso2.org diff --git a/pom.xml b/pom.xml index 24b53db3991..a0b341b21de 100644 --- a/pom.xml +++ b/pom.xml @@ -17,15 +17,13 @@ ~ under the License. --> - + 4.0.0 org.wso2.carbon.cdm wso2cdm-parent pom - 1.0.0-SNAPSHOT + 1.0.0 WSO2 CDM - Parent http://wso2.org WSO2 Connected Device Manager @@ -578,7 +576,7 @@ https://github.com/wso2/product-cdm.git scm:git:https://github.com/wso2/product-cdm.git scm:git:https://github.com/wso2/product-cdm.git - HEAD + 1.0.0 @@ -820,7 +818,7 @@ 4.3.0 - 1.0.0-SNAPSHOT + 1.0.0 diff --git a/product/modules/distribution/pom.xml b/product/modules/distribution/pom.xml index 63e8c9328df..f1b4826bec7 100644 --- a/product/modules/distribution/pom.xml +++ b/product/modules/distribution/pom.xml @@ -17,14 +17,12 @@ ~ under the License. --> - + org.wso2.cdmserver wso2cdmserver-product - 1.0.0-SNAPSHOT + 1.0.0 ../../pom.xml @@ -107,29 +105,21 @@ - + - - - - + + + + - - - - + + + + - + - + @@ -142,29 +132,23 @@ - + - - - - + + + + - - - - + + + - + - + @@ -177,29 +161,23 @@ - + - - - - + + + + - - - - + + + - + - + --> @@ -211,48 +189,42 @@ - - - + + + - - - - + + + + - + - - + + - + --> og4j.logger.net.sf.ehcache=ERROR - - + + @@ -261,19 +233,16 @@ package - + - @@ -288,20 +257,20 @@ install - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/product/modules/integration/pom.xml b/product/modules/integration/pom.xml index 4e489975abe..a152f7231b7 100644 --- a/product/modules/integration/pom.xml +++ b/product/modules/integration/pom.xml @@ -17,13 +17,11 @@ ~ under the License. --> - + org.wso2.cdmserver wso2cdmserver-product - 1.0.0-SNAPSHOT + 1.0.0 ../../pom.xml 4.0.0 diff --git a/product/modules/integration/tests-common/admin-clients/pom.xml b/product/modules/integration/tests-common/admin-clients/pom.xml index 10a57d72aa9..d8c90fb055d 100644 --- a/product/modules/integration/tests-common/admin-clients/pom.xml +++ b/product/modules/integration/tests-common/admin-clients/pom.xml @@ -17,14 +17,12 @@ ~ under the License. --> - + org.wso2.cdmserver cdm-integration-tests-common - 1.0.0-SNAPSHOT + 1.0.0 ../pom.xml diff --git a/product/modules/integration/tests-common/integration-test-utils/pom.xml b/product/modules/integration/tests-common/integration-test-utils/pom.xml index 560011cbf2c..497ac2dac50 100644 --- a/product/modules/integration/tests-common/integration-test-utils/pom.xml +++ b/product/modules/integration/tests-common/integration-test-utils/pom.xml @@ -17,14 +17,12 @@ ~ under the License. --> - + org.wso2.cdmserver cdm-integration-tests-common - 1.0.0-SNAPSHOT + 1.0.0 ../pom.xml diff --git a/product/modules/integration/tests-common/pom.xml b/product/modules/integration/tests-common/pom.xml index caf72137931..f6e930cbb61 100644 --- a/product/modules/integration/tests-common/pom.xml +++ b/product/modules/integration/tests-common/pom.xml @@ -16,15 +16,13 @@ ~ under the License. --> - + org.wso2.cdmserver wso2cdm-integration - 1.0.0-SNAPSHOT + 1.0.0 ../pom.xml diff --git a/product/modules/integration/tests-common/ui-pages/pom.xml b/product/modules/integration/tests-common/ui-pages/pom.xml index 6adb6f73344..e71092f0516 100644 --- a/product/modules/integration/tests-common/ui-pages/pom.xml +++ b/product/modules/integration/tests-common/ui-pages/pom.xml @@ -17,14 +17,12 @@ ~ under the License. --> - + org.wso2.cdmserver cdm-integration-tests-common - 1.0.0-SNAPSHOT + 1.0.0 ../pom.xml diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml index 36cd6803582..d9172c087b6 100644 --- a/product/modules/p2-profile-gen/pom.xml +++ b/product/modules/p2-profile-gen/pom.xml @@ -16,13 +16,11 @@ ~ specific language governing permissions and limitations ~ under the License. --> - + org.wso2.cdmserver wso2cdmserver-product - 1.0.0-SNAPSHOT + 1.0.0 ../../pom.xml @@ -489,9 +487,8 @@ package - - + + diff --git a/product/pom.xml b/product/pom.xml index ecf08c22f43..1592c111734 100644 --- a/product/pom.xml +++ b/product/pom.xml @@ -16,14 +16,12 @@ ~ specific language governing permissions and limitations ~ under the License. --> - + org.wso2.carbon.cdm wso2cdm-parent - 1.0.0-SNAPSHOT + 1.0.0 ../pom.xml From e1b94822abbd77222867198f8fb23ea982a068ec Mon Sep 17 00:00:00 2001 From: Geeth Munasinghe Date: Thu, 5 Feb 2015 12:35:56 +0530 Subject: [PATCH 2/5] [maven-release-plugin] prepare for next development iteration --- .../device-mgt/org.wso2.carbon.device.mgt.common/pom.xml | 4 ++-- .../device-mgt/org.wso2.carbon.device.mgt.core/pom.xml | 4 ++-- components/device-mgt/pom.xml | 4 ++-- .../policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml | 4 ++-- .../policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml | 4 ++-- .../policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml | 4 ++-- components/policy-mgt/pom.xml | 4 ++-- .../org.wso2.carbon.device.mgt.server.feature/pom.xml | 4 ++-- features/device-mgt/pom.xml | 4 ++-- .../org.wso2.carbon.policy.mgt.server.feature/pom.xml | 4 ++-- features/policy-mgt/pom.xml | 4 ++-- pom.xml | 6 +++--- product/modules/distribution/pom.xml | 8 +++----- product/modules/integration/pom.xml | 2 +- .../integration/tests-common/admin-clients/pom.xml | 2 +- .../tests-common/integration-test-utils/pom.xml | 2 +- product/modules/integration/tests-common/pom.xml | 2 +- product/modules/integration/tests-common/ui-pages/pom.xml | 2 +- product/modules/p2-profile-gen/pom.xml | 2 +- product/pom.xml | 2 +- 20 files changed, 35 insertions(+), 37 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml index c450bc99853..f5aba9d25fe 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml @@ -3,13 +3,13 @@ device-mgt org.wso2.carbon.cdm - 1.0.0 + 1.1.0-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.mgt.common - 1.0.0 + 1.1.0-SNAPSHOT bundle WSO2 Carbon - Device Management Commons WSO2 Carbon - Device Management Commons diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml index d4bd82ade30..a6087eb0d32 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml @@ -21,14 +21,14 @@ org.wso2.carbon.cdm device-mgt - 1.0.0 + 1.1.0-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.cdm org.wso2.carbon.device.mgt.core - 1.0.0 + 1.1.0-SNAPSHOT bundle WSO2 Carbon - Device Management Core WSO2 Carbon - Device Management Core diff --git a/components/device-mgt/pom.xml b/components/device-mgt/pom.xml index cfe11645462..5f0db874967 100644 --- a/components/device-mgt/pom.xml +++ b/components/device-mgt/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.cdm wso2cdm-parent - 1.0.0 + 1.1.0-SNAPSHOT ../../pom.xml 4.0.0 org.wso2.carbon.cdm device-mgt - 1.0.0 + 1.1.0-SNAPSHOT pom WSO2 Carbon - Device Management Component http://wso2.org diff --git a/components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml index bd4013f9a14..649f19bcba2 100644 --- a/components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml @@ -20,14 +20,14 @@ org.wso2.carbon.cdm policy-mgt - 1.0.0 + 1.1.0-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.cdm org.wso2.carbon.policy.evaluator - 1.0.0 + 1.1.0-SNAPSHOT bundle WSO2 Carbon - Policy Decision Point WSO2 Carbon - Policy Decision Point diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml index 665f9cec5e9..6aa12c85238 100644 --- a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml @@ -20,14 +20,14 @@ org.wso2.carbon.cdm policy-mgt - 1.0.0 + 1.1.0-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.cdm org.wso2.carbon.policy.mgt.common - 1.0.0 + 1.1.0-SNAPSHOT bundle WSO2 Carbon - Policy Management Common WSO2 Carbon - Policy Management Common diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml index 61d55cd1638..d26c50fc8c6 100644 --- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml @@ -20,14 +20,14 @@ org.wso2.carbon.cdm policy-mgt - 1.0.0 + 1.1.0-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.cdm org.wso2.carbon.policy.mgt.core - 1.0.0 + 1.1.0-SNAPSHOT bundle WSO2 Carbon - Policy Management Core WSO2 Carbon - Policy Management Core diff --git a/components/policy-mgt/pom.xml b/components/policy-mgt/pom.xml index 84b7d8706dc..493943afa5c 100644 --- a/components/policy-mgt/pom.xml +++ b/components/policy-mgt/pom.xml @@ -21,14 +21,14 @@ org.wso2.carbon.cdm wso2cdm-parent - 1.0.0 + 1.1.0-SNAPSHOT ../../pom.xml 4.0.0 org.wso2.carbon.cdm policy-mgt - 1.0.0 + 1.1.0-SNAPSHOT pom WSO2 Carbon - Policy Management Component http://wso2.org diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml index de689a33fbd..63a9d4aa1b5 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml @@ -20,14 +20,14 @@ org.wso2.carbon.cdm device-mgt-feature - 1.0.0 + 1.1.0-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.mgt.server.feature pom - 1.0.0 + 1.1.0-SNAPSHOT WSO2 Carbon - Device Management Server Feature http://wso2.org This feature contains the core bundles required for Back-end Devvice Management functionality diff --git a/features/device-mgt/pom.xml b/features/device-mgt/pom.xml index d85499574c2..9a1a8b37fb8 100644 --- a/features/device-mgt/pom.xml +++ b/features/device-mgt/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.cdm wso2cdm-parent - 1.0.0 + 1.1.0-SNAPSHOT ../../pom.xml 4.0.0 org.wso2.carbon.cdm device-mgt-feature - 1.0.0 + 1.1.0-SNAPSHOT pom WSO2 Carbon - Device Management Feature http://wso2.org diff --git a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml b/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml index f6ac3978f2f..dbfb7c8fcb4 100644 --- a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml +++ b/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml @@ -21,14 +21,14 @@ org.wso2.carbon.cdm policy-mgt-feature - 1.0.0 + 1.1.0-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.policy.mgt.server.feature pom - 1.0.0 + 1.1.0-SNAPSHOT WSO2 Carbon - Policy Management Server Feature http://wso2.org This feature contains the core bundles required for Back-end Devvice Management functionality diff --git a/features/policy-mgt/pom.xml b/features/policy-mgt/pom.xml index 66419f04fbf..6b5206a51a4 100644 --- a/features/policy-mgt/pom.xml +++ b/features/policy-mgt/pom.xml @@ -21,14 +21,14 @@ org.wso2.carbon.cdm wso2cdm-parent - 1.0.0 + 1.1.0-SNAPSHOT ../../pom.xml 4.0.0 org.wso2.carbon.cdm policy-mgt-feature - 1.0.0 + 1.1.0-SNAPSHOT pom WSO2 Carbon - Policy Management Feature http://wso2.org diff --git a/pom.xml b/pom.xml index a0b341b21de..82106f135d3 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.cdm wso2cdm-parent pom - 1.0.0 + 1.1.0-SNAPSHOT WSO2 CDM - Parent http://wso2.org WSO2 Connected Device Manager @@ -576,7 +576,7 @@ https://github.com/wso2/product-cdm.git scm:git:https://github.com/wso2/product-cdm.git scm:git:https://github.com/wso2/product-cdm.git - 1.0.0 + HEAD @@ -818,7 +818,7 @@ 4.3.0 - 1.0.0 + 1.1.0-SNAPSHOT diff --git a/product/modules/distribution/pom.xml b/product/modules/distribution/pom.xml index f1b4826bec7..4de69588f25 100644 --- a/product/modules/distribution/pom.xml +++ b/product/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.wso2.cdmserver wso2cdmserver-product - 1.0.0 + 1.1.0-SNAPSHOT ../../pom.xml @@ -139,8 +139,7 @@ - @@ -168,8 +167,7 @@ - diff --git a/product/modules/integration/pom.xml b/product/modules/integration/pom.xml index a152f7231b7..1842de18684 100644 --- a/product/modules/integration/pom.xml +++ b/product/modules/integration/pom.xml @@ -21,7 +21,7 @@ org.wso2.cdmserver wso2cdmserver-product - 1.0.0 + 1.1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/product/modules/integration/tests-common/admin-clients/pom.xml b/product/modules/integration/tests-common/admin-clients/pom.xml index d8c90fb055d..2e1dbcc02cc 100644 --- a/product/modules/integration/tests-common/admin-clients/pom.xml +++ b/product/modules/integration/tests-common/admin-clients/pom.xml @@ -22,7 +22,7 @@ org.wso2.cdmserver cdm-integration-tests-common - 1.0.0 + 1.1.0-SNAPSHOT ../pom.xml diff --git a/product/modules/integration/tests-common/integration-test-utils/pom.xml b/product/modules/integration/tests-common/integration-test-utils/pom.xml index 497ac2dac50..34ccdf61435 100644 --- a/product/modules/integration/tests-common/integration-test-utils/pom.xml +++ b/product/modules/integration/tests-common/integration-test-utils/pom.xml @@ -22,7 +22,7 @@ org.wso2.cdmserver cdm-integration-tests-common - 1.0.0 + 1.1.0-SNAPSHOT ../pom.xml diff --git a/product/modules/integration/tests-common/pom.xml b/product/modules/integration/tests-common/pom.xml index f6e930cbb61..3a2accf6b51 100644 --- a/product/modules/integration/tests-common/pom.xml +++ b/product/modules/integration/tests-common/pom.xml @@ -22,7 +22,7 @@ org.wso2.cdmserver wso2cdm-integration - 1.0.0 + 1.1.0-SNAPSHOT ../pom.xml diff --git a/product/modules/integration/tests-common/ui-pages/pom.xml b/product/modules/integration/tests-common/ui-pages/pom.xml index e71092f0516..9dc4f9f0120 100644 --- a/product/modules/integration/tests-common/ui-pages/pom.xml +++ b/product/modules/integration/tests-common/ui-pages/pom.xml @@ -22,7 +22,7 @@ org.wso2.cdmserver cdm-integration-tests-common - 1.0.0 + 1.1.0-SNAPSHOT ../pom.xml diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml index d9172c087b6..c6599ec6f16 100644 --- a/product/modules/p2-profile-gen/pom.xml +++ b/product/modules/p2-profile-gen/pom.xml @@ -20,7 +20,7 @@ org.wso2.cdmserver wso2cdmserver-product - 1.0.0 + 1.1.0-SNAPSHOT ../../pom.xml diff --git a/product/pom.xml b/product/pom.xml index 1592c111734..f89d9da9335 100644 --- a/product/pom.xml +++ b/product/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.cdm wso2cdm-parent - 1.0.0 + 1.1.0-SNAPSHOT ../pom.xml From b21676a639de303ff0d6f53a938b698f17e27c31 Mon Sep 17 00:00:00 2001 From: manoj Date: Thu, 5 Feb 2015 13:09:48 +0530 Subject: [PATCH 3/5] components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java Default License feature --- .../org.wso2.carbon.device.mgt.core/pom.xml | 3 +- .../mgt/core/DeviceManagementConstants.java | 1 + .../LicenseManagementServiceComponent.java | 113 ++++++++++++++++-- 3 files changed, 105 insertions(+), 12 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml index a6087eb0d32..952b316a5d7 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml @@ -72,7 +72,8 @@ org.wso2.carbon.device.mgt.common.*, org.wso2.carbon.user.api, org.wso2.carbon.user.core.*, - org.w3c.dom + org.w3c.dom, + javax.xml.namespace.*; !org.wso2.carbon.device.mgt.core.internal, diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementConstants.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementConstants.java index 8af1724de77..ee84a217cf9 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementConstants.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementConstants.java @@ -22,6 +22,7 @@ public final class DeviceManagementConstants { throw new AssertionError(); } public static final String PROPERTY_SETUP = "setup"; + public static final String DEFAULT_LICENSE_CONFIG_XML_NAME = "DefaultLicense.xml"; } } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/LicenseManagementServiceComponent.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/LicenseManagementServiceComponent.java index b1316eff5c0..3fd0ad6acc1 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/LicenseManagementServiceComponent.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/LicenseManagementServiceComponent.java @@ -22,11 +22,27 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.osgi.framework.BundleContext; import org.osgi.service.component.ComponentContext; +import org.wso2.carbon.base.MultitenantConstants; +import org.wso2.carbon.context.PrivilegedCarbonContext; +import org.wso2.carbon.context.RegistryType; +import org.wso2.carbon.device.mgt.common.DeviceManagementConstants; +import org.wso2.carbon.device.mgt.common.LicenseManagementException; import org.wso2.carbon.device.mgt.core.LicenseManager; import org.wso2.carbon.device.mgt.core.LicenseManagerImpl; +import org.wso2.carbon.device.mgt.core.config.LicenseConfigurationManager; +import org.wso2.carbon.device.mgt.core.config.LicenseManagementConfig; import org.wso2.carbon.device.mgt.core.service.LicenseManagementService; +import org.wso2.carbon.governance.api.exception.GovernanceException; +import org.wso2.carbon.governance.api.generic.GenericArtifactManager; +import org.wso2.carbon.governance.api.generic.dataobjects.GenericArtifact; +import org.wso2.carbon.registry.core.Registry; +import org.wso2.carbon.registry.core.exceptions.RegistryException; +import org.wso2.carbon.registry.core.service.RegistryService; +import org.wso2.carbon.registry.core.session.UserRegistry; import org.wso2.carbon.user.core.service.RealmService; +import javax.xml.namespace.QName; + /** * @scr.component name="org.wso2.carbon.license.manager" immediate="true" * @scr.reference name="user.realmservice.default" @@ -35,6 +51,9 @@ import org.wso2.carbon.user.core.service.RealmService; * policy="dynamic" * bind="setRealmService" * unbind="unsetRealmService" + * @scr.reference name="registryService.service" + * interface="org.wso2.carbon.registry.core.service.RegistryService" cardinality="1..1" + * policy="dynamic" bind="setRegistryService" unbind="unsetRegistryService" */ public class LicenseManagementServiceComponent { @@ -42,19 +61,83 @@ public class LicenseManagementServiceComponent { protected void activate(ComponentContext componentContext) { - if (log.isDebugEnabled()) { - log.debug("Initializing license management core bundle"); - } - LicenseManager licenseManager = new LicenseManagerImpl(); - LicenseManagementDataHolder.getInstance().setLicenseManager(licenseManager); + try { + if (log.isDebugEnabled()) { + log.debug("Initializing license management core bundle"); + } + LicenseManager licenseManager = new LicenseManagerImpl(); + LicenseManagementDataHolder.getInstance().setLicenseManager(licenseManager); - if (log.isDebugEnabled()) { - log.debug("Registering OSGi service LicenseManagementService"); + /* If -Dsetup option enabled then create creates default license management */ + String setupOption = System.getProperty( + org.wso2.carbon.device.mgt.core.DeviceManagementConstants.Common.PROPERTY_SETUP); + + if (setupOption != null) { + if (log.isDebugEnabled()) { + log.debug("-Dsetup is enabled.Check default licenses and add if not exists in registry"); + } + LicenseConfigurationManager.getInstance().initConfig(); + LicenseManagementConfig licenseManagementConfig = LicenseConfigurationManager.getInstance() + .getLicenseMgtConfig(); + addDefaultLicenses(licenseManagementConfig); + } + + if (log.isDebugEnabled()) { + log.debug("Registering OSGi service LicenseManagementService"); + } + BundleContext bundleContext = componentContext.getBundleContext(); + bundleContext + .registerService(LicenseManagementService.class.getName(), new LicenseManagementService(), null); + if (log.isDebugEnabled()) { + log.debug("License management core bundle has been successfully initialized"); + } + } catch (Throwable throwable) { + String msg = "Error occurred while initializing license management core bundle"; + log.error(msg, throwable); } - BundleContext bundleContext = componentContext.getBundleContext(); - bundleContext.registerService(LicenseManagementService.class.getName(), new LicenseManagementService(), null); - if (log.isDebugEnabled()) { - log.debug("License management core bundle has been successfully initialized"); + } + + private void addDefaultLicenses(LicenseManagementConfig licenseManagementConfig) throws LicenseManagementException { + + PrivilegedCarbonContext.startTenantFlow(); + PrivilegedCarbonContext.getThreadLocalCarbonContext().setUsername("admin"); + PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(MultitenantConstants.SUPER_TENANT_ID); + PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain( + MultitenantConstants.SUPER_TENANT_DOMAIN_NAME); + + Registry registry = (UserRegistry) PrivilegedCarbonContext.getThreadLocalCarbonContext().getRegistry( + RegistryType.USER_GOVERNANCE); + try { + GenericArtifactManager artifactManager = new GenericArtifactManager(registry, + DeviceManagementConstants.LicenseProperties.LICENSE_REGISTRY_KEY); + GenericArtifact artifact; + + for (org.wso2.carbon.device.mgt.core.config.license.License license : licenseManagementConfig + .getLicenseList()) { + + artifact = artifactManager.newGovernanceArtifact(new QName("http://www.wso2.com", + DeviceManagementConstants.LicenseProperties.LICENSE_REGISTRY_KEY)); + artifact.setAttribute(DeviceManagementConstants.LicenseProperties.OVERVIEW_NAME, license.getName()); + artifact.setAttribute(DeviceManagementConstants.LicenseProperties.OVERVIEW_VERSION, + license.getVersion()); + artifact.setAttribute(DeviceManagementConstants.LicenseProperties.OVERVIEW_LANGUAGE, + license.getLanguage()); + artifact.setAttribute(DeviceManagementConstants.LicenseProperties.OVERVIEW_PROVIDER, + license.getProvider()); + artifact.setAttribute(DeviceManagementConstants.LicenseProperties.VALID_TO, + license.getValidTo().toString()); + artifact.setAttribute(DeviceManagementConstants.LicenseProperties.VALID_FROM, + license.getValidFrom().toString()); + artifact.setAttribute(DeviceManagementConstants.LicenseProperties.LICENSE,license.getLicense()); + artifactManager.addGenericArtifact(artifact); + } + } catch (GovernanceException govEx) { + String errorMsg = "Governance error"; + log.error(errorMsg); + throw new LicenseManagementException(errorMsg, govEx); + } catch (RegistryException regEx) { + String errorMsg = "Registry error"; + throw new LicenseManagementException(errorMsg, regEx); } } @@ -79,4 +162,12 @@ public class LicenseManagementServiceComponent { } LicenseManagementDataHolder.getInstance().setRealmService(null); } + + protected void setRegistryService(RegistryService registryService) { + // CommonUtil.setRegistryService(registryService); + } + + protected void unsetRegistryService(RegistryService registryService) { + //CommonUtil.setRegistryService(null); + } } From 394258d10f02fe558e4cadbce088854f3730be53 Mon Sep 17 00:00:00 2001 From: manoj Date: Thu, 5 Feb 2015 13:10:26 +0530 Subject: [PATCH 4/5] Default License feature --- .../config/LicenseConfigurationManager.java | 73 ++++++++++++ .../core/config/LicenseManagementConfig.java | 41 +++++++ .../mgt/core/config/license/License.java | 104 ++++++++++++++++++ .../device/mgt/core/util/DateAdapter.java | 40 +++++++ 4 files changed, 258 insertions(+) create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/LicenseConfigurationManager.java create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/LicenseManagementConfig.java create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/license/License.java create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DateAdapter.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/LicenseConfigurationManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/LicenseConfigurationManager.java new file mode 100644 index 00000000000..2995c6b14fd --- /dev/null +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/LicenseConfigurationManager.java @@ -0,0 +1,73 @@ +/* + * + * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + +package org.wso2.carbon.device.mgt.core.config; + +import org.w3c.dom.Document; +import org.wso2.carbon.device.mgt.common.LicenseManagementException; +import org.wso2.carbon.device.mgt.core.DeviceManagementConstants; +import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil; +import org.wso2.carbon.utils.CarbonUtils; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.Unmarshaller; +import java.io.File; + +public class LicenseConfigurationManager { + + private LicenseManagementConfig licenseMgtConfig; + private static LicenseConfigurationManager licenseConfigManager; + + private static final String licenseMgtConfigXMLPath = CarbonUtils.getCarbonConfigDirPath() + File.separator + + DeviceManagementConstants.Common.DEFAULT_LICENSE_CONFIG_XML_NAME; + + public static LicenseConfigurationManager getInstance() { + if (licenseConfigManager == null) { + synchronized (LicenseConfigurationManager.class) { + if (licenseConfigManager == null) { + licenseConfigManager = new LicenseConfigurationManager(); + } + } + } + return licenseConfigManager; + } + + public synchronized void initConfig() throws LicenseManagementException { + + //catch generic exception.if any exception occurs wrap and throw LicenseManagementException + try { + File licenseMgtConfig = new File(licenseMgtConfigXMLPath); + Document doc = DeviceManagerUtil.convertToDocument(licenseMgtConfig); + + /* Un-marshaling License Management configuration */ + JAXBContext cdmContext = JAXBContext.newInstance(LicenseManagementConfig.class); + Unmarshaller unmarshaller = cdmContext.createUnmarshaller(); + this.licenseMgtConfig = (LicenseManagementConfig) unmarshaller.unmarshal(doc); + } catch (Exception e) { + throw new LicenseManagementException("Error occurred while initializing RSS config", e); + } + } + + public LicenseManagementConfig getLicenseMgtConfig() { + return licenseMgtConfig; + } + + +} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/LicenseManagementConfig.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/LicenseManagementConfig.java new file mode 100644 index 00000000000..dc61771e7f4 --- /dev/null +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/LicenseManagementConfig.java @@ -0,0 +1,41 @@ +/* + * + * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + +package org.wso2.carbon.device.mgt.core.config; + +import org.wso2.carbon.device.mgt.core.config.license.License; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import java.util.List; + +@XmlRootElement(name = "DefaultLicense") +public class LicenseManagementConfig { + + private List licenseList; + + @XmlElement(name = "License") + public List getLicenseList() { + return licenseList; + } + + public void setLicenseList(List licenseList) { + this.licenseList = licenseList; + } +} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/license/License.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/license/License.java new file mode 100644 index 00000000000..1ad70a39522 --- /dev/null +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/license/License.java @@ -0,0 +1,104 @@ +/* + * + * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + +package org.wso2.carbon.device.mgt.core.config.license; + +import org.wso2.carbon.device.mgt.core.util.DateAdapter; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import java.util.Date; + +@XmlRootElement(name = "License") +public class License { + + private String provider; + private String name; + private String version; + private String language; + private Date validFrom; + private Date validTo; + private String license; + + @XmlElement(name = "provider") + public String getProvider() { + return provider; + } + + public void setProvider(String provider) { + this.provider = provider; + } + + @XmlElement(name = "name") + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @XmlElement(name = "version") + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + @XmlElement(name = "language") + public String getLanguage() { + return language; + } + + public void setLanguage(String language) { + this.language = language; + } + + @XmlJavaTypeAdapter(DateAdapter.class) + public Date getValidFrom() { + return validFrom; + } + + public void setValidFrom(Date validFrom) { + this.validFrom = validFrom; + } + + @XmlJavaTypeAdapter(DateAdapter.class) + public Date getValidTo() { + return validTo; + } + + public void setValidTo(Date validTo) { + this.validTo = validTo; + } + + @XmlElement(name = "license") + public String getLicense() { + return license; + } + + public void setLicense(String license) { + this.license = license; + } + +} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DateAdapter.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DateAdapter.java new file mode 100644 index 00000000000..246852c80d7 --- /dev/null +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DateAdapter.java @@ -0,0 +1,40 @@ +/* + * + * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + +package org.wso2.carbon.device.mgt.core.util; + +import javax.xml.bind.annotation.adapters.XmlAdapter; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + +public class DateAdapter extends XmlAdapter { + + private SimpleDateFormat dateFormat = new SimpleDateFormat("dd-mm-yyyy"); + + @Override + public Date unmarshal(String strDate) throws ParseException { + return dateFormat.parse(strDate); + } + @Override + public String marshal(Date date) throws ParseException { + return dateFormat.format(date); + } +} From 8cd5f6d61f9c5ddaf2d6e4cb62c75741014f33ae Mon Sep 17 00:00:00 2001 From: manoj Date: Thu, 5 Feb 2015 13:11:10 +0530 Subject: [PATCH 5/5] Default License ManagementY --- .../wso2/carbon/device/mgt/common/DeviceManagementConstants.java | 1 + 1 file changed, 1 insertion(+) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java index 5e63acb960e..5e63430d41c 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java @@ -81,5 +81,6 @@ public final class DeviceManagementConstants { public static final String VALID_FROM = "overview_validityFrom"; public static final String VALID_TO = "overview_validityTo"; public static final String LICENSE = "overview_license"; + public static final String LICENSE_REGISTRY_KEY = "license"; } }