net-im/tigase-server: New config structure, remove previous version completly before building

svn path=/sunrise/; revision=7359

7 files changed, 86 insertions, 16 deletions

diff --git a/net-im/tigase-server/ChangeLog b/net-im/tigase-server/ChangeLog
index b19976284..08a9ced74 100644
--- a/net-im/tigase-server/ChangeLog
+++ b/net-im/tigase-server/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  17 Nov 2008; Mads Randstoft (mazzachre) <mads_randstoft@yahoo.dk>
+  -tigase-server-9999_pre3.ebuild, +tigase-server-9999_pre4.ebuild,
+  files/conf_d_tigase, files/init_d_tigase, +files/logger.patch,
+  +files/tigase.properties:
+  New config structure, remove previous version completly before building
+
   09 Oct 2008; Mads Randstoft (mazzachre) mads_randstoft@yahoo.dk
   -tigase-server-9999_pre2.ebuild, +tigase-server-9999_pre3.ebuild,
   files/init_d_tigase:
diff --git a/net-im/tigase-server/Manifest b/net-im/tigase-server/Manifest
index ad4304716..6ea523738 100644
--- a/net-im/tigase-server/Manifest
+++ b/net-im/tigase-server/Manifest
@@ -1,7 +1,9 @@
 AUX classpaths.patch 1353 RMD160 d4108e2629e309d0495e75a039d3084864b908dc SHA1 81d0f0c657af9f18a7e05b2eadff5833d54a599e SHA256 e44585d895a3d3759b4516ab6cc1808b985a270ab9668379f9ca61b591c9c99c
-AUX conf_d_tigase 187 RMD160 ae8d29f67017506298ad19235555c0fe3a844ec3 SHA1 958e0dfb910f872e6e9f89491580c388d9af562d SHA256 228b292fd577c84870871b40a555b511685afd28e60901e9b215b98b6d74bc46
+AUX conf_d_tigase 212 RMD160 2cc6420433550b78c9372c1f91bea4497fe6a162 SHA1 7d14879602bd556a20a24e6263044654ea5a8682 SHA256 1fa13057a607375005aa45944e6a0f95c7a40792be323beb83ee06f29303a5a9
 AUX default_config.patch 2706 RMD160 2caee9d6603d9cd657fc5b772e0fcab2268db47e SHA1 4e2f0b5c380de945677567bc924021261e7b9cef SHA256 a8c280aed7170d814d084a7bcee861483338d5cffd4065b7aa61362bf37ca09a
-AUX init_d_tigase 1175 RMD160 d87e2bfb1496dfa1fce89739dec6c32f797ad649 SHA1 4bcb5fea18803295699fbfadf61305eaafafd1d0 SHA256 4052a2e82655a8ad7141beaf211069dd305df9c526c63c3de0c364c0be8ac39f
-EBUILD tigase-server-9999_pre3.ebuild 1887 RMD160 5e6a377895b0a9044c9b1529ae5915a2d6cfead3 SHA1 285b365d3766b7e769b89c48f2102d13fd2bbed2 SHA256 88bd790d8d1e99302cd35476ebe83f175d90e43399e90b061eb2239b995b1b2f
-MISC ChangeLog 657 RMD160 4be3dfb679216ea0bfa2109a97bb12e824effe28 SHA1 367d28fb99b85186cc188cac19266af1bb39fe6e SHA256 afd8bf2319a85fa459ff171abf7a5662483e8b869f1c3a406fa0ed2fb869927d
+AUX init_d_tigase 1192 RMD160 96382bd5e70a7da70ff8d116848b996466a0e509 SHA1 78b370dacb4b167d10ed493378510105429f355a SHA256 0f4b9b9605bde169ec7c99f75fecf35b764bc3a1d2e41962ed317c5241e5f806
+AUX logger.patch 1660 RMD160 f6aaa2934c800da1390dd71ca99f340b7682d0dd SHA1 29adc4c13ba821be640aa06b022559307234ffb3 SHA256 dc510ca8b4f96a7228d14f9565011ab508b1beb02dca3b260debd1b3e1437495
+AUX tigase.properties 179 RMD160 b8bc56d2a89b371848a8a6cda105b24ea2e3a262 SHA1 05b315d981c810fc96efc526118c612f73356bfd SHA256 ea9319d9e5720a6478dcbc390723e90e669504783347040c8e00c5c7e7192e92
+EBUILD tigase-server-9999_pre4.ebuild 1927 RMD160 40847c4fd339c10a17f502a93fef5fd1f5c08f29 SHA1 09d6c1b9aafbbb931d49c5a1286565190d47321f SHA256 32767097ecb53c55b4bc7cb27fc036942595f7a470ebcc0bc6e8f62b8c1978b0
+MISC ChangeLog 961 RMD160 8bd16dd5b78446815eb0d5743f51f4236182d356 SHA1 411d6a467935344fcfb75f4d94280bb2e940026b SHA256 1adf2ba9971d97706a14471c09d79204e40cefc13faa80679379a518a09a9289
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/net-im/tigase-server/files/conf_d_tigase b/net-im/tigase-server/files/conf_d_tigase
index 141f5bfef..b77a7e541 100644
--- a/net-im/tigase-server/files/conf_d_tigase
+++ b/net-im/tigase-server/files/conf_d_tigase
@@ -2,4 +2,4 @@ JAVA_OPTIONS="-Djava.awt.headless=true -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=
 CLASSPATH=
 TIGASE_USER=tigase
 TIGASE_CONFIG=/etc/tigase-config.xml
-TIGASE_OPTIONS=
+TIGASE_PROPERTIES=/etc/tigase.properties
diff --git a/net-im/tigase-server/files/init_d_tigase b/net-im/tigase-server/files/init_d_tigase
index 128d9cf7c..b6c9e876a 100644
--- a/net-im/tigase-server/files/init_d_tigase
+++ b/net-im/tigase-server/files/init_d_tigase
@@ -5,20 +5,17 @@ depend() {
 	use dns logger
 }
 
-checkconfig() {
-	if [ ! -e ${TIGASE_CONFIG} ] ; then
-		eerror "No config file!"
-		eerror "Stop the server and edit config file ${TIGASE_CONFIG} to your needs before running the service"
-	fi
-}
-
 start()	{
 	source /etc/conf.d/tigase
-	checkconfig
 
 	ebegin "Starting Tigase"
 
-	start-stop-daemon --user ${TIGASE_USER} --start --quiet --background --pidfile /var/run/tigase --make-pidfile --exec /usr/bin/java -- ${JAVA_OPTIONS} -classpath $(java-config -dp tigase-server):${CLASSPATH} tigase.server.XMPPServer -c ${TIGASE_CONFIG} ${TIGASE_OPTIONS}
+	if [ -x ${TIGASE_CONFIG} ]
+	then
+		rm ${TIGASE_CONFIG}
+	fi
+
+	start-stop-daemon --user ${TIGASE_USER} --start --quiet --background --pidfile /var/run/tigase --make-pidfile --exec /usr/bin/java -- ${JAVA_OPTIONS} -classpath $(java-config -dp tigase-server):${CLASSPATH} tigase.server.XMPPServer -c ${TIGASE_CONFIG} --property-file ${TIGASE_PROPERTIES}
 	eend $?
 }
 
@@ -26,6 +23,12 @@ stop ()	{
 	ebegin "Stopping Tigase"
 	start-stop-daemon -u tigase --stop --quiet --pidfile /var/run/tigase
 	sleep 2
+
+	if [ -x ${TIGASE_CONFIG} ]
+	then
+		rm ${TIGASE_CONFIG}
+	fi
+
 	eend $?
 }
 
@@ -36,6 +39,12 @@ svc_restart () {
 
 	start-stop-daemon -u tigase --stop --quiet --pidfile /var/run/tigase
 	sleep 5
-	start-stop-daemon --user ${TIGASE_USER} --start --quiet --background --pidfile /var/run/tigase --make-pidfile --exec /usr/bin/java -- ${JAVA_OPTIONS} -classpath $(java-config -dp tigase-server):${CLASSPATH} tigase.server.XMPPServer -c ${TIGASE_CONFIG} ${TIGASE_OPTIONS}
+
+	if [ -x ${TIGASE_CONFIG} ]
+	then
+		rm ${TIGASE_CONFIG}
+	fi
+
+	start-stop-daemon --user ${TIGASE_USER} --start --quiet --background --pidfile /var/run/tigase --make-pidfile --exec /usr/bin/java -- ${JAVA_OPTIONS} -classpath $(java-config -dp tigase-server):${CLASSPATH} tigase.server.XMPPServer -c ${TIGASE_CONFIG} --property-file ${TIGASE_PROPERTIES}
 	eend $?
 }
diff --git a/net-im/tigase-server/files/logger.patch b/net-im/tigase-server/files/logger.patch
new file mode 100644
index 000000000..fd5b505c5
--- /dev/null
+++ b/net-im/tigase-server/files/logger.patch
@@ -0,0 +1,44 @@
+Index: src/main/java/tigase/util/LogFormatter.java
+===================================================================
+--- src/main/java/tigase/util/LogFormatter.java (revision 1213)
++++ src/main/java/tigase/util/LogFormatter.java (working copy)
+@@ -26,6 +26,7 @@
+ import java.util.Calendar;
+ import java.util.logging.Formatter;
+ import java.util.logging.LogRecord;
++import java.text.MessageFormat;
+
+ /**
+  * Describe class LogFormatter here.
+@@ -70,7 +71,25 @@
+                while (sb.length() < MED_LEN + LEVEL_OFFSET) {
+                        sb.append(' ');
+                } // end of while (sb.length() < MEDIUM_LEN)
+-               sb.append(record.getMessage());
++/*
++               try {
++                       
+sb.append(MessageFormat.format(record.getMessage().replaceAll("(\\{\\d+\\})", 
+"<$1>"), record.getParameters()));
++               } catch( Exception e ) {
++                       sb.append(e.getMessage());
++               }
++*/
++               sb.append(record.getMessage().replaceAll("(\\{\\d+\\})", 
+"").trim());
++
++               if( record.getParameters() != null ) {
++                       for( Object param : record.getParameters() ) {
++                               if( param == null ) {
++                                       sb.append("null");
++                               } else {
++                                       sb.append(" <" + 
+param.getClass().getName() + ":" + param.toString() + "> ");
++                               }
++                       }
++               }
++
+                if (record.getThrown() != null) {
+            try {
+                                StringWriter sw = new StringWriter();
+
diff --git a/net-im/tigase-server/files/tigase.properties b/net-im/tigase-server/files/tigase.properties
new file mode 100644
index 000000000..de7205477
--- /dev/null
+++ b/net-im/tigase-server/files/tigase.properties
@@ -0,0 +1,6 @@
+config-type=--gen-config-def
+  --trusted=admin@localhost
+  --admins=admin@localhost
+  --virt-hosts = localhost
+  --debug=server,xmpp.impl,db
+  basic-conf/logging/.level[S]=FINEST
diff --git a/net-im/tigase-server/tigase-server-9999_pre3.ebuild b/net-im/tigase-server/tigase-server-9999_pre4.ebuild
index 374b4a6e4..1e661f1ab 100644
--- a/net-im/tigase-server/tigase-server-9999_pre3.ebuild
+++ b/net-im/tigase-server/tigase-server-9999_pre4.ebuild
@@ -51,12 +51,15 @@ src_compile() {
 src_install() {
 	java-pkg_dojar jars/*.jar
 
-	use doc && java-pkg_dojavadoc docs-tigase-server/api
+	use doc && java-pkg_dojavadoc docs/api
 	use source && java-pkg_dosrc src/main/java/
 
 	newconfd "${FILESDIR}/conf_d_tigase" tigase
 	newinitd "${FILESDIR}/init_d_tigase" tigase
 
+	insinto /etc
+	doins "${FILESDIR}/tigase.properties"
+
 	insinto /var/lib/tigase/certificates
 	insopts -m0600
 	doins certs/*