revert-70aa11f8
manoj 10 years ago
commit 6e77014e64

@ -19,10 +19,6 @@
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>

@ -1,12 +1,12 @@
/** /**
* Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
* <p/> *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* <p/> *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* <p/> *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -26,23 +26,31 @@ import java.util.List;
*/ */
public interface DeviceManagerService { public interface DeviceManagerService {
/**
* Method to retrieve the provider type that implements DeviceManagerService interface
* @return Returns provider type
*/
String getProviderType();
/** /**
* Method to enrolling a particular device of type mobile, IoT, etc within CDM. * Method to enrolling a particular device of type mobile, IoT, etc within CDM.
*
* @param device Metadata corresponding to the device being enrolled * @param device Metadata corresponding to the device being enrolled
* @throws DeviceManagementException If some unusual behaviour is observed while enrolling a device * @throws DeviceManagementException If some unusual behaviour is observed while enrolling a device
*/ */
void enrolDevice(Device device) throws DeviceManagementException; void enrollDevice(Device device) throws DeviceManagementException;
/** /**
* Method to modify the metadata corresponding to device enrollment * Method to modify the metadata corresponding to device enrollment
*
* @param device Modified device enrollment related metadata * @param device Modified device enrollment related metadata
* @throws DeviceManagementException If some unusual behaviour is observed while modify the enrollment of a * @throws DeviceManagementException If some unusual behaviour is observed while modify the enrollment of a
* device * device
*/ */
void modifyEnrolment(Device device) throws DeviceManagementException; void modifyEnrollment(Device device) throws DeviceManagementException;
/** /**
* Method to disenroll a particular device from CDM. * Method to disenroll a particular device from CDM.
*
* @param type Device Type * @param type Device Type
* @param deviceId Device Identifier * @param deviceId Device Identifier
* @throws DeviceManagementException * @throws DeviceManagementException
@ -51,6 +59,7 @@ public interface DeviceManagerService {
/** /**
* Method to retrieve the status of the registration process of a particular device. * Method to retrieve the status of the registration process of a particular device.
*
* @param type Device Type * @param type Device Type
* @param deviceId Device Identifier * @param deviceId Device Identifier
* @return Status of enrollment * @return Status of enrollment
@ -60,6 +69,7 @@ public interface DeviceManagerService {
/** /**
* Method to retrieve the status of a particular device. * Method to retrieve the status of a particular device.
*
* @param type Device Type * @param type Device Type
* @param deviceId Device Identifier * @param deviceId Device Identifier
* @return Returns if the device is active * @return Returns if the device is active
@ -70,6 +80,7 @@ public interface DeviceManagerService {
/** /**
* Method to set the status indicating whether a particular device registered within CDM is enabled at a given * Method to set the status indicating whether a particular device registered within CDM is enabled at a given
* moment. * moment.
*
* @param status Indicates whether the device is active * @param status Indicates whether the device is active
* @throws DeviceManagementException If some unusual behaviour is observed while enrolling a device * @throws DeviceManagementException If some unusual behaviour is observed while enrolling a device
*/ */
@ -77,6 +88,7 @@ public interface DeviceManagerService {
/** /**
* Method to retrieve metadata of all devices registered within CDM corresponding to a particular device type. * Method to retrieve metadata of all devices registered within CDM corresponding to a particular device type.
*
* @param type Device Type * @param type Device Type
* @return List of metadata corresponding to all devices registered within CDM * @return List of metadata corresponding to all devices registered within CDM
*/ */
@ -84,6 +96,7 @@ public interface DeviceManagerService {
/** /**
* Method to retrieve metadata of a device corresponding to a particular type that carries a specific identifier. * Method to retrieve metadata of a device corresponding to a particular type that carries a specific identifier.
*
* @param type Device Type * @param type Device Type
* @param deviceId Device Identifier * @param deviceId Device Identifier
* @return Metadata corresponding to a particular device * @return Metadata corresponding to a particular device
@ -93,6 +106,7 @@ public interface DeviceManagerService {
/** /**
* Method to set the ownership type of a particular device. i.e. BYOD, COPE * Method to set the ownership type of a particular device. i.e. BYOD, COPE
*
* @param ownershipType Type of ownership * @param ownershipType Type of ownership
* @throws DeviceManagementException If some unusual behaviour is observed while enrolling a device * @throws DeviceManagementException If some unusual behaviour is observed while enrolling a device
*/ */

@ -53,8 +53,7 @@
<Bundle-Description>Device Management Core Bundle</Bundle-Description> <Bundle-Description>Device Management Core Bundle</Bundle-Description>
<Private-Package>org.wso2.carbon.device.mgt.core.internal</Private-Package> <Private-Package>org.wso2.carbon.device.mgt.core.internal</Private-Package>
<Import-Package> <Import-Package>
org.apache.axis2.*; org.apache.axis2.*;version="${axis2.osgi.version.range}",
version="${axis2.osgi.version.range}",
org.osgi.framework, org.osgi.framework,
org.osgi.service.component, org.osgi.service.component,
org.apache.commons.logging, org.apache.commons.logging,
@ -90,7 +89,6 @@
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>org.wso2.carbon.logging</artifactId>
<version>${carbon.kernel.version}</version>
</dependency> </dependency>
<dependency> <dependency>

@ -22,7 +22,7 @@ import org.wso2.carbon.device.mgt.common.spi.DeviceManagerService;
/** /**
* @scr.component name="org.wso2.carbon.device.manager" immediate="true" * @scr.component name="org.wso2.carbon.device.manager" immediate="true"
* @scr.reference name="device.manager.service" * @scr.reference name="device.manager.service"
* interface="org.wso2.carbon.device.mgt.common.spi.DeviceManager" cardinality="1..n" * interface="org.wso2.carbon.device.mgt.common.spi.DeviceManagerService" cardinality="1..n"
* policy="dynamic" bind="setDeviceManagerService" unbind="unsetDeviceManagerService" * policy="dynamic" bind="setDeviceManagerService" unbind="unsetDeviceManagerService"
*/ */
public class DeviceMgtServiceComponent { public class DeviceMgtServiceComponent {
@ -31,13 +31,13 @@ public class DeviceMgtServiceComponent {
protected void setDeviceManagerService(DeviceManagerService deviceManager) { protected void setDeviceManagerService(DeviceManagerService deviceManager) {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Setting Data Sources Service"); log.debug("Setting Device Management Service");
} }
} }
protected void unsetDeviceManagerService(DeviceManagerService deviceManager) { protected void unsetDeviceManagerService(DeviceManagerService deviceManager) {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Unsetting Data Sources Service"); log.debug("Unsetting Device Management Service");
} }
} }

@ -0,0 +1,82 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>device-mgt</artifactId>
<groupId>org.wso2.carbon</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.device.mgt.mobile.impl</artifactId>
<version>2.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>WSO2 Carbon - Mobile Device Management Impl</name>
<description>WSO2 Carbon - Mobile Device Management Impl</description>
<url>http://wso2.org</url>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Description>Device Management Mobile Impl Bundle</Bundle-Description>
<Private-Package>org.wso2.carbon.device.mgt.mobile.impl.internal</Private-Package>
<Import-Package>
org.osgi.framework,
org.osgi.service.component,
org.apache.commons.logging,
</Import-Package>
<Export-Package>
!org.wso2.carbon.device.mgt.mobile.impl.internal,
org.wso2.carbon.device.mgt.mobile.impl.*
</Export-Package>
<DynamicImport-Package>*</DynamicImport-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
<version>3.2.0.v20090520-1800</version>
</dependency>
</dependencies>
</project>

@ -0,0 +1,85 @@
/*
* Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
* 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 org.wso2.carbon.device.mgt.mobile.impl.android;
import org.wso2.carbon.device.mgt.common.Device;
import org.wso2.carbon.device.mgt.common.DeviceManagementException;
import org.wso2.carbon.device.mgt.common.spi.DeviceManagerService;
import java.util.List;
/**
* This represents the Android implementation of DeviceManagerService. *
*/
public class AndroidDeviceManagerService implements DeviceManagerService {
private static final String DEVICE_MANAGER_ANDROID = "android";
@Override
public String getProviderType() {
return DEVICE_MANAGER_ANDROID;
}
@Override
public void enrollDevice(Device device) throws DeviceManagementException {
}
@Override
public void modifyEnrollment(Device device) throws DeviceManagementException {
}
@Override
public void disEnrollDevice(String type, String deviceId)
throws DeviceManagementException {
}
@Override
public boolean isRegistered(String type, String deviceId)
throws DeviceManagementException {
return false;
}
@Override
public boolean isActive(String type, String deviceId)
throws DeviceManagementException {
return false;
}
@Override
public void setActive(boolean status) throws DeviceManagementException {
}
@Override
public List<Device> getAllDeviceInfo(String type) throws DeviceManagementException {
return null;
}
@Override
public Device getDeviceInfo(String type, String deviceId)
throws DeviceManagementException {
return null;
}
@Override
public void setOwnership(String ownershipType) throws DeviceManagementException {
}
}

@ -0,0 +1,64 @@
/*
* Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
* 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 org.wso2.carbon.device.mgt.mobile.impl.internal;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.component.ComponentContext;
import org.wso2.carbon.device.mgt.common.spi.DeviceManagerService;
import org.wso2.carbon.device.mgt.mobile.impl.android.AndroidDeviceManagerService;
import org.wso2.carbon.device.mgt.mobile.impl.ios.IOSDeviceManagerService;
import org.wso2.carbon.device.mgt.mobile.impl.windows.WindowsDeviceManagerService;
/**
* @scr.component name="org.wso2.carbon.device.manager.mobile" immediate="true"
*/
public class MobileDeviceMgtServiceComponent {
private static final Log log = LogFactory.getLog(MobileDeviceMgtServiceComponent.class);
ServiceRegistration serviceRegistration;
protected void activate(ComponentContext ctx) {
try {
if (log.isDebugEnabled()) {
log.debug("Activating Mobile Device Management Service");
}
AndroidDeviceManagerService androidDeviceMgrService = new AndroidDeviceManagerService();
IOSDeviceManagerService iOSDeviceMgrService = new IOSDeviceManagerService();
WindowsDeviceManagerService windowsDeviceMgrService = new WindowsDeviceManagerService();
serviceRegistration =
ctx.getBundleContext().registerService(DeviceManagerService.class.getName(),
androidDeviceMgrService, null);
serviceRegistration =
ctx.getBundleContext().registerService(DeviceManagerService.class.getName(),
iOSDeviceMgrService, null);
serviceRegistration =
ctx.getBundleContext().registerService(DeviceManagerService.class.getName(),
windowsDeviceMgrService, null);
} catch (Throwable e) {
log.error("Unable to activate Mobile Device Management Service Component", e);
}
}
protected void deactivate(ComponentContext ctx) {
if (log.isDebugEnabled()) {
log.debug("Deactivating Mobile Device Management Service");
}
serviceRegistration.unregister();
}
}

@ -0,0 +1,85 @@
/*
* Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
* 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 org.wso2.carbon.device.mgt.mobile.impl.ios;
import org.wso2.carbon.device.mgt.common.Device;
import org.wso2.carbon.device.mgt.common.DeviceManagementException;
import org.wso2.carbon.device.mgt.common.spi.DeviceManagerService;
import java.util.List;
/**
* This represents the iOS implementation of DeviceManagerService. *
*/
public class IOSDeviceManagerService implements DeviceManagerService {
private static final String DEVICE_MANAGER_IOS = "ios";
@Override
public String getProviderType() {
return DEVICE_MANAGER_IOS;
}
@Override
public void enrollDevice(Device device) throws DeviceManagementException {
}
@Override
public void modifyEnrollment(Device device) throws DeviceManagementException {
}
@Override
public void disEnrollDevice(String type, String deviceId)
throws DeviceManagementException {
}
@Override
public boolean isRegistered(String type, String deviceId)
throws DeviceManagementException {
return false;
}
@Override
public boolean isActive(String type, String deviceId)
throws DeviceManagementException {
return false;
}
@Override
public void setActive(boolean status) throws DeviceManagementException {
}
@Override
public List<Device> getAllDeviceInfo(String type) throws DeviceManagementException {
return null;
}
@Override
public Device getDeviceInfo(String type, String deviceId)
throws DeviceManagementException {
return null;
}
@Override
public void setOwnership(String ownershipType) throws DeviceManagementException {
}
}

@ -0,0 +1,85 @@
/*
* Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
* 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 org.wso2.carbon.device.mgt.mobile.impl.windows;
import org.wso2.carbon.device.mgt.common.Device;
import org.wso2.carbon.device.mgt.common.DeviceManagementException;
import org.wso2.carbon.device.mgt.common.spi.DeviceManagerService;
import java.util.List;
/**
* This represents the Windows implementation of DeviceManagerService.
*/
public class WindowsDeviceManagerService implements DeviceManagerService {
private static final String DEVICE_MANAGER_WINDOWS = "windows";
@Override
public String getProviderType() {
return DEVICE_MANAGER_WINDOWS;
}
@Override
public void enrollDevice(Device device) throws DeviceManagementException {
}
@Override
public void modifyEnrollment(Device device) throws DeviceManagementException {
}
@Override
public void disEnrollDevice(String type, String deviceId)
throws DeviceManagementException {
}
@Override
public boolean isRegistered(String type, String deviceId)
throws DeviceManagementException {
return false;
}
@Override
public boolean isActive(String type, String deviceId)
throws DeviceManagementException {
return false;
}
@Override
public void setActive(boolean status) throws DeviceManagementException {
}
@Override
public List<Device> getAllDeviceInfo(String type) throws DeviceManagementException {
return null;
}
@Override
public Device getDeviceInfo(String type, String deviceId)
throws DeviceManagementException {
return null;
}
@Override
public void setOwnership(String ownershipType) throws DeviceManagementException {
}
}

@ -39,6 +39,7 @@
<modules> <modules>
<module>org.wso2.carbon.device.mgt.core</module> <module>org.wso2.carbon.device.mgt.core</module>
<module>org.wso2.carbon.device.mgt.common</module> <module>org.wso2.carbon.device.mgt.common</module>
<module>org.wso2.carbon.device.mgt.mobile.impl</module>
</modules> </modules>
<dependencyManagement> <dependencyManagement>
@ -63,7 +64,32 @@
<artifactId>org.wso2.carbon.device.mgt.common</artifactId> <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
<version>3.3.100.v20120522-1822</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
<version>1.7.2</version>
<executions>
<execution>
<id>generate-scr-scrdescriptor</id>
<goals>
<goal>scr</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>
</project> </project>

@ -0,0 +1,84 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ 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.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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.wso2.carbon</groupId>
<artifactId>policy-mgt</artifactId>
<version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.policy.evaluator</artifactId>
<version>2.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>WSO2 Carbon - Policy Decision Point</name>
<description>WSO2 Carbon - Policy Decision Point</description>
<url>http://wso2.org</url>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Description>Policy Management Common Bundle</Bundle-Description>
<Private-Package>org.wso2.carbon.policy.evaluator</Private-Package>
<Import-Package>
org.apache.commons.logging
</Import-Package>
<Export-Package>
org.wso2.carbon.policy.evaluator.*
</Export-Package>
<DynamicImport-Package>*</DynamicImport-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
</dependency>
</dependencies>
</project>

@ -0,0 +1,54 @@
/*
* Copyright (c) 2005-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.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.policy.evaluator;
public class PDPException extends Exception {
private String pdpErrorMessage;
public String getPdpErrorMessage() {
return pdpErrorMessage;
}
public void setPdpErrorMessage(String pdpErrorMessage) {
this.pdpErrorMessage = pdpErrorMessage;
}
public PDPException(String message) {
setPdpErrorMessage(message);
}
public PDPException(String message, Exception ex) {
super(message, ex);
setPdpErrorMessage(message);
}
public PDPException(String message, Throwable cause) {
super(message, cause);
setPdpErrorMessage(message);
}
public PDPException(Throwable cause) {
super(cause);
}
public PDPException(){
super();
}
}

@ -0,0 +1,25 @@
/*
* 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.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.policy.evaluator.spi;
public interface PDPService {
}

@ -0,0 +1,89 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ 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.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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.wso2.carbon</groupId>
<artifactId>policy-mgt</artifactId>
<version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
<version>2.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>WSO2 Carbon - Policy Management Common</name>
<description>WSO2 Carbon - Policy Management Common</description>
<url>http://wso2.org</url>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Description>Policy Management Common Bundle</Bundle-Description>
<Private-Package>org.wso2.carbon.policy.mgt.common.internal</Private-Package>
<Import-Package>
org.apache.commons.logging
</Import-Package>
<Export-Package>
org.wso2.carbon.policy.mgt.common.*
</Export-Package>
<DynamicImport-Package>*</DynamicImport-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
<version>${carbon.kernel.version}</version>
</dependency>
</dependencies>
</project>

@ -0,0 +1,27 @@
/*
* Copyright (c) 2005-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.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.policy.mgt.common;
public class Feature {
private String code;
private String name;
private Object attribute;
}

@ -0,0 +1,55 @@
/*
* 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.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.policy.mgt.common;
public class FeatureManagementException extends Exception{
private String errorMessage;
public String getErrorMessage() {
return errorMessage;
}
public void setErrorMessage(String errorMessage) {
this.errorMessage = errorMessage;
}
public FeatureManagementException(String message) {
super(message);
setErrorMessage(message);
}
public FeatureManagementException(String message, Exception ex) {
super(message, ex);
setErrorMessage(message);
}
public FeatureManagementException(String message, Throwable cause) {
super(message, cause);
setErrorMessage(message);
}
public FeatureManagementException() {
super();
}
public FeatureManagementException(Throwable cause) {
super(cause);
}
}

@ -0,0 +1,28 @@
/*
* 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.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.policy.mgt.common;
import java.util.List;
public class Policy {
private int id;
private String policyName;
private List<Feature> featuresList;
}

@ -0,0 +1,55 @@
/*
* Copyright (c) 2005-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.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.policy.mgt.common;
public class PolicyManagementException extends Exception {
private String policyErrorMessage;
public String getPolicyErrorMessage() {
return policyErrorMessage;
}
public void setPolicyErrorMessage(String policyErrorMessage) {
this.policyErrorMessage = policyErrorMessage;
}
public PolicyManagementException(String message) {
super(message);
setPolicyErrorMessage(message);
}
public PolicyManagementException(String message, Exception ex) {
super(message, ex);
setPolicyErrorMessage(message);
}
public PolicyManagementException(String message, Throwable cause) {
super(message, cause);
setPolicyErrorMessage(message);
}
public PolicyManagementException() {
super();
}
public PolicyManagementException(Throwable cause) {
super(cause);
}
}

@ -0,0 +1,30 @@
/*
* 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.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.policy.mgt.common.spi;
import org.wso2.carbon.policy.mgt.common.Policy;
public interface PolicyManagerService {
void addPolicy(Policy policy);
void addPolicy(String deviceId, String deviceType, Policy policy);
void addPolicy(String deviceType,Policy policy);
}

@ -0,0 +1,94 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ 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.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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.wso2.carbon</groupId>
<artifactId>policy-mgt</artifactId>
<version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
<version>2.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>WSO2 Carbon - Policy Management Core</name>
<description>WSO2 Carbon - Policy Management Core</description>
<url>http://wso2.org</url>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Description>Policy Management Core Bundle</Bundle-Description>
<Private-Package>org.wso2.carbon.policy.mgt.core.internal</Private-Package>
<Import-Package>
org.apache.axis2.*;
version="${axis2.osgi.version.range}",
org.osgi.framework,
org.osgi.service.component,
org.apache.commons.logging,
</Import-Package>
<Export-Package>
!org.wso2.carbon.policy.mgt.core.internal,
org.wso2.carbon.policy.mgt.core.*
</Export-Package>
<DynamicImport-Package>*</DynamicImport-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
<version>${carbon.kernel.version}</version>
</dependency>
</dependencies>
</project>

@ -0,0 +1,25 @@
/**
* Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
* 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 org.wso2.carbon.policy.mgt.core.internal;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
public class PolicyMgtServiceComponent {
private static Log log = LogFactory.getLog(PolicyMgtServiceComponent.class);
}

@ -0,0 +1,65 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ 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.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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.wso2.carbon</groupId>
<artifactId>wso2cdm-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId>
<artifactId>policy-mgt</artifactId>
<version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>WSO2 Carbon - Policy Management Component</name>
<url>http://wso2.org</url>
<modules>
<module>org.wso2.carbon.policy.mgt.core</module>
<module>org.wso2.carbon.policy.mgt.common</module>
<module>org.wso2.carbon.policy.evalutor</module>
</modules>
<dependencyManagement>
<dependencies>
<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>4.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>

@ -39,6 +39,7 @@
<modules> <modules>
<module>components/device-mgt</module> <module>components/device-mgt</module>
<module>components/policy-mgt</module>
<module>product/modules/p2-profile-gen</module> <module>product/modules/p2-profile-gen</module>
<module>product/modules/distribution</module> <module>product/modules/distribution</module>
<module>product/modules/integration</module> <module>product/modules/integration</module>

@ -104,16 +104,16 @@
<!--<property name="shindig.version" value="2.5.0-beta5"/>--> <!--<property name="shindig.version" value="2.5.0-beta5"/>-->
<mkdir dir="${tempdir}"/> <mkdir dir="${tempdir}"/>
<mkdir dir="${tempdir}/wso2emm-${project.version}/repository/components"/> <mkdir dir="${tempdir}/wso2cdm-${project.version}/repository/components"/>
<unzip dest="${tempdir}"> <unzip dest="${tempdir}">
<fileset dir="target"> <fileset dir="target">
<include name="wso2emm-${project.version}.zip"/> <include name="wso2cdm-${project.version}.zip"/>
</fileset> </fileset>
</unzip> </unzip>
<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components" <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components"
overwrite="true"> overwrite="true">
<fileset <fileset
dir="${tempdir}/wso2emm-${project.version}/repository/components"></fileset> dir="${tempdir}/wso2cdm-${project.version}/repository/components"></fileset>
</copy> </copy>
<!--testing --> <!--testing -->
<!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" <!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar"
@ -137,7 +137,7 @@
og4j.logger.net.sf.ehcache=ERROR og4j.logger.net.sf.ehcache=ERROR
</concat> </concat>
<delete file="target/wso2emm-${project.version}.zip"/> <!--<delete file="target/wso2cdm-${project.version}.zip"/>-->
<delete dir="${tempdir}"/> <delete dir="${tempdir}"/>
</tasks> </tasks>
</configuration> </configuration>
@ -178,7 +178,7 @@
<delete dir="target/dependency-maven-plugin-markers"/> <delete dir="target/dependency-maven-plugin-markers"/>
<delete dir="target/maven-archiver"/> <delete dir="target/maven-archiver"/>
<delete dir="target/wso2carbon-core-${carbon.kernel.version}"/> <delete dir="target/wso2carbon-core-${carbon.kernel.version}"/>
<delete file="target/wso2emm-${project.version}.jar"/> <!--<delete file="target/wso2cdm-${project.version}.jar"/>-->
<delete dir="target/sources"/> <delete dir="target/sources"/>
<delete dir="target/site"/> <delete dir="target/site"/>
<delete dir="target/antrun"/> <delete dir="target/antrun"/>
@ -197,7 +197,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.5.2</version> <!--<version>2.5.2</version>-->
<executions> <executions>
<execution> <execution>
<id>1-pre-dist</id> <id>1-pre-dist</id>
@ -217,13 +217,14 @@
</configuration> </configuration>
</execution> </execution>
<!-- <execution> <execution>
<id>2-dist</id> <id>2-dist</id>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>attached</goal> <goal>attached</goal>
</goals> </goals>
<configuration> <configuration>
<appendAssemblyId>false</appendAssemblyId>
<filters> <filters>
<filter>${basedir}/src/assembly/filter.properties</filter> <filter>${basedir}/src/assembly/filter.properties</filter>
</filters> </filters>
@ -231,7 +232,7 @@
<descriptor>${basedir}/src/assembly/bin.xml</descriptor> <descriptor>${basedir}/src/assembly/bin.xml</descriptor>
</descriptors> </descriptors>
</configuration> </configuration>
</execution>--> </execution>
</executions> </executions>
</plugin> </plugin>

@ -1,5 +1,5 @@
<assembly> <assembly>
<!--<id>bin</id>--> <id>bin</id>
<formats> <formats>
<format>zip</format> <format>zip</format>
</formats> </formats>
@ -8,8 +8,8 @@
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>target/wso2carbon-core-${carbon.kernel.version}</directory> <directory>target/wso2carbon-core-${carbon.kernel.version}</directory>
<outputDirectory>wso2emm-${project.version}</outputDirectory> <outputDirectory>wso2cdm-${pom.version}</outputDirectory>
<excludes> <!-- <excludes>
<exclude>**/*.sh</exclude> <exclude>**/*.sh</exclude>
<exclude>**/README*</exclude> <exclude>**/README*</exclude>
<exclude>**/LICENSE*</exclude> <exclude>**/LICENSE*</exclude>
@ -22,40 +22,40 @@
<exclude>**/version.txt</exclude> <exclude>**/version.txt</exclude>
<exclude>**/axis2/axis2.xml</exclude> <exclude>**/axis2/axis2.xml</exclude>
<exclude>**/master-datasources.xml</exclude> <exclude>**/master-datasources.xml</exclude>
</excludes> </excludes>-->
</fileSet> </fileSet>
<!--copying runtimes--> <!--copying runtimes-->
<fileSet> <fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes</directory> <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes</directory>
<outputDirectory>wso2emm-${project.version}/lib/runtimes/</outputDirectory> <outputDirectory>wso2cdm-${pom.version}/lib/runtimes/</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
</includes> </includes>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>target/wso2carbon-core-${carbon.kernel.version}</directory> <directory>target/wso2carbon-core-${carbon.kernel.version}</directory>
<outputDirectory>wso2emm-${project.version}</outputDirectory> <outputDirectory>wso2cdm-${pom.version}</outputDirectory>
<includes> <includes>
<include>**/*.sh</include> <include>**/*.sh</include>
</includes> </includes>
<fileMode>755</fileMode> <fileMode>755</fileMode>
</fileSet> </fileSet>
<fileSet> <!-- <fileSet>
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/
</directory> </directory>
<outputDirectory>wso2emm-${project.version}/dbscripts/identity</outputDirectory> <outputDirectory>wso2cdm-${project.version}/dbscripts/identity</outputDirectory>
<includes> <includes>
<include>**/**.sql</include> <include>**/**.sql</include>
</includes> </includes>
</fileSet> </fileSet>-->
<!--Multitenancy related file --> <!--Multitenancy related file -->
<fileSet> <fileSet>
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
</directory> </directory>
<outputDirectory>wso2emm-${project.version}/repository/conf/multitenancy</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf/multitenancy</outputDirectory>
<includes> <includes>
<include>**/stratos.xml</include> <include>**/stratos.xml</include>
<include>**/multitenancy-packages.xml</include> <include>**/multitenancy-packages.xml</include>
@ -68,7 +68,7 @@
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
</directory> </directory>
<outputDirectory>wso2emm-${project.version}/repository/conf</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf</outputDirectory>
<includes> <includes>
<include>**/tenant-mgt.xml</include> <include>**/tenant-mgt.xml</include>
</includes> </includes>
@ -76,14 +76,14 @@
<fileSet> <fileSet>
<directory>src/repository/resources/styles/css</directory> <directory>src/repository/resources/styles/css</directory>
<outputDirectory>wso2emm-${project.version}/resources/allthemes/Default/admin</outputDirectory> <outputDirectory>wso2cdm-${project.version}/resources/allthemes/Default/admin</outputDirectory>
<includes> <includes>
<include>**/**.css</include> <include>**/**.css</include>
</includes> </includes>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>src/repository/resources/styles/images</directory> <directory>src/repository/resources/styles/images</directory>
<outputDirectory>wso2emm-${project.version}/resources/allthemes/Default/images</outputDirectory> <outputDirectory>wso2cdm-${project.version}/resources/allthemes/Default/images</outputDirectory>
<includes> <includes>
<include>**/**.gif</include> <include>**/**.gif</include>
<include>**/**.png</include> <include>**/**.png</include>
@ -94,13 +94,13 @@
<!-- copy documentation --> <!-- copy documentation -->
<fileSet> <fileSet>
<directory>target/site</directory> <directory>target/site</directory>
<outputDirectory>wso2emm-${project.version}/docs</outputDirectory> <outputDirectory>wso2cdm-${project.version}/docs</outputDirectory>
<fileMode>755</fileMode> <fileMode>755</fileMode>
</fileSet> </fileSet>
<!-- copy the landing page webapp --> <!-- copy the landing page webapp -->
<fileSet> <fileSet>
<directory>src/repository/resources/stratos_root</directory> <directory>src/repository/resources/stratos_root</directory>
<outputDirectory>wso2emm-${project.version}/repository/deployment/server/webapps/STRATOS_ROOT</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/deployment/server/webapps/STRATOS_ROOT</outputDirectory>
<fileMode>755</fileMode> <fileMode>755</fileMode>
</fileSet> </fileSet>
<fileSet> <fileSet>
@ -110,7 +110,7 @@
<include>*/**</include> <include>*/**</include>
</includes> </includes>
</fileSet> </fileSet>
<fileSet> <!-- <fileSet>
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps
</directory> </directory>
@ -124,10 +124,10 @@
<exclude>**/fakepublisher/</exclude> <exclude>**/fakepublisher/</exclude>
<exclude>**/fakestore/</exclude> <exclude>**/fakestore/</exclude>
</excludes> </excludes>
</fileSet> </fileSet>-->
<!--copy jaxrs web app for OAuth feature--> <!--copy jaxrs web app for OAuth feature-->
<fileSet> <!-- <fileSet>
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps
</directory> </directory>
@ -137,7 +137,7 @@
</includes> </includes>
</fileSet> </fileSet>
<!--copy web app for application authentication feature --> &lt;!&ndash;copy web app for application authentication feature &ndash;&gt;
<fileSet> <fileSet>
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps
@ -146,10 +146,10 @@
<includes> <includes>
<include>authenticationendpoint.war</include> <include>authenticationendpoint.war</include>
</includes> </includes>
</fileSet> </fileSet>-->
<fileSet> <fileSet>
<directory>src/repository/conf</directory> <directory>src/repository/conf</directory>
<outputDirectory>wso2emm-${project.version}/repository/conf</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf</outputDirectory>
<includes> <includes>
<include>**/api-manager.xml</include> <include>**/api-manager.xml</include>
<include>**/sso-idp-config.xml</include> <include>**/sso-idp-config.xml</include>
@ -159,7 +159,7 @@
<fileSet> <fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/ <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/
</directory> </directory>
<outputDirectory>wso2emm-${project.version}/repository/conf/security/</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf/security/</outputDirectory>
<includes> <includes>
<include>**/entitlement.properties</include> <include>**/entitlement.properties</include>
<include>**/trusted-idp-config.xml</include> <include>**/trusted-idp-config.xml</include>
@ -167,14 +167,14 @@
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>src/repository/conf/datasources</directory> <directory>src/repository/conf/datasources</directory>
<outputDirectory>wso2emm-${project.version}/repository/conf/datasources</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf/datasources</outputDirectory>
<includes> <includes>
<include>**/master-datasources.xml</include> <include>**/master-datasources.xml</include>
</includes> </includes>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>src/repository/resources</directory> <directory>src/repository/resources</directory>
<outputDirectory>wso2emm-${project.version}/repository/resources</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/resources</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
</includes> </includes>
@ -182,12 +182,12 @@
<!--data-bridge configuration--> <!--data-bridge configuration-->
<fileSet> <fileSet>
<directory>src/repository/conf/data-bridge</directory> <directory>src/repository/conf/data-bridge</directory>
<outputDirectory>wso2emm-${project.version}/repository/conf/data-bridge</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf/data-bridge</outputDirectory>
<fileMode>755</fileMode> <fileMode>755</fileMode>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.version}/lib/runtimes</directory> <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.version}/lib/runtimes</directory>
<outputDirectory>wso2emm-${project.version}/lib/runtimes/</outputDirectory> <outputDirectory>wso2cdm-${project.version}/lib/runtimes/</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
</includes> </includes>
@ -195,14 +195,14 @@
<fileSet> <fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/service-provider <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/service-provider
</directory> </directory>
<outputDirectory>wso2emm-${project.version}/dbscripts/service-provider</outputDirectory> <outputDirectory>wso2cdm-${project.version}/dbscripts/service-provider</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
</includes> </includes>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules</directory> <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules</directory>
<outputDirectory>wso2emm-${project.version}/modules/</outputDirectory> <outputDirectory>wso2cdm-${project.version}/modules/</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
</includes> </includes>
@ -212,7 +212,7 @@
<!-- Script --> <!-- Script -->
<fileSet> <fileSet>
<directory>src/repository/dbscripts/</directory> <directory>src/repository/dbscripts/</directory>
<outputDirectory>wso2emm-${project.version}/dbscripts</outputDirectory> <outputDirectory>wso2cdm-${project.version}/dbscripts</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
</includes> </includes>
@ -222,13 +222,13 @@
</fileSets> </fileSets>
<dependencySets> <dependencySets>
<dependencySet> <dependencySet>
<outputDirectory>wso2emm-${project.version}/lib/endorsed</outputDirectory> <outputDirectory>wso2cdm-${project.version}/lib/endorsed</outputDirectory>
<includes> <includes>
<include>javax.el:el-api:jar</include> <include>javax.el:el-api:jar</include>
</includes> </includes>
</dependencySet> </dependencySet>
<dependencySet> <dependencySet>
<outputDirectory>wso2emm-${project.version}/repository/deployment/client/modules <outputDirectory>wso2cdm-${project.version}/repository/deployment/client/modules
</outputDirectory> </outputDirectory>
<includes> <includes>
<include>org.hibernate.wso2:hibernate:jar</include> <include>org.hibernate.wso2:hibernate:jar</include>
@ -238,11 +238,11 @@
</dependencySets> </dependencySets>
<files> <files>
<file> <!-- <file>
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml
</source> </source>
<outputDirectory>wso2emm-${project.version}/repository/conf/tomcat</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf/tomcat</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
@ -250,115 +250,115 @@
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml
</source> </source>
<outputDirectory>wso2emm-${project.version}/repository/conf/tomcat</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf/tomcat</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>-->
<file> <file>
<source>src/repository/conf/tomcat/context.xml</source> <source>src/repository/conf/tomcat/context.xml</source>
<outputDirectory>wso2emm-${project.version}/repository/conf/tomcat</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf/tomcat</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <!-- <file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml
</source> </source>
<outputDirectory>wso2emm-${project.version}/repository/conf/</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf/</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>-->
<file> <file>
<source>INSTALL.txt</source> <source>INSTALL.txt</source>
<outputDirectory>wso2emm-${project.version}</outputDirectory> <outputDirectory>wso2cdm-${project.version}</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <file>
<source>README.txt</source> <source>README.txt</source>
<outputDirectory>wso2emm-${project.version}</outputDirectory> <outputDirectory>wso2cdm-${project.version}</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <file>
<source>LICENSE.txt</source> <source>LICENSE.txt</source>
<outputDirectory>wso2emm-${project.version}</outputDirectory> <outputDirectory>wso2cdm-${project.version}</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <file>
<source>release-notes.html</source> <source>release-notes.html</source>
<outputDirectory>wso2emm-${project.version}</outputDirectory> <outputDirectory>wso2cdm-${project.version}</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <file>
<source>target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt</source> <source>target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt</source>
<outputDirectory>wso2emm-${project.version}/bin/</outputDirectory> <outputDirectory>wso2cdm-${project.version}/bin/</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <file>
<source>target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt</source> <source>target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt</source>
<outputDirectory>wso2emm-${project.version}/bin/</outputDirectory> <outputDirectory>wso2cdm-${project.version}/bin/</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!--copy default xacml policy to repository/resources/security --> <!--copy default xacml policy to repository/resources/security -->
<file> <!-- <file>
<source>src/repository/resources/policies/xacml/default/admin.xml</source> <source>src/repository/resources/policies/xacml/default/admin.xml</source>
<outputDirectory>wso2emm-${project.version}/repository/resources/security/policies/xacml/default <outputDirectory>wso2cdm-${project.version}/repository/resources/security/policies/xacml/default
</outputDirectory> </outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
</file> </file>-->
<file> <file>
<source>src/repository/conf/log4j.properties</source> <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/log4j.properties</source>
<outputDirectory>wso2emm-${project.version}/repository/conf/</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf/</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
</file> </file>
<file> <file>
<source>src/repository/conf/multitenancy/cloud-services-desc.xml</source> <source>src/repository/conf/multitenancy/cloud-services-desc.xml</source>
<outputDirectory>wso2emm-${project.version}/repository/conf/multitenancy/</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf/multitenancy/</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
</file> </file>
<file> <file>
<source>src/repository/conf/axis2/axis2.xml</source> <source>src/repository/conf/axis2/axis2.xml</source>
<outputDirectory>wso2emm-${project.version}/repository/conf/axis2/</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf/axis2/</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <file>
<source>src/repository/conf/application-authenticators.xml</source> <source>src/repository/conf/application-authenticators.xml</source>
<outputDirectory>wso2emm-${project.version}/repository/conf/security/</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf/security/</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <file>
<source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/README</source> <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/README</source>
<outputDirectory>wso2emm-${project.version}/repository/conf/</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf/</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <file>
<source>src/repository/conf/identity.xml</source> <source>src/repository/conf/identity.xml</source>
<outputDirectory>wso2emm-${project.version}/repository/conf</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf</outputDirectory>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <file>
<source>src/repository/database/WSO2EMM_DB.h2.db</source> <source>src/repository/database/WSO2EMM_DB.h2.db</source>
<outputDirectory>wso2emm-${project.version}/repository/database</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/database</outputDirectory>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!-- nTask Component --> <!-- nTask Component -->
<file> <!-- <file>
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/tasks-config.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/tasks-config.xml
</source> </source>
<outputDirectory>wso2emm-${project.version}/repository/conf/etc</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/conf/etc</outputDirectory>
</file> </file>-->
<!-- End - nTask Component --> <!-- End - nTask Component -->
</files> </files>

@ -16,7 +16,7 @@
~ under the License. ~ under the License.
--> -->
<assembly> <assembly>
<id>1-pre-dist</id> <id>wso2-cdm-dist</id>
<formats> <formats>
<format>zip</format> <format>zip</format>
</formats> </formats>
@ -26,7 +26,7 @@
<!-- Copying p2 profile and osgi bundles--> <!-- Copying p2 profile and osgi bundles-->
<fileSet> <fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components</directory> <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components</directory>
<outputDirectory>wso2emm-${project.version}/repository/components</outputDirectory> <outputDirectory>wso2cdm-${project.version}/repository/components</outputDirectory>
<excludes> <excludes>
<exclude>**/eclipse.ini</exclude> <exclude>**/eclipse.ini</exclude>
<exclude>**/*.lock</exclude> <exclude>**/*.lock</exclude>

@ -25,7 +25,7 @@
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>target/site</directory> <directory>target/site</directory>
<outputDirectory>wso2emm-${project.version}-docs</outputDirectory> <outputDirectory>wso2cdm-${project.version}-docs</outputDirectory>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>../../modules/documentation/src/site/xdoc/user-core</directory> <directory>../../modules/documentation/src/site/xdoc/user-core</directory>

@ -1,6 +1,6 @@
product.name=WSO2 Connected Device Manager product.name=WSO2 Connected Device Manager
product.version=2.0.0-SNAPSHOT product.version=2.0.0-SNAPSHOT
product.key=EMM product.key=CDM
hotdeployment=true hotdeployment=true
hotupdate=true hotupdate=true
carbon.version=4.3.0 carbon.version=4.3.0

@ -32,5 +32,5 @@
<groupId>org.wso2.cdm</groupId> <groupId>org.wso2.cdm</groupId>
<artifactId>org.wso2.cdm.integration.common.clients</artifactId> <artifactId>org.wso2.cdm.integration.common.clients</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>admin-clents</name> <name>WSO2 CDM - Integration Admin Clients</name>
</project> </project>

@ -32,7 +32,7 @@
<artifactId>org.wso2.cdm.integration.common.utils</artifactId> <artifactId>org.wso2.cdm.integration.common.utils</artifactId>
<groupId>org.wso2.cdm</groupId> <groupId>org.wso2.cdm</groupId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>integration-test-utils</name> <name>WSO2 CDM - Integration Test Utils</name>
<licenses> <licenses>
<license> <license>

@ -32,7 +32,7 @@
<groupId>org.wso2.cdm</groupId> <groupId>org.wso2.cdm</groupId>
<artifactId>org.wso2.cdm.integration.ui.pages</artifactId> <artifactId>org.wso2.cdm.integration.ui.pages</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>integration-test-ui-pages</name> <name>WSO2 CDM - Integration Test Ui Pages</name>
<dependencies> <dependencies>

@ -28,6 +28,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>wso2cdm-profile-gen</artifactId> <artifactId>wso2cdm-profile-gen</artifactId>
<name>WSO2 Connected Device Manager (CDM) - P2 Profile Gen</name>
<packaging>pom</packaging> <packaging>pom</packaging>
<build> <build>

Loading…
Cancel
Save