Skip to content

Commit 6cc5d37

Browse files
Rob Strykermickaelistria
authored andcommitted
Split org.eclipse.search into core and ui bundles
Move parts that don't require UI into a `search.core` bundle. Legacy `.search` bundle now contains the bits that require UI. The `.search.core` plugin is now reusable in deployment which do not include UI bundles. Existing extension-points are preserved, without changing id/namespace. Introduce and Use an OSGi (declarative) service to pass the strategy to handle editor-specific dirty document from UI (.search) to Core (.search.core) Signed-off-by: Rob Stryker <[email protected]>
1 parent 35a5e7b commit 6cc5d37

37 files changed

+1213
-123
lines changed
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
4+
<attributes>
5+
<attribute name="module" value="true"/>
6+
</attributes>
7+
</classpathentry>
8+
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
9+
<classpathentry kind="src" path="search"/>
10+
<classpathentry kind="output" path="bin"/>
11+
</classpath>
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>org.eclipse.search.core</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.pde.ManifestBuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
<buildCommand>
19+
<name>org.eclipse.pde.SchemaBuilder</name>
20+
<arguments>
21+
</arguments>
22+
</buildCommand>
23+
<buildCommand>
24+
<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
25+
<arguments>
26+
</arguments>
27+
</buildCommand>
28+
</buildSpec>
29+
<natures>
30+
<nature>org.eclipse.jdt.core.javanature</nature>
31+
<nature>org.eclipse.pde.PluginNature</nature>
32+
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
33+
</natures>
34+
</projectDescription>
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
encoding/<project>=UTF-8
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
line.separator=\n

bundles/org.eclipse.search.core/.settings/org.eclipse.jdt.core.prefs

Lines changed: 463 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
eclipse.preferences.version=1
2+
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
3+
formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
4+
formatter_settings_version=12
5+
org.eclipse.jdt.ui.exception.name=e
6+
org.eclipse.jdt.ui.gettersetter.use.is=true
7+
org.eclipse.jdt.ui.ignorelowercasenames=true
8+
org.eclipse.jdt.ui.importorder=java;javax;sun;com;org;org.apache;org.w3c;org.eclipse;org.eclipse.swt;org.eclipse.core;org.eclipse.core.runtime;org.eclipse.core.resources;org.eclipse.core.filebuffers;org.eclipse.text;org.eclipse.jface;org.eclipse.jface.text;org.eclipse.ui;org.eclipse.ui.workbench.texteditor;org.eclipse.ui.texteditor;org.eclipse.ui.editors;org.eclipse.compare;org.eclipse.debug;org.eclipse.debug.ui;org.eclipse.search;org.eclipse.search2;org.eclipse.ltk;org.eclipse.jdt.core;org.eclipse.jdt.internal;org.eclipse.jdt.launching;org.eclipse.jdt.ui;org.eclipse.jdt.internal.ui;
9+
org.eclipse.jdt.ui.keywordthis=false
10+
org.eclipse.jdt.ui.ondemandthreshold=99
11+
org.eclipse.jdt.ui.overrideannotation=true
12+
org.eclipse.jdt.ui.staticondemandthreshold=99
13+
sp_cleanup.add_default_serial_version_id=false
14+
sp_cleanup.add_generated_serial_version_id=false
15+
sp_cleanup.add_missing_annotations=false
16+
sp_cleanup.add_missing_deprecated_annotations=true
17+
sp_cleanup.add_missing_methods=false
18+
sp_cleanup.add_missing_nls_tags=false
19+
sp_cleanup.add_missing_override_annotations=true
20+
sp_cleanup.add_missing_override_annotations_interface_methods=true
21+
sp_cleanup.add_serial_version_id=false
22+
sp_cleanup.always_use_blocks=true
23+
sp_cleanup.always_use_parentheses_in_expressions=false
24+
sp_cleanup.always_use_this_for_non_static_field_access=false
25+
sp_cleanup.always_use_this_for_non_static_method_access=false
26+
sp_cleanup.convert_functional_interfaces=false
27+
sp_cleanup.convert_to_enhanced_for_loop=false
28+
sp_cleanup.correct_indentation=false
29+
sp_cleanup.format_source_code=true
30+
sp_cleanup.format_source_code_changes_only=true
31+
sp_cleanup.insert_inferred_type_arguments=false
32+
sp_cleanup.make_local_variable_final=false
33+
sp_cleanup.make_parameters_final=false
34+
sp_cleanup.make_private_fields_final=false
35+
sp_cleanup.make_type_abstract_if_missing_method=false
36+
sp_cleanup.make_variable_declarations_final=false
37+
sp_cleanup.never_use_blocks=false
38+
sp_cleanup.never_use_parentheses_in_expressions=false
39+
sp_cleanup.on_save_use_additional_actions=true
40+
sp_cleanup.organize_imports=true
41+
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
42+
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=false
43+
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=false
44+
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
45+
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
46+
sp_cleanup.remove_private_constructors=false
47+
sp_cleanup.remove_redundant_type_arguments=false
48+
sp_cleanup.remove_trailing_whitespaces=true
49+
sp_cleanup.remove_trailing_whitespaces_all=false
50+
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
51+
sp_cleanup.remove_unnecessary_casts=false
52+
sp_cleanup.remove_unnecessary_nls_tags=false
53+
sp_cleanup.remove_unused_imports=false
54+
sp_cleanup.remove_unused_local_variables=false
55+
sp_cleanup.remove_unused_private_fields=false
56+
sp_cleanup.remove_unused_private_members=false
57+
sp_cleanup.remove_unused_private_methods=false
58+
sp_cleanup.remove_unused_private_types=false
59+
sp_cleanup.sort_members=false
60+
sp_cleanup.sort_members_all=false
61+
sp_cleanup.use_anonymous_class_creation=false
62+
sp_cleanup.use_blocks=false
63+
sp_cleanup.use_blocks_only_for_return_and_throw=false
64+
sp_cleanup.use_lambda=false
65+
sp_cleanup.use_parentheses_in_expressions=false
66+
sp_cleanup.use_this_for_non_static_field_access=false
67+
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
68+
sp_cleanup.use_this_for_non_static_method_access=false
69+
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=false
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
compilers.f.unresolved-features=1
2+
compilers.f.unresolved-plugins=1
3+
compilers.incompatible-environment=0
4+
compilers.p.build=1
5+
compilers.p.build.bin.includes=1
6+
compilers.p.build.encodings=2
7+
compilers.p.build.java.compiler=2
8+
compilers.p.build.java.compliance=1
9+
compilers.p.build.missing.output=2
10+
compilers.p.build.output.library=1
11+
compilers.p.build.source.library=1
12+
compilers.p.build.src.includes=1
13+
compilers.p.deprecated=1
14+
compilers.p.discouraged-class=1
15+
compilers.p.internal=1
16+
compilers.p.missing-packages=0
17+
compilers.p.missing-version-export-package=2
18+
compilers.p.missing-version-import-package=2
19+
compilers.p.missing-version-require-bundle=1
20+
compilers.p.no-required-att=0
21+
compilers.p.not-externalized-att=1
22+
compilers.p.unknown-attribute=0
23+
compilers.p.unknown-class=0
24+
compilers.p.unknown-element=0
25+
compilers.p.unknown-identifier=0
26+
compilers.p.unknown-resource=0
27+
compilers.p.unresolved-ex-points=0
28+
compilers.p.unresolved-import=0
29+
compilers.s.create-docs=false
30+
compilers.s.doc-folder=doc
31+
compilers.s.open-tags=1
32+
compilers.use-project=true
33+
eclipse.preferences.version=1
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
Manifest-Version: 1.0
2+
Bundle-ManifestVersion: 2
3+
Bundle-Name: %pluginName
4+
Bundle-SymbolicName: org.eclipse.search.core; singleton:=true
5+
Bundle-Version: 3.16.0.qualifier
6+
Bundle-Activator: org.eclipse.search.internal.core.SearchCorePlugin
7+
Bundle-ActivationPolicy: lazy
8+
Bundle-Vendor: %providerName
9+
Bundle-Localization: plugin
10+
Export-Package: org.eclipse.search.core.text,
11+
org.eclipse.search.internal.core;x-friends:="org.eclipse.search,org.eclipse.search.tests",
12+
org.eclipse.search.internal.core.text;x-friends:="org.eclipse.search,org.eclipse.search.tests"
13+
Require-Bundle:
14+
org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
15+
org.eclipse.core.resources;bundle-version="[3.14.0,4.0.0)",
16+
org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)",
17+
org.eclipse.core.filebuffers;bundle-version="[3.5.0,4.0.0)",
18+
org.eclipse.ltk.core.refactoring;bundle-version="[3.5.0,4.0.0)",
19+
org.eclipse.text;bundle-version="3.13.100"
20+
Bundle-RequiredExecutionEnvironment: JavaSE-17
21+
Automatic-Module-Name: org.eclipse.search.core
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
2+
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3+
<html xmlns="http://www.w3.org/1999/xhtml">
4+
<head>
5+
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
6+
<title>About</title>
7+
</head>
8+
<body lang="EN-US">
9+
<h2>About This Content</h2>
10+
11+
<p>November 30, 2017</p>
12+
<h3>License</h3>
13+
14+
<p>
15+
The Eclipse Foundation makes available all content in this plug-in
16+
(&quot;Content&quot;). Unless otherwise indicated below, the Content
17+
is provided to you under the terms and conditions of the Eclipse
18+
Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
19+
available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
20+
For purposes of the EPL, &quot;Program&quot; will mean the Content.
21+
</p>
22+
23+
<p>
24+
If you did not receive this Content directly from the Eclipse
25+
Foundation, the Content is being redistributed by another party
26+
(&quot;Redistributor&quot;) and different terms and conditions may
27+
apply to your use of any object code in the Content. Check the
28+
Redistributor's license that was provided with the Content. If no such
29+
license exists, contact the Redistributor. Unless otherwise indicated
30+
below, the terms and conditions of the EPL still apply to any source
31+
code in the Content and such source code may be obtained at <a
32+
href="http://www.eclipse.org/">http://www.eclipse.org</a>.
33+
</p>
34+
35+
</body>
36+
</html>
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
###############################################################################
2+
# Copyright (c) 2000, 2005 IBM Corporation and others.
3+
#
4+
# This program and the accompanying materials
5+
# are made available under the terms of the Eclipse Public License 2.0
6+
# which accompanies this distribution, and is available at
7+
# https://www.eclipse.org/legal/epl-2.0/
8+
#
9+
# SPDX-License-Identifier: EPL-2.0
10+
#
11+
# Contributors:
12+
# IBM Corporation - initial API and implementation
13+
###############################################################################
14+
bin.includes = plugin.xml,\
15+
about.html,\
16+
plugin.properties,\
17+
.,\
18+
META-INF/
19+
src.includes = about.html,\
20+
schema/
21+
source.. = search/

0 commit comments

Comments
 (0)