You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/12/10 10:14:43 UTC
svn commit: r1044245 [1/6] - in /ofbiz/branches/jquery: ./
applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/
applications/accounting/src/org/ofbiz/accounting/thirdparty/securepay/
applications/accounting/webapp/accounting/fin...
Author: jleroux
Date: Fri Dec 10 09:14:36 2010
New Revision: 1044245
URL: http://svn.apache.org/viewvc?rev=1044245&view=rev
Log:
Merges the trunk at r1044232 (few false conflicts handled by hand)
Modified:
ofbiz/branches/jquery/ (props changed)
ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMRespPositions.java (props changed)
ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/CPRespPositions.java (props changed)
ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java (props changed)
ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/securepay/SecurePayServiceTest.java (props changed)
ofbiz/branches/jquery/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl
ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java (contents, props changed)
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java (contents, props changed)
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java
ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
ofbiz/branches/jquery/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java (props changed)
ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed)
ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java (contents, props changed)
ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy
ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductUomDropDownOnly.groovy
ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy
ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy
ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy
ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/findOrders.ftl
ofbiz/branches/jquery/applications/order/webapp/ordermgr/return/returnLinks.ftl
ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed)
ofbiz/branches/jquery/applications/party/widget/partymgr/PartyForms.xml
ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed)
ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/category/OfbizCatalogUrlTransform.java (props changed)
ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java (props changed)
ofbiz/branches/jquery/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl
ofbiz/branches/jquery/applications/product/webapp/catalog/find/advancedsearch.ftl
ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditVirtualProductInventory.ftl
ofbiz/branches/jquery/applications/product/webapp/catalog/product/ViewProductOrders.ftl
ofbiz/branches/jquery/applications/product/webapp/facility/shipment/VerifyPick.ftl
ofbiz/branches/jquery/applications/securityext/src/org/ofbiz/securityext/da/ServiceDaHandler.java (props changed)
ofbiz/branches/jquery/applications/securityext/src/org/ofbiz/securityext/test/AuthorizationTests.java (props changed)
ofbiz/branches/jquery/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl
ofbiz/branches/jquery/debian/EncryptPassword.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/DependencyPool.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/ExecutionPool.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/GeneratedResult.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/TTLCachedObject.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/TTLObject.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/AsyncTTLObjectTest.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/DependencyPoolTests.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/SyncTTLObjectTest.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/TTLCachedObjectTest.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/TTLObjectTest.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/config/CoberturaInstrumenter.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/GenericSingletonToList.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/GenericSingletonToSet.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/JSONConverters.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/JSONResult.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/NetConverters.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/test/DateTimeTests.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/test/MiscTests.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/json/JSONWriter.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/json/test/JSONTests.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/IsEmpty.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/LockedBy.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/ObjectWrapper.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/SourceMonitored.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/test/ComparableRangeTests.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/test/GenericTestCaseBase.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/IndentingWriter.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/RMIExtendedSocketFactory.java (contents, props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/ReferenceCleaner.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilIO.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/cache/test/UtilCacheTests.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/GenericMap.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/GenericMapCollection.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/GenericMapEntry.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/GenericMapEntrySet.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/GenericMapKeySet.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/GenericMapSet.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/GenericMapValues.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/IteratorWrapper.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/MapContext.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/ReadOnlyMapEntry.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/test/GenericMapTest.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/test/IndentingWriterTests.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/test/ReferenceCleanerTests.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/test/StringUtilTests.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/test/UtilIOTests.java (props changed)
ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/test/UtilObjectTests.java (props changed)
ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/authentication/AuthHelper.java (props changed)
ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/authentication/AuthenticationComparator.java (props changed)
ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/authentication/api/Authenticator.java (props changed)
ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/authentication/api/AuthenticatorException.java (props changed)
ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/authentication/example/TestFailAuthenticator.java (props changed)
ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/authentication/example/TestPassAuthenticator.java (props changed)
ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml (props changed)
ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/sql/EntityConditionPlanner.java (props changed)
ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/sql/EntityDeletePlan.java (props changed)
ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/sql/EntityInsertPlan.java (props changed)
ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java (props changed)
ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/sql/EntitySelectPlan.java (props changed)
ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/sql/EntityUpdatePlan.java (props changed)
ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/sql/EntityViewPlan.java (props changed)
ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/sql/SQLUtil.java (props changed)
ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/util/CachedClassLoaderInit.java (props changed)
ofbiz/branches/jquery/framework/minilang/src/org/ofbiz/minilang/method/callops/CallScript.java (props changed)
ofbiz/branches/jquery/framework/security/src/org/ofbiz/security/authz/AbstractAuthorization.java (props changed)
ofbiz/branches/jquery/framework/security/src/org/ofbiz/security/authz/Authorization.java (props changed)
ofbiz/branches/jquery/framework/security/src/org/ofbiz/security/authz/AuthorizationFactory.java (props changed)
ofbiz/branches/jquery/framework/security/src/org/ofbiz/security/authz/EntityAuthorization.java (contents, props changed)
ofbiz/branches/jquery/framework/security/src/org/ofbiz/security/authz/da/DynamicAccess.java (props changed)
ofbiz/branches/jquery/framework/security/src/org/ofbiz/security/authz/da/DynamicAccessFactory.java (props changed)
ofbiz/branches/jquery/framework/security/src/org/ofbiz/security/authz/da/DynamicAccessHandler.java (props changed)
ofbiz/branches/jquery/framework/security/src/org/ofbiz/security/authz/da/GroovyDaHandler.java (props changed)
ofbiz/branches/jquery/framework/security/src/org/ofbiz/security/authz/da/ObjectDaHandler.java (props changed)
ofbiz/branches/jquery/framework/service/src/org/ofbiz/service/GenericInvoker.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/AggregateFunction.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/Atom.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/BetweenCondition.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/BooleanCondition.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/Condition.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/ConditionList.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/ConditionPlan.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/ConditionPlanner.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/ConstantValue.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/CountAllFunction.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/DeletePlan.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/FieldAll.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/FieldDef.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/FieldValue.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/FunctionCall.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/InsertPlan.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/InsertRow.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/InsertSource.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/InsertValues.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/Joined.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/Joiner.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/KeyMap.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/ListCondition.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/Main.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/MathValue.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/NumberValue.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/OrderByItem.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/ParameterValue.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/ParameterizedConditionException.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/Planner.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/Relation.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/SQLDelete.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/SQLIndex.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/SQLInsert.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/SQLPlan.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/SQLSelect.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/SQLStatement.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/SQLUpdate.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/SQLView.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/SelectGroup.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/SelectPlan.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/SetField.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/StaticValue.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/StringValue.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/Table.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/TableName.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/Unioned.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/UpdatePlan.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/Value.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/ViewPlan.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/test/ConditionsTest.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/test/Recorder.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/test/SQLTest.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/test/SelectTest.java (props changed)
ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/test/ValuesTest.java (props changed)
ofbiz/branches/jquery/framework/start/src/org/ofbiz/base/start/Instrumenter.java (props changed)
ofbiz/branches/jquery/framework/start/src/org/ofbiz/base/start/InstrumenterWorker.java (props changed)
ofbiz/branches/jquery/framework/testtools/src/org/ofbiz/testtools/TestListContainer.java (props changed)
ofbiz/branches/jquery/framework/webslinger/src/org/ofbiz/commons/vfs/CommonsVfsContainer.java (contents, props changed)
ofbiz/branches/jquery/framework/webslinger/src/org/ofbiz/commons/vfs/ofbiz/OfbizComponentProvider.java (contents, props changed)
ofbiz/branches/jquery/framework/webslinger/src/org/ofbiz/commons/vfs/ofbiz/OfbizHomeProvider.java (contents, props changed)
ofbiz/branches/jquery/framework/webslinger/src/org/ofbiz/webslinger/EntityHttpUtil.java (contents, props changed)
ofbiz/branches/jquery/framework/webslinger/src/org/ofbiz/webslinger/EntityTransactionUtil.java (props changed)
ofbiz/branches/jquery/framework/webslinger/src/org/ofbiz/webslinger/StatsUpdater.java (contents, props changed)
ofbiz/branches/jquery/framework/webslinger/src/org/ofbiz/webslinger/WebslingerBSFServiceEngine.java (props changed)
ofbiz/branches/jquery/framework/webslinger/src/org/ofbiz/webslinger/WebslingerCatalinaContainer.java (props changed)
ofbiz/branches/jquery/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContainer.java (props changed)
ofbiz/branches/jquery/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java (contents, props changed)
ofbiz/branches/jquery/framework/webslinger/src/org/ofbiz/webslinger/WebslingerServerEngine.java (contents, props changed)
ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/PortalPageWorker.java (contents, props changed)
ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/PortalPageWorkerInterface.java (contents, props changed)
ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/WidgetPortalPageWorker.java (contents, props changed)
ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java
ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/tree/MacroTreeRenderer.java (contents, props changed)
ofbiz/branches/jquery/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java
ofbiz/branches/jquery/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/ApplicationAuthenticationContext.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/AuthenticatedToken.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/PasswordCredential.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/PrincipalAuthenticationContext.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/ValidationFactor.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ApplicationAccessDeniedException.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ApplicationPermissionException.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InactiveAccountException.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidAuthenticationException.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidAuthorizationTokenException.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidCredentialException.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidGroupException.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidPrincipalException.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidRoleException.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidTokenException.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ObjectNotFoundException.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPAttribute.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPCookieInfo.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPGroup.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPNestableGroup.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPPrincipal.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPRole.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SearchRestriction.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/org/ofbiz/crowd/CrowdAuthenticator.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/org/ofbiz/crowd/CrowdWorker.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/org/ofbiz/crowd/security/SecurityServer.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/org/ofbiz/crowd/security/SecurityServerHttpBindingStub.java (contents, props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/org/ofbiz/crowd/security/SecurityServerLocator.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/org/ofbiz/crowd/security/SecurityServerPortType.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/org/ofbiz/crowd/user/UserAttributeMapper.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/org/ofbiz/crowd/user/UserGroupMapper.java (props changed)
ofbiz/branches/jquery/specialpurpose/crowd/src/org/ofbiz/crowd/user/UserWrapper.java (props changed)
ofbiz/branches/jquery/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl
ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ (props changed)
ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayAccount.java (props changed)
ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java (props changed)
ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java (props changed)
ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java (props changed)
ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java (contents, props changed)
ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPrefEvents.java (props changed)
ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java (contents, props changed)
ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCategoryFacade.java (props changed)
ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCustomerService.java (props changed)
ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java (props changed)
ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java (contents, props changed)
ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOptions.java (props changed)
ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java (props changed)
ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreSiteFacade.java (props changed)
ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl
ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl
ofbiz/branches/jquery/specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed)
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed)
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed)
ofbiz/branches/jquery/specialpurpose/pos/src/org/ofbiz/pos/component/PromoStatusBar.java (contents, props changed)
ofbiz/branches/jquery/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java (contents, props changed)
ofbiz/branches/jquery/themes/bizznesstime/includes/header.ftl
ofbiz/branches/jquery/themes/bluelight/includes/header.ftl
ofbiz/branches/jquery/themes/droppingcrumbs/includes/header.ftl
ofbiz/branches/jquery/themes/flatgrey/includes/header.ftl
ofbiz/branches/jquery/themes/tomahawk/includes/appbarClose.ftl
Propchange: ofbiz/branches/jquery/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 10 09:14:36 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:951708-1044013
+/ofbiz/trunk:951708-1044240
Propchange: ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMRespPositions.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/CPRespPositions.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/securepay/SecurePayServiceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl?rev=1044245&r1=1044244&r2=1044245&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl (original)
+++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl Fri Dec 10 09:14:36 2010
@@ -21,7 +21,7 @@ under the License.
<input name="_useRowSubmit" type="hidden" value="Y"/>
<input name="finAccountId" type="hidden" value="${finAccountId}"/>
<input name="glReconciliationId" type="hidden" value="${glReconciliationId}"/>
- <div class="screenlet">
+ <div class="screenlet">
<div class="screenlet-title-bar">
<ul>
<li class="h3">${uiLabelMap.AccountingCurrentBankReconciliation}</li>
@@ -43,7 +43,7 @@ under the License.
<#if currentGlReconciliation.statusId?exists>
<tr>
<td><span class="label">${uiLabelMap.CommonStatus}</span></td>
- <#assign currentStatus = currentGlReconciliation.getRelatedOneCache("StatusItem")>
+ <#assign currentStatus = currentGlReconciliation.getRelatedOneCache("StatusItem")>
<td>${currentStatus.description?if_exists}</td>
</tr>
</#if>
@@ -71,7 +71,7 @@ under the License.
</#if>
</div>
</div>
- <div class="screenlet">
+ <div class="screenlet">
<div class="screenlet-title-bar">
<ul>
<li class="h3">${uiLabelMap.AccountingPreviousBankReconciliation}</li>
@@ -88,7 +88,7 @@ under the License.
<#if previousGlReconciliation.statusId?exists>
<tr>
<td><span class="label">${uiLabelMap.CommonStatus}</span></td>
- <#assign previousStatus = previousGlReconciliation.getRelatedOneCache("StatusItem")>
+ <#assign previousStatus = previousGlReconciliation.getRelatedOneCache("StatusItem")>
<td>${previousStatus.description?if_exists}</td>
</tr>
</#if>
@@ -116,7 +116,7 @@ under the License.
</#if>
</div>
</div>
- <div class="screenlet">
+ <div class="screenlet">
<div class="screenlet-title-bar">
<ul>
<li class="h3">${uiLabelMap.AccountingFinAcctTransAssociatedToGlReconciliation}</li>
Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl?rev=1044245&r1=1044244&r2=1044245&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl (original)
+++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl Fri Dec 10 09:14:36 2010
@@ -86,7 +86,7 @@ under the License.
<#list acctgTransList as acctgTrans>
<fo:table-row>
<fo:table-cell border="1pt solid" border-width=".1mm">
- <fo:block text-align="center" font-size="5pt">${(acctgTrans.acctgTransId)!}</fo:block>
+ <fo:block text-align="center" font-size="5pt">${(acctgTrans.acctgTransId)!}</fo:block>
</fo:table-cell>
<fo:table-cell border="1pt solid" border-width=".1mm">
<fo:block text-align="center" font-size="5pt">
@@ -101,7 +101,7 @@ under the License.
<#assign acctgTransType = (delegator.findOne("AcctgTransType", {"acctgTransTypeId" : (acctgTrans.acctgTransTypeId)!}, false))!/>
<#if acctgTransType?has_content>${acctgTransType.description}</#if>
</#if>
- </fo:block>
+ </fo:block>
</fo:table-cell>
<fo:table-cell border="1pt solid" border-width=".1mm">
<fo:block text-align="center" font-size="5pt">
@@ -114,7 +114,7 @@ under the License.
<fo:table-cell border="1pt solid" border-width=".1mm">
<fo:block text-align="center" font-size="5pt">
${(acctgTrans.invoiceId)!}
- </fo:block>
+ </fo:block>
</fo:table-cell>
<fo:table-cell border="1pt solid" border-width=".1mm">
<fo:block text-align="center" font-size="5pt">
@@ -122,22 +122,22 @@ under the License.
<#assign paymentType = (delegator.findOne("Payment", {"paymentId" : (acctgTrans.paymentId)!}, false)).getRelatedOne("PaymentType")/>
${(acctgTrans.paymentId)!}<#if (paymentType?has_content)> -(${(paymentType.description)!})</#if>
</#if>
- </fo:block>
+ </fo:block>
</fo:table-cell>
<fo:table-cell border="1pt solid" border-width=".1mm">
<fo:block text-align="center" font-size="5pt">
${(acctgTrans.workEffortId)!}
- </fo:block>
+ </fo:block>
</fo:table-cell>
<fo:table-cell border="1pt solid" border-width=".1mm">
<fo:block text-align="center" font-size="5pt">
${(acctgTrans.shipmentId)!}
- </fo:block>
+ </fo:block>
</fo:table-cell>
<fo:table-cell border="1pt solid" border-width=".1mm">
<fo:block text-align="center" font-size="5pt">
${(acctgTrans.isPosted)!}
- </fo:block>
+ </fo:block>
</fo:table-cell>
<fo:table-cell border="1pt solid" border-width=".1mm">
<fo:block text-align="center" font-size="5pt">
Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java?rev=1044245&r1=1044244&r2=1044245&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java (original)
+++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java Fri Dec 10 09:14:36 2010
@@ -57,16 +57,26 @@ public class CheckPermissionTransform im
public static final String [] removeKeyNames = {};
/**
+ * @deprecated use FreeMarkerWorker.getWrappedObject()
* A wrapper for the FreeMarkerWorker version.
*/
+ @Deprecated
public static Object getWrappedObject(String varName, Environment env) {
return FreeMarkerWorker.getWrappedObject(varName, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Environment env) {
return FreeMarkerWorker.getArg(args, key, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Map ctx) {
return FreeMarkerWorker.getArg(args, key, ctx);
}
@@ -77,9 +87,9 @@ public class CheckPermissionTransform im
final Environment env = Environment.getCurrentEnvironment();
final Map templateCtx = FreeMarkerWorker.createEnvironmentMap(env);
//FreeMarkerWorker.convertContext(templateCtx);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
- final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env);
- final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
+ final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env);
+ final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env);
FreeMarkerWorker.getSiteParameters(request, templateCtx);
FreeMarkerWorker.overrideWithArgs(templateCtx, args);
final String mode = (String)templateCtx.get("mode");
Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java?rev=1044245&r1=1044244&r2=1044245&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java (original)
+++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java Fri Dec 10 09:14:36 2010
@@ -55,16 +55,26 @@ public class EditRenderSubContentCacheTr
public static final String [] saveKeyNames = {"contentId", "subContentId", "subDataResourceTypeId", "mimeTypeId", "whenMap", "locale", "wrapTemplateId", "encloseWrapText", "nullThruDatesOnly"};
/**
+ * @deprecated use FreeMarkerWorker.getWrappedObject()
* A wrapper for the FreeMarkerWorker version.
*/
+ @Deprecated
public static Object getWrappedObject(String varName, Environment env) {
return FreeMarkerWorker.getWrappedObject(varName, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Environment env) {
return FreeMarkerWorker.getArg(args, key, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Map ctx) {
return FreeMarkerWorker.getArg(args, key, ctx);
}
@@ -72,13 +82,13 @@ public class EditRenderSubContentCacheTr
public Writer getWriter(final Writer out, Map args) {
final StringBuilder buf = new StringBuilder();
final Environment env = Environment.getCurrentEnvironment();
- final Map templateCtx = (Map) FreeMarkerWorker.getWrappedObject("context", env);
- final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
- final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env);
+ final Map templateCtx = FreeMarkerWorker.getWrappedObject("context", env);
+ final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
+ final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env);
FreeMarkerWorker.getSiteParameters(request, templateCtx);
FreeMarkerWorker.overrideWithArgs(templateCtx, args);
- final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env);
+ final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env);
List trail = (List)templateCtx.get("globalNodeTrail");
String contentAssocPredicateId = (String)templateCtx.get("contentAssocPredicateId");
String strNullThruDatesOnly = (String)templateCtx.get("nullThruDatesOnly");
Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java?rev=1044245&r1=1044244&r2=1044245&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java (original)
+++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java Fri Dec 10 09:14:36 2010
@@ -50,16 +50,26 @@ public class EditRenderSubContentTransfo
public static final String module = EditRenderSubContentTransform.class.getName();
/**
+ * @deprecated use FreeMarkerWorker.getWrappedObject()
* A wrapper for the FreeMarkerWorker version.
*/
+ @Deprecated
public static Object getWrappedObject(String varName, Environment env) {
return FreeMarkerWorker.getWrappedObject(varName, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Environment env) {
return FreeMarkerWorker.getArg(args, key, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Map ctx) {
return FreeMarkerWorker.getArg(args, key, ctx);
}
@@ -67,26 +77,26 @@ public class EditRenderSubContentTransfo
public Writer getWriter(final Writer out, Map args) {
final StringBuilder buf = new StringBuilder();
final Environment env = Environment.getCurrentEnvironment();
- Map ctx = (Map) FreeMarkerWorker.getWrappedObject("context", env);
- final String editTemplate = getArg(args, "editTemplate", ctx);
- final String wrapTemplateId = getArg(args, "wrapTemplateId", ctx);
- final String mapKey = getArg(args, "mapKey", ctx);
- final String templateContentId = getArg(args, "templateContentId", ctx);
- final String subContentId = getArg(args, "subContentId", ctx);
- String subDataResourceTypeIdTemp = getArg(args, "subDataResourceTypeId", ctx);
- final String contentId = getArg(args, "contentId", ctx);
-
-
- final Locale locale = (Locale) FreeMarkerWorker.getWrappedObject("locale", env);
- String mimeTypeIdTemp = getArg(args, "mimeTypeId", ctx);
- final String rootDir = getArg(args, "rootDir", ctx);
- final String webSiteId = getArg(args, "webSiteId", ctx);
- final String https = getArg(args, "https", ctx);
- final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
- final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env);
- GenericValue subContentDataResourceViewTemp = (GenericValue) FreeMarkerWorker.getWrappedObject("subContentDataResourceView", env);
- //final HttpServletRequest request = (HttpServletRequest)FreeMarkerWorker.getWrappedObject("request", env);
+ Map ctx = FreeMarkerWorker.getWrappedObject("context", env);
+ final String editTemplate = FreeMarkerWorker.getArg(args, "editTemplate", ctx);
+ final String wrapTemplateId = FreeMarkerWorker.getArg(args, "wrapTemplateId", ctx);
+ final String mapKey = FreeMarkerWorker.getArg(args, "mapKey", ctx);
+ final String templateContentId = FreeMarkerWorker.getArg(args, "templateContentId", ctx);
+ final String subContentId = FreeMarkerWorker.getArg(args, "subContentId", ctx);
+ String subDataResourceTypeIdTemp = FreeMarkerWorker.getArg(args, "subDataResourceTypeId", ctx);
+ final String contentId = FreeMarkerWorker.getArg(args, "contentId", ctx);
+
+
+ final Locale locale = FreeMarkerWorker.getWrappedObject("locale", env);
+ String mimeTypeIdTemp = FreeMarkerWorker.getArg(args, "mimeTypeId", ctx);
+ final String rootDir = FreeMarkerWorker.getArg(args, "rootDir", ctx);
+ final String webSiteId = FreeMarkerWorker.getArg(args, "webSiteId", ctx);
+ final String https = FreeMarkerWorker.getArg(args, "https", ctx);
+ final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
+ final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env);
+ GenericValue subContentDataResourceViewTemp = FreeMarkerWorker.getWrappedObject("subContentDataResourceView", env);
+ //final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env);
ctx.put("mapKey", mapKey);
ctx.put("subDataResourceTypeIdTemp", subDataResourceTypeIdTemp);
@@ -203,7 +213,7 @@ public class EditRenderSubContentTransfo
throw new IOException("Error rendering content" + e2.toString());
}
- Map ctx = (Map) FreeMarkerWorker.getWrappedObject("context", env);
+ Map ctx = FreeMarkerWorker.getWrappedObject("context", env);
templateContext.put("contentId", contentId);
templateContext.put("locale", locale);
templateContext.put("mapKey", null);
Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java?rev=1044245&r1=1044244&r2=1044245&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java (original)
+++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java Fri Dec 10 09:14:36 2010
@@ -50,16 +50,26 @@ public class InjectNodeTrailCsvTransform
public static final String [] removeKeyNames = {"nodeTrailCsv"};
/**
+ * @deprecated use FreeMarkerWorker.getWrappedObject()
* A wrapper for the FreeMarkerWorker version.
*/
+ @Deprecated
public static Object getWrappedObject(String varName, Environment env) {
return FreeMarkerWorker.getWrappedObject(varName, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Environment env) {
return FreeMarkerWorker.getArg(args, key, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Map ctx) {
return FreeMarkerWorker.getArg(args, key, ctx);
}
@@ -68,11 +78,11 @@ public class InjectNodeTrailCsvTransform
public Writer getWriter(final Writer out, Map args) {
final StringBuilder buf = new StringBuilder();
final Environment env = Environment.getCurrentEnvironment();
- final Map templateCtx = (Map) FreeMarkerWorker.getWrappedObject("context", env);
+ final Map templateCtx = FreeMarkerWorker.getWrappedObject("context", env);
//FreeMarkerWorker.convertContext(templateCtx);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
- final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env);
- final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
+ final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env);
+ final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env);
FreeMarkerWorker.getSiteParameters(request, templateCtx);
FreeMarkerWorker.overrideWithArgs(templateCtx, args);
Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java?rev=1044245&r1=1044244&r2=1044245&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java (original)
+++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java Fri Dec 10 09:14:36 2010
@@ -60,16 +60,26 @@ public class LimitedSubContentCacheTrans
public static final String [] saveKeyNames = {"contentId", "subContentId", "entityList", "entityIndex", "subDataResourceTypeId", "mimeTypeId", "whenMap", "locale", "entityList", "viewSize", "viewIndex", "highIndex", "lowIndex", "listSize", "wrapTemplateId", "encloseWrapText", "nullThruDatesOnly", "globalNodeTrail", "outputIndex"};
/**
+ * @deprecated use FreeMarkerWorker.getWrappedObject()
* A wrapper for the FreeMarkerWorker version.
*/
+ @Deprecated
public static Object getWrappedObject(String varName, Environment env) {
return FreeMarkerWorker.getWrappedObject(varName, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Environment env) {
return FreeMarkerWorker.getArg(args, key, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Map ctx) {
return FreeMarkerWorker.getArg(args, key, ctx);
}
@@ -80,8 +90,8 @@ public class LimitedSubContentCacheTrans
final StringBuilder buf = new StringBuilder();
final Environment env = Environment.getCurrentEnvironment();
final Map templateRoot = FreeMarkerWorker.createEnvironmentMap(env);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
- final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
+ final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env);
FreeMarkerWorker.getSiteParameters(request, templateRoot);
final Map savedValuesUp = FastMap.newInstance();
FreeMarkerWorker.saveContextValues(templateRoot, upSaveKeyNames, savedValuesUp);
@@ -125,7 +135,7 @@ public class LimitedSubContentCacheTrans
final int returnLimit = Integer.parseInt(limitSize);
// limitMode will be "random" to begin with
String limitMode = (String) templateRoot.get("limitMode");
- final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env);
+ final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env);
List globalNodeTrail = (List) templateRoot.get("globalNodeTrail");
String strNullThruDatesOnly = (String) templateRoot.get("nullThruDatesOnly");
String orderBy = (String) templateRoot.get("orderBy");
Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java?rev=1044245&r1=1044244&r2=1044245&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java (original)
+++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java Fri Dec 10 09:14:36 2010
@@ -55,16 +55,26 @@ public class LoopSubContentTransform imp
public static final String[] removeKeyNames = {"wrapTemplateId", "entityList", "entityIndex", "textData", "dataResourceId","drDataResourceId", "subContentIdSub", "parentContent", "wrappedFTL"};
/**
+ * @deprecated use FreeMarkerWorker.getWrappedObject()
* A wrapper for the FreeMarkerWorker version.
*/
+ @Deprecated
public static Object getWrappedObject(String varName, Environment env) {
return FreeMarkerWorker.getWrappedObject(varName, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Environment env) {
return FreeMarkerWorker.getArg(args, key, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Map ctx) {
return FreeMarkerWorker.getArg(args, key, ctx);
}
@@ -138,9 +148,9 @@ public class LoopSubContentTransform imp
public Writer getWriter(final Writer out, Map args) {
final StringBuilder buf = new StringBuilder();
final Environment env = Environment.getCurrentEnvironment();
- final Map templateCtx = (Map) FreeMarkerWorker.getWrappedObject("context", env);
- final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
+ final Map templateCtx = FreeMarkerWorker.getWrappedObject("context", env);
+ final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
final Map savedValues = FreeMarkerWorker.saveValues(templateCtx, saveKeyNames);
FreeMarkerWorker.overrideWithArgs(templateCtx, args);
Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java?rev=1044245&r1=1044244&r2=1044245&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java (original)
+++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java Fri Dec 10 09:14:36 2010
@@ -54,10 +54,10 @@ public class RenderContentAndSubContent
public Writer getWriter(final Writer out, Map args) {
final Environment env = Environment.getCurrentEnvironment();
- final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
- final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env);
- final HttpServletResponse response = (HttpServletResponse) FreeMarkerWorker.getWrappedObject("response", env);
+ final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
+ final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env);
+ final HttpServletResponse response = FreeMarkerWorker.getWrappedObject("response", env);
final Map envMap = FreeMarkerWorker.createEnvironmentMap(env);
final Map templateRoot = MapStack.create();
((MapStack)templateRoot).push(envMap);
Propchange: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java?rev=1044245&r1=1044244&r2=1044245&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java (original)
+++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java Fri Dec 10 09:14:36 2010
@@ -58,12 +58,12 @@ public class RenderContentAsText impleme
public Writer getWriter(final Writer out, Map args) {
final Environment env = Environment.getCurrentEnvironment();
- //final Map templateCtx = (Map) FreeMarkerWorker.getWrappedObject("context", env);
+ //final Map templateCtx = FreeMarkerWorker.getWrappedObject("context", env);
//final Map templateCtx = FastMap.newInstance();
- final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
- final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env);
- final HttpServletResponse response = (HttpServletResponse) FreeMarkerWorker.getWrappedObject("response", env);
+ final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
+ final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env);
+ final HttpServletResponse response = FreeMarkerWorker.getWrappedObject("response", env);
final Map templateRoot = FreeMarkerWorker.createEnvironmentMap(env);
if (Debug.verboseOn()) Debug.logVerbose("in RenderSubContent, contentId(0):" + templateRoot.get("contentId"), module);
FreeMarkerWorker.getSiteParameters(request, templateRoot);
@@ -71,7 +71,7 @@ public class RenderContentAsText impleme
FreeMarkerWorker.saveContextValues(templateRoot, upSaveKeyNames, savedValuesUp);
FreeMarkerWorker.overrideWithArgs(templateRoot, args);
if (Debug.verboseOn()) Debug.logVerbose("in RenderSubContent, contentId(2):" + templateRoot.get("contentId"), module);
- // not used yet: final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env);
+ // not used yet: final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env);
// not used yet: List trail = (List)templateRoot.get("globalNodeTrail");
//if (Debug.infoOn()) Debug.logInfo("in Render(0), globalNodeTrail ." + trail , module);
// not used yet: String contentAssocPredicateId = (String)templateRoot.get("contentAssocPredicateId");
Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java?rev=1044245&r1=1044244&r2=1044245&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java (original)
+++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java Fri Dec 10 09:14:36 2010
@@ -54,10 +54,10 @@ public class RenderContentTransform impl
public Writer getWriter(final Writer out, Map args) {
final Environment env = Environment.getCurrentEnvironment();
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
- final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env);
- final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env);
- final HttpServletResponse response = (HttpServletResponse) FreeMarkerWorker.getWrappedObject("response", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
+ final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env);
+ final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env);
+ final HttpServletResponse response = FreeMarkerWorker.getWrappedObject("response", env);
final Map templateRoot = MapStack.create(FreeMarkerWorker.createEnvironmentMap(env));
((MapStack)templateRoot).push(args);
Propchange: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java?rev=1044245&r1=1044244&r2=1044245&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java (original)
+++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java Fri Dec 10 09:14:36 2010
@@ -58,12 +58,12 @@ public class RenderSubContentAsText impl
public Writer getWriter(final Writer out, Map args) {
final Environment env = Environment.getCurrentEnvironment();
- //final Map templateCtx = (Map) FreeMarkerWorker.getWrappedObject("context", env);
+ //final Map templateCtx = FreeMarkerWorker.getWrappedObject("context", env);
//final Map templateCtx = FastMap.newInstance();
- final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
- final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env);
- final HttpServletResponse response = (HttpServletResponse) FreeMarkerWorker.getWrappedObject("response", env);
+ final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
+ final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env);
+ final HttpServletResponse response = FreeMarkerWorker.getWrappedObject("response", env);
final Map templateRoot = FreeMarkerWorker.createEnvironmentMap(env);
if (Debug.infoOn()) Debug.logInfo("in RenderSubContent, contentId(0):" + templateRoot.get("contentId"), module);
FreeMarkerWorker.getSiteParameters(request, templateRoot);
@@ -71,7 +71,7 @@ public class RenderSubContentAsText impl
FreeMarkerWorker.saveContextValues(templateRoot, upSaveKeyNames, savedValuesUp);
FreeMarkerWorker.overrideWithArgs(templateRoot, args);
if (Debug.infoOn()) Debug.logInfo("in RenderSubContent, contentId(2):" + templateRoot.get("contentId"), module);
- //final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env);
+ //final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env);
//List trail = (List)templateRoot.get("globalNodeTrail");
//if (Debug.infoOn()) Debug.logInfo("in Render(0), globalNodeTrail ." + trail , module);
//String contentAssocPredicateId = (String)templateRoot.get("contentAssocPredicateId");
Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java?rev=1044245&r1=1044244&r2=1044245&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java (original)
+++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java Fri Dec 10 09:14:36 2010
@@ -60,12 +60,12 @@ public class RenderSubContentCacheTransf
public Writer getWriter(final Writer out, Map args) {
final StringBuilder buf = new StringBuilder();
final Environment env = Environment.getCurrentEnvironment();
- //final Map templateCtx = (Map) FreeMarkerWorker.getWrappedObject("context", env);
+ //final Map templateCtx = FreeMarkerWorker.getWrappedObject("context", env);
//final Map templateCtx = FastMap.newInstance();
- final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
- final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env);
- final HttpServletResponse response = (HttpServletResponse) FreeMarkerWorker.getWrappedObject("response", env);
+ final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
+ final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env);
+ final HttpServletResponse response = FreeMarkerWorker.getWrappedObject("response", env);
final Map templateRoot = FreeMarkerWorker.createEnvironmentMap(env);
//if (Debug.infoOn()) Debug.logInfo("in RenderSubContent, contentId(0):" + templateRoot.get("contentId"), module);
FreeMarkerWorker.getSiteParameters(request, templateRoot);
@@ -73,7 +73,7 @@ public class RenderSubContentCacheTransf
FreeMarkerWorker.saveContextValues(templateRoot, upSaveKeyNames, savedValuesUp);
FreeMarkerWorker.overrideWithArgs(templateRoot, args);
//if (Debug.infoOn()) Debug.logInfo("in RenderSubContent, contentId(2):" + templateRoot.get("contentId"), module);
- final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env);
+ final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env);
List trail = (List)templateRoot.get("globalNodeTrail");
//if (Debug.infoOn()) Debug.logInfo("in Render(0), globalNodeTrail ." + trail , module);
String contentAssocPredicateId = (String)templateRoot.get("contentAssocPredicateId");
Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java?rev=1044245&r1=1044244&r2=1044245&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java (original)
+++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java Fri Dec 10 09:14:36 2010
@@ -52,16 +52,22 @@ public class RenderSubContentTransform i
public static final String module = RenderSubContentTransform.class.getName();
/**
+ * @deprecated use FreeMarkerWorker.getArg()
* Does a conditional search to return a value for a parameter with the passed name. Looks first to see if it was passed as an argument to the transform.
* Secondly, it looks to see if it is passed as a parameter in the template context object.
* <p/>
* Note that this is different from the getArg method of EditRenderDataResourceTransform, which checks the request object instead of the template context
* object.
*/
+ @Deprecated
public static String getArg(Map args, String key, Environment env) {
return FreeMarkerWorker.getArg(args, key, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Map ctx) {
return FreeMarkerWorker.getArg(args, key, ctx);
}
@@ -69,22 +75,22 @@ public class RenderSubContentTransform i
public Writer getWriter(final Writer out, Map args) {
//final StringBuilder buf = new StringBuilder();
final Environment env = Environment.getCurrentEnvironment();
- Map ctx = (Map) FreeMarkerWorker.getWrappedObject("context", env);
+ Map ctx = FreeMarkerWorker.getWrappedObject("context", env);
if (ctx == null) {
ctx = FastMap.newInstance();
}
- final String mapKey = getArg(args, "mapKey", ctx);
- final String subContentId = getArg(args, "subContentId", ctx);
- final String subDataResourceTypeId = getArg(args, "subDataResourceTypeId", ctx);
- final String contentId = getArg(args, "contentId", ctx);
- final String mimeTypeId = getArg(args, "mimeTypeId", ctx);
- final String throwExceptionOnError = getArg(args, "throwExceptionOnError", ctx);
- final Locale locale = (Locale) FreeMarkerWorker.getWrappedObject("locale", env);
- final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env);
- final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
- final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env);
- GenericValue subContentDataResourceViewTemp = (GenericValue) FreeMarkerWorker.getWrappedObject("subContentDataResourceView", env);
+ final String mapKey = FreeMarkerWorker.getArg(args, "mapKey", ctx);
+ final String subContentId = FreeMarkerWorker.getArg(args, "subContentId", ctx);
+ final String subDataResourceTypeId = FreeMarkerWorker.getArg(args, "subDataResourceTypeId", ctx);
+ final String contentId = FreeMarkerWorker.getArg(args, "contentId", ctx);
+ final String mimeTypeId = FreeMarkerWorker.getArg(args, "mimeTypeId", ctx);
+ final String throwExceptionOnError = FreeMarkerWorker.getArg(args, "throwExceptionOnError", ctx);
+ final Locale locale = FreeMarkerWorker.getWrappedObject("locale", env);
+ final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env);
+ final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
+ final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env);
+ GenericValue subContentDataResourceViewTemp = FreeMarkerWorker.getWrappedObject("subContentDataResourceView", env);
if (subContentDataResourceViewTemp == null) {
List assocTypes = UtilMisc.toList("SUB_CONTENT");
Timestamp fromDate = UtilDateTime.nowTimestamp();
@@ -150,7 +156,7 @@ public class RenderSubContentTransform i
throw new IOException("Error rendering content" + e.toString());
}
- //Map resultCtx = (Map) FreeMarkerWorker.getWrappedObject("context", env);
+ //Map resultCtx = FreeMarkerWorker.getWrappedObject("context", env);
templateContext.put("mapKey", null);
templateContext.put("subContentId", null);
templateContext.put("subDataResourceTypeId", null);
Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java?rev=1044245&r1=1044244&r2=1044245&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java (original)
+++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java Fri Dec 10 09:14:36 2010
@@ -54,16 +54,26 @@ public class TraverseSubContentCacheTran
public static final String [] saveKeyNames = {"contentId", "subContentId", "subDataResourceTypeId", "mimeTypeId", "whenMap", "locale", "wrapTemplateId", "encloseWrapText", "nullThruDatesOnly", "globalNodeTrail"};
/**
+ * @deprecated use FreeMarkerWorker.getWrappedObject()
* A wrapper for the FreeMarkerWorker version.
*/
+ @Deprecated
public static Object getWrappedObject(String varName, Environment env) {
return FreeMarkerWorker.getWrappedObject(varName, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Environment env) {
return FreeMarkerWorker.getArg(args, key, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Map ctx) {
return FreeMarkerWorker.getArg(args, key, ctx);
}
@@ -71,7 +81,7 @@ public class TraverseSubContentCacheTran
public Writer getWriter(final Writer out, Map args) {
final StringBuilder buf = new StringBuilder();
final Environment env = Environment.getCurrentEnvironment();
- //final Map templateRoot = (Map) FreeMarkerWorker.getWrappedObject("context", env);
+ //final Map templateRoot = FreeMarkerWorker.getWrappedObject("context", env);
final Map templateRoot = FreeMarkerWorker.createEnvironmentMap(env);
//FreeMarkerWorker.convertContext(templateRoot);
final Map savedValuesUp = FastMap.newInstance();
@@ -80,10 +90,10 @@ public class TraverseSubContentCacheTran
FreeMarkerWorker.overrideWithArgs(templateRoot, args);
String startContentAssocTypeId = (String)templateRoot.get("contentAssocTypeId");
//if (Debug.infoOn()) Debug.logInfo("in TraverseSubContentCache, startContentAssocTypeId:" + startContentAssocTypeId, module);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
- final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
+ final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env);
FreeMarkerWorker.getSiteParameters(request, templateRoot);
- final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env);
+ final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env);
Object obj = templateRoot.get("globalNodeTrail");
List globalNodeTrail = (List)obj;
//List globalNodeTrail = (List)templateRoot.get("globalNodeTrail");
Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java?rev=1044245&r1=1044244&r2=1044245&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java (original)
+++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java Fri Dec 10 09:14:36 2010
@@ -56,16 +56,26 @@ public class TraverseSubContentTransform
public static final String [] removeKeyNames = {"templateContentId", "subDataResourceTypeId", "mapKey", "wrappedFTL", "nodeTrail"};
/**
+ * @deprecated use FreeMarkerWorker.getWrappedObject()
* A wrapper for the FreeMarkerWorker version.
*/
+ @Deprecated
public static Object getWrappedObject(String varName, Environment env) {
return FreeMarkerWorker.getWrappedObject(varName, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Environment env) {
return FreeMarkerWorker.getArg(args, key, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Map ctx) {
return FreeMarkerWorker.getArg(args, key, ctx);
}
@@ -73,34 +83,34 @@ public class TraverseSubContentTransform
public Writer getWriter(final Writer out, Map args) {
final StringBuilder buf = new StringBuilder();
final Environment env = Environment.getCurrentEnvironment();
- final Map templateCtx = (Map) FreeMarkerWorker.getWrappedObject("context", env);
+ final Map templateCtx = FreeMarkerWorker.getWrappedObject("context", env);
//FreeMarkerWorker.convertContext(templateCtx);
final Map savedValues = FreeMarkerWorker.saveValues(templateCtx, saveKeyNames);
FreeMarkerWorker.overrideWithArgs(templateCtx, args);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
/*
- final String editTemplate = getArg(args, "editTemplate", ctx);
- final String wrapTemplateId = getArg(args, "wrapTemplateId", ctx);
- //final String mapKey = getArg(args, "mapKey", ctx);
- final String templateContentId = getArg(args, "templateContentId", ctx);
- final String subDataResourceTypeId = getArg(args, "subDataResourceTypeId", ctx);
- final String contentId = getArg(args, "contentId", ctx);
- final String subContentId = getArg(args, "subContentId", ctx);
- final String rootDir = getArg(args, "rootDir", ctx);
- final String webSiteId = getArg(args, "webSiteId", ctx);
- final String https = getArg(args, "https", ctx);
- final String viewSize = getArg(args, "viewSize", ctx);
- final String viewIndex = getArg(args, "viewIndex", ctx);
- final String listSize = getArg(args, "listSize", ctx);
- final String highIndex = getArg(args, "highIndex", ctx);
- final String lowIndex = getArg(args, "lowIndex", ctx);
- final String queryString = getArg(args, "queryString", ctx);
- final Locale locale = (Locale) FreeMarkerWorker.getWrappedObject("locale", env);
- final String mimeTypeId = getArg(args, "mimeTypeId", ctx);
+ final String editTemplate = FreeMarkerWorker.getArg(args, "editTemplate", ctx);
+ final String wrapTemplateId = FreeMarkerWorker.getArg(args, "wrapTemplateId", ctx);
+ //final String mapKey = FreeMarkerWorker.getArg(args, "mapKey", ctx);
+ final String templateContentId = FreeMarkerWorker.getArg(args, "templateContentId", ctx);
+ final String subDataResourceTypeId = FreeMarkerWorker.getArg(args, "subDataResourceTypeId", ctx);
+ final String contentId = FreeMarkerWorker.getArg(args, "contentId", ctx);
+ final String subContentId = FreeMarkerWorker.getArg(args, "subContentId", ctx);
+ final String rootDir = FreeMarkerWorker.getArg(args, "rootDir", ctx);
+ final String webSiteId = FreeMarkerWorker.getArg(args, "webSiteId", ctx);
+ final String https = FreeMarkerWorker.getArg(args, "https", ctx);
+ final String viewSize = FreeMarkerWorker.getArg(args, "viewSize", ctx);
+ final String viewIndex = FreeMarkerWorker.getArg(args, "viewIndex", ctx);
+ final String listSize = FreeMarkerWorker.getArg(args, "listSize", ctx);
+ final String highIndex = FreeMarkerWorker.getArg(args, "highIndex", ctx);
+ final String lowIndex = FreeMarkerWorker.getArg(args, "lowIndex", ctx);
+ final String queryString = FreeMarkerWorker.getArg(args, "queryString", ctx);
+ final Locale locale = FreeMarkerWorker.getWrappedObject("locale", env);
+ final String mimeTypeId = FreeMarkerWorker.getArg(args, "mimeTypeId", ctx);
*/
- final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env);
- //final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env);
- GenericValue view = (GenericValue) FreeMarkerWorker.getWrappedObject("subContentDataResourceView", env);
+ final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env);
+ //final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env);
+ GenericValue view = FreeMarkerWorker.getWrappedObject("subContentDataResourceView", env);
final Integer indent = (templateCtx.get("indent") == null) ? Integer.valueOf(0) : (Integer)templateCtx.get("indent");
String contentId = (String)templateCtx.get("contentId");
@@ -262,7 +272,7 @@ public class TraverseSubContentTransform
throw new IOException("Error rendering content" + e.toString());
}
/*
- Map resultsCtx = (Map) FreeMarkerWorker.getWrappedObject("context", env);
+ Map resultsCtx = FreeMarkerWorker.getWrappedObject("context", env);
templateContext.put("contentId", contentId);
templateContext.put("locale", locale);
templateContext.put("mapKey", null);