svn commit: r1571262 - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1571262 - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Author: jleroux
Date: Mon Feb 24 12:18:49 2014 New Revision: 1571262 URL: http://svn.apache.org/r1571262 Log: Merges trunk HEAD Added: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/j2eespecs/el-api-2.2.jar - copied unchanged from r1571261, ofbiz/trunk/framework/base/lib/j2eespecs/el-api-2.2.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/juel-impl-2.2.7.jar - copied unchanged from r1571261, ofbiz/trunk/framework/base/lib/juel-impl-2.2.7.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/juel-spi-2.2.7.jar - copied unchanged from r1571261, ofbiz/trunk/framework/base/lib/juel-spi-2.2.7.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/ecj-4.3.1.jar - copied unchanged from r1571261, ofbiz/trunk/framework/catalina/lib/ecj-4.3.1.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.52-catalina-ha.jar - copied unchanged from r1571261, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.52-catalina-ha.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.52-catalina-tribes.jar - copied unchanged from r1571261, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.52-catalina-tribes.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.52-catalina.jar - copied unchanged from r1571261, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.52-catalina.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.52-jasper.jar - copied unchanged from r1571261, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.52-jasper.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.52-tomcat-api.jar - copied unchanged from r1571261, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.52-tomcat-api.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.52-tomcat-coyote.jar - copied unchanged from r1571261, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.52-tomcat-coyote.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.52-tomcat-juli.jar - copied unchanged from r1571261, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.52-tomcat-juli.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.52-tomcat-util.jar - copied unchanged from r1571261, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.52-tomcat-util.jar Removed: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/juel-2.2.1.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/config/ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/ecj-4.2.2.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.50-catalina-ha.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.50-catalina-tribes.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.50-tomcat-embed-core.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.50-tomcat-embed-jasper.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.50-tomcat-embed-logging-log4j.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/testtools/lib/org.springframework.web-3.1.0.M2.jar Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ (props changed) ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/content/ContentUrlFilter.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilHttp.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/ofbiz-component.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/GroovyBaseScript.groovy ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/WebAppUtil.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/appserver/src/org/ofbiz/appservers/GenerateContainer.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/blog/blogs.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/customer/newmsg.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/mergefromtrunk.bat (contents, props changed) Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1566539-1571261 Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath?rev=1571262&r1=1571261&r2=1571262&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath Mon Feb 24 12:18:49 2014 @@ -37,7 +37,8 @@ <classpathentry kind="lib" path="framework/base/lib/jdbm-1.0-SNAPSHOT.jar"/> <classpathentry kind="lib" path="framework/base/lib/jdom-1.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/jpim-0.1.jar"/> - <classpathentry kind="lib" path="framework/base/lib/juel-2.2.1.jar"/> + <classpathentry kind="lib" path="framework/base/lib/juel-impl-2.2.7.jar"/> + <classpathentry kind="lib" path="framework/base/lib/juel-spi-2.2.7.jar"/> <classpathentry kind="lib" path="framework/base/lib/junit-dep-4.10.jar"/> <classpathentry kind="lib" path="framework/base/lib/log4j-1.2.17.jar"/> <classpathentry kind="lib" path="framework/base/lib/mail-1.5.1.jar"/> @@ -85,6 +86,7 @@ <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jta_1.1_spec-1.1.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-saaj_1.3_spec-1.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/j2eespecs/annotations-api-3.0.jar"/> + <classpathentry kind="lib" path="framework/base/lib/j2eespecs/el-api-2.2.jar"/> <classpathentry kind="lib" path="framework/base/lib/j2eespecs/jsp-api-2.2.jar"/> <classpathentry kind="lib" path="framework/base/lib/j2eespecs/servlet-api-3.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/antlr-2.7.6.jar"/> @@ -99,12 +101,15 @@ <classpathentry kind="lib" path="framework/base/lib/scripting/jython-nooro.jar"/> <classpathentry kind="lib" path="specialpurpose/birt/lib/org.eclipse.birt.runtime_4.3.1.v20130918-1142.jar"/> <classpathentry kind="lib" path="specialpurpose/birt/lib/viewservlets.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/ecj-4.2.2.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.50-catalina-ha.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.50-catalina-tribes.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.50-tomcat-embed-core.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.50-tomcat-embed-jasper.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.50-tomcat-embed-logging-log4j.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/ecj-4.3.1.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.52-catalina-ha.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.52-catalina-tribes.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.52-catalina.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.52-jasper.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.52-tomcat-api.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.52-tomcat-coyote.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.52-tomcat-juli.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.52-tomcat-util.jar"/> <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.4.jar"/> <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-3.1.1.jar"/> <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-3.1.1.jar"/> @@ -135,7 +140,6 @@ <classpathentry kind="lib" path="framework/service/lib/neethi-2.0.4.jar"/> <classpathentry kind="lib" path="framework/service/lib/XmlSchema-1.4.3.jar"/> <classpathentry kind="lib" path="framework/testtools/lib/org.springframework.test-3.1.0.M2.jar"/> - <classpathentry kind="lib" path="framework/testtools/lib/org.springframework.web-3.1.0.M2.jar"/> <classpathentry kind="lib" path="framework/testtools/lib/org.springframework.core-3.1.0.M2.jar"/> <classpathentry kind="lib" path="framework/webapp/lib/DataVision-1.0.0.jar"/> <classpathentry kind="lib" path="framework/webapp/lib/ezmorph-0.9.1.jar"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE?rev=1571262&r1=1571261&r2=1571262&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE Mon Feb 24 12:18:49 2014 @@ -27,7 +27,8 @@ framework/base/lib/httpmime-4.2.1.jar framework/base/lib/ivy-2.2.0.jar framework/base/lib/jakarta-regexp-1.5.jar framework/base/lib/jpim-0.1.jar -framework/base/lib/juel-2.2.1.jar +framework/base/lib/juel-impl-2.2.7.jar +framework/base/lib/juel-spi-2.2.7.jar framework/base/lib/log4j-1.2.17.jar framework/base/lib/mx4j-3.0.1.jar framework/base/lib/mx4j-remote-3.0.1.jar @@ -65,6 +66,7 @@ framework/base/lib/j2eespecs/geronimo-jm framework/base/lib/j2eespecs/geronimo-jta_1.1_spec-1.1.1.jar framework/base/lib/j2eespecs/geronimo-saaj_1.3_spec-1.1.jar framework/base/lib/j2eespecs/annotations-api-3.0.jar +framework/base/lib/j2eespecs/el-api-2.2.jar framework/base/lib/j2eespecs/jsp-api-2.2.jar framework/base/lib/j2eespecs/servlet-api-3.0.jar framework/base/lib/scripting/bsf-2.4.0.jar @@ -74,11 +76,14 @@ framework/base/lib/scripting/jansi-1.2.1 framework/base/lib/xmlrpc-client-3.1.2.jar framework/base/lib/xmlrpc-common-3.1.2.jar framework/base/lib/xmlrpc-server-3.1.2.jar -framework/catalina/lib/tomcat-7.0.50-catalina-ha.jar -framework/catalina/lib/tomcat-7.0.50-catalina-tribes.jar -framework/catalina/lib/tomcat-7.0.50-tomcat-embed-core.jar -framework/catalina/lib/tomcat-7.0.50-tomcat-embed-jasper.jar -framework/catalina/lib/tomcat-7.0.50-tomcat-embed-logging-log4j.jar +framework/catalina/lib/tomcat-7.0.52-catalina-ha.jar +framework/catalina/lib/tomcat-7.0.52-catalina-tribes.jar +framework/catalina/lib/tomcat-7.0.52-catalina.jar +framework/catalina/lib/tomcat-7.0.52-jasper.jar +framework/catalina/lib/tomcat-7.0.52-tomcat-api.jar +framework/catalina/lib/tomcat-7.0.52-tomcat-coyote.jar +framework/catalina/lib/tomcat-7.0.52-tomcat-juli.jar +framework/catalina/lib/tomcat-7.0.52-tomcat-util.jar framework/entity/lib/commons-dbcp-1.4.jar framework/entity/lib/jdbc/derby-10.10.1.1.jar framework/entity/lib/jdbc/derbytools-10.8.2.2.jar @@ -102,7 +107,6 @@ framework/geronimo/lib/geronimo-connecto framework/geronimo/lib/geronimo-transaction-3.1.1.jar framework/testtools/lib/org.springframework.core-3.1.0.M2.jar framework/testtools/lib/org.springframework.test-3.1.0.M2.jar -framework/testtools/lib/org.springframework.web-3.1.0.M2.jar applications/content/lib/fontbox-1.7.1.jar applications/content/lib/jempbox-1.7.1.jar applications/content/lib/pdfbox-1.7.1.jar @@ -2184,7 +2188,7 @@ of California, with venue lying in Santa ========================================================================= The following libraries distributed with Apache OFBiz are licensed under the Eclipse Public License - v 1.0: -framework/catalina/lib/ecj-4.2.2.jar +framework/catalina/lib/ecj-4.3.1.jar ========================================================================= Eclipse Public License - v 1.0 Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/content/ContentUrlFilter.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/content/ContentUrlFilter.java?rev=1571262&r1=1571261&r2=1571262&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/content/ContentUrlFilter.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/content/ContentUrlFilter.java Mon Feb 24 12:18:49 2014 @@ -67,8 +67,7 @@ public class ContentUrlFilter extends Co //Set request attribute and session UrlServletHelper.setRequestAttributes(request, delegator, servletContext); String urlContentId = null; - StringBuffer pathInfoBuffer = UtilHttp.getFullRequestUrl(httpRequest); - String pathInfo = pathInfoBuffer.toString(); + String pathInfo = UtilHttp.getFullRequestUrl(httpRequest); if (UtilValidate.isNotEmpty(pathInfo)) { String alternativeUrl = pathInfo.substring(pathInfo.lastIndexOf("/")); if (alternativeUrl.endsWith("-content")) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java?rev=1571262&r1=1571261&r2=1571262&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java Mon Feb 24 12:18:49 2014 @@ -2136,8 +2136,8 @@ public class ShoppingCartItem implements BigDecimal amount = (BigDecimal) additionalProductFeatureAndAppl.get("amount"); if (amount != null) { amount = amount.multiply(this.getQuantity()); + orderAdjustment.set("amount", amount); } - orderAdjustment.set("amount", amount); BigDecimal recurringAmount = (BigDecimal) additionalProductFeatureAndAppl.get("recurringAmount"); if (recurringAmount != null) { @@ -2146,6 +2146,10 @@ public class ShoppingCartItem implements //Debug.logInfo("Setting recurringAmount " + recurringAmount + " for " + orderAdjustment, module); } + if (amount == null && recurringAmount == null) { + Debug.logWarning("In putAdditionalProductFeatureAndAppl the amount and recurringAmount are null for this adjustment: " + orderAdjustment, module); + } + this.addAdjustment(orderAdjustment); } @@ -2181,6 +2185,7 @@ public class ShoppingCartItem implements featureAppls = product.getRelated("ProductFeatureAppl", null, null, false); List<EntityExpr> filterExprs = UtilMisc.toList(EntityCondition.makeCondition("productFeatureApplTypeId", EntityOperator.EQUALS, "STANDARD_FEATURE")); filterExprs.add(EntityCondition.makeCondition("productFeatureApplTypeId", EntityOperator.EQUALS, "REQUIRED_FEATURE")); + filterExprs.add(EntityCondition.makeCondition("productFeatureApplTypeId", EntityOperator.EQUALS, "DISTINGUISHING_FEAT")); featureAppls = EntityUtil.filterByOr(featureAppls, filterExprs); } catch (GenericEntityException e) { Debug.logError(e, "Unable to get features from product : " + product.get("productId"), module); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilHttp.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilHttp.java?rev=1571262&r1=1571261&r2=1571262&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilHttp.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilHttp.java Mon Feb 24 12:18:49 2014 @@ -553,11 +553,11 @@ public class UtilHttp { return; } - StringBuffer fullRequestUrl = getFullRequestUrl(request); + String fullRequestUrl = getFullRequestUrl(request); session.setAttribute("_WEBAPP_NAME_", getApplicationName(request)); session.setAttribute("_CLIENT_LOCALE_", request.getLocale()); - session.setAttribute("_CLIENT_REQUEST_", fullRequestUrl.toString()); + session.setAttribute("_CLIENT_REQUEST_", fullRequestUrl); session.setAttribute("_CLIENT_USER_AGENT_", request.getHeader("User-Agent") != null ? request.getHeader("User-Agent") : ""); session.setAttribute("_CLIENT_REFERER_", request.getHeader("Referer") != null ? request.getHeader("Referer") : ""); @@ -579,8 +579,9 @@ public class UtilHttp { } } - public static StringBuffer getServerRootUrl(HttpServletRequest request) { - StringBuffer requestUrl = new StringBuffer(); + + private static StringBuilder prepareServerRootUrl(HttpServletRequest request) { + StringBuilder requestUrl = new StringBuilder(); requestUrl.append(request.getScheme()); requestUrl.append("://" + request.getServerName()); if (request.getServerPort() != 80 && request.getServerPort() != 443) @@ -588,13 +589,17 @@ public class UtilHttp { return requestUrl; } - public static StringBuffer getFullRequestUrl(HttpServletRequest request) { - StringBuffer requestUrl = getServerRootUrl(request); + public static String getServerRootUrl(HttpServletRequest request) { + return prepareServerRootUrl(request).toString(); + } + + public static String getFullRequestUrl(HttpServletRequest request) { + StringBuilder requestUrl = prepareServerRootUrl(request); requestUrl.append(request.getRequestURI()); if (request.getQueryString() != null) { requestUrl.append("?" + request.getQueryString()); } - return requestUrl; + return requestUrl.toString(); } public static Locale getLocale(HttpServletRequest request, HttpSession session, Object appDefaultLocale) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/ofbiz-component.xml?rev=1571262&r1=1571261&r2=1571262&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/ofbiz-component.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/ofbiz-component.xml Mon Feb 24 12:18:49 2014 @@ -24,7 +24,6 @@ under the License. <resource-loader name="main" type="component"/> <classpath type="jar" location="lib/*"/> <classpath type="jar" location="build/lib/*"/> - <classpath type="dir" location="config"/> <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> <container name="catalina-container" loaders="main" class="org.ofbiz.catalina.container.CatalinaContainer"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java?rev=1571262&r1=1571261&r2=1571262&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java Mon Feb 24 12:18:49 2014 @@ -19,7 +19,6 @@ package org.ofbiz.catalina.container; import java.io.File; -import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; import java.util.HashMap; @@ -32,7 +31,6 @@ import java.util.concurrent.ScheduledExe import javax.naming.InitialContext; import javax.naming.NamingException; -import javax.xml.parsers.ParserConfigurationException; import javolution.util.FastList; @@ -49,7 +47,6 @@ import org.apache.catalina.core.Standard import org.apache.catalina.core.StandardEngine; import org.apache.catalina.core.StandardHost; import org.apache.catalina.core.StandardServer; -import org.apache.catalina.core.StandardWrapper; import org.apache.catalina.deploy.FilterDef; import org.apache.catalina.deploy.FilterMap; import org.apache.catalina.filters.RequestDumperFilter; @@ -57,7 +54,6 @@ import org.apache.catalina.ha.tcp.Replic import org.apache.catalina.ha.tcp.SimpleTcpCluster; import org.apache.catalina.loader.WebappLoader; import org.apache.catalina.realm.MemoryRealm; -import org.apache.catalina.session.StandardManager; import org.apache.catalina.startup.ContextConfig; import org.apache.catalina.startup.Tomcat; import org.apache.catalina.tribes.group.GroupChannel; @@ -72,6 +68,7 @@ import org.apache.coyote.http11.Http11Pr import org.apache.tomcat.JarScanner; import org.apache.tomcat.util.IntrospectionUtils; import org.apache.tomcat.util.scan.StandardJarScanner; + import org.ofbiz.base.component.ComponentConfig; import org.ofbiz.base.concurrent.ExecutionPool; import org.ofbiz.base.container.ClassLoaderContainer; @@ -82,14 +79,11 @@ import org.ofbiz.base.container.Containe import org.ofbiz.base.location.FlexibleLocation; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.SSLUtil; -import org.ofbiz.base.util.UtilURL; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.DelegatorFactory; import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.xml.sax.SAXException; /* * --- Access Log Pattern Information - From Tomcat 5 AccessLogValve.java @@ -150,7 +144,6 @@ public class CatalinaContainer implement public static final String J2EE_SERVER = "OFBiz Container 3.1"; public static final String J2EE_APP = "OFBiz"; public static final String module = CatalinaContainer.class.getName(); - protected static Map<String, String> mimeTypes = new HashMap<String, String>(); private static final ThreadGroup CATALINA_THREAD_GROUP = new ThreadGroup("CatalinaContainer"); // load the JSSE propertes (set the trust store) @@ -168,8 +161,6 @@ public class CatalinaContainer implement protected boolean crossContext = false; protected boolean distribute = false; - protected boolean enableDefaultMimeTypes = true; - protected String catalinaRuntimeHome; private String name; @@ -661,28 +652,27 @@ public class CatalinaContainer implement } final boolean contextIsDistributable = distribute && appIsDistributable; + // create the web application context + StandardContext context = new StandardContext(); + context.setParent(host); + context.setDocBase(location); + context.setPath(mount); + context.addLifecycleListener(new ContextConfig()); + Tomcat.initWebappDefaults(context); // configure persistent sessions + // important: the call to context.setManager(...) must be done after Tomcat.initWebappDefaults(...) Property clusterProp = clusterConfig.get(engine.getName()); - - Manager sessionMgr = null; if (clusterProp != null && contextIsDistributable) { + Manager sessionMgr = null; String mgrClassName = ContainerConfig.getPropertyValue(clusterProp, "manager-class", "org.apache.catalina.ha.session.DeltaManager"); try { sessionMgr = (Manager)Class.forName(mgrClassName).newInstance(); } catch (Exception exc) { throw new ContainerException("Cluster configuration requires a valid manager-class property: " + exc.getMessage()); } - } else { - sessionMgr = new StandardManager(); + context.setManager(sessionMgr); } - // create the web application context - StandardContext context = new StandardContext(); - context.setParent(host); - context.setDocBase(location); - context.setPath(mount); - context.addLifecycleListener(new ContextConfig()); - JarScanner jarScanner = context.getJarScanner(); if (jarScanner instanceof StandardJarScanner) { StandardJarScanner standardJarScanner = (StandardJarScanner) jarScanner; @@ -693,8 +683,6 @@ public class CatalinaContainer implement egn.setService(tomcat.getService()); Debug.logInfo("host[" + host + "].addChild(" + context + ")", module); - //context.setDeployOnStartup(false); - //context.setBackgroundProcessorDelay(5); context.setJ2EEApplication(J2EE_APP); context.setJ2EEServer(J2EE_SERVER); context.setLoader(new WebappLoader(ClassLoaderContainer.getClassLoader())); @@ -712,7 +700,6 @@ public class CatalinaContainer implement context.setCrossContext(crossContext); context.setPrivileged(appInfo.privileged); - context.setManager(sessionMgr); context.getServletContext().setAttribute("_serverId", appInfo.server); context.getServletContext().setAttribute("componentName", appInfo.componentConfig.getComponentName()); @@ -729,34 +716,6 @@ public class CatalinaContainer implement context.addFilterMap(requestDumperFilterMap); } - // create the Default Servlet instance to mount - StandardWrapper defaultServlet = new StandardWrapper(); - defaultServlet.setParent(context); - defaultServlet.setServletClass("org.apache.catalina.servlets.DefaultServlet"); - defaultServlet.setServletName("default"); - defaultServlet.setLoadOnStartup(1); - defaultServlet.addInitParameter("debug", "0"); - defaultServlet.addInitParameter("listing", "true"); - defaultServlet.addMapping("/"); - context.addChild(defaultServlet); - context.addServletMapping("/", "default"); - - // create the Jasper Servlet instance to mount - StandardWrapper jspServlet = new StandardWrapper(); - jspServlet.setParent(context); - jspServlet.setServletClass("org.apache.jasper.servlet.JspServlet"); - jspServlet.setServletName("jsp"); - jspServlet.setLoadOnStartup(1); - jspServlet.addInitParameter("fork", "false"); - jspServlet.addInitParameter("xpoweredBy", "true"); - jspServlet.addMapping("*.jsp"); - jspServlet.addMapping("*.jspx"); - context.addChild(jspServlet); - context.addServletMapping("*.jsp", "jsp"); - - // default mime-type mappings - configureMimeTypes(context); - // set the init parameters for (Map.Entry<String, String> entry: initParameters.entrySet()) { context.addParameter(entry.getKey(), entry.getValue()); @@ -807,7 +766,7 @@ public class CatalinaContainer implement } loadedMounts.addAll(keys); } else { - appInfo.setAppBarDisplay(false); // disable app bar display on overrided apps + appInfo.setAppBarDisplay(false); // disable app bar display on overridden apps Debug.logInfo("Duplicate webapp mount; not loading : " + appInfo.getName() + " / " + appInfo.getLocation(), module); } } @@ -829,51 +788,4 @@ public class CatalinaContainer implement public String getName() { return name; } - - protected void configureMimeTypes(Context context) throws ContainerException { - Map<String, String> mimeTypes = CatalinaContainer.getMimeTypes(); - if (UtilValidate.isNotEmpty(mimeTypes)) { - for (Map.Entry<String, String> entry: mimeTypes.entrySet()) { - context.addMimeMapping(entry.getKey(), entry.getValue()); - } - } - } - - protected static synchronized Map<String, String> getMimeTypes() throws ContainerException { - if (UtilValidate.isNotEmpty(mimeTypes)) { - return mimeTypes; - } - - if (mimeTypes == null) mimeTypes = new HashMap<String, String>(); - URL xmlUrl = UtilURL.fromResource("mime-type.xml"); - - // read the document - Document mimeTypeDoc; - try { - mimeTypeDoc = UtilXml.readXmlDocument(xmlUrl, true); - } catch (SAXException e) { - throw new ContainerException("Error reading the mime-type.xml config file: " + xmlUrl, e); - } catch (ParserConfigurationException e) { - throw new ContainerException("Error reading the mime-type.xml config file: " + xmlUrl, e); - } catch (IOException e) { - throw new ContainerException("Error reading the mime-type.xml config file: " + xmlUrl, e); - } - - if (mimeTypeDoc == null) { - Debug.logError("Null document returned for mime-type.xml", module); - return null; - } - - // root element - Element root = mimeTypeDoc.getDocumentElement(); - - // mapppings - for (Element curElement: UtilXml.childElementList(root, "mime-mapping")) { - String extension = UtilXml.childElementValue(curElement, "extension"); - String type = UtilXml.childElementValue(curElement, "mime-type"); - mimeTypes.put(extension, type); - } - - return mimeTypes; - } } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/GroovyBaseScript.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/GroovyBaseScript.groovy?rev=1571262&r1=1571261&r2=1571262&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/GroovyBaseScript.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/GroovyBaseScript.groovy Mon Feb 24 12:18:49 2014 @@ -20,7 +20,6 @@ package org.ofbiz.service.engine import org.ofbiz.base.util.Debug; import org.ofbiz.service.ServiceUtil -import org.ofbiz.service.GenericServiceException import org.ofbiz.service.ExecutionServiceException abstract class GroovyBaseScript extends Script { @@ -55,7 +54,7 @@ abstract class GroovyBaseScript extends def success(String message) { // TODO: implement some clever i18n mechanism based on the userLogin and locale in the binding - if (this.binding.getVariable('request')) { + if (this.binding.hasVariable('request')) { // the script is invoked as an "event" if (message) { this.binding.getVariable('request').setAttribute("_EVENT_MESSAGE_", message) @@ -80,7 +79,7 @@ abstract class GroovyBaseScript extends } def error(String message) { // TODO: implement some clever i18n mechanism based on the userLogin and locale in the binding - if (this.binding.getVariable('request')) { + if (this.binding.hasVariable('request')) { // the script is invoked as an "event" if (message) { this.binding.getVariable('request').setAttribute("_ERROR_MESSAGE_", message) Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/WebAppUtil.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/WebAppUtil.java?rev=1571262&r1=1571261&r2=1571262&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/WebAppUtil.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/WebAppUtil.java Mon Feb 24 12:18:49 2014 @@ -26,9 +26,9 @@ import java.util.Map.Entry; import org.apache.catalina.deploy.ServletDef; import org.apache.catalina.deploy.WebXml; -import org.apache.catalina.startup.DigesterFactory; import org.apache.catalina.startup.WebRuleSet; import org.apache.tomcat.util.digester.Digester; +import org.apache.tomcat.util.descriptor.DigesterFactory; import org.ofbiz.base.component.ComponentConfig; import org.ofbiz.base.component.ComponentConfig.WebappInfo; import org.ofbiz.base.util.Assert; @@ -152,7 +152,7 @@ public final class WebAppUtil { result = new WebXml(); LocalResolver lr = new LocalResolver(new DefaultHandler()); ErrorHandler handler = new LocalErrorHandler(webXmlFileLocation, lr); - Digester digester = DigesterFactory.newDigester(validate, namespaceAware, new WebRuleSet()); + Digester digester = DigesterFactory.newDigester(validate, namespaceAware, new WebRuleSet(), false); digester.getParser(); digester.push(result); digester.setErrorHandler(handler); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java?rev=1571262&r1=1571261&r2=1571262&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java Mon Feb 24 12:18:49 2014 @@ -129,8 +129,7 @@ public class ContextFilter implements Fi httpRequest.setAttribute("_CONTEXT_ROOT_", config.getServletContext().getRealPath("/")); // set the server root url - StringBuffer serverRootUrl = UtilHttp.getServerRootUrl(httpRequest); - httpRequest.setAttribute("_SERVER_ROOT_URL_", serverRootUrl.toString()); + httpRequest.setAttribute("_SERVER_ROOT_URL_", UtilHttp.getServerRootUrl(httpRequest)); // request attributes from redirect call String reqAttrMapHex = (String) httpRequest.getSession().getAttribute("_REQ_ATTR_MAP_"); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java?rev=1571262&r1=1571261&r2=1571262&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java Mon Feb 24 12:18:49 2014 @@ -671,7 +671,7 @@ public class ServerHitBin { serverHit.set("contentId", this.id); serverHit.set("runningTimeMillis", Long.valueOf(runningTime)); - String fullRequestUrl = UtilHttp.getFullRequestUrl(request).toString(); + String fullRequestUrl = UtilHttp.getFullRequestUrl(request); serverHit.set("requestUrl", fullRequestUrl.length() > 250 ? fullRequestUrl.substring(0, 250) : fullRequestUrl); String referrerUrl = request.getHeader("Referer") != null ? request.getHeader("Referer") : ""; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/appserver/src/org/ofbiz/appservers/GenerateContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/appserver/src/org/ofbiz/appservers/GenerateContainer.java?rev=1571262&r1=1571261&r2=1571262&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/appserver/src/org/ofbiz/appservers/GenerateContainer.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/appserver/src/org/ofbiz/appservers/GenerateContainer.java Mon Feb 24 12:18:49 2014 @@ -62,7 +62,7 @@ import org.w3c.dom.Document; public class GenerateContainer implements Container { public static final String module = GenerateContainer.class.getName(); - public static final String source = "/framework/appserver/templates/"; + public static final String source = "/specialpurpose/appserver/templates/"; public static String target = "/setup/"; protected String configFile = null; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/blog/blogs.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/blog/blogs.ftl?rev=1571262&r1=1571261&r2=1571262&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/blog/blogs.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/blog/blogs.ftl Mon Feb 24 12:18:49 2014 @@ -28,7 +28,7 @@ under the License. <ul class="browsecategorylist"> <#list blogs as blog> <li class="browsecategorytext"> - <a href="<@ofbizUrl>MainBlog?blogContentId=${blog.contentId}</@ofbizUrl>" class="browsecategorybutton">${blog.contentName}</a> + <a href="<@ofbizUrl>MainBlog?blogContentId=${blog.contentId}</@ofbizUrl>" class="browsecategorybutton">${blog.contentName!}</a> </li> </#list> </ul> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/customer/newmsg.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/customer/newmsg.ftl?rev=1571262&r1=1571261&r2=1571262&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/customer/newmsg.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/customer/newmsg.ftl Mon Feb 24 12:18:49 2014 @@ -34,7 +34,7 @@ under the License. <#if productStore?has_content> <input type="hidden" name="partyIdTo" value="${productStore.payToPartyId?if_exists}"/> </#if> - <input type="hidden" name="note" value="${Static["org.ofbiz.base.util.UtilHttp"].getFullRequestUrl(request).toString()}"/> + <input type="hidden" name="note" value="${Static["org.ofbiz.base.util.UtilHttp"].getFullRequestUrl(request)}"/> <#if message?has_content> <input type="hidden" name="parentCommEventId" value="${communicationEvent.communicationEventId}"/> <#if (communicationEvent.origCommEventId?exists && communicationEvent.origCommEventId?length > 0)> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/mergefromtrunk.bat URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/mergefromtrunk.bat?rev=1571262&r1=1571261&r2=1571262&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/mergefromtrunk.bat (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/mergefromtrunk.bat Mon Feb 24 12:18:49 2014 @@ -21,6 +21,7 @@ rem interactive DOS version of mergefrom rem to use : launch and pass the trunk version number to merge in release rem since we have now svn:mergeinfo changing root ("."), we need to update before merging +cd .. svn up rem version to merge Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/mergefromtrunk.bat ------------------------------------------------------------------------------ Merged /ofbiz/trunk/tools/mergefromtrunk.bat:r1535158-1571261 |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |