community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/geethkokila/product-cdm

Browse Source
This commit is contained in:
inosh-perera 2015-01-06 18:59:23 +05:30
commit 4f16f32269
12 changed files with 115 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementServiceException.java
View File

@ -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;

9
components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
View File

@ -141,6 +141,15 @@
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.tomcat.ext</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.tomcat</artifactId>
</dependency>
</dependencies>
</project>

28
components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAOTest.java
View File

@ -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");
}
}

9
components/device-mgt/pom.xml
View File

@ -42,7 +42,7 @@
<module>org.wso2.carbon.device.mgt.mobile.impl</module>
</modules>
<dependencyManagement>
<!-- <dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.osgi</groupId>
@ -95,7 +95,7 @@
<version>4.3.0</version>
</dependency>
</dependencies>
</dependencyManagement>
</dependencyManagement>-->
<build>
<pluginManagement>
@ -116,9 +116,4 @@
</plugins>
</pluginManagement>
</build>
<properties>
<orbit.version.h2.engine>1.2.140.wso2v3</orbit.version.h2.engine>
<apim.version>1.2.1</apim.version>
<orbit.version.tomcat>7.0.52.wso2v5</orbit.version.tomcat>
</properties>
</project>

6
components/key-mgt/pom.xml
View File

@ -40,6 +40,7 @@
<module>org.wso2.carbon.key.mgt.handler.valve</module>
</modules>
<!--
<dependencyManagement>
<dependencies>
<dependency>
@ -89,6 +90,7 @@
</dependency>
</dependencies>
</dependencyManagement>
-->
<build>
<pluginManagement>
@ -109,9 +111,9 @@
</plugins>
</pluginManagement>
</build>
<properties>
<!-- <properties>
<orbit.version.h2.engine>1.2.140.wso2v3</orbit.version.h2.engine>
<apim.version>1.2.1</apim.version>
<orbit.version.tomcat>7.0.52.wso2v5</orbit.version.tomcat>
</properties>
</properties>-->
</project>

4
components/policy-mgt/pom.xml
View File

@ -42,7 +42,7 @@
<module>org.wso2.carbon.policy.evalutor</module>
</modules>
<dependencyManagement>
<!-- <dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.osgi</groupId>
@ -60,7 +60,7 @@
<version>4.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
</dependencyManagement>-->
<build>
<pluginManagement>

12
features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml
View File

@ -39,13 +39,13 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.device.mgt.mobile.impl</artifactId>
<version>${project.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId>
<version>${project.version}</version>
</dependency>
</dependency>
</dependencies>
<build>
@ -98,13 +98,13 @@
<bundles>
<bundleDef>org.wso2.carbon:org.wso2.carbon.device.mgt.mobile.impl:${project.version}
</bundleDef>
<bundleDef>org.wso2.carbon:org.wso2.carbon.device.mgt.common:${project.version}
<bundleDef>org.wso2.carbon:org.wso2.carbon.device.mgt.common:${project.version}
</bundleDef>
</bundles>
<importFeatures>
<importFeatureDef>org.wso2.carbon.core.server:${carbon.platform.version}
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
</importFeatureDef>
<importFeatureDef>org.wso2.carbon.device.mgt.server:${project.version}
<importFeatureDef>org.wso2.carbon.device.mgt.server:${project.version}
</importFeatureDef>
</importFeatures>
</configuration>

2
features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
View File

@ -112,7 +112,7 @@
</bundleDef>
</bundles>
<importFeatures>
<importFeatureDef>org.wso2.carbon.core.server:${carbon.platform.version}
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
</importFeatureDef>
</importFeatures>
</configuration>

2
features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
View File

@ -112,7 +112,7 @@
</bundleDef>
</bundles>
<importFeatures>
<importFeatureDef>org.wso2.carbon.core.server:${carbon.platform.version}
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
</importFeatureDef>
</importFeatures>
</configuration>

73
pom.xml
View File

@ -157,22 +157,22 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
<version>${carbon.platform.version}</version>
<version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core</artifactId>
<version>${carbon.platform.version}</version>
<version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ndatasource.core</artifactId>
<version>${carbon.platform.version}</version>
<version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ndatasource.rdbms</artifactId>
<version>${carbon.platform.version}</version>
<version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
@ -184,18 +184,77 @@
<artifactId>jboss-transaction-api_1.1_spec</artifactId>
<version>${jboss-transaction-api.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>3.8.1.v20120830-144521</version>
</dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
<version>3.6.100.v20120522-1841</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
<version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId>
<version>${cdm.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
<version>3.3.100.v20120522-1822</version>
</dependency>
<dependency>
<groupId>com.h2database.wso2</groupId>
<artifactId>h2-database-engine</artifactId>
<version>${orbit.version.h2.engine}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.apimgt.core</artifactId>
<version>${apim.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.apimgt.impl</artifactId>
<version>${apim.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.wso2</groupId>
<artifactId>tomcat</artifactId>
<version>${orbit.version.tomcat}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.tomcat.ext</artifactId>
<version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.tomcat</artifactId>
<version>${carbon.kernel.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<properties>
<testng.version>6.1.1</testng.version>
<carbon.kernel.version>4.3.0-SNAPSHOT</carbon.kernel.version>
<carbon.kernel.version>4.3.0</carbon.kernel.version>
<carbon.platform.version>4.3.0-SNAPSHOT</carbon.platform.version>
<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
<maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
<axis2.osgi.version.range>[1.6.1.wso2v11, 1.7.0)</axis2.osgi.version.range>
<jboss-transaction-api.version>1.0.0.Final</jboss-transaction-api.version>
<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
<cdm.version>2.0.0-SNAPSHOT</cdm.version>
<!--Testing -->
<test.framework.version>4.3.1</test.framework.version>
<testng.version>6.8</testng.version>
@ -205,6 +264,10 @@
<!--Eclipse Osgi-->
<eclipse.equinox.common.version>3.6.100.v20120522-1841</eclipse.equinox.common.version>
<eclipse.osgi.version>3.8.1.v20120830-144521</eclipse.osgi.version>
<orbit.version.h2.engine>1.2.140.wso2v3</orbit.version.h2.engine>
<apim.version>1.2.1</apim.version>
<orbit.version.tomcat>7.0.52.wso2v5</orbit.version.tomcat>
</properties>

37
product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Authentication.java
View File

@ -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";
}
}

36
product/modules/p2-profile-gen/pom.xml
View File

@ -100,9 +100,9 @@
<publishArtifactRepository>true</publishArtifactRepository>
<featureArtifacts>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.ndatasource.feature:${carbon.kernel.version}
</featureArtifactDef>
<!--<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.ndatasource.feature:${carbon.platform.version}
</featureArtifactDef>-->
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.device.mgt.server.feature:${project.version}
</featureArtifactDef>
@ -133,13 +133,13 @@
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.platform.version}
</featureArtifactDef>
<featureArtifactDef>
<!--<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.dbconsole.ui.feature:${carbon.platform.version}
</featureArtifactDef>
</featureArtifactDef>-->
<!-- API Manager related features -->
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.apimgt.core.feature:${carbon.kernel.version}
org.wso2.carbon:org.wso2.carbon.apimgt.core.feature:${carbon.platform.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.um.ws.service.server.feature:${carbon.platform.version}
@ -180,6 +180,9 @@
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.event.server.feature:${carbon.platform.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.event.common.feature:${carbon.platform.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.databridge.datapublisher.feature:${carbon.platform.version}
</featureArtifactDef>
@ -218,16 +221,16 @@
<features>
<feature>
<id>org.wso2.carbon.apimgt.core.feature.group</id>
<version>${carbon.kernel.version}</version>
<version>${carbon.platform.version}</version>
</feature>
<feature>
<!-- <feature>
<id>org.wso2.carbon.ndatasource.feature.group</id>
<version>${carbon.kernel.version}</version>
</feature>
<feature>
</feature>-->
<!--<feature>
<id>org.wso2.carbon.ndatasource.ui.feature.group</id>
<version>${carbon.kernel.version}</version>
</feature>
<version>${carbon.platform.version}</version>
</feature>-->
<feature>
<id>org.wso2.carbon.device.mgt.server.feature.group</id>
<version>${project.version}</version>
@ -318,6 +321,11 @@
<id>org.wso2.carbon.event.server.feature.group</id>
<version>${carbon.platform.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.common.feature.group</id>
<version>${carbon.platform.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
<version>${carbon.platform.version}</version>
@ -340,10 +348,10 @@
<id>org.wso2.carbon.identity.relying.party.server.feature.group</id>
<version>${carbon.platform.version}</version>
</feature>
<feature>
<!--<feature>
<id>org.wso2.carbon.dbconsole.ui.feature.group</id>
<version>${carbon.platform.version}</version>
</feature>
</feature>-->
</features>
</configuration>
</execution>