v200av200a

23 files changed, 117 insertions, 118 deletions

diff --git a/bundles/org.eclipse.swt/.cvsignore b/bundles/org.eclipse.swt/.cvsignore
index 30e8e7346e..3f041525eb 100755
--- a/bundles/org.eclipse.swt/.cvsignore
+++ b/bundles/org.eclipse.swt/.cvsignore
@@ -1,3 +1,2 @@
 bin

 .classpath

-build.properties
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/build.properties b/bundles/org.eclipse.swt/build.properties
new file mode 100644
index 0000000000..bbc1b6b399
--- /dev/null
+++ b/bundles/org.eclipse.swt/build.properties
@@ -0,0 +1,51 @@
+source.swt.jar = Eclipse SWT/win32,\

+                 Eclipse SWT/common,\

+                 Eclipse SWT AWT/win32,\

+                 Eclipse SWT Custom Widgets/common,\

+                 Eclipse SWT Drag and Drop/win32,\

+                 Eclipse SWT Drag and Drop/common,\

+                 Eclipse SWT OLE Win32/win32,\

+                 Eclipse SWT Printing/win32,\

+                 Eclipse SWT Printing/common,\

+                 Eclipse SWT Program/win32,\

+                 Eclipse SWT Program/common

+bin.includes = plugin.xml,\

+               ws/

+source.ws/motif/swt.jar = Eclipse SWT/motif,\

+                          Eclipse SWT/common,\

+                          Eclipse SWT Custom Widgets/common,\

+                          Eclipse SWT Drag and Drop/motif,\

+                          Eclipse SWT Drag and Drop/common,\

+                          Eclipse SWT Printing/motif,\

+                          Eclipse SWT Printing/common,\

+                          Eclipse SWT Program/motif,\

+                          Eclipse SWT Program/common

+source.ws/photon/swt.jar = Eclipse SWT/photon,\

+                           Eclipse SWT/common,\

+                           Eclipse SWT Custom Widgets/common,\

+                           Eclipse SWT Drag and Drop/photon,\

+                           Eclipse SWT Drag and Drop/common,\

+                           Eclipse SWT Printing/photon,\

+                           Eclipse SWT Printing/common,\

+                           Eclipse SWT Program/photon,\

+                           Eclipse SWT Program/common

+source.ws/win32/swt.jar = Eclipse SWT/win32,\

+                          Eclipse SWT/common,\

+                          Eclipse SWT AWT/win32,\

+                          Eclipse SWT Custom Widgets/common,\

+                          Eclipse SWT Drag and Drop/win32,\

+                          Eclipse SWT Drag and Drop/common,\

+                          Eclipse SWT OLE Win32/win32,\

+                          Eclipse SWT Printing/win32,\

+                          Eclipse SWT Printing/common,\

+                          Eclipse SWT Program/win32,\

+                          Eclipse SWT Program/common

+source.ws/gtk/swt.jar = Eclipse SWT/gtk,\

+                        Eclipse SWT/common,\

+                        Eclipse SWT Custom Widgets/common,\

+                        Eclipse SWT Drag and Drop/gtk,\

+                        Eclipse SWT Drag and Drop/common,\

+                        Eclipse SWT Printing/gtk,\

+                        Eclipse SWT Printing/common,\

+                        Eclipse SWT Program/gtk,\

+                        Eclipse SWT Program/common

diff --git a/bundles/org.eclipse.swt/build.properties.common b/bundles/org.eclipse.swt/build.properties.common
deleted file mode 100755
index 2af74c346f..0000000000
--- a/bundles/org.eclipse.swt/build.properties.common
+++ /dev/null
@@ -1,8 +0,0 @@
-build.vaj.Eclipse\ SWT\ Custom\ Widgets=Eclipse SWT Custom Widgets/common

-build.includes=plugin.xml,plugin.jars,build.properties,buildnotes_swt.html

-

-source.ws/win32/swt.jar=Eclipse SWT/win32,Eclipse SWT/common,Eclipse SWT AWT/win32,Eclipse SWT Custom Widgets/common,Eclipse SWT Drag and Drop/win32,Eclipse SWT Drag and Drop/common,Eclipse SWT OLE Win32/win32,Eclipse SWT Printing/win32,Eclipse SWT Printing/common,Eclipse SWT Program/win32,Eclipse SWT Program/common

-source.ws/motif/swt.jar=Eclipse SWT/motif,Eclipse SWT/common,Eclipse SWT Custom Widgets/common,Eclipse SWT Drag and Drop/motif,Eclipse SWT Drag and Drop/common,Eclipse SWT Printing/motif,Eclipse SWT Printing/common,Eclipse SWT Program/motif,Eclipse SWT Program/common

-source.ws/gtk/swt.jar=Eclipse SWT/gtk,Eclipse SWT/common,Eclipse SWT Custom Widgets/common,Eclipse SWT Drag and Drop/gtk,Eclipse SWT Drag and Drop/common,Eclipse SWT Printing/gtk,Eclipse SWT Printing/common,Eclipse SWT Program/gtk,Eclipse SWT Program/common

-source.ws/photon/swt.jar=Eclipse SWT/photon,Eclipse SWT/common,Eclipse SWT Custom Widgets/common,Eclipse SWT Drag and Drop/photon,Eclipse SWT Drag and Drop/common,Eclipse SWT Printing/photon,Eclipse SWT Printing/common,Eclipse SWT Program/photon,Eclipse SWT Program/common

-bin.includes=plugin.xml,ws/

diff --git a/bundles/org.eclipse.swt/build.properties.motif b/bundles/org.eclipse.swt/build.properties.motif
deleted file mode 100755
index b5db17f10e..0000000000
--- a/bundles/org.eclipse.swt/build.properties.motif
+++ /dev/null
@@ -1,5 +0,0 @@
-build.vaj.Eclipse\ SWT=Eclipse SWT/common,Eclipse SWT/emulated,Eclipse SWT/motif

-build.vaj.Eclipse\ SWT\ Drag\ and\ Drop=Eclipse SWT Drag and Drop/common,Eclipse SWT Drag and Drop/motif

-build.vaj.Eclipse\ SWT\ Printing=Eclipse SWT Printing/common,Eclipse SWT Printing/motif

-build.vaj.Eclipse\ SWT\ Program=Eclipse SWT Program/common,Eclipse SWT Program/motif

-build.includes=ws/motif
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/build.properties.photon b/bundles/org.eclipse.swt/build.properties.photon
deleted file mode 100755
index 339b6805c2..0000000000
--- a/bundles/org.eclipse.swt/build.properties.photon
+++ /dev/null
@@ -1,5 +0,0 @@
-build.vaj.Eclipse\ SWT=Eclipse SWT/common,Eclipse SWT/emulated,Eclipse SWT/photon

-build.vaj.Eclipse\ SWT\ Drag\ and\ Drop=Eclipse SWT Drag and Drop/common,Eclipse SWT Drag and Drop/photon

-build.vaj.Eclipse\ SWT\ Printing=Eclipse SWT Printing/common,Eclipse SWT Printing/photon

-build.vaj.Eclipse\ SWT\ Program=Eclipse SWT Program/common,Eclipse SWT Program/photon

-build.includes=ws/photon
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/build.properties.win32 b/bundles/org.eclipse.swt/build.properties.win32
deleted file mode 100755
index d87bb9905f..0000000000
--- a/bundles/org.eclipse.swt/build.properties.win32
+++ /dev/null
@@ -1,7 +0,0 @@
-build.vaj.Eclipse\ SWT=Eclipse SWT/common,Eclipse SWT/win32

-build.vaj.Eclipse\ SWT\ AWT=Eclipse SWT AWT/win32

-build.vaj.Eclipse\ SWT\ Drag\ and\ Drop=Eclipse SWT Drag and Drop/common,Eclipse SWT Drag and Drop/win32

-build.vaj.Eclipse\ SWT\ OLE\ Win32=Eclipse SWT OLE Win32/win32

-build.vaj.Eclipse\ SWT\ Printing=Eclipse SWT Printing/common,Eclipse SWT Printing/win32

-build.vaj.Eclipse\ SWT\ Program=Eclipse SWT Program/common,Eclipse SWT Program/win32

-build.includes=ws/win32
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/plugin.jars b/bundles/org.eclipse.swt/plugin.jars
deleted file mode 100755
index 01b2a14a49..0000000000
--- a/bundles/org.eclipse.swt/plugin.jars
+++ /dev/null
@@ -1,7 +0,0 @@
-swt.jar=\

-	Eclipse SWT Drag and Drop,\

-	Eclipse SWT,\

-	Eclipse SWT OLE Win32,\

-	Eclipse SWT Custom Widgets, \

-	Eclipse SWT Program,\

-	Eclipse SWT Printing
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/plugin.xml b/bundles/org.eclipse.swt/plugin.xml
index 2f3b714c78..9cfd17e9f5 100755
--- a/bundles/org.eclipse.swt/plugin.xml
+++ b/bundles/org.eclipse.swt/plugin.xml
@@ -3,12 +3,13 @@
 <plugin

    id="org.eclipse.swt"

    name="SWT"

-   version="0.9"

+   version="2.0"

    provider-name="Object Technology International, Inc.">

 

 <!-- Runtime -->

+<!-- Runtime -->

 <runtime>

-   <library name="swt.jar">

+   <library name="$ws$/swt.jar">

       <export name="*"/>

    </library>

 </runtime>

diff --git a/examples/org.eclipse.swt.examples.controls/build.properties b/examples/org.eclipse.swt.examples.controls/build.properties
index b82d52c1cb..6e7e56b0e9 100755
--- a/examples/org.eclipse.swt.examples.controls/build.properties
+++ b/examples/org.eclipse.swt.examples.controls/build.properties
@@ -1,12 +1,6 @@
-build.includes = doc-html/,\

-                 icons/,\

-                 plugin.properties,\

-                 plugin.xml,\

-                 plugin.jars

-                 

-build.vaj.Eclipse\ SWT\ Examples\ Controls = /

-

-build.excludes = bin/,\

-                 .cvsignore,\

-                 .vcm_meta,\

-                 build.properties
\ No newline at end of file
+bin.includes = doc-html/,\

+               icons/,\

+               plugin.properties,\

+               plugin.xml,\

+               import.properties

+source.controls.jar = /

diff --git a/examples/org.eclipse.swt.examples.controls/plugin.jars b/examples/org.eclipse.swt.examples.controls/plugin.jars
deleted file mode 100755
index 859f24f5fc..0000000000
--- a/examples/org.eclipse.swt.examples.controls/plugin.jars
+++ /dev/null
@@ -1 +0,0 @@
-controls.jar = Eclipse SWT Examples Controls
\ No newline at end of file
diff --git a/examples/org.eclipse.swt.examples.controls/plugin.xml b/examples/org.eclipse.swt.examples.controls/plugin.xml
index 079e77d394..251d2e7552 100755
--- a/examples/org.eclipse.swt.examples.controls/plugin.xml
+++ b/examples/org.eclipse.swt.examples.controls/plugin.xml
@@ -3,7 +3,7 @@
 <plugin

    id="org.eclipse.swt.examples.controls"

    name="%plugin.SWTControlsExample.name"

-   version="0.9"

+   version="2.0"

    provider-name="Object Technology International, Inc."

    class="org.eclipse.swt.examples.controls.ControlPlugin">

 <!-- Required plugins -->

diff --git a/examples/org.eclipse.swt.examples.launcher/build.properties b/examples/org.eclipse.swt.examples.launcher/build.properties
index 2b1909f65f..0926d2b5c1 100755
--- a/examples/org.eclipse.swt.examples.launcher/build.properties
+++ b/examples/org.eclipse.swt.examples.launcher/build.properties
@@ -1,14 +1,8 @@
-build.includes = doc/,\

-                 doc-html/,\

-                 icons/,\

-                 schema/,\

-                 plugin.properties,\

-                 plugin.xml,\

-                 plugin.jars

-                 

-build.vaj.Eclipse\ SWT\ Examples\ Launcher = /

-

-build.excludes = bin/,\

-                 .cvsignore,\

-                 .vcm_meta,\

-                 build.properties
\ No newline at end of file
+source.launcher.jar = /

+bin.includes = doc/,\

+               doc-html/,\

+               icons/,\

+               schema/,\

+               plugin.properties,\

+               plugin.xml,\

+               import.properties

diff --git a/examples/org.eclipse.swt.examples.launcher/plugin.jars b/examples/org.eclipse.swt.examples.launcher/plugin.jars
deleted file mode 100755
index 5af4a9bffc..0000000000
--- a/examples/org.eclipse.swt.examples.launcher/plugin.jars
+++ /dev/null
@@ -1 +0,0 @@
-launcher.jar = Eclipse SWT Examples Launcher
\ No newline at end of file
diff --git a/examples/org.eclipse.swt.examples.launcher/plugin.xml b/examples/org.eclipse.swt.examples.launcher/plugin.xml
index 8994a344d9..96e0f550f7 100755
--- a/examples/org.eclipse.swt.examples.launcher/plugin.xml
+++ b/examples/org.eclipse.swt.examples.launcher/plugin.xml
@@ -3,7 +3,7 @@
 <plugin

    id="org.eclipse.swt.examples.launcher"

    name="%plugin.SWTLauncherExample.name"

-   version="0.9"

+   version="2.0"

    provider-name="Object Technology International, Inc."

    class="org.eclipse.swt.examples.launcher.LauncherPlugin">

 <!-- Required plugins -->

diff --git a/examples/org.eclipse.swt.examples.ole.win32/build.properties b/examples/org.eclipse.swt.examples.ole.win32/build.properties
index b62af06cf8..e95f90148b 100755
--- a/examples/org.eclipse.swt.examples.ole.win32/build.properties
+++ b/examples/org.eclipse.swt.examples.ole.win32/build.properties
@@ -1,12 +1,6 @@
-build.includes = doc-html/,\

-                 icons/,\

-                 plugin.properties,\

-                 plugin.xml,\

-                 plugin.jars

-                 

-build.vaj.Eclipse\ SWT\ Examples\ OLE = /

-

-build.excludes = bin/,\

-                 .cvsignore,\

-                 .vcm_meta,\

-                 build.properties
\ No newline at end of file
+bin.includes = doc-html/,\

+               icons/,\

+               plugin.properties,\

+               plugin.xml,\

+               import.properties

+source.olewin32.jar = /

diff --git a/examples/org.eclipse.swt.examples.ole.win32/plugin.jars b/examples/org.eclipse.swt.examples.ole.win32/plugin.jars
deleted file mode 100755
index 425a2566f6..0000000000
--- a/examples/org.eclipse.swt.examples.ole.win32/plugin.jars
+++ /dev/null
@@ -1 +0,0 @@
-olewin32.jar = Eclipse SWT Examples OLE
\ No newline at end of file
diff --git a/examples/org.eclipse.swt.examples.ole.win32/plugin.xml b/examples/org.eclipse.swt.examples.ole.win32/plugin.xml
index 68ed92796b..b91876cadd 100755
--- a/examples/org.eclipse.swt.examples.ole.win32/plugin.xml
+++ b/examples/org.eclipse.swt.examples.ole.win32/plugin.xml
@@ -3,7 +3,7 @@
 <plugin

    id="org.eclipse.swt.examples.ole.win32"

    name="%plugin.SWTOLEExample.name"

-   version="0.9"

+   version="2.0"

    provider-name="Object Technology International, Inc."

    class="org.eclipse.swt.examples.ole.win32.OlePlugin">

 <!-- Required plugins -->

@@ -15,20 +15,21 @@
 </requires>

 

 <!-- Runtime -->

+<!-- Runtime -->

 <runtime>

    <library name="olewin32.jar"/>

 </runtime>

 

-<!-- Extension points -->

 <!-- Extensions -->

+<!-- Extension points -->

 <extension

       point="org.eclipse.ui.views">

    <view

          name="%view.OLEWebBrowserExample.name"

+         icon="icons/webbrowser_example.gif"

          category="org.eclipse.swt.examples.category"

          class="org.eclipse.swt.examples.ole.win32.OleBrowserView"

-         id="org.eclipse.swt.examples.ole.win32.browserView"

-         icon="icons/webbrowser_example.gif">

+         id="org.eclipse.swt.examples.ole.win32.browserView">

    </view>

 </extension>

 <extension

@@ -40,14 +41,16 @@
    </category>

    <item

          name="%launchitem.OLEWebBrowserExample.name"

+         icon="icons/webbrowser_example.gif"

          description="%launchitem.OLEWebBrowserExample.description"

          category="org.eclipse.swt.examples.launchWin32OnlyCategory"

-         id="org.eclipse.swt.examples.ole.win32.viewlauncher"

-         icon="icons/webbrowser_example.gif">

+         id="org.eclipse.swt.examples.ole.win32.viewlauncher">

       <view

-         viewId="org.eclipse.swt.examples.ole.win32.browserView"/>

+            viewId="org.eclipse.swt.examples.ole.win32.browserView">

+      </view>

       <source

-         zip="olewin32src.zip"/>

+            zip="olewin32src.zip">

+      </source>

    </item>

 </extension>

 </plugin>

diff --git a/examples/org.eclipse.swt.examples.paint/build.properties b/examples/org.eclipse.swt.examples.paint/build.properties
index 4bbd98e1c3..a330eae285 100755
--- a/examples/org.eclipse.swt.examples.paint/build.properties
+++ b/examples/org.eclipse.swt.examples.paint/build.properties
@@ -1,12 +1,6 @@
-build.includes = doc-html/,\

-                 icons/,\

-                 plugin.properties,\

-                 plugin.xml,\

-                 plugins.jars

-                 

-build.vaj.Eclipse\ SWT\ Examples\ Paint = /

-

-build.excludes = bin/,\

-                 .cvsignore,\

-                 .vcm_meta,\

-                 build.properties
\ No newline at end of file
+bin.includes = doc-html/,\

+               icons/,\

+               plugin.properties,\

+               plugin.xml,\

+               import.properties

+source.paint.jar = /

diff --git a/examples/org.eclipse.swt.examples.paint/plugin.jars b/examples/org.eclipse.swt.examples.paint/plugin.jars
deleted file mode 100755
index d3430a51a0..0000000000
--- a/examples/org.eclipse.swt.examples.paint/plugin.jars
+++ /dev/null
@@ -1 +0,0 @@
-paint.jar = Eclipse SWT Examples Paint

diff --git a/examples/org.eclipse.swt.examples.paint/plugin.xml b/examples/org.eclipse.swt.examples.paint/plugin.xml
index b60fd868cc..5547648dd7 100755
--- a/examples/org.eclipse.swt.examples.paint/plugin.xml
+++ b/examples/org.eclipse.swt.examples.paint/plugin.xml
@@ -3,7 +3,7 @@
 <plugin

    id="org.eclipse.swt.examples.paint"

    name="%plugin.SWTPaintExample.name"

-   version="0.9"

+   version="2.0"

    provider-name="Object Technology International, Inc."

    class="org.eclipse.swt.examples.paint.PaintPlugin">

 <!-- Required plugins -->

@@ -15,20 +15,21 @@
 </requires>

 

 <!-- Runtime -->

+<!-- Runtime -->

 <runtime>

    <library name="paint.jar"/>

 </runtime>

 

-<!-- Extension points -->

 <!-- Extensions -->

+<!-- Extension points -->

 <extension

       point="org.eclipse.ui.views">

    <view

          name="%view.PaintExample.name"

+         icon="icons/paint_example.gif"

          category="org.eclipse.swt.examples.category"

          class="org.eclipse.swt.examples.paint.PaintView"

-         id="org.eclipse.swt.examples.paint.view"

-         icon="icons/paint_example.gif">

+         id="org.eclipse.swt.examples.paint.view">

    </view>

 </extension>

 <extension

@@ -40,14 +41,16 @@
    </category>

    <item

          name="%launchitem.PaintExample.name"

+         icon="icons/paint_example.gif"

          description="%launchitem.PaintExample.description"

          category="org.eclipse.swt.examples.launchViewCategory"

-         icon="icons/paint_example.gif"

          id="org.eclipse.swt.examples.paint.viewlauncher">

       <view

-         viewId="org.eclipse.swt.examples.paint.view"/>

+            viewId="org.eclipse.swt.examples.paint.view">

+      </view>

       <source

-         zip="paintsrc.zip"/>

+            zip="paintsrc.zip">

+      </source>

    </item>

 </extension>

 </plugin>

diff --git a/examples/org.eclipse.swt.examples/build.properties b/examples/org.eclipse.swt.examples/build.properties
index 1edb128dd5..7b63e4ac95 100755
--- a/examples/org.eclipse.swt.examples/build.properties
+++ b/examples/org.eclipse.swt.examples/build.properties
@@ -1,9 +1,13 @@
-build.includes = doc-html/,\

-                 plugin.properties,\

-                 plugin.xml,\

-                 plugin.jars

-build.vaj.Eclipse\ SWT\ Examples = /

-build.excludes = bin/,\

-                 .cvsignore,\

-                 .vcm_meta,\

-                 build.properties

+bin.includes = doc-html/,\

+               plugin.properties,\

+               plugin.xml,\

+               examples_addressbook.properties,\

+               examples_contol.properties,\

+               examples_fileviewer.properties,\

+               examples_helloworld.properties,\

+               examples_hoverhelp.properties,\

+               examples_images.properties,\

+               examples_javaviewer.properties,\

+               examples_texteditor.properties,\

+               import.properties

+source.swtexamples.jar = /

diff --git a/examples/org.eclipse.swt.examples/plugin.jars b/examples/org.eclipse.swt.examples/plugin.jars
deleted file mode 100755
index bf99fbba4b..0000000000
--- a/examples/org.eclipse.swt.examples/plugin.jars
+++ /dev/null
@@ -1,2 +0,0 @@
-swtexamples.jar=\

-	Eclipse SWT Examples
\ No newline at end of file
diff --git a/examples/org.eclipse.swt.examples/plugin.xml b/examples/org.eclipse.swt.examples/plugin.xml
index 9a33dca8cf..f91d9dd352 100755
--- a/examples/org.eclipse.swt.examples/plugin.xml
+++ b/examples/org.eclipse.swt.examples/plugin.xml
@@ -3,7 +3,7 @@
 <plugin

    id="org.eclipse.swt.examples"

    name="%plugin.SWTStandaloneExampleSet.name"

-   version="0.9"

+   version="2.0"

    provider-name="Object Technology International, Inc."

    class="">

 <!-- Required plugins -->