View | Details | Raw Unified | Return to bug 52381
Collapse All | Expand All

(-)a/build.xml (-5 / +10 lines)
Lines 759-765 Link Here
759
    <!-- Tomcat-juli JAR File -->
759
    <!-- Tomcat-juli JAR File -->
760
    <jarIt jarfile="${tomcat-juli.jar}"
760
    <jarIt jarfile="${tomcat-juli.jar}"
761
      filesDir="${tomcat.classes}"
761
      filesDir="${tomcat.classes}"
762
      filesId="files.tomcat-juli" />
762
      filesId="files.tomcat-juli"
763
      manifest="${tomcat.manifests}/tomcat-juli.jar.manifest" />
763
764
764
    <!-- Catalina Main JAR File -->
765
    <!-- Catalina Main JAR File -->
765
    <jarIt jarfile="${catalina.jar}"
766
    <jarIt jarfile="${catalina.jar}"
Lines 789-795 Link Here
789
    <!-- Tomcat API JAR File -->
790
    <!-- Tomcat API JAR File -->
790
    <jarIt jarfile="${tomcat-api.jar}"
791
    <jarIt jarfile="${tomcat-api.jar}"
791
      filesDir="${tomcat.classes}"
792
      filesDir="${tomcat.classes}"
792
      filesId="files.tomcat-api" />
793
      filesId="files.tomcat-api"
794
      manifest="${tomcat.manifests}/tomcat-api.jar.manifest" />
793
795
794
    <!-- Tomcat Util JAR File -->
796
    <!-- Tomcat Util JAR File -->
795
    <jarIt jarfile="${tomcat-util.jar}"
797
    <jarIt jarfile="${tomcat-util.jar}"
Lines 814-825 Link Here
814
    <jarIt jarfile="${jasper.jar}"
816
    <jarIt jarfile="${jasper.jar}"
815
      filesDir="${tomcat.classes}"
817
      filesDir="${tomcat.classes}"
816
      filesId="files.jasper"
818
      filesId="files.jasper"
817
      meta-inf="${tomcat.manifests}/jasper.jar"/>
819
      meta-inf="${tomcat.manifests}/jasper.jar"
820
      manifest="${tomcat.manifests}/jasper.jar.manifest" />
818
821
819
    <!-- Jasper EL Implementation JAR File -->
822
    <!-- Jasper EL Implementation JAR File -->
820
    <jarIt jarfile="${jasper-el.jar}"
823
    <jarIt jarfile="${jasper-el.jar}"
821
      filesDir="${tomcat.classes}"
824
      filesDir="${tomcat.classes}"
822
      filesId="files.jasper-el" />
825
      filesId="files.jasper-el"
826
      manifest="${tomcat.manifests}/jasper-el.jar.manifest" />
823
827
824
    <!-- Re-packaged Apache Commons DBCP-->
828
    <!-- Re-packaged Apache Commons DBCP-->
825
    <jarIt jarfile="${tomcat-dbcp.jar}"
829
    <jarIt jarfile="${tomcat-dbcp.jar}"
Lines 1235-1241 Link Here
1235
    <jarIt jarfile="${tomcat-embed-jasper.jar}"
1239
    <jarIt jarfile="${tomcat-embed-jasper.jar}"
1236
           filesDir="${tomcat.classes}"
1240
           filesDir="${tomcat.classes}"
1237
           filesId="files.tomcat-embed-jasper"
1241
           filesId="files.tomcat-embed-jasper"
1238
           meta-inf="${tomcat.manifests}/jasper.jar"/>
1242
           meta-inf="${tomcat.manifests}/jasper.jar"
1243
           manifest="${tomcat.manifests}/jasper.jar.manifest"/>
1239
    <jarIt jarfile="${tomcat-embed-el.jar}"
1244
    <jarIt jarfile="${tomcat-embed-el.jar}"
1240
           filesDir="${tomcat.classes}"
1245
           filesDir="${tomcat.classes}"
1241
           filesId="files.tomcat-embed-el"/>
1246
           filesId="files.tomcat-embed-el"/>
(-)a/res/META-INF/el-api.jar.manifest (+14 lines)
Lines 9-11 Specification-Vendor: Sun Microsystems, Inc. Link Here
9
Implementation-Title: javax.el
9
Implementation-Title: javax.el
10
Implementation-Version: 3.0.@el.revision@
10
Implementation-Version: 3.0.@el.revision@
11
Implementation-Vendor: Apache Software Foundation
11
Implementation-Vendor: Apache Software Foundation
12
13
Name: OSGi
14
Export-Package: javax.el;version="3.0"
15
Bundle-Vendor: %bundleProvider
16
Bundle-ClassPath: .
17
Bundle-Version: 3.0
18
Bundle-Name: %bundleName
19
Bundle-Localization: plugin
20
Bundle-ManifestVersion: 2
21
Bundle-SymbolicName: javax.el
22
DynamicImport-Package: org.apache.el
23
Bundle-RequiredExecutionEnvironment: J2SE-1.4,
24
 CDC-1.0/Foundation-1.0,
25
 J2SE-1.3
(-)a/res/META-INF/jasper-el.jar.manifest (+23 lines)
Line 0 Link Here
1
Manifest-Version: 1.0
2
Specification-Title: Apache Tomcat
3
Specification-Version: @VERSION_MAJOR_MINOR@
4
Specification-Vendor: Apache Software Foundation
5
Implementation-Title: Apache Tomcat
6
Implementation-Version: @VERSION@
7
Implementation-Vendor: Apache Software Foundation
8
X-Compile-Source-JDK: @source.jdk@
9
X-Compile-Target-JDK: @target.jdk@
10
11
Name: OSGi
12
Export-Package: org.apache.el;version="@VERSION@"
13
Bundle-Vendor: %bundleProvider
14
Bundle-ClassPath: .
15
Bundle-Version: @VERSION@
16
Bundle-Name: %bundleName
17
Bundle-Localization: plugin
18
Bundle-ManifestVersion: 2
19
Import-Package: javax.el;version="3.0"
20
Bundle-SymbolicName: org.apache.el
21
Bundle-RequiredExecutionEnvironment: J2SE-1.4,
22
 CDC-1.0/Foundation-1.0,
23
 J2SE-1.3
(-)a/res/META-INF/jasper.jar.manifest (+66 lines)
Line 0 Link Here
1
Manifest-Version: 1.0
2
Specification-Title: Apache Tomcat
3
Specification-Version: @VERSION_MAJOR_MINOR@
4
Specification-Vendor: Apache Software Foundation
5
Implementation-Title: Apache Tomcat
6
Implementation-Version: @VERSION@
7
Implementation-Vendor: Apache Software Foundation
8
X-Compile-Source-JDK: @source.jdk@
9
X-Compile-Target-JDK: @target.jdk@
10
11
Name: OSGi
12
Export-Package: org.apache.jasper;version="@VERSION@",
13
 org.apache.jasper.compiler;version="@VERSION@",
14
 org.apache.jasper.compiler.tagplugin;version="@VERSION@",
15
 org.apache.jasper.resources;version="@VERSION@",
16
 org.apache.jasper.runtime;version="@VERSION@",
17
 org.apache.jasper.security;version="@VERSION@",
18
 org.apache.jasper.servlet;version="@VERSION@",
19
 org.apache.jasper.tagplugins.jstl;version="@VERSION@",
20
 org.apache.jasper.tagplugins.jstl.core;version="@VERSION@",
21
 org.apache.jasper.util;version="@VERSION@",
22
 org.apache.jasper.xmlparser;version="@VERSION@"
23
Bundle-Vendor: %bundleProvider
24
Bundle-ClassPath: .
25
Bundle-Version: @VERSION@
26
Bundle-Localization: plugin
27
Bundle-Name: %bundleName
28
Bundle-ManifestVersion: 2
29
Bundle-SymbolicName: org.apache.jasper
30
Import-Package: javax.servlet;version="[2.4.0, 3.0.0]",
31
 javax.servlet.http;version="[2.4.0, 3.0.0]",
32
 javax.servlet.jsp;version="[2.0.0, 2.2.0]",
33
 javax.servlet.jsp.el;version="[2.0.0, 2.2.0]",
34
 javax.servlet.jsp.resources;version="[2.0.0, 2.2.0]",
35
 javax.servlet.jsp.tagext;version="[2.0.0, 2.2.0]",
36
 javax.servlet.resources;version="[2.4.0, 3.0.0]",
37
 javax.xml.parsers,
38
 org.apache.commons.el;version="[1.0.0,2.0.0)",
39
 org.apache.commons.logging;version="[1.0.0,2.0.0)",
40
 org.apache.tools.ant;resolution:=optional,
41
 org.apache.tools.ant.taskdefs;resolution:=optional,
42
 org.apache.tools.ant.types;resolution:=optional,
43
 org.apache.tools.ant.util;resolution:=optional,
44
 org.w3c.dom,
45
 org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers,
46
 org.apache.tomcat;version="@VERSION@",
47
 org.apache.juli.logging;version="@VERSION@",
48
 javax.el;version="3.0",
49
 org.eclipse.jdt.internal.compiler,
50
 org.eclipse.jdt.internal.compiler.parser,
51
 org.eclipse.jdt.internal.compiler.parser.diagnose,
52
 org.eclipse.jdt.internal.compiler.flow,
53
 org.eclipse.jdt.internal.compiler.util,
54
 org.eclipse.jdt.internal.compiler.impl,
55
 org.eclipse.jdt.internal.compiler.lookup,
56
 org.eclipse.jdt.internal.compiler.codegen,
57
 org.eclipse.jdt.internal.compiler.batch,
58
 org.eclipse.jdt.internal.compiler.classfmt,
59
 org.eclipse.jdt.internal.compiler.ast,
60
 org.eclipse.jdt.internal.compiler.problem,
61
 org.eclipse.jdt.internal.compiler.env,
62
 org.eclipse.jdt.internal.core.util,
63
 org.eclipse.jdt.core.compiler
64
Bundle-RequiredExecutionEnvironment: J2SE-1.4,
65
 CDC-1.0/Foundation-1.0,
66
 J2SE-1.3
(-)a/res/META-INF/jsp-api.jar.manifest (+17 lines)
Lines 9-11 Specification-Vendor: Sun Microsystems, Inc. Link Here
9
Implementation-Title: javax.servlet.jsp
9
Implementation-Title: javax.servlet.jsp
10
Implementation-Version: 2.3.@jsp.revision@
10
Implementation-Version: 2.3.@jsp.revision@
11
Implementation-Vendor: Apache Software Foundation
11
Implementation-Vendor: Apache Software Foundation
12
13
Name: OSGi
14
Bundle-Vendor: %bundleProvider
15
Bundle-Localization: plugin
16
Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
17
Bundle-Name: %bundleName
18
Bundle-SymbolicName: javax.servlet.jsp
19
Export-Package: javax.servlet.jsp; version=2.3,
20
 javax.servlet.jsp.el; version=2.3,
21
 javax.servlet.jsp.resources; version=2.3,
22
 javax.servlet.jsp.tagext; version=2.3
23
Bundle-Version: 2.3
24
Bundle-ManifestVersion: 2
25
Import-Package: javax.servlet; version=3.1,
26
 javax.servlet.http; version=3.1,
27
 javax.servlet.resources; version=3.1,
28
 javax.el;version="3.0"
(-)a/res/META-INF/servlet-api.jar.manifest (+14 lines)
Lines 9-11 Specification-Vendor: Sun Microsystems, Inc. Link Here
9
Implementation-Title: javax.servlet
9
Implementation-Title: javax.servlet
10
Implementation-Version: 3.1.@servlet.revision@
10
Implementation-Version: 3.1.@servlet.revision@
11
Implementation-Vendor: Apache Software Foundation
11
Implementation-Vendor: Apache Software Foundation
12
13
Name: OSGi
14
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,J2SE-1.4
15
Bundle-SymbolicName: javax.servlet
16
Bundle-ManifestVersion: 2
17
Bundle-Name: %bundleName
18
Bundle-Localization: plugin
19
Bundle-Version: 3.1
20
Bundle-Vendor: %bundleProvider
21
Export-Package: javax.servlet;version="3.1",
22
 javax.servlet.http;version="3.1",
23
 javax.servlet.annotation;version="3.1",
24
 javax.servlet.descriptor;version="3.1",
25
 javax.servlet.resources;version="3.1",
(-)a/res/META-INF/tomcat-api.jar.manifest (+20 lines)
Line 0 Link Here
1
Manifest-Version: 1.0
2
Specification-Title: Apache Tomcat
3
Specification-Version: @VERSION_MAJOR_MINOR@
4
Specification-Vendor: Apache Software Foundation
5
Implementation-Title: Apache Tomcat
6
Implementation-Version: @VERSION@
7
Implementation-Vendor: Apache Software Foundation
8
X-Compile-Source-JDK: @source.jdk@
9
X-Compile-Target-JDK: @target.jdk@
10
11
Name: OSGi
12
Export-Package: org.apache.tomcat;version=""@VERSION@
13
Bundle-Vendor: %bundleProvider
14
Bundle-ClassPath: .
15
Bundle-Version: @VERSION@
16
Bundle-Name: %bundleName
17
Bundle-Localization: plugin
18
Bundle-ManifestVersion: 2
19
Bundle-SymbolicName: org.apache.tomcat
20
Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3
(-)a/res/META-INF/tomcat-juli.jar.manifest (+20 lines)
Line 0 Link Here
1
Manifest-Version: 1.0
2
Specification-Title: Apache Tomcat
3
Specification-Version: @VERSION_MAJOR_MINOR@
4
Specification-Vendor: Apache Software Foundation
5
Implementation-Title: Apache Tomcat
6
Implementation-Version: @VERSION@
7
Implementation-Vendor: Apache Software Foundation
8
X-Compile-Source-JDK: @source.jdk@
9
X-Compile-Target-JDK: @target.jdk@
10
11
Name: OSGi
12
Export-Package: org.apache.juli;version="@VERSION@",org.apache.juli.logging;version="@VERSION@"
13
Bundle-Vendor: %bundleProvider
14
Bundle-ClassPath: .
15
Bundle-Version: @VERSION@
16
Bundle-Name: %bundleName
17
Bundle-Localization: plugin
18
Bundle-ManifestVersion: 2
19
Bundle-SymbolicName: org.apache.juli
20
Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3

Return to bug 52381