From 9bddb9407b1f8c9c061fbc9d91d36c779b30687b Mon Sep 17 00:00:00 2001 From: Geeth Munasinghe Date: Tue, 23 Dec 2014 15:03:40 +0530 Subject: [PATCH 1/4] Fixing pom issues --- .../org.wso2.carbon.device.mgt.core/pom.xml | 9 +++ components/device-mgt/pom.xml | 9 +-- components/key-mgt/pom.xml | 6 +- components/policy-mgt/pom.xml | 4 +- pom.xml | 71 +++++++++++++++++-- product/modules/p2-profile-gen/pom.xml | 20 +++--- 6 files changed, 94 insertions(+), 25 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 e839f54070..f1ceacf062 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 @@ -141,6 +141,15 @@ org.testng testng + + + org.wso2.carbon + org.wso2.carbon.tomcat.ext + + + org.wso2.carbon + org.wso2.carbon.tomcat + diff --git a/components/device-mgt/pom.xml b/components/device-mgt/pom.xml index 7b248638d7..5188221684 100644 --- a/components/device-mgt/pom.xml +++ b/components/device-mgt/pom.xml @@ -42,7 +42,7 @@ org.wso2.carbon.device.mgt.mobile.impl - + @@ -116,9 +116,4 @@ - - 1.2.140.wso2v3 - 1.2.1 - 7.0.52.wso2v5 - diff --git a/components/key-mgt/pom.xml b/components/key-mgt/pom.xml index e427627aff..67b910014f 100644 --- a/components/key-mgt/pom.xml +++ b/components/key-mgt/pom.xml @@ -40,6 +40,7 @@ org.wso2.carbon.key.mgt.handler.valve + @@ -109,9 +111,9 @@ - + diff --git a/components/policy-mgt/pom.xml b/components/policy-mgt/pom.xml index 53a5d3d0c7..44645e77f1 100644 --- a/components/policy-mgt/pom.xml +++ b/components/policy-mgt/pom.xml @@ -42,7 +42,7 @@ org.wso2.carbon.policy.evalutor - + diff --git a/pom.xml b/pom.xml index 8f324b9b5b..d39097a1c7 100644 --- a/pom.xml +++ b/pom.xml @@ -157,22 +157,22 @@ org.wso2.carbon org.wso2.carbon.utils - ${carbon.platform.version} + ${carbon.kernel.version} org.wso2.carbon org.wso2.carbon.core - ${carbon.platform.version} + ${carbon.kernel.version} org.wso2.carbon org.wso2.carbon.ndatasource.core - ${carbon.platform.version} + ${carbon.kernel.version} org.wso2.carbon org.wso2.carbon.ndatasource.rdbms - ${carbon.platform.version} + ${carbon.kernel.version} org.wso2.carbon @@ -184,6 +184,64 @@ jboss-transaction-api_1.1_spec ${jboss-transaction-api.version} + + + + org.eclipse.osgi + org.eclipse.osgi + 3.8.1.v20120830-144521 + + + org.eclipse.equinox + org.eclipse.equinox.common + 3.6.100.v20120522-1841 + + + org.wso2.carbon + org.wso2.carbon.logging + ${carbon.kernel.version} + + + org.wso2.carbon + org.wso2.carbon.device.mgt.common + ${cdm.version} + + + org.eclipse.osgi + org.eclipse.osgi.services + 3.3.100.v20120522-1822 + + + com.h2database.wso2 + h2-database-engine + ${orbit.version.h2.engine} + + + org.wso2.carbon + org.wso2.carbon.apimgt.core + ${apim.version} + + + org.wso2.carbon + org.wso2.carbon.apimgt.impl + ${apim.version} + + + org.apache.tomcat.wso2 + tomcat + ${orbit.version.tomcat} + + + org.wso2.carbon + org.wso2.carbon.tomcat.ext + ${carbon.kernel.version} + + + org.wso2.carbon + org.wso2.carbon.tomcat + ${carbon.kernel.version} + + @@ -196,6 +254,7 @@ [1.6.1.wso2v11, 1.7.0) 1.0.0.Final 1.5.4 + 2.0.0-SNAPSHOT 4.3.1 6.8 @@ -205,6 +264,10 @@ 3.6.100.v20120522-1841 3.8.1.v20120830-144521 + + 1.2.140.wso2v3 + 1.2.1 + 7.0.52.wso2v5 diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml index acafff81fe..774d6c4c21 100644 --- a/product/modules/p2-profile-gen/pom.xml +++ b/product/modules/p2-profile-gen/pom.xml @@ -100,9 +100,9 @@ true - - org.wso2.carbon:org.wso2.carbon.ndatasource.feature:${carbon.kernel.version} - + org.wso2.carbon:org.wso2.carbon.device.mgt.server.feature:${project.version} @@ -139,7 +139,7 @@ - org.wso2.carbon:org.wso2.carbon.apimgt.core.feature:${carbon.kernel.version} + org.wso2.carbon:org.wso2.carbon.apimgt.core.feature:${carbon.platform.version} org.wso2.carbon:org.wso2.carbon.um.ws.service.server.feature:${carbon.platform.version} @@ -218,16 +218,16 @@ org.wso2.carbon.apimgt.core.feature.group - ${carbon.kernel.version} + ${carbon.platform.version} - + + org.wso2.carbon.device.mgt.server.feature.group ${project.version} From 704afe78ae24fcd8a962e17046b5ee6e55997fbe Mon Sep 17 00:00:00 2001 From: manoj Date: Mon, 5 Jan 2015 15:31:47 +0530 Subject: [PATCH 2/4] Delete test classes --- .../device/mgt/core/dao/DeviceDAOTest.java | 28 -------------- .../java/cdm/api/android/Authentication.java | 37 ------------------- 2 files changed, 65 deletions(-) delete mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAOTest.java delete mode 100644 product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Authentication.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAOTest.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAOTest.java deleted file mode 100644 index 980527aaec..0000000000 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAOTest.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2014, 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. - * 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.dao; - -import org.testng.Assert; - -public class DeviceDAOTest { - - // @Test - public void setUp() throws Exception { - // log.info("Testing started."); - Assert.assertEquals("A", "A"); - } - -} diff --git a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Authentication.java b/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Authentication.java deleted file mode 100644 index b5687928b1..0000000000 --- a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Authentication.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2011-2012 WSO2, Inc. (http://wso2.com) - * - * Licensed 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 cdm.api.android; - -import javax.ws.rs.*; - -@Path("/authenticate/") -public class Authentication { - - @POST - @Path("/device/") - public String authenticateDevice(@FormParam("username") String username, - @FormParam("password") String password) { - return "jwwfowrjwqporqwrpqworpq"; - } - - @POST - @Path("/device/license") - @Produces ("text/plain") - public String getLicense() { - return "License Agreement"; - } -} From f01f822f6f43c5ae5b1b3f78d346faedce8053a5 Mon Sep 17 00:00:00 2001 From: manoj Date: Mon, 5 Jan 2015 15:32:02 +0530 Subject: [PATCH 3/4] Refactor Device Management service exception class --- .../device/mgt/common/DeviceManagementServiceException.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementServiceException.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementServiceException.java index 941d04db53..d350a13910 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementServiceException.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementServiceException.java @@ -18,9 +18,6 @@ package org.wso2.carbon.device.mgt.common; -/** - * Created by manoj on 12/22/14. - */ public class DeviceManagementServiceException extends Exception { private static final long serialVersionUID = -8933146283800122640L; From e29d863a2e342a754014cb14f3ff80c0c729f4cc Mon Sep 17 00:00:00 2001 From: Geeth Munasinghe Date: Tue, 6 Jan 2015 14:04:31 +0530 Subject: [PATCH 4/4] Fixing build problems --- .../pom.xml | 12 ++++++------ .../pom.xml | 2 +- .../pom.xml | 2 +- pom.xml | 2 +- product/modules/p2-profile-gen/pom.xml | 16 ++++++++++++---- 5 files changed, 21 insertions(+), 13 deletions(-) diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml index cbf563398f..2da85a8dbb 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml @@ -39,13 +39,13 @@ org.wso2.carbon org.wso2.carbon.device.mgt.mobile.impl - ${project.version} + ${project.version} - + org.wso2.carbon org.wso2.carbon.device.mgt.common ${project.version} - + @@ -98,13 +98,13 @@ org.wso2.carbon:org.wso2.carbon.device.mgt.mobile.impl:${project.version} - org.wso2.carbon:org.wso2.carbon.device.mgt.common:${project.version} + org.wso2.carbon:org.wso2.carbon.device.mgt.common:${project.version} - org.wso2.carbon.core.server:${carbon.platform.version} + org.wso2.carbon.core.server:${carbon.kernel.version} - org.wso2.carbon.device.mgt.server:${project.version} + org.wso2.carbon.device.mgt.server:${project.version} 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 ab9bf942f2..ba36238a26 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 @@ -112,7 +112,7 @@ - org.wso2.carbon.core.server:${carbon.platform.version} + org.wso2.carbon.core.server:${carbon.kernel.version} 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 1d272a1512..4cca87102e 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 @@ -112,7 +112,7 @@ - org.wso2.carbon.core.server:${carbon.platform.version} + org.wso2.carbon.core.server:${carbon.kernel.version} diff --git a/pom.xml b/pom.xml index d39097a1c7..44542484c2 100644 --- a/pom.xml +++ b/pom.xml @@ -247,7 +247,7 @@ 6.1.1 - 4.3.0-SNAPSHOT + 4.3.0 4.3.0-SNAPSHOT 1.5.4 1.3 diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml index 774d6c4c21..f1524dbb38 100644 --- a/product/modules/p2-profile-gen/pom.xml +++ b/product/modules/p2-profile-gen/pom.xml @@ -133,9 +133,9 @@ org.wso2.carbon:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.platform.version} - + @@ -180,6 +180,9 @@ org.wso2.carbon:org.wso2.carbon.event.server.feature:${carbon.platform.version} + + org.wso2.carbon:org.wso2.carbon.event.common.feature:${carbon.platform.version} + org.wso2.carbon:org.wso2.carbon.databridge.datapublisher.feature:${carbon.platform.version} @@ -318,6 +321,11 @@ org.wso2.carbon.event.server.feature.group ${carbon.platform.version} + + + org.wso2.carbon.event.common.feature.group + ${carbon.platform.version} + org.wso2.carbon.databridge.datapublisher.feature.group ${carbon.platform.version} @@ -340,10 +348,10 @@ org.wso2.carbon.identity.relying.party.server.feature.group ${carbon.platform.version} - +