Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package tomcat for openSUSE:Factory checked in at 2023-01-17 17:35:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tomcat (Old) and /work/SRC/openSUSE:Factory/.tomcat.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tomcat" Tue Jan 17 17:35:48 2023 rev:89 rq:1058900 version:9.0.43 Changes: -------- --- /work/SRC/openSUSE:Factory/tomcat/tomcat.changes 2022-12-02 13:13:52.934097671 +0100 +++ /work/SRC/openSUSE:Factory/.tomcat.new.32243/tomcat.changes 2023-01-17 17:35:56.885399790 +0100 @@ -1,0 +2,12 @@ +Fri Dec 23 08:20:55 UTC 2022 - Michele Bussolotto <[email protected]> + +- set logrotate for localhost.log, manager.log, host-manager.log and localhost_access_log.txt +- use logrotate for catalina.out + * update tomcat-serverxml-tool and spec to configure server.xml +- Added patch: + * tomcat-9.0-logrotate_everything.patch + * tomcat-serverxml-tool.tar.gz +- Removed: + * tomcat-serverxml-tool-1.0.tar.gz + +------------------------------------------------------------------- Old: ---- tomcat-serverxml-tool-1.0.tar.gz New: ---- tomcat-9.0-logrotate_everything.patch tomcat-serverxml-tool.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat.spec ++++++ --- /var/tmp/diff_new_pack.ShAtiB/_old 2023-01-17 17:35:58.405408359 +0100 +++ /var/tmp/diff_new_pack.ShAtiB/_new 2023-01-17 17:35:58.409408383 +0100 @@ -24,7 +24,6 @@ %define minor_version 0 %define micro_version 43 %define packdname apache-tomcat-%{version}-src -%define serverxmltool_version 1.0 # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/ %global basedir /srv/%{name} %define appdir %{basedir}/webapps @@ -63,7 +62,7 @@ Source30: tomcat-preamble Source31: tomcat-server Source32: tomcat-named.service -Source33: https://gitlab.suse.de/galaxy/tomcat-serverxml-tool/-/archive/%{serverxmltool_version}/tomcat-serverxml-tool-%{serverxmltool_version}.tar.gz +Source33: tomcat-serverxml-tool.tar.gz Source34: tomcat-serverxml-tool.sh.in Source1000: tomcat-rpmlintrc Source1001: https://archive.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz.asc @@ -91,6 +90,7 @@ Patch13: tomcat-9.0.43-CVE-2021-43980.patch Patch14: tomcat-9.0.43-CVE-2022-42252.patch Patch15: tomcat-9.0-fix_catalina.patch +Patch16: tomcat-9.0-logrotate_everything.patch BuildRequires: ant >= 1.8.1 BuildRequires: ant-antlr @@ -272,6 +272,7 @@ %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 # remove date from docs sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl @@ -335,9 +336,9 @@ popd popd -pushd %{_builddir}/tomcat-serverxml-tool-%{serverxmltool_version}/src +pushd %{_builddir}/tomcat-serverxml-tool/src javac -source %{javac_target} -target %{javac_target} com/suse/tcserverxml/ApplyStylesheet.java -jar cfe %{_builddir}/tomcat-serverxml-tool-%{serverxmltool_version}/serverxmltool.jar com.suse.tcserverxml.ApplyStylesheet com/suse/tcserverxml/ApplyStylesheet.class com/suse/tcserverxml/add-context.xslt com/suse/tcserverxml/remove-context.xslt +jar cfe %{_builddir}/tomcat-serverxml-tool/serverxmltool.jar com.suse.tcserverxml.ApplyStylesheet com/suse/tcserverxml/ApplyStylesheet.class com/suse/tcserverxml/add-context.xslt com/suse/tcserverxml/remove-context.xslt com/suse/tcserverxml/add-valve-rotatable-false.xslt popd %install @@ -587,7 +588,7 @@ ln -s -f %{_sysconfdir}/alternatives/servlet.jar %{buildroot}%{_javadir}/servlet.jar # Install tool used to edit server.xml -pushd %{_builddir}/tomcat-serverxml-tool-%{serverxmltool_version} +pushd %{_builddir}/tomcat-serverxml-tool cat %{SOURCE34} | sed 's#@LIBEXECDIR@#%{_libexecdir}#g' >tomcat-serverxml-tool.sh install -m 0755 tomcat-serverxml-tool.sh \ %{buildroot}%{_libexecdir}/%{name}/serverxml-tool.sh @@ -677,35 +678,39 @@ %{libdir}/\[ecj\].jar >/dev/null 2>&1 %post webapps -%{serverxmltool} add %{tomcatappdir}/ROOT / -%{serverxmltool} add %{tomcatappdir}/sample /sample -%{serverxmltool} add %{tomcatappdir}/examples /examples +%{serverxmltool} add-context.xslt docBase=%{tomcatappdir}/ROOT path=/ +%{serverxmltool} add-context.xslt docBase=%{tomcatappdir}/sample path=/sample +%{serverxmltool} add-context.xslt docBase=%{tomcatappdir}/examples path=/examples %postun webapps if [ $1 -eq 0 ]; then # uninstall only - %{serverxmltool} remove %{tomcatappdir}/ROOT / - %{serverxmltool} remove %{tomcatappdir}/sample /sample - %{serverxmltool} remove %{tomcatappdir}/examples /examples + %{serverxmltool} remove-context.xslt docBase=%{tomcatappdir}/ROOT path=/ + %{serverxmltool} remove-context.xslt docBase=%{tomcatappdir}/sample path=/sample + %{serverxmltool} remove-context.xslt docBase=%{tomcatappdir}/examples path=/examples fi %post admin-webapps -%{serverxmltool} add %{tomcatappdir}/host-manager /host-manager %{tomcatappdir}/host-manager/META-INF/context.xml -%{serverxmltool} add %{tomcatappdir}/manager /manager %{tomcatappdir}/manager/META-INF/context.xml +%{serverxmltool} add-context.xslt docBase=%{tomcatappdir}/host-manager path=/host-manager contextXml=%{tomcatappdir}/host-manager/META-INF/context.xml +%{serverxmltool} add-context.xslt docBase=%{tomcatappdir}/manager path=/manager contextXml=%{tomcatappdir}/manager/META-INF/context.xml + %postun admin-webapps if [ $1 -eq 0 ]; then # uninstall only - %{serverxmltool} remove %{tomcatappdir}/host-manager /host-manager - %{serverxmltool} remove %{tomcatappdir}/manager /manager + %{serverxmltool} remove-context.xslt docBase=%{tomcatappdir}/host-manager path=/host-manager + %{serverxmltool} remove-context.xslt docBase=%{tomcatappdir}/manager path=/manager fi %post docs-webapp -%{serverxmltool} add %{tomcatappdir}/docs /docs +%{serverxmltool} add-context.xslt docBase=%{tomcatappdir}/docs path=/docs %postun docs-webapp if [ $1 -eq 0 ]; then # uninstall only - %{serverxmltool} remove %{tomcatappdir}/docs /docs + %{serverxmltool} remove-context.xslt docBase=%{tomcatappdir}/docs path=/docs fi +%posttrans +%{serverxmltool} add-valve-rotatable-false.xslt + %files %doc {LICENSE,NOTICE,RELEASE*} %attr(0755,root,root) %{_bindir}/%{name}-digest @@ -727,7 +732,7 @@ %attr(0755,root,tomcat) %dir %{basedir} %attr(0755,root,tomcat) %dir %{confdir} %attr(0775,root,tomcat) %dir %{appdir} -%attr(0770,tomcat,root) %dir %{logdir} +%attr(0770,tomcat,tomcat) %dir %{logdir} %attr(0660,tomcat,tomcat) %{logdir}/catalina.out %attr(0770,root,tomcat) %dir %{cachedir} %attr(0775,root,tomcat) %dir %{cachedir}/Catalina ++++++ tomcat-9.0-logrotate_everything.patch ++++++ Index: apache-tomcat-9.0.43-src/conf/logging.properties =================================================================== --- apache-tomcat-9.0.43-src.orig/conf/logging.properties +++ apache-tomcat-9.0.43-src/conf/logging.properties @@ -80,3 +80,7 @@ org.apache.catalina.core.ContainerBase.[ 1catalina.org.apache.juli.AsyncFileHandler.suffix = out 1catalina.org.apache.juli.AsyncFileHandler.rotatable = false + +2localhost.org.apache.juli.AsyncFileHandler.rotatable = false +3manager.org.apache.juli.AsyncFileHandler.rotatable = false +4host-manager.org.apache.juli.AsyncFileHandler.rotatable = false ++++++ tomcat-9.0.logrotate ++++++ --- /var/tmp/diff_new_pack.ShAtiB/_old 2023-01-17 17:35:58.561409239 +0100 +++ /var/tmp/diff_new_pack.ShAtiB/_new 2023-01-17 17:35:58.565409261 +0100 @@ -1,11 +1,11 @@ -@@@TCLOG@@@/catalina.out { +@@@TCLOG@@@/catalina.out @@@TCLOG@@@/localhost_access_log.txt @@@TCLOG@@@/host-manager.log @@@TCLOG@@@/localhost.log @@@TCLOG@@@/manager.log{ notifempty copytruncate weekly rotate 52 compress missingok - su root tomcat + su tomcat tomcat create 0644 tomcat tomcat } ++++++ tomcat-serverxml-tool.sh.in ++++++ --- /var/tmp/diff_new_pack.ShAtiB/_old 2023-01-17 17:35:58.653409758 +0100 +++ /var/tmp/diff_new_pack.ShAtiB/_new 2023-01-17 17:35:58.653409758 +0100 @@ -4,41 +4,30 @@ SERVERXML=/etc/tomcat/server.xml function usage { - echo "Usage: <script> add|remove docBase path [contextXmlFile]" + echo "Usage: <script> file.xslt [arg=value]..." } -if [[ -z "$1" || -z "$2" ]]; then +if [[ -z "$1" ]]; then usage exit 1 fi -CMD="$1" -DOCBASE="$2" -CTXPATH="$3" -CONTEXTXML=${4:-''} - -if [ "$CMD" = "add" ]; then - XSLT="add-context.xslt" -elif [ "$CMD" = "remove" ]; then - XSLT="remove-context.xslt" -else - usage - exit 1; -fi +XSLT="$1" +ATTRIBUTE="${@:2}" SUFIX=$(date +%H%M%S%N) rm -f ${SERVERXML}.new${SUFIX} ${SERVERXML}.old${SUFIX} -/usr/bin/java -jar $JAR $XSLT $SERVERXML $DOCBASE $CTXPATH $CONTEXTXML > ${SERVERXML}.new${SUFIX} +/usr/bin/java -jar $JAR $XSLT $SERVERXML $ATTRIBUTE > ${SERVERXML}.new${SUFIX} if [ $? -eq 0 ]; then mv $SERVERXML ${SERVERXML}.old${SUFIX} mv ${SERVERXML}.new${SUFIX} $SERVERXML rm ${SERVERXML}.old${SUFIX} - if [ "$CMD" = "add" ]; then - echo "Added webapp $CTXPATH from $DOCBASE to $SERVERXML." - else - echo "Removed webapp $CTXPATH from $SERVERXML." + if [[ -z "$ATTRIBUTE" ]]; then + echo "Use $XSLT with no attribute" + else + echo "Use $XSLT with attribute $ATTRIBUTE" fi else echo "$SERVERXML was not modified." ++++++ tomcat-serverxml-tool-1.0.tar.gz -> tomcat-serverxml-tool.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomcat-serverxml-tool-1.0/.project new/tomcat-serverxml-tool/.project --- old/tomcat-serverxml-tool-1.0/.project 1970-01-01 01:00:00.000000000 +0100 +++ new/tomcat-serverxml-tool/.project 2022-11-29 11:02:01.553753619 +0100 @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>tomcat-serverxml-tool</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomcat-serverxml-tool-1.0/com/suse/tcserverxml/ApplyStylesheet.java new/tomcat-serverxml-tool/com/suse/tcserverxml/ApplyStylesheet.java --- old/tomcat-serverxml-tool-1.0/com/suse/tcserverxml/ApplyStylesheet.java 1970-01-01 01:00:00.000000000 +0100 +++ new/tomcat-serverxml-tool/com/suse/tcserverxml/ApplyStylesheet.java 2019-02-19 18:33:41.000000000 +0100 @@ -0,0 +1,82 @@ +/** + * Copyright (c) 2019 SUSE LLC + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + */ +package com.suse.tcserverxml; + +import org.w3c.dom.Document; +import org.xml.sax.SAXException; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; + +public class ApplyStylesheet { + + static Document document; + + public static void main(String[] argv) { + if (argv.length != 4 && argv.length != 5) { + System.err.println("Usage: java com.suse.tcserverxml.ApplyStylesheet stylesheet serverXmlFile docBase path [contextXmlFile]"); + System.exit(1); + } + + String stylesheet = argv[0]; + File datafile = new File(argv[1]); + String docBase = argv[2]; + String path = argv[3]; + String contextXml = argv.length > 4 ? argv[4] : null; + + DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance(); + try { + DocumentBuilder builder = docFactory.newDocumentBuilder(); + document = builder.parse(datafile); + + // Use a Transformer for output + TransformerFactory xsltFactory = TransformerFactory.newInstance(); + InputStream styleInput = ApplyStylesheet.class.getResourceAsStream(stylesheet); + StreamSource styleSource = new StreamSource(styleInput); + Transformer transformer = xsltFactory.newTransformer(styleSource); + + transformer.setParameter("docBase", docBase); + transformer.setParameter("path", path.startsWith("/") ? path : "/" + path); + if (contextXml != null) { + transformer.setParameter("contextXml", contextXml); + } + transformer.setParameter("forceUpdate", "false"); + + DOMSource source = new DOMSource(document); + StreamResult result = new StreamResult(System.out); + transformer.transform(source, result); + + } catch (TransformerException | SAXException te) { + System.out.println("\n** Transformation error"); + te.printStackTrace(); + System.exit(2); + } catch (ParserConfigurationException pce) { + System.out.println("\n** Parser configuration error"); + pce.printStackTrace(); + System.exit(3); + } catch (IOException ioe) { + System.out.println("\n** IO error"); + ioe.printStackTrace(); + System.exit(4); + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomcat-serverxml-tool-1.0/com/suse/tcserverxml/add-context.xslt new/tomcat-serverxml-tool/com/suse/tcserverxml/add-context.xslt --- old/tomcat-serverxml-tool-1.0/com/suse/tcserverxml/add-context.xslt 1970-01-01 01:00:00.000000000 +0100 +++ new/tomcat-serverxml-tool/com/suse/tcserverxml/add-context.xslt 2019-02-19 18:33:41.000000000 +0100 @@ -0,0 +1,79 @@ +<?xml version="1.0"?> +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> + + <xsl:param name="path" /> + <xsl:param name="docBase" /> + <xsl:param name="contextXml" /> + <xsl:param name="forceUpdate" /> + + <xsl:template match="@*|node()"> + <xsl:copy> + <xsl:apply-templates select="@*|node()"/> + </xsl:copy> + </xsl:template> + + <xsl:template match="Host[@name='localhost'and Context[@path=$path]]"> + <xsl:copy> + <!-- Update existing Context --> + <xsl:apply-templates select="@*|node()"> + <xsl:with-param name="updateContext" select="$forceUpdate"></xsl:with-param> + </xsl:apply-templates> + </xsl:copy> + </xsl:template> + + <xsl:template match="Host[@name='localhost' and not(Context[@path=$path])]"> + <xsl:copy> + <xsl:apply-templates select="@*|node()"/> + <!-- Add new Context --> + <xsl:call-template name="add_context"/> + </xsl:copy> + </xsl:template> + + <xsl:template match="Context"> + <xsl:param name="setPathDocBase"/> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xsl:if test="$setPathDocBase='true'"> + <xsl:attribute name="path"><xsl:value-of select="$path"/></xsl:attribute> + <xsl:attribute name="docBase"><xsl:value-of select="$docBase"/></xsl:attribute> + </xsl:if> + <xsl:apply-templates select="node()"/> + </xsl:copy> + </xsl:template> + + <xsl:template match="Context[@path=$path]"> + <xsl:param name="updateContext"/> + <xsl:choose> + <xsl:when test="$updateContext='true'"> + <xsl:call-template name="add_context"/> + </xsl:when> + <xsl:otherwise> + <xsl:copy> + <xsl:apply-templates select="@*|node()"/> + </xsl:copy> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + + <xsl:template name="add_context"> + <xsl:choose> + <xsl:when test="not($contextXml)"> + <xsl:call-template name="add_simple_context"/> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="document($contextXml)/Context"> + <xsl:with-param name="setPathDocBase">true</xsl:with-param> + </xsl:apply-templates> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + + <xsl:template name="add_simple_context"> + <Context path="{$path}" docBase="{$docBase}"> + <Resources allowLinking="true" /> + </Context> + <xsl:text>
</xsl:text> + </xsl:template> + +</xsl:stylesheet> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomcat-serverxml-tool-1.0/com/suse/tcserverxml/remove-context.xslt new/tomcat-serverxml-tool/com/suse/tcserverxml/remove-context.xslt --- old/tomcat-serverxml-tool-1.0/com/suse/tcserverxml/remove-context.xslt 1970-01-01 01:00:00.000000000 +0100 +++ new/tomcat-serverxml-tool/com/suse/tcserverxml/remove-context.xslt 2019-02-19 18:33:41.000000000 +0100 @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> + + <xsl:param name="docBase"/> + <xsl:param name="path"/> + + <xsl:template match="@*|node()"> + <xsl:copy> + <xsl:apply-templates select="@*|node()"/> + </xsl:copy> + </xsl:template> + + <xsl:template match="Context[@path=$path]"/> + +</xsl:stylesheet> + Binary files old/tomcat-serverxml-tool-1.0/src/com/suse/tcserverxml/ApplyStylesheet.class and new/tomcat-serverxml-tool/src/com/suse/tcserverxml/ApplyStylesheet.class differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomcat-serverxml-tool-1.0/src/com/suse/tcserverxml/ApplyStylesheet.java new/tomcat-serverxml-tool/src/com/suse/tcserverxml/ApplyStylesheet.java --- old/tomcat-serverxml-tool-1.0/src/com/suse/tcserverxml/ApplyStylesheet.java 2020-11-02 17:48:38.000000000 +0100 +++ new/tomcat-serverxml-tool/src/com/suse/tcserverxml/ApplyStylesheet.java 2023-01-10 12:26:56.968603612 +0100 @@ -32,16 +32,14 @@ static Document document; public static void main(String[] argv) { - if (argv.length != 4 && argv.length != 5) { - System.err.println("Usage: java com.suse.tcserverxml.ApplyStylesheet stylesheet serverXmlFile docBase path [contextXmlFile]"); + if (argv.length < 2 ) { + System.err.println("Usage: <script> file.xslt [arg=val]..."); System.exit(1); } String stylesheet = argv[0]; - File datafile = new File(argv[1]); - String docBase = argv[2]; - String path = argv[3]; - String contextXml = argv.length > 4 ? argv[4] : null; + String data = argv[1]; + File datafile = new File(data); DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance(); try { @@ -53,11 +51,16 @@ InputStream styleInput = ApplyStylesheet.class.getResourceAsStream(stylesheet); StreamSource styleSource = new StreamSource(styleInput); Transformer transformer = xsltFactory.newTransformer(styleSource); - - transformer.setParameter("docBase", docBase); - transformer.setParameter("path", path.startsWith("/") ? path : "/" + path); - if (contextXml != null) { - transformer.setParameter("contextXml", contextXml); + for(int i = 2 ; i < argv.length ; i++) { + if (!argv[i].contains("=")) { + System.err.println("arg " + argv[0]); + System.err.println("arg " + argv[1]); + System.err.println("Error with arg " + argv[i] + ". = is missing"); + System.exit(1); + } + String arg = argv[i].split("=")[0]; + String val = argv[i].split("=")[1]; + transformer.setParameter(arg, val); } DOMSource source = new DOMSource(document); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomcat-serverxml-tool-1.0/src/com/suse/tcserverxml/add-valve-rotatable-false.xslt new/tomcat-serverxml-tool/src/com/suse/tcserverxml/add-valve-rotatable-false.xslt --- old/tomcat-serverxml-tool-1.0/src/com/suse/tcserverxml/add-valve-rotatable-false.xslt 1970-01-01 01:00:00.000000000 +0100 +++ new/tomcat-serverxml-tool/src/com/suse/tcserverxml/add-valve-rotatable-false.xslt 2023-01-10 14:35:57.455946573 +0100 @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> + + <xsl:template match="@*|node()"> + <xsl:copy> + <xsl:apply-templates select="@*|node()"/> + </xsl:copy> + </xsl:template> + + <xsl:template match="Valve[@className='org.apache.catalina.valves.AccessLogValve']"> + <xsl:copy> + <xsl:attribute name="rotatable">false</xsl:attribute> + <xsl:apply-templates select="@*|node()"/> + </xsl:copy> + </xsl:template> +</xsl:stylesheet> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomcat-serverxml-tool-1.0/src/com/suse/tcserverxml/remove-valve.xslt new/tomcat-serverxml-tool/src/com/suse/tcserverxml/remove-valve.xslt --- old/tomcat-serverxml-tool-1.0/src/com/suse/tcserverxml/remove-valve.xslt 1970-01-01 01:00:00.000000000 +0100 +++ new/tomcat-serverxml-tool/src/com/suse/tcserverxml/remove-valve.xslt 2023-01-10 13:42:33.119140863 +0100 @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> + + <xsl:param name="className"/> + <xsl:template match="@*|node()"> + <xsl:copy> + <xsl:apply-templates select="@*|node()"/> + </xsl:copy> + </xsl:template> + + <xsl:template match="Valve[@className=$className]"/> + +</xsl:stylesheet> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomcat-serverxml-tool-1.0/tomcat-serverxml-tool.iml new/tomcat-serverxml-tool/tomcat-serverxml-tool.iml --- old/tomcat-serverxml-tool-1.0/tomcat-serverxml-tool.iml 1970-01-01 01:00:00.000000000 +0100 +++ new/tomcat-serverxml-tool/tomcat-serverxml-tool.iml 2021-12-20 11:46:19.701638313 +0100 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module> \ No newline at end of file Binary files old/tomcat-serverxml-tool-1.0/tomcat-serverxml-tool.jar and new/tomcat-serverxml-tool/tomcat-serverxml-tool.jar differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomcat-serverxml-tool-1.0/tomcat-serverxml-tool.sh new/tomcat-serverxml-tool/tomcat-serverxml-tool.sh --- old/tomcat-serverxml-tool-1.0/tomcat-serverxml-tool.sh 2020-11-02 17:48:38.000000000 +0100 +++ new/tomcat-serverxml-tool/tomcat-serverxml-tool.sh 2023-01-10 12:25:53.771954831 +0100 @@ -4,44 +4,29 @@ SERVERXML=/etc/tomcat/server.xml function usage { - echo "Usage: <script> add|remove docBase path [contextXmlFile]" + echo "Usage: <script> file.xslt [arg=value]..." } -if [[ -z "$1" || -z "$2" ]]; then +if [[ -z "$1" ]]; then usage exit 1 fi -CMD="$1" -DOCBASE="$2" -CTXPATH="$3" -CONTEXTXML=${4:-''} - -if [ "$CMD" = "add" ]; then - XSLT="add-context.xslt" -elif [ "$CMD" = "remove" ]; then - XSLT="remove-context.xslt" -else - usage - exit 1; -fi +XSLT="$1" +ATTRIBUTE="${@:2}" SUFIX=$(date +%H%M%S%N) rm -f ${SERVERXML}.new${SUFIX} ${SERVERXML}.old${SUFIX} -/usr/bin/java -jar $JAR $XSLT $SERVERXML $DOCBASE $CTXPATH $CONTEXTXML > ${SERVERXML}.new${SUFIX} +/usr/bin/java -jar $JAR $XSLT $SERVERXML $ATTRIBUTE > ${SERVERXML}.new${SUFIX} if [ $? -eq 0 ]; then mv $SERVERXML ${SERVERXML}.old${SUFIX} mv ${SERVERXML}.new${SUFIX} $SERVERXML rm ${SERVERXML}.old${SUFIX} - if [ "$CMD" = "add" ]; then - echo "Added webapp $CTXPATH from $DOCBASE to $SERVERXML." - else - echo "Removed webapp $CTXPATH from $SERVERXML." - fi + echo "Use $XSLT with attribute $ATTRIBUTE" else echo "$SERVERXML was not modified." rm ${SERVERXML}.new${SUFIX} exit 2 -fi \ No newline at end of file +fi
