svn commit: r757075 [3/3] - in /ofbiz/trunk/framework/webapp/
Locked
 
|
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=757075&r1=757074&r2=757075&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 Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -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=757075&r1=757074&r2=757075&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 Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -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=757075&r1=757074&r2=757075&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 Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -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/IterateNextTEI.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTEI.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTEI.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTEI.java Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTag.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTag.java Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorHasNextTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorHasNextTag.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorHasNextTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorHasNextTag.java Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTEI.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTEI.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTEI.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTEI.java Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTag.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTag.java Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTEI.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTEI.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTEI.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTEI.java Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 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=757075&r1=757074&r2=757075&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 Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -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/ParamTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ParamTag.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ParamTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ParamTag.java Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 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=757075&r1=757074&r2=757075&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 Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -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/ServiceTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ServiceTag.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ServiceTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ServiceTag.java Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/UnlessTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/UnlessTag.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/UnlessTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/UnlessTag.java Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 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=757075&r1=757074&r2=757075&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 Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -40,18 +40,18 @@ 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_"); + RequestHandler rh = (RequestHandler) context.getAttribute("_REQUEST_HANDLER_"); BodyContent body = getBodyContent(); String baseURL = body.getString(); - String newURL = rh.makeLink(request, response, baseURL); - + String newURL = rh.makeLink(request, response, baseURL); + body.clearBody(); - try { + try { getPreviousOut().print(newURL); } catch (IOException e) { if (UtilJ2eeCompat.useNestedJspException(pageContext.getServletContext())) { Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/test/AbstractXmlRpcTestCase.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/test/AbstractXmlRpcTestCase.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/test/AbstractXmlRpcTestCase.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/test/AbstractXmlRpcTestCase.java Sat Mar 21 23:24:37 2009 @@ -56,7 +56,7 @@ } public org.apache.xmlrpc.client.XmlRpcClient getRpcClient(String url) throws MalformedURLException { - return getRpcClient(url, null, null); + return getRpcClient(url, null, null); } public org.apache.xmlrpc.client.XmlRpcClient getRpcClient(String url, String login, String password) throws MalformedURLException { Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/test/XmlRpcTests.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/test/XmlRpcTests.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/test/XmlRpcTests.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/test/XmlRpcTests.java Sat Mar 21 23:24:37 2009 @@ -38,7 +38,7 @@ public void testXmlRpcRequest() throws Exception { XmlRpcClient client = this.getRpcClient(url, "admin", "ofbiz"); Object[] params = new Object[] { 55.00, "message from xml-rpc client" }; - Map result = (Map) client.execute("testScv", params); + Map result = (Map) client.execute("testScv", params); assertEquals("XML-RPC Service result success", "service done", result.get("resp")); } } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/AbstractViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/AbstractViewHandler.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/AbstractViewHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/AbstractViewHandler.java Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 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=757075&r1=757074&r2=757075&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 Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -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=757075&r1=757074&r2=757075&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 Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -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=757075&r1=757074&r2=757075&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 Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -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=757075&r1=757074&r2=757075&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 Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -37,14 +37,14 @@ * 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) */ public void render(String name, String page, String info, String contentType, String encoding, HttpServletRequest request, HttpServletResponse response) throws ViewHandlerException { - // render and obtain the XSL-FO + // render and obtain the XSL-FO Writer writer = new StringWriter(); try { wrapper.render(page, request, response, writer, null, false); @@ -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,17 +64,17 @@ } catch (GeneralException e) { throw new ViewHandlerException(e.getMessage(), e.getNested()); } - - // set the content type and length - response.setContentType("application/pdf"); + + // set the content type and length + response.setContentType("application/pdf"); response.setContentLength(out.size()); - + // write to the browser - try { + try { out.writeTo(response.getOutputStream()); response.getOutputStream().flush(); } catch (IOException e) { - throw new ViewHandlerException("Unable write to browser OutputStream", e); - } + throw new ViewHandlerException("Unable write to browser OutputStream", e); + } } } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/FopRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/FopRenderer.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/FopRenderer.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/FopRenderer.java Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 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=757075&r1=757074&r2=757075&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 Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -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 module = GenericViewRenderer.class.getName(); public static final String DEFAULT_RENDERER = "freemarker"; - public Map renderers = null; - + public Map renderers = null; + protected SiteContext siteContext = null; /** @@ -71,13 +71,13 @@ } catch (Exception e) { Debug.logError(e, "Problems loading custom settings", module); throw new RuntimeException(e.toString()); - } + } } /* (non-Javadoc) * @see org.jpublish.view.ViewRenderer#init() */ - public void init() throws Exception { + public void init() throws Exception { } /** @@ -88,70 +88,70 @@ HttpSession session = context.getSession(); Security security = (Security) request.getAttribute("security"); GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); - - Page parent = (Page) context.get("page"); + + 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)) { + + // 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 this page has a template, lets render the template if (page != null && parent != null && page.getPath() != parent.getPath()) { Debug.logInfo("Parent: " + parent.getPath(), module); Debug.logInfo("Page: " + page.getPath(), module); Debug.logInfo("Template: " + page.getFullTemplateName(), module); - if (!page.getTemplateName().equals("basic")) { + if (!page.getTemplateName().equals("basic")) { renderTemplate(cloneContext(context), page, out); return; } - } - */ - + } + */ + // get the view renderer for this page if (Debug.verboseOn()) Debug.logVerbose("Getting renderer for: " + path, module); String rendererName = DEFAULT_RENDERER; - if (page != null) { - rendererName = page.getProperty("page-renderer"); + if (page != null) { + rendererName = page.getProperty("page-renderer"); if (rendererName == null) rendererName = DEFAULT_RENDERER; } - + ViewRenderer renderer = (ViewRenderer) renderers.get(rendererName); if (renderer == null) - renderer = (ViewRenderer) renderers.get(DEFAULT_RENDERER); - + 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); + 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); if (siteContext.isProtectReservedNames()) { context.enableCheckReservedNames(this); - } - try { + } + try { Debug.logInfo("Merging template", module); Template template = siteContext.getTemplateManager().getTemplate(page.getFullTemplateName()); template.merge(context, page, out); } catch (Exception e) { - throw new ViewRenderException(e); + throw new ViewRenderException(e); } - } - + } + private JPublishContext cloneContext(JPublishContext context) { JPublishContext newContext = new JPublishContext(this); context.disableCheckReservedNames(this); Object keys[] = context.getKeys(); - for (int i = 0; i < keys.length; i++) + for (int i = 0; i < keys.length; i++) newContext.put((String) keys[i], context.get((String) keys[i])); if (siteContext.isProtectReservedNames()) { context.enableCheckReservedNames(this); - } + } return newContext; } @@ -159,30 +159,30 @@ * @see org.jpublish.view.ViewRenderer#render(org.jpublish.JPublishContext, java.io.InputStream, java.io.OutputStream) */ public void render(JPublishContext context, String path, InputStream in, OutputStream out) throws IOException, ViewRenderException { - render(context, path, new InputStreamReader(in), new OutputStreamWriter(out)); + render(context, path, new InputStreamReader(in), new OutputStreamWriter(out)); } /** * @see org.jpublish.view.ViewRenderer#loadConfiguration(com.anthonyeden.lib.config.Configuration) */ - public void loadConfiguration(Configuration config) throws ConfigurationException { + public void loadConfiguration(Configuration config) throws ConfigurationException { } - + private Page getPage(String path) { - Page page = null; - try { + Page page = null; + try { PageInstance pi = siteContext.getPageManager().getPage(path.substring(path.lastIndexOf(":")+1)); if (pi != null) - page = new Page(pi); - } catch (Exception e) {} + page = new Page(pi); + } 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(); @@ -193,7 +193,7 @@ renderer.loadConfiguration(viewRendererConfiguration); renderer.init(); Debug.logInfo("Added renderer [" + renderName + "] - [" + className + "]", module); - renderers.put(renderName, renderer); - } - } + renderers.put(renderName, renderer); + } + } } 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=757075&r1=757074&r2=757075&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 Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -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=757075&r1=757074&r2=757075&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 Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -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; @@ -47,7 +47,7 @@ this.servletContext = context; this.wrapper = (JPublishWrapper) context.getAttribute("jpublishWrapper"); if (this.wrapper == null) { - this.wrapper = new JPublishWrapper(servletContext); + this.wrapper = new JPublishWrapper(servletContext); } // make sure it loaded 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=757075&r1=757074&r2=757075&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 Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -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 @@ -74,9 +74,9 @@ try { //siteContext = new SiteContext(contextRoot, servletConfig.getInitParameter("config")); siteContext = new SiteContext(contextRoot, "WEB-INF/jpublish.xml"); - siteContext.setWebInfPath(webInfPath); + siteContext.setWebInfPath(webInfPath); } catch (Exception e) { - Debug.logError(e, "Cannot load SiteContext", module); + Debug.logError(e, "Cannot load SiteContext", module); } // execute startup actions @@ -84,13 +84,13 @@ ActionManager actionManager = siteContext.getActionManager(); actionManager.executeStartupActions(); } catch (Exception e) { - Debug.logError(e, "Problems executing JPublish startup actions", module); + 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 @@ -172,10 +172,10 @@ * @throws GeneralException */ public String render(String path, HttpServletRequest request, HttpServletResponse response) throws GeneralException { - Writer writer = new StringWriter(); - String content = null; + Writer writer = new StringWriter(); + String content = null; render(path, request, response, writer); - try { + try { content = writer.toString(); writer.close(); } catch (IOException e) { @@ -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); } @@ -250,7 +250,7 @@ // if the page is static StaticResourceManager staticResourceManager = siteContext.getStaticResourceManager(); if (staticResourceManager.resourceExists(path)) { - if (outputStream != null) { + if (outputStream != null) { // execute the global actions if (executeGlobalActions(request, response, context, path, allowRedirect)) return; @@ -258,12 +258,12 @@ // execute path actions if (executePathActions(request, response, context, path, allowRedirect)) return; - + // execute parameter actions if (executeParameterActions(request, response, context, path, allowRedirect)) return; - // load and return the static resource + // load and return the static resource staticResourceManager.load(path, outputStream); outputStream.flush(); return; @@ -271,12 +271,12 @@ 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"); - // load the page + // load the page PageInstance pageInstance = siteContext.getPageManager().getPage(path); Page page = new Page(pageInstance); @@ -304,16 +304,16 @@ if (executeParameterActions(request, response, context, path, allowRedirect)) return; - // execute the page actions + // execute the page actions if (optionalRedirect(page.executeActions(context), path, response, allowRedirect)) return; // get the template Template template = siteContext.getTemplateManager().getTemplate(page.getFullTemplateName()); - - // merge the template + + // merge the template template.merge(context, page, writer); - writer.flush(); + writer.flush(); } catch (FileNotFoundException e) { throw new GeneralException("File not found", e); } catch (Exception e) { @@ -327,26 +327,26 @@ } } - /** + /** * Privleged action for setting the class path. This is used to get around - * the Java security system to set the class path so scripts have full + * the Java security system to set the class path so scripts have full * access to all loaded Java classes. - * + * * <p>Note: This functionality is untested.</p> */ class SetClassPathAction implements PrivilegedAction { private String classPath; - /** - * Construct the action to set the class path. + /** + * Construct the action to set the class path. * @param classPath The new class path */ public SetClassPathAction(String classPath) { this.classPath = classPath; } - /** - * Set the "java.class.path" property. + /** + * Set the "java.class.path" property. * @return Returns null */ public Object run() { 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=757075&r1=757074&r2=757075&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 Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -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=757075&r1=757074&r2=757075&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 Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -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=757075&r1=757074&r2=757075&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 Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -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=757075&r1=757074&r2=757075&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 Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -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=757075&r1=757074&r2=757075&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 Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -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=757075&r1=757074&r2=757075&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 Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -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/VelocityViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/VelocityViewHandler.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/VelocityViewHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/VelocityViewHandler.java Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -48,7 +48,7 @@ public static final String module = VelocityViewHandler.class.getName(); public static final String REQUEST = "req"; - public static final String RESPONSE = "res"; + public static final String RESPONSE = "res"; private static SimplePool writerPool = new SimplePool(40); private VelocityEngine ve = null; @@ -89,7 +89,7 @@ } } - public void render(String name, String page, String info, String contentType, String encoding, + public void render(String name, String page, String info, String contentType, String encoding, HttpServletRequest request, HttpServletResponse response) throws ViewHandlerException { if (ve == null) { throw new ViewHandlerException("Velocity Template Engine has not been initialized"); 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=757075&r1=757074&r2=757075&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 Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -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) { + if (handlers.size() == 0) { this.preLoadAll(); } - + // get the view handler by type from the contextHandlers ViewHandler handler = handlers.get(type); @@ -99,7 +99,7 @@ } if (handler == null) { throw new ViewHandlerException("No handler found for type: " + type); - } + } } return handler; } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ViewHandler.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ViewHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ViewHandler.java Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ViewHandlerException.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ViewHandlerException.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ViewHandlerException.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ViewHandlerException.java Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 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=757075&r1=757074&r2=757075&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 Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -49,10 +49,10 @@ import freemarker.template.TemplateException; /** - * WfsViewHandler - View Handler + * 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,8 +96,8 @@ throw new ViewHandlerException(e.getMessage(), e); } } - - public static Template getDocTemplate(String fileUrl) throws FileNotFoundException, IOException, TemplateException, URISyntaxException { + + public static Template getDocTemplate(String fileUrl) throws FileNotFoundException, IOException, TemplateException, URISyntaxException { Template template = null; URL screenFileUrl = FlexibleLocation.resolveLocation(fileUrl, null); String urlStr = screenFileUrl.toString(); @@ -110,7 +110,7 @@ } public static Configuration makeDefaultOfbizConfig() throws TemplateException, IOException { - Configuration config = new Configuration(); + Configuration config = new Configuration(); config.setObjectWrapper(BeansWrapper.getDefaultInstance()); config.setSetting("datetime_format", "yyyy-MM-dd HH:mm:ss.SSS"); Configuration defaultOfbizConfig = config; 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=757075&r1=757074&r2=757075&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 Sat Mar 21 23:24:37 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -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=757075&r1=757074&r2=757075&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 Sat Mar 21 23:24:37 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 |