svn commit: r1623295 [1/5] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1623295 [1/5] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Author: jleroux
Date: Mon Sep 8 06:04:39 2014 New Revision: 1623295 URL: http://svn.apache.org/r1623295 Log: Keeps in sync with OFBiz trunk HEAD Removed: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/commons/commons-digester3-3.2.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/commons/commons-discovery-0.4.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/commons/commons-modeler-2.0.1.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/commons/commons-primitives-1.0.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/httpmime-4.2.1.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/jcip-annotations-1.0.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/log4j-jcl-2.0.1.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/mx4j-3.0.1.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/mx4j-remote-3.0.1.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/scripting/asm-analysis-3.2.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/scripting/asm-tree-3.2.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/scripting/asm-util-3.2.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/scripting/janino-2.5.15.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilJ2eeCompat.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/GenericValueHtmlWrapper.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/dtd/regions.xsd ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/lib/DataVision-1.0.0.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/lib/velocity-1.6.1.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/pseudotag/ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/region/ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/taglib/AbstractParameterTag.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/taglib/EntityFieldTag.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/taglib/FormatTag.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/taglib/I18nBundleTag.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/taglib/I18nMessageArgumentTag.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/taglib/I18nMessageTag.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/taglib/IfTag.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/taglib/InputValueTag.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTEI.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTag.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorHasNextTag.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTEI.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTag.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTEI.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTag.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/taglib/ParamTag.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/taglib/PrintTag.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/taglib/ServiceTag.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/taglib/UnlessTag.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/taglib/UrlTag.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/view/DataVisionViewHandler.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/view/FopPdfViewHandler.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/view/FopRenderer.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/view/GenericViewRenderer.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/view/JPublishViewHandler.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/view/JPublishWrapper.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/view/RegionViewHandler.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/view/VelocityViewHandler.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/UomReport.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/ofbiz.tld ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/entity/EditEntity.jsp ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/entity/xmldsdump.jsp 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/.gitignore ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/NOTICE ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/OPTIONAL_LIBRARIES ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/config/AccountingUiLabels.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/config/ContentEntityLabels.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/config/content.properties ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/data/ContentTypeData.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/data/TemplateData.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/ContentManagementWorker.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/cms/CmsEvents.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/view/SimpleContentViewHandler.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/webapp/content/WEB-INF/actions/content/GetContentLookupList.groovy ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.groovy ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderUiLabels.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/entitydef/entitymodel.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/script/org/ofbiz/party/party/PartyServices.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/servicedef/services.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/cost/CostServices.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_cost.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_store.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_subscription.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/facility/CountFacilityInventoryByProduct.groovy ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ConfigScreens.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Upcoming.groovy ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/config/log4j2.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/Debug.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonEntityLabels.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonUiLabels.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/util/SequenceUtil.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/DispatchContext.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/GenericAbstractDispatcher.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/GenericDispatcherFactory.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/LocalDispatcher.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelService.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelServiceReader.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ServiceDispatcher.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/group/ServiceGroupReader.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/Config.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/Start.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/both.properties ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/install.properties ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/jetty.properties ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/pos.properties ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/rmi.properties ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/setup.properties ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/start.properties ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/test.properties ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/testlist.properties ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/build.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/dtd/webapp-catalog.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/event/EventFactory.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/event/RomeEventHandler.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/ftl/FreeMarkerViewHandler.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/taglib/ContentUrlTag.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/view/HttpViewHandler.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/view/ViewFactory.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/actions/entity/XmlDsDump.groovy ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/controller.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/web.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/entity/xmldsrawdump.jsp ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ivy.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/macros.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/birt/WEB-INF/controller.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/webapp/example/WEB-INF/controller.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/src/org/ofbiz/content/test/LuceneTests.java Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1621696-1623291 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=1623295&r1=1623294&r2=1623295&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 Sep 8 06:04:39 2014 @@ -16,7 +16,6 @@ <classpathentry kind="lib" path="framework/base/lib/ant/ant-1.9.0-ant-apache-bsf.jar"/> <classpathentry kind="lib" path="framework/base/lib/antisamy-bin.1.2.jar"/> <classpathentry kind="lib" path="framework/base/lib/avalon-framework-4.2.0.jar"/> - <classpathentry kind="lib" path="framework/base/lib/avalon-util-exception-1.0.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/barcode4j-2.1-barcode4j-fop-ext-complete.jar"/> <classpathentry kind="lib" path="framework/base/lib/batik-all-1.7.jar"/> <classpathentry kind="lib" path="framework/base/lib/clhm-release-1.0-lru.jar"/> @@ -26,13 +25,11 @@ <classpathentry kind="lib" path="framework/base/lib/httpclient-4.2.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/httpclient-cache-4.2.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/httpcore-4.2.1.jar"/> - <classpathentry kind="lib" path="framework/base/lib/httpmime-4.2.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/httpunit-1.7.jar"/> <classpathentry kind="lib" path="framework/base/lib/ical4j-1.0-rc2.jar"/> <classpathentry kind="lib" path="framework/base/lib/icu4j-52_1.jar"/> <classpathentry kind="lib" path="framework/base/lib/ivy-2.2.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/javolution-5.4.3.jar"/> - <classpathentry kind="lib" path="framework/base/lib/jcip-annotations-1.0.jar"/> <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"/> @@ -41,8 +38,6 @@ <classpathentry kind="lib" path="framework/base/lib/junit-dep-4.10.jar"/> <classpathentry kind="lib" path="framework/base/lib/log4j-api-2.0.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/mail-1.5.1.jar"/> - <classpathentry kind="lib" path="framework/base/lib/mx4j-3.0.1.jar"/> - <classpathentry kind="lib" path="framework/base/lib/mx4j-remote-3.0.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/nekohtml-1.9.16.jar"/> <classpathentry kind="lib" path="framework/base/lib/owasp-esapi-full-java-1.4-patched-by-OFBIZ-3135.jar"/> <classpathentry kind="lib" path="framework/base/lib/resolver-2.9.1.jar"/> @@ -64,17 +59,13 @@ <classpathentry kind="lib" path="framework/base/lib/commons/commons-codec-1.6.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-collections-3.2.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-compress-1.4.1.jar"/> - <classpathentry kind="lib" path="framework/base/lib/commons/commons-digester3-3.2.jar"/> - <classpathentry kind="lib" path="framework/base/lib/commons/commons-discovery-0.4.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-el-1.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-fileupload-1.3.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-io-2.4.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-lang-2.6.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-logging-1.1.2.jar"/> - <classpathentry kind="lib" path="framework/base/lib/commons/commons-modeler-2.0.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-net-3.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-pool2-2.2.jar"/> - <classpathentry kind="lib" path="framework/base/lib/commons/commons-primitives-1.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-validator-1.4.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-csv-1.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-activation_1.0.2_spec-1.0.jar"/> @@ -90,9 +81,6 @@ <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"/> <classpathentry kind="lib" path="framework/base/lib/scripting/asm-3.2.jar"/> - <classpathentry kind="lib" path="framework/base/lib/scripting/asm-analysis-3.2.jar"/> - <classpathentry kind="lib" path="framework/base/lib/scripting/asm-tree-3.2.jar"/> - <classpathentry kind="lib" path="framework/base/lib/scripting/asm-util-3.2.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/bsf-2.4.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/bsh-2.0b4.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/groovy-all-2.2.1.jar"/> @@ -141,12 +129,10 @@ <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.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"/> <classpathentry kind="lib" path="framework/webapp/lib/iText-2.1.7.jar"/> <classpathentry kind="lib" path="framework/webapp/lib/json-lib-2.2.3-jdk15.jar"/> <classpathentry kind="lib" path="framework/webapp/lib/rome-0.9.jar"/> - <classpathentry kind="lib" path="framework/webapp/lib/velocity-1.6.1.jar"/> <classpathentry kind="lib" path="specialpurpose/googlecheckout/lib/checkout-sdk-0.8.8.jar"/> <classpathentry kind="lib" path="specialpurpose/ldap/lib/cas-server-core-3.3.jar"/> <classpathentry kind="lib" path="specialpurpose/pos/lib/XuiCoreSwing-v3.2rc2b.jar"/> @@ -190,7 +176,7 @@ <classpathentry kind="src" path="framework/sql/build/gen-src/javacc"/> <classpathentry kind="src" path="framework/start/src"/> <classpathentry kind="src" path="framework/testtools/src"/> - <classpathentry excluding="org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java|org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java|org/ofbiz/webapp/view/FopPdfViewHandler.java|org/ofbiz/webapp/view/GenericViewRenderer.java|org/ofbiz/webapp/view/JPublishViewHandler.java|org/ofbiz/webapp/view/JPublishWrapper.java|org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java|org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java|org/ofbiz/webapp/view/JasperReportsJXlsViewHandler.java|org/ofbiz/webapp/view/JasperReportsPoiXlsViewHandler.java" kind="src" path="framework/webapp/src"/> + <classpathentry excluding="org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java|org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java|org/ofbiz/webapp/view/JasperReportsJXlsViewHandler.java|org/ofbiz/webapp/view/JasperReportsPoiXlsViewHandler.java" kind="src" path="framework/webapp/src"/> <classpathentry kind="src" path="framework/webtools/src"/> <classpathentry kind="src" path="framework/widget/src"/> <classpathentry kind="src" path="specialpurpose/assetmaint/src"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.gitignore URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.gitignore?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.gitignore (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.gitignore Mon Sep 8 06:04:39 2014 @@ -3,7 +3,8 @@ framework/*/build framework/base/lib/cobertura-*.jar framework/base/lib/asm*.jar framework/base/lib/oro*.jar -framework/entity/lib/jdbc/postgresql-*.jar +framework/entity/lib/jdbc/*.jar +!framework/entity/lib/jdbc/derby*.jar hot-deploy/*/build specialpurpose/*/build applications/content/index/ @@ -21,11 +22,13 @@ runtime/logs/cobertura-report runtime/logs/*.log* runtime/logs/*.html* runtime/logs/test-results/* +/runtime/logs/birt runtime/data/derby/* runtime/data/utilcache.* runtime/catalina/work/* runtime/jetty runtime/tempfiles/* +!runtime/tempfiles/README runtime/indexes/products/ themes/flatgrey/webapp/flatgrey/javascript-min.css themes/flatgrey/webapp/flatgrey/js/application-min.js @@ -39,4 +42,3 @@ themes/flatgrey/webapp/flatgrey/mainrtl- *# .*.swp .*.swo -framework/entity/lib/jdbc \ No newline at end of file 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=1623295&r1=1623294&r2=1623295&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 Sep 8 06:04:39 2014 @@ -21,7 +21,6 @@ framework/base/lib/clhm-release-1.0-lru. framework/base/lib/httpclient-4.2.1.jar framework/base/lib/httpclient-cache-4.2.1.jar framework/base/lib/httpcore-4.2.1.jar -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 @@ -30,10 +29,7 @@ framework/base/lib/juel-spi-2.2.7.jar framework/base/lib/log4j-1.2-api-2.0.1.jar framework/base/lib/log4j-api-2.0.1.jar framework/base/lib/log4j-core-2.0.1.jar -framework/base/lib/log4j-jcl-2.0.1.jar framework/base/lib/log4j-slf4j-impl-2.0.1.jar -framework/base/lib/mx4j-3.0.1.jar -framework/base/lib/mx4j-remote-3.0.1.jar framework/base/lib/nekohtml-1.9.16.jar framework/base/lib/resolver-2.9.1.jar framework/base/lib/serializer-2.9.1.jar @@ -48,17 +44,13 @@ framework/base/lib/commons/commons-codec framework/base/lib/commons/commons-collections-3.2.1.jar framework/base/lib/commons/commons-compress-1.4.1.jar framework/base/lib/commons/commons-csv-1.0.jar -framework/base/lib/commons/commons-digester3-3.2.jar -framework/base/lib/commons/commons-discovery-0.4.jar framework/base/lib/commons/commons-el-1.0.jar framework/base/lib/commons/commons-fileupload-1.3.1.jar framework/base/lib/commons/commons-io-2.4.jar framework/base/lib/commons/commons-lang-2.6.jar framework/base/lib/commons/commons-logging-1.1.2.jar -framework/base/lib/commons/commons-modeler-2.0.1.jar framework/base/lib/commons/commons-net-3.1.jar framework/base/lib/commons/commons-pool2-2.2.jar -framework/base/lib/commons/commons-primitives-1.0.jar framework/base/lib/commons/commons-validator-1.4.0.jar framework/base/lib/j2eespecs/geronimo-activation_1.0.2_spec-1.0.jar framework/base/lib/j2eespecs/geronimo-j2ee-connector_1.5_spec-2.0.0.jar @@ -98,7 +90,6 @@ framework/service/lib/commons-httpclient framework/service/lib/neethi-2.0.4.jar framework/service/lib/XmlSchema-1.4.3.jar framework/webapp/lib/fop-1.1.jar -framework/webapp/lib/velocity-1.6.1.jar framework/webapp/lib/xmlgraphics-commons-1.5.jar framework/webapp/lib/json-lib-2.2.3-jdk15.jar framework/webapp/lib/ezmorph-0.9.1.jar @@ -329,7 +320,6 @@ framework/images/webapp/images/date/time ========================================================================= The following libraries distributed with Apache OFBiz are licensed under the Apache Software License: -framework/webapp/lib/DataVision-1.0.0.jar framework/base/lib/ant/ant-contrib-1.0b3.jar ========================================================================= Apache Software License @@ -457,10 +447,6 @@ framework/base/lib/xstream-1.4.6.jar framework/base/lib/owasp-esapi-full-java-1.4.jar framework/base/lib/scripting/antlr-2.7.6.jar framework/base/lib/scripting/asm-3.2.jar -framework/base/lib/scripting/asm-analysis-3.2.jar -framework/base/lib/scripting/asm-tree-3.2.jar -framework/base/lib/scripting/asm-util-3.2.jar -framework/base/lib/scripting/janino-2.5.15.jar framework/base/lib/scripting/jline-0.9.94.jar ========================================================================= @@ -2413,10 +2399,6 @@ It was allowed by the author to use the Apache OFBiz system in an email to H.Bakker from N.Walsh dd Tue, 25 Aug 2009 07:27:51 -0400 (18:27 ICT) ========================================================================= -The following libraries are licensed under the Creative Commons Attribution -2.5 License: -jcip-annotations-1.0.jar - Apache Ofbiz includes images in the ofbiz/framework/images/webapp/images/icons directory with the following licence: Creative Commons Attribution 2.5 License and condition : Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/NOTICE URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/NOTICE?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/NOTICE (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/NOTICE Mon Sep 8 06:04:39 2014 @@ -221,14 +221,6 @@ This product includes software developed (http://jdbm.sourceforge.net/). ========================================================================= -== MX4J Notice == -========================================================================= - -This software consists of voluntary contributions made by many -individuals on behalf of the MX4J project. For more information on -MX4J, please see <http://mx4j.sourceforge.net> - -========================================================================= == PNG Behavior Notice == ========================================================================= @@ -245,44 +237,6 @@ This product includes software developed Douglas Crockford (http://www.crockford.com). ========================================================================= -== DataVision Notice == -========================================================================= - -Icons - -DataVision uses graphic images developed by Sun. The image files are copied -into DataVision.jar. - -Copyright 2000 by Sun Microsystems, Inc. All Rights Reserved. - -Sun grants you (``Licensee'') a non-exclusive, royalty free, license to use, -and redistribute this software graphics artwork, as individual graphics or -as a collection, as part of software code or programs that you develop, -provided that i) this copyright notice and license accompany the software -graphics artwork; and ii) you do not utilize the software graphics artwork -in a manner which is disparaging to Sun. Unless enforcement is prohibited -by applicable law, you may not modify the graphics, and must use them true -to color and unmodified in every way. - -This software graphics artwork is provided ``AS IS,'' without a warranty of -any kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND -WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR -A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN AND ITS -LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A -RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE GRAPHICS ARTWORK. - -IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, -PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL -OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF -LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE GRAPHICS -ARTWORK, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -If any of the above provisions are held to be in violation of applicable -law, void, or unenforceable in any jurisdiction, then such provisions are -waived to the extent necessary for this Disclaimer to be otherwise -enforceable in such jurisdiction. - -========================================================================= == CoolTips Notice == ========================================================================= This product includes software developed by Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/OPTIONAL_LIBRARIES URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/OPTIONAL_LIBRARIES?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/OPTIONAL_LIBRARIES (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/OPTIONAL_LIBRARIES Mon Sep 8 06:04:39 2014 @@ -7,27 +7,6 @@ to change to include them in the OFBiz b NOTE: While these aren't included in the main SVN repository they are available on the old Undersun SVN server in the specialized/libraries component directory. --=- Web Presentation: ________________________________________________________________________________________________________________________________________________ - --JPublish/EdenLib (Apache): - NOTE: these were removed for library compatibility reasons, not for license - reasons; working these back in may be tricky - http://sourceforge.net/projects/jpublish - http://edenlib.sourceforge.net/ - framework/webapp/lib: - JPublish.jar - EdenLib.jar - TO BUILD comment out exclude: framework/webapp/build.xml: - org/ofbiz/webapp/view/GenericViewRenderer.java - org/ofbiz/webapp/view/JPublishViewHandler.java - org/ofbiz/webapp/view/JPublishWrapper.java - org/ofbiz/webapp/view/FopPdfViewHandler.java - org/ofbiz/webapp/ftl/FreeMarkerViewHandler.java - org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java - org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java - AND uncomment the jpublish type section portions of: - org/ofbiz/webapp/region/Section.java - -=- Scripting: ________________________________________________________________________________________________________________________________________________ -JavaScript/Rhino (NPL 1.1): Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/config/AccountingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/config/AccountingUiLabels.xml?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/config/AccountingUiLabels.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/config/AccountingUiLabels.xml Mon Sep 8 06:04:39 2014 @@ -3885,7 +3885,7 @@ <value xml:lang="th">สà¸à¸¸à¸¥à¹à¸à¸´à¸</value> <value xml:lang="vi">Tiá»n tá»</value> <value xml:lang="zh">å¸ç§</value> - <value xml:lang="zh_TW">å¹£å¥</value> + <value xml:lang="zh_TW">度éå®ä½</value> </property> <property key="AccountingCurrentAsset"> <value xml:lang="de">Umlaufvermögen</value> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/config/ContentEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/config/ContentEntityLabels.xml?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/config/ContentEntityLabels.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/config/ContentEntityLabels.xml Mon Sep 8 06:04:39 2014 @@ -1901,11 +1901,6 @@ <value xml:lang="zh">å±å¹æ件</value> <value xml:lang="zh_TW">è¢å¹æ件</value> </property> - <property key="DataTemplateType.description.VTL"> - <value xml:lang="en">Velocity</value> - <value xml:lang="ro">Viteza</value> - <value xml:lang="th">à¸à¸§à¸²à¸¡à¹à¸£à¹à¸§</value> - </property> <property key="DataTemplateType.description.WM"> <value xml:lang="en">WebMacro</value> <value xml:lang="th">à¹à¸§à¹à¸ Macro</value> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/config/content.properties URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/config/content.properties?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/config/content.properties (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/config/content.properties Mon Sep 8 06:04:39 2014 @@ -28,10 +28,6 @@ permissionRecorderOn=true allowedHasRoleOperations=HAS_USER_ROLE|HAS_AUTHOR_ROLE|HAS_EDITOR_ROLE|HAS_ADMIN_ROLE|HAS_PUBLISHER_ROLE viewSize=10 -# some properties used to put comments around freemarker template blocks using the FreeMarkerViewRenderer -freemarker.showTemplateId=Y -freemarker.templateIdPrefix=[system] - # user level content uploading (relative to ofbiz.home) content.upload.path.prefix=runtime/uploads content.upload.max.files=250 Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/data/ContentTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/data/ContentTypeData.xml?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/data/ContentTypeData.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/data/ContentTypeData.xml Mon Sep 8 06:04:39 2014 @@ -138,7 +138,6 @@ under the License. <DataTemplateType dataTemplateTypeId="NONE" description="No Template" extension=""/> <DataTemplateType dataTemplateTypeId="FTL" description="FreeMarker" extension="ftl"/> - <DataTemplateType dataTemplateTypeId="VTL" description="Velocity" extension="vtl"/> <DataTemplateType dataTemplateTypeId="WM" description="WebMacro" extension="wm"/> <DataTemplateType dataTemplateTypeId="XSLT" description="XSLT" extension="xsl"/> <DataTemplateType dataTemplateTypeId="SCREEN_COMBINED" description="Screen widget" extension="xml"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/data/TemplateData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/data/TemplateData.xml?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/data/TemplateData.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/data/TemplateData.xml Mon Sep 8 06:04:39 2014 @@ -337,12 +337,6 @@ ResourceId=${subDataResourceId?if_exists <br/> </@checkPermission> </td></tr> -<#-- can't include this file because this template is not run thru JPublish and it, therefore, - does not know where to find nextprev.ftl. - Looks like Configuration.setDirectoryForTemplateLoading could be used, but I don't want to - worry about passing a request object down to this level, at this time. -<#include "nextprev.ftl"/> ---> <#assign outputIndex = 0/> <#if outputIndex?exists > Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/ContentManagementWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/ContentManagementWorker.java?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/ContentManagementWorker.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/ContentManagementWorker.java Mon Sep 8 06:04:39 2014 @@ -177,28 +177,6 @@ public class ContentManagementWorker { return ret; } - //public static String getFromSomewhere(String name, LinkedHashMap paramMap, HttpServletRequest request, org.jpublish.JPublishContext context) { - /* This method should no longer be in use; the JPublish library was removed by default from OFBiz - public static String getFromSomewhere(String name, Map paramMap, HttpServletRequest request, org.jpublish.JPublishContext context) { - - String ret = null; - if (paramMap != null) - ret = (String)paramMap.get(name); - - if (UtilValidate.isEmpty(ret)) { - Object obj = request.getAttribute(name); - if (obj != null) { - ret = obj.toString(); - } else { - obj = context.get(name); - if (obj != null) { - ret = obj.toString(); - } - } - } - return ret; - } */ - public static void getCurrentValue(HttpServletRequest request, Delegator delegator) { HttpSession session = request.getSession(); Map<String, GenericPK> currentEntityMap = UtilGenerics.checkMap(session.getAttribute("currentEntityMap")); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/cms/CmsEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/cms/CmsEvents.java?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/cms/CmsEvents.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/cms/CmsEvents.java Mon Sep 8 06:04:39 2014 @@ -20,7 +20,6 @@ package org.ofbiz.content.cms; import java.io.IOException; -import java.io.OutputStreamWriter; import java.io.Writer; import java.util.List; import java.util.Locale; @@ -28,7 +27,6 @@ import java.util.Locale; import javax.servlet.RequestDispatcher; import javax.servlet.ServletContext; import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; @@ -37,7 +35,6 @@ import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.GeneralRuntimeException; import org.ofbiz.base.util.UtilHttp; -import org.ofbiz.base.util.UtilJ2eeCompat; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; @@ -266,19 +263,8 @@ public class CmsEvents { //String contextLinkPrefix = rh.makeLink(request, response, "", true, false, true); //templateMap.put("_CONTEXT_LINK_PREFIX_", contextLinkPrefix); - Writer writer; try { - // use UtilJ2eeCompat to get this setup properly - boolean useOutputStreamNotWriter = false; - if (servletContext != null) { - useOutputStreamNotWriter = UtilJ2eeCompat.useOutputStreamNotWriter(servletContext); - } - if (useOutputStreamNotWriter) { - ServletOutputStream ros = response.getOutputStream(); - writer = new OutputStreamWriter(ros, "UTF-8"); - } else { - writer = response.getWriter(); - } + Writer writer = response.getWriter(); // TODO: replace "screen" to support dynamic rendering of different output FormStringRenderer formStringRenderer = new MacroFormRenderer(UtilProperties.getPropertyValue("widget", "screen.formrenderer"), request, response); templateMap.put("formStringRenderer", formStringRenderer); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/view/SimpleContentViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/view/SimpleContentViewHandler.java?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/view/SimpleContentViewHandler.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/view/SimpleContentViewHandler.java Mon Sep 8 06:04:39 2014 @@ -45,17 +45,20 @@ import org.ofbiz.webapp.view.AbstractVie import org.ofbiz.webapp.view.ViewHandlerException; import org.ofbiz.webapp.website.WebSiteWorker; -/** - * Uses XSL-FO formatted templates to generate PDF views - * This handler will use JPublish to generate the XSL-FO - */ public class SimpleContentViewHandler extends AbstractViewHandler { public static final String module = SimpleContentViewHandler.class.getName(); - protected ServletContext servletContext = null; + private String rootDir = null; + private String https = null; + private String defaultCharset = null; public void init(ServletContext context) throws ViewHandlerException { - this.servletContext = context; + rootDir = context.getRealPath("/"); + https = (String) context.getAttribute("https"); + defaultCharset = context.getInitParameter("charset"); + if (UtilValidate.isEmpty(defaultCharset)) { + defaultCharset = "UTF-8"; + } } /** * @see org.ofbiz.webapp.view.ViewHandler#render(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) @@ -71,18 +74,10 @@ public class SimpleContentViewHandler ex String contentRevisionSeqId = request.getParameter("contentRevisionSeqId"); String mimeTypeId = request.getParameter("mimeTypeId"); Locale locale = UtilHttp.getLocale(request); - String rootDir = null; String webSiteId = WebSiteWorker.getWebSiteId(request); - String https = null; - if (UtilValidate.isEmpty(rootDir)) { - rootDir = servletContext.getRealPath("/"); - } - if (UtilValidate.isEmpty(https)) { - https = (String) servletContext.getAttribute("https"); - } try { - if (Debug.verboseOn()) Debug.logVerbose("SCVH(0a)- dataResourceId:" + dataResourceId, module); + if (Debug.verboseOn()) Debug.logVerbose("dataResourceId:" + dataResourceId, module); Delegator delegator = (Delegator)request.getAttribute("delegator"); if (UtilValidate.isEmpty(dataResourceId)) { if (UtilValidate.isEmpty(contentRevisionSeqId)) { @@ -91,7 +86,7 @@ public class SimpleContentViewHandler ex GenericValue content = delegator.findOne("Content", UtilMisc.toMap("contentId", contentId), true); dataResourceId = content.getString("dataResourceId"); } - if (Debug.verboseOn()) Debug.logVerbose("SCVH(0b)- dataResourceId:" + dataResourceId, module); + if (Debug.verboseOn()) Debug.logVerbose("dataResourceId:" + dataResourceId, module); } else { Timestamp fromDate = null; if (UtilValidate.isNotEmpty(fromDateStr)) { @@ -107,7 +102,7 @@ public class SimpleContentViewHandler ex } GenericValue content = ContentWorker.getSubContent(delegator, contentId, mapKey, null, null, assocList, fromDate); dataResourceId = content.getString("dataResourceId"); - if (Debug.verboseOn()) Debug.logVerbose("SCVH(0b)- dataResourceId:" + dataResourceId, module); + if (Debug.verboseOn()) Debug.logVerbose("dataResourceId:" + dataResourceId, module); } } else { GenericValue contentRevisionItem = delegator.findOne("ContentRevisionItem", UtilMisc.toMap("contentId", rootContentId, "itemContentId", contentId, "contentRevisionSeqId", contentRevisionSeqId), true); @@ -116,9 +111,9 @@ public class SimpleContentViewHandler ex + ", contentRevisionSeqId=" + contentRevisionSeqId + ", itemContentId=" + contentId); } dataResourceId = contentRevisionItem.getString("newDataResourceId"); - if (Debug.verboseOn()) Debug.logVerbose("SCVH(1)- contentRevisionItem:" + contentRevisionItem, module); - if (Debug.verboseOn()) Debug.logVerbose("SCVH(2)-contentId=" + rootContentId + ", contentRevisionSeqId=" + contentRevisionSeqId + ", itemContentId=" + contentId, module); - if (Debug.verboseOn()) Debug.logVerbose("SCVH(3)- dataResourceId:" + dataResourceId, module); + if (Debug.verboseOn()) Debug.logVerbose("contentRevisionItem:" + contentRevisionItem, module); + if (Debug.verboseOn()) Debug.logVerbose("contentId=" + rootContentId + ", contentRevisionSeqId=" + contentRevisionSeqId + ", itemContentId=" + contentId, module); + if (Debug.verboseOn()) Debug.logVerbose("dataResourceId:" + dataResourceId, module); } } if (UtilValidate.isNotEmpty(dataResourceId)) { @@ -126,22 +121,14 @@ public class SimpleContentViewHandler ex // DEJ20080717: why are we rendering the DataResource directly instead of rendering the content? ByteBuffer byteBuffer = DataResourceWorker.getContentAsByteBuffer(delegator, dataResourceId, https, webSiteId, locale, rootDir); ByteArrayInputStream bais = new ByteArrayInputStream(byteBuffer.array()); - // hack for IE and mime types - //String userAgent = request.getHeader("User-Agent"); - //if (userAgent.indexOf("MSIE") > -1) { - // Debug.logInfo("Found MSIE changing mime type from - " + mimeTypeId, module); - // mimeTypeId = "application/octet-stream"; - //} // setup chararcter encoding and content type String charset = dataResource.getString("characterSetId"); - mimeTypeId = dataResource.getString("mimeTypeId"); if (UtilValidate.isEmpty(charset)) { - charset = servletContext.getInitParameter("charset"); + charset = defaultCharset; } - if (UtilValidate.isEmpty(charset)) { - charset = "UTF-8"; + if (UtilValidate.isEmpty(mimeTypeId)) { + mimeTypeId = dataResource.getString("mimeTypeId"); } - // setup content type String contentType2 = UtilValidate.isNotEmpty(mimeTypeId) ? mimeTypeId + "; charset=" +charset : contentType; String fileName = null; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/webapp/content/WEB-INF/actions/content/GetContentLookupList.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/webapp/content/WEB-INF/actions/content/GetContentLookupList.groovy?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/webapp/content/WEB-INF/actions/content/GetContentLookupList.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/webapp/content/WEB-INF/actions/content/GetContentLookupList.groovy Mon Sep 8 06:04:39 2014 @@ -21,14 +21,10 @@ import org.ofbiz.entity.util.*; import org.ofbiz.entity.*; import org.ofbiz.base.util.*; - import javolution.util.FastList; - import javolution.util.FastSet; - import javolution.util.FastMap; import org.ofbiz.entity.transaction.TransactionUtil; import org.ofbiz.entity.util.EntityListIterator; import org.ofbiz.entity.GenericEntity; import org.ofbiz.entity.model.ModelField; - import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.model.ModelEntity; import org.ofbiz.entity.model.ModelReader; @@ -47,7 +43,7 @@ String curFindString=""; ModelReader reader = delegator.getModelReader(); ModelEntity modelEntity = reader.getModelEntity("ContentAssocViewTo"); GenericEntity findByEntity = delegator.makeValue("ContentAssocViewTo"); -List errMsgList = FastList.newInstance(); +List errMsgList = new ArrayList(); Iterator fieldIterator = modelEntity.getFieldsIterator(); while (fieldIterator.hasNext()) { ModelField field = fieldIterator.next(); @@ -93,11 +89,8 @@ if ((highIndex - lowIndex + 1) > 0) { try { beganTransaction = TransactionUtil.begin(); allConditions = EntityCondition.makeCondition( conditions, EntityOperator.AND ); - fieldsToSelect = FastSet.newInstance(); - //fieldsToSelect=["contentId", "contentName", "mimeTypeId"] as Set; findOptions = new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true); - EntityListIterator listIt=null; - listIt = delegator.find("ContentAssocViewTo", allConditions, null, null, ["contentId ASC"], findOptions); + EntityListIterator listIt = delegator.find("ContentAssocViewTo", allConditions, null, null, ["contentId ASC"], findOptions); resultPartialList = listIt.getPartialList(lowIndex, highIndex - lowIndex + 1); arraySize = listIt.getResultsSizeAfterPartialList(); @@ -127,5 +120,4 @@ context.resultPartialList = resultPartia viewIndexLast = UtilMisc.getViewLastIndex(arraySize, viewSize); context.viewIndexLast = viewIndexLast; -contentAssoc = FastList.newInstance(); context.contentAssoc=resultPartialList; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.groovy?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.groovy Mon Sep 8 06:04:39 2014 @@ -17,12 +17,8 @@ * under the License. */ -import org.ofbiz.entity.transaction.TransactionUtil -import org.ofbiz.entity.util.EntityListIterator import org.ofbiz.entity.condition.EntityOperator -import org.ofbiz.entity.condition.EntityExpr import org.ofbiz.entity.condition.EntityCondition -import org.ofbiz.entity.condition.EntityConditionList import org.ofbiz.marketing.report.ReportHelper //query for both number of visits and number of orders Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderUiLabels.xml?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderUiLabels.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderUiLabels.xml Mon Sep 8 06:04:39 2014 @@ -196,7 +196,7 @@ <value xml:lang="th">หà¸à¹à¸§à¸¢à¸§à¸±à¸à¸ªà¸à¸¸à¸¥à¹à¸à¸´à¸</value> <value xml:lang="vi">ÄÆ¡n vá» tiá»n tá»</value> <value xml:lang="zh">è´§å¸å¸ç§</value> - <value xml:lang="zh_TW">å¹£å¥</value> + <value xml:lang="zh_TW">度éå®ä½</value> </property> <property key="FormFieldTitle_custRequestId"> <value xml:lang="de">Kundenanfrage-ID</value> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java Mon Sep 8 06:04:39 2014 @@ -2987,7 +2987,6 @@ public class OrderServices { return ServiceUtil.returnSuccess(); } - @SuppressWarnings("unchecked") public static Map<String, Object> cancelFlaggedSalesOrders(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); @@ -2997,13 +2996,13 @@ public class OrderServices { List<GenericValue> ordersToCheck = null; // create the query expressions - List<EntityExpr> exprs = UtilMisc.toList( + List<EntityCondition> exprs = UtilMisc.<EntityCondition>toList( EntityCondition.makeCondition("orderTypeId", EntityOperator.EQUALS, "SALES_ORDER"), EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "ORDER_COMPLETED"), EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "ORDER_CANCELLED"), EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "ORDER_REJECTED") ); - EntityConditionList<EntityExpr> ecl = EntityCondition.makeCondition(exprs, EntityOperator.AND); + EntityConditionList<EntityCondition> ecl = EntityCondition.makeCondition(exprs, EntityOperator.AND); // get the orders try { @@ -3064,7 +3063,7 @@ public class OrderServices { } } else { // check for auto-cancel items - List itemsExprs = new ArrayList(); + ArrayList<EntityCondition> itemsExprs = new ArrayList<EntityCondition>(); // create the query expressions itemsExprs.add(EntityCondition.makeCondition("orderId", EntityOperator.EQUALS, orderId)); @@ -3781,7 +3780,6 @@ public class OrderServices { } String[] itemInfo = key.split(":"); - @SuppressWarnings("unused") int groupIdx = -1; try { groupIdx = Integer.parseInt(itemInfo[1]); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java Mon Sep 8 06:04:39 2014 @@ -319,8 +319,11 @@ public class ShoppingListServices { } shoppingListTypeId = shoppingList.getString("shoppingListTypeId"); - OrderReadHelper orh = new OrderReadHelper(orderHeader); - if (orh == null) { + OrderReadHelper orh; + try { + orh = new OrderReadHelper(orderHeader); + } catch (IllegalArgumentException e) { + Debug.logError(e, module); return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderUnableToLoadOrderReadHelper", UtilMisc.toMap("orderId",orderId), locale)); } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy Mon Sep 8 06:04:39 2014 @@ -25,7 +25,7 @@ import org.ofbiz.service.*; import org.ofbiz.entity.*; import org.ofbiz.entity.condition.*; import org.ofbiz.entity.util.*; -import org.ofbiz.webapp.taglib.*; +import org.ofbiz.webapp.taglib.ContentUrlTag; import org.ofbiz.webapp.stats.VisitHandler; import org.ofbiz.webapp.website.WebSiteWorker import org.ofbiz.order.shoppingcart.ShoppingCartEvents; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy Mon Sep 8 06:04:39 2014 @@ -29,7 +29,7 @@ import org.ofbiz.entity.*; import org.ofbiz.entity.condition.*; import org.ofbiz.entity.util.*; import org.ofbiz.service.*; -import org.ofbiz.webapp.taglib.*; +import org.ofbiz.webapp.taglib.ContentUrlTag; import org.ofbiz.product.product.ProductContentWrapper; import org.ofbiz.product.product.ProductSearch; import org.ofbiz.product.product.ProductSearchSession; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/entitydef/entitymodel.xml?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/entitydef/entitymodel.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/entitydef/entitymodel.xml Mon Sep 8 06:04:39 2014 @@ -1566,12 +1566,20 @@ under the License. title="PartyAcctgPreference and PartyGroup Entity"> <member-entity entity-alias="PTYACCPREF" entity-name="PartyAcctgPreference"/> <member-entity entity-alias="PTYGROUP" entity-name="PartyGroup"/> + <member-entity entity-alias="PTYROLE" entity-name="PartyRole"/> <alias entity-alias="PTYACCPREF" name="partyId"/> <alias entity-alias="PTYACCPREF" name="baseCurrencyUomId"/> <alias entity-alias="PTYGROUP" name="groupName"/> + <alias entity-alias="PTYROLE" name="roleTypeId"/> <view-link entity-alias="PTYACCPREF" rel-entity-alias="PTYGROUP"> <key-map field-name="partyId"/> </view-link> + <view-link entity-alias="PTYACCPREF" rel-entity-alias="PTYROLE"> + <key-map field-name="partyId"/> + </view-link> + <entity-condition> + <condition-expr entity-alias="PTYROLE" field-name="roleTypeId" operator="equals" value="INTERNAL_ORGANIZATIO"/> + </entity-condition> </view-entity> <view-entity entity-name="PartyAndGroup" package-name="org.ofbiz.party.party" Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/script/org/ofbiz/party/party/PartyServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/script/org/ofbiz/party/party/PartyServices.xml Mon Sep 8 06:04:39 2014 @@ -21,20 +21,6 @@ under the License. <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd"> - <simple-method method-name="createPartyRole" short-description="Create Party Role"> - <entity-one entity-name="PartyRole" value-field="partyRole"/> - <if-empty field="partyRole"> - <make-value entity-name="PartyRole" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <create-value value-field="newEntity"/> - </if-empty> - </simple-method> - <simple-method method-name="deletePartyRole" short-description="Delete a PartyRole"> - <entity-one entity-name="PartyRole" value-field="partyRole"/> - <remove-value value-field="partyRole"/> - </simple-method> - - <simple-method method-name="savePartyNameChange" short-description="Save Party Name Change"> <!-- for special case in ecommerce, if no partyId is passed in use userLogin.partyId --> <if-empty field="parameters.partyId"> @@ -88,8 +74,8 @@ under the License. </else-if> </if> </simple-method> - <simple-method method-name="getPartyNameForDate" short-description="Get Party Name For Date"> + <simple-method method-name="getPartyNameForDate" short-description="Get Party Name For Date"> <entity-and entity-name="PartyNameHistory" list="partyNameHistoryList"> <field-map field-name="partyId" from-field="parameters.partyId"/> <order-by field-name="-changeDate"/> @@ -179,15 +165,6 @@ under the License. </simple-method> <!-- PostalAddressBoundary methods --> - <simple-method method-name="createPostalAddressBoundary" short-description="Create Postal Address Boundary"> - <make-value entity-name="PostalAddressBoundary" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="deletePostalAddressBoundary" short-description="Delete a Postal Address Boundary"> - <entity-one entity-name="PostalAddressBoundary" value-field="postalAddressBoundary"/> - <remove-value value-field="postalAddressBoundary"/> - </simple-method> <simple-method method-name="getPostalAddressBoundary" short-description="Get Postal Address Boundary"> <make-value entity-name="PostalAddressBoundary" value-field="postalAddressBoundaryLookupMap"/> <set field="postalAddressBoundaryLookupMap.geoId" from-field="parameters.geoId"/> @@ -200,14 +177,14 @@ under the License. </simple-method> <!-- PartyIdentification methods --> - <simple-method method-name="createPartyIdentifications" short-description="create mass party identification with association between vale and type"> + <simple-method method-name="createPartyIdentifications" short-description="create mass party identification with association between value and type"> <set field="partyIdentCtx.partyId" from-field="parameters.partyId"/> <iterate-map key="key" value="value" map="parameters.identifications"> <entity-one value-field="identificationType" entity-name="PartyIdentificationType" use-cache="true"> - <field-map field-name="partyIdentificationTypeId" from-field="value"/> - </entity-one> - <if-not-empty field="identificationType"> - <set field="idValue" value="${parameters.identifications.${identificationType.partyIdentificationTypeId}}"/> + <field-map field-name="partyIdentificationTypeId" from-field="value"/> + </entity-one> + <if-not-empty field="identificationType"> + <set field="idValue" value="${parameters.identifications.${identificationType.partyIdentificationTypeId}}"/> <if-not-empty field="idValue"> <set field="partyIdentCtx.partyIdentificationTypeId" from-field="identificationType.partyIdentificationTypeId"/> <set field="partyIdentCtx.idValue" from-field="idValue"/> @@ -217,77 +194,6 @@ under the License. </iterate-map> </simple-method> - <!-- PartyClassification methods --> - <simple-method method-name="createPartyClassification" short-description="create a PartyClassification"> - <make-value entity-name="PartyClassification" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty> - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="updatePartyClassification" short-description="update a PartyClassification"> - <entity-one entity-name="PartyClassification" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - <simple-method method-name="deletePartyClassification" short-description="delete a PartyClassification"> - <entity-one entity-name="PartyClassification" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - <!-- PartyClassificationGroup methods --> - <simple-method method-name="createPartyClassificationGroup" short-description="create a PartyClassificationGroup"> - <log level="verbose" message="in newEntity"/> - <make-value entity-name="PartyClassificationGroup" value-field="newEntity"/> - <sequenced-id sequence-name="PartyClassificationGroup" field="newEntity.partyClassificationGroupId"/> - <field-to-result field="newEntity.partyClassificationGroupId" result-name="partyClassificationGroupId"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <log level="verbose" message="newEntity:${newEntity}"/> - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="updatePartyClassificationGroup" short-description="update a PartyClassificationGroup"> - <entity-one entity-name="PartyClassificationGroup" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - <simple-method method-name="deletePartyClassificationGroup" short-description="delete a PartyClassificationGroup"> - <entity-one entity-name="PartyClassificationGroup" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <!-- Vendor Party services --> - <simple-method method-name="createVendor" short-description="createVendor"> - <make-value value-field="newEntity" entity-name="Vendor"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="updateVendor" short-description="updateVendor"> - <entity-one entity-name="Vendor" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - <simple-method method-name="deleteVendor" short-description="deleteVendor"> - <entity-one entity-name="Vendor" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <!-- party attribute services --> - <simple-method method-name="createPartyAttribute" short-description="createPartyAttribute"> - <make-value value-field="newEntity" entity-name="PartyAttribute"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="updatePartyAttribute" short-description="updatePartyAttribute"> - <entity-one entity-name="PartyAttribute" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - <simple-method method-name="removePartyAttribute" short-description="removePartyAttribute"> - <entity-one entity-name="PartyAttribute" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - <!-- party profile default --> <simple-method method-name="setPartyProfileDefaults" short-description="Sets Party Profile Defaults"> <if-empty field="parameters.partyId"> @@ -947,23 +853,6 @@ under the License. <set field="relMap.comments" from-field="parameters.comments"/> <call-service service-name="createPartyRelationship" in-map-name="relMap"/> </simple-method> - - <simple-method method-name="createPartyCarrierAccount" short-description="Create PartyCarrierAccount"> - <make-value entity-name="PartyCarrierAccount" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.fromDate"> - <now-timestamp field="nowTimeStamp"/> - <set field="newEntity.fromDate" from-field="nowTimeStamp"/> - </if-empty> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updatePartyCarrierAccount" short-description="Update a PartyCarrierAccount"> - <entity-one entity-name="PartyCarrierAccount" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> <!-- send party creation email notification --> <simple-method method-name="sendCreatePartyEmailNotification" short-description="Notification email on party creation" login-required="false"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |