May 2, 2006
+The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.
+ +If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
+ + + \ No newline at end of file diff --git a/doc/bundles/org.eclipse.ecf.doc/build.properties b/doc/bundles/org.eclipse.ecf.doc/build.properties index ad7a539f7..df8abeb70 100644 --- a/doc/bundles/org.eclipse.ecf.doc/build.properties +++ b/doc/bundles/org.eclipse.ecf.doc/build.properties @@ -1,4 +1,9 @@ bin.includes = plugin.xml,\ html/,\ toc*.xml,\ - META-INF/ + META-INF/,\ + about.html +src.includes = about.html,\ + META-INF/,\ + html/,\ + plugin.xml diff --git a/doc/bundles/org.eclipse.ecf.tutorial/META-INF/MANIFEST.MF b/doc/bundles/org.eclipse.ecf.tutorial/META-INF/MANIFEST.MF index 8871b58b4..a4d195fc9 100644 --- a/doc/bundles/org.eclipse.ecf.tutorial/META-INF/MANIFEST.MF +++ b/doc/bundles/org.eclipse.ecf.tutorial/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ECF Tutorial Plug-in Bundle-SymbolicName: org.eclipse.ecf.tutorial;singleton:=true -Bundle-Version: 0.8.1 +Bundle-Version: 0.8.2 Bundle-Activator: org.eclipse.ecf.tutorial.Activator Bundle-Vendor: Eclipse.org Bundle-Localization: plugin diff --git a/doc/bundles/org.eclipse.ecf.tutorial/about.html b/doc/bundles/org.eclipse.ecf.tutorial/about.html new file mode 100644 index 000000000..5d03fd4c9 --- /dev/null +++ b/doc/bundles/org.eclipse.ecf.tutorial/about.html @@ -0,0 +1,28 @@ + + + + +May 2, 2006
+The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.
+ +If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
+ + + \ No newline at end of file diff --git a/doc/bundles/org.eclipse.ecf.tutorial/build.properties b/doc/bundles/org.eclipse.ecf.tutorial/build.properties index e9f26dd83..f4f7b16a6 100644 --- a/doc/bundles/org.eclipse.ecf.tutorial/build.properties +++ b/doc/bundles/org.eclipse.ecf.tutorial/build.properties @@ -1,7 +1,10 @@ bin.includes = META-INF/,\ tutorial.jar,\ - plugin.xml + plugin.xml,\ + about.html jars.compile.order = tutorial.jar source.tutorial.jar = src/ output.tutorial.jar = bin/ -src.includes = META-INF/ +src.includes = META-INF/,\ + about.html,\ + plugin.xml diff --git a/examples/bundles/org.eclipse.ecf.example.clients/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.example.clients/META-INF/MANIFEST.MF index 46bb8030f..316f8fd96 100644 --- a/examples/bundles/org.eclipse.ecf.example.clients/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.example.clients/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ECF Example Clients Bundle-SymbolicName: org.eclipse.ecf.example.clients;singleton:=true -Bundle-Version: 0.8.1 +Bundle-Version: 0.8.2 Bundle-Vendor: Eclipse.org Bundle-Localization: plugin Export-Package: org.eclipse.ecf.example.clients diff --git a/examples/bundles/org.eclipse.ecf.example.clients/about.html b/examples/bundles/org.eclipse.ecf.example.clients/about.html new file mode 100644 index 000000000..5d03fd4c9 --- /dev/null +++ b/examples/bundles/org.eclipse.ecf.example.clients/about.html @@ -0,0 +1,28 @@ + + + + +May 2, 2006
+The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.
+ +If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
+ + + \ No newline at end of file diff --git a/examples/bundles/org.eclipse.ecf.example.clients/build.properties b/examples/bundles/org.eclipse.ecf.example.clients/build.properties index a1c01280c..c87f12002 100644 --- a/examples/bundles/org.eclipse.ecf.example.clients/build.properties +++ b/examples/bundles/org.eclipse.ecf.example.clients/build.properties @@ -1,8 +1,10 @@ bin.includes = META-INF/,\ plugin.xml,\ - clients.jar + clients.jar,\ + about.html jars.compile.order = clients.jar source.clients.jar = src/ output.clients.jar = bin/ src.includes = plugin.xml,\ - META-INF/ + META-INF/,\ + about.html diff --git a/examples/bundles/org.eclipse.ecf.example.collab.editor/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.example.collab.editor/META-INF/MANIFEST.MF index 5cb611c36..781e9a8d0 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab.editor/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.example.collab.editor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ECF Shared Editor Plug-in Bundle-SymbolicName: org.eclipse.ecf.example.collab.editor; singleton:=true -Bundle-Version: 0.8.1 +Bundle-Version: 0.8.2 Bundle-Activator: org.eclipse.ecf.example.collab.editor.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, @@ -22,3 +22,4 @@ Require-Bundle: org.eclipse.ui, org.eclipse.ui.ide Eclipse-LazyStart: true Bundle-Vendor: Eclipse.org +Bundle-ClassPath: collabeditor.jar diff --git a/examples/bundles/org.eclipse.ecf.example.collab.editor/about.html b/examples/bundles/org.eclipse.ecf.example.collab.editor/about.html new file mode 100644 index 000000000..5d03fd4c9 --- /dev/null +++ b/examples/bundles/org.eclipse.ecf.example.collab.editor/about.html @@ -0,0 +1,28 @@ + + + + +May 2, 2006
+The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.
+ +If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
+ + + \ No newline at end of file diff --git a/examples/bundles/org.eclipse.ecf.example.collab.editor/build.properties b/examples/bundles/org.eclipse.ecf.example.collab.editor/build.properties index 0d3d3a745..1b3f7815a 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab.editor/build.properties +++ b/examples/bundles/org.eclipse.ecf.example.collab.editor/build.properties @@ -1,6 +1,11 @@ -source.. = src/ -output.. = bin/ bin.includes = plugin.xml,\ META-INF/,\ - .,\ - icons/ + icons/,\ + collabeditor.jar,\ + about.html +source.collabeditor.jar = src/ +src.includes = about.html,\ + META-INF/,\ + icons/,\ + plugin.xml +jars.compile.order = collabeditor.jar diff --git a/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF index aa5da8e1f..878256eba 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-Name: ECF Collaboration Example Bundle-SymbolicName: org.eclipse.ecf.example.collab;singleton=true -Bundle-Version: 0.8.1 +Bundle-Version: 0.8.2 Bundle-ClassPath: client.jar Bundle-Activator: org.eclipse.ecf.example.collab.ClientPlugin Bundle-Vendor: Eclipse.org diff --git a/examples/bundles/org.eclipse.ecf.example.collab/about.html b/examples/bundles/org.eclipse.ecf.example.collab/about.html index 6f6b96c4c..5d03fd4c9 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/about.html +++ b/examples/bundles/org.eclipse.ecf.example.collab/about.html @@ -1,22 +1,28 @@ - - + + +February 24, 2005
+May 2, 2006
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at http://www.eclipse.org/legal/epl-v10.html. +
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content.
+If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
\ No newline at end of file diff --git a/examples/bundles/org.eclipse.ecf.example.collab/build.properties b/examples/bundles/org.eclipse.ecf.example.collab/build.properties index aa47f64b7..9b53b0eaf 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/build.properties +++ b/examples/bundles/org.eclipse.ecf.example.collab/build.properties @@ -11,10 +11,12 @@ bin.includes = plugin.xml,\ META-INF/,\ icons/,\ - client.jar + client.jar,\ + about.html jars.compile.order = client.jar source.client.jar = src/ output.client.jar = bin/ src.includes = META-INF/,\ icons/,\ - plugin.xml + plugin.xml,\ + about.html diff --git a/examples/bundles/org.eclipse.ecf.example.sdo.editor/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.example.sdo.editor/META-INF/MANIFEST.MF index b11b8e4ca..f06bc3f00 100644 --- a/examples/bundles/org.eclipse.ecf.example.sdo.editor/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.example.sdo.editor/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-Name: ECF SDO Editor Example Bundle-SymbolicName: org.eclipse.ecf.example.sdo.editor;singleton=true -Bundle-Version: 0.8.1 +Bundle-Version: 0.8.2 Bundle-ClassPath: editor.jar Bundle-Activator: org.eclipse.ecf.example.sdo.editor.EditorPlugin Bundle-Vendor: Eclipse.org diff --git a/examples/bundles/org.eclipse.ecf.example.sdo.editor/about.html b/examples/bundles/org.eclipse.ecf.example.sdo.editor/about.html index 6f6b96c4c..5d03fd4c9 100644 --- a/examples/bundles/org.eclipse.ecf.example.sdo.editor/about.html +++ b/examples/bundles/org.eclipse.ecf.example.sdo.editor/about.html @@ -1,22 +1,28 @@ - - + + +February 24, 2005
+May 2, 2006
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at http://www.eclipse.org/legal/epl-v10.html. +
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content.
+If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
\ No newline at end of file diff --git a/examples/bundles/org.eclipse.ecf.example.sdo.editor/build.properties b/examples/bundles/org.eclipse.ecf.example.sdo.editor/build.properties index 403c0ee45..a6bbb25ac 100644 --- a/examples/bundles/org.eclipse.ecf.example.sdo.editor/build.properties +++ b/examples/bundles/org.eclipse.ecf.example.sdo.editor/build.properties @@ -1,10 +1,12 @@ bin.includes = plugin.xml,\ META-INF/,\ icons/,\ - editor.jar + editor.jar,\ + about.html jars.compile.order = editor.jar source.editor.jar = src/ src.includes = META-INF/,\ icons/,\ - plugin.xml + plugin.xml,\ + about.html output.editor.jar = bin/ diff --git a/examples/bundles/org.eclipse.ecf.sdo/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.sdo/META-INF/MANIFEST.MF index c32ef7f96..57c2e9bf5 100644 --- a/examples/bundles/org.eclipse.ecf.sdo/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.sdo/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-Name: ECF SDO API Bundle-SymbolicName: org.eclipse.ecf.sdo;singleton=true -Bundle-Version: 0.8.1 +Bundle-Version: 0.8.2 Bundle-ClassPath: ecf.sdo.jar Bundle-Activator: org.eclipse.ecf.sdo.SDOPlugin$EclipsePlugin Bundle-Vendor: Eclipse.org diff --git a/examples/bundles/org.eclipse.ecf.sdo/about.html b/examples/bundles/org.eclipse.ecf.sdo/about.html index 6f6b96c4c..5d03fd4c9 100644 --- a/examples/bundles/org.eclipse.ecf.sdo/about.html +++ b/examples/bundles/org.eclipse.ecf.sdo/about.html @@ -1,22 +1,28 @@ - - + + +February 24, 2005
+May 2, 2006
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at http://www.eclipse.org/legal/epl-v10.html. +
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content.
+If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
\ No newline at end of file diff --git a/examples/bundles/org.eclipse.ecf.sdo/build.properties b/examples/bundles/org.eclipse.ecf.sdo/build.properties index a21fa47ec..fcc60f9c7 100644 --- a/examples/bundles/org.eclipse.ecf.sdo/build.properties +++ b/examples/bundles/org.eclipse.ecf.sdo/build.properties @@ -3,7 +3,9 @@ output.ecf.sdo.jar = bin/ bin.includes = plugin.xml,\ META-INF/,\ ecf.sdo.jar,\ - schema/ + schema/,\ + about.html src.includes = META-INF/,\ plugin.xml,\ - schema/ + schema/,\ + about.html diff --git a/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF index 440e7720e..39c159bdb 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ECF DataShare Bundle-SymbolicName: org.eclipse.ecf.datashare;singleton:=true -Bundle-Version: 0.8.1 +Bundle-Version: 0.8.2 Bundle-ClassPath: datashare.jar Bundle-Vendor: Eclipse.org Bundle-Localization: plugin diff --git a/framework/bundles/org.eclipse.ecf.datashare/about.html b/framework/bundles/org.eclipse.ecf.datashare/about.html new file mode 100644 index 000000000..5d03fd4c9 --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.datashare/about.html @@ -0,0 +1,28 @@ + + + + +May 2, 2006
+The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.
+ +If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
+ + + \ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.datashare/build.properties b/framework/bundles/org.eclipse.ecf.datashare/build.properties index 2499fcdf2..f25e94dc9 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/build.properties +++ b/framework/bundles/org.eclipse.ecf.datashare/build.properties @@ -1,5 +1,7 @@ source.datashare.jar = src/ output.datashare.jar = bin/ bin.includes = META-INF/,\ - datashare.jar -src.includes = META-INF/ + datashare.jar,\ + about.html +src.includes = META-INF/,\ + about.html diff --git a/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF index bb53e1d5f..0b6bd44ea 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ECF Discovery API Bundle-SymbolicName: org.eclipse.ecf.discovery -Bundle-Version: 0.8.1 +Bundle-Version: 0.8.2 Bundle-ClassPath: discovery.jar Bundle-Activator: org.eclipse.ecf.discovery.DiscoveryPlugin Bundle-Vendor: Eclipse.org diff --git a/framework/bundles/org.eclipse.ecf.discovery/about.html b/framework/bundles/org.eclipse.ecf.discovery/about.html new file mode 100644 index 000000000..5d03fd4c9 --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.discovery/about.html @@ -0,0 +1,28 @@ + + + + +May 2, 2006
+The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.
+ +If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
+ + + \ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.discovery/build.properties b/framework/bundles/org.eclipse.ecf.discovery/build.properties index 8b3ccd224..c25109856 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/build.properties +++ b/framework/bundles/org.eclipse.ecf.discovery/build.properties @@ -1,5 +1,7 @@ source.discovery.jar = src/ output.discovery.jar = bin/ bin.includes = META-INF/,\ - discovery.jar -src.includes = META-INF/ + discovery.jar,\ + about.html +src.includes = META-INF/,\ + about.html diff --git a/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF index 020bb2415..d98feac1f 100644 --- a/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-Name: ECF Presence API Bundle-SymbolicName: org.eclipse.ecf.presence;singleton=true -Bundle-Version: 0.8.1 +Bundle-Version: 0.8.2 Bundle-ClassPath: presence.jar Bundle-Activator: org.eclipse.ecf.presence.PresencePlugin Bundle-Vendor: Eclipse.org diff --git a/framework/bundles/org.eclipse.ecf.presence/about.html b/framework/bundles/org.eclipse.ecf.presence/about.html new file mode 100644 index 000000000..5d03fd4c9 --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.presence/about.html @@ -0,0 +1,28 @@ + + + + +May 2, 2006
+The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.
+ +If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
+ + + \ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.presence/build.properties b/framework/bundles/org.eclipse.ecf.presence/build.properties index c96585b38..71e01e080 100644 --- a/framework/bundles/org.eclipse.ecf.presence/build.properties +++ b/framework/bundles/org.eclipse.ecf.presence/build.properties @@ -2,6 +2,8 @@ source.presence.jar = src/ output.presence.jar = bin/ bin.includes = plugin.xml,\ META-INF/,\ - presence.jar + presence.jar,\ + about.html src.includes = META-INF/,\ - plugin.xml + plugin.xml,\ + about.html diff --git a/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF index c0f83f58c..0c50f48a9 100644 --- a/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-SymbolicName: org.eclipse.ecf.provider;singleton=true -Bundle-Version: 0.8.1 +Bundle-Version: 0.8.2 Bundle-Name: ECF Provider API Bundle-Vendor: Eclipse.org Bundle-ClassPath: provider.jar diff --git a/framework/bundles/org.eclipse.ecf.provider/about.html b/framework/bundles/org.eclipse.ecf.provider/about.html index 6f6b96c4c..5d03fd4c9 100644 --- a/framework/bundles/org.eclipse.ecf.provider/about.html +++ b/framework/bundles/org.eclipse.ecf.provider/about.html @@ -1,22 +1,28 @@ - - + + +February 24, 2005
+May 2, 2006
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at http://www.eclipse.org/legal/epl-v10.html. +
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content.
+If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.provider/build.properties b/framework/bundles/org.eclipse.ecf.provider/build.properties index a1dad2035..7c1f61acb 100644 --- a/framework/bundles/org.eclipse.ecf.provider/build.properties +++ b/framework/bundles/org.eclipse.ecf.provider/build.properties @@ -3,8 +3,10 @@ output.provider.jar = bin/ bin.includes = plugin.xml,\ provider.jar,\ META-INF/,\ - conf/ + conf/,\ + about.html src.includes = plugin.xml,\ provider.jar,\ META-INF/,\ - conf/ + conf/,\ + about.html diff --git a/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF index cd57c94a4..5574f3d50 100644 --- a/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-Name: ECF UI API Bundle-SymbolicName: org.eclipse.ecf.ui;singleton=true -Bundle-Version: 0.8.1 +Bundle-Version: 0.8.2 Bundle-ClassPath: ui.jar Bundle-Activator: org.eclipse.ecf.ui.UiPlugin Bundle-Vendor: Eclipse.org diff --git a/framework/bundles/org.eclipse.ecf.ui/about.html b/framework/bundles/org.eclipse.ecf.ui/about.html index 6f6b96c4c..5d03fd4c9 100644 --- a/framework/bundles/org.eclipse.ecf.ui/about.html +++ b/framework/bundles/org.eclipse.ecf.ui/about.html @@ -1,22 +1,28 @@ - - + + +February 24, 2005
+May 2, 2006
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at http://www.eclipse.org/legal/epl-v10.html. +
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content.
+If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.ui/build.properties b/framework/bundles/org.eclipse.ecf.ui/build.properties index 4556981aa..32727e632 100644 --- a/framework/bundles/org.eclipse.ecf.ui/build.properties +++ b/framework/bundles/org.eclipse.ecf.ui/build.properties @@ -3,7 +3,9 @@ output.ui.jar = bin/ bin.includes = plugin.xml,\ META-INF/,\ ui.jar,\ - icons/ + icons/,\ + about.html src.includes = icons/,\ META-INF/,\ - plugin.xml + plugin.xml,\ + about.html diff --git a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF index 671333b29..eaefe24f0 100644 --- a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-Name: ECF Core Bundle-SymbolicName: org.eclipse.ecf;singleton=true -Bundle-Version: 0.8.1 +Bundle-Version: 0.8.2 Bundle-ClassPath: ecf.jar Bundle-Activator: org.eclipse.ecf.internal.core.ECFPlugin Bundle-Vendor: Eclipse.org diff --git a/framework/bundles/org.eclipse.ecf/about.html b/framework/bundles/org.eclipse.ecf/about.html index 6f6b96c4c..5d03fd4c9 100644 --- a/framework/bundles/org.eclipse.ecf/about.html +++ b/framework/bundles/org.eclipse.ecf/about.html @@ -1,22 +1,28 @@ - - + + +February 24, 2005
+May 2, 2006
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at http://www.eclipse.org/legal/epl-v10.html. +
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content.
+If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf/build.properties b/framework/bundles/org.eclipse.ecf/build.properties index 26f78da07..ee1bd0938 100644 --- a/framework/bundles/org.eclipse.ecf/build.properties +++ b/framework/bundles/org.eclipse.ecf/build.properties @@ -2,6 +2,8 @@ source.ecf.jar = src/ output.ecf.jar = bin/ bin.includes = plugin.xml,\ META-INF/,\ - ecf.jar + ecf.jar,\ + about.html src.includes = plugin.xml,\ - META-INF/ + META-INF/,\ + about.html diff --git a/framework/bundles/org.eclipse.ecf/javadoc.xml b/framework/bundles/org.eclipse.ecf/javadoc.xml index 97329c006..f39927af4 100644 --- a/framework/bundles/org.eclipse.ecf/javadoc.xml +++ b/framework/bundles/org.eclipse.ecf/javadoc.xml @@ -1,6 +1,6 @@May 2, 2006
+The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.
+ +If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
+ + +The Content includes items that have been sourced from third parties as set out below. If you + did not receive this Content directly from the Eclipse Foundation, the following is provided + for informational purposes only, and you should look to the Redistributor´s license for + terms and conditions of use.
+ +Smack API v2.2.0
+The plug-in includes software developed by Jive Software as part of the Smack open source client library.
+ +The Ant binary code in smack.jar, smackx.jar, and smackx-debug.jar are included with the plug-in with modification to remove certain images from the original library. + +The Smack source code is located Jive Software Smack Library
+ +Your use of the Smack libraries is subject to the terms and conditions of the Apache Software License 2.0. A copy of the license is contained +in the file asl-v20.txt and is also available at http://www.apache.org/licenses/LICENSE-2.0.html. + +
The names "Smack", "Jive Software" and "Apache Software Foundation" must not be used to endorse or promote products derived from this +software without prior written permission. For written permission, please contact apache@apache.org and info@jivesoftware.com.
+ + + \ No newline at end of file diff --git a/protocols/bundles/org.jivesoftware.smack/asl-v20.txt b/protocols/bundles/org.jivesoftware.smack/asl-v20.txt new file mode 100644 index 000000000..d64569567 --- /dev/null +++ b/protocols/bundles/org.jivesoftware.smack/asl-v20.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/protocols/bundles/org.jivesoftware.smack/build.properties b/protocols/bundles/org.jivesoftware.smack/build.properties index 69b274bcb..613a06a5a 100644 --- a/protocols/bundles/org.jivesoftware.smack/build.properties +++ b/protocols/bundles/org.jivesoftware.smack/build.properties @@ -2,12 +2,16 @@ bin.includes = META-INF/,\ plugin.xml,\ schema/,\ jars/,\ - smack.jar + smack.jar,\ + about.html,\ + asl-v20.txt jars.compile.order = smack.jar src.includes = schema/,\ plugin.xml,\ META-INF/,\ - jars/ + jars/,\ + about.html,\ + asl-v20.txt bin.excludes = jars/jsse.jar,\ jars/smack.jar,\ jars/smackx-debug.jar,\ diff --git a/providers/bundles/org.eclipse.ecf.provider.datashare/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.datashare/META-INF/MANIFEST.MF index 6861fbc7d..204c61047 100644 --- a/providers/bundles/org.eclipse.ecf.provider.datashare/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.datashare/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ECF Datashare Provider Plug-in Bundle-SymbolicName: org.eclipse.ecf.provider.datashare;singleton:=true -Bundle-Version: 0.8.1 +Bundle-Version: 0.8.2 Bundle-Activator: org.eclipse.ecf.provider.datashare.Activator Bundle-Vendor: Eclipse.org Bundle-Localization: plugin diff --git a/providers/bundles/org.eclipse.ecf.provider.datashare/about.html b/providers/bundles/org.eclipse.ecf.provider.datashare/about.html new file mode 100644 index 000000000..5d03fd4c9 --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.datashare/about.html @@ -0,0 +1,28 @@ + + + + +May 2, 2006
+The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.
+ +If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
+ + + \ No newline at end of file diff --git a/providers/bundles/org.eclipse.ecf.provider.datashare/build.properties b/providers/bundles/org.eclipse.ecf.provider.datashare/build.properties index 09f7f7ae5..2d9f8a95d 100644 --- a/providers/bundles/org.eclipse.ecf.provider.datashare/build.properties +++ b/providers/bundles/org.eclipse.ecf.provider.datashare/build.properties @@ -1,9 +1,11 @@ bin.includes = META-INF/,\ plugin.xml,\ - dsprovider.jar + dsprovider.jar,\ + about.html src.includes = META-INF/,\ src/,\ - plugin.xml + plugin.xml,\ + about.html jars.compile.order = dsprovider.jar source.dsprovider.jar = src/ output.dsprovider.jar = bin/ diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF index b5a4b5681..0c943a406 100644 --- a/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ECF Zeroconf Discovery Provider Bundle-SymbolicName: org.eclipse.ecf.provider.jmdns;singleton:=true -Bundle-Version: 0.8.1 +Bundle-Version: 0.8.2 Bundle-Activator: org.eclipse.ecf.provider.jmdns.JmdnsPlugin Bundle-Vendor: Eclipse.org Bundle-Localization: plugin diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/about.html b/providers/bundles/org.eclipse.ecf.provider.jmdns/about.html index 80f336f8d..16b71944c 100644 --- a/providers/bundles/org.eclipse.ecf.provider.jmdns/about.html +++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/about.html @@ -1,26 +1,35 @@ - - + + +February 24, 2005
+May 2, 2006
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at http://www.eclipse.org/legal/epl-v10.html. +
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content.
- -The Content includes items that have been sourced from third parties as follows:
+If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
+ + +The Content includes items that have been sourced from third parties as set out below. If you + did not receive this Content directly from the Eclipse Foundation, the following is provided + for informational purposes only, and you should look to the Redistributor´s license for + terms and conditions of use.
The plug-in includes software developed as the JmDNS v1.0 open source library.
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.xmpp/META-INF/MANIFEST.MF index 1d4c32fa9..e24f106de 100644 --- a/providers/bundles/org.eclipse.ecf.provider.xmpp/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-Name: ECF XMPP Provider Bundle-SymbolicName: org.eclipse.ecf.provider.xmpp;singleton=true -Bundle-Version: 0.8.1 +Bundle-Version: 0.8.2 Bundle-ClassPath: xmpp.jar Bundle-Activator: org.eclipse.ecf.provider.xmpp.XmppPlugin Bundle-Vendor: Eclipse.org diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/about.html b/providers/bundles/org.eclipse.ecf.provider.xmpp/about.html index 1d77777cb..5d03fd4c9 100644 --- a/providers/bundles/org.eclipse.ecf.provider.xmpp/about.html +++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/about.html @@ -1,39 +1,28 @@ - - + + +February 24, 2005
+May 2, 2006
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at http://www.eclipse.org/legal/epl-v10.html. +
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content.
- -The Content includes items that have been sourced from third parties as follows:
- -Smack API v1.4.1
-The plug-in includes software developed by Jive Software as part of the Smack open source client library.
- -The Ant binary code in smack.jar, smackx.jar, and smackx-debug.jar are included with the plug-in with modification to remove certain images from the original library. - -The Smack source code is located Jive Software Smack Library
- -Your use of the Smack libraries is subject to the terms and conditions of the Apache Software License 2.0. A copy of the license is contained -in the file asl-v20.txt and is also available at http://www.apache.org/licenses/LICENSE-2.0.html. - -
The names "Smack", "Jive Software" and "Apache Software Foundation" must not be used to endorse or promote products derived from this -software without prior written permission. For written permission, please contact apache@apache.org and info@jivesoftware.com.
+If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
\ No newline at end of file diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/asl-v20.txt b/providers/bundles/org.eclipse.ecf.provider.xmpp/asl-v20.txt deleted file mode 100644 index d64569567..000000000 --- a/providers/bundles/org.eclipse.ecf.provider.xmpp/asl-v20.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/releng/features/org.eclipse.ecf.core-feature/about.html b/releng/features/org.eclipse.ecf.core-feature/about.html index 6f6b96c4c..5d03fd4c9 100644 --- a/releng/features/org.eclipse.ecf.core-feature/about.html +++ b/releng/features/org.eclipse.ecf.core-feature/about.html @@ -1,22 +1,28 @@ - - + + +February 24, 2005
+May 2, 2006
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at http://www.eclipse.org/legal/epl-v10.html. +
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content.
+If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
\ No newline at end of file diff --git a/releng/features/org.eclipse.ecf.core-feature/feature.xml b/releng/features/org.eclipse.ecf.core-feature/feature.xml index 6caf3e25c..1c0cc8ba6 100644 --- a/releng/features/org.eclipse.ecf.core-feature/feature.xml +++ b/releng/features/org.eclipse.ecf.core-feature/feature.xml @@ -2,7 +2,7 @@May 2, 2006
+The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.
+ +If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
+ + + \ No newline at end of file diff --git a/server-side/bundles/org.eclipse.ecf.server/build.properties b/server-side/bundles/org.eclipse.ecf.server/build.properties index 9343ccaaa..38d8d4cb0 100644 --- a/server-side/bundles/org.eclipse.ecf.server/build.properties +++ b/server-side/bundles/org.eclipse.ecf.server/build.properties @@ -1,8 +1,10 @@ bin.includes = .,\ - META-INF/,\ - conf/ + META-INF/,\ + conf/,\ + about.html src.includes = META-INF/,\ - conf/ + conf/,\ + about.html jars.compile.order = . source.. = src/ output.. = bin/ diff --git a/server-side/bundles/org.eclipse.ecf.server/conf/server.xml b/server-side/bundles/org.eclipse.ecf.server/conf/server.xml index ae209312b..ee14077dd 100644 --- a/server-side/bundles/org.eclipse.ecf.server/conf/server.xml +++ b/server-side/bundles/org.eclipse.ecf.server/conf/server.xml @@ -1,7 +1,6 @@May 2, 2006
+The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.
+ +If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
+ + + \ No newline at end of file diff --git a/server-side/features/org.eclipse.ecf.server-feature/bin/startjmsserver.cmd b/server-side/features/org.eclipse.ecf.server-feature/bin/startjmsserver.cmd index e564ff1b1..1600a628a 100644 --- a/server-side/features/org.eclipse.ecf.server-feature/bin/startjmsserver.cmd +++ b/server-side/features/org.eclipse.ecf.server-feature/bin/startjmsserver.cmd @@ -1,29 +1,30 @@ setlocal cd %~dp0 set RP=..\..\..\plugins -set JMS=%RP%\org.eclipse.ecf.provider.jms_0.8.1 -set ECF=%RP%\org.eclipse.ecf_0.8.1\ecf.jar +set JMS=%RP%\org.eclipse.ecf.provider.jms_0.8.2 +set ECF=%RP%\org.eclipse.ecf_0.8.2\ecf.jar set JMSP=%JMS%\jmsprovider.jar -set UI=%RP%\org.eclipse.ecf.ui_0.8.1\ui.jar -set SDO=%RP%\org.eclipse.ecf.sdo_0.8.1\ecf.sdo.jar -set DS=%RP%\org.eclipse.ecf.datashare_0.8.1\datashare.jar -set DSP=%RP%\org.eclipse.ecf.provider.datashare_0.8.1\dsprovider.jar -set FS=%RP%\org.eclipse.ecf.fileshare_0.8.1\fileshare.jar -set FSP=%RP%\org.eclipse.ecf.provider.fileshare_0.8.1\fsprovider.jar -set PROVIDER=%RP%\org.eclipse.ecf.provider_0.8.1\provider.jar -set PRESENCE=%RP%\org.eclipse.ecf.presence_0.8.1\presence.jar -set GED=%RP%\org.eclipse.ecf.example.sdo.gefeditor_0.8.1\editor.jar -set ED=%RP%\org.eclipse.ecf.example.sdo.editor_0.8.1\editor.jar -set LIBRARY=%RP%\org.eclipse.ecf.example.sdo.library_0.8.1\runtime\org.eclipse.ecf.example.library.jar -set DISCOVERY=%RP%\org.eclipse.ecf.discovery_0.8.1\discovery.jar -set HELLO=%RP%\org.eclipse.ecf.example.hello_0.8.1\hello.jar -set COLLAB=%RP%\org.eclipse.ecf.example.collab_0.8.1\client.jar +set UI=%RP%\org.eclipse.ecf.ui_0.8.2\ui.jar +set SDO=%RP%\org.eclipse.ecf.sdo_0.8.2\ecf.sdo.jar +set DS=%RP%\org.eclipse.ecf.datashare_0.8.2\datashare.jar +set DSP=%RP%\org.eclipse.ecf.provider.datashare_0.8.2\dsprovider.jar +set FS=%RP%\org.eclipse.ecf.fileshare_0.8.2\fileshare.jar +set FSP=%RP%\org.eclipse.ecf.provider.fileshare_0.8.2\fsprovider.jar +set PROVIDER=%RP%\org.eclipse.ecf.provider_0.8.2\provider.jar +set PRESENCE=%RP%\org.eclipse.ecf.presence_0.8.2\presence.jar +set GED=%RP%\org.eclipse.ecf.example.sdo.gefeditor_0.8.2\editor.jar +set ED=%RP%\org.eclipse.ecf.example.sdo.editor_0.8.2\editor.jar +set LIBRARY=%RP%\org.eclipse.ecf.example.sdo.library_0.8.2\runtime\org.eclipse.ecf.example.library.jar +set DISCOVERY=%RP%\org.eclipse.ecf.discovery_0.8.2\discovery.jar +set HELLO=%RP%\org.eclipse.ecf.example.hello_0.8.2\hello.jar +set COLLAB=%RP%\org.eclipse.ecf.example.collab_0.8.2\client.jar +set CED=%RP%\org.eclipse.ecf.example.collab.editor_0.8.2\collabeditor.jar set JMSL=%JMS%\lib\activemq3.1M5 set JMSLIB=%JMSL%\activeio-1.1.jar;%JMSL%\activemq-core-3.1-M5.jar;%JMSL%\commons-logging-1.0.3.jar;%JMSL%\concurrent-1.3.4.jar;%JMSL%\geronimo-spec-j2ee-jacc-1.0-rc4.jar;%JMSL%\geronimo-spec-j2ee-management-1.0-rc4.jar;%JMSL%\geronimo-spec-jms-1.1-rc4.jar;%JMSL%\geronimo-spec-jta-1.0.1B-rc4.jar;%JMSL%\log4j-1.2.8.jar;%JMSL%\spring-1.2.2.jar -set CP="..\lib\core.jar;..\lib\runtime.jar;..\lib\osgi.jar;%JMSLIB%;%ECF%;%PROVIDER%;%PRESENCE%;%JMSP%;%DISCOVERY%;%UI%;%SDO%;%DS%;%DSP%;%FS%;%FSP%;%GED%;%ED%;%LIBRARY%;%HELLO%;%COLLAB%." +set CP="..\lib\core.jar;..\lib\runtime.jar;..\lib\osgi.jar;%JMSLIB%;%ECF%;%PROVIDER%;%PRESENCE%;%JMSP%;%DISCOVERY%;%UI%;%SDO%;%DS%;%DSP%;%FS%;%FSP%;%GED%;%ED%;%LIBRARY%;%HELLO%;%COLLAB%;%CED%;." rem set TRACE=-Dorg.eclipse.ecf.provider.jms.Trace=true -Dorg.eclipse.ecf.provider.Trace=true set TRACE=-Dorg.eclipse.ecf.provider.Trace=true -Dorg.eclipse.ecf.Trace=true -Dorg.eclipse.ecf.provider.jms.Trace=true diff --git a/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.cmd b/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.cmd index 2e758de63..edfc6da04 100644 --- a/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.cmd +++ b/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.cmd @@ -2,23 +2,24 @@ echo off setlocal cd %~dp0 set RP=..\..\..\plugins -set ECF=%RP%\org.eclipse.ecf_0.8.1\ecf.jar -set UI=%RP%\org.eclipse.ecf.ui_0.8.1\ui.jar -set SDO=%RP%\org.eclipse.ecf.sdo_0.8.1\ecf.sdo.jar -set DS=%RP%\org.eclipse.ecf.datashare_0.8.1\datashare.jar -set DSP=%RP%\org.eclipse.ecf.provider.datashare_0.8.1\dsprovider.jar -set FS=%RP%\org.eclipse.ecf.fileshare_0.8.1\fileshare.jar -set FSP=%RP%\org.eclipse.ecf.provider.fileshare_0.8.1\fsprovider.jar -set PROVIDER=%RP%\org.eclipse.ecf.provider_0.8.1\provider.jar -set PRESENCE=%RP%\org.eclipse.ecf.presence_0.8.1\presence.jar -set GED=%RP%\org.eclipse.ecf.example.sdo.gefeditor_0.8.1\editor.jar -set ED=%RP%\org.eclipse.ecf.example.sdo.editor_0.8.1\editor.jar -set LIBRARY=%RP%\org.eclipse.ecf.example.sdo.library_0.8.1\runtime\org.eclipse.ecf.example.library.jar -set DISCOVERY=%RP%\org.eclipse.ecf.discovery_0.8.1\discovery.jar -set HELLO=%RP%\org.eclipse.ecf.example.hello_0.8.1\hello.jar -set COLLAB=%RP%\org.eclipse.ecf.example.collab_0.8.1\client.jar +set ECF=%RP%\org.eclipse.ecf_0.8.2\ecf.jar +set UI=%RP%\org.eclipse.ecf.ui_0.8.2\ui.jar +set SDO=%RP%\org.eclipse.ecf.sdo_0.8.2\ecf.sdo.jar +set DS=%RP%\org.eclipse.ecf.datashare_0.8.2\datashare.jar +set DSP=%RP%\org.eclipse.ecf.provider.datashare_0.8.2\dsprovider.jar +set FS=%RP%\org.eclipse.ecf.fileshare_0.8.2\fileshare.jar +set FSP=%RP%\org.eclipse.ecf.provider.fileshare_0.8.2\fsprovider.jar +set PROVIDER=%RP%\org.eclipse.ecf.provider_0.8.2\provider.jar +set PRESENCE=%RP%\org.eclipse.ecf.presence_0.8.2\presence.jar +set GED=%RP%\org.eclipse.ecf.example.sdo.gefeditor_0.8.2\editor.jar +set ED=%RP%\org.eclipse.ecf.example.sdo.editor_0.8.2\editor.jar +set LIBRARY=%RP%\org.eclipse.ecf.example.sdo.library_0.8.2\runtime\org.eclipse.ecf.example.library.jar +set DISCOVERY=%RP%\org.eclipse.ecf.discovery_0.8.2\discovery.jar +set HELLO=%RP%\org.eclipse.ecf.example.hello_0.8.2\hello.jar +set COLLAB=%RP%\org.eclipse.ecf.example.collab_0.8.2\client.jar +set CED=%RP%\org.eclipse.ecf.example.collab.editor_0.8.2\collabeditor.jar -set CP="..\lib\core.jar;..\lib\runtime.jar;..\lib\osgi.jar;%ECF%;%UI%;%SDO%;%PROVIDER%;%PRESENCE%;%GED%;%ED%;%LIBRARY%;%HELLO%;%DS%;%DSP%;%FS%;%FsSP%;%DISCOVERY%;%COLLAB%;." +set CP="..\lib\core.jar;..\lib\runtime.jar;..\lib\osgi.jar;%ECF%;%UI%;%SDO%;%PROVIDER%;%PRESENCE%;%GED%;%ED%;%LIBRARY%;%HELLO%;%DS%;%DSP%;%FS%;%FsSP%;%DISCOVERY%;%COLLAB%;%CED%;." set TRACE=-Dorg.eclipse.ecf.Trace=true -Dorg.eclipse.ecf.provider.Trace=true diff --git a/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.sh b/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.sh index dd67ee6a4..4de42dbe3 100644 --- a/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.sh +++ b/server-side/features/org.eclipse.ecf.server-feature/bin/startserver.sh @@ -4,23 +4,24 @@ RP=../../../plugins CURRENT=`pwd` cd ${CURRENT} # Relative path for accessing plugins -ECF=${RP}/org.eclipse.ecf_0.8.1/ecf.jar -UI=${RP}/org.eclipse.ecf.ui_0.8.1/ui.jar -SDO=${RP}/org.eclipse.ecf.sdo_0.8.1/ecf.sdo.jar -DS=${RP}/org.eclipse.ecf.datashare_0.8.1/datashare.jar -DSP=${RP}/org.eclipse.ecf.provider.datashare_0.8.1/dsprovider.jar -FS=${RP}/org.eclipse.ecf.fileshare_0.8.1/fileshare.jar -FSP=${RP}/org.eclipse.ecf.provider.fileshare_0.8.1/fsprovider.jar -PROVIDER=${RP}/org.eclipse.ecf.provider_0.8.1/provider.jar -PRESENCE=${RP}/org.eclipse.ecf.presence_0.8.1/presence.jar -GED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.8.1/editor.jar -ED=${RP}/org.eclipse.ecf.example.sdo.editor_0.8.1/editor.jar -LIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.8.1/runtime/org.eclipse.ecf.example.library.jar -DISCOVERY=${RP}/org.eclipse.ecf.discovery_0.8.1/discovery.jar -HELLO=${RP}/org.eclipse.ecf.example.hello_0.8.1/hello.jar -COLLAB=${RP}/org.eclipse.ecf.example.collab_0.8.1/client.jar +ECF=${RP}/org.eclipse.ecf_0.8.2/ecf.jar +UI=${RP}/org.eclipse.ecf.ui_0.8.2/ui.jar +SDO=${RP}/org.eclipse.ecf.sdo_0.8.2/ecf.sdo.jar +DS=${RP}/org.eclipse.ecf.datashare_0.8.2/datashare.jar +DSP=${RP}/org.eclipse.ecf.provider.datashare_0.8.2/dsprovider.jar +FS=${RP}/org.eclipse.ecf.fileshare_0.8.2/fileshare.jar +FSP=${RP}/org.eclipse.ecf.provider.fileshare_0.8.2/fsprovider.jar +PROVIDER=${RP}/org.eclipse.ecf.provider_0.8.2/provider.jar +PRESENCE=${RP}/org.eclipse.ecf.presence_0.8.2/presence.jar +GED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.8.2/editor.jar +ED=${RP}/org.eclipse.ecf.example.sdo.editor_0.8.2/editor.jar +LIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.8.2/runtime/org.eclipse.ecf.example.library.jar +DISCOVERY=${RP}/org.eclipse.ecf.discovery_0.8.2/discovery.jar +HELLO=${RP}/org.eclipse.ecf.example.hello_0.8.2/hello.jar +COLLAB=${RP}/org.eclipse.ecf.example.collab_0.8.2/client.jar +CED=${RP}/org.eclipse.ecf.example.collab.editor_0.8.2/collabeditor.jar -CP="../lib/core.jar:../lib/runtime.jar:../lib/osgi.jar:${ECF}:${UI}:${SDO}:${PROVIDER}:${PRESENCE}:${GED}:${ED}:${LIBRARY}:${DS}:${DSP}:${FS}:${FSP}:${HELLO}:${DISCOVERY}:${COLLAB}:." +CP="../lib/core.jar:../lib/runtime.jar:../lib/osgi.jar:${ECF}:${UI}:${SDO}:${PROVIDER}:${PRESENCE}:${GED}:${ED}:${LIBRARY}:${DS}:${DSP}:${FS}:${FSP}:${HELLO}:${DISCOVERY}:${COLLAB}:${CED}:." TRACE="-Dorg.eclipse.ecf.Trace=true -Dorg.eclipse.ecf.provider.Trace=true" diff --git a/server-side/features/org.eclipse.ecf.server-feature/bin/startserverlog.sh b/server-side/features/org.eclipse.ecf.server-feature/bin/startserverlog.sh index c7dd1d1e9..64ce2d31f 100644 --- a/server-side/features/org.eclipse.ecf.server-feature/bin/startserverlog.sh +++ b/server-side/features/org.eclipse.ecf.server-feature/bin/startserverlog.sh @@ -4,23 +4,24 @@ RP=../../../plugins CURRENT=`pwd` cd ${CURRENT} # Relative path for accessing plugins -ECF=${RP}/org.eclipse.ecf_0.8.1/ecf.jar -UI=${RP}/org.eclipse.ecf.ui_0.8.1/ui.jar -SDO=${RP}/org.eclipse.ecf.sdo_0.8.1/ecf.sdo.jar -DS=${RP}/org.eclipse.ecf.datashare_0.8.1/datashare.jar -DSP=${RP}/org.eclipse.ecf.provider.datashare_0.8.1/dsprovider.jar -FS=${RP}/org.eclipse.ecf.fileshare_0.8.1/fileshare.jar -FSP=${RP}/org.eclipse.ecf.provider.fileshare_0.8.1/fsprovider.jar -PROVIDER=${RP}/org.eclipse.ecf.provider_0.8.1/provider.jar -PRESENCE=${RP}/org.eclipse.ecf.presence_0.8.1/presence.jar -GED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.8.1/editor.jar -ED=${RP}/org.eclipse.ecf.example.sdo.editor_0.8.1/editor.jar -LIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.8.1/runtime/org.eclipse.ecf.example.library.jar -DISCOVERY=${RP}/org.eclipse.ecf.discovery_0.8.1/discovery.jar -HELLO=${RP}/org.eclipse.ecf.example.hello_0.8.1/hello.jar -COLLAB=${RP}/org.eclipse.ecf.example.collab_0.8.1/client.jar +ECF=${RP}/org.eclipse.ecf_0.8.2/ecf.jar +UI=${RP}/org.eclipse.ecf.ui_0.8.2/ui.jar +SDO=${RP}/org.eclipse.ecf.sdo_0.8.2/ecf.sdo.jar +DS=${RP}/org.eclipse.ecf.datashare_0.8.2/datashare.jar +DSP=${RP}/org.eclipse.ecf.provider.datashare_0.8.2/dsprovider.jar +FS=${RP}/org.eclipse.ecf.fileshare_0.8.2/fileshare.jar +FSP=${RP}/org.eclipse.ecf.provider.fileshare_0.8.2/fsprovider.jar +PROVIDER=${RP}/org.eclipse.ecf.provider_0.8.2/provider.jar +PRESENCE=${RP}/org.eclipse.ecf.presence_0.8.2/presence.jar +GED=${RP}/org.eclipse.ecf.example.sdo.gefeditor_0.8.2/editor.jar +ED=${RP}/org.eclipse.ecf.example.sdo.editor_0.8.2/editor.jar +LIBRARY=${RP}/org.eclipse.ecf.example.sdo.library_0.8.2/runtime/org.eclipse.ecf.example.library.jar +DISCOVERY=${RP}/org.eclipse.ecf.discovery_0.8.2/discovery.jar +HELLO=${RP}/org.eclipse.ecf.example.hello_0.8.2/hello.jar +COLLAB=${RP}/org.eclipse.ecf.example.collab_0.8.2/client.jar +CED=${RP}/org.eclipse.ecf.example.collab.editor_0.8.2/collabeditor.jar -CP="../lib/core.jar:../lib/runtime.jar:../lib/osgi.jar:${ECF}:${UI}:${SDO}:${PROVIDER}:${PRESENCE}:${GED}:${ED}:${LIBRARY}:${DS}:${DSP}:${FS}:${FSP}:${HELLO}:${DISCOVERY}:${COLLAB}:." +CP="../lib/core.jar:../lib/runtime.jar:../lib/osgi.jar:${ECF}:${UI}:${SDO}:${PROVIDER}:${PRESENCE}:${GED}:${ED}:${LIBRARY}:${DS}:${DSP}:${FS}:${FSP}:${HELLO}:${DISCOVERY}:${COLLAB}:${CED}:." TRACE="-Dorg.eclipse.ecf.Trace=true -Dorg.eclipse.ecf.provider.Trace=true" diff --git a/server-side/features/org.eclipse.ecf.server-feature/build.properties b/server-side/features/org.eclipse.ecf.server-feature/build.properties index 6b4a1618d..6379b393d 100644 --- a/server-side/features/org.eclipse.ecf.server-feature/build.properties +++ b/server-side/features/org.eclipse.ecf.server-feature/build.properties @@ -1,8 +1,10 @@ bin.includes = bin/,\ lib/,\ feature.xml,\ - conf/ + conf/,\ + about.html src.includes = conf/,\ feature.xml,\ lib/,\ - bin/ + bin/,\ + about.html diff --git a/server-side/features/org.eclipse.ecf.server-feature/feature.xml b/server-side/features/org.eclipse.ecf.server-feature/feature.xml index f90c7fa70..ef32365f1 100644 --- a/server-side/features/org.eclipse.ecf.server-feature/feature.xml +++ b/server-side/features/org.eclipse.ecf.server-feature/feature.xml @@ -2,7 +2,7 @@