svn commit: r791212 [1/8] - in /ofbiz/trunk: ./ applications/accounting/src/or
Locked
svn commit: r791212 [1/8] - in /ofbiz/trunk: ./ applications/accounting/src/or
 
|
Author: lektran
Date: Sun Jul 5 10:01:19 2009 New Revision: 791212 URL: http://svn.apache.org/viewvc?rev=791212&view=rev Log: Sorry for the big commit, got a bit carried away. Added override and deprecated annotations wherever they were missing Removed the use of any deprecated classes/methods (except OutputFormat in UtilXml) A few other random generics and misc. cleanups Modified: ofbiz/trunk/.classpath ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/test/FinAccountTests.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCServicesTest.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeApi.java ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java ofbiz/trunk/applications/content/src/ControlApplet.java ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java ofbiz/trunk/applications/content/src/org/ofbiz/content/search/ContentDocument.java ofbiz/trunk/applications/content/src/org/ofbiz/content/search/DataResourceDocument.java ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchWorker.java ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java ofbiz/trunk/applications/order/src/org/ofbiz/order/test/PurchaseOrderTest.java ofbiz/trunk/applications/order/src/org/ofbiz/order/test/SalesOrderTest.java ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyWorker.java ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryWorker.java ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java ofbiz/trunk/applications/product/src/org/ofbiz/product/test/InventoryItemTransferTest.java ofbiz/trunk/applications/product/src/org/ofbiz/product/test/StockMovesTest.java ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsMockApiServlet.java ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/project/ProjectWorker.java ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java ofbiz/trunk/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentResourceHandler.java ofbiz/trunk/framework/base/src/org/ofbiz/base/config/ClasspathLoader.java ofbiz/trunk/framework/base/src/org/ofbiz/base/config/FileLoader.java ofbiz/trunk/framework/base/src/org/ofbiz/base/config/MainResourceHandler.java ofbiz/trunk/framework/base/src/org/ofbiz/base/config/UrlLoader.java ofbiz/trunk/framework/base/src/org/ofbiz/base/splash/SplashScreen.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/CachedClassLoader.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/DateRange.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GeneralException.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GeneralRuntimeException.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Log4jLoggerWriter.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MessageString.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectInputStream.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/OfbizBshBsfEngine.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/OutputStreamByteCount.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/StringUtil.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/TimeDuration.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilParse.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheSoftReference.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/HardRefCacheLine.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/SoftRefCacheLine.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleServletAccessor.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/LRUMap.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/LifoSet.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapComparator.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapStack.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/JuelConnector.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/UelFunctions.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/UelUtil.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/SSLImpl.java ofbiz/trunk/framework/common/src/org/ofbiz/common/authentication/AuthHelper.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericPK.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValue.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValueHtmlWrapper.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/cache/EntityObjectCache.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityClause.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityComparisonOperator.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionBase.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionList.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionParam.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionValue.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityWhereString.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/OrderByItem.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/OrderByList.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/SQLProcessor.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelField.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelIndex.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelInfo.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelKeyMap.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelRelation.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/DebugXaResource.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/GenericXaResource.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/ByteWrapper.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaCondition.java ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleServiceEngine.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ContextAccessor.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/FieldObject.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/FieldString.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/StringObject.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/StringString.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/AddError.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallBsh.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallClassMethod.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallObjectMethod.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallServiceAsynch.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMethod.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CheckErrors.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CreateObject.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/Return.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/Assert.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CombinedCondition.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareCondition.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareFieldCondition.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/EmptyCondition.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/HasPermissionCondition.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/MasterIf.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ValidateMethodCondition.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/While.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearEntityCaches.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CloneValue.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityOne.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByAnd.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByDate.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelated.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeNextSeqId.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeValue.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowDateToEnv.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowTimestampToEnv.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/OrderValueList.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SequencedIdToEnv.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetNonpkFields.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetPkFields.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionBegin.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionCommit.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionRollback.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ClearField.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/EnvToEnv.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/EnvToField.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToEnv.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToField.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToList.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FirstFromList.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ListToList.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Loop.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/MapToMap.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/OrderMapList.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/SetCalendar.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringAppend.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToField.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToList.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ToString.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToRequest.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToSession.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestParametersToList.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestToField.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/SessionToField.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/WebappPropertyToField.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckId.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompare.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompareField.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfEmpty.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfHasPermission.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfInstanceOf.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfNotEmpty.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfRegexp.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfValidateMethod.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Calculate.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Log.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/PropertyToField.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/serviceops/FieldToResult.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/BaseCompare.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Compare.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/CompareField.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/ConstantOper.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Convert.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Copy.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/InFieldOper.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/NotEmpty.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/PropertyOper.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Regexp.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/ValidateMethod.java ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java ofbiz/trunk/framework/service/src/org/ofbiz/service/LocalDispatcher.java ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelParam.java ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceIface.java ofbiz/trunk/framework/service/src/org/ofbiz/service/RunningService.java ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceValidationException.java ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceXaWrapper.java ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressions.java ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaCondition.java ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/BSFEngine.java ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/BeanShellEngine.java ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericAsyncEngine.java ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/HttpEngine.java ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/StandardJavaEngine.java ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupModel.java ofbiz/trunk/framework/service/src/org/ofbiz/service/group/GroupServiceModel.java ofbiz/trunk/framework/service/src/org/ofbiz/service/group/ServiceGroupEngine.java ofbiz/trunk/framework/service/src/org/ofbiz/service/job/GenericServiceJob.java ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java ofbiz/trunk/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceEngine.java ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java ofbiz/trunk/framework/service/src/org/ofbiz/service/test/ServiceEngineTests.java ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Classpath.java ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Start.java ofbiz/trunk/framework/start/src/org/ofbiz/base/start/StartupException.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/JythonTest.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ServiceTest.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/SimpleMethodTest.java ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONSimpleEventHandler.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/LoopWriter.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizAmountTransform.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizContentTransform.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCurrencyTransform.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizUrlTransform.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/RenderWrappedTextTransform.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Content.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Region.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RegionTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/RenderTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/region/Section.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/AbstractParameterTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ContentUrlTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/EntityFieldTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/FormatTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/I18nBundleTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/I18nMessageTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IfTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/InputValueTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTEI.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorHasNextTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTEI.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTEI.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ParamTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/PrintTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ServiceTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/UnlessTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/UrlTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopFactory.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavServlet.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/xmlrpc/AliasSupportedTransportFactory.java ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/StatsUpdater.java ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerBSFServiceEngine.java ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerCatalinaContainer.java ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerServerEngine.java ofbiz/trunk/framework/webslinger/websites/webslinger/www/WEB-INF/web.xml ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoBase.java ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ControllerViewArtifactInfo.java ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/EntityArtifactInfo.java ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java ofbiz/trunk/framework/webtools/webapp/webtools/entity/tablesMySql.jsp ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/GenericWidgetOutput.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/WidgetContextCacheKey.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapperImage.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenXmlViewHandler.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/activedirectory/OFBizActiveDirectoryAuthenticationHandler.java ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/cas/OFBizCasAuthenticationHandler.java ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/openldap/OFBizLdapAuthenticationHandler.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/PosContainer.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CashDrawer.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CheckScanner.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Journal.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Keyboard.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/LineDisplay.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Msr.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/PinPad.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Scanner.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/SignatureCapture.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullCashDrawer.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/ScannerKybService.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/WorkflowEngine.java ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/client/StartActivityJob.java ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityLoopImplementation.java ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityNoImplementation.java ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityRouteImplementation.java ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivitySubFlowImplementation.java ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityToolImplementation.java ofbiz/trunk/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessImpl.java Modified: ofbiz/trunk/.classpath URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/.classpath (original) +++ ofbiz/trunk/.classpath Sun Jul 5 10:01:19 2009 @@ -15,7 +15,7 @@ <classpathentry kind="src" path="framework/base/src"/> <classpathentry kind="src" path="framework/start/src"/> <classpathentry kind="src" path="framework/geronimo/src"/> - <classpathentry excluding="org/ofbiz/accounting/thirdparty/clearcommerce/**|org/ofbiz/accounting/thirdparty/cybersource/**|org/ofbiz/accounting/thirdparty/verisign/**|org/ofbiz/accounting/thirdparty/worldpay/**" kind="src" path="applications/accounting/src"/> + <classpathentry excluding="org/ofbiz/accounting/thirdparty/cybersource/**|org/ofbiz/accounting/thirdparty/verisign/**|org/ofbiz/accounting/thirdparty/worldpay/**" kind="src" path="applications/accounting/src"/> <classpathentry excluding="org/ofbiz/content/openoffice/|org/ofbiz/content/report/" kind="src" path="applications/content/src"/> <classpathentry kind="src" path="specialpurpose/ecommerce/src"/> <classpathentry kind="src" path="applications/manufacturing/src"/> Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java Sun Jul 5 10:01:19 2009 @@ -54,6 +54,7 @@ private static int rounding = UtilNumber.getBigDecimalRoundingMode("invoice.rounding"); /** @deprecated */ + @Deprecated public static void getPartyPaymentMethodValueMaps(PageContext pageContext, String partyId, Boolean showOld, String paymentMethodValueMapsAttr) { GenericDelegator delegator = (GenericDelegator) pageContext.getRequest().getAttribute("delegator"); List paymentMethodValueMaps = getPartyPaymentMethodValueMaps(delegator, partyId, showOld); @@ -98,6 +99,7 @@ /** TODO: REMOVE (DEJ 20030301): This is the OLD style and should be removed when the eCommerce and party mgr JSPs are */ /** @deprecated */ + @Deprecated public static void getPaymentMethodAndRelated(PageContext pageContext, String partyId, String paymentMethodAttr, String creditCardAttr, String eftAccountAttr, String paymentMethodIdAttr, String curContactMechIdAttr, String donePageAttr, String tryEntityAttr) { Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/test/FinAccountTests.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/test/FinAccountTests.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/test/FinAccountTests.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/test/FinAccountTests.java Sun Jul 5 10:01:19 2009 @@ -40,10 +40,12 @@ super(name); } + @Override protected void setUp() throws Exception { userLogin = delegator.findByPrimaryKey("UserLogin", UtilMisc.toMap("userLoginId", "system")); } + @Override protected void tearDown() throws Exception { } Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java Sun Jul 5 10:01:19 2009 @@ -18,29 +18,35 @@ *******************************************************************************/ package org.ofbiz.accounting.thirdparty.clearcommerce; -import java.util.Map; -import java.util.List; -import java.util.Iterator; -import java.util.ArrayList; -import java.text.DecimalFormat; -import java.io.OutputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.io.OutputStream; import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.TransformerException; -import org.ofbiz.base.util.*; -import org.ofbiz.entity.GenericValue; +import org.ofbiz.accounting.payment.PaymentGatewayServices; +import org.ofbiz.base.util.Debug; +import org.ofbiz.base.util.GeneralException; +import org.ofbiz.base.util.HttpClient; +import org.ofbiz.base.util.HttpClientException; +import org.ofbiz.base.util.UtilGenerics; +import org.ofbiz.base.util.UtilNumber; +import org.ofbiz.base.util.UtilProperties; +import org.ofbiz.base.util.UtilValidate; +import org.ofbiz.base.util.UtilXml; import org.ofbiz.entity.GenericEntityException; +import org.ofbiz.entity.GenericValue; import org.ofbiz.service.DispatchContext; import org.ofbiz.service.ServiceUtil; -import org.ofbiz.accounting.payment.PaymentGatewayServices; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.xml.sax.SAXException; -import org.apache.xml.serialize.XMLSerializer; -import org.apache.xml.serialize.OutputFormat; /** @@ -53,7 +59,7 @@ private static int rounding = UtilNumber.getBigDecimalRoundingMode("invoice.rounding"); - public static Map ccAuth(DispatchContext dctx, Map context) { + public static Map<String, Object> ccAuth(DispatchContext dctx, Map<String, Object> context) { String ccAction = (String) context.get("ccAction"); if (ccAction == null) ccAction = new String("PreAuth"); Document authRequestDoc = buildPrimaryTxRequest(context, ccAction, (BigDecimal) context.get("processAmount"), @@ -67,11 +73,11 @@ } if (getMessageListMaxSev(authResponseDoc) > 4) { // 5 and higher, process error from HSBC - Map result = ServiceUtil.returnSuccess(); + Map<String, Object> result = ServiceUtil.returnSuccess(); result.put("authResult", new Boolean(false)); result.put("processAmount", new BigDecimal("0.00")); result.put("authRefNum", getReferenceNum(authResponseDoc)); - List messages = getMessageList(authResponseDoc); + List<String> messages = getMessageList(authResponseDoc); if (UtilValidate.isNotEmpty(messages)) { result.put("internalRespMsgs", messages); } @@ -81,7 +87,7 @@ return processAuthResponse(authResponseDoc); } - public static Map ccCredit(DispatchContext dctx, Map context) { + public static Map<String, Object> ccCredit(DispatchContext dctx, Map<String, Object> context) { String action = new String("Credit"); if (context.get("pbOrder") != null) { action = new String("Auth"); // required for periodic billing.... @@ -97,11 +103,11 @@ } if (getMessageListMaxSev(creditResponseDoc) > 4) { - Map result = ServiceUtil.returnSuccess(); + Map<String, Object> result = ServiceUtil.returnSuccess(); result.put("creditResult", new Boolean(false)); result.put("creditAmount", new BigDecimal("0.00")); result.put("creditRefNum", getReferenceNum(creditResponseDoc)); - List messages = getMessageList(creditResponseDoc); + List<String> messages = getMessageList(creditResponseDoc); if (UtilValidate.isNotEmpty(messages)) { result.put("internalRespMsgs", messages); } @@ -111,7 +117,7 @@ return processCreditResponse(creditResponseDoc); } - public static Map ccCapture(DispatchContext dctx, Map context) { + public static Map<String, Object> ccCapture(DispatchContext dctx, Map<String, Object> context) { GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference"); GenericValue authTransaction = PaymentGatewayServices.getAuthTransaction(orderPaymentPreference); @@ -130,11 +136,11 @@ } if (getMessageListMaxSev(captureResponseDoc) > 4) { - Map result = ServiceUtil.returnSuccess(); + Map<String, Object> result = ServiceUtil.returnSuccess(); result.put("captureResult", new Boolean(false)); result.put("captureAmount", new BigDecimal("0.00")); result.put("captureRefNum", getReferenceNum(captureResponseDoc)); - List messages = getMessageList(captureResponseDoc); + List<String> messages = getMessageList(captureResponseDoc); if (UtilValidate.isNotEmpty(messages)) { result.put("internalRespMsgs", messages); } @@ -144,7 +150,7 @@ return processCaptureResponse(captureResponseDoc); } - public static Map ccRelease(DispatchContext dctx, Map context) { + public static Map<String, Object> ccRelease(DispatchContext dctx, Map<String, Object> context) { GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference"); GenericValue authTransaction = PaymentGatewayServices.getAuthTransaction(orderPaymentPreference); @@ -162,11 +168,11 @@ } if (getMessageListMaxSev(releaseResponseDoc) > 4) { - Map result = ServiceUtil.returnSuccess(); + Map<String, Object> result = ServiceUtil.returnSuccess(); result.put("releaseResult", new Boolean(false)); result.put("releaseAmount", new BigDecimal("0.00")); result.put("releaseRefNum", getReferenceNum(releaseResponseDoc)); - List messages = getMessageList(releaseResponseDoc); + List<String> messages = getMessageList(releaseResponseDoc); if (UtilValidate.isNotEmpty(messages)) { result.put("internalRespMsgs", messages); } @@ -176,7 +182,7 @@ return processReleaseResponse(releaseResponseDoc); } - public static Map ccReleaseNoop(DispatchContext dctx, Map context) { + public static Map<String, Object> ccReleaseNoop(DispatchContext dctx, Map<String, Object> context) { GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference"); GenericValue authTransaction = PaymentGatewayServices.getAuthTransaction(orderPaymentPreference); @@ -184,7 +190,7 @@ return ServiceUtil.returnError("No authorization transaction found; cannot release"); } - Map result = ServiceUtil.returnSuccess(); + Map<String, Object> result = ServiceUtil.returnSuccess(); result.put("releaseResult", Boolean.valueOf(true)); result.put("releaseCode", authTransaction.getString("gatewayCode")); result.put("releaseAmount", authTransaction.getBigDecimal("amount")); @@ -195,7 +201,7 @@ return result; } - public static Map ccRefund(DispatchContext dctx, Map context) { + public static Map<String, Object> ccRefund(DispatchContext dctx, Map<String, Object> context) { GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference"); GenericValue authTransaction = PaymentGatewayServices.getAuthTransaction(orderPaymentPreference); @@ -216,11 +222,11 @@ } if (getMessageListMaxSev(refundResponseDoc) > 4) { - Map result = ServiceUtil.returnSuccess(); + Map<String, Object> result = ServiceUtil.returnSuccess(); result.put("refundResult", new Boolean(false)); result.put("refundAmount", new BigDecimal("0.00")); result.put("refundRefNum", getReferenceNum(refundResponseDoc)); - List messages = getMessageList(refundResponseDoc); + List<String> messages = getMessageList(refundResponseDoc); if (UtilValidate.isNotEmpty(messages)) { result.put("internalRespMsgs", messages); } @@ -230,7 +236,7 @@ return processRefundResponse(refundResponseDoc); } - public static Map ccReAuth(DispatchContext dctx, Map context) { + public static Map<String, Object> ccReAuth(DispatchContext dctx, Map<String, Object> context) { GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference"); GenericValue authTransaction = PaymentGatewayServices.getAuthTransaction(orderPaymentPreference); @@ -249,11 +255,11 @@ } if (getMessageListMaxSev(reauthResponseDoc) > 4) { - Map result = ServiceUtil.returnSuccess(); + Map<String, Object> result = ServiceUtil.returnSuccess(); result.put("reauthResult", new Boolean(false)); result.put("reauthAmount", new BigDecimal("0.00")); result.put("reauthRefNum", getReferenceNum(reauthResponseDoc)); - List messages = getMessageList(reauthResponseDoc); + List<String> messages = getMessageList(reauthResponseDoc); if (UtilValidate.isNotEmpty(messages)) { result.put("internalRespMsgs", messages); } @@ -264,7 +270,7 @@ } - public static Map ccReport(DispatchContext dctx, Map context) { + public static Map<String, Object> ccReport(DispatchContext dctx, Map<String, Object> context) { // configuration file String paymentConfig = (String) context.get("paymentConfig"); @@ -345,28 +351,29 @@ UtilXml.addChildElementValue(value,"OrderId", orderId, requestDocument); Debug.set(Debug.VERBOSE, true); - Document reportResponseDoc = null; + //Document reportResponseDoc = null; try { - reportResponseDoc = sendRequest(requestDocument, (String) context.get("paymentConfig")); + //reportResponseDoc = + sendRequest(requestDocument, (String) context.get("paymentConfig")); } catch (ClearCommerceException cce) { return ServiceUtil.returnError(cce.getMessage()); } Debug.set(Debug.VERBOSE, true); - Map result = ServiceUtil.returnSuccess(); + Map<String, Object> result = ServiceUtil.returnSuccess(); return result; } - private static Map processAuthResponse(Document responseDocument) { + private static Map<String, Object> processAuthResponse(Document responseDocument) { Element engineDocElement = UtilXml.firstChildElement(responseDocument.getDocumentElement(), "EngineDoc"); Element orderFormElement = UtilXml.firstChildElement(engineDocElement, "OrderFormDoc"); Element transactionElement = UtilXml.firstChildElement(orderFormElement, "Transaction"); Element procResponseElement = UtilXml.firstChildElement(transactionElement, "CardProcResp"); - Map result = ServiceUtil.returnSuccess(); + Map<String, Object> result = ServiceUtil.returnSuccess(); String errorCode = UtilXml.childElementValue(procResponseElement, "CcErrCode"); if ("1".equals(errorCode)) { @@ -398,21 +405,21 @@ result.put("scoreCode", UtilXml.childElementValue(fraudInfoElement, "TotalScore")); } - List messages = getMessageList(responseDocument); + List<String> messages = getMessageList(responseDocument); if (UtilValidate.isNotEmpty(messages)) { result.put("internalRespMsgs", messages); } return result; } - private static Map processCreditResponse(Document responseDocument) { + private static Map<String, Object> processCreditResponse(Document responseDocument) { Element engineDocElement = UtilXml.firstChildElement(responseDocument.getDocumentElement(), "EngineDoc"); Element orderFormElement = UtilXml.firstChildElement(engineDocElement, "OrderFormDoc"); Element transactionElement = UtilXml.firstChildElement(orderFormElement, "Transaction"); Element procResponseElement = UtilXml.firstChildElement(transactionElement, "CardProcResp"); - Map result = ServiceUtil.returnSuccess(); + Map<String, Object> result = ServiceUtil.returnSuccess(); String errorCode = UtilXml.childElementValue(procResponseElement, "CcErrCode"); if ("1".equals(errorCode)) { @@ -432,21 +439,21 @@ result.put("creditFlag", UtilXml.childElementValue(procResponseElement, "Status")); result.put("creditMessage", UtilXml.childElementValue(procResponseElement, "CcReturnMsg")); - List messages = getMessageList(responseDocument); + List<String> messages = getMessageList(responseDocument); if (UtilValidate.isNotEmpty(messages)) { result.put("internalRespMsgs", messages); } return result; } - private static Map processCaptureResponse(Document responseDocument) { + private static Map<String, Object> processCaptureResponse(Document responseDocument) { Element engineDocElement = UtilXml.firstChildElement(responseDocument.getDocumentElement(), "EngineDoc"); Element orderFormElement = UtilXml.firstChildElement(engineDocElement, "OrderFormDoc"); Element transactionElement = UtilXml.firstChildElement(orderFormElement, "Transaction"); Element procResponseElement = UtilXml.firstChildElement(transactionElement, "CardProcResp"); - Map result = ServiceUtil.returnSuccess(); + Map<String, Object> result = ServiceUtil.returnSuccess(); String errorCode = UtilXml.childElementValue(procResponseElement, "CcErrCode"); if ("1".equals(errorCode)) { @@ -466,21 +473,21 @@ result.put("captureFlag", UtilXml.childElementValue(procResponseElement, "Status")); result.put("captureMessage", UtilXml.childElementValue(procResponseElement, "CcReturnMsg")); - List messages = getMessageList(responseDocument); + List<String> messages = getMessageList(responseDocument); if (UtilValidate.isNotEmpty(messages)) { result.put("internalRespMsgs", messages); } return result; } - private static Map processReleaseResponse(Document responseDocument) { + private static Map<String, Object> processReleaseResponse(Document responseDocument) { Element engineDocElement = UtilXml.firstChildElement(responseDocument.getDocumentElement(), "EngineDoc"); Element orderFormElement = UtilXml.firstChildElement(engineDocElement, "OrderFormDoc"); Element transactionElement = UtilXml.firstChildElement(orderFormElement, "Transaction"); Element procResponseElement = UtilXml.firstChildElement(transactionElement, "CardProcResp"); - Map result = ServiceUtil.returnSuccess(); + Map<String, Object> result = ServiceUtil.returnSuccess(); String errorCode = UtilXml.childElementValue(procResponseElement, "CcErrCode"); if ("1".equals(errorCode)) { @@ -500,21 +507,21 @@ result.put("releaseFlag", UtilXml.childElementValue(procResponseElement, "Status")); result.put("releaseMessage", UtilXml.childElementValue(procResponseElement, "CcReturnMsg")); - List messages = getMessageList(responseDocument); + List<String> messages = getMessageList(responseDocument); if (UtilValidate.isNotEmpty(messages)) { result.put("internalRespMsgs", messages); } return result; } - private static Map processRefundResponse(Document responseDocument) { + private static Map<String, Object> processRefundResponse(Document responseDocument) { Element engineDocElement = UtilXml.firstChildElement(responseDocument.getDocumentElement(), "EngineDoc"); Element orderFormElement = UtilXml.firstChildElement(engineDocElement, "OrderFormDoc"); Element transactionElement = UtilXml.firstChildElement(orderFormElement, "Transaction"); Element procResponseElement = UtilXml.firstChildElement(transactionElement, "CardProcResp"); - Map result = ServiceUtil.returnSuccess(); + Map<String, Object> result = ServiceUtil.returnSuccess(); String errorCode = UtilXml.childElementValue(procResponseElement, "CcErrCode"); if ("1".equals(errorCode)) { @@ -534,21 +541,21 @@ result.put("refundFlag", UtilXml.childElementValue(procResponseElement, "Status")); result.put("refundMessage", UtilXml.childElementValue(procResponseElement, "CcReturnMsg")); - List messages = getMessageList(responseDocument); + List<String> messages = getMessageList(responseDocument); if (UtilValidate.isNotEmpty(messages)) { result.put("internalRespMsgs", messages); } return result; } - private static Map processReAuthResponse(Document responseDocument) { + private static Map<String, Object> processReAuthResponse(Document responseDocument) { Element engineDocElement = UtilXml.firstChildElement(responseDocument.getDocumentElement(), "EngineDoc"); Element orderFormElement = UtilXml.firstChildElement(engineDocElement, "OrderFormDoc"); Element transactionElement = UtilXml.firstChildElement(orderFormElement, "Transaction"); Element procResponseElement = UtilXml.firstChildElement(transactionElement, "CardProcResp"); - Map result = ServiceUtil.returnSuccess(); + Map<String, Object> result = ServiceUtil.returnSuccess(); String errorCode = UtilXml.childElementValue(procResponseElement, "CcErrCode"); if ("1".equals(errorCode)) { @@ -568,23 +575,23 @@ result.put("reauthFlag", UtilXml.childElementValue(procResponseElement, "Status")); result.put("reauthMessage", UtilXml.childElementValue(procResponseElement, "CcReturnMsg")); - List messages = getMessageList(responseDocument); + List<String> messages = getMessageList(responseDocument); if (UtilValidate.isNotEmpty(messages)) { result.put("internalRespMsgs", messages); } return result; } - private static List getMessageList(Document responseDocument) { + private static List<String> getMessageList(Document responseDocument) { - List messageList = new ArrayList(); + List<String> messageList = new ArrayList<String>(); Element engineDocElement = UtilXml.firstChildElement(responseDocument.getDocumentElement(), "EngineDoc"); Element messageListElement = UtilXml.firstChildElement(engineDocElement, "MessageList"); - List messageElementList = UtilXml.childElementList(messageListElement, "Message"); + List<? extends Element> messageElementList = UtilXml.childElementList(messageListElement, "Message"); if (UtilValidate.isNotEmpty(messageElementList)) { - for (Iterator i = messageElementList.iterator(); i.hasNext();) { - Element messageElement = (Element) i.next(); + for (Iterator<? extends Element> i = messageElementList.iterator(); i.hasNext();) { + Element messageElement = i.next(); int severity = 0; try { severity = Integer.parseInt(UtilXml.childElementValue(messageElement, "Sev")); @@ -631,7 +638,7 @@ return referenceNum; } - private static Document buildPrimaryTxRequest(Map context, String type, BigDecimal amount, String refNum) { + private static Document buildPrimaryTxRequest(Map<String, Object> context, String type, BigDecimal amount, String refNum) { String paymentConfig = (String) context.get("paymentConfig"); if (UtilValidate.isEmpty(paymentConfig)) { @@ -689,7 +696,7 @@ // TODO: determine if adding OrderItemList is worthwhile - JFE 2004.02.14 - Map pbOrder = (Map) context.get("pbOrder"); + Map<String, Object> pbOrder = UtilGenerics.checkMap(context.get("pbOrder")); if (pbOrder != null) { if (Debug.verboseOn()) Debug.logInfo("pbOrder Map not empty:" + pbOrder.toString(),module); Element pbOrderElement = UtilXml.addChildElement(orderFormDocElement, "PbOrder", requestDocument); // periodic billing order @@ -702,16 +709,16 @@ else if (context.get("OrderFrequencyCycle") != null && context.get("OrderFrequencyInterval") != null && context.get("TotalNumberPayments") != null) { Element pbOrderElement = UtilXml.addChildElement(orderFormDocElement, "PbOrder", requestDocument); // periodic billing order UtilXml.addChildElementValue(pbOrderElement, "OrderFrequencyCycle", (String) context.get("OrderFrequencyCycle"), requestDocument); - Element interval = UtilXml.addChildElementValue(pbOrderElement, "OrderFrequencyInterval", (String) pbOrder.get("OrderFrequencyInterval"), requestDocument); + Element interval = UtilXml.addChildElementValue(pbOrderElement, "OrderFrequencyInterval", (String) context.get("OrderFrequencyInterval"), requestDocument); interval.setAttribute("DataType", "S32"); - Element total = UtilXml.addChildElementValue(pbOrderElement, "TotalNumberPayments", (String) pbOrder.get("TotalNumberPayments"), requestDocument); + Element total = UtilXml.addChildElementValue(pbOrderElement, "TotalNumberPayments", (String) context.get("TotalNumberPayments"), requestDocument); total.setAttribute("DataType", "S32"); } return requestDocument; } - private static Document buildSecondaryTxRequest(Map context, String id, String type, BigDecimal amount) { + private static Document buildSecondaryTxRequest(Map<String, Object> context, String id, String type, BigDecimal amount) { String paymentConfig = (String) context.get("paymentConfig"); if (UtilValidate.isEmpty(paymentConfig)) { @@ -875,17 +882,10 @@ OutputStream os = new ByteArrayOutputStream(); - OutputFormat format = new OutputFormat(); - format.setOmitDocumentType(true); - format.setOmitXMLDeclaration(true); - format.setIndenting(false); - - XMLSerializer serializer = new XMLSerializer(os, format); try { - serializer.asDOMSerializer(); - serializer.serialize(requestDocument.getDocumentElement()); - } catch (IOException ioe) { - throw new ClearCommerceException("Error serializing requestDocument: " + ioe.getMessage()); + UtilXml.writeXmlDocument(requestDocument, os, "UTF-8", true, false, 0); + } catch (TransformerException e) { + throw new ClearCommerceException("Error serializing requestDocument: " + e.getMessage()); } String xmlString = os.toString(); Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCServicesTest.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCServicesTest.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCServicesTest.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCServicesTest.java Sun Jul 5 10:01:19 2009 @@ -62,6 +62,7 @@ super(name); } + @Override protected void setUp() throws Exception { // populate test data configFile = new String("paymentTest.properties"); Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeApi.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeApi.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeApi.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeApi.java Sun Jul 5 10:01:19 2009 @@ -165,6 +165,7 @@ return UtilXml.childElementValue(req, name); } + @Override public String toString() { try { return UtilXml.writeXmlDocument(document); Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java (original) +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java Sun Jul 5 10:01:19 2009 @@ -148,6 +148,7 @@ return (String) document.get(name); } + @Override public String toString() { StringBuilder buf = new StringBuilder(); Iterator i = document.entrySet().iterator(); Modified: ofbiz/trunk/applications/content/src/ControlApplet.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/ControlApplet.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/ControlApplet.java (original) +++ ofbiz/trunk/applications/content/src/ControlApplet.java Sun Jul 5 10:01:19 2009 @@ -57,6 +57,7 @@ protected Thread thread = null; + @Override public void init() { ctx = this.getAppletContext(); this.sessionId = this.getParameter("sessionId"); @@ -106,6 +107,7 @@ } } + @Override public void destroy() { this.stopped = true; } Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java Sun Jul 5 10:01:19 2009 @@ -283,6 +283,7 @@ } } + @Override public String toString() { return this.renderThis(); } @@ -342,6 +343,7 @@ } class Content extends AbstractInfo { + @Override public Object get(Object key) { if (!(key instanceof String)) { Debug.logWarning("Key parameters must be a string", module); @@ -372,6 +374,7 @@ } class SubContent extends AbstractInfo { + @Override public Object get(Object key) { if (!(key instanceof String)) { Debug.logWarning("Key parameters must be a string", module); @@ -406,6 +409,7 @@ } class MetaData extends AbstractInfo { + @Override public Object get(Object key) { if (!(key instanceof String)) { Debug.logWarning("Key parameters must be a string", module); @@ -427,6 +431,7 @@ } class DataResource extends AbstractInfo { + @Override public Object get(Object key) { if (!(key instanceof String)) { Debug.logWarning("Key parameters must be a string", module); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java Sun Jul 5 10:01:19 2009 @@ -393,6 +393,7 @@ } /** @deprecated */ + @Deprecated public static String getImageType(GenericDelegator delegator, GenericValue dataResource) { String imageType = null; if (dataResource != null) { @@ -715,24 +716,28 @@ /** @deprecated */ + @Deprecated public static String renderDataResourceAsText(GenericDelegator delegator, String dataResourceId, Map templateContext, GenericValue view, Locale locale, String mimeTypeId) throws GeneralException, IOException { return renderDataResourceAsText(delegator, dataResourceId, templateContext, locale, mimeTypeId, false); } /** @deprecated */ + @Deprecated public static void renderDataResourceAsText(GenericDelegator delegator, String dataResourceId, Appendable out, Map templateContext, GenericValue view, Locale locale, String targetMimeTypeId) throws GeneralException, IOException { renderDataResourceAsText(delegator, dataResourceId, out, templateContext, locale, targetMimeTypeId, false); } /** @deprecated */ + @Deprecated public static String renderDataResourceAsTextCache(GenericDelegator delegator, String dataResourceId, Map templateContext, GenericValue view, Locale locale, String mimeTypeId) throws GeneralException, IOException { return renderDataResourceAsText(delegator, dataResourceId, templateContext, locale, mimeTypeId, true); } /** @deprecated */ + @Deprecated public static void renderDataResourceAsTextCache(GenericDelegator delegator, String dataResourceId, Appendable out, Map templateContext, GenericValue view, Locale locale, String targetMimeTypeId) throws GeneralException, IOException { renderDataResourceAsText(delegator, dataResourceId, out, templateContext, locale, targetMimeTypeId, true); @@ -844,24 +849,28 @@ } /** @deprecated */ + @Deprecated public static String getDataResourceTextCache(GenericValue dataResource, String mimeTypeId, Locale locale, Map context, GenericDelegator delegator) throws IOException, GeneralException { return getDataResourceText(dataResource, mimeTypeId, locale, context, delegator, true); } /** @deprecated */ + @Deprecated public static void writeDataResourceTextCache(GenericValue dataResource, String mimeTypeId, Locale locale, Map context, GenericDelegator delegator, Appendable outWriter) throws IOException, GeneralException { writeDataResourceText(dataResource, mimeTypeId, locale, context, delegator, outWriter, true); } /** @deprecated */ + @Deprecated public static String getDataResourceText(GenericValue dataResource, String mimeTypeId, Locale locale, Map context, GenericDelegator delegator) throws IOException, GeneralException { return getDataResourceText(dataResource, mimeTypeId, locale, context, delegator, false); } /** @deprecated */ + @Deprecated public static void writeDataResourceText(GenericValue dataResource, String mimeTypeId, Locale locale, Map context, GenericDelegator delegator, Appendable out) throws IOException, GeneralException { writeDataResourceText(dataResource, mimeTypeId, locale, context, delegator, out, false); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/search/ContentDocument.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/search/ContentDocument.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/search/ContentDocument.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/search/ContentDocument.java Sun Jul 5 10:01:19 2009 @@ -76,7 +76,7 @@ // make a new, empty document doc = new Document(); String contentId = content.getString("contentId"); - doc.add(new Field("contentId", contentId, Store.YES, Index.UN_TOKENIZED, TermVector.NO)); + doc.add(new Field("contentId", contentId, Store.YES, Index.NOT_ANALYZED, TermVector.NO)); // Add the last modified date of the file a field named "modified". Use // a // Keyword field, so that it's searchable, but so that no attempt is @@ -87,14 +87,14 @@ modDate = (Timestamp) content.get("createdDate"); } if (modDate != null) { - doc.add(new Field("modified", modDate.toString(), Store.YES, Index.UN_TOKENIZED, TermVector.NO)); + doc.add(new Field("modified", modDate.toString(), Store.YES, Index.NOT_ANALYZED, TermVector.NO)); } String contentName = content.getString("contentName"); if (UtilValidate.isNotEmpty(contentName)) - doc.add(new Field("title", contentName, Store.YES, Index.TOKENIZED, TermVector.NO)); + doc.add(new Field("title", contentName, Store.YES, Index.ANALYZED, TermVector.NO)); String description = content.getString("description"); if (UtilValidate.isNotEmpty(description)) - doc.add(new Field("description", description, Store.YES, Index.TOKENIZED, TermVector.NO)); + doc.add(new Field("description", description, Store.YES, Index.ANALYZED, TermVector.NO)); List ancestorList = FastList.newInstance(); GenericDelegator delegator = content.getDelegator(); ContentWorker.getContentAncestryAll(delegator, contentId, "WEB_SITE_PUB_PT", "TO", ancestorList); @@ -102,7 +102,7 @@ //Debug.logInfo("in ContentDocument, ancestorString:" + ancestorString, // module); if (UtilValidate.isNotEmpty(ancestorString)) { - Field field = new Field("site", ancestorString, Store.NO, Index.TOKENIZED, TermVector.NO); + Field field = new Field("site", ancestorString, Store.NO, Index.ANALYZED, TermVector.NO); //Debug.logInfo("in ContentDocument, field:" + field.stringValue(), // module); doc.add(field); @@ -165,7 +165,7 @@ } //Debug.logInfo("in DataResourceDocument, text:" + text, module); if (UtilValidate.isNotEmpty(text)) { - Field field = new Field("content", text, Store.NO, Index.TOKENIZED, TermVector.NO); + Field field = new Field("content", text, Store.NO, Index.ANALYZED, TermVector.NO); //Debug.logInfo("in ContentDocument, field:" + field.stringValue(), module); doc.add(field); } @@ -188,7 +188,7 @@ String featureString = StringUtil.join(featureList, " "); //Debug.logInfo("in ContentDocument, featureString:" + featureString, module); if (UtilValidate.isNotEmpty(featureString)) { - Field field = new Field("feature", featureString, Store.NO, Index.TOKENIZED, TermVector.NO); + Field field = new Field("feature", featureString, Store.NO, Index.ANALYZED, TermVector.NO); doc.add(field); } return true; Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/search/DataResourceDocument.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/search/DataResourceDocument.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/search/DataResourceDocument.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/search/DataResourceDocument.java Sun Jul 5 10:01:19 2009 @@ -60,7 +60,7 @@ // make a new, empty document doc = new Document(); - doc.add(new Field("dataResourceId", id, Store.YES, Index.UN_TOKENIZED, TermVector.NO)); + doc.add(new Field("dataResourceId", id, Store.YES, Index.NOT_ANALYZED, TermVector.NO)); String mimeTypeId = dataResource.getString("mimeTypeId"); if (UtilValidate.isEmpty(mimeTypeId)) { @@ -84,7 +84,7 @@ String text = outWriter.toString(); Debug.logInfo("in DataResourceDocument, text:" + text, module); if (UtilValidate.isNotEmpty(text)) - doc.add(new Field("content", text, Store.NO, Index.TOKENIZED, TermVector.NO)); + doc.add(new Field("content", text, Store.NO, Index.ANALYZED, TermVector.NO)); return doc; } Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchWorker.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchWorker.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchWorker.java Sun Jul 5 10:01:19 2009 @@ -139,9 +139,9 @@ // Now create IndexWriter writer = null; try { - writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), false); + writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), false, IndexWriter.MaxFieldLength.UNLIMITED); } catch (Exception e) { - writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), true); + writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), true, IndexWriter.MaxFieldLength.UNLIMITED); } //if (Debug.infoOn()) Debug.logInfo("in indexContent, writer:" + // writer, module); @@ -189,10 +189,10 @@ String indexAllPath = getIndexPath(path); IndexWriter writer = null; try { - writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), false); + writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), false, IndexWriter.MaxFieldLength.UNLIMITED); if (Debug.infoOn()) Debug.logInfo("Used old directory:" + indexAllPath, module); } catch (FileNotFoundException e) { - writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), true); + writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), true, IndexWriter.MaxFieldLength.UNLIMITED); if (Debug.infoOn()) Debug.logInfo("Created new directory:" + indexAllPath, module); } @@ -229,13 +229,13 @@ String indexAllPath = getIndexPath(path); IndexWriter writer = null; try { - writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), false); + writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), false, IndexWriter.MaxFieldLength.UNLIMITED); } catch (FileNotFoundException e) { - writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), true); + writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), true, IndexWriter.MaxFieldLength.UNLIMITED); } indexDataResource(delegator, context, id, writer); writer.optimize(); - writer.close(); + writer.close(); } Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java Sun Jul 5 10:01:19 2009 @@ -90,14 +90,17 @@ return new LoopWriter(out) { + @Override public void write(char cbuf[], int off, int len) { buf.append(cbuf, off, len); } + @Override public void flush() throws IOException { out.flush(); } + @Override public int onStart() throws TemplateModelException, IOException { List trail = (List)templateCtx.get("globalNodeTrail"); String trailCsv = ContentWorker.nodeTrailToCsv(trail); @@ -195,6 +198,7 @@ } + @Override public void close() throws IOException { FreeMarkerWorker.reloadValues(templateCtx, savedValues, env); String wrappedContent = buf.toString(); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java Sun Jul 5 10:01:19 2009 @@ -122,14 +122,17 @@ return new Writer(out) { + @Override public void write(char cbuf[], int off, int len) { buf.append(cbuf, off, len); } + @Override public void flush() throws IOException { out.flush(); } + @Override public void close() throws IOException { FreeMarkerWorker.reloadValues(templateCtx, savedValues, env); String wrappedContent = buf.toString(); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java Sun Jul 5 10:01:19 2009 @@ -161,14 +161,17 @@ return new Writer(out) { + @Override public void write(char cbuf[], int off, int len) { buf.append(cbuf, off, len); } + @Override public void flush() throws IOException { out.flush(); } + @Override public void close() throws IOException { String wrappedFTL = buf.toString(); if (editTemplate != null && editTemplate.equalsIgnoreCase("true")) { Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java Sun Jul 5 10:01:19 2009 @@ -80,14 +80,17 @@ final String passedCsv = (String)templateCtx.get("nodeTrailCsv"); + @Override public void write(char cbuf[], int off, int len) { buf.append(cbuf, off, len); } + @Override public void flush() throws IOException { out.flush(); } + @Override public int onStart() throws TemplateModelException, IOException { String csvTrail = null; @@ -160,6 +163,7 @@ } + @Override public void close() throws IOException { templateCtx.put("nodeTrailCsv", passedCsv); String wrappedContent = buf.toString(); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java Sun Jul 5 10:01:19 2009 @@ -156,16 +156,19 @@ return new LoopWriter(out) { + @Override public void write(char cbuf[], int off, int len) { buf.append(cbuf, off, len); //StringBuilder ctxBuf = (StringBuilder) templateRoot.get("buf"); //ctxBuf.append(cbuf, off, len); } + @Override public void flush() throws IOException { out.flush(); } + @Override public int onStart() throws TemplateModelException, IOException { List globalNodeTrail = (List) templateRoot.get("globalNodeTrail"); @@ -184,6 +187,7 @@ } } + @Override public int afterBody() throws TemplateModelException, IOException { FreeMarkerWorker.reloadValues(templateRoot, savedValues, env); List list = (List) templateRoot.get("globalNodeTrail"); @@ -207,6 +211,7 @@ } } + @Override public void close() throws IOException { FreeMarkerWorker.reloadValues(templateRoot, savedValuesUp, env); String wrappedContent = buf.toString(); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java Sun Jul 5 10:01:19 2009 @@ -178,14 +178,17 @@ return new LoopWriter(out) { + @Override public void write(char cbuf[], int off, int len) { buf.append(cbuf, off, len); } + @Override public void flush() throws IOException { out.flush(); } + @Override public int onStart() throws TemplateModelException, IOException { templateCtx.put("entityIndex", Integer.valueOf(0)); boolean inProgress = prepCtx(delegator, templateCtx); @@ -196,6 +199,7 @@ } } + @Override public int afterBody() throws TemplateModelException, IOException { boolean inProgress = prepCtx(delegator, templateCtx); if (inProgress) { @@ -205,6 +209,7 @@ } } + @Override public void close() throws IOException { String wrappedFTL = buf.toString(); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java Sun Jul 5 10:01:19 2009 @@ -76,13 +76,16 @@ return new Writer(out) { + @Override public void write(char cbuf[], int off, int len) { } + @Override public void flush() throws IOException { out.flush(); } + @Override public void close() throws IOException { renderSubContent(); //if (Debug.verboseOn()) Debug.logVerbose("in Render(2), globalNodeTrail ." + getWrapped(env, "globalNodeTrail") , module); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java?rev=791212&r1=791211&r2=791212&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java Sun Jul 5 10:01:19 2009 @@ -127,13 +127,16 @@ return new Writer(out) { + @Override public void write(char cbuf[], int off, int len) { } + @Override public void flush() throws IOException { out.flush(); } + @Override public void close() throws IOException { List globalNodeTrail = (List)templateRoot.get("globalNodeTrail"); if (Debug.verboseOn()) Debug.logVerbose("Render close, globalNodeTrail(2a):" + ContentWorker.nodeTrailToCsv(globalNodeTrail), ""); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |