Commit 44646ac1 authored by Larry Sachs's avatar Larry Sachs Committed by George Nash

Change uri so they don't start with /oic/

Per spec, uri cannot start with /oic/
Uri that started with /oic/upnp/ now starts with /upnp/

Change-Id: If1e560a898530628cb821ab1ae27242f5d39215c
Signed-off-by: Larry Sachs's avatarLarry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18547Tested-by: default avatarjenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash's avatarGeorge Nash <george.nash@intel.com>
parent f1c2f8b7
......@@ -37,7 +37,7 @@ import org.iotivity.base.OcRepresentation;
public class AvTransport extends Service implements Parcelable {
public static final String UPNP_OIC_TYPE_AV_TRANSPORT = "oic.r.av.transport";
public static final String UPNP_OIC_URI_PREFIX_AV_TRANSPORT = "/oic/upnp/av-transport/";
public static final String UPNP_OIC_URI_PREFIX_AV_TRANSPORT = "/upnp/av-transport/";
public static final String AV_TRANSPORT_URI_KEY = "avTransportUri";
public static final String DESIRED_URI_KEY = "currentUri";
......
......@@ -38,7 +38,7 @@ import java.util.Map;
public class ConnectionManager extends Service {
public static final String UPNP_OIC_TYPE_CONNECTION_MANAGER = "oic.r.connection.manager";
public static final String UPNP_OIC_URI_PREFIX_CONNECTION_MANAGER = "/oic/upnp/connection-manager/";
public static final String UPNP_OIC_URI_PREFIX_CONNECTION_MANAGER = "/upnp/connection-manager/";
public static final String PROTOCOL_INFO_KEY = "protocolInfo";
public static final String PROTOCOL_INFO_SOURCE_KEY = "source";
......
......@@ -37,7 +37,7 @@ import org.iotivity.base.OcRepresentation;
public class ContentDirectory extends Service implements Parcelable {
public static final String UPNP_OIC_TYPE_CONTENT_DIRECTORY = "oic.r.content.directory";
public static final String UPNP_OIC_URI_PREFIX_CONTENT_DIRECTORY = "/oic/upnp/content-directory/";
public static final String UPNP_OIC_URI_PREFIX_CONTENT_DIRECTORY = "/upnp/content-directory/";
public static final String SYSTEM_UPDATE_ID_KEY = "systemUpdateId";
public static final String SEARCH_CAPS_KEY = "searchCaps";
......
......@@ -34,7 +34,7 @@ import org.iotivity.base.OcRepresentation;
public class MediaRenderer extends Device {
public static final String UPNP_OIC_TYPE_DEVICE_MEDIA_RENDERER = "oic.d.media.renderer";
public static final String UPNP_OIC_URI_PREFIX_MEDIA_RENDERER = "/oic/upnp/media/renderer/";
public static final String UPNP_OIC_URI_PREFIX_MEDIA_RENDERER = "/upnp/media/renderer/";
private RenderingControl mRenderingControl;
private ConnectionManager mConnectionManager;
......
......@@ -34,7 +34,7 @@ import org.iotivity.base.OcRepresentation;
public class MediaServer extends Device {
public static final String UPNP_OIC_TYPE_DEVICE_MEDIA_SERVER = "oic.d.media.server";
public static final String UPNP_OIC_URI_PREFIX_MEDIA_SERVER = "/oic/upnp/media/server/";
public static final String UPNP_OIC_URI_PREFIX_MEDIA_SERVER = "/upnp/media/server/";
private ContentDirectory mContentDirectory;
private ConnectionManager mConnectionManager;
......
......@@ -37,7 +37,7 @@ import org.iotivity.base.OcRepresentation;
public class RenderingControl extends Service implements Parcelable {
public static final String UPNP_OIC_TYPE_RENDERING_CONTROL = "oic.r.rendering.control";
public static final String UPNP_OIC_URI_PREFIX_RENDERING_CONTROL = "/oic/upnp/rendering-control/";
public static final String UPNP_OIC_URI_PREFIX_RENDERING_CONTROL = "/upnp/rendering-control/";
public static final String VOLUME_KEY = "volume";
public static final String MUTE_KEY = "mute";
......
......@@ -34,7 +34,7 @@ import org.iotivity.base.OcRepresentation;
public class BinarySwitch extends Service {
public static final String UPNP_OIC_TYPE_BINARY_SWITCH = "oic.r.switch.binary";
public static final String UPNP_OIC_URI_PREFIX_BINARY_SWITCH = "/oic/upnp/switch/";
public static final String UPNP_OIC_URI_PREFIX_BINARY_SWITCH = "/upnp/switch/";
public static final String VALUE_KEY = "value";
public static final boolean DEFAULT_VALUE = false;
......
......@@ -34,7 +34,7 @@ import org.iotivity.base.OcRepresentation;
public class Brightness extends Service {
public static final String UPNP_OIC_TYPE_BRIGHTNESS = "oic.r.light.brightness";
public static final String UPNP_OIC_URI_PREFIX_BRIGHTNESS = "/oic/upnp/brightness/";
public static final String UPNP_OIC_URI_PREFIX_BRIGHTNESS = "/upnp/brightness/";
public static final String BRIGHTNESS_KEY = "brightness";
public static final int DEFAULT_BRIGHTNESS = 100;
......
......@@ -34,7 +34,7 @@ import org.iotivity.base.OcRepresentation;
public class Light extends Device {
public static final String UPNP_OIC_TYPE_DEVICE_LIGHT = "oic.d.light";
public static final String UPNP_OIC_URI_PREFIX_LIGHT = "/oic/upnp/light/";
public static final String UPNP_OIC_URI_PREFIX_LIGHT = "/upnp/light/";
private BinarySwitch mBinarySwitch;
private Brightness mBrightness;
......
......@@ -55,30 +55,30 @@ static const std::string UPNP_OIC_TYPE_WAN_PPP_CONNECTION = "oic.r.wan.p
static const std::string UPNP_OIC_TYPE_LAN_HOST_CONFIG = "oic.r.lan.config";
// URI prefix (URI = URI_PREFIX + UDN)
static const std::string UPNP_OIC_URI_PREFIX_LIGHT = "/oic/upnp/light/";
static const std::string UPNP_OIC_IRI_PREFIX_BRIGHTNESS = "/oic/upnp/brightness/";
static const std::string UPNP_OIC_URI_PREFIX_POWER_SWITCH = "/oic/upnp/switch/";
static const std::string UPNP_OIC_URI_PREFIX_INET_GATEWAY = "/oic/upnp/igd/";
static const std::string UPNP_OIC_URI_PREFIX_LAYER3_FORWARDING = "/oic/upnp/l3f/";
static const std::string UPNP_OIC_URI_PREFIX_DEVICE_PROTECTION = "/oic/upnp/device-protection/";
static const std::string UPNP_OIC_URI_PREFIX_WAN = "/oic/upnp/wan/";
static const std::string UPNP_OIC_URI_PREFIX_WAN_IF_CONFIG = "/oic/upnp/wan/ifconfig/";
static const std::string UPNP_OIC_URI_PREFIX_WAN_CABLE_LINK_CONFIG = "/oic/upnp/wan/cableconfig";
static const std::string UPNP_OIC_URI_PREFIX_WAN_DSL_LINK_CONFIG = "/oic/upnp/wan/dslconfig";
static const std::string UPNP_OIC_URI_PREFIX_WAN_ETHERNET_CONFIG = "/oic/upnp/wan/ethernetconfig";
static const std::string UPNP_OIC_URI_PREFIX_WAN_POTS_LINK_CONFIG = "/oic/upnp/wan/potsconfig";
static const std::string UPNP_OIC_URI_PREFIX_WAN_CONNECTION = "/oic/upnp/wan/connection";
static const std::string UPNP_OIC_URI_PREFIX_WAN_IP_CONNECTION = "/oic/upnp/wan/ip";
static const std::string UPNP_OIC_URI_PREFIX_WAN_PPP_CONNECTION = "/oic/upnp/wan/ppp";
static const std::string UPNP_OIC_URI_PREFIX_LAN = "/oic/upnp/lan";
static const std::string UPNP_OIC_URI_PREFIX_LAN_HOST_CONFIG = "/oic/upnp/lan/hostconfig";
static const std::string UPNP_OIC_URI_PREFIX_MEDIA_RENDERER = "/oic/upnp/media/renderer/";
static const std::string UPNP_OIC_URI_PREFIX_MEDIA_SERVER = "/oic/upnp/media/server/";
static const std::string UPNP_OIC_URI_PREFIX_CONNECTION_MANAGER = "/oic/upnp/connection-manager/";
static const std::string UPNP_OIC_URI_PREFIX_AV_TRANSPORT = "/oic/upnp/av-transport/";
static const std::string UPNP_OIC_URI_PREFIX_CONTENT_DIRECTORY = "/oic/upnp/content-directory/";
static const std::string UPNP_OIC_URI_PREFIX_RENDERING_CONTROL = "/oic/upnp/rendering-control/";
static const std::string UPNP_OIC_URI_PREFIX_SCHEDULED_RECORDING = "/oic/upnp/scheduled-recording/";
static const std::string UPNP_OIC_URI_PREFIX_LIGHT = "/upnp/light/";
static const std::string UPNP_OIC_URI_PREFIX_BRIGHTNESS = "/upnp/brightness/";
static const std::string UPNP_OIC_URI_PREFIX_POWER_SWITCH = "/upnp/switch/";
static const std::string UPNP_OIC_URI_PREFIX_INET_GATEWAY = "/upnp/igd/";
static const std::string UPNP_OIC_URI_PREFIX_LAYER3_FORWARDING = "/upnp/l3f/";
static const std::string UPNP_OIC_URI_PREFIX_DEVICE_PROTECTION = "/upnp/device-protection/";
static const std::string UPNP_OIC_URI_PREFIX_WAN = "/upnp/wan/";
static const std::string UPNP_OIC_URI_PREFIX_WAN_IF_CONFIG = "/upnp/wan/ifconfig/";
static const std::string UPNP_OIC_URI_PREFIX_WAN_CABLE_LINK_CONFIG = "/upnp/wan/cableconfig";
static const std::string UPNP_OIC_URI_PREFIX_WAN_DSL_LINK_CONFIG = "/upnp/wan/dslconfig";
static const std::string UPNP_OIC_URI_PREFIX_WAN_ETHERNET_CONFIG = "/upnp/wan/ethernetconfig";
static const std::string UPNP_OIC_URI_PREFIX_WAN_POTS_LINK_CONFIG = "/upnp/wan/potsconfig";
static const std::string UPNP_OIC_URI_PREFIX_WAN_CONNECTION = "/upnp/wan/connection";
static const std::string UPNP_OIC_URI_PREFIX_WAN_IP_CONNECTION = "/upnp/wan/ip";
static const std::string UPNP_OIC_URI_PREFIX_WAN_PPP_CONNECTION = "/upnp/wan/ppp";
static const std::string UPNP_OIC_URI_PREFIX_LAN = "/upnp/lan";
static const std::string UPNP_OIC_URI_PREFIX_LAN_HOST_CONFIG = "/upnp/lan/hostconfig";
static const std::string UPNP_OIC_URI_PREFIX_MEDIA_RENDERER = "/upnp/media/renderer/";
static const std::string UPNP_OIC_URI_PREFIX_MEDIA_SERVER = "/upnp/media/server/";
static const std::string UPNP_OIC_URI_PREFIX_CONNECTION_MANAGER = "/upnp/connection-manager/";
static const std::string UPNP_OIC_URI_PREFIX_AV_TRANSPORT = "/upnp/av-transport/";
static const std::string UPNP_OIC_URI_PREFIX_CONTENT_DIRECTORY = "/upnp/content-directory/";
static const std::string UPNP_OIC_URI_PREFIX_RENDERING_CONTROL = "/upnp/rendering-control/";
static const std::string UPNP_OIC_URI_PREFIX_SCHEDULED_RECORDING = "/upnp/scheduled-recording/";
// AV transport service, and Rendering control service query params
static const std::string UPNP_OIC_QUERY_PARAM_INSTANCE_ID = "iid";
......
......@@ -107,7 +107,7 @@ static std::map<std::string, std::string > UpnpInterfaceMap =
static std::map<std::string, std::string > UpnpUriPrefixMap =
{
{UPNP_OIC_TYPE_DEVICE_LIGHT, UPNP_OIC_URI_PREFIX_LIGHT},
{UPNP_OIC_TYPE_BRIGHTNESS, UPNP_OIC_IRI_PREFIX_BRIGHTNESS},
{UPNP_OIC_TYPE_BRIGHTNESS, UPNP_OIC_URI_PREFIX_BRIGHTNESS},
{UPNP_OIC_TYPE_POWER_SWITCH, UPNP_OIC_URI_PREFIX_POWER_SWITCH},
{UPNP_OIC_TYPE_DEVICE_INET_GATEWAY, UPNP_OIC_URI_PREFIX_INET_GATEWAY},
{UPNP_OIC_TYPE_DEVICE_WAN, UPNP_OIC_URI_PREFIX_WAN},
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment