Skip to content

Commit

Permalink
recreate OSGi Service Descriptor XMLs
Browse files Browse the repository at this point in the history
- no more CRLF in xml
- sort alphabetically within MANIFEST.MF

This is triggered by temporarily selecting an empty Target Platform.
  • Loading branch information
haubi committed Feb 23, 2024
1 parent 29253ec commit d020dce
Show file tree
Hide file tree
Showing 14 changed files with 98 additions and 98 deletions.
20 changes: 10 additions & 10 deletions bundles/org.eclipse.tea.core.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,17 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore,
org.eclipse.e4.core.di.extensions
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/org.eclipse.tea.core.ui.config.TaskingConsoleConfig.xml,
OSGI-INF/org.eclipse.tea.core.ui.internal.PrintTaskChains.xml,
OSGI-INF/org.eclipse.tea.core.ui.internal.listeners.AutoBuildDeactivator.xml,
OSGI-INF/org.eclipse.tea.core.ui.internal.run.RunTaskChain.xml,
OSGI-INF/org.eclipse.tea.core.ui.internal.context.E4WorkbenchContextFunction.xml,
OSGI-INF/org.eclipse.tea.core.ui.internal.headless.WorkbenchStarter.xml,
OSGI-INF/org.eclipse.tea.core.ui.DevelopmentMenuDecoration.xml,
OSGI-INF/org.eclipse.tea.core.ui.TaskingConsole.xml,
OSGI-INF/org.eclipse.tea.core.ui.internal.TaskProgressEstimationImpl.xml,
OSGI-INF/org.eclipse.tea.core.ui.internal.listeners.EventBrokerBridge.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.annotation,
org.eclipse.e4.ui.css.swt.theme,
javax.inject;version="1.0.0"
Service-Component: OSGI-INF/org.eclipse.tea.core.ui.DevelopmentMenuDecoration.xml,
OSGI-INF/org.eclipse.tea.core.ui.TaskingConsole.xml,
OSGI-INF/org.eclipse.tea.core.ui.config.TaskingConsoleConfig.xml,
OSGI-INF/org.eclipse.tea.core.ui.internal.PrintTaskChains.xml,
OSGI-INF/org.eclipse.tea.core.ui.internal.TaskProgressEstimationImpl.xml,
OSGI-INF/org.eclipse.tea.core.ui.internal.context.E4WorkbenchContextFunction.xml,
OSGI-INF/org.eclipse.tea.core.ui.internal.headless.WorkbenchStarter.xml,
OSGI-INF/org.eclipse.tea.core.ui.internal.listeners.AutoBuildDeactivator.xml,
OSGI-INF/org.eclipse.tea.core.ui.internal.listeners.EventBrokerBridge.xml,
OSGI-INF/org.eclipse.tea.core.ui.internal.run.RunTaskChain.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.tea.core.ui.internal.PrintTaskChains">
<service>
<provide interface="org.eclipse.tea.core.services.TaskChain"/>
</service>
<implementation class="org.eclipse.tea.core.ui.internal.PrintTaskChains"/>
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.tea.core.ui.internal.PrintTaskChains">
<service>
<provide interface="org.eclipse.tea.core.services.TaskChain"/>
</service>
<implementation class="org.eclipse.tea.core.ui.internal.PrintTaskChains"/>
</scr:component>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.tea.core.ui.internal.headless.WorkbenchStarter">
<service>
<provide interface="org.eclipse.tea.core.services.TaskingHeadlessLifeCycle"/>
</service>
<implementation class="org.eclipse.tea.core.ui.internal.headless.WorkbenchStarter"/>
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.tea.core.ui.internal.headless.WorkbenchStarter">
<service>
<provide interface="org.eclipse.tea.core.services.TaskingHeadlessLifeCycle"/>
</service>
<implementation class="org.eclipse.tea.core.ui.internal.headless.WorkbenchStarter"/>
</scr:component>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.tea.core.ui.internal.run.RunTaskChain">
<service>
<provide interface="org.eclipse.tea.core.services.TaskChain"/>
</service>
<implementation class="org.eclipse.tea.core.ui.internal.run.RunTaskChain"/>
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.tea.core.ui.internal.run.RunTaskChain">
<service>
<provide interface="org.eclipse.tea.core.services.TaskChain"/>
</service>
<implementation class="org.eclipse.tea.core.ui.internal.run.RunTaskChain"/>
</scr:component>
24 changes: 12 additions & 12 deletions bundles/org.eclipse.tea.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,6 @@ Require-Bundle: org.eclipse.osgi.services;resolution:=optional,
org.eclipse.e4.core.di.extensions
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/org.eclipse.tea.core.internal.context.TaskChainLookupContextFunction.xml,
OSGI-INF/org.eclipse.tea.core.internal.context.TaskingLogLookupContextFunction.xml,
OSGI-INF/org.eclipse.tea.core.internal.DefaultTaskingLog.xml,
OSGI-INF/org.eclipse.tea.core.internal.config.CoreConfig.xml,
OSGI-INF/org.eclipse.tea.core.internal.listeners.LifecycleAnnouncer.xml,
OSGI-INF/org.eclipse.tea.core.internal.stats.TaskingStatConfig.xml,
OSGI-INF/org.eclipse.tea.core.internal.stats.TaskingStatListener.xml,
OSGI-INF/org.eclipse.tea.core.internal.listeners.TaskingStatusTracker.xml,
OSGI-INF/org.eclipse.tea.core.internal.listeners.WorkspaceSaver.xml,
OSGI-INF/org.eclipse.tea.core.TaskingCoreGroupingIds.xml,
OSGI-INF/org.eclipse.tea.core.internal.config.TaskingDevelopmentConfig.xml,
OSGI-INF/org.eclipse.tea.core.internal.listeners.ConfigurationRefresher.xml
Export-Package: org.eclipse.tea.core;
uses:="org.eclipse.core.runtime,
org.eclipse.e4.core.contexts,
Expand All @@ -47,3 +35,15 @@ Export-Package: org.eclipse.tea.core;
org.eclipse.tea.core.internal.tasks;x-friends:="org.eclipse.tea.core.ui",
org.eclipse.tea.core.services
Import-Package: javax.inject;version="1.0.0"
Service-Component: OSGI-INF/org.eclipse.tea.core.TaskingCoreGroupingIds.xml,
OSGI-INF/org.eclipse.tea.core.internal.DefaultTaskingLog.xml,
OSGI-INF/org.eclipse.tea.core.internal.config.CoreConfig.xml,
OSGI-INF/org.eclipse.tea.core.internal.config.TaskingDevelopmentConfig.xml,
OSGI-INF/org.eclipse.tea.core.internal.context.TaskChainLookupContextFunction.xml,
OSGI-INF/org.eclipse.tea.core.internal.context.TaskingLogLookupContextFunction.xml,
OSGI-INF/org.eclipse.tea.core.internal.listeners.ConfigurationRefresher.xml,
OSGI-INF/org.eclipse.tea.core.internal.listeners.LifecycleAnnouncer.xml,
OSGI-INF/org.eclipse.tea.core.internal.listeners.TaskingStatusTracker.xml,
OSGI-INF/org.eclipse.tea.core.internal.listeners.WorkspaceSaver.xml,
OSGI-INF/org.eclipse.tea.core.internal.stats.TaskingStatConfig.xml,
OSGI-INF/org.eclipse.tea.core.internal.stats.TaskingStatListener.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.tea.core.internal.context.TaskChainLookupContextFunction">
<property name="service.context.key" value="org.eclipse.tea.core.services.TaskChain"/>
<service>
<provide interface="org.eclipse.e4.core.contexts.IContextFunction"/>
</service>
<implementation class="org.eclipse.tea.core.internal.context.TaskChainLookupContextFunction"/>
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.tea.core.internal.context.TaskChainLookupContextFunction">
<property name="service.context.key" value="org.eclipse.tea.core.services.TaskChain"/>
<service>
<provide interface="org.eclipse.e4.core.contexts.IContextFunction"/>
</service>
<implementation class="org.eclipse.tea.core.internal.context.TaskChainLookupContextFunction"/>
</scr:component>
8 changes: 4 additions & 4 deletions bundles/org.eclipse.tea.ease/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ Require-Bundle: org.eclipse.tea.core,
org.eclipse.swt,
com.google.guava
Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/org.eclipse.tea.ease.internal.ListEaseScripts.xml,
OSGI-INF/org.eclipse.tea.ease.internal.menu.EaseScriptProvider.xml,
OSGI-INF/org.eclipse.tea.ease.chains.TaskChainRunEaseScript.xml,
OSGI-INF/org.eclipse.tea.ease.config.EaseScriptConfig.xml
Export-Package: org.eclipse.tea.ease
Service-Component: OSGI-INF/org.eclipse.tea.ease.chains.TaskChainRunEaseScript.xml,
OSGI-INF/org.eclipse.tea.ease.config.EaseScriptConfig.xml,
OSGI-INF/org.eclipse.tea.ease.internal.ListEaseScripts.xml,
OSGI-INF/org.eclipse.tea.ease.internal.menu.EaseScriptProvider.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ Require-Bundle: org.eclipse.core.resources,
org.eclipse.tea.core.ui
Import-Package: javax.inject
Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/org.eclipse.tea.library.build.lcdsl.tasks.chains.TaskChainBuildAnyFeatureSite.xml,
OSGI-INF/org.eclipse.tea.library.build.lcdsl.tasks.p2.ProductBuildTaskChain.xml,
OSGI-INF/org.eclipse.tea.library.build.lcdsl.tasks.chains.TaskChainLcDslLaunch.xml,
OSGI-INF/org.eclipse.tea.library.build.lcdsl.tasks.config.LcDslLaunchConfig.xml
Export-Package: org.eclipse.tea.library.build.lcdsl.tasks,
org.eclipse.tea.library.build.lcdsl.tasks.chains,
org.eclipse.tea.library.build.lcdsl.tasks.p2
Service-Component: OSGI-INF/org.eclipse.tea.library.build.lcdsl.tasks.chains.TaskChainBuildAnyFeatureSite.xml,
OSGI-INF/org.eclipse.tea.library.build.lcdsl.tasks.chains.TaskChainLcDslLaunch.xml,
OSGI-INF/org.eclipse.tea.library.build.lcdsl.tasks.config.LcDslLaunchConfig.xml,
OSGI-INF/org.eclipse.tea.library.build.lcdsl.tasks.p2.ProductBuildTaskChain.xml
22 changes: 11 additions & 11 deletions bundles/org.eclipse.tea.library.build/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,19 @@ Export-Package: org.eclipse.tea.library.build.chain,
org.eclipse.tea.library.build.ui,
org.eclipse.tea.library.build.util
Bundle-Activator: org.eclipse.tea.library.build.internal.Activator
Service-Component: OSGI-INF/org.eclipse.tea.library.build.tasks.chains.CleanBuildAllProjects.xml,
OSGI-INF/org.eclipse.tea.library.build.config.TeaBuildConfig.xml,
OSGI-INF/org.eclipse.tea.library.build.chain.plugin.TeaBuildPluginDependencyWireFactory.xml,
OSGI-INF/org.eclipse.tea.library.build.tasks.chains.CleanProjectsWithErrors.xml,
OSGI-INF/org.eclipse.tea.library.build.tasks.chains.CmdSyncMavenArtifacts.xml,
OSGI-INF/org.eclipse.tea.library.build.internal.context.JarManagerContextFunction.xml,
Service-Component: OSGI-INF/org.eclipse.tea.library.build.chain.plugin.TeaBuildPluginDependencyWireFactory.xml,
OSGI-INF/org.eclipse.tea.library.build.chain.plugin.TeaBuildPluginElementFactory.xml,
OSGI-INF/org.eclipse.tea.library.build.chain.plugin.TeaBuildPluginVisitor.xml,
OSGI-INF/org.eclipse.tea.library.build.chain.plugin.TeaTargetPlatformDependencyWireFactory.xml,
OSGI-INF/org.eclipse.tea.library.build.config.BuildDirectories.xml,
OSGI-INF/org.eclipse.tea.library.build.config.TeaBuildConfig.xml,
OSGI-INF/org.eclipse.tea.library.build.internal.context.BuildVersionServiceContextFunction.xml,
OSGI-INF/org.eclipse.tea.library.build.jar.ZipConfig.xml,
OSGI-INF/org.eclipse.tea.library.build.internal.context.JarManagerContextFunction.xml,
OSGI-INF/org.eclipse.tea.library.build.internal.context.UpdateSiteManagerContextFunction.xml,
OSGI-INF/org.eclipse.tea.library.build.jar.ZipConfig.xml,
OSGI-INF/org.eclipse.tea.library.build.lifecycle.CacheDirectoryCleanup.xml,
OSGI-INF/org.eclipse.tea.library.build.chain.plugin.TeaTargetPlatformDependencyWireFactory.xml,
OSGI-INF/org.eclipse.tea.library.build.tasks.chains.ExportAllJars.xml,
OSGI-INF/org.eclipse.tea.library.build.menu.BuildLibraryMenu.xml,
OSGI-INF/org.eclipse.tea.library.build.chain.plugin.TeaBuildPluginVisitor.xml,
OSGI-INF/org.eclipse.tea.library.build.config.BuildDirectories.xml
OSGI-INF/org.eclipse.tea.library.build.tasks.chains.CleanBuildAllProjects.xml,
OSGI-INF/org.eclipse.tea.library.build.tasks.chains.CleanProjectsWithErrors.xml,
OSGI-INF/org.eclipse.tea.library.build.tasks.chains.CmdSyncMavenArtifacts.xml,
OSGI-INF/org.eclipse.tea.library.build.tasks.chains.ExportAllJars.xml
16 changes: 8 additions & 8 deletions bundles/org.eclipse.tea.samples/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.e4.core.services
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/org.eclipse.tea.samples.taskchain.SampleTaskChain.xml,
OSGI-INF/org.eclipse.tea.samples.menu.SampleMenuDecoration.xml,
OSGI-INF/org.eclipse.tea.samples.config.SampleConfig.xml,
OSGI-INF/org.eclipse.tea.samples.taskchain.SampleHiddenTaskChain.xml,
OSGI-INF/org.eclipse.tea.samples.taskchain.SampleStatusTaskChain.xml,
OSGI-INF/org.eclipse.tea.samples.taskchain.AllSamplesTaskChain.xml,
OSGI-INF/org.eclipse.tea.samples.taskchain.SamplePreferenceImportTaskChain.xml,
OSGI-INF/org.eclipse.tea.samples.stat.SampleStatContribution.xml
Export-Package: org.eclipse.tea.samples.taskchain,
org.eclipse.tea.samples.tasks
Import-Package: javax.inject;version="1.0.0"
Service-Component: OSGI-INF/org.eclipse.tea.samples.config.SampleConfig.xml,
OSGI-INF/org.eclipse.tea.samples.menu.SampleMenuDecoration.xml,
OSGI-INF/org.eclipse.tea.samples.stat.SampleStatContribution.xml,
OSGI-INF/org.eclipse.tea.samples.taskchain.AllSamplesTaskChain.xml,
OSGI-INF/org.eclipse.tea.samples.taskchain.SampleHiddenTaskChain.xml,
OSGI-INF/org.eclipse.tea.samples.taskchain.SamplePreferenceImportTaskChain.xml,
OSGI-INF/org.eclipse.tea.samples.taskchain.SampleStatusTaskChain.xml,
OSGI-INF/org.eclipse.tea.samples.taskchain.SampleTaskChain.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.tea.samples.menu.SampleMenuDecoration">
<service>
<provide interface="org.eclipse.tea.core.services.TaskingMenuDecoration"/>
</service>
<implementation class="org.eclipse.tea.samples.menu.SampleMenuDecoration"/>
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.tea.samples.menu.SampleMenuDecoration">
<service>
<provide interface="org.eclipse.tea.core.services.TaskingMenuDecoration"/>
</service>
<implementation class="org.eclipse.tea.samples.menu.SampleMenuDecoration"/>
</scr:component>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.tea.samples.taskchain.AllSamplesTaskChain">
<service>
<provide interface="org.eclipse.tea.core.services.TaskChain"/>
</service>
<implementation class="org.eclipse.tea.samples.taskchain.AllSamplesTaskChain"/>
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.tea.samples.taskchain.AllSamplesTaskChain">
<service>
<provide interface="org.eclipse.tea.core.services.TaskChain"/>
</service>
<implementation class="org.eclipse.tea.samples.taskchain.AllSamplesTaskChain"/>
</scr:component>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.tea.samples.taskchain.SampleHiddenTaskChain">
<service>
<provide interface="org.eclipse.tea.core.services.TaskChain"/>
</service>
<implementation class="org.eclipse.tea.samples.taskchain.SampleHiddenTaskChain"/>
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.tea.samples.taskchain.SampleHiddenTaskChain">
<service>
<provide interface="org.eclipse.tea.core.services.TaskChain"/>
</service>
<implementation class="org.eclipse.tea.samples.taskchain.SampleHiddenTaskChain"/>
</scr:component>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.tea.samples.taskchain.SampleTaskChain">
<service>
<provide interface="org.eclipse.tea.core.services.TaskChain"/>
</service>
<implementation class="org.eclipse.tea.samples.taskchain.SampleTaskChain"/>
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.tea.samples.taskchain.SampleTaskChain">
<service>
<provide interface="org.eclipse.tea.core.services.TaskChain"/>
</service>
<implementation class="org.eclipse.tea.samples.taskchain.SampleTaskChain"/>
</scr:component>

0 comments on commit d020dce

Please sign in to comment.