svn commit: r1635909 - in /ofbiz/trunk/framework/webapp/
Locked
 
|
Author: adrianc
Date: Sat Nov 1 09:32:53 2014 New Revision: 1635909 URL: http://svn.apache.org/r1635909 Log: Remove Javolution from the webapp component. Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ProtectViewWorker.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JavaEventHandler.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceMultiEventHandler.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceStreamHandler.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/PropFindHelper.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavUtil.java Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java?rev=1635909&r1=1635908&r2=1635909&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java Sat Nov 1 09:32:53 2014 @@ -22,16 +22,16 @@ import java.io.File; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; import javax.servlet.ServletContext; -import javolution.util.FastList; -import javolution.util.FastMap; -import javolution.util.FastSet; - import org.ofbiz.base.component.ComponentConfig.WebappInfo; import org.ofbiz.base.location.FlexibleLocation; import org.ofbiz.base.metrics.Metrics; @@ -60,7 +60,7 @@ public class ConfigXMLReader { public static final RequestResponse emptyNoneRequestResponse = RequestResponse.createEmptyNoneRequestResponse(); public static Set<String> findControllerFilesWithRequest(String requestUri, String controllerPartialPath) throws GeneralException { - Set<String> allControllerRequestSet = FastSet.newInstance(); + Set<String> allControllerRequestSet = new HashSet<String>(); if (UtilValidate.isEmpty(requestUri)) { return allControllerRequestSet; } @@ -70,7 +70,7 @@ public class ConfigXMLReader { try { // find controller.xml file with webappMountPoint + "/WEB-INF" in the path List<File> controllerFiles = FileUtil.findXmlFiles(null, controllerPartialPath, "site-conf", "site-conf.xsd"); - controllerConfigs = FastList.newInstance(); + controllerConfigs = new LinkedList<ControllerConfig>(); for (File controllerFile : controllerFiles) { URL controllerUrl = null; try { @@ -125,7 +125,7 @@ public class ConfigXMLReader { // if (controllerLocAndRequestSet.size() > 0) Debug.logInfo("============== In findRequestNamesLinkedtoInWidget, controllerLocAndRequestSet: " + controllerLocAndRequestSet, module); return controllerLocAndRequestSet; } else { - return FastSet.newInstance(); + return new HashSet<String>(); } } @@ -176,16 +176,16 @@ public class ConfigXMLReader { private String securityClass; private String defaultRequest; private String statusCode; - private List<URL> includes = FastList.newInstance(); - private Map<String, Event> firstVisitEventList = FastMap.newInstance(); - private Map<String, Event> preprocessorEventList = FastMap.newInstance(); - private Map<String, Event> postprocessorEventList = FastMap.newInstance(); - private Map<String, Event> afterLoginEventList = FastMap.newInstance(); - private Map<String, Event> beforeLogoutEventList = FastMap.newInstance(); - private Map<String, String> eventHandlerMap = FastMap.newInstance(); - private Map<String, String> viewHandlerMap = FastMap.newInstance(); - private Map<String, RequestMap> requestMapMap = FastMap.newInstance(); - private Map<String, ViewMap> viewMapMap = FastMap.newInstance(); + private List<URL> includes = new ArrayList<URL>(); + private Map<String, Event> firstVisitEventList = new HashMap<String, Event>(); + private Map<String, Event> preprocessorEventList = new HashMap<String, Event>(); + private Map<String, Event> postprocessorEventList = new HashMap<String, Event>(); + private Map<String, Event> afterLoginEventList = new HashMap<String, Event>(); + private Map<String, Event> beforeLogoutEventList = new HashMap<String, Event>(); + private Map<String, String> eventHandlerMap = new HashMap<String, String>(); + private Map<String, String> viewHandlerMap = new HashMap<String, String>(); + private Map<String, RequestMap> requestMapMap = new HashMap<String, RequestMap>(); + private Map<String, ViewMap> viewMapMap = new HashMap<String, ViewMap>(); public ControllerConfig(URL url) throws WebAppConfigurationException { this.url = url; @@ -532,7 +532,7 @@ public class ConfigXMLReader { public boolean securityCert = false; public boolean securityExternalView = true; public boolean securityDirectRequest = true; - public Map<String, RequestResponse> requestResponseMap = FastMap.newInstance(); + public Map<String, RequestResponse> requestResponseMap = new HashMap<String, RequestResponse>(); public Metrics metrics = null; public RequestMap(Element requestMapElement) { @@ -587,8 +587,8 @@ public class ConfigXMLReader { public boolean saveLastView = false; public boolean saveCurrentView = false; public boolean saveHomeView = false; - public Map<String, String> redirectParameterMap = FastMap.newInstance(); - public Map<String, String> redirectParameterValueMap = FastMap.newInstance(); + public Map<String, String> redirectParameterMap = new HashMap<String, String>(); + public Map<String, String> redirectParameterValueMap = new HashMap<String, String>(); public RequestResponse() { } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java?rev=1635909&r1=1635908&r2=1635909&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java Sat Nov 1 09:32:53 2014 @@ -25,9 +25,11 @@ import java.security.cert.X509Certificat import java.sql.Timestamp; import java.util.ArrayList; import java.util.Collection; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.ServiceLoader; +import java.util.concurrent.ConcurrentHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -39,9 +41,6 @@ import javax.servlet.http.HttpSession; import javax.servlet.jsp.PageContext; import javax.transaction.Transaction; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.component.ComponentConfig; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; @@ -89,7 +88,7 @@ public class LoginWorker { public static final String X509_CERT_ATTR = "SSLx509Cert"; /** This Map is keyed by the randomly generated externalLoginKey and the value is a UserLogin GenericValue object */ - public static Map<String, GenericValue> externalLoginKeys = FastMap.newInstance(); + public static Map<String, GenericValue> externalLoginKeys = new ConcurrentHashMap<String, GenericValue>(); public static StringWrapper makeLoginUrl(PageContext pageContext) { return makeLoginUrl(pageContext, "checkLogin"); @@ -238,7 +237,7 @@ public class LoginWorker { List<Object> errorMessageList = UtilGenerics.checkList(request.getAttribute("_ERROR_MESSAGE_LIST")); if (!hasBasePermission(userLogin, request) || isFlaggedLoggedOut(userLogin)) { if (errorMessageList == null) { - errorMessageList = new FastList<Object>(); + errorMessageList = new LinkedList<Object>(); request.setAttribute("_ERROR_MESSAGE_LIST", errorMessageList); } errorMessageList.add("User does not have permission or is flagged as logged out"); @@ -378,7 +377,7 @@ public class LoginWorker { password = (String) request.getAttribute("PASSWORD"); } - List<String> unpwErrMsgList = FastList.newInstance(); + List<String> unpwErrMsgList = new LinkedList<String>(); if (UtilValidate.isEmpty(username)) { unpwErrMsgList.add(UtilProperties.getMessage(resourceWebapp, "loginevents.username_was_empty_reenter", UtilHttp.getLocale(request))); } @@ -967,7 +966,7 @@ public class LoginWorker { } protected static boolean checkValidIssuer(Delegator delegator, Map<String, String> x500Map, BigInteger serialNumber) throws GeneralException { - List<EntityCondition> conds = FastList.newInstance(); + List<EntityCondition> conds = new LinkedList<EntityCondition>(); conds.add(EntityCondition.makeCondition(EntityOperator.OR, EntityCondition.makeConditionMap("commonName", x500Map.get("CN")), EntityCondition.makeConditionMap("commonName", null), EntityCondition.makeConditionMap("commonName", ""))); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ProtectViewWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ProtectViewWorker.java?rev=1635909&r1=1635908&r2=1635909&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ProtectViewWorker.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ProtectViewWorker.java Sat Nov 1 09:32:53 2014 @@ -20,13 +20,12 @@ package org.ofbiz.webapp.control; import java.util.List; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilMisc; @@ -43,8 +42,8 @@ public class ProtectViewWorker { private final static String module = ProtectViewWorker.class.getName(); private static final String resourceWebapp = "WebappUiLabels"; - private static final FastMap<String, Long> hitsByViewAccessed = FastMap.newInstance(); - private static final FastMap<String, Long> durationByViewAccessed = FastMap.newInstance(); + private static final Map<String, Long> hitsByViewAccessed = new ConcurrentHashMap<String, Long>(); + private static final Map<String, Long> durationByViewAccessed = new ConcurrentHashMap<String, Long>(); private static final Long one = new Long(1); /** Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?rev=1635909&r1=1635908&r2=1635909&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java Sat Nov 1 09:32:53 2014 @@ -26,6 +26,7 @@ import java.io.UnsupportedEncodingExcept import java.net.URL; import java.security.cert.X509Certificate; import java.util.Enumeration; +import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -35,8 +36,6 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import javolution.util.FastMap; - import org.ofbiz.base.start.Start; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.SSLUtil; @@ -546,7 +545,7 @@ public class RequestHandler { String preReqAttStr = (String) request.getSession().getAttribute("_REQ_ATTR_MAP_"); Map<String, Object> previousRequestAttrMap = null; if (preReqAttStr != null) { - previousRequestAttrMap = FastMap.newInstance(); + previousRequestAttrMap = new HashMap<String, Object>(); request.getSession().removeAttribute("_REQ_ATTR_MAP_"); byte[] reqAttrMapBytes = StringUtil.fromHexString(preReqAttStr); Map<String, Object> preRequestMap = checkMap(UtilObject.getObject(reqAttrMapBytes), String.class, Object.class); @@ -828,7 +827,7 @@ public class RequestHandler { if (Debug.infoOn()) Debug.logInfo("Sending redirect to: [" + url + "], sessionId=" + UtilHttp.getSessionId(req), module); // set the attributes in the session so we can access it. Enumeration<String> attributeNameEnum = UtilGenerics.cast(req.getAttributeNames()); - Map<String, Object> reqAttrMap = FastMap.newInstance(); + Map<String, Object> reqAttrMap = new HashMap<String, Object>(); Integer statusCode; try { statusCode = Integer.valueOf(statusCodeString); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java?rev=1635909&r1=1635908&r2=1635909&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java Sat Nov 1 09:32:53 2014 @@ -28,6 +28,7 @@ import java.io.IOException; import java.sql.Timestamp; import java.util.Collection; import java.util.Date; +import java.util.HashMap; import java.util.Iterator; import java.util.Locale; import java.util.Map; @@ -37,8 +38,6 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilProperties; @@ -50,8 +49,8 @@ import org.ofbiz.service.GenericServiceE import org.ofbiz.service.LocalDispatcher; import org.ofbiz.service.ModelService; import org.ofbiz.service.calendar.RecurrenceRule; -import org.ofbiz.webapp.control.RequestHandler; import org.ofbiz.webapp.control.ConfigXMLReader.Event; +import org.ofbiz.webapp.control.RequestHandler; /** * CoreEvents - WebApp Events Related To Framework pieces @@ -125,7 +124,7 @@ public class CoreEvents { String retryCnt = (String) params.remove("SERVICE_MAXRETRY"); // the frequency map - Map<String, Integer> freqMap = FastMap.newInstance(); + Map<String, Integer> freqMap = new HashMap<String, Integer>(); freqMap.put("SECONDLY", Integer.valueOf(1)); freqMap.put("MINUTELY", Integer.valueOf(2)); @@ -169,7 +168,7 @@ public class CoreEvents { } // make the context valid; using the makeValid method from ModelService - Map<String, Object> serviceContext = FastMap.newInstance(); + Map<String, Object> serviceContext = new HashMap<String, Object>(); Iterator<String> ci = modelService.getInParamNames().iterator(); while (ci.hasNext()) { String name = ci.next(); @@ -347,7 +346,7 @@ public class CoreEvents { session.removeAttribute("_SAVED_SYNC_RESULT_"); Map<String, String[]> serviceFieldsToSave = checkMap(request.getParameterMap(), String.class, String[].class); - Map<String, Object> savedFields = FastMap.newInstance(); + Map<String, Object> savedFields = new HashMap<String, Object>(); for (Map.Entry<String, String[]> entry : serviceFieldsToSave.entrySet()) { String key = entry.getKey(); @@ -384,14 +383,14 @@ public class CoreEvents { servicePathMap = checkMap(servicePathObject); } else if (servicePathObject instanceof GenericEntity) { GenericEntity servicePathEntity = (GenericEntity)servicePathObject; - servicePathMap = FastMap.newInstance(); + servicePathMap = new HashMap<String, Object>(); for (Map.Entry<String, Object> entry: servicePathEntity.entrySet()) { servicePathMap.put(entry.getKey(), entry.getValue()); } } else if (servicePathObject instanceof Collection<?>) { Collection<?> servicePathColl = checkCollection(servicePathObject); int count=0; - servicePathMap = FastMap.newInstance(); + servicePathMap = new HashMap<String, Object>(); for (Object value: servicePathColl) { servicePathMap.put("_"+count+"_", value); count++; 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=1635909&r1=1635908&r2=1635909&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 Nov 1 09:32:53 2014 @@ -19,14 +19,13 @@ package org.ofbiz.webapp.event; import java.lang.reflect.Method; +import java.util.HashMap; import java.util.Map; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.webapp.control.ConfigXMLReader; import org.ofbiz.webapp.control.ConfigXMLReader.Event; @@ -39,7 +38,7 @@ public class JavaEventHandler implements public static final String module = JavaEventHandler.class.getName(); - private Map<String, Class<?>> eventClassMap = FastMap.newInstance(); + private Map<String, Class<?>> eventClassMap = new HashMap<String, Class<?>>(); /** * @see org.ofbiz.webapp.event.EventHandler#init(javax.servlet.ServletContext) 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=1635909&r1=1635908&r2=1635909&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 Nov 1 09:32:53 2014 @@ -24,6 +24,7 @@ import java.io.File; import java.io.IOException; import java.nio.ByteBuffer; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -35,9 +36,6 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileUploadException; import org.apache.commons.fileupload.disk.DiskFileItemFactory; @@ -132,7 +130,7 @@ public class ServiceEventHandler impleme } boolean isMultiPart = ServletFileUpload.isMultipartContent(request); - Map<String, Object> multiPartMap = FastMap.newInstance(); + Map<String, Object> multiPartMap = new HashMap<String, Object>(); if (isMultiPart) { // get the http upload configuration String maxSizeStr = EntityUtilProperties.getPropertyValue("general.properties", "http.upload.max.size", "-1", dctx.getDelegator()); @@ -190,7 +188,7 @@ public class ServiceEventHandler impleme if (mapValue instanceof List<?>) { checkList(mapValue, Object.class).add(item.getString()); } else if (mapValue instanceof String) { - List<String> newList = FastList.newInstance(); + List<String> newList = new LinkedList<String>(); newList.add((String) mapValue); newList.add(item.getString()); multiPartMap.put(fieldName, newList); @@ -246,7 +244,7 @@ public class ServiceEventHandler impleme } // we have a service and the model; build the context - Map<String, Object> serviceContext = FastMap.newInstance(); + Map<String, Object> serviceContext = new HashMap<String, Object>(); for (ModelParam modelParam: model.getInModelParamList()) { String name = modelParam.name; @@ -320,7 +318,7 @@ public class ServiceEventHandler impleme // get only the parameters for this service - converted to proper type // TODO: pass in a list for error messages, like could not convert type or not a proper X, return immediately with messages if there are any - List<Object> errorMessages = FastList.newInstance(); + List<Object> errorMessages = new LinkedList<Object>(); serviceContext = model.makeValid(serviceContext, ModelService.IN_PARAM, true, errorMessages, timeZone, locale); if (errorMessages.size() > 0) { // uh-oh, had some problems... 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=1635909&r1=1635908&r2=1635909&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 Nov 1 09:32:53 2014 @@ -19,6 +19,8 @@ package org.ofbiz.webapp.event; import java.util.Arrays; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -30,9 +32,6 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilHttp; @@ -50,9 +49,9 @@ import org.ofbiz.service.ServiceAuthExce import org.ofbiz.service.ServiceUtil; import org.ofbiz.service.ServiceValidationException; import org.ofbiz.webapp.control.ConfigXMLReader; -import org.ofbiz.webapp.control.RequestHandler; import org.ofbiz.webapp.control.ConfigXMLReader.Event; import org.ofbiz.webapp.control.ConfigXMLReader.RequestMap; +import org.ofbiz.webapp.control.RequestHandler; import org.ofbiz.webapp.control.WebAppConfigurationException; /** @@ -155,8 +154,8 @@ public class ServiceMultiEventHandler im String messageSuffixStr = UtilProperties.getMessage("DefaultMessages", "service.message.suffix", locale); // prepare the error message and success message lists - List<Object> errorMessages = FastList.newInstance(); - List<String> successMessages = FastList.newInstance(); + List<Object> errorMessages = new LinkedList<Object>(); + List<String> successMessages = new LinkedList<String>(); // Check the global-transaction attribute of the event from the controller to see if the // event should be wrapped in a transaction @@ -207,7 +206,7 @@ public class ServiceMultiEventHandler im } // build the context - Map<String, Object> serviceContext = FastMap.newInstance(); + Map<String, Object> serviceContext = new HashMap<String, Object>(); for (ModelParam modelParam: modelService.getInModelParamList()) { String paramName = modelParam.name; 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=1635909&r1=1635908&r2=1635909&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 Nov 1 09:32:53 2014 @@ -23,14 +23,13 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.io.PrintStream; +import java.util.HashMap; import java.util.Map; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.DelegatorFactory; @@ -70,7 +69,7 @@ public class ServiceStreamHandler implem throw new EventHandlerException(e.getMessage(), e); } - Map<String, Object> context = FastMap.newInstance(); + Map<String, Object> context = new HashMap<String, Object>(); context.put("inputStream", in); context.put("outputStream", out); 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=1635909&r1=1635908&r2=1635909&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 Nov 1 09:32:53 2014 @@ -27,6 +27,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; import java.io.Writer; +import java.util.HashMap; import java.util.Locale; import java.util.Map; @@ -34,8 +35,6 @@ import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javolution.util.FastMap; - import org.apache.xmlrpc.XmlRpcException; import org.apache.xmlrpc.XmlRpcHandler; import org.apache.xmlrpc.XmlRpcRequest; @@ -190,7 +189,7 @@ public class XmlRpcEventHandler extends String password = config.getBasicPassword(); // check the account - Map<String, Object> context = FastMap.newInstance(); + Map<String, Object> context = new HashMap<String, Object>(); context.put("login.username", username); context.put("login.password", password); @@ -287,7 +286,7 @@ public class XmlRpcEventHandler extends } // context placeholder - Map<String, Object> context = FastMap.newInstance(); + Map<String, Object> context = new HashMap<String, Object>(); if (model != null) { int parameterCount = xmlRpcReq.getParameterCount(); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/PropFindHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/PropFindHelper.java?rev=1635909&r1=1635908&r2=1635909&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/PropFindHelper.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/PropFindHelper.java Sat Nov 1 09:32:53 2014 @@ -18,10 +18,9 @@ *******************************************************************************/ package org.ofbiz.webapp.webdav; +import java.util.LinkedList; import java.util.List; -import javolution.util.FastList; - import org.ofbiz.base.util.UtilValidate; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -56,7 +55,7 @@ public class PropFindHelper extends Resp } public List<Element> getFindPropsList(String nameSpaceUri) { - List<Element> result = FastList.newInstance(); + List<Element> result = new LinkedList<Element>(); NodeList nodeList = this.requestDocument.getElementsByTagNameNS(nameSpaceUri == null ? "*" : nameSpaceUri, "prop"); for (int i = 0; i < nodeList.getLength(); i++) { Node node = nodeList.item(i).getFirstChild(); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavUtil.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavUtil.java?rev=1635909&r1=1635908&r2=1635909&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavUtil.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavUtil.java Sat Nov 1 09:32:53 2014 @@ -23,14 +23,13 @@ import java.io.InputStream; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.HashMap; import java.util.Map; import java.util.TimeZone; import javax.servlet.http.HttpServletRequest; import javax.xml.parsers.ParserConfigurationException; -import javolution.util.FastMap; - import org.ofbiz.base.util.Base64; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilProperties; @@ -101,7 +100,7 @@ public class WebDavUtil { if ("true".equalsIgnoreCase(UtilProperties.getPropertyValue("security.properties", "password.lowercase"))) { password = password.toLowerCase(); } - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); result.put("login.username", username); result.put("login.password", password); return result; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |