[Commits] (bcm) set the server admin env entry from a build property cosmo.serverAdmin

[commits at osafoundation.org]

Commit by: bcm
Modified files:
server/build.xml 1.33 1.34
server/shared.properties 1.20 1.21
server/etc/cosmo.xml 1.4 1.5

Log message:
set the server admin env entry from a build property cosmo.serverAdmin


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/server/build.xml.diff?r1=text&tr1=1.33&r2=text&tr2=1.34
http://cvs.osafoundation.org/index.cgi/server/shared.properties.diff?r1=text&tr1=1.20&r2=text&tr2=1.21
http://cvs.osafoundation.org/index.cgi/server/etc/cosmo.xml.diff?r1=text&tr1=1.4&r2=text&tr2=1.5

Index: server/build.xml
diff -u server/build.xml:1.33 server/build.xml:1.34
--- server/build.xml:1.33	Tue Apr 12 16:59:17 2005
+++ server/build.xml	Tue Apr 12 18:51:51 2005
@@ -153,6 +153,7 @@
       <filterset>
         <filter token="RELOADABLE" value="${compile.debug}"/>
         <filter token="VERSION" value="${cosmo.version}"/>
+        <filter token="SERVER_ADMIN" value="${cosmo.serverAdmin}"/>
         <filter token="DB_USERNAME" value="${cosmo.dist.userdb.username}"/>
         <filter token="DB_PASSWORD" value="${cosmo.dist.userdb.password}"/>
         <filter token="DB_DRIVER" value="${cosmo.dist.userdb.driver}"/>

Index: server/shared.properties
diff -u server/shared.properties:1.20 server/shared.properties:1.21
--- server/shared.properties:1.20	Tue Apr 12 16:27:28 2005
+++ server/shared.properties	Tue Apr 12 18:51:51 2005
@@ -116,3 +116,9 @@
 cosmo.test.userdb.username=sa
 cosmo.test.userdb.password=
 cosmo.test.userdb.jar=${hsqldb.jar}
+
+#
+# misc
+#
+
+cosmo.serverAdmin=root at localhost

Index: server/etc/cosmo.xml
diff -u server/etc/cosmo.xml:1.4 server/etc/cosmo.xml:1.5
--- server/etc/cosmo.xml:1.4	Mon Apr 11 17:13:29 2005
+++ server/etc/cosmo.xml	Tue Apr 12 18:51:51 2005
@@ -4,7 +4,7 @@
          reloadable="@RELOADABLE@">
   <Environment name="cosmo/version" value="@VERSION@"
                type="java.lang.String" override="false"/>
-  <Environment name="cosmo/serverAdmin" value="root at localhost"
+  <Environment name="cosmo/serverAdmin" value="@SERVER_ADMIN@"
                type="java.lang.String" override="false"/>
   <Resource name="jcr/repositoryFactory"
             type="org.apache.jackrabbit.core.jndi.BindableRepository"/>