Package: eclipse / 3.8.1-10

find-tomcat-libs.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
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
From: Jakub Adam <jakub.adam@ktknet.cz>
Date: Thu, 15 Mar 2012 21:02:03 +0100
Subject: find-tomcat-libs

---
 dependencies/dependencies.properties               |   15 ++++++------
 .../META-INF/MANIFEST.MF                           |   12 ++++++++++
 .../META-INF/MANIFEST.MF                           |   25 ++++++++++++++++++++
 patches/eclipse-equinox-jsp-jasper.patch           |    2 +-
 4 files changed, 46 insertions(+), 8 deletions(-)
 create mode 100644 dependencyManifests/org.apache.tomcat.api_7.0.21.jar/META-INF/MANIFEST.MF
 create mode 100644 dependencyManifests/org.apache.tomcat.util_7.0.26.jar/META-INF/MANIFEST.MF

diff --git a/dependencies/dependencies.properties b/dependencies/dependencies.properties
index 96a827f..b7f5ce0 100644
--- a/dependencies/dependencies.properties
+++ b/dependencies/dependencies.properties
@@ -6,12 +6,13 @@
 com.ibm.icu_4.4.2.v20110823.jar=/usr/share/java/icu4j-eclipse/plugins/com.ibm.icu_4.4.2.v20110823.jar:/usr/share/java/com.ibm.icu-4.4.jar:/usr/share/java/com.ibm.icu.jar:/usr/share/java/icu4j.jar
 
 com.jcraft.jsch_0.1.44.v201101211721.jar=/usr/share/java/jsch.jar
-javax.servlet_3.0.0.v201112011016.jar=/usr/share/java/tomcat/tomcat-servlet-3.0-api.jar
-javax.servlet.jsp_2.2.0.v201112011158.jar=/usr/share/java/tomcat/tomcat-jsp-2.2-api.jar
-javax.el_2.2.0.v201108011116.jar=/usr/share/java/tomcat/tomcat-el-2.2-api.jar
-org.apache.tomcat_7.0.21.jar=/usr/share/java/tomcat/tomcat-api.jar
-org.apache.juli_7.0.21.jar=/usr/share/java/tomcat/tomcat-juli.jar
-org.apache.el_7.0.21.jar=/usr/share/java/tomcat/jasper-el.jar
+javax.servlet_3.0.0.v201112011016.jar=/usr/share/java/servlet-api-3.1.jar
+javax.servlet.jsp_2.2.0.v201112011158.jar=/usr/share/java/jsp-api-2.3.jar
+javax.el_2.2.0.v201108011116.jar=/usr/share/java/el-api-3.0.jar
+org.apache.tomcat.api_7.0.21.jar=/usr/share/java/tomcat8-api.jar
+org.apache.tomcat.util_7.0.26.jar=/usr/share/java/tomcat8-util.jar
+org.apache.juli_7.0.21.jar=/usr/share/java/tomcat8-juli.jar
+org.apache.el_7.0.21.jar=/usr/share/java/tomcat8-jasper-el.jar
 org.apache.commons.codec_1.3.0.v201101211617.jar=/usr/share/java/commons-codec.jar
 org.apache.commons.el_1.0.0.v200806031608.jar=/usr/share/java/commons-el.jar
 org.apache.commons.httpclient_3.1.0.v201012070820.jar=/usr/share/java/commons-httpclient.jar
@@ -19,7 +20,7 @@ org.apache.commons.logging_1.0.4.v201101211617.jar=/usr/share/java/commons-loggi
 org.apache.felix.gogo.command_0.8.0.v201108120515.jar=/usr/share/java/org.apache.felix.gogo.command.jar
 org.apache.felix.gogo.runtime_0.8.0.v201108120515.jar=/usr/share/java/org.apache.felix.gogo.runtime.jar
 org.apache.felix.gogo.shell_0.8.0.v201110170705.jar=/usr/share/java/org.apache.felix.gogo.shell.jar
-org.apache.jasper_7.0.21.jar=/usr/share/java/tomcat/jasper.jar
+org.apache.jasper_7.0.21.jar=/usr/share/java/tomcat8-jasper.jar
 org.apache.lucene.core_2.9.1.v201101211721.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar
 org.apache.lucene.analysis_2.9.1.v201101211721.jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar:/usr/share/java/lucene-analyzers.jar
 org.eclipse.swt_3.7.1.jar=/usr/share/java/swt.jar
diff --git a/dependencyManifests/org.apache.tomcat.api_7.0.21.jar/META-INF/MANIFEST.MF b/dependencyManifests/org.apache.tomcat.api_7.0.21.jar/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..1ab56e1
--- /dev/null
+++ b/dependencyManifests/org.apache.tomcat.api_7.0.21.jar/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Export-Package: org.apache.tomcat;version="7.0.21"
+Bundle-Vendor: %bundleProvider
+Bundle-ClassPath: .
+Bundle-Version: 7.0.21
+Bundle-Name: %bundleName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.apache.tomcat.api
+Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J
+ 2SE-1.3
+
diff --git a/dependencyManifests/org.apache.tomcat.util_7.0.26.jar/META-INF/MANIFEST.MF b/dependencyManifests/org.apache.tomcat.util_7.0.26.jar/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..3adac60
--- /dev/null
+++ b/dependencyManifests/org.apache.tomcat.util_7.0.26.jar/META-INF/MANIFEST.MF
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Bundle-Vendor: Apache Software Foundation
+Bundle-Version: 7.0.26
+Specification-Title: Apache Tomcat
+Implementation-Title: Apache Tomcat
+Bundle-ManifestVersion: 2
+X-Compile-Source-JDK: 1.6
+Bundle-Name: Apache Tomcat Util
+Bundle-SymbolicName: org.apache.tomcat.util
+Created-By: 1.6.0_24-b24 (Sun Microsystems Inc.)
+X-Compile-Target-JDK: 1.6
+Ant-Version: Apache Ant 1.8.2
+Export-Package: org.apache.tomcat.util.file;version="7.0.26",org.apache.
+ tomcat.util.res;version="7.0.26",org.apache.tomcat.util.scan;version="7.
+ 0.26";uses:="javax.servlet,org.apache.tomcat"
+Implementation-Version: 7.0.26
+Implementation-Vendor: Apache Software Foundation
+Import-Package: javax.servlet;version="[2.6.0, 4.0.0)",org.apache.juli.l
+ ogging;version="[7.0.26, 7.0.26]",org.apache.tomcat;version="[7.0.26, 7.
+ 0.26]"
+Bundle-Localization: plugin
+Specification-Vendor: Apache Software Foundation
+Specification-Version: 7.0
+
+
diff --git a/patches/eclipse-equinox-jsp-jasper.patch b/patches/eclipse-equinox-jsp-jasper.patch
index ed0a96e..a9db712 100644
--- a/patches/eclipse-equinox-jsp-jasper.patch
+++ b/patches/eclipse-equinox-jsp-jasper.patch
@@ -228,7 +228,7 @@
 + javax.servlet.http;version="[2.4.0,3.0.0]",
 + javax.servlet.jsp;version="[2.0.0,2.3)",
 + org.apache.jasper.servlet;version="7.0.21",
-+ org.apache.tomcat;version="7.0.21",
++ org.apache.tomcat.api;version="7.0.21",
   org.osgi.framework;version="1.3.0",
   org.osgi.service.http;version="1.2.0",
   org.osgi.service.packageadmin;version="1.2.0",