Jar up the entire plugin.

rse/plugins/org.eclipse.dstore.core/build.properties

@@ -1,9 +1,10 @@
 bin.includes = .,\
+               dstore_core.jar,\
                plugin.properties,\
                about.html,\
                META-INF/
 src.includes = about.html
 source.. = src/
-output.. = bin1/
+output.. = bin/
 source.dstore_core.jar = src/
-output.dstore_core.jar = bin2/
+output.dstore_core.jar = dstore_core.bin/

rse/plugins/org.eclipse.dstore.extra/META-INF/MANIFEST.MF

@@ -11,4 +11,3 @@ Require-Bundle: org.eclipse.ui,
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.dstore.extra.internal.extra
 Bundle-Vendor: Eclipse.org
-Bundle-ClassPath: dstore_extra.jar

rse/plugins/org.eclipse.dstore.extra/build.properties

@@ -1,10 +1,10 @@
-bin.includes = about.html,\
+bin.includes = .,\
+               about.html,\
                META-INF/,\
-               plugin.properties,\
+               dstore_extra_server.jar,\
-               dstore_extra.jar
+               plugin.properties
-jars.compile.order = dstore_extra.jar
+source.. = src/
-source.dstore_extra.jar = src/
+output.. = bin/
-output.dstore_extra.jar = bin/
 source.dstore_extra_server.jar = server/
-output.dstore_extra_server.jar = bin2/
+output.dstore_extra_server.jar = server.bin/
 src.includes = about.html

rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF

@@ -17,4 +17,3 @@ Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.connectorservice.dstore,
  org.eclipse.rse.connectorservice.dstore.util
 Bundle-Vendor: Eclipse.org
-Bundle-ClassPath: dstore_connector_service.jar

rse/plugins/org.eclipse.rse.connectorservice.dstore/build.properties

@@ -1,8 +1,7 @@
-bin.includes = META-INF/,\
+bin.includes = .,\
+               META-INF/,\
                about.html,\
-               plugin.properties,\
+               plugin.properties
-               dstore_connector_service.jar
+source.. = src/
-source.dstore_connector_service.jar = src/
+output.. = bin/
-jars.compile.order = dstore_connector_service.jar
-output.dstore_connector_service.jar = bin/
 src.includes = about.html

rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF

@@ -12,4 +12,3 @@ Require-Bundle: org.eclipse.ui,
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.connectorservice.local
 Bundle-Vendor: Eclipse.org
-Bundle-ClassPath: local_connector_service.jar

rse/plugins/org.eclipse.rse.connectorservice.local/build.properties

@@ -1,8 +1,7 @@
-bin.includes = META-INF/,\
+bin.includes = .,\
+               META-INF/,\
                about.html,\
-               plugin.properties,\
+               plugin.properties
-               local_connector_service.jar
+source.. = src/
-source.local_connector_service.jar = src/
+output.. = bin/
-jars.compile.order = local_connector_service.jar
-output.local_connector_service.jar = bin/
 src.includes = about.html

rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF

@@ -8,4 +8,3 @@ Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.core
-Bundle-ClassPath: rsecore.jar

rse/plugins/org.eclipse.rse.core/build.properties

@@ -3,9 +3,8 @@ bin.includes = META-INF/,\
                plugin.properties,\
                about.properties,\
                about.html,\
-               rsecore.jar,\
+               .,\
                schema/
-source.rsecore.jar = src/
+source.. = src/
-jars.compile.order = rsecore.jar
+output.. = bin/
-output.rsecore.jar = bin/
 src.includes = about.html

rse/plugins/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF

@@ -19,4 +19,3 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.ui
 Eclipse-LazyStart: true
 Bundle-Vendor: Eclipse.org
-Bundle-ClassPath: dstore_security.jar

rse/plugins/org.eclipse.rse.dstore.security/build.properties

@@ -2,13 +2,8 @@ bin.includes = about.html,\
                icons/,\
                plugin.properties,\
                plugin.xml,\
-               dstore_security.jar,\
+               .,\
-               schema/,\
-               about.htm,\
-               about.mappings,\
-               about.properties,\
-               about.ini,\
                META-INF/
-source.dstore_security.jar = src/
+source.. = src/
-output.dstore_security.jar = bin/
+output.. = bin/
 src.includes = about.html

rse/plugins/org.eclipse.rse.eclipse.filesystem/build.properties

@@ -2,8 +2,7 @@ bin.includes = META-INF/,\
                plugin.xml,\
                about.html,\
                plugin.properties,\
-               rse_filesystem.jar
+               .
-jars.compile.order = rse_filesystem.jar
+source.. = src/
-source.rse_filesystem.jar = src/
+output.. = bin/
-output.rse_filesystem.jar = bin/
 src.includes = about.html

rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF

@@ -32,4 +32,3 @@ Export-Package: org.eclipse.rse.files.ui,
  org.eclipse.rse.files.ui.widgets,
  org.eclipse.rse.files.ui.wizards
 Bundle-Vendor: Eclipse.org
-Bundle-ClassPath: files_ui.jar

rse/plugins/org.eclipse.rse.files.ui/build.properties

@@ -3,8 +3,7 @@ bin.includes = META-INF/,\
                about.html,\
                icons/,\
                plugin.properties,\
-               files_ui.jar
+               .
-source.files_ui.jar = src/
+source.. = src/
-jars.compile.order = files_ui.jar
+output.. = bin/
-output.files_ui.jar = bin/
 src.includes = about.html

rse/plugins/org.eclipse.rse.logging/META-INF/MANIFEST.MF

@@ -11,4 +11,3 @@ Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.logging,
  org.eclipse.rse.logging.performance
 Bundle-Vendor: Eclipse.org
-Bundle-ClassPath: systemslogging.jar

rse/plugins/org.eclipse.rse.logging/build.properties

@@ -3,16 +3,9 @@ bin.includes = HelpContexts.xml,\
                plugin.properties,\
                plugin.xml,\
                style/,\
-               systemslogging.jar,\
+               .,\
-               about.ini,\
-               about.htm,\
-               about.mappings,\
-               about.properties,\
                about.html,\
-               about.mappings,\
-               about.properties,\
                META-INF/
-jars.compile.order = systemslogging.jar
+source.. = src/
-source.systemslogging.jar = src/
+output.. = bin/
-output.systemslogging.jar = bin/
 src.includes = about.html

rse/plugins/org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF

@@ -32,4 +32,3 @@ Export-Package: org.eclipse.rse.processes.ui,
  org.eclipse.rse.processes.ui.view
 Eclipse-LazyStart: true
 Bundle-Vendor: Eclipse.org
-Bundle-ClassPath: processes_ui.jar

rse/plugins/org.eclipse.rse.processes.ui/build.properties

@@ -6,8 +6,7 @@ bin.includes = META-INF/,\
                messageFile.dtd,\
                plugin.properties,\
                systemmessages.xml,\
-               processes_ui.jar
+               .
-source.processes_ui.jar = src/
+source.. = src/
-jars.compile.order = processes_ui.jar
+output.. = bin/
-output.processes_ui.jar = bin/
 src.includes = about.html

rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF

@@ -25,5 +25,3 @@ Export-Package: org.eclipse.rse.dstore.universal.miners,
  org.eclipse.rse.services.dstore.shells,
  org.eclipse.rse.services.dstore.util
 Bundle-Vendor: Eclipse.org
-Bundle-ClassPath: dstore_services.jar,
- dstore_miners.jar

rse/plugins/org.eclipse.rse.services.dstore/build.properties

@@ -2,12 +2,11 @@ bin.includes = META-INF/,\
                about.html,\
                about.properties,\
                plugin.properties,\
-               dstore_services.jar,\
+               dstore_miners.jar,\
-               dstore_miners.jar
+               .
-source.dstore_services.jar = src/
+source.. = src/,miners/
-output.dstore_services.jar = bin/
+output.. = bin/
-jars.compile.order = dstore_miners.jar,\
+jars.compile.order = dstore_miners.jar,.
-                     dstore_services.jar
 source.dstore_miners.jar = miners/
-output.dstore_miners.jar = bin/
+output.dstore_miners.jar = miners.bin/
 src.includes = about.html

rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF

@@ -11,4 +11,3 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.services
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.services.files.ftp
-Bundle-ClassPath: ftpfiles.jar

rse/plugins/org.eclipse.rse.services.files.ftp/build.properties

@@ -2,8 +2,7 @@ bin.includes = META-INF/,\
                about.html,\
                about.properties,\
                plugin.properties,\
-               ftpfiles.jar
+               .
-source.ftpfiles.jar = src/
+source.. = src/
-jars.compile.order = ftpfiles.jar
+output.. = bin/
-output.ftpfiles.jar = bin/
 src.includes = about.html

rse/plugins/org.eclipse.rse.services.local/META-INF/MANIFEST.MF

@@ -17,4 +17,3 @@ Export-Package: org.eclipse.rse.internal.services.local.search,
  org.eclipse.rse.services.local.processes,
  org.eclipse.rse.services.local.search,
  org.eclipse.rse.services.local.shells
-Bundle-ClassPath: localfiles.jar

rse/plugins/org.eclipse.rse.services.local/build.properties

@@ -2,9 +2,8 @@ bin.includes = META-INF/,\
                about.html,\
                about.properties,\
                plugin.properties,\
-               localfiles.jar,\
+               .,\
                patterns.dat
-source.localfiles.jar = src/
+source.. = src/
-jars.compile.order = localfiles.jar
+output.. = bin/
-output.localfiles.jar = bin/
 src.includes = about.html

rse/plugins/org.eclipse.rse.services/META-INF/MANIFEST.MF

@@ -22,5 +22,3 @@ Export-Package: org.eclipse.rse.services,
  org.eclipse.rse.services.processes,
  org.eclipse.rse.services.search,
  org.eclipse.rse.services.shells
-Bundle-ClassPath: clientserver.jar,
- services.jar

rse/plugins/org.eclipse.rse.services/build.properties

@@ -1,12 +1,10 @@
 bin.includes = META-INF/,\
                about.html,\
                plugin.properties,\
-               services.jar,\
+               .
-               clientserver.jar
+jars.compile.order = clientserver.jar,.
-jars.compile.order = clientserver.jar,\
-                     services.jar
 source.clientserver.jar = clientserver/
-output.clientserver.jar = bin/
+output.clientserver.jar = clientserver.bin/
-source.services.jar = src/
+source.. = src/,clientserver/
-output.services.jar = bin/
+output.. = bin/
 src.includes = about.html

rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF

@@ -26,4 +26,3 @@ Export-Package: org.eclipse.rse.shells.ui,
  org.eclipse.rse.shells.ui.propertypages,
  org.eclipse.rse.shells.ui.view
 Bundle-Vendor: Eclipse.org
-Bundle-ClassPath: shells_ui.jar

rse/plugins/org.eclipse.rse.shells.ui/build.properties

@@ -3,8 +3,7 @@ bin.includes = META-INF/,\
                about.html,\
                icons/,\
                plugin.properties,\
-               shells_ui.jar
+               .
-source.shells_ui.jar = src/
+source.. = src/
-jars.compile.order = shells_ui.jar
+output.. = bin/
-output.shells_ui.jar = bin/
 src.includes = about.html

rse/plugins/org.eclipse.rse.subsystems.files.core/META-INF/MANIFEST.MF

@@ -18,4 +18,3 @@ Export-Package: org.eclipse.rse.internal.subsystems.files.core,
  org.eclipse.rse.subsystems.files.core.subsystems,
  org.eclipse.rse.subsystems.files.core.util
 Bundle-Vendor: Eclipse.org
-Bundle-ClassPath: files_core.jar

rse/plugins/org.eclipse.rse.subsystems.files.core/build.properties

@@ -1,8 +1,7 @@
 bin.includes = META-INF/,\
                about.html,\
                plugin.properties,\
-               files_core.jar
+               .
-jars.compile.order = files_core.jar
+source.. = src/
-source.files_core.jar = src/
+output.. = bin/
-output.files_core.jar = bin/
 src.includes = about.html

rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF

@@ -20,4 +20,3 @@ Export-Package: org.eclipse.rse.subsystems.files.dstore,
  org.eclipse.rse.subsystems.files.dstore.model,
  org.eclipse.rse.subsystems.files.dstore.subsystem
 Bundle-Vendor: Eclipse.org
-Bundle-ClassPath: filesDstore.jar

rse/plugins/org.eclipse.rse.subsystems.files.dstore/build.properties

@@ -3,8 +3,7 @@ bin.includes = META-INF/,\
                icons/,\
                plugin.properties,\
                plugin.xml,\
-               filesDstore.jar
+               .
-jars.compile.order = filesDstore.jar
+source.. = src/
-source.filesDstore.jar = src/
+output.. = bin/
-output.filesDstore.jar = bin/
 src.includes = about.html

rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF

@@ -17,4 +17,3 @@ Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.subsystems.files.ftp,
  org.eclipse.rse.subsystems.files.ftp.connectorservice,
  org.eclipse.rse.subsystems.files.ftp.model
-Bundle-ClassPath: filesFTP.jar

rse/plugins/org.eclipse.rse.subsystems.files.ftp/build.properties

@@ -3,8 +3,7 @@ bin.includes = META-INF/,\
                icons/,\
                plugin.properties,\
                plugin.xml,\
-               filesFTP.jar
+               .
-jars.compile.order = filesFTP.jar
+source.. = src/
-source.filesFTP.jar = src/
+output.. = bin/
-output.filesFTP.jar = bin/
 src.includes = about.html

rse/plugins/org.eclipse.rse.subsystems.files.local/META-INF/MANIFEST.MF

@@ -15,6 +15,5 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.ui
 Eclipse-LazyStart: true
 Bundle-Vendor: Eclipse.org
-Bundle-ClassPath: filesLocal.jar
 Export-Package: org.eclipse.rse.subsystems.files.local,
  org.eclipse.rse.subsystems.files.local.model

rse/plugins/org.eclipse.rse.subsystems.files.local/build.properties

@@ -3,8 +3,7 @@ bin.includes = META-INF/,\
                icons/,\
                plugin.properties,\
                plugin.xml,\
-               filesLocal.jar
+               .
-jars.compile.order = filesLocal.jar
+source.. = src/
-source.filesLocal.jar = src/
+output.. = bin/
-output.filesLocal.jar = bin/
 src.includes = about.html

rse/plugins/org.eclipse.rse.subsystems.processes.core/META-INF/MANIFEST.MF

@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.subsystems.processes.core;singleton:=true
 Bundle-Version: 1.0.0
-Bundle-ClassPath: processes.jar
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
 Export-Package: org.eclipse.rse.subsystems.processes.core,

rse/plugins/org.eclipse.rse.subsystems.processes.core/build.properties

@@ -1,8 +1,7 @@
 bin.includes = META-INF/,\
                about.html,\
-               processes.jar,\
+               .,\
                plugin.properties
-jars.compile.order = processes.jar
+source.. = src/
-source.processes.jar = src/
+output.. = bin/
-output.processes.jar = bin/
 src.includes = about.html

rse/plugins/org.eclipse.rse.subsystems.processes.dstore/META-INF/MANIFEST.MF

@@ -17,4 +17,3 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.ui
 Eclipse-LazyStart: true
 Bundle-Vendor: Eclipse.org
-Bundle-ClassPath: processesDstore.jar

rse/plugins/org.eclipse.rse.subsystems.processes.dstore/build.properties

@@ -3,8 +3,7 @@ bin.includes = META-INF/,\
                plugin.properties,\
                icons/,\
                plugin.xml,\
-               processesDstore.jar
+               .
-source.processesDstore.jar = src/
+source.. = src/
-output.processesDstore.jar = bin/
+output.. = bin/
-jars.compile.order = processesDstore.jar
 src.includes = build.properties

rse/plugins/org.eclipse.rse.subsystems.processes.local/META-INF/MANIFEST.MF

@@ -15,5 +15,4 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.ui
 Eclipse-LazyStart: true
 Bundle-Vendor: Eclipse.org
-Bundle-ClassPath: processesLocal.jar
 Export-Package: org.eclipse.rse.subsystems.processes.local

rse/plugins/org.eclipse.rse.subsystems.processes.local/build.properties

@@ -3,8 +3,7 @@ bin.includes = META-INF/,\
                icons/,\
                plugin.properties,\
                plugin.xml,\
-               processesLocal.jar
+               .
-source.processesLocal.jar = src/
+source.. = src/
-output.processesLocal.jar = bin/
+output.. = bin/
-jars.compile.order = processesLocal.jar
 src.includes = about.html

rse/plugins/org.eclipse.rse.subsystems.shells.core/META-INF/MANIFEST.MF

@@ -20,4 +20,3 @@ Export-Package: org.eclipse.rse.internal.subsystems.shells.servicesubsystem,
  org.eclipse.rse.subsystems.shells.core.subsystems,
  org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem
 Bundle-Vendor: Eclipse.org
-Bundle-ClassPath: shells_core.jar

rse/plugins/org.eclipse.rse.subsystems.shells.core/build.properties

@@ -1,8 +1,7 @@
 bin.includes = META-INF/,\
                about.html,\
                plugin.properties,\
-               shells_core.jar
+               .
-jars.compile.order = shells_core.jar
+source.. = src/
-source.shells_core.jar = src/
+output.. = bin/
-output.shells_core.jar = bin/
 src.includes = about.html

rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF

@@ -18,6 +18,5 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.subsystems.files.core
 Eclipse-LazyStart: true
 Bundle-Vendor: Eclipse.org
-Bundle-ClassPath: shellsDStore.jar
 Export-Package: org.eclipse.rse.subsystems.shells.dstore,
  org.eclipse.rse.subsystems.shells.dstore.model

rse/plugins/org.eclipse.rse.subsystems.shells.dstore/build.properties

@@ -3,8 +3,7 @@ bin.includes = META-INF/,\
                icons/,\
                plugin.properties,\
                plugin.xml,\
-               shellsDStore.jar
+               .
-source.shellsDStore.jar = src/
+source.. = src/
-output.shellsDStore.jar = bin/
+output.. = bin/
-jars.compile.order = shellsDStore.jar
 src.includes = about.html

rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF

@@ -16,5 +16,4 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.subsystems.files.core
 Eclipse-LazyStart: true
 Bundle-Vendor: Eclipse.org
-Bundle-ClassPath: shellsLocal.jar
 Export-Package: org.eclipse.rse.subsystems.shells.local

rse/plugins/org.eclipse.rse.subsystems.shells.local/build.properties

@@ -3,8 +3,7 @@ bin.includes = META-INF/,\
                icons/,\
                plugin.properties,\
                plugin.xml,\
-               shellsLocal.jar
+               .
-source.shellsLocal.jar = src/
+source.. = src/
-output.shellsLocal.jar = bin/
+output.. = bin/
-jars.compile.order = shellsLocal.jar
 src.includes = about.html

rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF

@@ -54,4 +54,3 @@ Export-Package: org.eclipse.rse.core,
  org.eclipse.rse.ui.widgets.services,
  org.eclipse.rse.ui.wizards
 Bundle-Vendor: Eclipse.org
-Bundle-ClassPath: systems.jar

rse/plugins/org.eclipse.rse.ui/build.properties

@@ -1,25 +1,19 @@
-output.systems.jar = bin/
 bin.includes = HelpContexts.xml,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
                messageFile.dtd,\
                plugin.properties,\
                plugin.xml,\
-               systemResources.properties,\
                systemmessages.xml,\
-               systems.jar,\
+               .,\
                icons/,\
-               about.htm,\
                about.html,\
                META-INF/,\
                schema/
-source.systems.jar = references/,\
-                     filters/,\
-                     model/,\
-                     subsystems/,\
-                     systems/,\
-                     persistence/,\
-                     UI/
-jars.compile.order = systems.jar
 src.includes = about.html
+output.. = bin/
+source.. = references/,\
+           filters/,\
+           model/,\
+           subsystems/,\
+           systems/,\
+           persistence/,\
+           UI/