Author: doogie
Date: Fri Mar 13 05:37:48 2009 New Revision: 753126 URL: http://svn.apache.org/viewvc?rev=753126&view=rev Log: Upgrade webslinger(servlet spec 2.5). Added: ofbiz/trunk/framework/webslinger/lib/webslinger-20090313-536fba2eb96a.jar (with props) ofbiz/trunk/framework/webslinger/lib/webslinger-catalina-20090313-536fba2eb96a.jar (with props) ofbiz/trunk/framework/webslinger/lib/webslinger-ext-20090313-536fba2eb96a.jar (with props) ofbiz/trunk/framework/webslinger/lib/webslinger-launcher-20090313-536fba2eb96a.jar (with props) Removed: ofbiz/trunk/framework/webslinger/lib/webslinger-20090312-2018a822aa51.jar ofbiz/trunk/framework/webslinger/lib/webslinger-catalina-20090312-2018a822aa51.jar ofbiz/trunk/framework/webslinger/lib/webslinger-ext-20090312-2018a822aa51.jar ofbiz/trunk/framework/webslinger/lib/webslinger-launcher-20090312-2018a822aa51.jar Modified: ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java Added: ofbiz/trunk/framework/webslinger/lib/webslinger-20090313-536fba2eb96a.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webslinger/lib/webslinger-20090313-536fba2eb96a.jar?rev=753126&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/webslinger/lib/webslinger-20090313-536fba2eb96a.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/webslinger/lib/webslinger-catalina-20090313-536fba2eb96a.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webslinger/lib/webslinger-catalina-20090313-536fba2eb96a.jar?rev=753126&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/webslinger/lib/webslinger-catalina-20090313-536fba2eb96a.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/webslinger/lib/webslinger-ext-20090313-536fba2eb96a.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webslinger/lib/webslinger-ext-20090313-536fba2eb96a.jar?rev=753126&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/webslinger/lib/webslinger-ext-20090313-536fba2eb96a.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/webslinger/lib/webslinger-launcher-20090313-536fba2eb96a.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webslinger/lib/webslinger-launcher-20090313-536fba2eb96a.jar?rev=753126&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/webslinger/lib/webslinger-launcher-20090313-536fba2eb96a.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java?rev=753126&r1=753125&r2=753126&view=diff ============================================================================== --- ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java (original) +++ ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java Fri Mar 13 05:37:48 2009 @@ -158,6 +158,7 @@ } protected class OfbizLayout implements Layout { + private final String contextPath; private final String id; private final String target; private final String[] bases; @@ -166,6 +167,7 @@ protected final String dispatcherName; protected OfbizLayout(GenericValue server) throws GenericEntityException { + contextPath = server.getString("contextPath"); id = server.getString("webslingerServerId"); target = server.getString("target"); List<GenericValue> baseValues = server.getRelatedCache("WebslingerServerBase", UtilMisc.toList("seqNum")); @@ -179,6 +181,10 @@ hashCode = target.hashCode() ^ ObjectUtil.hashCodeHelper(delegatorName) ^ ArrayUtil.hashCodeHelper(bases); } + public String getContextPath() { + return contextPath; + } + public String getId() { return id; } @@ -198,6 +204,7 @@ public boolean equals(Object o) { if (!(o instanceof OfbizLayout)) return false; OfbizLayout other = (OfbizLayout) o; + if (!contextPath.equals(other.contextPath)) return false; if (!target.equals(other.target)) return false; if (!ObjectUtil.equalsHelper(delegatorName, other.delegatorName)) return false; return ArrayUtil.equalsHelper(bases, other.bases); |
Free forum by Nabble | Edit this page |