# HG changeset patch # User Eugene Ostroukhov # Date 1268347024 28800 # Node ID 2d8702ba47f8530accaa841dfbc08defd80860eb # Parent 28cd64723120dfcc4cc3073b290598d96e01691c# Parent 8dac5bbadbba0f8b70dc9052a7aaf3205e9cddf6 Heads merged diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.debug.core/plugin.xml --- a/org.symbian.tools.wrttools.debug.core/plugin.xml Mon Mar 08 12:18:48 2010 -0800 +++ b/org.symbian.tools.wrttools.debug.core/plugin.xml Thu Mar 11 14:37:04 2010 -0800 @@ -10,13 +10,16 @@ + name="WebRuntime Toolkit"> + + + + + + diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.doc.WRTKit/META-INF/MANIFEST.MF --- a/org.symbian.tools.wrttools.doc.WRTKit/META-INF/MANIFEST.MF Mon Mar 08 12:18:48 2010 -0800 +++ b/org.symbian.tools.wrttools.doc.WRTKit/META-INF/MANIFEST.MF Thu Mar 11 14:37:04 2010 -0800 @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: WRTKit +Bundle-Name: WRTKit Documentation Bundle-SymbolicName: org.symbian.tools.wrttools.doc.WRTKit;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.symbian.tools.wrttools.doc.WRTKit.Activator @@ -8,4 +8,5 @@ org.eclipse.core.runtime Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Vendor: Symbian Foundation diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.previewer/META-INF/MANIFEST.MF --- a/org.symbian.tools.wrttools.previewer/META-INF/MANIFEST.MF Mon Mar 08 12:18:48 2010 -0800 +++ b/org.symbian.tools.wrttools.previewer/META-INF/MANIFEST.MF Thu Mar 11 14:37:04 2010 -0800 @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Previewer +Bundle-Name: WRT Preview Support Bundle-SymbolicName: org.symbian.tools.wrttools.previewer;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.symbian.tools.wrttools.previewer.PreviewerPlugin @@ -22,3 +22,4 @@ javax.servlet.http;version="2.5.0", org.eclipse.equinox.jsp.jasper;version="1.0.0", org.osgi.service.http;version="1.2.1" +Bundle-Vendor: Symbian Foundation diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.previewer/preview/css/style.css --- a/org.symbian.tools.wrttools.previewer/preview/css/style.css Mon Mar 08 12:18:48 2010 -0800 +++ b/org.symbian.tools.wrttools.previewer/preview/css/style.css Thu Mar 11 14:37:04 2010 -0800 @@ -456,34 +456,37 @@ } div#event-battery.active:hover, div#event-messaging.active:hover, div#event-memory.active:hover{ -/* background-position: 0px -50px; */ - background-position: 0px -100px; + background-position: 0px -50px; +/* background-position: 0px -100px; */ border: 1px solid #75ea4f; } div#event-messaging.inactive, div#event-memory.inactive{ -/* background-position: 0px -100px; */ - background-position: 0px -50px; + background-position: 0px -100px; +/* background-position: 0px -50px; */ border: 1px solid #676767; } div#event-battery{ /* background-image: url(../images/battery-icon.png); */ - background-image: url(../images/battery_1.png); +/* background-image: url(../images/battery_1.png); */ + background-image: url(../images/battery-icon_bkup.png); } div#event-messaging{ /* background-image: url(../images/messaging-icon.gif); */ - background-image: url(../images/messaging_1.png); +/* background-image: url(../images/messaging_1.png); */ + background-image: url(../images/messaging-icon_bkup.png); } div#event-memory{ /* background-image: url(../images/memory-icon.png); */ - background-image: url(../images/memory_1.png); +/* background-image: url(../images/memory_1.png); */ + background-image: url(../images/memory-icon_bkup.png); } - +/* div#event-battery.active:hover{ background-image: url(../images/battery_2.png); } @@ -495,6 +498,7 @@ div#event-memory.active:hover{ background-image: url(../images/memory_2.png); } +*/ div.ui-panel{ diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.previewer/preview/favicon.gif Binary file org.symbian.tools.wrttools.previewer/preview/favicon.gif has changed diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.previewer/preview/images/import_icon_16px.png Binary file org.symbian.tools.wrttools.previewer/preview/images/import_icon_16px.png has changed diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.previewer/preview/images/import_wizard_banner.png Binary file org.symbian.tools.wrttools.previewer/preview/images/import_wizard_banner.png has changed diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.previewer/preview/script/jquery-ui/css/ui-darkness/ui.all.css --- a/org.symbian.tools.wrttools.previewer/preview/script/jquery-ui/css/ui-darkness/ui.all.css Mon Mar 08 12:18:48 2010 -0800 +++ b/org.symbian.tools.wrttools.previewer/preview/script/jquery-ui/css/ui-darkness/ui.all.css Thu Mar 11 14:37:04 2010 -0800 @@ -206,8 +206,8 @@ /*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; font-family: Segoe UI, Arial, sans-serif; font-size: 0.9em; -/* background: #000000 url(images/000000_40x100_textures_05_inset_soft_25.png) 0 bottom repeat-x; */ - background: #333333 url(images/000000_40x100_textures_05_inset_soft_25.png) 0 bottom repeat-x; + background: #000000 url(images/000000_40x100_textures_05_inset_soft_25.png) 0 bottom repeat-x; +/* background: #333333 url(images/000000_40x100_textures_05_inset_soft_25.png) 0 bottom repeat-x; */ color: #ffffff; /* border: 4px solid #666666; */ border: 4px solid #333; @@ -284,8 +284,7 @@ /*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; padding: .5em 1.5em .5em 0.8em; color: #eeeeee; -/* background: #555555 url(images/555555_40x100_textures_02_glass_20.png) 0 50% repeat-x; */ - background: #FF0000 url(images/555555_40x100_textures_02_glass_20.png) 0 50% repeat-x; + background: #555555 url(images/555555_40x100_textures_02_glass_20.png) 0 50% repeat-x; border-bottom: 1px solid #666666; font-size: 0.8em; font-weight: bold; diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.previewer/preview/script/nokia.js --- a/org.symbian.tools.wrttools.previewer/preview/script/nokia.js Mon Mar 08 12:18:48 2010 -0800 +++ b/org.symbian.tools.wrttools.previewer/preview/script/nokia.js Thu Mar 11 14:37:04 2010 -0800 @@ -790,7 +790,7 @@ return false; } - NOKIA.helper.error('Unable to intialize the widget, failed to process Info.plist file.
Please ensure Info.plist file exists on the widget root folder
or check the filename of Info.plist It is case-sensitive'); + NOKIA.helper.error('WRT Previewer: Initialization failed. Could not open Info.plist file.
Please ensure Info.plist file exists in the project root folder and that it is named properly.'); return false; } else{ diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.previewer/preview/wrt_preview.html --- a/org.symbian.tools.wrttools.previewer/preview/wrt_preview.html Mon Mar 08 12:18:48 2010 -0800 +++ b/org.symbian.tools.wrttools.previewer/preview/wrt_preview.html Thu Mar 11 14:37:04 2010 -0800 @@ -16,7 +16,7 @@ - WRT Preview + WRT Debugger @@ -26,6 +26,7 @@ +
diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.product/META-INF/MANIFEST.MF --- a/org.symbian.tools.wrttools.product/META-INF/MANIFEST.MF Mon Mar 08 12:18:48 2010 -0800 +++ b/org.symbian.tools.wrttools.product/META-INF/MANIFEST.MF Thu Mar 11 14:37:04 2010 -0800 @@ -16,6 +16,7 @@ org.eclipse.wst.css.ui;bundle-version="1.0.400", org.eclipse.wst.html.ui;bundle-version="1.0.400", org.eclipse.wst.xml.ui;bundle-version="1.1.0", - org.symbian.tools.wrttools.previewer;bundle-version="1.0.0" + org.symbian.tools.wrttools.previewer;bundle-version="1.0.0", + org.eclipse.ui.intro Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.product/build.properties --- a/org.symbian.tools.wrttools.product/build.properties Mon Mar 08 12:18:48 2010 -0800 +++ b/org.symbian.tools.wrttools.product/build.properties Thu Mar 11 14:37:04 2010 -0800 @@ -8,7 +8,8 @@ about.properties,\ about.html,\ plugin.properties,\ - config_inis/ + config_inis/,\ + splash.bmp source.. = src/ # javac javacSource=1.5 javacTarget=1.5 diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.product/config_inis/linux.ini --- a/org.symbian.tools.wrttools.product/config_inis/linux.ini Mon Mar 08 12:18:48 2010 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -#Product Runtime Configuration File -org.eclipse.update.reconcile=false -eclipse.p2.profile=profile -osgi.framework=file\:plugins/org.eclipse.osgi_3.5.1.R35x_v20090827.jar -osgi.bundles=reference\:file\:org.eclipse.equinox.ds_1.1.1.R35x_v20090806.jar@1\:start,reference\:file\:org.eclipse.equinox.simpleconfigurator_1.0.101.R35x_v20090807-1100.jar@1\:start -org.eclipse.equinox.simpleconfigurator.configUrl=file\:org.eclipse.equinox.simpleconfigurator/bundles.info -eclipse.product=org.symbian.tools.wrttools.product.product -osgi.framework.extensions=reference\:file\:javax.transaction_1.1.1.v200909161740.jar -eclipse.p2.data.area=@config.dir/../p2/ -osgi.bundles.defaultStartLevel=4 -eclipse.application=org.eclipse.ui.ide.workbench -osgi.instance.area.default=@user.home/Documents/WebRuntime Developer Workspace diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.product/config_inis/macosx.ini --- a/org.symbian.tools.wrttools.product/config_inis/macosx.ini Mon Mar 08 12:18:48 2010 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -#Product Runtime Configuration File -org.eclipse.update.reconcile=false -eclipse.p2.profile=profile -osgi.framework=file\:plugins/org.eclipse.osgi_3.5.1.R35x_v20090827.jar -osgi.bundles=reference\:file\:org.eclipse.equinox.ds_1.1.1.R35x_v20090806.jar@1\:start,reference\:file\:org.eclipse.equinox.simpleconfigurator_1.0.101.R35x_v20090807-1100.jar@1\:start -org.eclipse.equinox.simpleconfigurator.configUrl=file\:org.eclipse.equinox.simpleconfigurator/bundles.info -eclipse.product=org.symbian.tools.wrttools.product.product -osgi.framework.extensions=reference\:file\:javax.transaction_1.1.1.v200909161740.jar -eclipse.p2.data.area=@config.dir/../p2/ -osgi.bundles.defaultStartLevel=4 -eclipse.application=org.eclipse.ui.ide.workbench -osgi.instance.area.default=@user.home/Documents/WebRuntime Developer Workspace diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.product/config_inis/windows.ini --- a/org.symbian.tools.wrttools.product/config_inis/windows.ini Mon Mar 08 12:18:48 2010 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -#Product Runtime Configuration File -org.eclipse.update.reconcile=false -eclipse.p2.profile=profile -osgi.framework=file\:plugins/org.eclipse.osgi_3.5.1.R35x_v20090827.jar -osgi.bundles=reference\:file\:org.eclipse.equinox.ds_1.1.1.R35x_v20090806.jar@1\:start,reference\:file\:org.eclipse.equinox.simpleconfigurator_1.0.101.R35x_v20090807-1100.jar@1\:start -org.eclipse.equinox.simpleconfigurator.configUrl=file\:org.eclipse.equinox.simpleconfigurator/bundles.info -eclipse.product=org.symbian.tools.wrttools.product.product -osgi.framework.extensions=reference\:file\:javax.transaction_1.1.1.v200909161740.jar -eclipse.p2.data.area=@config.dir/../p2/ -osgi.bundles.defaultStartLevel=4 -eclipse.application=org.eclipse.ui.ide.workbenchosgi.instance.area.default=@user.home/My Documents/WebRuntime Developer Workspace diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.product/icons/WRT_Wizard_banner.png Binary file org.symbian.tools.wrttools.product/icons/WRT_Wizard_banner.png has changed diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.product/icons/WRT_blurb_image.gif Binary file org.symbian.tools.wrttools.product/icons/WRT_blurb_image.gif has changed diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.product/icons/WRT_blurb_image.png Binary file org.symbian.tools.wrttools.product/icons/WRT_blurb_image.png has changed diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.product/icons/WRT_blurb_image_2.png Binary file org.symbian.tools.wrttools.product/icons/WRT_blurb_image_2.png has changed diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon.icns Binary file org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon.icns has changed diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon.ico Binary file org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon.ico has changed diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon.xpm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon.xpm Thu Mar 11 14:37:04 2010 -0800 @@ -0,0 +1,93 @@ +/* XPM */ +static char * WRT_main_icon_xpm[] = { +"32 32 58 1", +" c None", +". c #000000", +"+ c #2F2509", +"@ c #7E6417", +"# c #AD8920", +"$ c #BD9523", +"% c #9E7C1D", +"& c #201906", +"* c #FCC72E", +"= c #FCD154", +"- c #FCDE88", +"; c #FDE295", +"> c #ECBB2B", +", c #FCD668", +"' c #FDF3D5", +") c #FDF9EE", +"! c #FDECBD", +"~ c #FCD051", +"{ c #100C03", +"] c #FCD86D", +"^ c #FDF4DB", +"/ c #FCD35E", +"( c #FDF0C9", +"_ c #FDEDBF", +": c #FCCC41", +"< c #FDE7A8", +"[ c #FDECBA", +"} c #FDDE85", +"| c #FCCD46", +"1 c #FDE9AD", +"2 c #FCD259", +"3 c #FDE6A2", +"4 c #FCCF4B", +"5 c #FDD564", +"6 c #FDE499", +"7 c #FCCE49", +"8 c #FCCE47", +"9 c #FDE292", +"0 c #FCC934", +"a c #FDE08C", +"b c #FDDA75", +"c c #FDD35B", +"d c #FDDF88", +"e c #FCCD45", +"f c #FDD665", +"g c #FDDE86", +"h c #FCD04F", +"i c #FCCD44", +"j c #FDD769", +"k c #FDDE84", +"l c #FCCA39", +"m c #DDAE28", +"n c #8E701A", +"o c #4F3E0E", +"p c #6E5714", +"q c #3F320C", +"r c #CDA225", +"s c #5F4B11", +" ........................ ", +" ..+@#$%@@@@@@@@@@@@#$#@+.. ", +" .&$**=-;;;;;;;;;;;;;;-=**$&. ", +" .&>*,'))))))))))))))))))!~*>{. ", +"..$*]^^^^^^^^^^^^^^^^^^^^^^]*$..", +".+*/(((((((((((((((((((((((_:*+.", +".@*<[[[[[[[[[[[[[[[[[[[[[[[[}*@.", +".@|11111111111111111111111111*@.", +".@2333333333333333333333333334@.", +".@5666666666666666666666666667@.", +".@8999999999999999999999999990@.", +".@0aaaaaaaaaaaaaaaaaaaaaaaaab*@.", +".@*cdddddddddddddddddddddddde*@.", +".@**fggggggggggggggggggggggh**@.", +".@***ijkkkkkkkkkkkkkkkkkkji***@.", +".@******liiiiiiiiiiiiiil******@.", +".@****************************@.", +".@****************************@.", +".@@@>*m@n**$@$m@@@@%>*$@@@@@@$@.", +".@+.$*@..>*o.%$.....{m@......@@.", +".@p.@*+..#*{.>$.q*>&.n***..***@.", +".$#.q>.{.pr.+*$.q**+.#***..***$.", +".$>.{#.%{+n.p*$.{q{.s****..***$.", +".$*+.q.mo.q.$*$.&p.{r****..***$.", +".#*@..&*n...**$.q*p.+>***..***%.", +".@*$..p*r..o**$.q**+.s***..***@.", +".+**@@r**@@$**m@%**m@@m**@@***+.", +"..$**************************$..", +" .{r************************r{. ", +" .{$**********************${. ", +" ..+@@@@@@@@%$$%@@@@@@@p+.. ", +" ...................... "}; diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon_128px.png Binary file org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon_128px.png has changed diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon_16px.png Binary file org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon_16px.png has changed diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon_32px.png Binary file org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon_32px.png has changed diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon_48px.png Binary file org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon_48px.png has changed diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon_64px.png Binary file org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon_64px.png has changed diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.product/icons/newWRT_app_icon_16px.png Binary file org.symbian.tools.wrttools.product/icons/newWRT_app_icon_16px.png has changed diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.product/launch/WRT IDE Product (Linux).launch --- a/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Linux).launch Mon Mar 08 12:18:48 2010 -0800 +++ b/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Linux).launch Thu Mar 11 14:37:04 2010 -0800 @@ -9,7 +9,7 @@ - + @@ -21,8 +21,8 @@ - - + + diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.product/launch/WRT IDE Product (Windows).launch --- a/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Windows).launch Mon Mar 08 12:18:48 2010 -0800 +++ b/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Windows).launch Thu Mar 11 14:37:04 2010 -0800 @@ -22,8 +22,8 @@ - - + + @@ -45,9 +45,9 @@ - + - + @@ -55,19 +55,19 @@ + - + - - + - + @@ -75,18 +75,18 @@ + - + - + + - - + - @@ -107,8 +107,8 @@ + - @@ -118,11 +118,11 @@ + - + - @@ -130,31 +130,31 @@ + - - + - + + - + - + - + - @@ -165,39 +165,39 @@ + - + - + - + - + - + - + + - - @@ -212,38 +212,38 @@ + - + - + - + - + - - + - + + - + - @@ -251,9 +251,9 @@ - + - + @@ -261,19 +261,19 @@ + - + - + - + - @@ -282,8 +282,8 @@ + - @@ -297,29 +297,29 @@ + - + - + - + - + - + - @@ -331,20 +331,20 @@ + - + - + - + - @@ -374,10 +374,10 @@ + - + - @@ -388,20 +388,20 @@ + - + - - + - + + - @@ -423,10 +423,10 @@ + - + - @@ -440,18 +440,18 @@ + - + - + - + + - - @@ -477,14 +477,14 @@ + - + - diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.product/p2.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/org.symbian.tools.wrttools.product/p2.inf Thu Mar 11 14:37:04 2010 -0800 @@ -0,0 +1,33 @@ +requires.1.namespace=org.eclipse.equinox.p2.iu +requires.1.name=toolingorg.eclipse.configuration.win32 +requires.1.filter=(osgi.os=win32) +requires.1.range=[1.0.0,1.0.0] +requires.1.greedy=true + +requires.2.namespace=org.eclipse.equinox.p2.iu +requires.2.name=toolingorg.eclipse.configuration +requires.2.filter=(!(osgi.os=win32)) +requires.2.range=[1.0.0,1.0.0] +requires.2.greedy=true + +units.1.id=toolingorg.eclipse.configuration.win32 +units.1.version=1.0.0 +units.1.provides.1.namespace=org.eclipse.equinox.p2.iu +units.1.provides.1.name=toolingorg.eclipse.configuration.win32 +units.1.provides.1.version=1.0.0 +units.1.filter=(osgi.os=win32) +units.1.touchpoint.id=org.eclipse.equinox.p2.osgi +units.1.touchpoint.version=1.0.0 +units.1.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/My Documents/WRT Workspace); +units.1.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:); + +units.2.id=toolingorg.eclipse.configuration +units.2.version=1.0.0 +units.2.provides.1.namespace=org.eclipse.equinox.p2.iu +units.2.provides.1.name=toolingorg.eclipse.configuration +units.2.provides.1.version=1.0.0 +units.2.filter=(!(osgi.os=win32)) +units.2.touchpoint.id=org.eclipse.equinox.p2.osgi +units.2.touchpoint.version=1.0.0 +units.2.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/Documents/WRT Workspace); +units.2.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:); \ No newline at end of file diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.product/plugin.xml --- a/org.symbian.tools.wrttools.product/plugin.xml Mon Mar 08 12:18:48 2010 -0800 +++ b/org.symbian.tools.wrttools.product/plugin.xml Thu Mar 11 14:37:04 2010 -0800 @@ -19,7 +19,7 @@ class="org.symbian.tools.wrttools.product.actions.NewCSSFileAction" icon="icons/newcss_wiz.gif" id="org.symbian.tools.wrttools.product.newCssFileAction" - label="%action.newcss.label" + label="New CSS File..." style="push" toolbarPath="wrtwizards"> @@ -41,7 +41,7 @@ + id="org.symbian.tools.wrttools.core.wrtwidgetwizard" + banner="WRT_Wizard_banner.png"> @@ -159,19 +160,19 @@ + value="icons/WRT_blurb_image_2.png"> + value="000000"> + value="0,250,422,15"> + value="7,230,441,20"> + + + + + + + diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.product/splash.bmp Binary file org.symbian.tools.wrttools.product/splash.bmp has changed diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools.product/wrt-ide.product --- a/org.symbian.tools.wrttools.product/wrt-ide.product Mon Mar 08 12:18:48 2010 -0800 +++ b/org.symbian.tools.wrttools.product/wrt-ide.product Thu Mar 11 14:37:04 2010 -0800 @@ -4,7 +4,7 @@ - + %productBlurb @@ -21,19 +21,24 @@ -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts - + + location="org.symbian.tools.wrttools.product" + startupProgressRect="5,245,410,15" + startupMessageRect="7,220,400,20" + startupForegroundColor="000000" /> + + - + + + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5 org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6 @@ -132,7 +137,6 @@ - @@ -195,6 +199,7 @@ + diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools/icons/WRT_application_icon_16px.png Binary file org.symbian.tools.wrttools/icons/WRT_application_icon_16px.png has changed diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools/icons/WRT_wizard_banner.png Binary file org.symbian.tools.wrttools/icons/WRT_wizard_banner.png has changed diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools/icons/import_icon_16px.png Binary file org.symbian.tools.wrttools/icons/import_icon_16px.png has changed diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools/icons/import_wizard_banner.png Binary file org.symbian.tools.wrttools/icons/import_wizard_banner.png has changed diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools/plugin.xml --- a/org.symbian.tools.wrttools/plugin.xml Mon Mar 08 12:18:48 2010 -0800 +++ b/org.symbian.tools.wrttools/plugin.xml Thu Mar 11 14:37:04 2010 -0800 @@ -75,7 +75,8 @@ - - + +--> - + @@ -155,7 +157,7 @@ - + @@ -189,7 +191,7 @@ - + Import WRT project created in Aptana, Adobe Dreamweaver or WRT IDE @@ -283,6 +286,7 @@ class="org.symbian.tools.wrttools.wizards.WgzImportWizard" icon="icons/WRTImport.gif" id="org.symbian.tools.wrttools.importwgz" + banner="icons/WRT_wizard_banner.png" name="Sources from WGZ File"> Create WRT project from deployable WGZ application archive @@ -631,7 +635,7 @@ point="org.eclipse.ui.keywords"> + label="wrt, webruntime, web runtime, cwrt widget"> \"WRT\"->\"Deployment\" to set deployment preferences."); } } diff -r 28cd64723120 -r 2d8702ba47f8 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/ProjectUtils.java --- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/ProjectUtils.java Mon Mar 08 12:18:48 2010 -0800 +++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/ProjectUtils.java Thu Mar 11 14:37:04 2010 -0800 @@ -76,110 +76,105 @@ @SuppressWarnings("restriction") public class ProjectUtils { - private static final class FocusOnProjectJob extends Job { + private static final class FocusOnProjectJob extends Job { - private final Display display; - private final IProject[] projects; + private final Display display; + private final IProject[] projects; - public FocusOnProjectJob(IProject[] projects, Display display) { - super("Preparing projects"); - this.projects = projects; - this.display = display; - setRule(this.projects.length == 1 ? projects[0] : projects[0] - .getWorkspace().getRoot()); - setUser(false); - } + public FocusOnProjectJob(IProject[] projects, Display display) { + super("Preparing projects"); + this.projects = projects; + this.display = display; + setRule(this.projects.length == 1 ? projects[0] : projects[0].getWorkspace().getRoot()); + setUser(false); + } - @Override - protected IStatus run(IProgressMonitor monitor) { - try { - final Collection files = new HashSet( - projects.length); - for (IProject project : projects) { - String file = CoreUtil.getIndexFile(project); - if (file != null) { - IFile index = project.getFile(file); - if (index.isAccessible()) { - files.add(index); - } - } - } - final IFile[] filesArray = files - .toArray(new IFile[files.size()]); - display.asyncExec(new Runnable() { + @Override + protected IStatus run(IProgressMonitor monitor) { + try { + final Collection files = new HashSet(projects.length); + for (IProject project : projects) { + String file = CoreUtil.getIndexFile(project); + if (file != null) { + IFile index = project.getFile(file); + if (index.isAccessible()) { + files.add(index); + } + } + } + final IFile[] filesArray = files.toArray(new IFile[files.size()]); + if (filesArray.length > 0) { + display.asyncExec(new Runnable() { - public void run() { - IWorkbenchPage activePage = PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getActivePage(); - IViewReference reference = activePage - .findViewReference(Activator.NAVIGATOR_ID); - IWorkbenchPart part = reference.getPart(false); - if (part instanceof ISetSelectionTarget) { - StructuredSelection selection; - if (filesArray.length == 1) { - selection = new StructuredSelection( - filesArray[0]); - } else { - selection = new StructuredSelection(filesArray); - } - ((ISetSelectionTarget) part) - .selectReveal(selection); - } - try { - IDE.openEditors(activePage, filesArray); - ResourcesPlugin.getWorkspace().run( - new TouchAllResources(projects), - new NullProgressMonitor()); - } catch (CoreException e) { - Activator.log(e); - } - } - }); - } catch (CoreException e) { - Activator.log(e); - } - return Status.OK_STATUS; - } - } - private static final class TouchAllResources implements IWorkspaceRunnable { - private final IProject[] projects; + public void run() { + IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getActivePage(); + IViewReference reference = activePage.findViewReference(Activator.NAVIGATOR_ID); + IWorkbenchPart part = reference.getPart(false); + if (part instanceof ISetSelectionTarget) { + StructuredSelection selection; + if (filesArray.length == 1) { + selection = new StructuredSelection(filesArray[0]); + } else { + selection = new StructuredSelection(filesArray); + } + ((ISetSelectionTarget) part).selectReveal(selection); + } + try { + IDE.openEditors(activePage, filesArray); + ResourcesPlugin.getWorkspace().run(new TouchAllResources(projects), + new NullProgressMonitor()); + } catch (CoreException e) { + Activator.log(e); + } + } + }); + } + } catch (CoreException e) { + Activator.log(e); + } + return Status.OK_STATUS; + } + } - public TouchAllResources(IProject[] projects) { - this.projects = projects; + private static final class TouchAllResources implements IWorkspaceRunnable { + private final IProject[] projects; - } + public TouchAllResources(IProject[] projects) { + this.projects = projects; + + } - public void run(IProgressMonitor monitor) throws CoreException { - for (IProject project : projects) { - project.accept(new IResourceVisitor() { - public boolean visit(IResource resource) - throws CoreException { - if (resource.isAccessible() - && resource.getType() == IResource.FILE - && resource.getFileExtension().equals("js")) { - resource.touch(new NullProgressMonitor()); - } - return true; - } - }); - } - } - } - private static final String DEFAULT_APTANA_WORKSPACE = "Aptana Studio Workspace"; - private static final Collection EXCLUDED; + public void run(IProgressMonitor monitor) throws CoreException { + for (IProject project : projects) { + project.accept(new IResourceVisitor() { + public boolean visit(IResource resource) throws CoreException { + if (resource.isAccessible() && resource.getType() == IResource.FILE + && resource.getFileExtension().equals("js")) { + resource.touch(new NullProgressMonitor()); + } + return true; + } + }); + } + } + } - public static final String PREVIEW_FOLDER = "preview"; + private static final String DEFAULT_APTANA_WORKSPACE = "Aptana Studio Workspace"; + private static final Collection EXCLUDED; - public static final String PREVIEW_FRAME_FILE = "wrt_preview_frame.html"; + public static final String PREVIEW_FOLDER = "preview"; - public static final String PREVIEW_MAIN_FILE = "wrt_preview_main.html"; + public static final String PREVIEW_FRAME_FILE = "wrt_preview_frame.html"; - static { + public static final String PREVIEW_MAIN_FILE = "wrt_preview_main.html"; + + static { EXCLUDED = new TreeSet(Arrays.asList(".project", ProjectUtils.PREVIEW_FOLDER, ProjectUtils.PREVIEW_FRAME_FILE, ProjectUtils.PREVIEW_MAIN_FILE)); } - private static boolean accepted(Object object) { + private static boolean accepted(Object object) { final String name; if (object instanceof ZipEntry) { name = ((ZipEntry) object).getName(); @@ -194,65 +189,58 @@ return isValidProjectFile(path.lastSegment()); } - public static void addWrtNature(IProject project) { - if (!hasWrtNature(project)) { - try { - IProjectDescription description = project.getDescription(); - String[] natureIds = description.getNatureIds(); - String[] newNatures = new String[natureIds.length + 1]; - System.arraycopy(natureIds, 0, newNatures, 1, natureIds.length); - newNatures[0] = WidgetProjectNature.ID; - description.setNatureIds(newNatures); + public static void addWrtNature(IProject project) { + if (!hasWrtNature(project)) { + try { + IProjectDescription description = project.getDescription(); + String[] natureIds = description.getNatureIds(); + String[] newNatures = new String[natureIds.length + 1]; + System.arraycopy(natureIds, 0, newNatures, 1, natureIds.length); + newNatures[0] = WidgetProjectNature.ID; + description.setNatureIds(newNatures); - ICommand[] buildSpec = description.getBuildSpec(); - for (int i = 0; i < buildSpec.length; i++) { - ICommand command = buildSpec[i]; - if (JavaScriptCore.BUILDER_ID.equals(command - .getBuilderName())) { - buildSpec[i] = buildSpec[buildSpec.length - 1]; - buildSpec[buildSpec.length - 1] = command; - description.setBuildSpec(buildSpec); - break; - } - } - - project.setDescription(description, new NullProgressMonitor()); - } catch (CoreException e) { - Activator.log(e); - } - } - } + ICommand[] buildSpec = description.getBuildSpec(); + for (int i = 0; i < buildSpec.length; i++) { + ICommand command = buildSpec[i]; + if (JavaScriptCore.BUILDER_ID.equals(command.getBuilderName())) { + buildSpec[i] = buildSpec[buildSpec.length - 1]; + buildSpec[buildSpec.length - 1] = command; + description.setBuildSpec(buildSpec); + break; + } + } - private static void checkParent(IContainer parent) throws CoreException { - if (parent.getType() == IResource.FOLDER && !parent.exists()) { - checkParent(parent.getParent()); - ((IFolder) parent).create(false, true, new NullProgressMonitor()); - } - } + project.setDescription(description, new NullProgressMonitor()); + } catch (CoreException e) { + Activator.log(e); + } + } + } - public static void copyFile(IProject project, String name, - ZipInputStream stream, long size, IProgressMonitor monitor) - throws CoreException, IOException { - IFile file = project.getFile(name); - file.create(new NonClosingStream(stream), true, new SubProgressMonitor( - monitor, 1)); - } + private static void checkParent(IContainer parent) throws CoreException { + if (parent.getType() == IResource.FOLDER && !parent.exists()) { + checkParent(parent.getParent()); + ((IFolder) parent).create(false, true, new NullProgressMonitor()); + } + } - public static IProject createWrtProject(String name, URI uri, - IProgressMonitor monitor) throws CoreException { - uri = isDefaultProjectLocation(uri) ? null : uri; + public static void copyFile(IProject project, String name, ZipInputStream stream, long size, + IProgressMonitor monitor) throws CoreException, IOException { + IFile file = project.getFile(name); + file.create(new NonClosingStream(stream), true, new SubProgressMonitor(monitor, 1)); + } + + public static IProject createWrtProject(String name, URI uri, IProgressMonitor monitor) throws CoreException { + uri = isDefaultProjectLocation(uri) ? null : uri; monitor.beginTask("Create project resources", 25); - IWorkspace workspace = ResourcesPlugin.getWorkspace(); - IProject project = workspace.getRoot().getProject(name); - BuildPathsBlock.createProject(project, uri, new SubProgressMonitor( - monitor, 10)); - BuildPathsBlock.addJavaNature(project, new SubProgressMonitor(monitor, - 10)); + IWorkspace workspace = ResourcesPlugin.getWorkspace(); + IProject project = workspace.getRoot().getProject(name); + BuildPathsBlock.createProject(project, uri, new SubProgressMonitor(monitor, 10)); + BuildPathsBlock.addJavaNature(project, new SubProgressMonitor(monitor, 10)); - ValidationFramework.getDefault().addValidationBuilder(project); - ValidationFramework.getDefault().applyChanges( - ValidationFramework.getDefault().getProjectSettings(project), - true); + ValidationFramework.getDefault().addValidationBuilder(project); + ValidationFramework.getDefault().applyChanges(ValidationFramework.getDefault().getProjectSettings(project), + true); IJavaScriptProject jsProject = JavaScriptCore.create(project); final IIncludePathEntry[] includepath = jsProject.getRawIncludepath(); @@ -268,13 +256,13 @@ "Window"); ((JavaProject) jsProject).setCommonSuperType(superType); - addWrtNature(project); + addWrtNature(project); - monitor.done(); - return project; - } + monitor.done(); + return project; + } - public static List filterExternalProjectEntries(List fileSystemObjects) { + public static List filterExternalProjectEntries(List fileSystemObjects) { List result = new LinkedList(); for (Object object : fileSystemObjects) { if (accepted(object)) { @@ -284,87 +272,86 @@ return result; } - public static void focusOn(IProject... projects) { - new FocusOnProjectJob(projects, Display.getCurrent()).schedule(50); - } + public static void focusOn(IProject... projects) { + new FocusOnProjectJob(projects, Display.getCurrent()).schedule(50); + } - public static String getDefaultAptanaLocation() { - File myDocuments = FileSystemView.getFileSystemView() - .getDefaultDirectory(); - File file = new File(myDocuments, DEFAULT_APTANA_WORKSPACE); // Windows - if (file.exists()) { - return file.getAbsolutePath(); - } - file = new File(myDocuments, "Documents" + File.separator - + DEFAULT_APTANA_WORKSPACE); // Mac OS X - if (file.exists()) { - return file.getAbsolutePath(); - } - return ""; - } + public static String getDefaultAptanaLocation() { + File myDocuments = FileSystemView.getFileSystemView().getDefaultDirectory(); + File file = new File(myDocuments, DEFAULT_APTANA_WORKSPACE); // Windows + if (file.exists()) { + return file.getAbsolutePath(); + } + file = new File(myDocuments, "Documents" + File.separator + DEFAULT_APTANA_WORKSPACE); // Mac OS X + if (file.exists()) { + return file.getAbsolutePath(); + } + return ""; + } - public static boolean hasWrtNature(IProject project) { - try { - return project.hasNature(WidgetProjectNature.ID); - } catch (CoreException e) { - Activator.log(e); - return false; - } - } + public static boolean hasWrtNature(IProject project) { + try { + return project.hasNature(WidgetProjectNature.ID); + } catch (CoreException e) { + Activator.log(e); + return false; + } + } public static File isWrtProject(File[] contents) { - for (int i = 0; i < contents.length; i++) { - File file = contents[i]; + for (int i = 0; i < contents.length; i++) { + File file = contents[i]; if (file.isFile() && file.getName().equalsIgnoreCase(CoreUtil.METADATA_FILE)) { return file.getParentFile(); - } - } + } + } return null; - } + } private static boolean isDefaultProjectLocation(URI uri) { - if (uri == null) { - return true; - } - File file = new File(uri); - IPath project = new Path(file.getAbsolutePath()); - IPath workspace = ResourcesPlugin.getWorkspace().getRoot() - .getLocation(); - return workspace.isPrefixOf(project); - } + if (uri == null) { + return true; + } + File file = new File(uri); + IPath project = new Path(file.getAbsolutePath()); + IPath workspace = ResourcesPlugin.getWorkspace().getRoot().getLocation(); + return workspace.isPrefixOf(project); + } public static boolean isPlist(IResource resource) { return resource.getType() == IResource.FILE && resource.getName().equalsIgnoreCase(CoreUtil.METADATA_FILE); - } + } private static boolean isValidProjectFile(String fileName) { return !EXCLUDED.contains(fileName); } - public static void unzip(String archiveFile, IContainer location, - int trimSegments, IProgressMonitor progressMonitor) - throws IOException, CoreException { - progressMonitor.beginTask(MessageFormat.format("Unpacking {0}", - archiveFile), IProgressMonitor.UNKNOWN); - ZipInputStream stream = new ZipInputStream(new FileInputStream( - archiveFile)); + public static void unzip(String archiveFile, IContainer location, int trimSegments, IProgressMonitor progressMonitor) + throws IOException, CoreException { + progressMonitor.beginTask(MessageFormat.format("Unpacking {0}", archiveFile), IProgressMonitor.UNKNOWN); + ZipInputStream stream = new ZipInputStream(new FileInputStream(archiveFile)); - try { - ZipEntry nextEntry; - while ((nextEntry = stream.getNextEntry()) != null) { - IPath p = new Path(nextEntry.getName()) - .removeFirstSegments(trimSegments); - if (!nextEntry.isDirectory()) { - IFile file = location.getFile(p); - checkParent(file.getParent()); - file.create(new NonClosingStream(stream), false, - new SubProgressMonitor(progressMonitor, 1)); - } - } - } finally { - stream.close(); - } - progressMonitor.done(); - } + try { + ZipEntry nextEntry; + while ((nextEntry = stream.getNextEntry()) != null) { + IPath p = new Path(nextEntry.getName()).removeFirstSegments(trimSegments); + if (!isIgnored(p) && !nextEntry.isDirectory()) { + IFile file = location.getFile(p); + checkParent(file.getParent()); + file.create(new NonClosingStream(stream), false, new SubProgressMonitor(progressMonitor, 1)); + } + } + } finally { + stream.close(); + } + progressMonitor.done(); + } + + private static boolean isIgnored(IPath p) { + if (p.segmentCount() == 1) { + return IProjectDescription.DESCRIPTION_FILE_NAME.equals(p.lastSegment()); + } + return false; + } } diff -r 28cd64723120 -r 2d8702ba47f8 scripts/build.properties.SED --- a/scripts/build.properties.SED Mon Mar 08 12:18:48 2010 -0800 +++ b/scripts/build.properties.SED Thu Mar 11 14:37:04 2010 -0800 @@ -55,17 +55,10 @@ #groupConfigurations=true #The format of the archive. By default a zip is created using antZip. -#The list can only contain the configuration for which the desired format is different than zip. -#archivesFormat=win32, win32, x86 - antZip& \ -# linux, gtk, ppc - antZip &\ -# linux, gtk, x86 - antZip& \ -# linux, gtk, x86_64 - antZip& \ -# linux, motif, x86 - antZip& \ -# solaris, motif, sparc - antZip& \ -# solaris, gtk, sparc - antZip& \ -# aix, motif, ppc - antZip& \ -# hpux, motif, PA_RISC - antZip& \ -# macosx, carbon, ppc - antZip +#The list can only contain the configuration for which the desired format is different than zip. +archivesFormat=win32, win32, x86 - zip& \ + linux, gtk, x86 - zip& \ + macosx, cocoa, x86 - zip #Allow cycles involving at most one bundle that needs to be compiled with the rest being binary bundles. allowBinaryCycles = true @@ -116,7 +109,7 @@ buildType=N # ID of the build. Used in naming the build output. -buildId=TestBuild +buildId=WrtIde # Label for the build. Used in naming the build output buildLabel=${buildType}.${buildId} @@ -139,12 +132,12 @@ # in most RCP app or a plug-in, the baseLocation should be the location of a previously # installed Eclipse against which the application or plug-in code will be compiled and the RCP delta pack. -base=/usr/eclipse/JEE +base=/usr/master/eclipse/3.5.2/jee baseLocation=${base}/eclipse -eclipseLocation=/usr/eclipse +eclipseLocation=/usr/master/eclipse/3.5.2/pde/eclipse equinoxLauncherPluginVersion=1.0.201.R35x_v20090715 -pdeBuildPluginVersion=3.5.1.R35x_20090820 +pdeBuildPluginVersion=3.5.2.R35x_20100114 #Folder containing repositories whose content is needed to compile against #repoBaseLocation=${base}/repos diff -r 28cd64723120 -r 2d8702ba47f8 scripts/plugin.properties.SED --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/plugin.properties.SED Thu Mar 11 14:37:04 2010 -0800 @@ -0,0 +1,14 @@ +pluginName=WebRuntime Toolkit IDE +providerName=Symbian Foundation +productName=Web Runtime Toolkit IDE +productBlurb=Symbian Foundation's Open Source Web Runtime Toolkit IDE based on Eclipse Platform for developing and deploying Web applications\n\ +\n\ +Version: 1.0.0\n\ +Build id: SED_BUILD_ID \n\ +\n\ +(c) Copyright 2009-2010 Symbian Foundation and/or its subsidiary(-ies). All rights reserved.\n +Visit http://www.symbian.org\n\ +\n\ +This offering is powered by Eclipse technology and includes\n\ +Eclipse plug-ins that can be installed and used\n\ +with other Eclipse-based offerings. diff -r 28cd64723120 -r 2d8702ba47f8 scripts/shepard.sh --- a/scripts/shepard.sh Mon Mar 08 12:18:48 2010 -0800 +++ b/scripts/shepard.sh Thu Mar 11 14:37:04 2010 -0800 @@ -30,6 +30,8 @@ # set the build directory in the build.properties files. cat ${SOURCE_DIR}/scripts/build.properties.SED | sed -e s#SED_BUILD_DIR#${BUILD_DIR}#g > ${SOURCE_DIR}/scripts/build.properties +cat ${SOURCE_DIR}/scripts/plugin.properties.SED | sed -e s#SED_BUILD_ID#${ECLIPSE_TIMESTAMP}#g > ${SOURCE_DIR}/org.symbian.tools.wrttools.product/plugin.properties + # bug fix for 1872. [testcase: go to about box. click on installation details. Do you see an error? ] for f in `find ${SOURCE_DIR} -name MANIFEST.MF` do @@ -42,7 +44,7 @@ ${ANT_CMD} -DbuildDirectory=${BUILD_DIR} -DsourceDirectory=${SOURCE_DIR} -cd ${BUILD_DIR}/N.TestBuild +cd ${BUILD_DIR}/N.WrtIde # bug 2165 - add a timestamp to filename for file in *.zip