201015
authorhgs
Tue, 01 Jun 2010 23:31:49 +0530
changeset 15 a7bf91e74567
parent 9 e84a4b44b2e8
child 16 738a02800a7a
201015
servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp
servicediscoveryandcontrol/pnp/test/upnp/Server/StringDictionary/upnpdeviceschema.st
servicediscoveryandcontrol/pnp/test/upnp/Server/StringDictionary/upnpserviceschema.st
servicediscoveryandcontrol/pnp/test/upnp/group/application-protocols_upnp.mrp
servicediscoveryandcontrol/pnp/test/upnp/unittests/upnpdescriptiontest/StringDictionary/testvendordeviceschema.st
servicediscoveryandcontrol/pnp/test/upnp/unittests/upnpdescriptiontest/StringDictionary/testvendorserviceschema.st
servicediscoveryandcontrol/pnp/test/upnp/upnpdescription/StringDictionary/upnpdescriptionschema.st
servicediscoveryandcontrol/pnp/test/upnp/upnputils/strings/UpnpStringConstants.st
srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp
--- a/servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp	Fri Apr 16 15:55:43 2010 +0300
+++ b/servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp	Tue Jun 01 23:31:49 2010 +0530
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
-#
-
 component	servicediscoveryframework
 source	\sf\mw\srvdiscovery\servicediscoveryandcontrol\pnp
 binary	\sf\mw\srvdiscovery\servicediscoveryandcontrol\pnp\group	all
--- a/servicediscoveryandcontrol/pnp/test/upnp/Server/StringDictionary/upnpdeviceschema.st	Fri Apr 16 15:55:43 2010 +0300
+++ b/servicediscoveryandcontrol/pnp/test/upnp/Server/StringDictionary/upnpdeviceschema.st	Tue Jun 01 23:31:49 2010 +0530
@@ -1,49 +1,49 @@
-#
-# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-upnpdeviceXMLTagsstringtable UPNPDEVICEXMLTAGS
-ERoot root
-ESpecVersion specVersion
-EMajorNumber major
-EMinorNumber minor
-EUrlBase URLBase
-EDevice device
-EDeviceType deviceType
-EFriendlyName friendlyName
-EManufacturer manufacturer
-EManufacturerUrl manufacturerURL
-EModelDescription modelDescription
-EModelName modelName
-EModelNumber modelNumber
-EModel modelURL
-ESerialNumber serialNumber
-EUdn UDN
-EUpc UPC
-EIconList iconList
-EIcon icon
-EMimeType mimetype
-EWidth width
-EHeight height
-EDepth depth
-EUrl url
-EServiceList serviceList
-EService service
-EServiceType serviceType
-EServiceId serviceId
-EScpdUrl SCPDURL
-EContorlUrl controlURL
-EEventSubUrl eventSubURL
-EDeviceList deviceList
-EPresentationUrl presentationURL
+#
+# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+upnpdeviceXMLTagsstringtable UPNPDEVICEXMLTAGS
+ERoot root
+ESpecVersion specVersion
+EMajorNumber major
+EMinorNumber minor
+EUrlBase URLBase
+EDevice device
+EDeviceType deviceType
+EFriendlyName friendlyName
+EManufacturer manufacturer
+EManufacturerUrl manufacturerURL
+EModelDescription modelDescription
+EModelName modelName
+EModelNumber modelNumber
+EModel modelURL
+ESerialNumber serialNumber
+EUdn UDN
+EUpc UPC
+EIconList iconList
+EIcon icon
+EMimeType mimetype
+EWidth width
+EHeight height
+EDepth depth
+EUrl url
+EServiceList serviceList
+EService service
+EServiceType serviceType
+EServiceId serviceId
+EScpdUrl SCPDURL
+EContorlUrl controlURL
+EEventSubUrl eventSubURL
+EDeviceList deviceList
+EPresentationUrl presentationURL
--- a/servicediscoveryandcontrol/pnp/test/upnp/Server/StringDictionary/upnpserviceschema.st	Fri Apr 16 15:55:43 2010 +0300
+++ b/servicediscoveryandcontrol/pnp/test/upnp/Server/StringDictionary/upnpserviceschema.st	Tue Jun 01 23:31:49 2010 +0530
@@ -1,39 +1,39 @@
-# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-#
-# Contributors:
-#
-# Description:
-#
-upnpserviceXMLTagsstringtable UPNPSERVICEXMLTAGS
-EScpd scpd
-ESpecVersion specVersion
-EMajorNumber major
-EMinorNumber minor
-EActionList actionList
-EAction action
-EName name
-EArgumentList argumentList
-EArgument argument
-EArgumentDirection direction
-ERelatedStateVar relatedStateVariable
-ERetValue retval
-EServiceStateTable serviceStateTable
-EStateVariable stateVariable
-EStateVariableDataType dataType
-EStateVariableDefaultValue defaultValue
-EAllowedValueList allowedValueList
-EAllowedValue allowedValue
-EAllowedValueRange allowedValueRange
-EMinimumValue minimum
-EMaximumValue maximum
-EStepValue step
-ESendEvents sendEvents
+# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+#
+# Contributors:
+#
+# Description:
+#
+upnpserviceXMLTagsstringtable UPNPSERVICEXMLTAGS
+EScpd scpd
+ESpecVersion specVersion
+EMajorNumber major
+EMinorNumber minor
+EActionList actionList
+EAction action
+EName name
+EArgumentList argumentList
+EArgument argument
+EArgumentDirection direction
+ERelatedStateVar relatedStateVariable
+ERetValue retval
+EServiceStateTable serviceStateTable
+EStateVariable stateVariable
+EStateVariableDataType dataType
+EStateVariableDefaultValue defaultValue
+EAllowedValueList allowedValueList
+EAllowedValue allowedValue
+EAllowedValueRange allowedValueRange
+EMinimumValue minimum
+EMaximumValue maximum
+EStepValue step
+ESendEvents sendEvents
--- a/servicediscoveryandcontrol/pnp/test/upnp/group/application-protocols_upnp.mrp	Fri Apr 16 15:55:43 2010 +0300
+++ b/servicediscoveryandcontrol/pnp/test/upnp/group/application-protocols_upnp.mrp	Tue Jun 01 23:31:49 2010 +0530
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
-#
-
 component	application-protocols_upnp
 source	\sf\mw\srvdiscovery\servicediscoveryandcontrol\upnp
 binary	\sf\mw\srvdiscovery\servicediscoveryandcontrol\upnp\group	all
--- a/servicediscoveryandcontrol/pnp/test/upnp/unittests/upnpdescriptiontest/StringDictionary/testvendordeviceschema.st	Fri Apr 16 15:55:43 2010 +0300
+++ b/servicediscoveryandcontrol/pnp/test/upnp/unittests/upnpdescriptiontest/StringDictionary/testvendordeviceschema.st	Tue Jun 01 23:31:49 2010 +0530
@@ -1,19 +1,19 @@
-#
-# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-upnpdescriptionXMLTagsstringtable UPNPVENDORDEVICETAGS
-EVendor vendor
-EVendorTag vendorTag
+#
+# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+upnpdescriptionXMLTagsstringtable UPNPVENDORDEVICETAGS
+EVendor vendor
+EVendorTag vendorTag
 EVendorService vendorService
\ No newline at end of file
--- a/servicediscoveryandcontrol/pnp/test/upnp/unittests/upnpdescriptiontest/StringDictionary/testvendorserviceschema.st	Fri Apr 16 15:55:43 2010 +0300
+++ b/servicediscoveryandcontrol/pnp/test/upnp/unittests/upnpdescriptiontest/StringDictionary/testvendorserviceschema.st	Tue Jun 01 23:31:49 2010 +0530
@@ -1,20 +1,20 @@
-#
-# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-upnpdescriptionXMLTagsstringtable UPNPVENDORSERVICETAGS
-EVendorAction vendorAction
-EVendorArg vendorArg
-EVendorState vendorState
+#
+# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+upnpdescriptionXMLTagsstringtable UPNPVENDORSERVICETAGS
+EVendorAction vendorAction
+EVendorArg vendorArg
+EVendorState vendorState
 EVendorDec vendorDec
\ No newline at end of file
--- a/servicediscoveryandcontrol/pnp/test/upnp/upnpdescription/StringDictionary/upnpdescriptionschema.st	Fri Apr 16 15:55:43 2010 +0300
+++ b/servicediscoveryandcontrol/pnp/test/upnp/upnpdescription/StringDictionary/upnpdescriptionschema.st	Tue Jun 01 23:31:49 2010 +0530
@@ -1,71 +1,71 @@
-# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-#
-# Contributors:
-#
-# Description:
-#
-upnpdescriptionXMLTagsstringtable UPNPDESCRIPTIONXMLTAGS
-EScpd scpd
-ESpecVersion specVersion
-EMajorNumber major
-EMinorNumber minor
-EActionList actionList
-EAction action
-EName name
-EArgumentList argumentList
-EArgument argument
-EArgumentDirection direction
-ERelatedStateVar relatedStateVariable
-ERetValue retval
-EServiceStateTable serviceStateTable
-EStateVariable stateVariable
-EStateVariableDataType dataType
-EStateVariableDefaultValue defaultValue
-EAllowedValueList allowedValueList
-EAllowedValue allowedValue
-EAllowedValueRange allowedValueRange
-EMinimumValue minimum
-EMaximumValue maximum
-EStepValue step
-ESendEvents sendEvents
-ERoot root
-EUrlBase URLBase
-EDevice device
-EDeviceType deviceType
-EFriendlyName friendlyName
-EManufacturer manufacturer
-EManufacturerUrl manufacturerURL
-EModelDescription modelDescription
-EModelName modelName
-EModelNumber modelNumber
-EModel modelURL
-ESerialNumber serialNumber
-EUdn UDN
-EUpc UPC
-EIconList iconList
-EIcon icon
-EMimeType mimetype
-EWidth width
-EHeight height
-EDepth depth
-EUrl url
-EServiceList serviceList
-EService service
-EServiceType serviceType
-EServiceId serviceId
-EScpdUrl SCPDURL
-EContorlUrl controlURL
-EEventSubUrl eventSubURL
-EDeviceList deviceList
-EPresentationUrl presentationURL
-EDlnaDoc X_DLNADOC
+# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+#
+# Contributors:
+#
+# Description:
+#
+upnpdescriptionXMLTagsstringtable UPNPDESCRIPTIONXMLTAGS
+EScpd scpd
+ESpecVersion specVersion
+EMajorNumber major
+EMinorNumber minor
+EActionList actionList
+EAction action
+EName name
+EArgumentList argumentList
+EArgument argument
+EArgumentDirection direction
+ERelatedStateVar relatedStateVariable
+ERetValue retval
+EServiceStateTable serviceStateTable
+EStateVariable stateVariable
+EStateVariableDataType dataType
+EStateVariableDefaultValue defaultValue
+EAllowedValueList allowedValueList
+EAllowedValue allowedValue
+EAllowedValueRange allowedValueRange
+EMinimumValue minimum
+EMaximumValue maximum
+EStepValue step
+ESendEvents sendEvents
+ERoot root
+EUrlBase URLBase
+EDevice device
+EDeviceType deviceType
+EFriendlyName friendlyName
+EManufacturer manufacturer
+EManufacturerUrl manufacturerURL
+EModelDescription modelDescription
+EModelName modelName
+EModelNumber modelNumber
+EModel modelURL
+ESerialNumber serialNumber
+EUdn UDN
+EUpc UPC
+EIconList iconList
+EIcon icon
+EMimeType mimetype
+EWidth width
+EHeight height
+EDepth depth
+EUrl url
+EServiceList serviceList
+EService service
+EServiceType serviceType
+EServiceId serviceId
+EScpdUrl SCPDURL
+EContorlUrl controlURL
+EEventSubUrl eventSubURL
+EDeviceList deviceList
+EPresentationUrl presentationURL
+EDlnaDoc X_DLNADOC
 EDlnaCap X_DLNACAP
\ No newline at end of file
--- a/servicediscoveryandcontrol/pnp/test/upnp/upnputils/strings/UpnpStringConstants.st	Fri Apr 16 15:55:43 2010 +0300
+++ b/servicediscoveryandcontrol/pnp/test/upnp/upnputils/strings/UpnpStringConstants.st	Tue Jun 01 23:31:49 2010 +0530
@@ -1,61 +1,61 @@
-#
-# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-fstringtable UPnP
-#
-#Standard tokens specified in UPnP Device Architecture
-EInfinite infinite
-ENS ns
-#
-#UPnP Headers
-ENTS NTS
-ENT NT
-EUSN USN
-EMX MX
-EST ST
-ETimeout Timeout
-ESEQ SEQ
-EMAN MAN
-ESoapAction SoapAction
-EExt Ext
-ESID SID
-ECallback Callback
-#
-#UPnP request methods
-ENotify NOTIFY
-EMSearch M-SEARCH
-EMPost M-POST
-ESubscribe SUBSCRIBE
-EUnsubscribe UNSUBSCRIBE
-#
-#Standard constants
-ETextXml text/xml
-EUtf8 utf-8
-EUpnpEvent upnp:event
-EUpnpPropChange upnp:propchange
-ESoapUrl http://schemas.xmlsoap.org/soap/envelope
-ESoapHeader 01-SOAPACTION
-ENsParam 01
-#
-#Standard response status codes
-ENotFound Not Found
-EBadRequest Bad request
-EInternalServerError Internal Server Error
-ENotImplemented Not Implemented
-EPreconditionFailed Precondition Failed
-EMethodNotAllowed Method Not Allowed
-EOk OK
-EUnsupportedMediaType Unsupported Media Type
-ERequestTimeout Request Timeout
+#
+# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+fstringtable UPnP
+#
+#Standard tokens specified in UPnP Device Architecture
+EInfinite infinite
+ENS ns
+#
+#UPnP Headers
+ENTS NTS
+ENT NT
+EUSN USN
+EMX MX
+EST ST
+ETimeout Timeout
+ESEQ SEQ
+EMAN MAN
+ESoapAction SoapAction
+EExt Ext
+ESID SID
+ECallback Callback
+#
+#UPnP request methods
+ENotify NOTIFY
+EMSearch M-SEARCH
+EMPost M-POST
+ESubscribe SUBSCRIBE
+EUnsubscribe UNSUBSCRIBE
+#
+#Standard constants
+ETextXml text/xml
+EUtf8 utf-8
+EUpnpEvent upnp:event
+EUpnpPropChange upnp:propchange
+ESoapUrl http://schemas.xmlsoap.org/soap/envelope
+ESoapHeader 01-SOAPACTION
+ENsParam 01
+#
+#Standard response status codes
+ENotFound Not Found
+EBadRequest Bad request
+EInternalServerError Internal Server Error
+ENotImplemented Not Implemented
+EPreconditionFailed Precondition Failed
+EMethodNotAllowed Method Not Allowed
+EOk OK
+EUnsupportedMediaType Unsupported Media Type
+ERequestTimeout Request Timeout
--- a/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp	Fri Apr 16 15:55:43 2010 +0300
+++ b/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp	Tue Jun 01 23:31:49 2010 +0530
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
-#
-
 component           srvdiscovery_metadata
 source   \sf\mw\srvdiscovery\srvdiscovery_info\srvdiscovery_metadata 
 source   \sf\mw\srvdiscovery\package_definition.xml