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

[michi at wyona.com]

Author: michi
Date: 2007-01-04 12:47:25 +0100 (Thu, 04 Jan 2007)
New Revision: 21413

Modified:
   public/yanel/trunk/conf/realms.xml
   public/yanel/trunk/conf/spring-yanel-config.xml
   public/yanel/trunk/src/build/dependencies.xml
Log:
realm configuration simplified

Modified: public/yanel/trunk/conf/realms.xml
===================================================================
--- public/yanel/trunk/conf/realms.xml	2007-01-04 11:46:28 UTC (rev 21412)
+++ public/yanel/trunk/conf/realms.xml	2007-01-04 11:47:25 UTC (rev 21413)
@@ -12,11 +12,13 @@
 <!-- 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"/>
 </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"/>
 
 <!--
 NOTE: Default port corresponding to protocol (e.g. 80 for http or 443 for https)
@@ -39,6 +41,7 @@
 <!--
 <realm id="yulup-demo" mount-point="/yulup-demo/">
   <name>Yulup Demo</name>
+  <config src="PATH/TO/YULUP/yanel-realm-config.xml"/>
 
   <reverse-proxy>
     <host-name>demo.yulup.org</host-name>
@@ -51,6 +54,7 @@
 <!--
 <realm id="yulup-website" mount-point="/yulup-website/">
   <name>Yulup Website</name>
+  <config src="PATH/TO/YULUP/yanel-realm-config.xml"/>
 
   <reverse-proxy>
     <host-name>www.yulup.org</host-name>
@@ -63,6 +67,7 @@
 <!--
 <realm id="wyona-pictures" mount-point="/wyona-pictures/">
   <name>Wyona Pictures</name>
+  <config src="PATH/TO/WYONA-PICTURES/yanel-realm-config.xml"/>
 
   <reverse-proxy>
     <host-name>www.wyonapictures.com</host-name>
@@ -74,10 +79,12 @@
 
 <realm id="test" mount-point="/test/">
   <name>Tests</name>
+  <config src="../src/realms/test/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"/>
 </realm>
 
 </realms>

Modified: public/yanel/trunk/conf/spring-yanel-config.xml
===================================================================
--- public/yanel/trunk/conf/spring-yanel-config.xml	2007-01-04 11:46:28 UTC (rev 21412)
+++ public/yanel/trunk/conf/spring-yanel-config.xml	2007-01-04 11:47:25 UTC (rev 21413)
@@ -4,15 +4,19 @@
 <beans>
   <bean id="DefaultRepositoryFactory" class="org.wyona.yarep.core.RepositoryFactory"/>
   <bean id="RTIRepositoryFactory" class="org.wyona.yarep.core.RepositoryFactory">
-    <constructor-arg type="java.lang.String" value="yanel-rti-yarep.properties"/>
+    <!-- <constructor-arg type="java.lang.String" value="yanel-rti-yarep.properties"/> -->
   </bean>
-  <!-- <bean id="ACPoliciesRepositoryFactory" class="org.wyona.yarep.core.RepositoryFactory">
-    <constructor-arg type="java.lang.String" value="ac-policies-yarep.properties"/>
+  <bean id="ACPoliciesRepositoryFactory" class="org.wyona.yarep.core.RepositoryFactory">
+    <!-- <constructor-arg type="java.lang.String" value="ac-policies-yarep.properties"/> -->
   </bean>
   <bean id="ACIdentitiesRepositoryFactory" class="org.wyona.yarep.core.RepositoryFactory">
-    <constructor-arg type="java.lang.String" value="ac-identities-yarep.properties"/>
-  </bean> -->
+    <!-- <constructor-arg type="java.lang.String" value="ac-identities-yarep.properties"/> -->
+  </bean>
   <bean id="map" class="org.wyona.yanel.impl.map.MapImpl"/>
+  <!--
   <bean id="policyManager" class="org.wyona.security.impl.PolicyManagerImpl"/>
   <bean id="identityManager" class="org.wyona.security.impl.IdentityManagerImpl"/>
+  -->
+  <bean id="PolicyManagerFactory" class="org.wyona.security.impl.PolicyManagerFactoryImpl"/>
+  <bean id="IdentityManagerFactory" class="org.wyona.security.impl.IdentityManagerFactoryImpl"/>
 </beans>

Modified: public/yanel/trunk/src/build/dependencies.xml
===================================================================
--- public/yanel/trunk/src/build/dependencies.xml	2007-01-04 11:46:28 UTC (rev 21412)
+++ public/yanel/trunk/src/build/dependencies.xml	2007-01-04 11:47:25 UTC (rev 21413)
@@ -33,7 +33,7 @@
       <dependency groupId="wyona-org-commons" artifactId="wyona-org-commons"
                   version="0.0.1-dev-r19469"/>
       <dependency groupId="wyona-org-security" artifactId="wyona-org-security-core"
-                  version="0.0.1-dev-r15584"/>
+                  version="0.0.1-dev-r21160"/>
 
       <!-- TODO: Add to yanel.xml, because these libs are only needed during runtime -->
       <dependency groupId="avalon-framework" artifactId="avalon-framework-api"
@@ -57,7 +57,7 @@
       <dependency groupId="xalan" artifactId="xalan"
                   version="2.7.0"/>
       <dependency groupId="wyona-org-security" artifactId="wyona-org-security-impl"
-                  version="0.0.1-dev-r15775"/>
+                  version="0.0.1-dev-r21160"/>
       <dependency groupId="yarep" artifactId="yarep-impl"
                   version="0.0.1-dev-r21378"/>