Author: bdekruijff at gmail.com
Date: Thu Feb 3 12:34:43 2011
New Revision: 758
Log:
AMDATU-282 code clean & removed test code
Removed:
branches/amdatu-dispatcher/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/test/
Modified:
branches/amdatu-dispatcher/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/dispatch/HttpFilterChain.java
branches/amdatu-dispatcher/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/dispatch/InvocationFilterChain.java
branches/amdatu-dispatcher/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/dispatch/NotFoundFilterChain.java
branches/amdatu-dispatcher/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/filter/DispatchInterceptFilter.java
branches/amdatu-dispatcher/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/osgi/DispatcherServiceActivator.java
Modified:
branches/amdatu-dispatcher/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/dispatch/HttpFilterChain.java
==============================================================================
---
branches/amdatu-dispatcher/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/dispatch/HttpFilterChain.java
(original)
+++
branches/amdatu-dispatcher/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/dispatch/HttpFilterChain.java
Thu Feb 3 12:34:43 2011
@@ -26,11 +26,11 @@
import javax.servlet.http.HttpServletResponse;
public abstract class HttpFilterChain implements FilterChain {
- public final void doFilter(ServletRequest req, ServletResponse res)
- throws IOException, ServletException {
+
+ public final void doFilter(ServletRequest req, ServletResponse res) throws
IOException, ServletException {
doFilter((HttpServletRequest) req, (HttpServletResponse) res);
}
- protected abstract void doFilter(HttpServletRequest req,
HttpServletResponse res)
- throws IOException, ServletException;
+ protected abstract void doFilter(HttpServletRequest req,
HttpServletResponse res) throws IOException,
+ ServletException;
}
Modified:
branches/amdatu-dispatcher/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/dispatch/InvocationFilterChain.java
==============================================================================
---
branches/amdatu-dispatcher/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/dispatch/InvocationFilterChain.java
(original)
+++
branches/amdatu-dispatcher/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/dispatch/InvocationFilterChain.java
Thu Feb 3 12:34:43 2011
@@ -25,30 +25,31 @@
import org.amdatu.web.dispatcher.handler.FilterHandler;
-public final class InvocationFilterChain
- extends HttpFilterChain {
- private final FilterHandler[] handlers;
- private final ServletPipeline servletPipeline;
- private final FilterChain proceedingChain;
- private int index = -1;
+public final class InvocationFilterChain extends HttpFilterChain {
+
+ private final FilterHandler[] m_filterHandlers;
+ private final ServletPipeline m_servletPipeline;
+ private final FilterChain m_proceedingChain;
+
+ private int m_index = -1;
public InvocationFilterChain(FilterHandler[] handlers, ServletPipeline
servletPipeline, FilterChain proceedingChain) {
- this.handlers = handlers;
- this.servletPipeline = servletPipeline;
- this.proceedingChain = proceedingChain;
+ m_filterHandlers = handlers;
+ m_servletPipeline = servletPipeline;
+ m_proceedingChain = proceedingChain;
}
protected void doFilter(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
- this.index++;
+ this.m_index++;
- if (this.index < this.handlers.length) {
- this.handlers[this.index].handle(req, res, this);
+ if (this.m_index < this.m_filterHandlers.length) {
+ this.m_filterHandlers[this.m_index].handle(req, res, this);
}
else {
- if (!this.servletPipeline.handle(req, res)) {
+ if (!this.m_servletPipeline.handle(req, res)) {
System.err.println("Request not handled. Returning to parent
chain... ");
- this.proceedingChain.doFilter(req, res);
+ this.m_proceedingChain.doFilter(req, res);
}
}
}
Modified:
branches/amdatu-dispatcher/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/dispatch/NotFoundFilterChain.java
==============================================================================
---
branches/amdatu-dispatcher/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/dispatch/NotFoundFilterChain.java
(original)
+++
branches/amdatu-dispatcher/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/dispatch/NotFoundFilterChain.java
Thu Feb 3 12:34:43 2011
@@ -24,8 +24,7 @@
public final class NotFoundFilterChain extends HttpFilterChain {
- protected void doFilter(HttpServletRequest req, HttpServletResponse res)
- throws IOException, ServletException {
+ protected void doFilter(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
res.sendError(HttpServletResponse.SC_NOT_FOUND);
}
}
Modified:
branches/amdatu-dispatcher/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/filter/DispatchInterceptFilter.java
==============================================================================
---
branches/amdatu-dispatcher/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/filter/DispatchInterceptFilter.java
(original)
+++
branches/amdatu-dispatcher/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/filter/DispatchInterceptFilter.java
Thu Feb 3 12:34:43 2011
@@ -33,7 +33,7 @@
import org.osgi.service.log.LogService;
/**
- * Simple interceptor filter that collaborates with
<code>DispatcherService</code>
+ * Simple intercept filter that collaborates with
<code>DispatcherService</code>
* to redirect request to a custom (mostly tenant specific) pipeline. When
there
* is no custom pipeline or no target matches the request is continued down the
* original chain.
Modified:
branches/amdatu-dispatcher/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/osgi/DispatcherServiceActivator.java
==============================================================================
---
branches/amdatu-dispatcher/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/osgi/DispatcherServiceActivator.java
(original)
+++
branches/amdatu-dispatcher/amdatu-web/dispatcher/src/main/java/org/amdatu/web/dispatcher/osgi/DispatcherServiceActivator.java
Thu Feb 3 12:34:43 2011
@@ -22,14 +22,12 @@
import javax.servlet.Filter;
import javax.servlet.Servlet;
-import org.amdatu.core.tenant.Tenant;
import org.amdatu.core.tenant.TenantManagementService;
import org.amdatu.web.dispatcher.DispatchExtenderFilter;
import org.amdatu.web.dispatcher.DispatcherService;
import org.amdatu.web.dispatcher.extender.TenanHostNameDispatchExtender;
import org.amdatu.web.dispatcher.extender.TenantParameterDispatchExtender;
import org.amdatu.web.dispatcher.service.DispatcherServiceImpl;
-import org.amdatu.web.dispatcher.test.HelloWorldServlet;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.apache.felix.http.api.ExtHttpService;
@@ -95,14 +93,6 @@
.add(createServiceDependency().setService(DispatcherService.class).setRequired(true))
.add(createServiceDependency().setService(TenantManagementService.class).setRequired(true))
.add(createServiceDependency().setService(LogService.class).setRequired(true)));
-
- // test servlets
- Dictionary<String, String> props = new Hashtable<String, String>();
- props.put("alias", "/hello/world");
- manager.add(
- createAdapterService(Tenant.class, null)
- .setImplementation(HelloWorldServlet.class)
- .setInterface(Servlet.class.getName(), props));
}
@Override
