svn commit: r757075 [2/3] - in /ofbiz/trunk/framework/webapp/
Locked
 
|
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/EventFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/EventFactory.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/EventFactory.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/EventFactory.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 @@ -122,6 +122,6 @@ RequestHandler handler = (RequestHandler) application.getAttribute("_REQUEST_HANDLER_"); ConfigXMLReader.ControllerConfig controllerConfig = handler.getControllerConfig(); ConfigXMLReader.RequestMap requestMap = controllerConfig.requestMapMap.get(requestUri); - return handler.runEvent(request, response, requestMap.event, requestMap, "unknown"); + return handler.runEvent(request, response, requestMap.event, requestMap, "unknown"); } } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/EventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/EventHandler.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/EventHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/EventHandler.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,7 +34,7 @@ /** * Initializes the handler. Since handlers use the singleton pattern this method should only be called * the first time the handler is used. - * + * * @param context ServletContext This may be needed by the handler in order to lookup properties or XML * definition files for rendering pages or handler options. * @throws EventHandlerException @@ -47,7 +47,7 @@ * @param requestMap Contains information about the request-map the event was called from * @param request The servlet request object * @param response The servlet response object - * + * *@return String Result code *@throws EventHandlerException */ Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/EventHandlerException.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/EventHandlerException.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/EventHandlerException.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/EventHandlerException.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 @@ public EventHandlerException(Throwable t) { super(t); } - + public EventHandlerException(String str) { super(str); } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/FileUploadProgressListener.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/FileUploadProgressListener.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/FileUploadProgressListener.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/FileUploadProgressListener.java Sat Mar 21 23:24:37 2009 @@ -50,7 +50,7 @@ public long getBytesRead() { return bytesRead; } - + public int getItems() { return items; } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/GroovyEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/GroovyEventHandler.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/GroovyEventHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/GroovyEventHandler.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,7 +34,7 @@ import org.ofbiz.webapp.control.ConfigXMLReader.RequestMap; public class GroovyEventHandler implements EventHandler { - + public static final String module = GroovyEventHandler.class.getName(); public void init(ServletContext context) throws EventHandlerException { @@ -59,11 +59,11 @@ Object result = GroovyUtil.runScriptAtLocation(event.path + event.invoke, groovyContext); // check the result if (result != null && !(result instanceof String)) { - throw new EventHandlerException("Event did not return a String result, it returned a " + result.getClass().getName()); + throw new EventHandlerException("Event did not return a String result, it returned a " + result.getClass().getName()); } return (String) result; } catch (Exception e) { throw new EventHandlerException("Groovy Event Error", e); - } + } } } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONJavaEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONJavaEventHandler.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONJavaEventHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONJavaEventHandler.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/event/JSONServiceEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONServiceEventHandler.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONServiceEventHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONServiceEventHandler.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/event/JSONSimpleEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONSimpleEventHandler.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONSimpleEventHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONSimpleEventHandler.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/event/JavaEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JavaEventHandler.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JavaEventHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JavaEventHandler.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 @@ */ public void init(ServletContext context) throws EventHandlerException { } - + /** * @see org.ofbiz.webapp.event.EventHandler#invoke(Event, org.ofbiz.webapp.control.ConfigXMLReader.RequestMap, HttpServletRequest, HttpServletResponse) */ Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/RomeEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/RomeEventHandler.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/RomeEventHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/RomeEventHandler.java Sat Mar 21 23:24:37 2009 @@ -53,7 +53,7 @@ if (this.handler == null) { throw new EventHandlerException("No request handler found in servlet context!"); } - + // get the service event handler this.service = new ServiceEventHandler(); this.service.init(context); @@ -92,7 +92,7 @@ } catch (FeedException e) { throw new EventHandlerException("Unable to write RSS feed", e); } - + return respCode; } } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.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 @@ -65,7 +65,7 @@ */ public void init(ServletContext context) throws EventHandlerException { } - + /** * @see org.ofbiz.webapp.event.EventHandler#invoke(Event, org.ofbiz.webapp.control.ConfigXMLReader.RequestMap, HttpServletRequest, HttpServletResponse) */ @@ -138,14 +138,14 @@ // not a wsdl request; invoke the service try { - axisServer = AxisServer.getServer(UtilMisc.toMap("name", "OFBiz/Axis Server", "provider", null)); + axisServer = AxisServer.getServer(UtilMisc.toMap("name", "OFBiz/Axis Server", "provider", null)); } catch (AxisFault e) { sendError(response, e); throw new EventHandlerException("Problems with the AXIS server", e); } MessageContext mctx = new MessageContext(axisServer); mctx.setEncodingStyle(Constants.URI_LITERAL_ENC); // sets the response encoding - + // get the SOAP message Message msg = null; @@ -178,12 +178,12 @@ // get the service name and parameters try { - reqEnv = (SOAPEnvelope) msg.getSOAPPart().getEnvelope(); + reqEnv = (SOAPEnvelope) msg.getSOAPPart().getEnvelope(); } catch (SOAPException e) { sendError(response, "Problem processing the service"); throw new EventHandlerException("Cannot get the envelope", e); } - + List<Object> bodies = null; try { @@ -264,9 +264,9 @@ } } - try { - response.setContentType(msg.getContentType(Constants.DEFAULT_SOAP_VERSION)); - response.setContentLength(Integer.parseInt(Long.toString(msg.getContentLength()))); + try { + response.setContentType(msg.getContentType(Constants.DEFAULT_SOAP_VERSION)); + response.setContentLength(Integer.parseInt(Long.toString(msg.getContentLength()))); } catch (AxisFault e) { sendError(response, e); throw new EventHandlerException(e.getMessage(), e); @@ -292,7 +292,7 @@ try { res.setContentType(msg.getContentType(Constants.DEFAULT_SOAP_VERSION)); res.setContentLength(Integer.parseInt(Long.toString(msg.getContentLength()))); - msg.writeTo(res.getOutputStream()); + msg.writeTo(res.getOutputStream()); res.flushBuffer(); } catch (Exception e) { throw new EventHandlerException(e.getMessage(), e); @@ -319,7 +319,7 @@ uri.append(reqInfo); return uri.toString(); } - + public static String messageToString(Message msg) throws SOAPException, IOException { ByteArrayOutputStream out = new ByteArrayOutputStream(); msg.writeTo(out); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.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 @@ -134,7 +134,7 @@ Debug.logError(e, "Unable to obtain the max upload size from general.properties; using default -1", module); maxUploadSize = -1; } - // get the http size threshold configuration - files bigger than this will be + // get the http size threshold configuration - files bigger than this will be // temporarly stored on disk during upload String sizeThresholdStr = UtilProperties.getPropertyValue("general.properties", "http.upload.max.sizethreshold", "10240"); int sizeThreshold = 10240; // 10K @@ -274,10 +274,10 @@ // NOTTODO: may want to allow parameters that map to entity PK fields to be in the URL, but that might be a big security hole since there are certain security sensitive entities that are made of only PK fields, or that only need PK fields to function (like UserLoginSecurityGroup) // NOTTODO: we could allow URL parameters when it is not a POST (ie when !request.getMethod().equalsIgnoreCase("POST")), but that would open a security hole where sensitive parameters can be passed on the URL in a GET/etc and bypass this security constraint } - + // use the rawParametersMap from UtilHttp in order to also get pathInfo parameters, do canonicalization, etc value = rawParametersMap.get(name); - + // make any composite parameter data (e.g., from a set of parameters {name_c_date, name_c_hour, name_c_minutes}) if (value == null) { value = UtilHttp.makeParamValueFromComposite(request, name, locale); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceMultiEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceMultiEventHandler.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceMultiEventHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceMultiEventHandler.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 @@ -63,9 +63,9 @@ public static final String SYNC = "sync"; public static final String ASYNC = "async"; - + protected ServletContext servletContext; - + /** * @see org.ofbiz.webapp.event.EventHandler#init(javax.servlet.ServletContext) */ @@ -78,7 +78,7 @@ */ public String invoke(Event event, RequestMap requestMap, HttpServletRequest request, HttpServletResponse response) throws EventHandlerException { // TODO: consider changing this to use the new UtilHttp.parseMultiFormData method - + // make sure we have a valid reference to the Service Engine LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); if (dispatcher == null) { @@ -164,7 +164,7 @@ boolean eventGlobalTransaction = controllerConfig.requestMapMap.get(requestUri).event.globalTransaction; Set<String> urlOnlyParameterNames = UtilHttp.getUrlOnlyParameterMap(request).keySet(); - + // big try/finally to make sure commit or rollback are run boolean beganTrans = false; String returnString = null; @@ -183,7 +183,7 @@ String curSuffix = UtilHttp.MULTI_ROW_DELIMITER + i; boolean rowSelected = false; if (UtilValidate.isNotEmpty(request.getAttribute(UtilHttp.ROW_SUBMIT_PREFIX + i))) { - rowSelected = request.getAttribute(UtilHttp.ROW_SUBMIT_PREFIX + i) == null ? false : + rowSelected = request.getAttribute(UtilHttp.ROW_SUBMIT_PREFIX + i) == null ? false : "Y".equalsIgnoreCase((String)request.getAttribute(UtilHttp.ROW_SUBMIT_PREFIX + i)); } else { rowSelected = request.getParameter(UtilHttp.ROW_SUBMIT_PREFIX + i) == null ? false : @@ -199,7 +199,7 @@ Map<String, Object> serviceContext = FastMap.newInstance(); for (ModelParam modelParam: modelService.getInModelParamList()) { String paramName = modelParam.name; - + // Debug.logInfo("In ServiceMultiEventHandler processing input parameter [" + modelParam.name + (modelParam.optional?"(optional):":"(required):") + modelParam.mode + "] for service [" + serviceName + "]", module); // don't include userLogin, that's taken care of below @@ -223,7 +223,7 @@ // first check for request parameters if (value == null) { String name = paramName + curSuffix; - + // special case for security: if this is a request-map defined as secure in controller.xml then only accept body parameters coming in, ie don't allow the insecure URL parameters // NOTE: the RequestHandler will check the HttpSerletRequest security to make sure it is secure if the request-map -> security -> https=true, but we can't just look at the request.isSecure() method here because it is allowed to send secure requests for request-map with https=false if (requestMap != null && requestMap.securityHttps) { @@ -233,7 +233,7 @@ // TODO: restore this once more issues with existing links, like Delete links in forms, are resolved, for now just log warnings: throw new EventHandlerException(errMsg); } } - + String[] paramArr = request.getParameterValues(name); if (paramArr != null) { if (paramArr.length > 1) { @@ -259,7 +259,7 @@ } else { value = gParamArr[0]; } - } + } if (value == null) { value = request.getAttribute(paramName); } @@ -336,7 +336,7 @@ if (UtilValidate.isNotEmpty(errorMessage)) { errorMessages.add(errorMessage); } - + // get the success messages if (!UtilValidate.isEmpty((String)result.get(ModelService.SUCCESS_MESSAGE))) { String newSuccessMessage = (String)result.get(ModelService.SUCCESS_MESSAGE); @@ -402,7 +402,7 @@ returnString = "success"; } } - + return returnString; } } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceStreamHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceStreamHandler.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceStreamHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceStreamHandler.java Sat Mar 21 23:24:37 2009 @@ -56,7 +56,7 @@ this.dispatcher = GenericDispatcher.getLocalDispatcher(dispatcherName, delegator); } - public String invoke(Event event, RequestMap requestMap, HttpServletRequest request, HttpServletResponse response) throws EventHandlerException { + public String invoke(Event event, RequestMap requestMap, HttpServletRequest request, HttpServletResponse response) throws EventHandlerException { InputStream in; try { in = request.getInputStream(); @@ -75,7 +75,7 @@ context.put("outputStream", out); if (Debug.infoOn()) Debug.logInfo("Running service with context: " + context, module); - + Map<String, Object> resp; try { resp = dispatcher.runSync(event.invoke, context); @@ -100,7 +100,7 @@ throw new EventHandlerException(ServiceUtil.getErrorMessage(resp)); } } - + return null; } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/SimpleEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/SimpleEventHandler.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/SimpleEventHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/SimpleEventHandler.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,15 +46,15 @@ */ public void init(ServletContext context) throws EventHandlerException { } - + /** * @see org.ofbiz.webapp.event.EventHandler#invoke(Event, org.ofbiz.webapp.control.ConfigXMLReader.RequestMap, HttpServletRequest, HttpServletResponse) */ public String invoke(Event event, RequestMap requestMap, HttpServletRequest request, HttpServletResponse response) throws EventHandlerException { String xmlResource = event.path; String eventName = event.invoke; - Locale locale = UtilHttp.getLocale(request); - + Locale locale = UtilHttp.getLocale(request); + if (Debug.verboseOn()) Debug.logVerbose("[Set path/method]: " + xmlResource + " / " + eventName, module); if (xmlResource == null) { @@ -71,7 +71,7 @@ return eventReturn; } catch (MiniLangException e) { Debug.logError(e, module); - String errMsg = UtilProperties.getMessage(SimpleEventHandler.err_resource, "simpleEventHandler.event_not_completed", (locale != null ? locale : Locale.getDefault())) + ": "; + String errMsg = UtilProperties.getMessage(SimpleEventHandler.err_resource, "simpleEventHandler.event_not_completed", (locale != null ? locale : Locale.getDefault())) + ": "; request.setAttribute("_ERROR_MESSAGE_", errMsg + e.getMessage()); return "error"; } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/TestEvent.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/TestEvent.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/TestEvent.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/TestEvent.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 @@ public class TestEvent { public static final String module = TestEvent.class.getName(); - + public static String test(HttpServletRequest request, HttpServletResponse response) { request.setAttribute("MESSAGE", "Test Event Ran Fine."); Debug.log("Test Event Ran Fine.", module); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/WfsEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/WfsEventHandler.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/WfsEventHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/WfsEventHandler.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 @@ -63,7 +63,7 @@ public class WfsEventHandler implements EventHandler { public static final String module = WfsEventHandler.class.getName(); - + public static final String InputTemplateUrl ="component://webapp/script/org/ofbiz/webapp/event/processWfs.ftl"; /** @@ -71,7 +71,7 @@ */ public void init(ServletContext context) throws EventHandlerException { } - + /** Invoke the web event *@param eventPath The path or location of this event *@param eventMethod The method to invoke @@ -103,7 +103,7 @@ // Take "ogc:filter" element and transform it to a Simple Method query script String inputTmplUrl = UtilProperties.getPropertyValue("wfs", "input.template.path", WfsEventHandler.InputTemplateUrl); String xmlScript = processWfsEntity(typeName, queryElem, inputTmplUrl); - + // run simple method script to get a list of entities Document simpleDoc = UtilXml.readXmlDocument(xmlScript); Element simpleElem = simpleDoc.getDocumentElement(); @@ -112,7 +112,7 @@ String retStr = meth.exec(methodContext); //Need to check return string List entityList = (List) request.getAttribute("entityList"); request.setAttribute("entityList", entityList); - + } catch (TemplateException ioe) { sendError(response, "Problem handling event"); throw new EventHandlerException("Problem processing template", ioe); @@ -143,7 +143,7 @@ try { // res.setContentType(msg.getContentType(Constants.DEFAULT_WFS_VERSION)); // res.setContentLength(Integer.parseInt(Long.toString(msg.getContentLength()))); -// msg.writeTo(res.getOutputStream()); +// msg.writeTo(res.getOutputStream()); // res.flushBuffer(); } catch (Exception e) { throw new EventHandlerException(e.getMessage(), e); @@ -170,7 +170,7 @@ // uri.append(reqInfo); return uri.toString(); } - + public static String processWfsEntity(String entityName, Node domNode, String templatePath) throws TemplateException, FileNotFoundException, IOException, URISyntaxException { String result = null; NodeModel nodeModel = NodeModel.wrap(domNode); @@ -185,7 +185,7 @@ return result; } - 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(); @@ -198,7 +198,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/event/XmlRpcEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java Sat Mar 21 23:24:37 2009 @@ -71,7 +71,7 @@ private Boolean enabledForExtensions = null; private Boolean enabledForExceptions = null; - + public void init(ServletContext context) throws EventHandlerException { String delegatorName = context.getInitParameter("entityDelegatorName"); this.delegator = GenericDelegator.getGenericDelegator(delegatorName); @@ -204,7 +204,7 @@ public ServiceRpcHandler() { this.setAuthenticationHandler(new OfbizRpcAuthHandler()); } - + public XmlRpcHandler getHandler(String method) throws XmlRpcNoSuchHandlerException, XmlRpcException { ModelService model = null; try { @@ -234,7 +234,7 @@ } // prepare the context -- single parameter type struct (map) - Map<String, Object> context = this.getContext(xmlRpcReq, serviceName); + Map<String, Object> context = this.getContext(xmlRpcReq, serviceName); // add in auth parameters XmlRpcHttpRequestConfig config = (XmlRpcHttpRequestConfig) xmlRpcReq.getConfig(); @@ -256,11 +256,11 @@ throw new XmlRpcException(e.getMessage(), e); } if (ServiceUtil.isError(resp)) { - Debug.logError(ServiceUtil.getErrorMessage(resp), module); + Debug.logError(ServiceUtil.getErrorMessage(resp), module); throw new XmlRpcException(ServiceUtil.getErrorMessage(resp)); } - // return only definied parameters + // return only definied parameters return model.makeValid(resp, ModelService.OUT_PARAM, false, null); } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/FreeMarkerViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/FreeMarkerViewHandler.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/FreeMarkerViewHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/FreeMarkerViewHandler.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 @@ -44,11 +44,11 @@ /** FreemarkerViewHandler - Freemarker Template Engine View Handler. */ public class FreeMarkerViewHandler extends AbstractViewHandler { - + public static final String module = FreeMarkerViewHandler.class.getName(); protected ServletContext servletContext = null; protected Configuration config = (Configuration) FreeMarkerWorker.getDefaultOfbizConfig().clone(); - + public void init(ServletContext context) throws ViewHandlerException { this.servletContext = context; config.setCacheStorage(new OfbizCacheStorage("unknown")); @@ -56,18 +56,18 @@ config.setDirectoryForTemplateLoading(new File(servletContext.getRealPath("/"))); } catch (IOException e) { throw new ViewHandlerException("Could not create file for webapp root path", e); - } - } - - public void render(String name, String page, String info, String contentType, String encoding, - HttpServletRequest request, HttpServletResponse response) throws ViewHandlerException { - if (page == null || page.length() == 0) + } + } + + public void render(String name, String page, String info, String contentType, String encoding, + HttpServletRequest request, HttpServletResponse response) throws ViewHandlerException { + if (page == null || page.length() == 0) throw new ViewHandlerException("Invalid template source"); - + // make the root context (data model) for freemarker MapStack<String> context = MapStack.create(); prepOfbizRoot(context, request, response); - + // process the template & flush the output try { if (page.startsWith("component://")) { @@ -82,15 +82,15 @@ throw new ViewHandlerException("Problems processing Freemarker template", te); } catch (IOException ie) { throw new ViewHandlerException("Problems writing to output stream", ie); - } + } } - + public static void prepOfbizRoot(Map<String, Object> root, HttpServletRequest request, HttpServletResponse response) { ServletContext servletContext = (ServletContext) request.getAttribute("servletContext"); HttpSession session = request.getSession(); - + BeansWrapper wrapper = BeansWrapper.getDefaultInstance(); - + // add in the OFBiz objects root.put("delegator", request.getAttribute("delegator")); root.put("dispatcher", request.getAttribute("dispatcher")); @@ -99,13 +99,13 @@ // add the response object (for transforms) to the context as a BeanModel root.put("response", response); - + // add the application object (for transforms) to the context as a BeanModel root.put("application", servletContext); - + // add the servlet context -- this has been deprecated, and now requires servlet, do we really need it? - //root.put("applicationAttributes", new ServletContextHashModel(servletContext, BeansWrapper.getDefaultInstance())); - + //root.put("applicationAttributes", new ServletContextHashModel(servletContext, BeansWrapper.getDefaultInstance())); + // add the session object (for transforms) to the context as a BeanModel root.put("session", session); @@ -121,7 +121,7 @@ // add the request parameters -- this now uses a Map from UtilHttp Map<String, Object> requestParameters = UtilHttp.getParameterMap(request); root.put("requestParameters", requestParameters); - + // add the TabLibFactory TaglibFactory JspTaglibs = new TaglibFactory(servletContext); root.put("JspTaglibs", JspTaglibs); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.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 @@ -76,7 +76,7 @@ } } root.put("context", wrapper.wrap(contextMap)); - root.put("cachedInclude", new JpCacheIncludeTransform()); // only adding this in for JP! + root.put("cachedInclude", new JpCacheIncludeTransform()); // only adding this in for JP! //root.put("jpublishContext", wrapper.wrap(context)); FreeMarkerViewHandler.prepOfbizRoot(root, request, response); } catch (Exception e) { @@ -94,7 +94,7 @@ template.setObjectWrapper(BeansWrapper.getDefaultInstance()); /* NEVER add content to the beginning of templates; this effects XML processing which requires the - first line remain intact. + first line remain intact. boolean showTemplateId = UtilProperties.propertyValueEquals("content", "freemarker.showTemplateId", "Y"); String templateIdPrefix = UtilProperties.getPropertyValue("content", "freemarker.templateIdPrefix", "[system]"); if (showTemplateId) { Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/JpCacheIncludeTransform.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/ftl/LoopWriter.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/LoopWriter.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/LoopWriter.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/LoopWriter.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,11 +29,11 @@ public LoopWriter(Writer out) { } - public int onStart() throws TemplateModelException, IOException { + public int onStart() throws TemplateModelException, IOException { return TransformControl.EVALUATE_BODY; } - public int afterBody() throws TemplateModelException, IOException { + public int afterBody() throws TemplateModelException, IOException { return TransformControl.END_EVALUATION; } @@ -41,7 +41,7 @@ throw t; } - public void close() throws IOException { + public void close() throws IOException { } public void write(char cbuf[], int off, int len) { Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizAmountTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizAmountTransform.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizAmountTransform.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizAmountTransform.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 @@ -44,7 +44,7 @@ public static final String module = OfbizAmountTransform.class.getName(); public static final String SPELLED_OUT_FORMAT = "spelled-out"; - + private static String getArg(Map args, String key) { String result = ""; Object o = args.get(key); @@ -90,7 +90,7 @@ } return Double.valueOf(0.00); } - + public Writer getWriter(final Writer out, Map args) { final StringBuilder buf = new StringBuilder(); @@ -107,7 +107,7 @@ out.flush(); } - public void close() throws IOException { + public void close() throws IOException { try { if (Debug.verboseOn()) Debug.logVerbose("parms: " + amount + " " + format + " " + locale, module); Locale localeObj = null; Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCacheStorage.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCacheStorage.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCacheStorage.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCacheStorage.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 @@ -28,23 +28,23 @@ public class OfbizCacheStorage implements CacheStorage { //can't have global cache because names/keys are relative to the webapp protected final UtilCache<Object, Object> localCache; - + public OfbizCacheStorage(String id) { this.localCache = new UtilCache<Object, Object>("webapp.FreeMarkerCache." + id, 0, 0, false); } - + public Object get(Object key) { return localCache.get(key); } - + public void put(Object key, Object value) { localCache.put(key, value); } - + public void remove(Object key) { localCache.remove(key); } - + public void clear() { localCache.clear(); } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizContentTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizContentTransform.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizContentTransform.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizContentTransform.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 @@ -38,10 +38,10 @@ * OfbizContentTransform - Freemarker Transform for content links */ public class OfbizContentTransform implements TemplateTransformModel { - + public final static String module = OfbizUrlTransform.class.getName(); - - public Writer getWriter(final Writer out, Map args) { + + public Writer getWriter(final Writer out, Map args) { final StringBuilder buf = new StringBuilder(); return new Writer(out) { public void write(char cbuf[], int off, int len) { @@ -52,21 +52,21 @@ out.flush(); } - public void close() throws IOException { - try { + public void close() throws IOException { + try { Environment env = Environment.getCurrentEnvironment(); BeanModel req = (BeanModel)env.getVariable("request"); HttpServletRequest request = req == null ? null : (HttpServletRequest) req.getWrappedObject(); - + String requestUrl = buf.toString(); - + // make the link StringBuffer newURL = new StringBuffer(); ContentUrlTag.appendContentPrefix(request, newURL); if (newURL.length() > 0 && newURL.charAt(newURL.length() - 1) != '/' && requestUrl.charAt(0) != '/') { newURL.append('/'); } - newURL.append(requestUrl); + newURL.append(requestUrl); out.write(newURL.toString()); } catch (TemplateModelException e) { throw new IOException(e.getMessage()); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCurrencyTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCurrencyTransform.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCurrencyTransform.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCurrencyTransform.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 @@ -109,7 +109,7 @@ } return 0; } - + public Writer getWriter(final Writer out, Map args) { final StringBuilder buf = new StringBuilder(); @@ -133,7 +133,7 @@ out.flush(); } - public void close() throws IOException { + public void close() throws IOException { try { if (Debug.verboseOn()) Debug.logVerbose("parms: " + amount + " " + isoCode + " " + locale, module); if (locale.length() < 1) { Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizUrlTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizUrlTransform.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizUrlTransform.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizUrlTransform.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 @@ -44,9 +44,9 @@ public class OfbizUrlTransform implements TemplateTransformModel { public final static String module = OfbizUrlTransform.class.getName(); - + public boolean checkArg(Map args, String key, boolean defaultValue) { - if (!args.containsKey(key)) { + if (!args.containsKey(key)) { return defaultValue; } else { Object o = args.get(key); @@ -57,13 +57,13 @@ return defaultValue; } } - - public Writer getWriter(final Writer out, Map args) { + + public Writer getWriter(final Writer out, Map args) { final StringBuilder buf = new StringBuilder(); final boolean fullPath = checkArg(args, "fullPath", false); final boolean secure = checkArg(args, "secure", false); final boolean encode = checkArg(args, "encode", true); - + return new Writer(out) { public void write(char cbuf[], int off, int len) { buf.append(cbuf, off, len); @@ -73,8 +73,8 @@ out.flush(); } - public void close() throws IOException { - try { + public void close() throws IOException { + try { Environment env = Environment.getCurrentEnvironment(); BeanModel req = (BeanModel) env.getVariable("request"); BeanModel res = (BeanModel) env.getVariable("response"); @@ -86,9 +86,9 @@ if (res != null) { response = (HttpServletResponse) res.getWrappedObject(); } - + String requestUrl = buf.toString(); - + // make the link RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_"); out.write(rh.makeLink(request, response, requestUrl, fullPath, secure, encode)); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/RenderWrappedTextTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/RenderWrappedTextTransform.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/RenderWrappedTextTransform.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/RenderWrappedTextTransform.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,8 +36,8 @@ public class RenderWrappedTextTransform implements TemplateTransformModel { public static final String module = RenderWrappedTextTransform.class.getName(); - - public Writer getWriter(final Writer out, Map args) { + + public Writer getWriter(final Writer out, Map args) { final Environment env = Environment.getCurrentEnvironment(); Map<String, Object> ctx = checkMap(FreeMarkerWorker.getWrappedObject("context", env), String.class, Object.class); final String wrappedFTL = FreeMarkerWorker.getArg(checkMap(args, String.class, Object.class), "wrappedFTL", ctx); @@ -51,7 +51,7 @@ out.flush(); } - public void close() throws IOException { + public void close() throws IOException { if (UtilValidate.isNotEmpty(wrappedFTL)) { out.write(wrappedFTL); } else { Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/SetRequestAttributeMethod.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/SetRequestAttributeMethod.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/SetRequestAttributeMethod.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/SetRequestAttributeMethod.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,24 +33,24 @@ * SetRequestAttributeMethod - Freemarker Method for setting request attributes */ public class SetRequestAttributeMethod implements TemplateMethodModelEx { - - public static final String module = SetRequestAttributeMethod.class.getName(); + + public static final String module = SetRequestAttributeMethod.class.getName(); - /* + /* * @see freemarker.template.TemplateMethodModel#exec(java.util.List) */ public Object exec(List args) throws TemplateModelException { if (args == null || args.size() != 2) - throw new TemplateModelException("Invalid number of arguements"); - if (!(args.get(0) instanceof TemplateScalarModel)) + throw new TemplateModelException("Invalid number of arguements"); + if (!(args.get(0) instanceof TemplateScalarModel)) throw new TemplateModelException("First argument not an instance of TemplateScalarModel"); - if (!(args.get(1) instanceof BeanModel) && !(args.get(1) instanceof TemplateNumberModel) && !(args.get(1) instanceof TemplateScalarModel)) + if (!(args.get(1) instanceof BeanModel) && !(args.get(1) instanceof TemplateNumberModel) && !(args.get(1) instanceof TemplateScalarModel)) throw new TemplateModelException("Second argument not an instance of BeanModel nor TemplateNumberModel nor TemplateScalarModel"); - + Environment env = Environment.getCurrentEnvironment(); BeanModel req = (BeanModel)env.getVariable("request"); HttpServletRequest request = (HttpServletRequest) req.getWrappedObject(); - + String name = ((TemplateScalarModel) args.get(0)).getAsString(); Object value = null; if (args.get(1) instanceof TemplateScalarModel) @@ -58,9 +58,9 @@ if (args.get(1) instanceof TemplateNumberModel) value = ((TemplateNumberModel) args.get(1)).getAsNumber(); if (args.get(1) instanceof BeanModel) - value = ((BeanModel) args.get(1)).getWrappedObject(); - - request.setAttribute(name, value); + value = ((BeanModel) args.get(1)).getWrappedObject(); + + request.setAttribute(name, value); return new SimpleScalar(""); } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/pseudotag/EntityField.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/pseudotag/EntityField.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/pseudotag/EntityField.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/pseudotag/EntityField.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/pseudotag/InputValue.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/pseudotag/InputValue.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/pseudotag/InputValue.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/pseudotag/InputValue.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/region/Content.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Content.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Content.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Content.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 @@ * <br/>- region (for a nested region) * <br/>- default (for region if matches region name OR JSP/Servlet resource otherwise) * <br/>- resource (for JSP/Servlet resource) - * <br/>- or any ViewHandler defined in the corresponding controller.xml file + * <br/>- or any ViewHandler defined in the corresponding controller.xml file */ protected final String type; Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Region.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Region.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Region.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Region.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 @@ * <br/>Implements abstract render(PageContext) from Content */ public class Region extends Content { - + public static final String module = Region.class.getName(); private Map<String, Section> sections = FastMap.newInstance(); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RegionManager.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RegionManager.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RegionManager.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RegionManager.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,22 +35,22 @@ * A class to manage the region cache and read a region XML file */ public class RegionManager { - + public static final String module = RegionManager.class.getName(); protected static UtilCache<URL, Map<String, Region>> regionCache = new UtilCache<URL, Map<String, Region>>("webapp.Regions.Config", 0, 0); - + protected URL regionFile = null; - + public RegionManager(URL regionFile) { this.regionFile = regionFile; if (regionFile == null) throw new IllegalArgumentException("regionFile cannot be null"); - + //This may seem a bit funny, but we want to keep it in the cache so that it can be reloaded easily // Also note that we do not check to see if it is already there, in all cases we want to re-load the definition regionCache.put(regionFile, readRegionXml(regionFile)); } - + public Map<String, Region> getRegions() { Map<String, Region> regions = regionCache.get(regionFile); if (regions == null) { Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RegionStack.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RegionStack.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RegionStack.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RegionStack.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/region/RegionTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RegionTag.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RegionTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RegionTag.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/region/RenderTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RenderTag.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RenderTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RenderTag.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 @@ -27,9 +27,9 @@ * Tag to render a region */ public class RenderTag extends RegionTag { - + public static final String module = RenderTag.class.getName(); - + private String sectionName = null; private String role = null; private String permission = null; Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Section.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Section.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Section.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Section.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 @@ import org.ofbiz.webapp.view.ViewHandlerException; /** - * A section is content with a name that implements Content.render. + * A section is content with a name that implements Content.render. * <p>That method renders content either by including * it or by printing it directly, depending upon the direct * value passed to the Section constructor.</p> @@ -45,7 +45,7 @@ protected final String name; protected final String info; protected RegionManager regionManager; - + public final static String module = Section.class.getName(); public Section(String name, String info, String content, String type, RegionManager regionManager) { @@ -125,7 +125,7 @@ try { contentStr = jp.render(content, request, response); } catch (GeneralException e) { - Debug.logError(e, "Problems rendering view from JPublish", module); + Debug.logError(e, "Problems rendering view from JPublish", module); } if (UtilJ2eeCompat.useOutputStreamNotWriter(context)) { response.getOutputStream().print(contentStr); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.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,7 +40,7 @@ /** * <p>Counts server hits and tracks statistics for request, events and views - * <p>Handles total stats since the server started and binned + * <p>Handles total stats since the server started and binned * stats according to settings in the serverstats.properties file. */ public class ServerHitBin { @@ -542,7 +542,7 @@ break; } - // the first in the list will be this object, remove and copy it, + // the first in the list will be this object, remove and copy it, // put the copy at the first of the list, then put this object back on binList.remove(0); if (this.numberHits > 0) { @@ -587,7 +587,7 @@ void saveHit(HttpServletRequest request, long startTime, long runningTime, GenericValue userLogin) { // persist record of hit in ServerHit entity if option turned on if (UtilProperties.propertyValueEqualsIgnoreCase("serverstats", "stats.persist." + ServerHitBin.typeIds[type] + ".hit", "true")) { - // if the hit type is ENTITY and the name contains "ServerHit" don't + // if the hit type is ENTITY and the name contains "ServerHit" don't // persist; avoids the infinite loop and a bunch of annoying data if (this.type == ENTITY && this.id.indexOf("ServerHit") > 0) { return; @@ -666,7 +666,7 @@ // This may not satisfy those who want to record each and // every server hit even with equal startTimes but that could be // solved adding a counter to the ServerHit's PK (a counter - // counting multiple hits at the same startTime). + // counting multiple hits at the same startTime). try { serverHit.create(); } catch (GenericEntityException e) { 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=757075&r1=757074&r2=757075&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 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 @@ -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) { @@ -174,9 +174,9 @@ } } } - } + } } - + 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/AbstractParameterTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/AbstractParameterTag.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/AbstractParameterTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/AbstractParameterTag.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/ContentUrlTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ContentUrlTag.java?rev=757075&r1=757074&r2=757075&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ContentUrlTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ContentUrlTag.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/EntityFieldTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/EntityFieldTag.java?rev=757075&r1=757074&r2=757075&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 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 @@ * 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=757075&r1=757074&r2=757075&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 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 @@ * 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=757075&r1=757074&r2=757075&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 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 @@ * 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=757075&r1=757074&r2=757075&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 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,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(); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |