Author: tchemit Date: 2012-04-06 19:36:59 +0200 (Fri, 06 Apr 2012) New Revision: 3243 Url: http://chorem.org/repositories/revision/pollen/3243 Log: make pollen works without the jetty-runner servlet api (no method ServletRequest#getServletContext()) Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java 2012-04-06 16:46:00 UTC (rev 3242) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java 2012-04-06 17:36:59 UTC (rev 3243) @@ -30,6 +30,9 @@ import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.web.filter.TopiaTransactionFilter; +import javax.servlet.FilterConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; import javax.servlet.ServletRequest; /** @@ -44,10 +47,20 @@ private static final Log log = LogFactory.getLog(PollenTopiaTransactionFilter.class); + private ServletContext servletContext; + @Override + public void init(FilterConfig filterConfig) throws ServletException { + + servletContext = filterConfig.getServletContext(); + super.init(filterConfig); + } + + @Override protected TopiaContext beginTransaction(ServletRequest request) throws TopiaRuntimeException { + PollenApplicationContext applicationContext = - PollenApplicationContext.get(request.getServletContext()); + PollenApplicationContext.get(servletContext); TopiaContext rootContext = applicationContext.getRootContext(); try { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java 2012-04-06 16:46:00 UTC (rev 3242) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java 2012-04-06 17:36:59 UTC (rev 3243) @@ -84,7 +84,7 @@ protected PollenServiceContext getServiceContext(ServletRequest request) { PollenApplicationContext applicationContext = - PollenApplicationContext.get(request.getServletContext()); + PollenApplicationContext.get(getServletContext()); PollenServiceFactory serviceFactory = new PollenServiceFactory();