--- a/sbsv2/raptor/RELEASE-NOTES.txt	Thu Mar 25 11:35:53 2010 +0000
+++ b/sbsv2/raptor/RELEASE-NOTES.txt	Thu Mar 25 12:24:53 2010 +0000
@@ -1,5 +1,10 @@
 Release Notes for Symbian Build System v2
 
+next version
+Defect Fixes:
+- SF Bug 2308 - [Raptor]: PLUGIN3 TARGETTYPEs don't set resource output offsets correctly
+
+
 version 2.12.5
 
 Defect Fixes:
@@ -15,7 +20,6 @@
 - Fix: improve robustness to bad -c options
 
 
-
 version 2.12.4
 
 Defect Fixes:

--- a/sbsv2/raptor/python/raptor_meta.py	Thu Mar 25 11:35:53 2010 +0000
+++ b/sbsv2/raptor/python/raptor_meta.py	Thu Mar 25 12:24:53 2010 +0000
@@ -1722,7 +1722,7 @@
 	def getDefaultResourceTargetPath(self, targettype):
 		# the different default TARGETPATH values should come from the
 		# configuration rather than being hard-coded here.
-		if targettype == "plugin":
+		if targettype in ["plugin", "plugin3"]:
 			return "resource/plugins"
 		if targettype == "pdl":
 			return "resource/printers"

--- a/sbsv2/raptor/test/smoke_suite/plugin_armv5_winscw_freeze.py	Thu Mar 25 11:35:53 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/plugin_armv5_winscw_freeze.py	Thu Mar 25 12:24:53 2010 +0000
@@ -24,7 +24,8 @@
 		the correct FREEZE behaviour in each case.  The correct behaviour for a PLUGIN/PLUGIN3 is
 		indicative of all TARGETTYPEs where the build system defines known exports: FREEZE should do nothing
 		unless an explicit DEFFILE statement is present in the .mmp file.
-		Also confirms default UID2 settings for PLUGIN3 TARGETTYPEs."""
+		Also confirms default UID2 settings for PLUGIN3 TARGETTYPEs and default resource generation locations
+		for both PLUGIN and PLUGIN3."""
 	t.usebash = True
 	
 	t.command = """
@@ -34,7 +35,13 @@
 
 	t.targets = [
 		"smoke_suite/test_resources/simple_plugin/bwins/plugin2u.def",
-		"smoke_suite/test_resources/simple_plugin/eabi/plugin2u.def"		
+		"smoke_suite/test_resources/simple_plugin/eabi/plugin2u.def",
+		"$(EPOCROOT)/epoc32/data/z/resource/plugins/plugin.rsc",
+		"$(EPOCROOT)/epoc32/release/winscw/udeb/z/resource/plugins/plugin.rsc",
+		"$(EPOCROOT)/epoc32/release/winscw/urel/z/resource/plugins/plugin.rsc",
+		"$(EPOCROOT)/epoc32/data/z/resource/plugins/plugin3.rsc",
+		"$(EPOCROOT)/epoc32/release/winscw/udeb/z/resource/plugins/plugin3.rsc",
+		"$(EPOCROOT)/epoc32/release/winscw/urel/z/resource/plugins/plugin3.rsc"	
 		]
 	
 	t.antitargets = [

--- a/sbsv2/raptor/test/smoke_suite/test_resources/simple_plugin/plugin.mmp	Thu Mar 25 11:35:53 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/simple_plugin/plugin.mmp	Thu Mar 25 12:24:53 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 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 "Eclipse Public License v1.0"
@@ -26,5 +26,9 @@
 SOURCEPATH		.
 SOURCE			plugin.cpp
 SYSTEMINCLUDE 	/epoc32/include
-SYSTEMINCLUDE 	/epoc32/include/ecom 
+SYSTEMINCLUDE 	/epoc32/include/ecom
+SYSTEMINCLUDE	/epoc32/include/techview
 LIBRARY			euser.lib apmime.lib efsrv.lib
+
+START RESOURCE	plugin.rss
+END

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/simple_plugin/plugin.rss	Thu Mar 25 12:24:53 2010 +0000
@@ -0,0 +1,28 @@
+/*
+* Copyright (c) 2010 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 "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: 
+* Dummy ECOM resource file
+*
+*/
+
+NAME PLUG
+
+#include <eikon.rh>
+#include <eikcore.rsg>
+#include <appinfo.rh>
+
+RESOURCE RSS_SIGNATURE { }
+
+RESOURCE TBUF { buf=""; }
+RESOURCE TBUF r_example_text_plug { buf="plug"; }

--- a/sbsv2/raptor/test/smoke_suite/test_resources/simple_plugin/plugin3.mmp	Thu Mar 25 11:35:53 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/simple_plugin/plugin3.mmp	Thu Mar 25 12:24:53 2010 +0000
@@ -12,7 +12,7 @@
 * Contributors:
 *
 * Description: 
-* Example ECOMP plugin3 component, with no UID listed
+* Example ECOM plugin3 component, with no UID listed
 *
 */
 
@@ -24,6 +24,10 @@
 VENDORID		0x70000001
 SOURCEPATH		.
 SOURCE			plugin.cpp
-SYSTEMINCLUDE 	/epoc32/include
-SYSTEMINCLUDE 	/epoc32/include/ecom 
+SYSTEMINCLUDE	/epoc32/include
+SYSTEMINCLUDE	/epoc32/include/ecom
+SYSTEMINCLUDE	/epoc32/include/techview
 LIBRARY			euser.lib apmime.lib efsrv.lib
+
+START RESOURCE	plugin3.rss
+END

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/simple_plugin/plugin3.rss	Thu Mar 25 12:24:53 2010 +0000
@@ -0,0 +1,28 @@
+/*
+* Copyright (c) 2010 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 "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: 
+* Dummy ECOM resource file
+*
+*/
+
+NAME PLG3
+
+#include <eikon.rh>
+#include <eikcore.rsg>
+#include <appinfo.rh>
+
+RESOURCE RSS_SIGNATURE { }
+
+RESOURCE TBUF { buf=""; }
+RESOURCE TBUF r_example_text_plug3 { buf="plug3"; }