svn commit: r759243 [2/2] - in /ofbiz/trunk/framework/webapp/
Locked
 
|
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/VisitHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/VisitHandler.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/VisitHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/VisitHandler.java Fri Mar 27 16:58:52 2009 @@ -43,7 +43,7 @@ public class VisitHandler { // Debug module name public static final String module = VisitHandler.class.getName(); - + public static final String visitorCookieName = "OFBiz.Visitor"; public static void setUserLogin(HttpSession session, GenericValue userLogin, boolean userCreated) { @@ -62,7 +62,7 @@ Debug.logError(e, "Could not update visitor: ", module); } } - + GenericValue visit = getVisit(session); if (visit != null) { visit.set("userLoginId", userLogin.get("userLoginId")); @@ -70,12 +70,12 @@ visit.set("partyId", userLogin.get("partyId")); } visit.set("userCreated", Boolean.valueOf(userCreated)); - + // make sure the visitorId is still in place if (visitor != null) { visit.set("visitorId", visitor.get("visitorId")); } - + try { visit.store(); } catch (GenericEntityException e) { @@ -103,18 +103,18 @@ visit = (GenericValue) session.getAttribute("visit"); if (visit == null) { GenericDelegator delegator = null; - + // first try the session attribute delegatorName String delegatorName = (String) session.getAttribute("delegatorName"); if (UtilValidate.isNotEmpty(delegatorName)) { delegator = GenericDelegator.getGenericDelegator(delegatorName); } - + // then try the ServletContext attribute delegator, should always be there... if (delegator == null) { delegator = (GenericDelegator) session.getServletContext().getAttribute("delegator"); } - + if (delegator == null) { Debug.logError("Could not find delegator with delegatorName [" + delegatorName + "] in session, or a delegator attribute in the ServletContext, not creating Visit entity", module); } else { @@ -125,11 +125,11 @@ String initialUserAgent = (String) session.getAttribute("_CLIENT_USER_AGENT_"); String initialLocale = initialLocaleObj != null ? initialLocaleObj.toString() : ""; - + if (UtilValidate.isEmpty(webappName)) { Debug.logInfo(new Exception(), "The webappName was empty, somehow the initial request settings were missing.", module); } - + visit = delegator.makeValue("Visit"); visit.set("sessionId", session.getId()); visit.set("fromDate", new Timestamp(session.getCreationTime())); @@ -146,7 +146,7 @@ } visit.set("clientHostName", session.getAttribute("_CLIENT_REMOTE_HOST_")); visit.set("clientUser", session.getAttribute("_CLIENT_REMOTE_USER_")); - + // get the visitorId GenericValue visitor = (GenericValue) session.getAttribute("visitor"); if (visitor != null) { @@ -176,7 +176,7 @@ } } } - + if (visit == null) { Debug.logWarning("Could not find or create the visit...", module); } @@ -217,9 +217,9 @@ } } } - + if (Debug.infoOn()) Debug.logInfo("Found visitorId [" + cookieVisitorId + "] in cookie", module); - + if (UtilValidate.isEmpty(cookieVisitorId)) { // no visitor cookie? create visitor and send back cookie too visitor = delegator.makeValue("Visitor"); @@ -244,11 +244,11 @@ } } } - + if (visitor != null) { // we got one, and it's a new one since it was null before session.setAttribute("visitor", visitor); - + // create the cookie and send it back, this may be done over and over, in effect frequently refreshing the cookie Cookie visitorCookie = new Cookie(visitorCookieName, visitor.getString("visitorId")); visitorCookie.setMaxAge(60 * 60 * 24 * 365); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/EntityFieldTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/EntityFieldTag.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/EntityFieldTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/EntityFieldTag.java Fri Mar 27 16:58:52 2009 @@ -31,7 +31,7 @@ * EntityFieldTag - Tag to Print Localized Entity Fields. */ public class EntityFieldTag extends TagSupport { - + public static final String module = EntityFieldTag.class.getName(); protected String field = null; Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/FormatTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/FormatTag.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/FormatTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/FormatTag.java Fri Mar 27 16:58:52 2009 @@ -31,7 +31,7 @@ * FormatTag - JSP Tag to format numbers and dates. */ public class FormatTag extends BodyTagSupport { - + public static final String module = FormatTag.class.getName(); private String type = "N"; Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/I18nBundleTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/I18nBundleTag.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/I18nBundleTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/I18nBundleTag.java Fri Mar 27 16:58:52 2009 @@ -33,7 +33,7 @@ * for this page. */ public class I18nBundleTag extends TagSupport { - + public static final String module = I18nBundleTag.class.getName(); private String baseName = null; Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/I18nMessageArgumentTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/I18nMessageArgumentTag.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/I18nMessageArgumentTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/I18nMessageArgumentTag.java Fri Mar 27 16:58:52 2009 @@ -29,9 +29,9 @@ * ordered list of arguments to use with java.text.MessageFormat. */ public class I18nMessageArgumentTag extends TagSupport { - + public static final String module = I18nMessageArgumentTag.class.getName(); - + public void setValue(Object argumentValue) throws JspException { try { I18nMessageTag messageTag = (I18nMessageTag) this.getParent(); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/I18nMessageTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/I18nMessageTag.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/I18nMessageTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/I18nMessageTag.java Fri Mar 27 16:58:52 2009 @@ -35,7 +35,7 @@ * content in a web page. */ public class I18nMessageTag extends BodyTagSupport { - + public static final String module = I18nMessageTag.class.getName(); private String key = null; Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IfTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IfTag.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IfTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IfTag.java Fri Mar 27 16:58:52 2009 @@ -32,7 +32,7 @@ * IfTag - Conditional Tag. */ public class IfTag extends BodyTagSupport { - + public static final String module = IfTag.class.getName(); private String name = null; Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/InputValueTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/InputValueTag.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/InputValueTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/InputValueTag.java Fri Mar 27 16:58:52 2009 @@ -33,7 +33,7 @@ * attribute is false, always tries to use the request parameter and ignores the entity field. */ public class InputValueTag extends TagSupport { - + public static final String module = InputValueTag.class.getName(); private String field = null; Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTag.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTag.java Fri Mar 27 16:58:52 2009 @@ -29,7 +29,7 @@ * ObjectTag - Loads an object from the PageContext. */ public class ObjectTag extends TagSupport { - + public static final String module = ObjectTag.class.getName(); protected Object element = null; Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/PrintTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/PrintTag.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/PrintTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/PrintTag.java Fri Mar 27 16:58:52 2009 @@ -30,7 +30,7 @@ * <p><b>Title:</b> PrintTag - Prints an attribute from the PageContext. */ public class PrintTag extends TagSupport { - + public static final String module = PrintTag.class.getName(); private String attribute = null; Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/UrlTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/UrlTag.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/UrlTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/UrlTag.java Fri Mar 27 16:58:52 2009 @@ -40,7 +40,7 @@ public int doEndTag() throws JspException { HttpServletRequest request = (HttpServletRequest) pageContext.getRequest(); HttpServletResponse response = (HttpServletResponse) pageContext.getResponse(); - + ServletContext context = (ServletContext) request.getAttribute("servletContext"); RequestHandler rh = (RequestHandler) context.getAttribute("_REQUEST_HANDLER_"); @@ -48,7 +48,7 @@ String baseURL = body.getString(); String newURL = rh.makeLink(request, response, baseURL); - + body.clearBody(); try { Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopFactory.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopFactory.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopFactory.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopFactory.java Fri Mar 27 16:58:52 2009 @@ -31,7 +31,7 @@ public class ApacheFopFactory { public static final String module = ApacheFopFactory.class.getName(); - + /** @deprecated use ApacheFopWorker.getFactoryInstance() */ public static FopFactory instance() { return ApacheFopWorker.getFactoryInstance(); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java Fri Mar 27 16:58:52 2009 @@ -53,7 +53,7 @@ * <code>org.ofbiz.webapp.view.ApacheFopWorker-</code>. */ public static final String tempFilePrefix = "org.ofbiz.webapp.view.ApacheFopWorker-"; - + protected static FopFactory fopFactory = null; /** Returns an instance of the FopFactory class. FOP documentation recommends @@ -90,7 +90,7 @@ } return fopFactory; } - + /** Transform an xsl-fo file to the specified file format. * @param srcFile The xsl-fo File instance * @param destFile The target (result) File instance @@ -152,7 +152,7 @@ throw new FOPException(e); } } - + /** Returns a new Fop instance. Note: FOP documentation recommends using * a Fop instance for one transform run only. * @param out The target (result) OutputStream instance @@ -173,7 +173,7 @@ } return fop; } - + /** Returns a temporary File instance. The temporary file name starts with * <a href="#tempFilePrefix">tempFilePrefix</a> and ends with ".xml". * Calling methods are responsible for deleting the temporary file.<p> @@ -209,7 +209,7 @@ private URIResolver defaultResolver; protected LocalResolver() {} - + public LocalResolver(URIResolver defaultResolver) { this.defaultResolver = defaultResolver; } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/DataVisionViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/DataVisionViewHandler.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/DataVisionViewHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/DataVisionViewHandler.java Fri Mar 27 16:58:52 2009 @@ -37,7 +37,7 @@ * Handles DataVision type view rendering */ public class DataVisionViewHandler extends AbstractViewHandler { - + public static final String module = DataVisionViewHandler.class.getName(); protected ServletContext context; Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/FopPdfViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/FopPdfViewHandler.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/FopPdfViewHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/FopPdfViewHandler.java Fri Mar 27 16:58:52 2009 @@ -37,9 +37,9 @@ * This handler will use JPublish to generate the XSL-FO */ public class FopPdfViewHandler extends JPublishViewHandler { - + public static final String module = FopPdfViewHandler.class.getName(); - + /** * @see org.ofbiz.webapp.view.ViewHandler#render(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) */ @@ -54,7 +54,7 @@ if (Debug.verboseOn()) { Debug.logVerbose("XSL-FO : " + writer.toString(), module); } - + // render the byte array ByteArrayOutputStream out = null; Reader reader = new StringReader(writer.toString()); @@ -64,11 +64,11 @@ } catch (GeneralException e) { throw new ViewHandlerException(e.getMessage(), e.getNested()); } - + // set the content type and length response.setContentType("application/pdf"); response.setContentLength(out.size()); - + // write to the browser try { out.writeTo(response.getOutputStream()); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/GenericViewRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/GenericViewRenderer.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/GenericViewRenderer.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/GenericViewRenderer.java Fri Mar 27 16:58:52 2009 @@ -53,11 +53,11 @@ * Generic JPublish View Renderer - This is in testing; for use in wrapping other renderers */ public class GenericViewRenderer extends AbstractViewRenderer { - + public static final String module = GenericViewRenderer.class.getName(); public static final String DEFAULT_RENDERER = "freemarker"; public Map renderers = null; - + protected SiteContext siteContext = null; /** @@ -88,15 +88,15 @@ HttpSession session = context.getSession(); Security security = (Security) request.getAttribute("security"); GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); - + Page parent = (Page) context.get("page"); Page page = getPage(path); - + // decorate the content w/ edit images if we have permission if (userLogin != null && security.hasEntityPermission("CONTENTMGR", "_UPDATE", userLogin)) { out.write("<a href='/content/control/editContent?filePath=" + path + "'>*</a>"); } - + /* this loops -- not good // if this page has a template, lets render the template if (page != null && parent != null && page.getPath() != parent.getPath()) { @@ -109,7 +109,7 @@ } } */ - + // get the view renderer for this page if (Debug.verboseOn()) Debug.logVerbose("Getting renderer for: " + path, module); String rendererName = DEFAULT_RENDERER; @@ -118,16 +118,16 @@ if (rendererName == null) rendererName = DEFAULT_RENDERER; } - + ViewRenderer renderer = (ViewRenderer) renderers.get(rendererName); if (renderer == null) renderer = (ViewRenderer) renderers.get(DEFAULT_RENDERER); - + // call the renderer to render the rest of the page. Debug.logVerbose("Calling render", module); renderer.render(context, path, in, out); } - + private void renderTemplate(JPublishContext context, Page page, Writer out) throws IOException, ViewRenderException { context.disableCheckReservedNames(this); context.put("page", page); @@ -142,7 +142,7 @@ throw new ViewRenderException(e); } } - + private JPublishContext cloneContext(JPublishContext context) { JPublishContext newContext = new JPublishContext(this); context.disableCheckReservedNames(this); @@ -167,7 +167,7 @@ */ public void loadConfiguration(Configuration config) throws ConfigurationException { } - + private Page getPage(String path) { Page page = null; try { @@ -177,12 +177,12 @@ } catch (Exception e) {} return page; } - + private void loadCustom() throws Exception { ClassLoader cl = Thread.currentThread().getContextClassLoader(); InputStream in = new FileInputStream(siteContext.getConfigurationFile()); Configuration configuration = new XMLConfiguration(in); - + Iterator renderElements = configuration.getChildren("page-renderer").iterator(); while (renderElements.hasNext()) { Configuration viewRendererConfiguration = (Configuration) renderElements.next(); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/HttpViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/HttpViewHandler.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/HttpViewHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/HttpViewHandler.java Fri Mar 27 16:58:52 2009 @@ -31,7 +31,7 @@ * ViewHandlerException - View Handler Exception */ public class HttpViewHandler extends AbstractViewHandler { - + public static final String module = HttpViewHandler.class.getName(); protected ServletContext context; Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JPublishViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JPublishViewHandler.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JPublishViewHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JPublishViewHandler.java Fri Mar 27 16:58:52 2009 @@ -36,7 +36,7 @@ public class JPublishViewHandler extends AbstractViewHandler { public static final String module = JPublishViewHandler.class.getName(); - + protected ServletContext servletContext = null; protected JPublishWrapper wrapper = null; Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JPublishWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JPublishWrapper.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JPublishWrapper.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JPublishWrapper.java Fri Mar 27 16:58:52 2009 @@ -54,12 +54,12 @@ * JPublishWrapper - Used for calling pages through JPublish */ public class JPublishWrapper { - + public static final String module = JPublishWrapper.class.getName(); - + protected ServletContext servletContext = null; protected SiteContext siteContext = null; - + public JPublishWrapper(ServletContext context) { this.servletContext = context; // find the WEB-INF root @@ -86,11 +86,11 @@ } catch (Exception e) { Debug.logError(e, "Problems executing JPublish startup actions", module); } - + // set this wrapper in the ServletContext for use by the ViewHandler servletContext.setAttribute("jpublishWrapper", this); } - + protected void configureClasspath(File webInfPath) { File webLibPath = new File(webInfPath, "lib"); File webClassPath = new File(webInfPath, "classes"); @@ -162,7 +162,7 @@ } return false; } - + /** * Renders a page and returns the string containing the content of the rendered page * @param path Path to the page @@ -183,11 +183,11 @@ } return content; } - + public void render(String path, HttpServletRequest request, HttpServletResponse response, Writer writer) throws GeneralException { render(path, request, response, writer, null, false); } - + public void render(String path, HttpServletRequest request, HttpServletResponse response, Writer writer, OutputStream outputStream) throws GeneralException { render(path, request, response, writer, outputStream, false); } @@ -258,7 +258,7 @@ // execute path actions if (executePathActions(request, response, context, path, allowRedirect)) return; - + // execute parameter actions if (executeParameterActions(request, response, context, path, allowRedirect)) return; @@ -271,7 +271,7 @@ throw new GeneralException("Cannot load static resource with a null OutputStream"); } } - + // check and make sure we have a writer if (writer == null) throw new GeneralException("Cannot load dynamic content with a null Writer"); @@ -310,7 +310,7 @@ // get the template Template template = siteContext.getTemplateManager().getTemplate(page.getFullTemplateName()); - + // merge the template template.merge(context, page, writer); writer.flush(); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsJXlsViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsJXlsViewHandler.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsJXlsViewHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsJXlsViewHandler.java Fri Mar 27 16:58:52 2009 @@ -48,7 +48,7 @@ * Handles JasperReports JXls view rendering */ public class JasperReportsJXlsViewHandler extends AbstractViewHandler { - + public static final String module = JasperReportsJXlsViewHandler.class.getName(); protected ServletContext context; @@ -91,7 +91,7 @@ } } } - + response.setContentType("application/xls"); Map parameters = (Map) request.getAttribute("jrParameters"); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java Fri Mar 27 16:58:52 2009 @@ -46,7 +46,7 @@ * Handles JasperReports PDF view rendering */ public class JasperReportsPdfViewHandler extends AbstractViewHandler { - + public static final String module = JasperReportsPdfViewHandler.class.getName(); protected ServletContext context; @@ -89,7 +89,7 @@ } } } - + response.setContentType("application/pdf"); Map parameters = (Map) request.getAttribute("jrParameters"); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsPoiXlsViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsPoiXlsViewHandler.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsPoiXlsViewHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsPoiXlsViewHandler.java Fri Mar 27 16:58:52 2009 @@ -48,7 +48,7 @@ * Handles JasperReports PoiXls view rendering */ public class JasperReportsPoiXlsViewHandler extends AbstractViewHandler { - + public static final String module = JasperReportsPoiXlsViewHandler.class.getName(); protected ServletContext context; @@ -91,7 +91,7 @@ } } } - + response.setContentType("application/xls"); Map parameters = (Map) request.getAttribute("jrParameters"); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java Fri Mar 27 16:58:52 2009 @@ -45,7 +45,7 @@ * Handles JasperReports PDF view rendering */ public class JasperReportsXmlViewHandler extends AbstractViewHandler { - + public static final String module = JasperReportsXmlViewHandler.class.getName(); protected ServletContext context; Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JspViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JspViewHandler.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JspViewHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JspViewHandler.java Fri Mar 27 16:58:52 2009 @@ -33,7 +33,7 @@ * JspViewHandler - Java Server Pages View Handler */ public class JspViewHandler extends AbstractViewHandler { - + public static final String module = JspViewHandler.class.getName(); protected ServletContext context; @@ -59,7 +59,7 @@ // tell the ContextFilter we are forwarding request.setAttribute(ContextFilter.FORWARDED_FROM_SERVLET, Boolean.TRUE); RequestDispatcher rd = request.getRequestDispatcher(page); - + if (rd == null) { Debug.logInfo("HttpServletRequest.getRequestDispatcher() failed; trying ServletContext", module); rd = context.getRequestDispatcher(page); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/RegionViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/RegionViewHandler.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/RegionViewHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/RegionViewHandler.java Fri Mar 27 16:58:52 2009 @@ -36,7 +36,7 @@ * Handles Region type view rendering */ public class RegionViewHandler extends AbstractViewHandler { - + public static final String module = RegionViewHandler.class.getName(); protected ServletContext context; Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ViewFactory.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ViewFactory.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ViewFactory.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ViewFactory.java Fri Mar 27 16:58:52 2009 @@ -34,13 +34,13 @@ * ViewFactory - View Handler Factory */ public class ViewFactory { - + public static final String module = ViewFactory.class.getName(); protected RequestHandler requestHandler = null; protected ServletContext context = null; protected Map<String, ViewHandler> handlers = null; - + public ViewFactory(RequestHandler requestHandler) { this.handlers = FastMap.newInstance(); this.requestHandler = requestHandler; @@ -79,12 +79,12 @@ if (type == null || type.length() == 0) { type = "default"; } - + // check if we are new / empty and add the default handler in if (handlers.size() == 0) { this.preLoadAll(); } - + // get the view handler by type from the contextHandlers ViewHandler handler = handlers.get(type); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/WfsViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/WfsViewHandler.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/WfsViewHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/WfsViewHandler.java Fri Mar 27 16:58:52 2009 @@ -52,7 +52,7 @@ * WfsViewHandler - View Handler */ public class WfsViewHandler extends AbstractViewHandler { - + public static final String module = WfsViewHandler.class.getName(); public static final String FormatTemplateUrl ="component://webapp/script/org/ofbiz/webapp/event/formatWfs.ftl"; @@ -74,7 +74,7 @@ if (Debug.infoOn()) Debug.logInfo("Retreiving HTTP resource at: " + page, module); try { String result = null; - + List entityList = (List)request.getAttribute("entityList"); SimpleSequence simpleList = new SimpleSequence(entityList); Map<String, Object> ctx = FastMap.newInstance(); @@ -96,7 +96,7 @@ throw new ViewHandlerException(e.getMessage(), e); } } - + public static Template getDocTemplate(String fileUrl) throws FileNotFoundException, IOException, TemplateException, URISyntaxException { Template template = null; URL screenFileUrl = FlexibleLocation.resolveLocation(fileUrl, null); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/website/WebSiteWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/website/WebSiteWorker.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/website/WebSiteWorker.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/website/WebSiteWorker.java Fri Mar 27 16:58:52 2009 @@ -31,7 +31,7 @@ * WebSiteWorker - Worker class for web site related functionality */ public class WebSiteWorker { - + public static final String module = WebSiteWorker.class.getName(); public static String getWebSiteId(ServletRequest request) { @@ -40,7 +40,7 @@ if (application == null) return null; return application.getInitParameter("webSiteId"); } - + public static GenericValue getWebSite(ServletRequest request) { String webSiteId = getWebSiteId(request); if (webSiteId == null) { Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/xmlrpc/XmlRpcClient.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/xmlrpc/XmlRpcClient.java?rev=759243&r1=759242&r2=759243&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/xmlrpc/XmlRpcClient.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/xmlrpc/XmlRpcClient.java Fri Mar 27 16:58:52 2009 @@ -33,7 +33,7 @@ public class XmlRpcClient extends org.apache.xmlrpc.client.XmlRpcClient { public static final String module = XmlRpcClient.class.getName(); - + protected String keyStoreComponent; protected String keyStoreName; protected String keyAlias; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |