[Yanel-commits] rev 24268 - in public/yanel/trunk: conf src/build

[michi at wyona.com]

Author: michi
Date: 2007-05-08 15:23:17 +0200 (Tue, 08 May 2007)
New Revision: 24268

Modified:
   public/yanel/trunk/conf/realms.xml
   public/yanel/trunk/src/build/build.xml
Log:
replace token introduced

Modified: public/yanel/trunk/conf/realms.xml
===================================================================
--- public/yanel/trunk/conf/realms.xml	2007-05-08 13:21:54 UTC (rev 24267)
+++ public/yanel/trunk/conf/realms.xml	2007-05-08 13:23:17 UTC (rev 24268)
@@ -1,17 +1,17 @@
 <?xml version="1.0"?>
 
-<realms xmlns="http://www.wyona.org/yanel/1.0" version="2007031300">
+<realms xmlns="http://www.wyona.org/yanel/1.0" version="2007050800">
 
 <!-- WARNING: Access Control does not work properly for nested realms (also the mount-point needs to match the id in order to make the access control work properly, e.g. id="zurich" and mount-point="/zurich/")! -->
 <realm id="javadoc" mount-point="/yanel-website/javadoc/">
   <name>Yanel Javadoc</name>
-  <config src="../src/realms/javadoc/yanel-realm-config.xml"/>
+  <config src="@REALMS_DIR@/javadoc/yanel-realm-config.xml"/>
 </realm>
 
 <!-- ROOT realm -->
 <realm id="yanel-website" mount-point="/yanel-website/">
   <name>Yanel Website</name>
-  <config src="../src/realms/yanel-website/config/yanel-realm-config.xml"/>
+  <config src="@REALMS_DIR@/yanel-website/config/yanel-realm-config.xml"/>
 
 <!--
 NOTE: Default port corresponding to protocol (e.g. 80 for http or 443 for https)
@@ -72,12 +72,12 @@
 
 <realm id="test-cases" mount-point="/test/use-cases/">
   <name>Use-Cases</name>
-  <config src="../src/realms/use-cases/yanel/config/yanel-realm-config.xml"/>
+  <config src="@REALMS_DIR@/use-cases/yanel/config/yanel-realm-config.xml"/>
 </realm>
 
 <realm id="test" mount-point="/test/">
   <name>Tests</name>
-  <config src="../src/realms/test/yanel/config/yanel-realm-config.xml"/>
+  <config src="@REALMS_DIR@/test/yanel/config/yanel-realm-config.xml"/>
 </realm>
 
 <!--
@@ -85,12 +85,12 @@
 -->
 <realm id="from-scratch-realm-template" mount-point="/from-scratch-realm/">
   <name>From Scratch Realm Template</name>
-  <config src="../src/realms/from-scratch-realm-template/yanel/config/yanel-realm-config.xml"/>
+  <config src="@REALMS_DIR@/from-scratch-realm-template/yanel/config/yanel-realm-config.xml"/>
 </realm>
 
 <realm id="welcome" mount-point="/" root="true">
   <name>Yanel Welcome and General Administration</name>
-  <config src="../src/realms/welcome-admin/yanel/config/yanel-realm-config.xml"/>
+  <config src="@REALMS_DIR@/welcome-admin/yanel/config/yanel-realm-config.xml"/>
 </realm>
 
 </realms>

Modified: public/yanel/trunk/src/build/build.xml
===================================================================
--- public/yanel/trunk/src/build/build.xml	2007-05-08 13:21:54 UTC (rev 24267)
+++ public/yanel/trunk/src/build/build.xml	2007-05-08 13:23:17 UTC (rev 24268)
@@ -412,7 +412,7 @@
     </replace>
 
     <replace file="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/realms.xml" value="${yanel.home.dir.forward.slashes}/src/realms">
-      <replacetoken>../src/realms</replacetoken>
+      <replacetoken>@REALMS_DIR@</replacetoken>
     </replace>
 
     <replace file="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/resource-types.xml" value="${yanel.home.dir.forward.slashes}/src">