Package: eclipse / 3.8.1-10

eclipse-help-tomcat.patch Patch series | download
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
From: Jakub Adam <jakub.adam@ktknet.cz>
Date: Fri, 23 Mar 2012 20:37:07 +0100
Subject: eclipse-help-tomcat

---
 .../eclipse-help-feature-adjust-dependencies.patch |   34 ++++++++++++-------
 1 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/patches/eclipse-help-feature-adjust-dependencies.patch b/patches/eclipse-help-feature-adjust-dependencies.patch
index 361f25a..ce8649e 100644
--- a/patches/eclipse-help-feature-adjust-dependencies.patch
+++ b/patches/eclipse-help-feature-adjust-dependencies.patch
@@ -1,7 +1,7 @@
-diff -r -Nu eclipse-3.8.0-M1-src/features/org.eclipse.help/feature.xml eclipse-3.8.0-M1-src.patched/features/org.eclipse.help/feature.xml
---- eclipse-3.8.0-M1-src/features/org.eclipse.help/feature.xml	2011-03-27 10:30:27.000000000 -0400
-+++ eclipse-3.8.0-M1-src.patched/features/org.eclipse.help/feature.xml	2011-08-23 14:01:19.026328809 -0400
-@@ -34,30 +34,37 @@
+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"/>
@@ -19,7 +19,7 @@ diff -r -Nu eclipse-3.8.0-M1-src/features/org.eclipse.help/feature.xml eclipse-3
 -   <plugin
 -         id="org.apache.commons.logging"
 +  <plugin
-+         id="org.apache.tomcat"
++         id="org.apache.tomcat.api"
           download-size="0"
           install-size="0"
           version="0.0.0"
@@ -28,6 +28,13 @@ diff -r -Nu eclipse-3.8.0-M1-src/features/org.eclipse.help/feature.xml eclipse-3
 -   <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"
@@ -47,7 +54,7 @@ diff -r -Nu eclipse-3.8.0-M1-src/features/org.eclipse.help/feature.xml eclipse-3
           download-size="0"
           install-size="0"
           version="0.0.0"
-@@ -182,5 +189,19 @@
+@@ -182,5 +196,19 @@
           install-size="0"
           version="0.0.0"
           unpack="false"/>
@@ -67,10 +74,10 @@ diff -r -Nu eclipse-3.8.0-M1-src/features/org.eclipse.help/feature.xml eclipse-3
 +         unpack="false"/> 
    
  </feature>
-diff -r -Nu eclipse-3.8.0-M1-src/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF eclipse-3.8.0-M1-src.patched/plugins/org.eclipse.help.base/META
---- eclipse-3.8.0-M1-src/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF    2011-06-21 11:41:09.000000000 -0400
-+++ eclipse-3.8.0-M1-src.patched/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF    2011-08-23 11:09:30.399033718 -0400
-@@ -39,7 +39,7 @@
+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
@@ -79,9 +86,10 @@ diff -r -Nu eclipse-3.8.0-M1-src/plugins/org.eclipse.help.base/META-INF/MANIFEST
   org.apache.lucene.analysis;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
   org.eclipse.ant.core;bundle-version="3.2.200";resolution:=optional,
   org.eclipse.core.runtime;bundle-version="3.6.0",
---- a/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java.old	2012-01-18 08:58:41.397436636 +0100
-+++ b/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java	2012-01-18 08:59:35.994625494 +0100
-@@ -106,7 +106,7 @@
+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$