Heads merge
authorEugene Ostroukhov <eugeneo@symbian.org>
Thu, 04 Mar 2010 17:06:37 -0800
changeset 222 46f364ef3f5d
parent 221 ab8569330011 (diff)
parent 220 41890dfa56f5 (current diff)
child 223 e6391b76ba4c
Heads merge
org.symbian.tools.wrttools.previewer/preview/images/wrt-help-con.gif
org.symbian.wrttools.doc.WRTKit/src/org/symbian/wrtools/lib/wrtkit/Activator.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/org.symbian.tools.wrttools.product/config_inis/linux.ini	Thu Mar 04 17:06:37 2010 -0800
@@ -0,0 +1,12 @@
+#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
--- a/org.symbian.tools.wrttools.product/config_inis/linux/config.ini	Thu Mar 04 15:42:37 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-#This configuration file was written by: org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser
-#Thu Mar 04 02:05:20 PST 2010
-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/WRT Workspace
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/org.symbian.tools.wrttools.product/config_inis/macosx.ini	Thu Mar 04 17:06:37 2010 -0800
@@ -0,0 +1,12 @@
+#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
--- a/org.symbian.tools.wrttools.product/config_inis/macosx/config.ini	Thu Mar 04 15:42:37 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-#This configuration file was written by: org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser
-#Thu Mar 04 02:06:26 PST 2010
-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/WRT Workspace
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/org.symbian.tools.wrttools.product/config_inis/windows.ini	Thu Mar 04 17:06:37 2010 -0800
@@ -0,0 +1,11 @@
+#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
--- a/org.symbian.tools.wrttools.product/config_inis/windows/config.ini	Thu Mar 04 15:42:37 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-#This configuration file was written by: org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser
-#Thu Mar 04 13:13:15 PST 2010
-org.eclipse.update.reconcile=false
-eclipse.p2.profile=profile
-osgi.instance.area.default=@user.home/My Documents/WRT Workspace
-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
-osgi.bundles.defaultStartLevel=4
-eclipse.p2.data.area=@config.dir/../p2/
-eclipse.application=org.eclipse.ui.ide.workbench
--- a/org.symbian.tools.wrttools.product/wrt-ide.product	Thu Mar 04 15:42:37 2010 -0800
+++ b/org.symbian.tools.wrttools.product/wrt-ide.product	Thu Mar 04 17:06:37 2010 -0800
@@ -11,9 +11,6 @@
    </aboutInfo>
 
    <configIni use="default">
-      <linux>/org.symbian.tools.wrttools.product/config_inis/linux/config.ini</linux>
-      <macosx>/org.symbian.tools.wrttools.product/config_inis/macosx/config.ini</macosx>
-      <win32>/org.symbian.tools.wrttools.product/config_inis/windows/config.ini</win32>
    </configIni>
 
    <launcherArgs>