Return-Path: 
 <jetspeed-dev-return-23832-apmail-portals-jetspeed-dev-archive=portals.apache.org@portals.apache.org>
Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org
Received: (qmail 33045 invoked from network); 14 Oct 2005 04:12:20 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 14 Oct 2005 04:12:20 -0000
Received: (qmail 26629 invoked by uid 500); 14 Oct 2005 04:12:17 -0000
Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org
Received: (qmail 26601 invoked by uid 500); 14 Oct 2005 04:12:17 -0000
Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jetspeed-dev-help@portals.apache.org>
List-Unsubscribe: <mailto:jetspeed-dev-unsubscribe@portals.apache.org>
List-Post: <mailto:jetspeed-dev@portals.apache.org>
List-Id: <jetspeed-dev.portals.apache.org>
Reply-To: "Jetspeed Developers List" <jetspeed-dev@portals.apache.org>
Delivered-To: mailing list jetspeed-dev@portals.apache.org
Received: (qmail 26590 invoked by uid 99); 14 Oct 2005 04:12:17 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Oct 2005 21:12:17 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Thu, 13 Oct 2005 21:12:19 -0700
Received: (qmail 32895 invoked by uid 65534); 14 Oct 2005 04:11:56 -0000
Message-ID: <20051014041156.32894.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r320994 -
 /portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/profiler.xml
Date: Fri, 14 Oct 2005 04:11:56 -0000
To: jetspeed-dev@portals.apache.org
From: taylor@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: taylor
Date: Thu Oct 13 21:11:53 2005
New Revision: 320994

URL: http://svn.apache.org/viewcvs?rev=320994&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-379

encapsulate initialization of criterion resolvers in a spring component

Modified:
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/profiler.xml

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/profiler.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/profiler.xml?rev=320994&r1=320993&r2=320994&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/profiler.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/profiler.xml Thu Oct 13 21:11:53 2005
@@ -23,7 +23,10 @@
         </constructor-arg>
         <constructor-arg index="1">
             <value>j2</value>
-        </constructor-arg>
+        </constructor-arg>                
+        <constructor-arg index="2">
+            <ref bean="ProfileResolvers" />            
+        </constructor-arg>                   
     </bean>
 
     <bean id="org.apache.jetspeed.profiler.Profiler" name="profiler" parent="baseTransactionProxy">
@@ -42,4 +45,74 @@
             </props>
         </property>
     </bean>
+               
+    <bean id="ProfileResolvers"  
+          class="org.apache.jetspeed.profiler.rules.impl.ProfileResolversImpl">
+        <constructor-arg index="0">          
+        <map>
+          <entry key="request">
+            <ref bean="StandardResolver" />
+          </entry>
+          <entry key="request.session">
+            <ref bean="RequestSessionResolver" />
+          </entry>
+          <entry key="path">
+            <ref bean="PathResolver" />
+          </entry>
+          <entry key="path.session">
+            <ref bean="PathSessionResolver" />
+          </entry>
+          <entry key="hard.coded">
+            <ref bean="HardCodedResolver" />
+          </entry>
+          <entry key="user">
+            <ref bean="UserCriterionResolver" />
+          </entry>
+          <entry key="role">
+            <ref bean="RoleCriterionResolver" />
+          </entry>
+          <entry key="group">
+            <ref bean="GroupCriterionResolver" />
+          </entry>
+          <entry key="mediatype">
+            <ref bean="MediatypeCriterionResolver" />
+          </entry>
+          <entry key="language">
+            <ref bean="LanguageCriterionResolver" />
+          </entry>
+          <entry key="country">
+            <ref bean="CountryCriterionResolver" />
+          </entry>
+          <entry key="group.role.user">
+            <ref bean="GroupRoleUserCriterionResolver" />
+          </entry>
+          <entry key="user.attribute">
+            <ref bean="UserAttributeResolver" />
+          </entry>
+          <entry key="navigation">
+            <ref bean="NavigationCriterionResolver" />
+          </entry>
+          <entry key="user.agent">
+            <ref bean="UserAgentCriterionResolver" />
+          </entry>          
+        </map>
+        </constructor-arg>                  
+    </bean>
+    
+    <bean id='StandardResolver' class='org.apache.jetspeed.profiler.rules.impl.StandardResolver'></bean>
+    <bean id='RequestSessionResolver' class='org.apache.jetspeed.profiler.rules.impl.RequestSessionResolver'></bean>
+    <bean id='PathResolver' class='org.apache.jetspeed.profiler.rules.impl.PathResolver'></bean>
+    <bean id='PathSessionResolver' class='org.apache.jetspeed.profiler.rules.impl.PathSessionResolver'></bean>
+    <bean id='HardCodedResolver' class='org.apache.jetspeed.profiler.rules.impl.HardCodedResolver'></bean>
+    <bean id='UserCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.UserCriterionResolver'></bean>
+    <bean id='RoleCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.RoleCriterionResolver'></bean>
+    <bean id='GroupCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.GroupCriterionResolver'></bean>
+    <bean id='MediatypeCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.MediatypeCriterionResolver'></bean>
+    <bean id='LanguageCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.LanguageCriterionResolver'></bean>
+    <bean id='CountryCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.CountryCriterionResolver'></bean>
+    <bean id='GroupRoleUserCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.GroupRoleUserCriterionResolver'></bean>
+    <bean id='UserAttributeResolver' class='org.apache.jetspeed.profiler.rules.impl.UserAttributeResolver'></bean>
+    <bean id='NavigationCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.NavigationCriterionResolver'></bean>
+    <bean id='UserAgentCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.UserAgentCriterionResolver'></bean>
+    
 </beans>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org