File: eclipse-help-feature-adjust-dependencies.patch

package info (click to toggle)
eclipse 3.8.1-10
  • links: PTS, VCS
  • area: main
  • in suites: stretch
  • size: 338,840 kB
  • ctags: 472,808
  • sloc: java: 2,762,042; ansic: 136,783; xml: 105,676; cpp: 35,759; jsp: 4,420; sh: 3,288; perl: 1,687; makefile: 232; python: 67; php: 24
file content (93 lines) | stat: -rw-r--r-- 3,187 bytes parent folder | download | duplicates (3)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
diff --git a/features/org.eclipse.help/feature.xml b/features/org.eclipse.help/feature.xml
--- a/features/org.eclipse.help/feature.xml
+++ b/features/org.eclipse.help/feature.xml
@@ -34,30 +34,44 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-  
-   <plugin
-         id="com.sun.el"
+
+  <plugin
+         id="javax.el"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.apache.commons.logging"
+  <plugin
+         id="org.apache.tomcat.api"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.apache.jasper.glassfish"
+  <plugin
+         id="org.apache.tomcat.util"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+  <plugin
+         id="org.apache.juli"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+  <plugin
+         id="org.apache.el"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.apache.lucene"
+         id="org.apache.commons.logging"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -182,5 +196,12 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+
+ <plugin
+         id="org.apache.jasper"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/> 
   
 </feature>
diff --git a/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF b/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF
--- a/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF
@@ -39,7 +39,7 @@ Export-Package: org.apache.lucene.demo.html;x-internal:=true,
  org.eclipse.help.search,
  org.eclipse.help.server,
  org.eclipse.help.standalone
-Require-Bundle: org.apache.lucene;bundle-version="2.9.0";visibility:=reexport,
+Require-Bundle: org.apache.lucene.core;bundle-version="2.9.0";visibility:=reexport,
  org.apache.lucene.analysis;bundle-version="2.9.0";visibility:=reexport,
  org.eclipse.ant.core;bundle-version="3.2.200";resolution:=optional,
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/eclipse/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java b/eclipse/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
--- a/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
+++ b/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
@@ -106,7 +106,7 @@ public class SearchIndex implements ISearchIndex, IHelpSearchIndex {
 
 	public static final String DEPENDENCIES_KEY_ANALYZER = "analyzer"; //$NON-NLS-1$
 
-	private static final String LUCENE_BUNDLE_ID = "org.apache.lucene"; //$NON-NLS-1$
+	private static final String LUCENE_BUNDLE_ID = "org.apache.lucene.core"; //$NON-NLS-1$
 
 	private static final String FIELD_NAME = "name"; //$NON-NLS-1$