idok-commit AT lists.psi.ch

Subject: Commit emails of the iDok project

List archive

[idok-commit] idok commit r692 - in branches/opensource: . scripts/admin/test_server

From: "Apache" <apache AT savannah.psi.ch>
To: idok-commit AT lists.psi.ch
Subject: [idok-commit] idok commit r692 - in branches/opensource: . scripts/admin/test_server
Date: Thu, 31 Jan 2008 11:47:46 +0100
List-archive: <https://lists.web.psi.ch/pipermail/idok-commit/>
List-id: Commit emails of the iDok project <idok-commit.lists.psi.ch>

Author: geus AT PSI.CH
Date: Thu Jan 31 11:47:46 2008
New Revision: 692

Log:
Improved logging and capturing of stdout and stderr of orbd and dmssd on
local server or test server; Everything is logged to /path/to/idok_server/log

Modified:
branches/opensource/local-server.xml
branches/opensource/scripts/admin/test_server/setup_test_server_ubuntu.sh

Modified: branches/opensource/local-server.xml
==============================================================================
--- branches/opensource/local-server.xml (original)
+++ branches/opensource/local-server.xml Thu Jan 31 11:47:46 2008
@@ -13,6 +13,7 @@
<property name="server.project.root.dir"
value="${server.root.dir}/projects" />
<property name="server.httpd.conf.dir"
value="${server.root.dir}/httpd/conf.d" />
<property name="server.nameservice.dir"
value="${server.root.dir}/orbd" />
+ <property name="server.log.dir" value="${server.root.dir}/log" />
<property name="server.hostname" value="localhost" />
<property name="keystore.passwd.corba" value="90fd3498jw03riqdgs4f"
/>

@@ -54,6 +55,7 @@
<mkdir dir="${server.project.root.dir}" />
<mkdir dir="${server.httpd.conf.dir}" />
<mkdir dir="${server.nameservice.dir}" />
+ <mkdir dir="${server.log.dir}" />
</target>

<target name="create-test-project" description="create a subversion
test repository">
@@ -80,8 +82,20 @@
</exec>
</target>

+ <target name="generate-logging-config" description="generate
logging.conf file">
+ <echo file="${server.log.dir}/logging.conf">
+ handlers = java.util.logging.FileHandler,
java.util.logging.ConsoleHandler
+ java.util.logging.FileHandler.level = ALL
+ java.util.logging.FileHandler.formatter =
java.util.logging.SimpleFormatter
+ java.util.logging.FileHandler.pattern =
${server.log.dir}/dmssd.log
+ java.util.logging.FileHandler.limit = 0
+ java.util.logging.FileHandler.count = 1
+ java.util.logging.FileHandler.append = false
+ </echo>
+ </target>
+
<target name="start-orbd" description="start CORBA naming service">
- <exec dir="${server.nameservice.dir}"
executable="${orbd.exec}" spawn="true">
+ <exec dir="${server.nameservice.dir}"
executable="${orbd.exec}" output="${server.log.dir}/orbd.out">
<arg value="-defaultdb" />
<arg value="${server.nameservice.dir}" />
<arg value="-ORBInitialPort" />
@@ -91,16 +105,15 @@
</exec>
</target>

- <target name="start-server-sunorb" depends="" description="start
local iDok server with Sun ORB">
- <java classname="ch.psi.dms.service.server.Daemon"
fork="true" spawn="true">
- 
+ <target name="start-server-sunorb" depends="generate-logging-config"
description="start local iDok server with Sun ORB">
+ <java classname="ch.psi.dms.service.server.Daemon"
fork="true" output="${server.log.dir}/dmssd.out">
<jvmarg line="-server" />

<classpath>
<fileset refid="idok.libs.server" />
</classpath>

- <sysproperty key="java.util.logging.config.file"
value="${idok.basedir}/scripts/admin/test_server/logging.conf" />
+ <sysproperty key="java.util.logging.config.file"
value="${server.log.dir}/logging.conf" />
<sysproperty key="ch.psi.dms.server.projectRoot"
value="${server.project.root.dir}" />
<sysproperty key="derby.system.home"
value="${server.authzn.db.dir}" />
<sysproperty
key="ch.psi.dms.service.admin.backup.dir"
value="${server.authzn.db.backup.dir}" />
@@ -116,19 +129,11 @@
<sysproperty key="ch.psi.dms.service.common.keypass"
value="${keystore.passwd}" />
<sysproperty key="ch.psi.dms.privateKeyPassword"
value="${keystore.passwd.corba}" />
<sysproperty
key="ch.psi.dms.service.server.admin.masterAdminName" value="idokadmin" />
-
- 
</java>
</target>

- <target name="start-server-jacorb" depends="" description="start
local iDok server with Sun ORB">
- <java classname="ch.psi.dms.service.server.Daemon"
fork="true" spawn="true">
- 
+ <target name="start-server-jacorb" depends="generate-logging-config"
description="start local iDok server with Sun ORB">
+ <java classname="ch.psi.dms.service.server.Daemon"
fork="true" output="${server.log.dir}/orbd.out">
<jvmarg line="-server
-Xbootclasspath/p:lib/jacorb.jar:lib/logkit.jar:lib/avalon-framework.jar" />


</java>
</target>

Modified:
branches/opensource/scripts/admin/test_server/setup_test_server_ubuntu.sh
==============================================================================
--- branches/opensource/scripts/admin/test_server/setup_test_server_ubuntu.sh
(original)
+++ branches/opensource/scripts/admin/test_server/setup_test_server_ubuntu.sh
Thu Jan 31 11:47:46 2008
@@ -71,9 +71,9 @@
ServerSignature On

<Location />
- AuthType Basic
- AuthName "iDok login"
- AuthUserFile $IDOK_SERVER_ROOT/httpd/passwd
+ AuthType Basic
+ AuthName "iDok login"
+ AuthUserFile $IDOK_SERVER_ROOT/httpd/passwd
</Location>

Alias /lib /home/toor/idok/lib

[idok-commit] idok commit r692 - in branches/opensource: . scripts/admin/test_server, Apache, 01/31/2008