weaver 2004/08/02 11:57:08
Modified: portal/src/java/org/apache/jetspeed/capabilities/impl
CapabilityValveImpl.java
Log:
Use dependency injection instead of the Jetspeed utility class.
Revision Changes Path
1.5 +14 -15
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityValveImpl.java
Index: CapabilityValveImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityValveImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CapabilityValveImpl.java 20 Jul 2004 18:57:56 -0000 1.4
+++ CapabilityValveImpl.java 2 Aug 2004 18:57:08 -0000 1.5
@@ -18,16 +18,15 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.jetspeed.Jetspeed;
+import org.apache.jetspeed.capabilities.Capabilities;
+import org.apache.jetspeed.capabilities.CapabilityMap;
+import org.apache.jetspeed.capabilities.MediaType;
+import org.apache.jetspeed.capabilities.MimeType;
import org.apache.jetspeed.pipeline.PipelineException;
import org.apache.jetspeed.pipeline.valve.CapabilityValve;
import org.apache.jetspeed.pipeline.valve.ValveContext;
import org.apache.jetspeed.profiler.rules.ProfilingRule;
import org.apache.jetspeed.request.RequestContext;
-import org.apache.jetspeed.capabilities.Capabilities;
-import org.apache.jetspeed.capabilities.CapabilityMap;
-import org.apache.jetspeed.capabilities.MediaType;
-import org.apache.jetspeed.capabilities.MimeType;
/**
* Invokes the capability mapper in the request pipeline
@@ -39,6 +38,12 @@
{
private static final Log log = LogFactory.getLog(CapabilityValveImpl.class);
String resourceDefault; // the default name for a resource
+ private Capabilities capabilities;
+
+ public CapabilityValveImpl(Capabilities capabilities)
+ {
+ this.capabilities = capabilities;
+ }
/**
* Initialize the valve before using in a pipeline.
@@ -48,11 +53,7 @@
}
- protected Capabilities getComponent()
- {
- return
(Capabilities)Jetspeed.getComponentManager().getComponent(Capabilities.class);
- }
-
+
public void invoke(RequestContext request, ValveContext context)
throws PipelineException
{
@@ -61,11 +62,9 @@
String requestMediaType =
request.getRequestParameter(ProfilingRule.STANDARD_MEDIATYPE);
String agent = request.getRequest().getHeader("User-Agent");
- // Connect to CapabilityService
- Capabilities component = getComponent();
-
+
// Get capability map
- CapabilityMap cm = component.getCapabilityMap(agent);
+ CapabilityMap cm = capabilities.getCapabilityMap(agent);
if ( cm == null)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
