On 05/12/2019 16:40, [email protected] wrote:
> This is an automated email from the ASF dual-hosted git repository.
>
> schultz pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
>
> The following commit(s) were added to refs/heads/master by this push:
> new 3554723 Move SSI component into separate JAR file.
> 3554723 is described below
>
> commit 3554723117122fb520c72b6c4a828d5f146d8c40
> Author: Christopher Schultz <[email protected]>
> AuthorDate: Thu Dec 5 11:39:36 2019 -0500
>
> Move SSI component into separate JAR file.
> ---
> build.xml | 18 ++++++++++++++++++
> res/bnd/catalina-ssi.jar.tmp.bnd | 19 +++++++++++++++++++
You need a pom in res/maven as well.
Mark
> 2 files changed, 37 insertions(+)
>
> diff --git a/build.xml b/build.xml
> index 3d1318e..fbe0311 100644
> --- a/build.xml
> +++ b/build.xml
> @@ -110,6 +110,7 @@
> <property name="tomcat-websocket.jar"
> value="${tomcat.build}/lib/tomcat-websocket.jar"/>
> <property name="catalina.jar" value="${tomcat.build}/lib/catalina.jar"/>
> <property name="catalina-tribes.jar"
> value="${tomcat.build}/lib/catalina-tribes.jar"/>
> + <property name="catalina-ssi.jar"
> value="${tomcat.build}/lib/catalina-ssi.jar"/>
> <property name="catalina-ha.jar"
> value="${tomcat.build}/lib/catalina-ha.jar"/>
> <property name="catalina-ant.jar"
> value="${tomcat.build}/lib/catalina-ant.jar"/>
> <property name="catalina-storeconfig.jar"
> value="${tomcat.build}/lib/catalina-storeconfig.jar"/>
> @@ -136,6 +137,7 @@
> <property name="tomcat-websocket-src.jar"
> value="${tomcat.src.jars}/tomcat-websocket-src.jar"/>
> <property name="catalina-src.jar"
> value="${tomcat.src.jars}/catalina-src.jar"/>
> <property name="catalina-tribes-src.jar"
> value="${tomcat.src.jars}/catalina-tribes-src.jar"/>
> + <property name="catalina-ssi-src.jar"
> value="${tomcat.src.jars}/catalina-ssi-src.jar"/>
> <property name="catalina-ha-src.jar"
> value="${tomcat.src.jars}/catalina-ha-src.jar"/>
> <property name="catalina-ant-src.jar"
> value="${tomcat.src.jars}/catalina-ant-src.jar"/>
> <property name="catalina-storeconfig-src.jar"
> value="${tomcat.src.jars}/catalina-storeconfig-src.jar"/>
> @@ -420,12 +422,17 @@
> <exclude name="org/apache/catalina/ha/**" />
> <exclude name="org/apache/catalina/tribes/**" />
> <exclude name="org/apache/catalina/storeconfig/**" />
> + <exclude name="org/apache/catalina/ssi/**" />
> </patternset>
>
> <patternset id="files.catalina-tribes">
> <include name="org/apache/catalina/tribes/**" />
> </patternset>
>
> + <patternset id="files.catalina-ssi">
> + <include name="org/apache/catalina/ssi/**" />
> + </patternset>
> +
> <patternset id="files.catalina-ha">
> <include name="org/apache/catalina/ha/**" />
> </patternset>
> @@ -834,6 +841,12 @@
> filesId="files.catalina-tribes"
> addOSGi="true" />
>
> + <!-- Server-Side Includes (SSI) -->
> + <jarIt jarfile="${catalina-ssi.jar}"
> + filesDir="${tomcat.classes}"
> + filesId="files.catalina-ssi"
> + addOSGi="true" />
> +
> <!-- Catalina Cluster/HA JAR File -->
> <jarIt jarfile="${catalina-ha.jar}"
> filesDir="${tomcat.classes}"
> @@ -2644,6 +2657,11 @@ skip.installer property in build.properties" />
> filesDir="java"
> filesId="files.catalina-tribes" />
>
> + <!-- Catalina SSI JAR File -->
> + <jarIt jarfile="${catalina-ssi-src.jar}"
> + filesDir="java"
> + filesId="files.catalina-ssi" />
> +
> <!-- Catalina Cluster/HA JAR File -->
> <jarIt jarfile="${catalina-ha-src.jar}"
> filesDir="java"
> diff --git a/res/bnd/catalina-ssi.jar.tmp.bnd
> b/res/bnd/catalina-ssi.jar.tmp.bnd
> new file mode 100644
> index 0000000..c17840d
> --- /dev/null
> +++ b/res/bnd/catalina-ssi.jar.tmp.bnd
> @@ -0,0 +1,19 @@
> +# 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-ssi
> +Bundle-SymbolicName: org.apache.tomcat-ssi
> +Bundle-Version: @VERSION@
> +Export-Package: \
> + org.apache.catalina.ssi
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [email protected]
> For additional commands, e-mail: [email protected]
>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
