[patch] Attempt to add OSGi metadata

asfbz-52381.patch (text/plain), 9.98 KB, created by Coty Sutherland on 2017-12-20 21:59:05 UTC

(hide)

Description: Attempt to add OSGi metadata

Filename:

MIME Type:

Creator: Coty Sutherland

Created: 2017-12-20 21:59:05 UTC

Size: 9.98 KB

patch

obsolete

>diff --git a/build.xml b/build.xml >index fd777e8f5..ee82e4f59 100644 >--- a/build.xml >+++ b/build.xml >@@ -759,7 +759,8 @@ > <!-- Tomcat-juli JAR File --> > <jarIt jarfile="${tomcat-juli.jar}" > filesDir="${tomcat.classes}" >- filesId="files.tomcat-juli" /> >+ filesId="files.tomcat-juli" >+ manifest="${tomcat.manifests}/tomcat-juli.jar.manifest" /> > > <!-- Catalina Main JAR File --> > <jarIt jarfile="${catalina.jar}" >@@ -789,7 +790,8 @@ > <!-- Tomcat API JAR File --> > <jarIt jarfile="${tomcat-api.jar}" > filesDir="${tomcat.classes}" >- filesId="files.tomcat-api" /> >+ filesId="files.tomcat-api" >+ manifest="${tomcat.manifests}/tomcat-api.jar.manifest" /> > > <!-- Tomcat Util JAR File --> > <jarIt jarfile="${tomcat-util.jar}" >@@ -814,12 +816,14 @@ > <jarIt jarfile="${jasper.jar}" > filesDir="${tomcat.classes}" > filesId="files.jasper" >- meta-inf="${tomcat.manifests}/jasper.jar"/> >+ meta-inf="${tomcat.manifests}/jasper.jar" >+ manifest="${tomcat.manifests}/jasper.jar.manifest" /> > > <!-- Jasper EL Implementation JAR File --> > <jarIt jarfile="${jasper-el.jar}" > filesDir="${tomcat.classes}" >- filesId="files.jasper-el" /> >+ filesId="files.jasper-el" >+ manifest="${tomcat.manifests}/jasper-el.jar.manifest" /> > > <!-- Re-packaged Apache Commons DBCP--> > <jarIt jarfile="${tomcat-dbcp.jar}" >@@ -1235,7 +1239,8 @@ > <jarIt jarfile="${tomcat-embed-jasper.jar}" > filesDir="${tomcat.classes}" > filesId="files.tomcat-embed-jasper" >- meta-inf="${tomcat.manifests}/jasper.jar"/> >+ meta-inf="${tomcat.manifests}/jasper.jar" >+ manifest="${tomcat.manifests}/jasper.jar.manifest"/> > <jarIt jarfile="${tomcat-embed-el.jar}" > filesDir="${tomcat.classes}" > filesId="files.tomcat-embed-el"/> >diff --git a/res/META-INF/el-api.jar.manifest b/res/META-INF/el-api.jar.manifest >index 4ff0991c1..658a3b787 100644 >--- a/res/META-INF/el-api.jar.manifest >+++ b/res/META-INF/el-api.jar.manifest >@@ -9,3 +9,17 @@ Specification-Vendor: Sun Microsystems, Inc. > Implementation-Title: javax.el > Implementation-Version: 3.0.@el.revision@ > Implementation-Vendor: Apache Software Foundation >+ >+Name: OSGi >+Export-Package: javax.el;version="3.0" >+Bundle-Vendor: %bundleProvider >+Bundle-ClassPath: . >+Bundle-Version: 3.0 >+Bundle-Name: %bundleName >+Bundle-Localization: plugin >+Bundle-ManifestVersion: 2 >+Bundle-SymbolicName: javax.el >+DynamicImport-Package: org.apache.el >+Bundle-RequiredExecutionEnvironment: J2SE-1.4, >+ CDC-1.0/Foundation-1.0, >+ J2SE-1.3 >diff --git a/res/META-INF/jasper-el.jar.manifest b/res/META-INF/jasper-el.jar.manifest >new file mode 100644 >index 000000000..9742235b5 >--- /dev/null >+++ b/res/META-INF/jasper-el.jar.manifest >@@ -0,0 +1,23 @@ >+Manifest-Version: 1.0 >+Specification-Title: Apache Tomcat >+Specification-Version: @VERSION_MAJOR_MINOR@ >+Specification-Vendor: Apache Software Foundation >+Implementation-Title: Apache Tomcat >+Implementation-Version: @VERSION@ >+Implementation-Vendor: Apache Software Foundation >+X-Compile-Source-JDK: @source.jdk@ >+X-Compile-Target-JDK: @target.jdk@ >+ >+Name: OSGi >+Export-Package: org.apache.el;version="@VERSION@" >+Bundle-Vendor: %bundleProvider >+Bundle-ClassPath: . >+Bundle-Version: @VERSION@ >+Bundle-Name: %bundleName >+Bundle-Localization: plugin >+Bundle-ManifestVersion: 2 >+Import-Package: javax.el;version="3.0" >+Bundle-SymbolicName: org.apache.el >+Bundle-RequiredExecutionEnvironment: J2SE-1.4, >+ CDC-1.0/Foundation-1.0, >+ J2SE-1.3 >diff --git a/res/META-INF/jasper.jar.manifest b/res/META-INF/jasper.jar.manifest >new file mode 100644 >index 000000000..8f3977175 >--- /dev/null >+++ b/res/META-INF/jasper.jar.manifest >@@ -0,0 +1,66 @@ >+Manifest-Version: 1.0 >+Specification-Title: Apache Tomcat >+Specification-Version: @VERSION_MAJOR_MINOR@ >+Specification-Vendor: Apache Software Foundation >+Implementation-Title: Apache Tomcat >+Implementation-Version: @VERSION@ >+Implementation-Vendor: Apache Software Foundation >+X-Compile-Source-JDK: @source.jdk@ >+X-Compile-Target-JDK: @target.jdk@ >+ >+Name: OSGi >+Export-Package: org.apache.jasper;version="@VERSION@", >+ org.apache.jasper.compiler;version="@VERSION@", >+ org.apache.jasper.compiler.tagplugin;version="@VERSION@", >+ org.apache.jasper.resources;version="@VERSION@", >+ org.apache.jasper.runtime;version="@VERSION@", >+ org.apache.jasper.security;version="@VERSION@", >+ org.apache.jasper.servlet;version="@VERSION@", >+ org.apache.jasper.tagplugins.jstl;version="@VERSION@", >+ org.apache.jasper.tagplugins.jstl.core;version="@VERSION@", >+ org.apache.jasper.util;version="@VERSION@", >+ org.apache.jasper.xmlparser;version="@VERSION@" >+Bundle-Vendor: %bundleProvider >+Bundle-ClassPath: . >+Bundle-Version: @VERSION@ >+Bundle-Localization: plugin >+Bundle-Name: %bundleName >+Bundle-ManifestVersion: 2 >+Bundle-SymbolicName: org.apache.jasper >+Import-Package: javax.servlet;version="[2.4.0, 3.0.0]", >+ javax.servlet.http;version="[2.4.0, 3.0.0]", >+ javax.servlet.jsp;version="[2.0.0, 2.2.0]", >+ javax.servlet.jsp.el;version="[2.0.0, 2.2.0]", >+ javax.servlet.jsp.resources;version="[2.0.0, 2.2.0]", >+ javax.servlet.jsp.tagext;version="[2.0.0, 2.2.0]", >+ javax.servlet.resources;version="[2.4.0, 3.0.0]", >+ javax.xml.parsers, >+ org.apache.commons.el;version="[1.0.0,2.0.0)", >+ org.apache.commons.logging;version="[1.0.0,2.0.0)", >+ org.apache.tools.ant;resolution:=optional, >+ org.apache.tools.ant.taskdefs;resolution:=optional, >+ org.apache.tools.ant.types;resolution:=optional, >+ org.apache.tools.ant.util;resolution:=optional, >+ org.w3c.dom, >+ org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers, >+ org.apache.tomcat;version="@VERSION@", >+ org.apache.juli.logging;version="@VERSION@", >+ javax.el;version="3.0", >+ org.eclipse.jdt.internal.compiler, >+ org.eclipse.jdt.internal.compiler.parser, >+ org.eclipse.jdt.internal.compiler.parser.diagnose, >+ org.eclipse.jdt.internal.compiler.flow, >+ org.eclipse.jdt.internal.compiler.util, >+ org.eclipse.jdt.internal.compiler.impl, >+ org.eclipse.jdt.internal.compiler.lookup, >+ org.eclipse.jdt.internal.compiler.codegen, >+ org.eclipse.jdt.internal.compiler.batch, >+ org.eclipse.jdt.internal.compiler.classfmt, >+ org.eclipse.jdt.internal.compiler.ast, >+ org.eclipse.jdt.internal.compiler.problem, >+ org.eclipse.jdt.internal.compiler.env, >+ org.eclipse.jdt.internal.core.util, >+ org.eclipse.jdt.core.compiler >+Bundle-RequiredExecutionEnvironment: J2SE-1.4, >+ CDC-1.0/Foundation-1.0, >+ J2SE-1.3 >diff --git a/res/META-INF/jsp-api.jar.manifest b/res/META-INF/jsp-api.jar.manifest >index 9ffe69ee3..5ee4bb638 100644 >--- a/res/META-INF/jsp-api.jar.manifest >+++ b/res/META-INF/jsp-api.jar.manifest >@@ -9,3 +9,20 @@ Specification-Vendor: Sun Microsystems, Inc. > Implementation-Title: javax.servlet.jsp > Implementation-Version: 2.3.@jsp.revision@ > Implementation-Vendor: Apache Software Foundation >+ >+Name: OSGi >+Bundle-Vendor: %bundleProvider >+Bundle-Localization: plugin >+Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3 >+Bundle-Name: %bundleName >+Bundle-SymbolicName: javax.servlet.jsp >+Export-Package: javax.servlet.jsp; version=2.3, >+ javax.servlet.jsp.el; version=2.3, >+ javax.servlet.jsp.resources; version=2.3, >+ javax.servlet.jsp.tagext; version=2.3 >+Bundle-Version: 2.3 >+Bundle-ManifestVersion: 2 >+Import-Package: javax.servlet; version=3.1, >+ javax.servlet.http; version=3.1, >+ javax.servlet.resources; version=3.1, >+ javax.el;version="3.0" >diff --git a/res/META-INF/servlet-api.jar.manifest b/res/META-INF/servlet-api.jar.manifest >index 63fba29eb..977b0abad 100644 >--- a/res/META-INF/servlet-api.jar.manifest >+++ b/res/META-INF/servlet-api.jar.manifest >@@ -9,3 +9,17 @@ Specification-Vendor: Sun Microsystems, Inc. > Implementation-Title: javax.servlet > Implementation-Version: 3.1.@servlet.revision@ > Implementation-Vendor: Apache Software Foundation >+ >+Name: OSGi >+Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,J2SE-1.4 >+Bundle-SymbolicName: javax.servlet >+Bundle-ManifestVersion: 2 >+Bundle-Name: %bundleName >+Bundle-Localization: plugin >+Bundle-Version: 3.1 >+Bundle-Vendor: %bundleProvider >+Export-Package: javax.servlet;version="3.1", >+ javax.servlet.http;version="3.1", >+ javax.servlet.annotation;version="3.1", >+ javax.servlet.descriptor;version="3.1", >+ javax.servlet.resources;version="3.1", >diff --git a/res/META-INF/tomcat-api.jar.manifest b/res/META-INF/tomcat-api.jar.manifest >new file mode 100644 >index 000000000..d212fd86c >--- /dev/null >+++ b/res/META-INF/tomcat-api.jar.manifest >@@ -0,0 +1,20 @@ >+Manifest-Version: 1.0 >+Specification-Title: Apache Tomcat >+Specification-Version: @VERSION_MAJOR_MINOR@ >+Specification-Vendor: Apache Software Foundation >+Implementation-Title: Apache Tomcat >+Implementation-Version: @VERSION@ >+Implementation-Vendor: Apache Software Foundation >+X-Compile-Source-JDK: @source.jdk@ >+X-Compile-Target-JDK: @target.jdk@ >+ >+Name: OSGi >+Export-Package: org.apache.tomcat;version=""@VERSION@ >+Bundle-Vendor: %bundleProvider >+Bundle-ClassPath: . >+Bundle-Version: @VERSION@ >+Bundle-Name: %bundleName >+Bundle-Localization: plugin >+Bundle-ManifestVersion: 2 >+Bundle-SymbolicName: org.apache.tomcat >+Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3 >diff --git a/res/META-INF/tomcat-juli.jar.manifest b/res/META-INF/tomcat-juli.jar.manifest >new file mode 100644 >index 000000000..5e7c3a011 >--- /dev/null >+++ b/res/META-INF/tomcat-juli.jar.manifest >@@ -0,0 +1,20 @@ >+Manifest-Version: 1.0 >+Specification-Title: Apache Tomcat >+Specification-Version: @VERSION_MAJOR_MINOR@ >+Specification-Vendor: Apache Software Foundation >+Implementation-Title: Apache Tomcat >+Implementation-Version: @VERSION@ >+Implementation-Vendor: Apache Software Foundation >+X-Compile-Source-JDK: @source.jdk@ >+X-Compile-Target-JDK: @target.jdk@ >+ >+Name: OSGi >+Export-Package: org.apache.juli;version="@VERSION@",org.apache.juli.logging;version="@VERSION@" >+Bundle-Vendor: %bundleProvider >+Bundle-ClassPath: . >+Bundle-Version: @VERSION@ >+Bundle-Name: %bundleName >+Bundle-Localization: plugin >+Bundle-ManifestVersion: 2 >+Bundle-SymbolicName: org.apache.juli >+Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3 View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]