Revision: 201003 PDK_3.0.g
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Tue, 02 Feb 2010 00:21:44 +0200
changeset 5 79d62d1d7957
parent 4 fdb8e8f25c0d
child 8 ce0d1c675e43
child 9 89a1f2bd800d
child 14 c2d04e94f03f
child 23 493788a4a8a4
Revision: 201003 Kit: 201005
drm_plat/drm_common_api/tsrc/data/mmc/DRM/content.dcf
drm_plat/drm_legacy_api/inc/DRMLicenseChecker.mmi
drm_plat/drm_legacy_api/inc/DRMLicenseManager.mmi
drm_plat/drm_rights_api/tsrc/data/c/content.dcf
drm_pub/oma_drm_caf_agent_api/tsrc/bc/DRM_CAF/data/content.dcf
omadrm/drmengine/group/CryptoPrep.flm
omadrm/drmengine/group/CryptoPrep.mak
omadrm/drmengine/group/DrmServerInterfaces.mmp
omadrm/drmengine/group/ROAPHandler.mmp
omadrm/drmengine/group/RightsServer.mmp
omadrm/drmplugins/drmrecognizer/group/RecDRM.mmp
--- a/drm_plat/drm_legacy_api/inc/DRMLicenseChecker.mmi	Tue Jan 26 12:08:35 2010 +0200
+++ b/drm_plat/drm_legacy_api/inc/DRMLicenseChecker.mmi	Tue Feb 02 00:21:44 2010 +0200
@@ -2,9 +2,9 @@
 * Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
--- a/drm_plat/drm_legacy_api/inc/DRMLicenseManager.mmi	Tue Jan 26 12:08:35 2010 +0200
+++ b/drm_plat/drm_legacy_api/inc/DRMLicenseManager.mmi	Tue Feb 02 00:21:44 2010 +0200
@@ -2,9 +2,9 @@
 * Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
--- a/omadrm/drmengine/group/CryptoPrep.flm	Tue Jan 26 12:08:35 2010 +0200
+++ b/omadrm/drmengine/group/CryptoPrep.flm	Tue Feb 02 00:21:44 2010 +0200
@@ -1,9 +1,9 @@
 # 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 the License "Symbian Foundation License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
 # Initial Contributors:
 # Nokia Corporation - initial contribution.
--- a/omadrm/drmengine/group/CryptoPrep.mak	Tue Jan 26 12:08:35 2010 +0200
+++ b/omadrm/drmengine/group/CryptoPrep.mak	Tue Feb 02 00:21:44 2010 +0200
@@ -1,9 +1,9 @@
 # Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Symbian Foundation License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
 # Initial Contributors:
 # Nokia Corporation - initial contribution.
--- a/omadrm/drmengine/group/DrmServerInterfaces.mmp	Tue Jan 26 12:08:35 2010 +0200
+++ b/omadrm/drmengine/group/DrmServerInterfaces.mmp	Tue Feb 02 00:21:44 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 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"
@@ -34,7 +34,7 @@
 USERINCLUDE     ../server/inc
 USERINCLUDE     ../notifier/inc
 USERINCLUDE     ../roapstorage/inc
-USERINCLUDE     ../drmclock/inc
+USERINCLUDE     ../drmclock/Inc
 #ifdef __DRM_FULL
 USERINCLUDE		../../drmhelper/inc
 #endif
@@ -63,7 +63,7 @@
 SOURCE          DRMRIContext.cpp
 SOURCE          RoapStorageClient.cpp
 
-SOURCEPATH      ../drmclock/src
+SOURCEPATH      ../drmclock/Src
 SOURCE          DRMClockClient2.cpp
 
 #ifdef __DRM_FULL
--- a/omadrm/drmengine/group/ROAPHandler.mmp	Tue Jan 26 12:08:35 2010 +0200
+++ b/omadrm/drmengine/group/ROAPHandler.mmp	Tue Feb 02 00:21:44 2010 +0200
@@ -33,7 +33,7 @@
 USERINCLUDE     ../utils/inc
 USERINCLUDE     ../server/inc
 USERINCLUDE     ../roapstorage/inc
-USERINCLUDE     ../drmclock/inc
+USERINCLUDE     ../drmclock/Inc
 USERINCLUDE     ../dcfrepository/client/inc
 USERINCLUDE     ../../../inc   // ADo level inc dir
 
--- a/omadrm/drmengine/group/RightsServer.mmp	Tue Jan 26 12:08:35 2010 +0200
+++ b/omadrm/drmengine/group/RightsServer.mmp	Tue Feb 02 00:21:44 2010 +0200
@@ -38,7 +38,7 @@
 USERINCLUDE     ../utils/inc
 USERINCLUDE     ../roap/inc
 USERINCLUDE     ../roapstorage/inc
-USERINCLUDE     ../drmclock/inc
+USERINCLUDE     ../drmclock/Inc
 USERINCLUDE     ../keystorage/inc
 USERINCLUDE     ../drmbackup/inc
 USERINCLUDE     ../../../inc   // ADo level inc dir
@@ -97,7 +97,7 @@
 
 // DRM Clock
 #ifdef __DRM_CLOCK
-SOURCEPATH      ../drmclock/src
+SOURCEPATH      ../drmclock/Src
 SOURCE          DRMClock.cpp
 SOURCE          DRMClockServer.cpp
 SOURCE          DRMClockSession.cpp
--- a/omadrm/drmplugins/drmrecognizer/group/RecDRM.mmp	Tue Jan 26 12:08:35 2010 +0200
+++ b/omadrm/drmplugins/drmrecognizer/group/RecDRM.mmp	Tue Feb 02 00:21:44 2010 +0200
@@ -34,7 +34,7 @@
 MW_LAYER_SYSTEMINCLUDE
 systeminclude	/epoc32/include/ecom
 
-source		RecDRM.CPP
+source		RecDRM.cpp
 
 START RESOURCE 101F51F4.RSS
 TARGET         RECDRM