Author: markt
Date: Tue May 29 14:31:38 2018
New Revision: 1832449
URL: http://svn.apache.org/viewvc?rev=1832449&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=52381
Add OSGi metadata to JAR files
Added:
tomcat/trunk/res/bnd/
tomcat/trunk/res/bnd/annotations-api.bnd
tomcat/trunk/res/bnd/catalina-ha.bnd
tomcat/trunk/res/bnd/catalina-storeconfig.bnd
tomcat/trunk/res/bnd/catalina-tribes.bnd
tomcat/trunk/res/bnd/catalina.bnd
tomcat/trunk/res/bnd/el-api.bnd
tomcat/trunk/res/bnd/jasper-el.bnd
tomcat/trunk/res/bnd/jasper.bnd
tomcat/trunk/res/bnd/jaspic-api.bnd
tomcat/trunk/res/bnd/jsp-api.bnd
tomcat/trunk/res/bnd/servlet-api.bnd
tomcat/trunk/res/bnd/tomcat-api.bnd
tomcat/trunk/res/bnd/tomcat-coyote.bnd
tomcat/trunk/res/bnd/tomcat-dbcp.bnd
tomcat/trunk/res/bnd/tomcat-embed-core.bnd
tomcat/trunk/res/bnd/tomcat-embed-el.bnd
tomcat/trunk/res/bnd/tomcat-embed-jasper.bnd
tomcat/trunk/res/bnd/tomcat-embed-websocket.bnd
tomcat/trunk/res/bnd/tomcat-jni.bnd
tomcat/trunk/res/bnd/tomcat-juli.bnd
tomcat/trunk/res/bnd/tomcat-util-scan.bnd
tomcat/trunk/res/bnd/tomcat-util.bnd
tomcat/trunk/res/bnd/tomcat-websocket.bnd
tomcat/trunk/res/bnd/websocket-api.bnd
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1832449&r1=1832448&r2=1832449&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Tue May 29 14:31:38 2018
@@ -218,3 +218,14 @@ saaj-api.version=1.3.5
saaj-api.home=${base.path}/saaj-api-${saaj-api.version}
saaj-api.loc=${base-maven.loc}/javax/xml/soap/saaj-api/${saaj-api.version}/saaj-api-${saaj-api.version}.jar
saaj-api.jar=${saaj-api.home}/saaj-api-${saaj-api.version}.jar
+
+# ----- bnd & bndlib, version 4.0.0 or later -----
+# ----- provides OSGI metadata for JARs -----
+bnd.version=4.0.0
+bnd.home=${base.path}/bnd-${bnd.version}
+bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar
+bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
+
+bndlib.home=${base.path}/bndlib-${bnd.version}
+bndlib.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bndlib/${bnd.version}/biz.aQute.bndlib-${bnd.version}.jar
+bndlib.jar=${bndlib.home}/biz.aQute.bndlib-${bnd.version}.jar
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1832449&r1=1832448&r2=1832449&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue May 29 14:31:38 2018
@@ -61,6 +61,7 @@
<property name="tomcat.home" value="${basedir}"/>
<property name="tomcat-nb.home" value="${basedir}/nbproject" />
<property name="tomcat.output" value="${basedir}/output"/>
+ <property name="tomcat.bnd" value="${tomcat.output}/bnd"/>
<property name="tomcat.build" value="${tomcat.output}/build"/>
<property name="tomcat.classes" value="${tomcat.output}/classes"/>
<property name="tomcat.deployer" value="${tomcat.output}/deployer"/>
@@ -257,6 +258,7 @@
<include name="**/javax.websocket.ContainerProvider"/>
<include
name="**/javax.websocket.server.ServerEndpointConfig$Configurator"/>
<include name="**/.gitignore"/>
+ <include name="**/*.bnd"/>
<include name="**/*.classpath"/>
<include name="**/*.css"/>
<include name="**/*.dtd"/>
@@ -535,6 +537,18 @@
</srcfiles>
</uptodate>
+ <!-- Property that determines if OSGI bnd files need updating -->
+ <uptodate property="bnd.uptodate"
+ targetfile="${tomcat.bnd}/annotations-api.bnd" >
+ <srcfiles file="${user.home}/build.properties" />
+ <srcfiles file="${basedir}/build.properties" />
+ <srcfiles file="${basedir}/build.properties.default" />
+ <srcfiles file="${basedir}/build.xml" />
+ <srcfiles dir="${tomcat.home}/res/bnd" >
+ <include name="*.bnd" />
+ </srcfiles>
+ </uptodate>
+
</target>
<target name="validate" if="${execute.validate}"
@@ -713,12 +727,25 @@
</target>
- <target name="package" depends="compile,build-manifests" >
+ <target name="build-bnd" unless="bnd.uptodate"
+ depends="setup-bnd,build-prepare">
+
+ <mkdir dir="${tomcat.bnd}" />
+ <copy todir="${tomcat.bnd}" overwrite="yes" filtering="yes"
+ encoding="ISO-8859-1">
+ <filterset refid="version.filters"/>
+ <fileset dir="${tomcat.home}/res/bnd" />
+ </copy>
+
+ </target>
+
+ <target name="package" depends="compile,build-manifests,build-bnd" >
<!-- Common Annotations 1.3 JAR File -->
<jarIt jarfile="${annotations-api.jar}"
filesDir="${tomcat.classes}"
filesId="files.annotations-api"
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest"
+ addOSGi="true" />
<!-- Servlet 4.0 Implementation JAR File -->
<jarIt jarfile="${servlet-api.jar}"
@@ -726,37 +753,43 @@
filesId="files.servlet-api"
manifest="${tomcat.manifests}/servlet-api.jar.manifest"
notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license" />
+ license="${tomcat.manifests}/servlet-api.jar.license"
+ addOSGi="true" />
<!-- JSP 2.3 Implementation JAR File -->
<jarIt jarfile="${jsp-api.jar}"
filesDir="${tomcat.classes}"
filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+ addOSGi="true" />
<!-- EL 3.0 Implementation JAR File -->
<jarIt jarfile="${el-api.jar}"
filesDir="${tomcat.classes}"
filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest" />
+ manifest="${tomcat.manifests}/el-api.jar.manifest"
+ addOSGi="true" />
<!-- WebSocket 1.1 API JAR File -->
<jarIt jarfile="${websocket-api.jar}"
filesDir="${tomcat.classes}"
filesId="files.websocket-api"
- manifest="${tomcat.manifests}/websocket-api.jar.manifest" />
+ manifest="${tomcat.manifests}/websocket-api.jar.manifest"
+ addOSGi="true" />
<!-- JASPIC 1.1 API JAR File -->
<jarIt jarfile="${jaspic-api.jar}"
filesDir="${tomcat.classes}"
filesId="files.jaspic-api"
- manifest="${tomcat.manifests}/jaspic-api.jar.manifest" />
+ manifest="${tomcat.manifests}/jaspic-api.jar.manifest"
+ addOSGi="true" />
<!-- WebSocket 1.1 implementation JAR File -->
<jarIt jarfile="${tomcat-websocket.jar}"
filesDir="${tomcat.classes}"
filesId="files.tomcat-websocket"
- meta-inf="${tomcat.manifests}/tomcat-websocket.jar"/>
+ meta-inf="${tomcat.manifests}/tomcat-websocket.jar"
+ addOSGi="true" />
<!-- Bootstrap JAR File -->
<jarIt jarfile="${bootstrap.jar}"
@@ -767,22 +800,26 @@
<!-- Tomcat-juli JAR File -->
<jarIt jarfile="${tomcat-juli.jar}"
filesDir="${tomcat.classes}"
- filesId="files.tomcat-juli" />
+ filesId="files.tomcat-juli"
+ addOSGi="true" />
<!-- Catalina Main JAR File -->
<jarIt jarfile="${catalina.jar}"
filesDir="${tomcat.classes}"
- filesId="files.catalina" />
+ filesId="files.catalina"
+ addOSGi="true" />
<!-- Catalina GroupCom/Tribes JAR File -->
<jarIt jarfile="${catalina-tribes.jar}"
filesDir="${tomcat.classes}"
- filesId="files.catalina-tribes" />
+ filesId="files.catalina-tribes"
+ addOSGi="true" />
<!-- Catalina Cluster/HA JAR File -->
<jarIt jarfile="${catalina-ha.jar}"
filesDir="${tomcat.classes}"
- filesId="files.catalina-ha" />
+ filesId="files.catalina-ha"
+ addOSGi="true" />
<!-- Catalina Ant Tasks JAR File -->
<jarIt jarfile="${catalina-ant.jar}"
@@ -792,47 +829,56 @@
<!-- Catalina Storeconfig JAR File -->
<jarIt jarfile="${catalina-storeconfig.jar}"
filesDir="${tomcat.classes}"
- filesId="files.catalina-storeconfig" />
+ filesId="files.catalina-storeconfig"
+ addOSGi="true" />
<!-- Tomcat API JAR File -->
<jarIt jarfile="${tomcat-api.jar}"
filesDir="${tomcat.classes}"
- filesId="files.tomcat-api" />
+ filesId="files.tomcat-api"
+ addOSGi="true" />
<!-- Tomcat Util JAR File -->
<jarIt jarfile="${tomcat-util.jar}"
filesDir="${tomcat.classes}"
- filesId="files.tomcat-util" />
+ filesId="files.tomcat-util"
+ addOSGi="true" />
<!-- Tomcat Util Scan JAR File -->
<jarIt jarfile="${tomcat-util-scan.jar}"
filesDir="${tomcat.classes}"
- filesId="files.tomcat-util-scan" />
+ filesId="files.tomcat-util-scan"
+ addOSGi="true" />
<!-- Protocol handlers - Coyote -->
<jarIt jarfile="${tomcat-coyote.jar}"
filesDir="${tomcat.classes}"
- filesId="files.tomcat-coyote" />
+ filesId="files.tomcat-coyote"
+ addOSGi="true" />
<jarIt jarfile="${tomcat-jni.jar}"
filesDir="${tomcat.classes}"
- filesId="files.tomcat-jni" />
+ filesId="files.tomcat-jni"
+ addOSGi="true" />
<!-- Jasper Implementation JAR File -->
<jarIt jarfile="${jasper.jar}"
filesDir="${tomcat.classes}"
filesId="files.jasper"
- meta-inf="${tomcat.manifests}/jasper.jar"/>
+ meta-inf="${tomcat.manifests}/jasper.jar"
+ addOSGi="true" />
<!-- Jasper EL Implementation JAR File -->
<jarIt jarfile="${jasper-el.jar}"
filesDir="${tomcat.classes}"
- filesId="files.jasper-el" />
+ filesId="files.jasper-el"
+ addOSGi="true" />
<!-- Re-packaged Apache Commons DBCP-->
<jarIt jarfile="${tomcat-dbcp.jar}"
filesDir="${tomcat.classes}"
- filesId="files.tomcat-dbcp" />
+ filesId="files.tomcat-dbcp"
+ addOSGi="true" />
<!-- i18n JARs -->
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-es.jar"
@@ -1223,7 +1269,7 @@
</txt2html>
</target>
<target name="embed-jars" description="Create experimental embedded jars"
- depends="build-manifests,compile" >
+ depends="build-manifests,build-bnd,compile" >
<mkdir dir="${tomcat.embed}" />
@@ -1241,18 +1287,22 @@
filesDir="${tomcat.classes}"
filesId="files.tomcat-embed-core"
notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license"/>
+ license="${tomcat.manifests}/servlet-api.jar.license"
+ addOSGi="true" />
<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"
+ addOSGi="true" />
<jarIt jarfile="${tomcat-embed-el.jar}"
filesDir="${tomcat.classes}"
- filesId="files.tomcat-embed-el"/>
+ filesId="files.tomcat-embed-el"
+ addOSGi="true" />
<jarIt jarfile="${tomcat-embed-websocket.jar}"
filesDir="${tomcat.classes}"
filesId="files.tomcat-embed-websocket"
- meta-inf="${tomcat.manifests}/tomcat-websocket.jar"/>
+ meta-inf="${tomcat.manifests}/tomcat-websocket.jar"
+ addOSGi="true" />
</target>
@@ -2920,6 +2970,31 @@ Read the Building page on the Apache Tom
<!-- ======================= Macros, Taskdefs etc ========================
-->
+ <target name="setup-bnd" >
+ <!-- Download bnd -->
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${bnd.loc}"/>
+ <param name="destfile" value="${bnd.jar}"/>
+ <param name="destdir" value="${bnd.home}"/>
+ </antcall>
+
+ <!-- Download bndlib -->
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${bndlib.loc}"/>
+ <param name="destfile" value="${bndlib.jar}"/>
+ <param name="destdir" value="${bndlib.home}"/>
+ </antcall>
+
+ <!-- Add bnd tasks to project -->
+ <path id="bndlib.classpath">
+ <fileset file="${bnd.jar}" />
+ <fileset file="${bndlib.jar}" />
+ </path>
+
+ <taskdef resource="aQute/bnd/ant/taskdef.properties"
classpathref="bndlib.classpath" />
+
+ </target>
+
<macrodef name="jarIt" description="utility macro for standard JAR
packaging">
<attribute name="jarfile"
description="the name of the JAR file to create"/>
@@ -2935,6 +3010,8 @@ Read the Building page on the Apache Tom
default="${tomcat.manifests}/default.license" />
<attribute name="meta-inf" description="additional contents for META-INF"
default="${tomcat.manifests}/default" />
+ <attribute name="addOSGi" description="generate OSGi metadata"
+ default="false" />
<sequential>
<jar jarfile="@{jarfile}" manifest="@{manifest}">
<fileset dir="@{filesDir}">
@@ -2948,9 +3025,21 @@ Read the Building page on the Apache Tom
<zipfileset file="@{notice}" fullpath="META-INF/NOTICE" />
<zipfileset file="@{license}" fullpath="META-INF/LICENSE" />
</jar>
+ <antcall target="add-osgi" >
+ <param name="jarfile" value="@{jarfile}" />
+ <param name="addOSGi" value="@{addOSGi}" />
+ </antcall>
</sequential>
</macrodef>
+ <target name="add-osgi" if="${addOSGi}" >
+ <echo message="add-osgi ${jarfile} ${addOSGi}"></echo>
+ <bndwrap output="${jarfile}" definitions="${tomcat.bnd}" >
+ <fileset file="${jarfile}" />
+ </bndwrap>
+ <delete file="${jarfile}.bak" />
+ </target>
+
<!-- Macro, used to create checksum and signature files -->
<!-- Requires 'file' as a parameter. -->
<macrodef name="hashAndSign">
Added: tomcat/trunk/res/bnd/annotations-api.bnd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/bnd/annotations-api.bnd?rev=1832449&view=auto
==============================================================================
--- tomcat/trunk/res/bnd/annotations-api.bnd (added)
+++ tomcat/trunk/res/bnd/annotations-api.bnd Tue May 29 14:31:38 2018
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Bundle-Name: tomcat-annotations-api
+Bundle-SymbolicName: org.apache.tomcat-annotations-api
+Bundle-Version: @VERSION@
+Export-Package: \
+ javax.annotation,\
+ javax.annotation.security,\
+ javax.annotation.sql
Added: tomcat/trunk/res/bnd/catalina-ha.bnd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/bnd/catalina-ha.bnd?rev=1832449&view=auto
==============================================================================
--- tomcat/trunk/res/bnd/catalina-ha.bnd (added)
+++ tomcat/trunk/res/bnd/catalina-ha.bnd Tue May 29 14:31:38 2018
@@ -0,0 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Bundle-Name: tomcat-catalina-ha
+Bundle-SymbolicName: org.apache.tomcat-catalina-ha
+Bundle-Version: @VERSION@
+Export-Package: \
+ org.apache.catalina.ha,\
+ org.apache.catalina.ha.authenticator,\
+ org.apache.catalina.ha.backend,\
+ org.apache.catalina.ha.context,\
+ org.apache.catalina.ha.deploy,\
+ org.apache.catalina.ha.session,\
+ org.apache.catalina.ha.tcp
\ No newline at end of file
Added: tomcat/trunk/res/bnd/catalina-storeconfig.bnd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/bnd/catalina-storeconfig.bnd?rev=1832449&view=auto
==============================================================================
--- tomcat/trunk/res/bnd/catalina-storeconfig.bnd (added)
+++ tomcat/trunk/res/bnd/catalina-storeconfig.bnd Tue May 29 14:31:38 2018
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Bundle-Name: tomcat-storeconfig
+Bundle-SymbolicName: org.apache.tomcat-storeconfig
+Bundle-Version: @VERSION@
+Export-Package: org.apache.catalina.storeconfig
\ No newline at end of file
Added: tomcat/trunk/res/bnd/catalina-tribes.bnd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/bnd/catalina-tribes.bnd?rev=1832449&view=auto
==============================================================================
--- tomcat/trunk/res/bnd/catalina-tribes.bnd (added)
+++ tomcat/trunk/res/bnd/catalina-tribes.bnd Tue May 29 14:31:38 2018
@@ -0,0 +1,29 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Bundle-Name: tomcat-tribes
+Bundle-SymbolicName: org.apache.tomcat-tribes
+Bundle-Version: @VERSION@
+Export-Package: \
+ org.apache.catalina.tribes,\
+ org.apache.catalina.tribes.group,\
+ org.apache.catalina.tribes.group.interceptors,\
+ org.apache.catalina.tribes.io,\
+ org.apache.catalina.tribes.jmx,\
+ org.apache.catalina.tribes.membership,\
+ org.apache.catalina.tribes.tipis,\
+ org.apache.catalina.tribes.transport,\
+ org.apache.catalina.tribes.transport.bio,\
+ org.apache.catalina.tribes.transport.nio,\
+ org.apache.catalina.tribes.util
\ No newline at end of file
Added: tomcat/trunk/res/bnd/catalina.bnd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/bnd/catalina.bnd?rev=1832449&view=auto
==============================================================================
--- tomcat/trunk/res/bnd/catalina.bnd (added)
+++ tomcat/trunk/res/bnd/catalina.bnd Tue May 29 14:31:38 2018
@@ -0,0 +1,46 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Bundle-Name: tomcat-catalina
+Bundle-SymbolicName: org.apache.tomcat-catalina
+Bundle-Version: @VERSION@
+Export-Package: \
+ org.apache.catalina.authenticator,\
+ org.apache.catalina.authenticator.jaspic,\
+ org.apache.catalina.connector,\
+ org.apache.catalina.core,\
+ org.apache.catalina.deploy,\
+ org.apache.catalina.filters,\
+ org.apache.catalina.loader,\
+ org.apache.catalina.manager,\
+ org.apache.catalina.manager.host,\
+ org.apache.catalina.mapper,\
+ org.apache.catalina.mbeans,\
+ org.apache.catalina.realm,\
+ org.apache.catalina.security,\
+ org.apache.catalina.servlets,\
+ org.apache.catalina.session,\
+ org.apache.catalina.ssi,\
+ org.apache.catalina.startup,\
+ org.apache.catalina.users,\
+ org.apache.catalina.util,\
+ org.apache.catalina.valves,\
+ org.apache.catalina.valves.rewrite,\
+ org.apache.catalina.webresources,\
+ org.apache.naming,\
+ org.apache.naming.factory,\
+ org.apache.naming.java,\
+ org.apache.catalina.webresources.war,\
+ org.apache.catalina.manager.util,\
+ org.apache.catalina
\ No newline at end of file
Added: tomcat/trunk/res/bnd/el-api.bnd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/bnd/el-api.bnd?rev=1832449&view=auto
==============================================================================
--- tomcat/trunk/res/bnd/el-api.bnd (added)
+++ tomcat/trunk/res/bnd/el-api.bnd Tue May 29 14:31:38 2018
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Bundle-Name: tomcat-el-api
+Bundle-SymbolicName: org.apache.tomcat-el-api
+Bundle-Version: @VERSION@
+Export-Package: javax.el
\ No newline at end of file
Added: tomcat/trunk/res/bnd/jasper-el.bnd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/bnd/jasper-el.bnd?rev=1832449&view=auto
==============================================================================
--- tomcat/trunk/res/bnd/jasper-el.bnd (added)
+++ tomcat/trunk/res/bnd/jasper-el.bnd Tue May 29 14:31:38 2018
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Bundle-Name: tomcat-jasper-el
+Bundle-SymbolicName: org.apache.tomcat-jasper-el
+Bundle-Version: @VERSION@
+Export-Package: \
+ org.apache.el,\
+ org.apache.el.lang,\
+ org.apache.el.parser
\ No newline at end of file
Added: tomcat/trunk/res/bnd/jasper.bnd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/bnd/jasper.bnd?rev=1832449&view=auto
==============================================================================
--- tomcat/trunk/res/bnd/jasper.bnd (added)
+++ tomcat/trunk/res/bnd/jasper.bnd Tue May 29 14:31:38 2018
@@ -0,0 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Bundle-Name: tomcat-jasper
+Bundle-SymbolicName: org.apache.tomcat-jasper
+Bundle-Version: @VERSION@
+Export-Package: \
+ org.apache.jasper,\
+ org.apache.jasper.compiler,\
+ org.apache.jasper.compiler.tagplugin,\
+ org.apache.jasper.el,\
+ org.apache.jasper.runtime,\
+ org.apache.jasper.security,\
+ org.apache.jasper.servlet,\
+ org.apache.jasper.tagplugins.jstl,\
+ org.apache.jasper.tagplugins.jstl.core,\
+ org.apache.jasper.util
\ No newline at end of file
Added: tomcat/trunk/res/bnd/jaspic-api.bnd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/bnd/jaspic-api.bnd?rev=1832449&view=auto
==============================================================================
--- tomcat/trunk/res/bnd/jaspic-api.bnd (added)
+++ tomcat/trunk/res/bnd/jaspic-api.bnd Tue May 29 14:31:38 2018
@@ -0,0 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Bundle-Name: tomcat-jaspic-api
+Bundle-SymbolicName: org.apache.tomcat-jaspic-api
+Bundle-Version: @VERSION@
+Export-Package: \
+ javax.security.auth.message,\
+ javax.security.auth.message.callback,\
+ javax.security.auth.message.config,\
+ javax.security.auth.message.module
\ No newline at end of file
Added: tomcat/trunk/res/bnd/jsp-api.bnd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/bnd/jsp-api.bnd?rev=1832449&view=auto
==============================================================================
--- tomcat/trunk/res/bnd/jsp-api.bnd (added)
+++ tomcat/trunk/res/bnd/jsp-api.bnd Tue May 29 14:31:38 2018
@@ -0,0 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Bundle-Name: tomcat-jsp-api
+Bundle-SymbolicName: org.apache.tomcat-jsp-api
+Bundle-Version: @VERSION@
+Export-Package: \
+ javax.servlet.jsp,\
+ javax.servlet.jsp.el,\
+ javax.servlet.jsp.resources,\
+ javax.servlet.jsp.tagext
\ No newline at end of file
Added: tomcat/trunk/res/bnd/servlet-api.bnd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/bnd/servlet-api.bnd?rev=1832449&view=auto
==============================================================================
--- tomcat/trunk/res/bnd/servlet-api.bnd (added)
+++ tomcat/trunk/res/bnd/servlet-api.bnd Tue May 29 14:31:38 2018
@@ -0,0 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Bundle-Name: tomcat-servlet-api
+Bundle-SymbolicName: org.apache.tomcat-servlet-api
+Bundle-Version: @VERSION@
+Export-Package: \
+ javax.servlet,\
+ javax.servlet.annotation,\
+ javax.servlet.descriptor,\
+ javax.servlet.http,\
+ javax.servlet.resources
\ No newline at end of file
Added: tomcat/trunk/res/bnd/tomcat-api.bnd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/bnd/tomcat-api.bnd?rev=1832449&view=auto
==============================================================================
--- tomcat/trunk/res/bnd/tomcat-api.bnd (added)
+++ tomcat/trunk/res/bnd/tomcat-api.bnd Tue May 29 14:31:38 2018
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Bundle-Name: tomcat-api
+Bundle-SymbolicName: org.apache.tomcat-api
+Bundle-Version: @VERSION@
+Export-Package: org.apache.tomcat
Added: tomcat/trunk/res/bnd/tomcat-coyote.bnd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/bnd/tomcat-coyote.bnd?rev=1832449&view=auto
==============================================================================
--- tomcat/trunk/res/bnd/tomcat-coyote.bnd (added)
+++ tomcat/trunk/res/bnd/tomcat-coyote.bnd Tue May 29 14:31:38 2018
@@ -0,0 +1,36 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Bundle-Name: tomcat-coyote
+Bundle-SymbolicName: org.apache.tomcat-coyote
+Bundle-Version: @VERSION@
+Export-Package: \
+ org.apache.coyote,\
+ org.apache.coyote.ajp,\
+ org.apache.coyote.http11,\
+ org.apache.coyote.http11.filters,\
+ org.apache.coyote.http11.upgrade,\
+ org.apache.coyote.http2,\
+ org.apache.tomcat.util.bcel.classfile,\
+ org.apache.tomcat.util.http,\
+ org.apache.tomcat.util.http.fileupload,\
+ org.apache.tomcat.util.http.fileupload.disk,\
+ org.apache.tomcat.util.http.fileupload.servlet,\
+ org.apache.tomcat.util.http.fileupload.util,\
+ org.apache.tomcat.util.http.parser,\
+ org.apache.tomcat.util.log,\
+ org.apache.tomcat.util.modeler,\
+ org.apache.tomcat.util.net,\
+ org.apache.tomcat.util.net.openssl,\
+ org.apache.tomcat.util.net.openssl.ciphers
\ No newline at end of file
Added: tomcat/trunk/res/bnd/tomcat-dbcp.bnd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/bnd/tomcat-dbcp.bnd?rev=1832449&view=auto
==============================================================================
--- tomcat/trunk/res/bnd/tomcat-dbcp.bnd (added)
+++ tomcat/trunk/res/bnd/tomcat-dbcp.bnd Tue May 29 14:31:38 2018
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Bundle-Name: tomcat-dbcp
+Bundle-SymbolicName: org.apache.tomcat-dbcp
+Bundle-Version: @VERSION@
+Export-Package: \
+ org.apache.tomcat.dbcp.dbcp2.cpdsadapter,\
+ org.apache.tomcat.dbcp.dbcp2.datasources,\
+ org.apache.tomcat.dbcp.dbcp2.managed,\
+ org.apache.tomcat.dbcp.dbcp2,\
+ org.apache.tomcat.dbcp.pool2,\
+ org.apache.tomcat.dbcp.pool2.impl
Added: tomcat/trunk/res/bnd/tomcat-embed-core.bnd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/bnd/tomcat-embed-core.bnd?rev=1832449&view=auto
==============================================================================
--- tomcat/trunk/res/bnd/tomcat-embed-core.bnd (added)
+++ tomcat/trunk/res/bnd/tomcat-embed-core.bnd Tue May 29 14:31:38 2018
@@ -0,0 +1,92 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Bundle-Name: tomcat-embed-core
+Bundle-SymbolicName: org.apache.tomcat-embed-core
+Bundle-Version: @VERSION@
+Export-Package: \
+ javax.security.auth.message,\
+ javax.security.auth.message.callback,\
+ javax.security.auth.message.config,\
+ javax.security.auth.message.module,\
+ javax.servlet,\
+ javax.servlet.annotation,\
+ javax.servlet.descriptor,\
+ javax.servlet.http,\
+ javax.servlet.resources,\
+ org.apache.catalina,\
+ org.apache.catalina.authenticator,\
+ org.apache.catalina.authenticator.jaspic,\
+ org.apache.catalina.connector,\
+ org.apache.catalina.core,\
+ org.apache.catalina.deploy,\
+ org.apache.catalina.filters,\
+ org.apache.catalina.loader,\
+ org.apache.catalina.manager,\
+ org.apache.catalina.manager.host,\
+ org.apache.catalina.manager.util,\
+ org.apache.catalina.mapper,\
+ org.apache.catalina.mbeans,\
+ org.apache.catalina.realm,\
+ org.apache.catalina.security,\
+ org.apache.catalina.servlets,\
+ org.apache.catalina.session,\
+ org.apache.catalina.ssi,\
+ org.apache.catalina.startup,\
+ org.apache.catalina.users,\
+ org.apache.catalina.util,\
+ org.apache.catalina.valves,\
+ org.apache.catalina.valves.rewrite,\
+ org.apache.catalina.webresources,\
+ org.apache.catalina.webresources.war,\
+ org.apache.coyote,\
+ org.apache.coyote.ajp,\
+ org.apache.coyote.http11,\
+ org.apache.coyote.http11.filters,\
+ org.apache.coyote.http11.upgrade,\
+ org.apache.coyote.http2,\
+ org.apache.juli,\
+ org.apache.juli.logging,\
+ org.apache.naming,\
+ org.apache.naming.factory,\
+ org.apache.naming.java,\
+ org.apache.tomcat,\
+ org.apache.tomcat.jni,\
+ org.apache.tomcat.util,\
+ org.apache.tomcat.util.bcel.classfile,\
+ org.apache.tomcat.util.buf,\
+ org.apache.tomcat.util.codec.binary,\
+ org.apache.tomcat.util.collections,\
+ org.apache.tomcat.util.compat,\
+ org.apache.tomcat.util.descriptor,\
+ org.apache.tomcat.util.descriptor.tagplugin,\
+ org.apache.tomcat.util.descriptor.tld,\
+ org.apache.tomcat.util.descriptor.web,\
+ org.apache.tomcat.util.digester,\
+ org.apache.tomcat.util.file,\
+ org.apache.tomcat.util.http,\
+ org.apache.tomcat.util.http.fileupload,\
+ org.apache.tomcat.util.http.fileupload.disk,\
+ org.apache.tomcat.util.http.fileupload.servlet,\
+ org.apache.tomcat.util.http.fileupload.util,\
+ org.apache.tomcat.util.http.parser,\
+ org.apache.tomcat.util.log,\
+ org.apache.tomcat.util.modeler,\
+ org.apache.tomcat.util.net,\
+ org.apache.tomcat.util.net.openssl,\
+ org.apache.tomcat.util.net.openssl.ciphers,\
+ org.apache.tomcat.util.res,\
+ org.apache.tomcat.util.scan,\
+ org.apache.tomcat.util.security,\
+ org.apache.tomcat.util.threads
\ No newline at end of file
Added: tomcat/trunk/res/bnd/tomcat-embed-el.bnd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/bnd/tomcat-embed-el.bnd?rev=1832449&view=auto
==============================================================================
--- tomcat/trunk/res/bnd/tomcat-embed-el.bnd (added)
+++ tomcat/trunk/res/bnd/tomcat-embed-el.bnd Tue May 29 14:31:38 2018
@@ -0,0 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Bundle-Name: tomcat-embed-jasper-el
+Bundle-SymbolicName: org.apache.tomcat-embed-jasper-el
+Bundle-Version: @VERSION@
+Export-Package: \
+ javax.el,\
+ org.apache.el,\
+ org.apache.el.lang,\
+ org.apache.el.parser
\ No newline at end of file
Added: tomcat/trunk/res/bnd/tomcat-embed-jasper.bnd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/bnd/tomcat-embed-jasper.bnd?rev=1832449&view=auto
==============================================================================
--- tomcat/trunk/res/bnd/tomcat-embed-jasper.bnd (added)
+++ tomcat/trunk/res/bnd/tomcat-embed-jasper.bnd Tue May 29 14:31:38 2018
@@ -0,0 +1,32 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Bundle-Name: tomcat-embed-jasper
+Bundle-SymbolicName: org.apache.tomcat-embed-jasper
+Bundle-Version: @VERSION@
+Export-Package: \
+ javax.servlet.jsp,\
+ javax.servlet.jsp.el,\
+ javax.servlet.jsp.resources,\
+ javax.servlet.jsp.tagext,\
+ org.apache.jasper,\
+ org.apache.jasper.compiler,\
+ org.apache.jasper.compiler.tagplugin,\
+ org.apache.jasper.el,\
+ org.apache.jasper.runtime,\
+ org.apache.jasper.security,\
+ org.apache.jasper.servlet,\
+ org.apache.jasper.tagplugins.jstl,\
+ org.apache.jasper.tagplugins.jstl.core,\
+ org.apache.jasper.util
\ No newline at end of file
Added: tomcat/trunk/res/bnd/tomcat-embed-websocket.bnd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/bnd/tomcat-embed-websocket.bnd?rev=1832449&view=auto
==============================================================================
--- tomcat/trunk/res/bnd/tomcat-embed-websocket.bnd (added)
+++ tomcat/trunk/res/bnd/tomcat-embed-websocket.bnd Tue May 29 14:31:38 2018
@@ -0,0 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Bundle-Name: tomcat-websocket
+Bundle-SymbolicName: org.apache.tomcat-websocket
+Bundle-Version: @VERSION@
+Export-Package: \
+ javax.websocket,\
+ javax.websocket.server,\
+ org.apache.tomcat.websocket,\
+ org.apache.tomcat.websocket.server
\ No newline at end of file
Added: tomcat/trunk/res/bnd/tomcat-jni.bnd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/bnd/tomcat-jni.bnd?rev=1832449&view=auto
==============================================================================
--- tomcat/trunk/res/bnd/tomcat-jni.bnd (added)
+++ tomcat/trunk/res/bnd/tomcat-jni.bnd Tue May 29 14:31:38 2018
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Bundle-Name: tomcat-jni
+Bundle-SymbolicName: org.apache.tomcat-jni
+Bundle-Version: @VERSION@
+Export-Package: org.apache.tomcat.jni
\ No newline at end of file
Added: tomcat/trunk/res/bnd/tomcat-juli.bnd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/bnd/tomcat-juli.bnd?rev=1832449&view=auto
==============================================================================
--- tomcat/trunk/res/bnd/tomcat-juli.bnd (added)
+++ tomcat/trunk/res/bnd/tomcat-juli.bnd Tue May 29 14:31:38 2018
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Bundle-Name: tomcat-juli
+Bundle-SymbolicName: org.apache.tomcat-juli
+Bundle-Version: @VERSION@
+Export-Package: \
+ org.apache.juli,\
+ org.apache.juli.logging
\ No newline at end of file
Added: tomcat/trunk/res/bnd/tomcat-util-scan.bnd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/bnd/tomcat-util-scan.bnd?rev=1832449&view=auto
==============================================================================
--- tomcat/trunk/res/bnd/tomcat-util-scan.bnd (added)
+++ tomcat/trunk/res/bnd/tomcat-util-scan.bnd Tue May 29 14:31:38 2018
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Bundle-Name: tomcat-util-scan
+Bundle-SymbolicName: org.apache.tomcat-util-scan
+Bundle-Version: @VERSION@
+Export-Package: \
+ org.apache.tomcat.util.descriptor,\
+ org.apache.tomcat.util.descriptor.tagplugin,\
+ org.apache.tomcat.util.descriptor.tld,\
+ org.apache.tomcat.util.descriptor.web,\
+ org.apache.tomcat.util.digester,\
+ org.apache.tomcat.util.scan
\ No newline at end of file
Added: tomcat/trunk/res/bnd/tomcat-util.bnd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/bnd/tomcat-util.bnd?rev=1832449&view=auto
==============================================================================
--- tomcat/trunk/res/bnd/tomcat-util.bnd (added)
+++ tomcat/trunk/res/bnd/tomcat-util.bnd Tue May 29 14:31:38 2018
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Bundle-Name: tomcat-util
+Bundle-SymbolicName: org.apache.tomcat-util
+Bundle-Version: @VERSION@
+Export-Package: \
+ org.apache.tomcat.util,\
+ org.apache.tomcat.util.buf,\
+ org.apache.tomcat.util.codec.binary,\
+ org.apache.tomcat.util.collections,\
+ org.apache.tomcat.util.compat,\
+ org.apache.tomcat.util.file,\
+ org.apache.tomcat.util.res,\
+ org.apache.tomcat.util.security,\
+ org.apache.tomcat.util.threads
\ No newline at end of file
Added: tomcat/trunk/res/bnd/tomcat-websocket.bnd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/bnd/tomcat-websocket.bnd?rev=1832449&view=auto
==============================================================================
--- tomcat/trunk/res/bnd/tomcat-websocket.bnd (added)
+++ tomcat/trunk/res/bnd/tomcat-websocket.bnd Tue May 29 14:31:38 2018
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Bundle-Name: tomcat-websocket
+Bundle-SymbolicName: org.apache.tomcat-websocket
+Bundle-Version: @VERSION@
+Export-Package: \
+ org.apache.tomcat.websocket,\
+ org.apache.tomcat.websocket.server
\ No newline at end of file
Added: tomcat/trunk/res/bnd/websocket-api.bnd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/bnd/websocket-api.bnd?rev=1832449&view=auto
==============================================================================
--- tomcat/trunk/res/bnd/websocket-api.bnd (added)
+++ tomcat/trunk/res/bnd/websocket-api.bnd Tue May 29 14:31:38 2018
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Bundle-Name: tomcat-websocket-api
+Bundle-SymbolicName: org.apache.tomcat-websocket-api
+Bundle-Version: @VERSION@
+Export-Package: \
+ javax.websocket,\
+ javax.websocket.server
\ No newline at end of file
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1832449&r1=1832448&r2=1832449&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue May 29 14:31:38 2018
@@ -229,6 +229,9 @@
<fix>
Ensure that Apache Tomcat may be built from source with Java 11.
(markt)
</fix>
+ <add>
+ <bug>52381</bug>: Add OSGi metadata to JAR files, (markt)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
