SF.net SVN: gar:[26351] csw/mgar/pkg

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Thu Feb 1 13:08:14 CET 2018


Revision: 26351
          http://sourceforge.net/p/gar/code/26351
Author:   dmichelsen
Date:     2018-02-01 12:08:14 +0000 (Thu, 01 Feb 2018)
Log Message:
-----------
tomcat9: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/tomcat9/
    csw/mgar/pkg/tomcat9/trunk/Makefile
    csw/mgar/pkg/tomcat9/trunk/checksums
    csw/mgar/pkg/tomcat9/trunk/files/cswtomcat9

Removed Paths:
-------------
    csw/mgar/pkg/tomcat9/trunk/Makefile
    csw/mgar/pkg/tomcat9/trunk/checksums
    csw/mgar/pkg/tomcat9/trunk/files/cswtomcat8

Deleted: csw/mgar/pkg/tomcat9/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tomcat8/trunk/Makefile	2016-07-06 11:21:51 UTC (rev 25802)
+++ csw/mgar/pkg/tomcat9/trunk/Makefile	2018-02-01 12:08:14 UTC (rev 26351)
@@ -1,68 +0,0 @@
-NAME = apache-tomcat
-VERSION = 8.0.27
-
-DESCRIPTION = Apache Jakarta Tomcat 8 Servlet/JSP Container
-
-MASTER_SITES = http://ftp.fau.de/apache/tomcat/tomcat-8/v$(VERSION)/bin/
-DISTFILES += $(DISTNAME).tar.gz
-DISTFILES += cswusergroup
-DISTFILES += cswtomcat8
-#DISTFILES    += LICENSE
-NOGITPATCH    = 1
-
-VENDOR_URL = http://tomcat.apache.org/
-
-PACKAGES += CSWtomcat8
-SPKG_DESC_CSWtomcat8 = Apache Jakarta Tomcat 8 Servlet/JSP Container
-# PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWtomcat += CSWjre8
-ARCHALL_CSWtomcat8 = 1
-
-CONFIGURE_SCRIPTS =
-BUILD_SCRIPTS =
-TEST_SCRIPTS =
-INSTALL_SCRIPTS = tomcat
-
-INITSMF = /etc/opt/csw/init.d/cswtomcat8
-USERGROUP = /etc/opt/csw/pkg/CSWtomcat8/cswusergroup
-PRESERVECONF = /etc/opt/csw/tomcat8/conf/.*
-
-PROTOTYPE_MODIFIERS += varuser
-PROTOTYPE_FILES_varuser = /var/opt/csw/tomcat8/.*
-PROTOTYPE_USER_varuser  = tomcat
-PROTOTYPE_GROUP_varuser = tomcat
-PROTOTYPE_CLASS_varuser = ugfiles
-
-PROTOTYPE_MODIFIERS += etcperm
-PROTOTYPE_FILES_etcperm = /etc/opt/csw/tomcat8/conf/.*\.CSW
-PROTOTYPE_PERMS_etcperm = 0640
-PROTOTYPE_USER_etcperm  = tomcat
-PROTOTYPE_GROUP_etcperm = tomcat
-
-include gar/category.mk
-
-xpost-extract:
-	( for i in temp work logs conf ; do  find $(WORKSRC)/$$i -type d -exec chmod 0750 {} \;  ; find $(WORKSRC)/$$i -type f -exec chmod 0640 {} \; ; done )
-	@$(MAKECOOKIE)
-
-install-tomcat:
-	mkdir -p $(DESTDIR)/etc/opt/csw/init.d
-	mkdir -p $(DESTDIR)/etc/opt/csw/pkg/tomcat8
-	mkdir -p $(DESTDIR)/etc/opt/csw/tomcat8
-	mkdir -p $(DESTDIR)/opt/csw/etc/tomcat8
-	mkdir -p $(DESTDIR)/var/opt/csw/tomcat8
-	mkdir -p $(DESTDIR)/opt/csw/share
-	cp -fr $(WORKDIR)/$(DISTNAME) $(DESTDIR)/opt/csw/share/tomcat8
-	mv $(DESTDIR)/opt/csw/share/tomcat8/conf $(DESTDIR)/etc/opt/csw/tomcat8
-	mv $(DESTDIR)/opt/csw/share/tomcat8/logs $(DESTDIR)/var/opt/csw/tomcat8
-	mv $(DESTDIR)/opt/csw/share/tomcat8/work $(DESTDIR)/var/opt/csw/tomcat8
-	mv $(DESTDIR)/opt/csw/share/tomcat8/temp $(DESTDIR)/var/opt/csw/tomcat8
-	ln -s ../../../../etc/opt/csw/tomcat8/conf $(DESTDIR)/opt/csw/share/tomcat8/conf
-	ln -s ../../../../var/opt/csw/tomcat8/logs $(DESTDIR)/opt/csw/share/tomcat8/logs
-	ln -s ../../../../var/opt/csw/tomcat8/work $(DESTDIR)/opt/csw/share/tomcat8/work
-	ln -s ../../../../var/opt/csw/tomcat8/temp $(DESTDIR)/opt/csw/share/tomcat8/temp
-	rm $(DESTDIR)/var/opt/csw/tomcat8/temp/safeToDelete.tmp
-	#cp -fr $(WORKDIR)/cswtomcat8 $(DESTDIR)/etc/opt/csw/init.d
-	ginstall -m 644 $(WORKDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/$(NAME)
-	@$(MAKECOOKIE)
-

Copied: csw/mgar/pkg/tomcat9/trunk/Makefile (from rev 26232, csw/mgar/pkg/tomcat8/trunk/Makefile)
===================================================================
--- csw/mgar/pkg/tomcat9/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/tomcat9/trunk/Makefile	2018-02-01 12:08:14 UTC (rev 26351)
@@ -0,0 +1,68 @@
+NAME = apache-tomcat
+VERSION = 9.0.4
+
+DESCRIPTION = Apache Jakarta Tomcat 9 Servlet/JSP Container
+
+MASTER_SITES = http://ftp.fau.de/apache/tomcat/tomcat-9/v$(VERSION)/bin/
+DISTFILES += $(DISTNAME).tar.gz
+DISTFILES += cswusergroup
+DISTFILES += cswtomcat9
+#DISTFILES    += LICENSE
+NOGITPATCH    = 1
+
+VENDOR_URL = http://tomcat.apache.org/
+
+PACKAGES += CSWtomcat9
+SPKG_DESC_CSWtomcat9 = Apache Jakarta Tomcat 9 Servlet/JSP Container
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWtomcat += CSWjre8
+ARCHALL_CSWtomcat9 = 1
+
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS =
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = tomcat
+
+INITSMF = /etc/opt/csw/init.d/cswtomcat9
+USERGROUP = /etc/opt/csw/pkg/CSWtomcat9/cswusergroup
+PRESERVECONF = /etc/opt/csw/tomcat9/conf/.*
+
+PROTOTYPE_MODIFIERS += varuser
+PROTOTYPE_FILES_varuser = /var/opt/csw/tomcat9/.*
+PROTOTYPE_USER_varuser  = tomcat
+PROTOTYPE_GROUP_varuser = tomcat
+PROTOTYPE_CLASS_varuser = ugfiles
+
+PROTOTYPE_MODIFIERS += etcperm
+PROTOTYPE_FILES_etcperm = /etc/opt/csw/tomcat9/conf/.*\.CSW
+PROTOTYPE_PERMS_etcperm = 0640
+PROTOTYPE_USER_etcperm  = tomcat
+PROTOTYPE_GROUP_etcperm = tomcat
+
+include gar/category.mk
+
+xpost-extract:
+	( for i in temp work logs conf ; do  find $(WORKSRC)/$$i -type d -exec chmod 0750 {} \;  ; find $(WORKSRC)/$$i -type f -exec chmod 0640 {} \; ; done )
+	@$(MAKECOOKIE)
+
+install-tomcat:
+	mkdir -p $(DESTDIR)/etc/opt/csw/init.d
+	mkdir -p $(DESTDIR)/etc/opt/csw/pkg/tomcat9
+	mkdir -p $(DESTDIR)/etc/opt/csw/tomcat9
+	mkdir -p $(DESTDIR)/opt/csw/etc/tomcat9
+	mkdir -p $(DESTDIR)/var/opt/csw/tomcat9
+	mkdir -p $(DESTDIR)/opt/csw/share
+	cp -fr $(WORKDIR)/$(DISTNAME) $(DESTDIR)/opt/csw/share/tomcat9
+	mv $(DESTDIR)/opt/csw/share/tomcat9/conf $(DESTDIR)/etc/opt/csw/tomcat9
+	mv $(DESTDIR)/opt/csw/share/tomcat9/logs $(DESTDIR)/var/opt/csw/tomcat9
+	mv $(DESTDIR)/opt/csw/share/tomcat9/work $(DESTDIR)/var/opt/csw/tomcat9
+	mv $(DESTDIR)/opt/csw/share/tomcat9/temp $(DESTDIR)/var/opt/csw/tomcat9
+	ln -s ../../../../etc/opt/csw/tomcat9/conf $(DESTDIR)/opt/csw/share/tomcat9/conf
+	ln -s ../../../../var/opt/csw/tomcat9/logs $(DESTDIR)/opt/csw/share/tomcat9/logs
+	ln -s ../../../../var/opt/csw/tomcat9/work $(DESTDIR)/opt/csw/share/tomcat9/work
+	ln -s ../../../../var/opt/csw/tomcat9/temp $(DESTDIR)/opt/csw/share/tomcat9/temp
+	rm $(DESTDIR)/var/opt/csw/tomcat9/temp/safeToDelete.tmp
+	#cp -fr $(WORKDIR)/cswtomcat9 $(DESTDIR)/etc/opt/csw/init.d
+	ginstall -m 644 $(WORKDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/$(NAME)
+	@$(MAKECOOKIE)
+

Deleted: csw/mgar/pkg/tomcat9/trunk/checksums
===================================================================
--- csw/mgar/pkg/tomcat8/trunk/checksums	2016-07-06 11:21:51 UTC (rev 25802)
+++ csw/mgar/pkg/tomcat9/trunk/checksums	2018-02-01 12:08:14 UTC (rev 26351)
@@ -1 +0,0 @@
-a20be33bfb31a2c6e2eca755fb211cb9  apache-tomcat-8.0.27.tar.gz

Copied: csw/mgar/pkg/tomcat9/trunk/checksums (from rev 26232, csw/mgar/pkg/tomcat8/trunk/checksums)
===================================================================
--- csw/mgar/pkg/tomcat9/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/tomcat9/trunk/checksums	2018-02-01 12:08:14 UTC (rev 26351)
@@ -0,0 +1 @@
+079b1c9316ce12566d4c3993fb9165ea  apache-tomcat-9.0.4.tar.gz

Deleted: csw/mgar/pkg/tomcat9/trunk/files/cswtomcat8
===================================================================
--- csw/mgar/pkg/tomcat8/trunk/files/cswtomcat8	2016-07-06 11:21:51 UTC (rev 25802)
+++ csw/mgar/pkg/tomcat9/trunk/files/cswtomcat8	2018-02-01 12:08:14 UTC (rev 26351)
@@ -1,143 +0,0 @@
-#!/sbin/sh
-
-##################################################################
-#
-# Configuration file documentation
-#
-# tomcat8
-#
-#     This file let you change the values of a few variables used 
-#     by the init script to control the environment of tomcat6
-#     The list of variables is described below.
-#
-#     The configuration file can be stored in two different path :
-#
-#     /etc/opt/csw
-#         This directory contain machine specific config files
-#
-#     /opt/csw/etc
-#         This directory contain global config files
-#
-#     If there exist a /etc/opt/csw/tomcat8 config file, then the
-#     environment variables defined in this file are used and the
-#     /opt/csw/etc/tomcat6/conf/tomcat6 file is ignored even if it 
-#     exist.
-#
-#     If there exist only a /opt/csw/etc/tomcat8/conf/tomcat8 config
-#     file, then the environnement variables defined in this file are
-#     used.
-#
-#     If no configuration file exist, all the variables needed by
-#     tomcat6 are let to their default values (see the values 
-#     below).
-#
-#     In all cases, the default values are defined, and supereded
-#     by the values stored in the configuration file. This is 
-#     necessary to define an environment usuable by tomcat.
-# 
-# Environment variables documentation
-#
-# JAVA_HOME
-#
-#     JAVA_HOME specify which version of Java should be used
-#     by tomcat. You can supered the default value in the tomcat6
-#     configuration file. The value of this variable must be a path
-#     pointing to the root of a valid JRE or JDK (the root dir not
-#     the bin dir !). The default value is /usr/java.
-#
-# TOMCAT_USER
-#
-#     TOMCAT_USER variable defines the Solaris user running the 
-#     tomcat server. You can supered the default valude in the 
-#     tomcat6 configuration file. The value of this variable must 
-#     be a valid Solaris user (ie: root, nobody). The default value
-#     is root.
-#
-#     WARNING : By default the directory permissions are set for
-#     the root user (no write access for 'nobody').
-#     The logs are stored in /opt/csw/share/tomcat6/logs, and do belong
-#     to root user. If you change the TOMCAT_USER, be sure that this
-#     user can write in the log directory.
-#
-#     The following permissions may also have to be changed :
-#     . give read access to the conf directory and all its subdirs
-#     . give write access to the conf dir to let tomcat create new files
-#     . give write access to the work dir
-#
-
-##################################################################
-# Setting the default values
-#
-# DO NOT EDIT THE FOLLOWING VALUES. 
-#
-# Use the configuration file to supered their value
-#
-
-SPECIFIC_CONFIG_FILE=/etc/opt/csw/cswtomcat8
-GLOBAL_CONFIG_FILE=/opt/csw/etc/cswtomcat8
-
-JAVA_HOME=/usr/java
-TOMCAT_USER=tomcat
-
-##################################################################
-# Search for a custom configuration file in the default CSW paths
-#
-
-if [ -f $SPECIFIC_CONFIG_FILE ]
-then
-	echo Using configuration file : $SPECIFIC_CONFIG_FILE
-        . $SPECIFIC_CONFIG_FILE
-else
-        if [ -f $GLOBAL_CONFIG_FILE ]
-        then
-		echo Using configuration file : $GLOBAL_CONFIG_FILE
-                . $GLOBAL_CONFIG_FILE
-	fi
-fi
-
-echo "Using Java from : $JAVA_HOME"
-echo "Running as : $TOMCAT_USER (please see documentation included in $0 to change user)"
-
-##################################################################
-# Test if java is in the path defined by JAVA_HOME, if not try to 
-# guess path by testing standard directories
-#
-
-if [ ! -f $JAVA_HOME/bin/java ]
-then
-        echo "Java not found in $JAVA_HOME/bin. Trying /usr/java/bin"
-        JAVA_HOME=/usr/java
-        if [ ! -f $JAVA_HOME/bin/java ]
-        then
-                echo "Java not found in $JAVA_HOME/bin. Trying /usr/j2se/bin"
-                JAVA_HOME=/usr/j2se
-                if [ ! -f $JAVA_HOME/bin/java ]
-                then
-                        echo "Java not found in $JAVA_HOME/bin"
-                        echo "Java not found !"
-                        exit 1
-                fi
-        fi
-fi
-
-CATALINA_HOME=/opt/csw/share/tomcat8
-export JAVA_HOME
-export CATALINA_HOME
-
-case $1 in 
-'start')
-	/bin/su $TOMCAT_USER -c $CATALINA_HOME/bin/startup.sh
-        ;;
-'stop')
-	/bin/su $TOMCAT_USER -c $CATALINA_HOME/bin/shutdown.sh
-        ;;
-
-'restart')
-	/bin/su $TOMCAT_USER -c $CATALINA_HOME/bin/shutdown.sh
-	/bin/su $TOMCAT_USER -c $CATALINA_HOME/bin/startup.sh
-        ;;
-*)
-        echo "Usage: $0 { start | stop | restart }"
-        exit 1
-        ;;
-esac    

Copied: csw/mgar/pkg/tomcat9/trunk/files/cswtomcat9 (from rev 25802, csw/mgar/pkg/tomcat8/trunk/files/cswtomcat8)
===================================================================
--- csw/mgar/pkg/tomcat9/trunk/files/cswtomcat9	                        (rev 0)
+++ csw/mgar/pkg/tomcat9/trunk/files/cswtomcat9	2018-02-01 12:08:14 UTC (rev 26351)
@@ -0,0 +1,143 @@
+#!/sbin/sh
+
+##################################################################
+#
+# Configuration file documentation
+#
+# tomcat9
+#
+#     This file let you change the values of a few variables used 
+#     by the init script to control the environment of tomcat6
+#     The list of variables is described below.
+#
+#     The configuration file can be stored in two different path :
+#
+#     /etc/opt/csw
+#         This directory contain machine specific config files
+#
+#     /opt/csw/etc
+#         This directory contain global config files
+#
+#     If there exist a /etc/opt/csw/tomcat9 config file, then the
+#     environment variables defined in this file are used and the
+#     /opt/csw/etc/tomcat6/conf/tomcat6 file is ignored even if it 
+#     exist.
+#
+#     If there exist only a /opt/csw/etc/tomcat9/conf/tomcat9 config
+#     file, then the environnement variables defined in this file are
+#     used.
+#
+#     If no configuration file exist, all the variables needed by
+#     tomcat6 are let to their default values (see the values 
+#     below).
+#
+#     In all cases, the default values are defined, and supereded
+#     by the values stored in the configuration file. This is 
+#     necessary to define an environment usuable by tomcat.
+# 
+# Environment variables documentation
+#
+# JAVA_HOME
+#
+#     JAVA_HOME specify which version of Java should be used
+#     by tomcat. You can supered the default value in the tomcat6
+#     configuration file. The value of this variable must be a path
+#     pointing to the root of a valid JRE or JDK (the root dir not
+#     the bin dir !). The default value is /usr/java.
+#
+# TOMCAT_USER
+#
+#     TOMCAT_USER variable defines the Solaris user running the 
+#     tomcat server. You can supered the default valude in the 
+#     tomcat6 configuration file. The value of this variable must 
+#     be a valid Solaris user (ie: root, nobody). The default value
+#     is root.
+#
+#     WARNING : By default the directory permissions are set for
+#     the root user (no write access for 'nobody').
+#     The logs are stored in /opt/csw/share/tomcat6/logs, and do belong
+#     to root user. If you change the TOMCAT_USER, be sure that this
+#     user can write in the log directory.
+#
+#     The following permissions may also have to be changed :
+#     . give read access to the conf directory and all its subdirs
+#     . give write access to the conf dir to let tomcat create new files
+#     . give write access to the work dir
+#
+
+##################################################################
+# Setting the default values
+#
+# DO NOT EDIT THE FOLLOWING VALUES. 
+#
+# Use the configuration file to supered their value
+#
+
+SPECIFIC_CONFIG_FILE=/etc/opt/csw/cswtomcat9
+GLOBAL_CONFIG_FILE=/opt/csw/etc/cswtomcat9
+
+JAVA_HOME=/usr/java
+TOMCAT_USER=tomcat
+
+##################################################################
+# Search for a custom configuration file in the default CSW paths
+#
+
+if [ -f $SPECIFIC_CONFIG_FILE ]
+then
+	echo Using configuration file : $SPECIFIC_CONFIG_FILE
+        . $SPECIFIC_CONFIG_FILE
+else
+        if [ -f $GLOBAL_CONFIG_FILE ]
+        then
+		echo Using configuration file : $GLOBAL_CONFIG_FILE
+                . $GLOBAL_CONFIG_FILE
+	fi
+fi
+
+echo "Using Java from : $JAVA_HOME"
+echo "Running as : $TOMCAT_USER (please see documentation included in $0 to change user)"
+
+##################################################################
+# Test if java is in the path defined by JAVA_HOME, if not try to 
+# guess path by testing standard directories
+#
+
+if [ ! -f $JAVA_HOME/bin/java ]
+then
+        echo "Java not found in $JAVA_HOME/bin. Trying /usr/java/bin"
+        JAVA_HOME=/usr/java
+        if [ ! -f $JAVA_HOME/bin/java ]
+        then
+                echo "Java not found in $JAVA_HOME/bin. Trying /usr/j2se/bin"
+                JAVA_HOME=/usr/j2se
+                if [ ! -f $JAVA_HOME/bin/java ]
+                then
+                        echo "Java not found in $JAVA_HOME/bin"
+                        echo "Java not found !"
+                        exit 1
+                fi
+        fi
+fi
+
+CATALINA_HOME=/opt/csw/share/tomcat9
+export JAVA_HOME
+export CATALINA_HOME
+
+case $1 in 
+'start')
+	/bin/su $TOMCAT_USER -c $CATALINA_HOME/bin/startup.sh
+        ;;
+'stop')
+	/bin/su $TOMCAT_USER -c $CATALINA_HOME/bin/shutdown.sh
+        ;;
+
+'restart')
+	/bin/su $TOMCAT_USER -c $CATALINA_HOME/bin/shutdown.sh
+	/bin/su $TOMCAT_USER -c $CATALINA_HOME/bin/startup.sh
+        ;;
+*)
+        echo "Usage: $0 { start | stop | restart }"
+        exit 1
+        ;;
+esac    

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list