[csw-devel] SF.net SVN: gar:[17122] csw/mgar/pkg/mule/trunk

[idogan23 at users.sourceforge.net]

Revision: 17122
          http://gar.svn.sourceforge.net/gar/?rev=17122&view=rev
Author:   idogan23
Date:     2012-02-21 15:51:40 +0000 (Tue, 21 Feb 2012)
Log Message:
-----------
mule: few packaging fixes

Modified Paths:
--------------
    csw/mgar/pkg/mule/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/mule/trunk/files/0001-piddir.patch
    csw/mgar/pkg/mule/trunk/files/CSWmule.postinstall

Modified: csw/mgar/pkg/mule/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mule/trunk/Makefile	2012-02-21 15:15:41 UTC (rev 17121)
+++ csw/mgar/pkg/mule/trunk/Makefile	2012-02-21 15:51:40 UTC (rev 17122)
@@ -13,9 +13,12 @@
 DISTFILES  = $(DISTNAME).tar.gz
 DISTFILES += cswusergroup
 DISTFILES += cswmule.xml
+DISTFILES += cswmule
+DISTFILES += CSWmule.postinstall
 
 PATCHFILES += 0001-javapath.patch
 PATCHFILES += 0001-runasusermule.patch
+PATCHFILES += 0001-piddir.patch
 
 PACKAGING_PLATFORMS +=  solaris10-sparc solaris10-i386
 
@@ -37,11 +40,11 @@
 
 SPKG_CLASSES  = none cswinitsmf cswsampleconf cswusergroup ugfiles
 INITSMF       = /etc/opt/csw/init.d/cswmule
-PRESERVECONF  = /opt/csw/mule/conf/.*
+PRESERVECONF  = /etc/opt/csw/mule/.*
 USERGROUP     = /etc/opt/csw/pkg/CSWmule/cswusergroup
 
 PROTOTYPE_MODIFIERS          = mule_ugfiles
-MULE_UGFILES                 = /var/opt/csw/mule/logs
+MULE_UGFILES                 = /var/opt/csw/mule/logs /var/opt/csw/mule/pid
 PROTOTYPE_FILES_mule_ugfiles = $(MULE_UGFILES)
 PROTOTYPE_USER_mule_ugfiles  = mule
 PROTOTYPE_GROUP_mule_ugfiles = mule
@@ -53,12 +56,16 @@
 	@ginstall -d $(DESTDIR)/var/opt/csw/mule
 	@mv $(DESTDIR)/opt/csw/mule/logs $(DESTDIR)/var/opt/csw/mule
 	@ln -s /var/opt/csw/mule/logs $(DESTDIR)/opt/csw/mule/logs
+	@ginstall -d $(DESTDIR)/etc/opt/csw
+	@mv $(DESTDIR)/opt/csw/mule/conf $(DESTDIR)/etc/opt/csw/mule
+	@ln -s /etc/opt/csw/mule $(DESTDIR)/opt/csw/mule/conf
 	@ginstall -d $(DESTDIR)/etc/opt/csw/init.d
 	@ginstall -m 755 $(FILEDIR)/cswmule $(DESTDIR)/etc/opt/csw/init.d/cswmule
 	@ginstall -d $(DESTDIR)/var/opt/csw/svc/manifest/application
 	@ginstall -m 644 $(FILEDIR)/cswmule.xml $(DESTDIR)/var/opt/csw/svc/manifest/application/cswmule.xml
 	@ginstall -d $(DESTDIR)/etc/opt/csw/pkg/CSWmule
 	@ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWmule/cswusergroup
+	@ginstall -d $(DESTDIR)/var/opt/csw/mule/pid
 	@$(MAKECOOKIE)
 
 include gar/category.mk

Added: csw/mgar/pkg/mule/trunk/files/0001-piddir.patch
===================================================================
--- csw/mgar/pkg/mule/trunk/files/0001-piddir.patch	                        (rev 0)
+++ csw/mgar/pkg/mule/trunk/files/0001-piddir.patch	2012-02-21 15:51:40 UTC (rev 17122)
@@ -0,0 +1,25 @@
+From 0fce78cdc5e186ec46881d054fc66d6232c21006 Mon Sep 17 00:00:00 2001
+From: Ihsan Dogan <ihsan at opencsw.org>
+Date: Tue, 21 Feb 2012 15:16:11 +0100
+Subject: [PATCH] piddir
+
+---
+ bin/mule |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/bin/mule b/bin/mule
+index 467b4c6..f9a9c7f 100755
+--- a/bin/mule
++++ b/bin/mule
+@@ -125,7 +125,7 @@ JPDA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
+ PRIORITY=
+ 
+ # Location of the pid file.
+-PIDDIR="."
++PIDDIR="/var/opt/csw/mule/pid"
+ 
+ # If uncommented, causes the Wrapper to be shutdown using an anchor file.
+ #  When launched with the 'start' command, it will also ignore all INT and
+-- 
+1.7.9
+

Added: csw/mgar/pkg/mule/trunk/files/CSWmule.postinstall
===================================================================
--- csw/mgar/pkg/mule/trunk/files/CSWmule.postinstall	                        (rev 0)
+++ csw/mgar/pkg/mule/trunk/files/CSWmule.postinstall	2012-02-21 15:51:40 UTC (rev 17122)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ ! /etc/opt/csw/mule/wrapper-additional.conf ]
+then
+	touch /etc/opt/csw/mule/wrapper-additional.conf
+	chown mule:mule /etc/opt/csw/mule/wrapper-additional.conf
+fi

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