diff --git a/rse/plugins/org.eclipse.dstore.core/build.properties b/rse/plugins/org.eclipse.dstore.core/build.properties index 548cdcde880..18a5e68ac41 100644 --- a/rse/plugins/org.eclipse.dstore.core/build.properties +++ b/rse/plugins/org.eclipse.dstore.core/build.properties @@ -4,7 +4,4 @@ bin.includes = plugin.properties,\ serverscripts/ source.dstore_core.jar = src/ output.dstore_core.jar = bin/ -src.includes = about.html,\ - plugin.properties,\ - META-INF/,\ - serverscripts/ +src.includes = src/ diff --git a/rse/plugins/org.eclipse.dstore.extra/build.properties b/rse/plugins/org.eclipse.dstore.extra/build.properties index a39331fe9db..5ad41d3d439 100644 --- a/rse/plugins/org.eclipse.dstore.extra/build.properties +++ b/rse/plugins/org.eclipse.dstore.extra/build.properties @@ -2,9 +2,7 @@ bin.includes = about.html,\ META-INF/,\ plugin.properties,\ dstore_extra.jar -src.includes = META-INF/,\ - about.html,\ - plugin.properties jars.compile.order = dstore_extra.jar source.dstore_extra.jar = src/ output.dstore_extra.jar = bin/ +src.includes = src/ diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/build.properties b/rse/plugins/org.eclipse.rse.connectorservice.dstore/build.properties index 6972fc9aabe..0a32f333a0b 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/build.properties +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/build.properties @@ -2,9 +2,7 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties,\ dstore_connector_service.jar -src.includes = META-INF/,\ - about.html,\ - plugin.properties source.dstore_connector_service.jar = src/ jars.compile.order = dstore_connector_service.jar output.dstore_connector_service.jar = bin/ +src.includes = src/ diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/build.properties b/rse/plugins/org.eclipse.rse.connectorservice.local/build.properties index 9730f3af1ca..18dbcd3799f 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.local/build.properties +++ b/rse/plugins/org.eclipse.rse.connectorservice.local/build.properties @@ -2,9 +2,7 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties,\ local_connector_service.jar -src.includes = META-INF/,\ - about.html,\ - plugin.properties source.local_connector_service.jar = src/ jars.compile.order = local_connector_service.jar output.local_connector_service.jar = bin/ +src.includes = src/ diff --git a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF index ec7247c7eef..bbbe3970a67 100644 --- a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF @@ -8,3 +8,4 @@ Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime Eclipse-LazyStart: true Export-Package: org.eclipse.rse.core +Bundle-ClassPath: rsecore.jar diff --git a/rse/plugins/org.eclipse.rse.core/build.properties b/rse/plugins/org.eclipse.rse.core/build.properties index e9863e281ea..315ac1b53fd 100644 --- a/rse/plugins/org.eclipse.rse.core/build.properties +++ b/rse/plugins/org.eclipse.rse.core/build.properties @@ -1,5 +1,10 @@ -source.. = src/ -output.. = bin/ bin.includes = META-INF/,\ - .,\ - plugin.xml + plugin.xml,\ + plugin.properties,\ + about.properties,\ + about.html,\ + rsecore.jar,\ + schema/ +source.rsecore.jar = +jars.compile.order = rsecore.jar +src.includes = src/ diff --git a/rse/plugins/org.eclipse.rse.dstore.security/build.properties b/rse/plugins/org.eclipse.rse.dstore.security/build.properties index cf6a1d30ded..59e357e4e66 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/build.properties +++ b/rse/plugins/org.eclipse.rse.dstore.security/build.properties @@ -11,8 +11,4 @@ bin.includes = about.html,\ META-INF/ source.dstore_security.jar = src/ output.dstore_security.jar = bin/ -src.includes = META-INF/,\ - about.html,\ - icons/,\ - plugin.properties,\ - plugin.xml +src.includes = src/ diff --git a/rse/plugins/org.eclipse.rse.eclipse.filesystem/build.properties b/rse/plugins/org.eclipse.rse.eclipse.filesystem/build.properties index fca1546c3c5..28a61fc15d8 100644 --- a/rse/plugins/org.eclipse.rse.eclipse.filesystem/build.properties +++ b/rse/plugins/org.eclipse.rse.eclipse.filesystem/build.properties @@ -3,10 +3,7 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties,\ rse_filesystem.jar -src.includes = META-INF/,\ - about.html,\ - plugin.properties,\ - plugin.xml jars.compile.order = rse_filesystem.jar source.rse_filesystem.jar = src/ output.rse_filesystem.jar = bin/ +src.includes = src/ diff --git a/rse/plugins/org.eclipse.rse.files.ui/build.properties b/rse/plugins/org.eclipse.rse.files.ui/build.properties index 000d4a08dce..a2089a72fc8 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/build.properties +++ b/rse/plugins/org.eclipse.rse.files.ui/build.properties @@ -4,11 +4,7 @@ bin.includes = META-INF/,\ icons/,\ plugin.properties,\ files_ui.jar -src.includes = icons/,\ - plugin.properties,\ - plugin.xml,\ - META-INF/,\ - about.html source.files_ui.jar = src/ jars.compile.order = files_ui.jar output.files_ui.jar = bin/ +src.includes = src/ diff --git a/rse/plugins/org.eclipse.rse.logging/build.properties b/rse/plugins/org.eclipse.rse.logging/build.properties index aecd1815b53..fc95fc5be20 100644 --- a/rse/plugins/org.eclipse.rse.logging/build.properties +++ b/rse/plugins/org.eclipse.rse.logging/build.properties @@ -15,10 +15,4 @@ bin.includes = HelpContexts.xml,\ jars.compile.order = systemslogging.jar source.systemslogging.jar = src/ output.systemslogging.jar = bin/ -src.includes = HelpContexts.xml,\ - META-INF/,\ - RemoteSystemsLogging.properties,\ - about.html,\ - plugin.properties,\ - plugin.xml,\ - style/ +src.includes = src/ diff --git a/rse/plugins/org.eclipse.rse.processes.ui/build.properties b/rse/plugins/org.eclipse.rse.processes.ui/build.properties index 6794cecf340..748de2e3710 100644 --- a/rse/plugins/org.eclipse.rse.processes.ui/build.properties +++ b/rse/plugins/org.eclipse.rse.processes.ui/build.properties @@ -7,14 +7,7 @@ bin.includes = META-INF/,\ plugin.properties,\ systemmessages.xml,\ processes_ui.jar -src.includes = HelpContexts.xml,\ - about.html,\ - META-INF/,\ - icons/,\ - messageFile.dtd,\ - plugin.properties,\ - plugin.xml,\ - systemmessages.xml source.processes_ui.jar = src/ jars.compile.order = processes_ui.jar output.processes_ui.jar = bin/ +src.includes = src/ diff --git a/rse/plugins/org.eclipse.rse.services.dstore/build.properties b/rse/plugins/org.eclipse.rse.services.dstore/build.properties index f4285cc26ff..828a074507c 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/build.properties +++ b/rse/plugins/org.eclipse.rse.services.dstore/build.properties @@ -4,10 +4,7 @@ bin.includes = META-INF/,\ plugin.properties,\ dstore_services.jar,\ dstore_miners.jar -src.includes = META-INF/,\ - about.html,\ - about.properties,\ - plugin.properties +src.includes = src/ source.dstore_services.jar = src/ output.dstore_services.jar = bin/ jars.compile.order = dstore_miners.jar,\ diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/build.properties b/rse/plugins/org.eclipse.rse.services.files.ftp/build.properties index 14606becee6..ed94118f3d4 100644 --- a/rse/plugins/org.eclipse.rse.services.files.ftp/build.properties +++ b/rse/plugins/org.eclipse.rse.services.files.ftp/build.properties @@ -3,10 +3,7 @@ bin.includes = META-INF/,\ about.properties,\ plugin.properties,\ ftpfiles.jar -src.includes = META-INF/,\ - about.html,\ - about.properties,\ - plugin.properties source.ftpfiles.jar = src/ jars.compile.order = ftpfiles.jar output.ftpfiles.jar = bin/ +src.includes = src/ diff --git a/rse/plugins/org.eclipse.rse.services.local/build.properties b/rse/plugins/org.eclipse.rse.services.local/build.properties index ef02c081dfe..75c0226ba22 100644 --- a/rse/plugins/org.eclipse.rse.services.local/build.properties +++ b/rse/plugins/org.eclipse.rse.services.local/build.properties @@ -3,10 +3,7 @@ bin.includes = META-INF/,\ about.properties,\ plugin.properties,\ localfiles.jar -src.includes = META-INF/,\ - about.html,\ - about.properties,\ - plugin.properties source.localfiles.jar = src/ jars.compile.order = localfiles.jar output.localfiles.jar = bin/ +src.includes = src/ diff --git a/rse/plugins/org.eclipse.rse.services/build.properties b/rse/plugins/org.eclipse.rse.services/build.properties index 16baa859797..efec70d1abc 100644 --- a/rse/plugins/org.eclipse.rse.services/build.properties +++ b/rse/plugins/org.eclipse.rse.services/build.properties @@ -3,12 +3,10 @@ bin.includes = META-INF/,\ plugin.properties,\ services.jar,\ clientserver.jar -src.includes = META-INF/,\ - about.html,\ - plugin.properties jars.compile.order = clientserver.jar,\ services.jar source.clientserver.jar = clientserver/ output.clientserver.jar = bin/ source.services.jar = src/ output.services.jar = bin/ +src.includes = src/ diff --git a/rse/plugins/org.eclipse.rse.shells.ui/build.properties b/rse/plugins/org.eclipse.rse.shells.ui/build.properties index 356b100dff5..57432ea7ec0 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/build.properties +++ b/rse/plugins/org.eclipse.rse.shells.ui/build.properties @@ -4,11 +4,7 @@ bin.includes = META-INF/,\ icons/,\ plugin.properties,\ shells_ui.jar -src.includes = META-INF/,\ - about.html,\ - icons/,\ - plugin.properties,\ - plugin.xml source.shells_ui.jar = src/ jars.compile.order = shells_ui.jar output.shells_ui.jar = bin/ +src.includes = src/ diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/build.properties b/rse/plugins/org.eclipse.rse.subsystems.files.core/build.properties index 33d4ab4e9d6..6471d2c7a75 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/build.properties +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/build.properties @@ -2,9 +2,7 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties,\ files_core.jar -src.includes = META-INF/,\ - about.html,\ - plugin.properties jars.compile.order = files_core.jar source.files_core.jar = src/ output.files_core.jar = bin/ +src.includes = src/ diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/build.properties b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/build.properties index 2a1e900ea81..8b64fb05d01 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/build.properties +++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/build.properties @@ -4,11 +4,7 @@ bin.includes = META-INF/,\ plugin.properties,\ plugin.xml,\ filesDstore.jar -src.includes = META-INF/,\ - about.html,\ - icons/,\ - plugin.properties,\ - plugin.xml jars.compile.order = filesDstore.jar source.filesDstore.jar = src/ output.filesDstore.jar = bin/ +src.includes = src/ diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/build.properties b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/build.properties index 76cca47f060..881e727aa15 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/build.properties +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/build.properties @@ -4,11 +4,7 @@ bin.includes = META-INF/,\ plugin.properties,\ plugin.xml,\ filesFTP.jar -src.includes = META-INF/,\ - about.html,\ - plugin.properties,\ - plugin.xml,\ - icons/ jars.compile.order = filesFTP.jar source.filesFTP.jar = src/ output.filesFTP.jar = bin/ +src.includes = src/ diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/build.properties b/rse/plugins/org.eclipse.rse.subsystems.files.local/build.properties index e844199e676..49f67fb3fc2 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.local/build.properties +++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/build.properties @@ -4,11 +4,7 @@ bin.includes = META-INF/,\ plugin.properties,\ plugin.xml,\ filesLocal.jar -src.includes = META-INF/,\ - about.html,\ - icons/,\ - plugin.properties,\ - plugin.xml jars.compile.order = filesLocal.jar source.filesLocal.jar = src/ output.filesLocal.jar = bin/ +src.includes = src/ diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.core/build.properties b/rse/plugins/org.eclipse.rse.subsystems.processes.core/build.properties index 750d7fe5f92..47174f3ae05 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.core/build.properties +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.core/build.properties @@ -5,6 +5,4 @@ bin.includes = META-INF/,\ jars.compile.order = processes.jar source.processes.jar = src/ output.processes.jar = bin/ -src.includes = META-INF/,\ - about.html,\ - plugin.properties +src.includes = src/ diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/build.properties b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/build.properties index 34fff98542a..0837fcf4096 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/build.properties +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/build.properties @@ -4,11 +4,7 @@ bin.includes = META-INF/,\ icons/,\ plugin.xml,\ processesDstore.jar -src.includes = META-INF/,\ - about.html,\ - icons/,\ - plugin.properties,\ - plugin.xml source.processesDstore.jar = src/ output.processesDstore.jar = bin/ jars.compile.order = processesDstore.jar +src.includes = src/ diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.local/build.properties b/rse/plugins/org.eclipse.rse.subsystems.processes.local/build.properties index 92c5c8142d4..3ecea21ae72 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.local/build.properties +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.local/build.properties @@ -4,11 +4,7 @@ bin.includes = META-INF/,\ plugin.properties,\ plugin.xml,\ processesLocal.jar -src.includes = META-INF/,\ - about.html,\ - icons/,\ - plugin.properties,\ - plugin.xml source.processesLocal.jar = src/ output.processesLocal.jar = bin/ jars.compile.order = processesLocal.jar +src.includes = src/ diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/build.properties b/rse/plugins/org.eclipse.rse.subsystems.shells.core/build.properties index 0d7698806f5..3abf26cf2f1 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/build.properties +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/build.properties @@ -2,9 +2,7 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties,\ shells_core.jar -src.includes = META-INF/,\ - about.html,\ - plugin.properties jars.compile.order = shells_core.jar source.shells_core.jar = src/ output.shells_core.jar = bin/ +src.includes = src/ diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/build.properties b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/build.properties index 650aa257f69..9f068fd1acd 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/build.properties +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/build.properties @@ -4,11 +4,7 @@ bin.includes = META-INF/,\ plugin.properties,\ plugin.xml,\ shellsDStore.jar -src.includes = plugin.xml,\ - plugin.properties,\ - icons/,\ - META-INF/,\ - about.html source.shellsDStore.jar = src/ output.shellsDStore.jar = bin/ jars.compile.order = shellsDStore.jar +src.includes = src/ diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.local/build.properties b/rse/plugins/org.eclipse.rse.subsystems.shells.local/build.properties index 394c41240b0..2caa7acf91e 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.local/build.properties +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.local/build.properties @@ -4,11 +4,7 @@ bin.includes = META-INF/,\ plugin.properties,\ plugin.xml,\ shellsLocal.jar -src.includes = META-INF/,\ - about.html,\ - icons/,\ - plugin.properties,\ - plugin.xml source.shellsLocal.jar = src/ output.shellsLocal.jar = bin/ jars.compile.order = shellsLocal.jar +src.includes = src/ diff --git a/rse/plugins/org.eclipse.rse.ui/build.properties b/rse/plugins/org.eclipse.rse.ui/build.properties index 11abb04e674..7b108d7199f 100644 --- a/rse/plugins/org.eclipse.rse.ui/build.properties +++ b/rse/plugins/org.eclipse.rse.ui/build.properties @@ -22,12 +22,10 @@ source.systems.jar = references/,\ persistence/,\ UI/ jars.compile.order = systems.jar -src.includes = META-INF/,\ - HelpContexts.xml,\ - about.html,\ - icons/,\ - messageFile.dtd,\ - plugin.properties,\ - plugin.xml,\ - schema/,\ - systemmessages.xml +src.includes = UI/,\ + filters/,\ + model/,\ + persistence/,\ + references/,\ + subsystems/,\ + systems/