You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2003/12/04 05:50:19 UTC
cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/profiler ProfilerValve.java

taylor      2003/12/03 20:50:19

  Modified:    portal/src/java/org/apache/jetspeed/aggregator
                        BasicAggregator.java
               portal/src/java/org/apache/jetspeed/engine
                        JetspeedEngine.java JetspeedServlet.java
               portal/src/java/org/apache/jetspeed/profiler
                        ProfileLocator.java ProfilerService.java
               portal/src/java/org/apache/jetspeed/profiler/impl
                        JetspeedProfileLocator.java
                        JetspeedProfilerService.java
               portal/src/java/org/apache/jetspeed/profiler/rules
                        PrincipalRule.java ProfilingRule.java
                        RuleCriterion.java
               portal/src/java/org/apache/jetspeed/profiler/rules/impl
                        AbstractProfilingRule.java PrincipalRuleImpl.java
                        RoleFallbackProfilingRule.java
                        RuleCriterionImpl.java StandardProfilingRule.java
               portal/src/java/org/apache/jetspeed/request
                        JetspeedRequestContext.java RequestContext.java
               portal/src/java/org/apache/jetspeed/security/impl
                        SecurityValveImpl.java UserPrincipalImpl.java
               portal/src/java/org/apache/jetspeed/services/page
                        PageManager.java PageManagerService.java
               portal/src/java/org/apache/jetspeed/services/page/impl
                        CastorXmlPageManagerService.java
                        DatabasePageManagerService.java
               portal/src/java/org/apache/jetspeed/services/profiler
                        ProfilerValve.java
  Added:       portal/src/java/org/apache/jetspeed/aggregator
                        Jetspeed1Aggregator.java
               portal/src/java/org/apache/jetspeed/localization/impl
                        LocalizationValveImpl.java
               portal/src/java/org/apache/jetspeed/profiler
                        ProfileLocatorProperty.java Profiler.java
               portal/src/java/org/apache/jetspeed/profiler/impl
                        ProfileFallbackIterator.java
                        ProfileLocatorControl.java
                        ProfileLocatorPropertyImpl.java
                        ProfilerValveImpl.java
               portal/src/java/org/apache/jetspeed/profiler/rules
                        RuleCriterionResolver.java
               portal/src/java/org/apache/jetspeed/profiler/rules/impl
                        CountryCriterionResolver.java
                        GroupCriterionResolver.java
                        GroupRoleUserCriterionResolver.java
                        LanguageCriterionResolver.java
                        MediatypeCriterionResolver.java
                        RoleCriterionResolver.java StandardResolver.java
                        UserCriterionResolver.java
               portal/src/java/org/apache/jetspeed/security
                        SecurityHelper.java
  Removed:     portal/src/java/org/apache/jetspeed/profiler/rules
                        RuleTypeHandler.java
  Log:
  Swapped out old profiler in place of new profiler based on rules
  The new profiler org.apache.jetspeed.profiler doesn't hardcode its profiling rules
  but instead uses rules stored in the database. I haven't currently implemented the
  default J1 fallback, but haven't completed role-based fallback.
  I'd like to delete all the old profiler code from the CVS if nobody objects ...
  and still leave it in J1 of course
  
  The BasicAggregator now uses the new Page and Fragment model for page aggregation.
  It hasn't yet integrated Desktops.
  A new aggregator was added, Jetspeed1Aggregator which is actually the old BasicAggregator.
  The goal here is to support different fragment (layout) models by swapping out aggregators.
  This means you could have different fragment models such as J1, J2, IBM, Pluto...
  
  Added a couple more valves:
  - a simple localization valve which puts the locale in the requestContext
  - a simple security valve that puts a JAAS Subject into the requestContext
      the Subject has at least one principal, a User principal which is gathered
      from the servlet api's. This can get us by for a while until the security service develops
  - replaced the old profiler valve with a new one
  
  Revision  Changes    Path
  1.5       +24 -22    jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/BasicAggregator.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/BasicAggregator.java.diff?r1=1.4&r2=1.5
  
  
  1.1                  jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/Jetspeed1Aggregator.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/Jetspeed1Aggregator.java?rev=1.1
  
  
  1.7       +10 -3     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java.diff?r1=1.6&r2=1.7
  
  
  1.3       +2 -2      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/JetspeedServlet.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/JetspeedServlet.java.diff?r1=1.2&r2=1.3
  
  
  1.1                  jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/localization/impl/LocalizationValveImpl.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/localization/impl/LocalizationValveImpl.java?rev=1.1
  
  
  1.3       +77 -7     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/ProfileLocator.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/ProfileLocator.java.diff?r1=1.2&r2=1.3
  
  
  1.3       +15 -4     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/ProfilerService.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/ProfilerService.java.diff?r1=1.2&r2=1.3
  
  
  1.1                  jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/ProfileLocatorProperty.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/ProfileLocatorProperty.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/Profiler.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/Profiler.java?rev=1.1
  
  
  1.2       +80 -8     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfileLocator.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfileLocator.java.diff?r1=1.1&r2=1.2
  
  
  1.3       +83 -20    jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerService.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerService.java.diff?r1=1.2&r2=1.3
  
  
  1.1                  jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/impl/ProfileFallbackIterator.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/impl/ProfileFallbackIterator.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/impl/ProfileLocatorControl.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/impl/ProfileLocatorControl.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/impl/ProfileLocatorPropertyImpl.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/impl/ProfileLocatorPropertyImpl.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java?rev=1.1
  
  
  1.2       +2 -1      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/PrincipalRule.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/PrincipalRule.java.diff?r1=1.1&r2=1.2
  
  
  1.3       +16 -4     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/ProfilingRule.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/ProfilingRule.java.diff?r1=1.2&r2=1.3
  
  
  1.3       +53 -2     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/RuleCriterion.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/RuleCriterion.java.diff?r1=1.2&r2=1.3
  
  
  1.1                  jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/RuleCriterionResolver.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/RuleCriterionResolver.java?rev=1.1
  
  
  1.3       +64 -3     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/impl/AbstractProfilingRule.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/impl/AbstractProfilingRule.java.diff?r1=1.2&r2=1.3
  
  
  1.2       +2 -1      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/impl/PrincipalRuleImpl.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/impl/PrincipalRuleImpl.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +4 -3      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/impl/RoleFallbackProfilingRule.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/impl/RoleFallbackProfilingRule.java.diff?r1=1.1&r2=1.2
  
  
  1.3       +55 -2     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/impl/RuleCriterionImpl.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/impl/RuleCriterionImpl.java.diff?r1=1.2&r2=1.3
  
  
  1.3       +73 -7     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/impl/StandardProfilingRule.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/impl/StandardProfilingRule.java.diff?r1=1.2&r2=1.3
  
  
  1.1                  jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/impl/CountryCriterionResolver.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/impl/CountryCriterionResolver.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/impl/GroupCriterionResolver.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/impl/GroupCriterionResolver.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/impl/GroupRoleUserCriterionResolver.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/impl/GroupRoleUserCriterionResolver.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/impl/LanguageCriterionResolver.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/impl/LanguageCriterionResolver.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/impl/MediatypeCriterionResolver.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/impl/MediatypeCriterionResolver.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/impl/RoleCriterionResolver.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/impl/RoleCriterionResolver.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/impl/StandardResolver.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/impl/StandardResolver.java?rev=1.1
  
  
  1.1                  jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/impl/UserCriterionResolver.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/rules/impl/UserCriterionResolver.java?rev=1.1
  
  
  1.6       +15 -7     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java.diff?r1=1.5&r2=1.6
  
  
  1.5       +7 -6      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/request/RequestContext.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/request/RequestContext.java.diff?r1=1.4&r2=1.5
  
  
  1.1                  jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/security/SecurityHelper.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/security/SecurityHelper.java?rev=1.1
  
  
  1.2       +25 -10    jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/security/impl/SecurityValveImpl.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/security/impl/SecurityValveImpl.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +1 -3      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/security/impl/UserPrincipalImpl.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/security/impl/UserPrincipalImpl.java.diff?r1=1.1&r2=1.2
  
  
  1.6       +7 -1      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/page/PageManager.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/page/PageManager.java.diff?r1=1.5&r2=1.6
  
  
  1.6       +10 -2     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/page/PageManagerService.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/page/PageManagerService.java.diff?r1=1.5&r2=1.6
  
  
  1.6       +10 -1     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/page/impl/CastorXmlPageManagerService.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/page/impl/CastorXmlPageManagerService.java.diff?r1=1.5&r2=1.6
  
  
  1.4       +12 -3     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/page/impl/DatabasePageManagerService.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/page/impl/DatabasePageManagerService.java.diff?r1=1.3&r2=1.4
  
  
  1.2       +2 -2      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/profiler/ProfilerValve.java
  
  http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/profiler/ProfilerValve.java.diff?r1=1.1&r2=1.2
  
  

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