--- a/javaextensions/subsystem.mk	Fri Sep 17 16:44:34 2010 +0300
+++ b/javaextensions/subsystem.mk	Mon Oct 04 11:29:25 2010 +0300
@@ -20,22 +20,26 @@
 	iapinfo/build \
 	mobinfo/build \
 	comm/build \
-	globalindicators/build \
-	webservices/build \
 	satsa/build \
 	location/build \
 	sensor/build
 
+# Component webservices is needed only if the package hasn't been split
+ifndef RD_JAVA_PKG_SPLIT
+   COMPONENTS += webservices/build
+endif        	
+
 ifeq ($(UI),AVKON)
 # Broadcast stub is available for now only on AVKON environments (where also MMAPI exists)
 COMPONENTS += \
 	broadcast_stub/build
 endif
 
-SYMBIAN_ONLY = pim wma bluetooth satsa/build location/build sensor/build iapinfo/build mobinfo/build globalindicators/build comm/build broadcast_stub/build
+SYMBIAN_ONLY = pim wma bluetooth satsa/build location/build sensor/build iapinfo/build mobinfo/build comm/build broadcast_stub/build ccapi
 
 LINUX_ONLY =
 
+SKIP_IN_SF = ccapi
 
 SUBSYSTEMS = \
     midppush \
@@ -54,6 +58,17 @@
     COMPONENTS += midprms/build
 endif
 
+# Include old globalindicator only TB 9.2 and older releases
+ifndef RD_JAVA_S60_RELEASE_10_1_ONWARDS
+    COMPONENTS += globalindicators/build
+    SYMBIAN_ONLY += globalindicators/build
+endif
+
+# Include CCAPI JSR 257 and CCAPI extensions only on 9.2 java PS2
+ifdef RD_JAVA_S60_RELEASE_9_2
+    SUBSYSTEMS += ccapi		                  
+endif
+
 # Declare that release preparation removes subdirectories not in build, except
 # listed special cases
 REMOVE_NOTBUILT_EXCLUDING = inc