You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by sc...@apache.org on 2019/12/06 16:51:58 UTC
[tomcat] branch master updated: Fix missing loose-ends when
re-packaging SSI into a separate library.
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 dff6e16 Fix missing loose-ends when re-packaging SSI into a separate library.
dff6e16 is described below
commit dff6e167db57804ed9c93e7475d42a3d93443b0e
Author: Christopher Schultz <ch...@christopherschultz.net>
AuthorDate: Fri Dec 6 11:51:12 2019 -0500
Fix missing loose-ends when re-packaging SSI into a separate library.
---
RELEASE-NOTES | 1 +
conf/catalina.properties | 1 +
res/maven/mvn-pub.xml | 8 +++++++
res/maven/tomcat-ssi.pom | 43 +++++++++++++++++++++++++++++++++++++
webapps/docs/changelog.xml | 3 +++
webapps/docs/class-loader-howto.xml | 1 +
6 files changed, 57 insertions(+)
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 825889a..c4e88e1 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -70,6 +70,7 @@ for use by web applications (by placing them in "lib"):
* catalina.jar (Tomcat Catalina implementation)
* catalina-ant.jar (Tomcat Catalina Ant tasks)
* catalina-ha.jar (High availability package)
+* catalina-ssi.jar (Server-side Includes module)
* catalina-storeconfig.jar (Generation of XML configuration from current state)
* catalina-tribes.jar (Group communication)
* ecj-@JDT_VERSION@.jar (Eclipse JDT Java compiler)
diff --git a/conf/catalina.properties b/conf/catalina.properties
index 289f697..cff2aa2 100644
--- a/conf/catalina.properties
+++ b/conf/catalina.properties
@@ -115,6 +115,7 @@ aspectj*.jar,\
bootstrap.jar,\
catalina-ant.jar,\
catalina-ha.jar,\
+catalina-ssi.jar,\
catalina-storeconfig.jar,\
catalina-tribes.jar,\
catalina.jar,\
diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index 467165f..fee8d8e 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -291,6 +291,10 @@
jarFileName="catalina-tribes.jar"
srcJarFileName="catalina-tribes-src.jar"/>
+ <doMavenInstall artifactId="tomcat-ssi"
+ jarFileName="catalina-ssi.jar"
+ srcJarFileName="catalina-ssi-src.jar"/>
+
<doMavenInstall artifactId="tomcat-storeconfig"
jarFileName="catalina-storeconfig.jar"
srcJarFileName="catalina-storeconfig-src.jar"/>
@@ -385,6 +389,10 @@
jarFileName="catalina-tribes.jar"
srcJarFileName="catalina-tribes-src.jar"/>
+ <doMavenDeploy artifactId="tomcat-ssi"
+ jarFileName="catalina-ssi.jar"
+ srcJarFileName="catalina-ssi-src.jar"/>
+
<doMavenDeploy artifactId="tomcat-storeconfig"
jarFileName="catalina-storeconfig.jar"
srcJarFileName="catalina-storeconfig-src.jar"/>
diff --git a/res/maven/tomcat-ssi.pom b/res/maven/tomcat-ssi.pom
new file mode 100644
index 0000000..5db29d2
--- /dev/null
+++ b/res/maven/tomcat-ssi.pom
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-ssi</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <description>Tomcat Group Communication Package</description>
+ <url>https://tomcat.apache.org/</url>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-juli</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 238f90f..91dbce6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -99,6 +99,9 @@
and refactor loops in <code>FileStore</code> to use the ForEach style.
Pull request provided by Govinda Sakhare. (markt)
</scode>
+ <update>
+ Moved server-side include (SSI) module into a separate JAR library. (schultz)
+ </update>
</changelog>
</subsection>
<subsection name="Coyote">
diff --git a/webapps/docs/class-loader-howto.xml b/webapps/docs/class-loader-howto.xml
index 9054593..eecbc01 100644
--- a/webapps/docs/class-loader-howto.xml
+++ b/webapps/docs/class-loader-howto.xml
@@ -135,6 +135,7 @@ loaders as it is initialized:</p>
container portion of Tomcat.</li>
<li><em>catalina-ant.jar</em> — Tomcat Catalina Ant tasks.</li>
<li><em>catalina-ha.jar</em> — High availability package.</li>
+ <li><em>catalina-ssi.jar</em> — Server-side Includes module.</li>
<li><em>catalina-storeconfig.jar</em> — Generation of XML
configuration files from current state</li>
<li><em>catalina-tribes.jar</em> — Group communication package.</li>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org