[Yanel-commits] rev 23959 - in public/yanel/trunk: conf src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources src/core/java/org/wyona/yanel/servlet

michi at wyona.com michi at wyona.com
Sat Apr 21 23:34:58 CEST 2007


Author: michi
Date: 2007-04-21 23:34:56 +0200 (Sat, 21 Apr 2007)
New Revision: 23959

Modified:
   public/yanel/trunk/conf/spring-yanel-config.xml
   public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/ResourceCreatorResource.java
   public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
repo-navigation bean id updated and also new implementation used

Modified: public/yanel/trunk/conf/spring-yanel-config.xml
===================================================================
--- public/yanel/trunk/conf/spring-yanel-config.xml	2007-04-21 21:10:15 UTC (rev 23958)
+++ public/yanel/trunk/conf/spring-yanel-config.xml	2007-04-21 21:34:56 UTC (rev 23959)
@@ -20,5 +20,8 @@
   <bean id="PolicyManagerFactory" class="org.wyona.security.impl.PolicyManagerFactoryImpl"/>
   <bean id="IdentityManagerFactory" class="org.wyona.security.impl.IdentityManagerFactoryImpl"/>
 
-  <bean id="nav-sitetree" class="org.wyona.yanel.impl.navigation.SitetreeRTIImpl"/>
+  <bean id="repo-navigation" class="org.wyona.yanel.impl.navigation.SitetreeResConfigAndDataRepoImpl"/>
+<!--
+  <bean id="repo-navigation" class="org.wyona.yanel.impl.navigation.SitetreeRTIImpl"/>
+-->
 </beans>

Modified: public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/ResourceCreatorResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/ResourceCreatorResource.java	2007-04-21 21:10:15 UTC (rev 23958)
+++ public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/ResourceCreatorResource.java	2007-04-21 21:34:56 UTC (rev 23959)
@@ -263,7 +263,7 @@
                     //sb.append("<br/><br/><input type=\"submit\" value=\"Save As\" name=\"save-as\"/>");
 
                     // TODO: Display repository navigation of this path ...
-                    Sitetree sitetree = (Sitetree) getYanel().getBeanFactory().getBean("nav-sitetree");
+                    Sitetree sitetree = (Sitetree) getYanel().getBeanFactory().getBean("repo-navigation");
                     Node node = sitetree.getNode(getRealm(), getPath());
                     if (node.isCollection()) {
                         log.error("DEBUG: Is Collection: " + node.getName());

Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java	2007-04-21 21:10:15 UTC (rev 23958)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java	2007-04-21 21:34:56 UTC (rev 23959)
@@ -141,7 +141,7 @@
 
             map = (Map) yanel.getBeanFactory().getBean("map");
 
-            sitetree = (Sitetree) yanel.getBeanFactory().getBean("nav-sitetree");
+            sitetree = (Sitetree) yanel.getBeanFactory().getBean("repo-navigation");
 
             sslPort = config.getInitParameter("ssl-port");
             toolbarMasterSwitch = config.getInitParameter("toolbar-master-switch");




More information about the Yanel-commits mailing list