forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r263883 - in /forrest/trunk/main/java/org/apache/forrest/locationmap/lm: ActNode.java LocationMap.java LocatorNode.java
Date Sun, 28 Aug 2005 15:42:57 GMT
Author: thorsten
Date: Sun Aug 28 08:42:51 2005
New Revision: 263883

URL: http://svn.apache.org/viewcvs?rev=263883&view=rev
Log:
fixed a copy and paste error that where overriding the Selector service in the manager instead
of creating a new Action Selector.

Modified:
    forrest/trunk/main/java/org/apache/forrest/locationmap/lm/ActNode.java
    forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocationMap.java
    forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocatorNode.java

Modified: forrest/trunk/main/java/org/apache/forrest/locationmap/lm/ActNode.java
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/locationmap/lm/ActNode.java?rev=263883&r1=263882&r2=263883&view=diff
==============================================================================
--- forrest/trunk/main/java/org/apache/forrest/locationmap/lm/ActNode.java (original)
+++ forrest/trunk/main/java/org/apache/forrest/locationmap/lm/ActNode.java Sun Aug 28 08:42:51
2005
@@ -65,7 +65,7 @@
         // get the selector
         m_type = configuration.getAttribute("type",m_ln.getDefaultAction());
         try {
-            final ServiceSelector selectors = (ServiceSelector) super.m_manager.lookup(Selector.ROLE
+ "Selector");
+            final ServiceSelector selectors = (ServiceSelector) super.m_manager.lookup(Action.ROLE
+ "Selector");
             m_action = (Action) selectors.select(m_type);
         } catch (ServiceException e) {
             final String message = "Unable to get Selector of type " + m_type;

Modified: forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocationMap.java
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocationMap.java?rev=263883&r1=263882&r2=263883&view=diff
==============================================================================
--- forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocationMap.java (original)
+++ forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocationMap.java Sun Aug 28
08:42:51 2005
@@ -190,7 +190,7 @@
             if (!actionSelector.isSelectable(m_defaultAction)) {
                 throw new ConfigurationException("Default action is not defined.");
             }
-            m_manager.put(Selector.ROLE+"Selector",actionSelector);
+            m_manager.put(Action.ROLE+"Selector",actionSelector);
         }
 
         m_manager.makeReadOnly();

Modified: forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocatorNode.java
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocatorNode.java?rev=263883&r1=263882&r2=263883&view=diff
==============================================================================
--- forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocatorNode.java (original)
+++ forrest/trunk/main/java/org/apache/forrest/locationmap/lm/LocatorNode.java Sun Aug 28
08:42:51 2005
@@ -86,6 +86,9 @@
             else if (children[i].getName().equals("select")) {
                 node = new SelectNode(this, super.m_manager);
             }
+            else if (children[i].getName().equals("act")) {
+                node = new ActNode(this, super.m_manager);
+            }
             else {
                 final String message = "Illegal locator node child: " 
                     + children[i].getName();



Mime
View raw message