You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2026/10/27 13:03:36 UTC
(ofbiz-framework) branch trunk updated (b4c630224b -> 522792d5cf)
This is an automated email from the ASF dual-hosted git repository.
mridulpathak pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
from b4c630224b Remove this-escape warnings in OrderByList, ModelParam, MimeMessageWrapper and the recurrence classes
new 71aaba7f0b Start Java license headers with /* instead of /****
new 522792d5cf Fix documentation comments that are not attached to any declaration
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../ofbiz/accounting/AccountingException.java | 2 +-
.../java/org/apache/ofbiz/accounting/GlEvents.java | 2 +-
.../accounting/agreement/AgreementServices.java | 2 +-
.../accounting/finaccount/FinAccountServices.java | 2 +-
.../ofbiz/accounting/invoice/InvoiceServices.java | 2 +-
.../ofbiz/accounting/invoice/InvoiceWorker.java | 2 +-
.../accounting/ledger/GeneralLedgerServices.java | 2 +-
.../accounting/payment/BillingAccountWorker.java | 2 +-
.../payment/GiftCertificateServices.java | 2 +-
.../accounting/payment/PaymentGatewayServices.java | 2 +-
.../accounting/payment/PaymentMethodServices.java | 2 +-
.../ofbiz/accounting/payment/PaymentWorker.java | 2 +-
.../ofbiz/accounting/period/PeriodServices.java | 2 +-
.../ofbiz/accounting/tax/TaxAuthorityServices.java | 2 +-
.../ofbiz/accounting/util/UtilAccounting.java | 2 +-
.../ofbiz/content/ContentManagementEvents.java | 2 +-
.../ofbiz/content/ContentManagementServices.java | 2 +-
.../ofbiz/content/ContentManagementWorker.java | 2 +-
.../java/org/apache/ofbiz/content/ConvertTree.java | 2 +-
.../ofbiz/content/cms/ContentJsonEvents.java | 2 +-
.../ofbiz/content/content/ContentEvents.java | 2 +-
.../ofbiz/content/content/ContentKeywordIndex.java | 2 +-
.../content/content/ContentPermissionServices.java | 2 +-
.../ofbiz/content/content/ContentSearch.java | 2 +-
.../ofbiz/content/content/ContentSearchEvents.java | 2 +-
.../content/content/ContentSearchSession.java | 2 +-
.../ofbiz/content/content/ContentServices.java | 2 +-
.../content/content/ContentServicesComplex.java | 2 +-
.../ofbiz/content/content/ContentUrlFilter.java | 2 +-
.../ofbiz/content/content/ContentWorker.java | 2 +-
.../ofbiz/content/content/ContentWrapper.java | 2 +-
.../ofbiz/content/content/PermissionRecorder.java | 2 +-
.../content/content/UploadContentAndImage.java | 2 +-
.../org/apache/ofbiz/content/data/DataEvents.java | 2 +-
.../ofbiz/content/data/DataResourceWorker.java | 2 +-
.../apache/ofbiz/content/data/DataServices.java | 2 +-
.../ofbiz/content/ftp/FtpClientInterface.java | 2 +-
.../org/apache/ofbiz/content/ftp/FtpServices.java | 2 +-
.../apache/ofbiz/content/ftp/SecureFtpClient.java | 2 +-
.../apache/ofbiz/content/ftp/SimpleFtpClient.java | 2 +-
.../apache/ofbiz/content/ftp/SshClientHelper.java | 2 +-
.../org/apache/ofbiz/content/ftp/SshFtpClient.java | 2 +-
.../apache/ofbiz/content/layout/LayoutEvents.java | 2 +-
.../apache/ofbiz/content/layout/LayoutWorker.java | 2 +-
.../ofbiz/content/output/OutputServices.java | 2 +-
.../permission/EntityPermissionChecker.java | 2 +-
.../apache/ofbiz/content/survey/PdfFormHelper.java | 2 +-
.../ofbiz/content/survey/PdfSurveyServices.java | 2 +-
.../apache/ofbiz/content/survey/SurveyEvents.java | 2 +-
.../apache/ofbiz/content/survey/SurveyWrapper.java | 2 +-
.../content/view/SimpleContentViewHandler.java | 2 +-
.../webapp/ftl/CheckPermissionTransform.java | 2 +-
.../ftl/EditRenderSubContentCacheTransform.java | 2 +-
.../webapp/ftl/EditRenderSubContentTransform.java | 2 +-
.../webapp/ftl/InjectNodeTrailCsvTransform.java | 2 +-
.../ftl/LimitedSubContentCacheTransform.java | 2 +-
.../webapp/ftl/LoopSubContentTransform.java | 2 +-
.../webapp/ftl/OfbizContentAltUrlTransforms.java | 2 +-
.../webapp/ftl/RenderContentAndSubContent.java | 2 +-
.../content/webapp/ftl/RenderContentAsText.java | 2 +-
.../content/webapp/ftl/RenderContentTransform.java | 2 +-
.../content/webapp/ftl/RenderSubContentAsText.java | 2 +-
.../webapp/ftl/RenderSubContentCacheTransform.java | 2 +-
.../webapp/ftl/RenderSubContentTransform.java | 2 +-
.../ftl/TraverseSubContentCacheTransform.java | 2 +-
.../webapp/ftl/TraverseSubContentTransform.java | 2 +-
.../webapp/ftl/WrapSubContentCacheTransform.java | 2 +-
.../ofbiz/content/data/DataServicesTest.java | 2 +-
.../org/apache/ofbiz/humanres/HumanResEvents.java | 2 +-
.../apache/ofbiz/manufacturing/bom/BOMHelper.java | 2 +-
.../apache/ofbiz/manufacturing/bom/BOMNode.java | 2 +-
.../ofbiz/manufacturing/bom/BOMServices.java | 2 +-
.../apache/ofbiz/manufacturing/bom/BOMTree.java | 2 +-
.../manufacturing/jobshopmgt/ProductionRun.java | 2 +-
.../jobshopmgt/ProductionRunEvents.java | 2 +-
.../jobshopmgt/ProductionRunHelper.java | 2 +-
.../jobshopmgt/ProductionRunServices.java | 2 +-
.../mrp/InventoryEventPlannedServices.java | 2 +-
.../ofbiz/manufacturing/mrp/MrpServices.java | 2 +-
.../ofbiz/manufacturing/mrp/ProposedOrder.java | 2 +-
.../manufacturing/routing/RoutingServices.java | 2 +-
.../manufacturing/techdata/TechDataServices.java | 1 -
.../marketing/marketing/MarketingServices.java | 2 +-
.../ofbiz/marketing/report/ReportHelper.java | 2 +-
.../marketing/tracking/TrackingCodeEvents.java | 2 +-
.../java/org/apache/ofbiz/sfa/vcard/VCard.java | 2 +-
.../ofbiz/order/order/OrderChangeHelper.java | 2 +-
.../ofbiz/order/order/OrderContentWrapper.java | 2 +-
.../org/apache/ofbiz/order/order/OrderEvents.java | 2 +-
.../apache/ofbiz/order/order/OrderReadHelper.java | 2 +-
.../apache/ofbiz/order/order/OrderServices.java | 2 +-
.../apache/ofbiz/order/quote/QuoteServices.java | 2 +-
.../order/shoppingcart/CartEventListener.java | 2 +-
.../shoppingcart/CartItemModifyException.java | 2 +-
.../ofbiz/order/shoppingcart/CheckOutEvents.java | 2 +-
.../order/shoppingcart/ItemNotFoundException.java | 2 +-
.../ofbiz/order/shoppingcart/ShoppingCart.java | 2 +-
.../order/shoppingcart/ShoppingCartEvents.java | 2 +-
.../order/shoppingcart/ShoppingCartHelper.java | 2 +-
.../order/shoppingcart/ShoppingCartServices.java | 2 +-
.../ofbiz/order/shoppingcart/WebShoppingCart.java | 2 +-
.../shoppingcart/product/ProductDisplayWorker.java | 2 +-
.../shoppingcart/product/ProductPromoWorker.java | 2 +-
.../product/ProductStoreCartAwareEvents.java | 2 +-
.../shipping/ShippingEstimateWrapper.java | 2 +-
.../shoppingcart/shipping/ShippingEvents.java | 2 +-
.../order/shoppinglist/ShoppingListEvents.java | 2 +-
.../order/shoppinglist/ShoppingListServices.java | 2 +-
.../org/apache/ofbiz/order/task/TaskEvents.java | 2 +-
.../org/apache/ofbiz/order/task/TaskWorker.java | 2 +-
.../apache/ofbiz/order/test/OrderTestServices.java | 2 +-
.../communication/CommunicationEventServices.java | 2 +-
.../apache/ofbiz/party/contact/ContactHelper.java | 2 +-
.../ofbiz/party/contact/ContactMechServices.java | 2 +-
.../ofbiz/party/contact/ContactMechWorker.java | 2 +-
.../ofbiz/party/content/PartyContentWrapper.java | 2 +-
.../org/apache/ofbiz/party/party/PartyHelper.java | 2 +-
.../ofbiz/party/party/PartyRelationshipHelper.java | 2 +-
.../party/party/PartyRelationshipServices.java | 2 +-
.../apache/ofbiz/party/party/PartyTypeHelper.java | 2 +-
.../ofbiz/product/catalog/CatalogWorker.java | 2 +-
.../product/category/CatalogUrlDirective.java | 2 +-
.../ofbiz/product/category/CatalogUrlFilter.java | 2 +-
.../product/category/CatalogUrlSeoFilter.java | 2 +-
.../ofbiz/product/category/CatalogUrlServlet.java | 2 +-
.../product/category/CategoryContentWrapper.java | 2 +-
.../product/category/CategoryControlServlet.java | 2 +-
.../ofbiz/product/category/CategoryServices.java | 2 +-
.../ofbiz/product/category/CategoryWorker.java | 2 +-
.../product/category/SeoCatalogUrlServlet.java | 2 +-
.../product/category/SeoContentUrlFilter.java | 2 +-
.../ofbiz/product/category/SeoContextFilter.java | 2 +-
.../ofbiz/product/category/SeoControlServlet.java | 2 +-
.../apache/ofbiz/product/category/SeoUrlUtil.java | 2 +-
.../category/ftl/CatalogAltUrlSeoTransform.java | 2 +-
.../category/ftl/CatalogUrlSeoTransform.java | 2 +-
.../category/ftl/OfbizCatalogAltUrlTransform.java | 2 +-
.../category/ftl/OfbizCatalogUrlTransform.java | 2 +-
.../ofbiz/product/category/ftl/SeoTransform.java | 2 +-
.../product/category/ftl/UrlRegexpTransform.java | 2 +-
.../config/ProductConfigItemContentWrapper.java | 2 +-
.../ofbiz/product/config/ProductConfigWorker.java | 2 +-
.../ofbiz/product/config/ProductConfigWrapper.java | 2 +-
.../config/ProductConfigWrapperException.java | 2 +-
.../ofbiz/product/feature/ParametricSearch.java | 2 +-
.../product/feature/ProductFeatureServices.java | 2 +-
.../org/apache/ofbiz/product/image/ScaleImage.java | 2 +-
.../ofbiz/product/imagemanagement/CropImage.java | 2 +-
.../ofbiz/product/imagemanagement/FrameImage.java | 2 +-
.../imagemanagement/ImageManagementHelper.java | 2 +-
.../imagemanagement/ImageManagementServices.java | 2 +-
.../product/imagemanagement/ImageUrlServlet.java | 2 +-
.../product/imagemanagement/ReplaceImage.java | 2 +-
.../ofbiz/product/imagemanagement/RotateImage.java | 2 +-
.../ofbiz/product/inventory/InventoryServices.java | 2 +-
.../ofbiz/product/migrate/MigrationServices.java | 2 +-
.../apache/ofbiz/product/price/PriceServices.java | 2 +-
.../apache/ofbiz/product/product/KeywordIndex.java | 2 +-
.../product/product/ProductContentWrapper.java | 2 +-
.../ofbiz/product/product/ProductEvents.java | 2 +-
.../product/ProductPromoContentWrapper.java | 2 +-
.../ofbiz/product/product/ProductSearchEvents.java | 2 +-
.../ofbiz/product/product/ProductServices.java | 2 +-
.../ofbiz/product/product/ProductUtilServices.java | 2 +-
.../ofbiz/product/product/ProductWorker.java | 2 +-
.../ofbiz/product/product/VariantEvents.java | 2 +-
.../apache/ofbiz/product/promo/PromoServices.java | 2 +-
.../spreadsheetimport/ImportProductHelper.java | 2 +-
.../spreadsheetimport/ImportProductServices.java | 2 +-
.../ofbiz/product/store/ProductStoreEvents.java | 2 +-
.../product/store/ProductStoreSurveyWrapper.java | 2 +-
.../ofbiz/product/store/ProductStoreWorker.java | 2 +-
.../product/subscription/SubscriptionServices.java | 2 +-
.../ofbiz/shipment/packing/PackingEvent.java | 2 +-
.../ofbiz/shipment/packing/PackingServices.java | 2 +-
.../ofbiz/shipment/packing/PackingSession.java | 2 +-
.../ofbiz/shipment/packing/PackingSessionLine.java | 2 +-
.../ofbiz/shipment/picklist/PickListServices.java | 2 +-
.../ofbiz/shipment/shipment/ShipmentEvents.java | 2 +-
.../ofbiz/shipment/shipment/ShipmentServices.java | 2 +-
.../ofbiz/shipment/shipment/ShipmentWorker.java | 2 +-
.../ofbiz/shipment/verify/VerifyPickServices.java | 2 +-
.../ofbiz/shipment/verify/VerifyPickSession.java | 2 +-
.../shipment/verify/VerifyPickSessionRow.java | 2 +-
.../weightPackage/WeightPackageServices.java | 2 +-
.../weightPackage/WeightPackageSession.java | 2 +-
.../weightPackage/WeightPackageSessionLine.java | 2 +-
.../ofbiz/securityext/login/LoginEvents.java | 2 +-
.../securityext/migrate/MigrationServices.java | 2 +-
.../security/OFBizApplicationSecurity.java | 2 +-
.../content/WorkEffortContentWrapper.java | 2 +-
.../ofbiz/workeffort/workeffort/ICalConverter.java | 2 +-
.../workeffort/workeffort/ICalHandlerFactory.java | 2 +-
.../workeffort/workeffort/ICalRecurConverter.java | 2 +-
.../ofbiz/workeffort/workeffort/ICalWorker.java | 2 +-
.../workeffort/WorkEffortKeywordIndex.java | 2 +-
.../WorkEffortPartyAssignmentServices.java | 2 +-
.../workeffort/workeffort/WorkEffortSearch.java | 2 +-
.../workeffort/WorkEffortSearchEvents.java | 2 +-
.../workeffort/WorkEffortSearchSession.java | 2 +-
.../workeffort/workeffort/WorkEffortServices.java | 2 +-
.../workeffort/workeffort/WorkEffortWorker.java | 2 +-
docs/asciidoc/resource/source.java | 2 +-
.../ofbiz/base/component/ComponentConfig.java | 2 +-
.../ofbiz/base/component/ComponentException.java | 2 +-
.../base/component/ComponentResourceHandler.java | 2 +-
.../ofbiz/base/concurrent/ConstantFuture.java | 2 +-
.../ofbiz/base/concurrent/ExecutionPool.java | 2 +-
.../org/apache/ofbiz/base/config/FileLoader.java | 2 +-
.../ofbiz/base/config/GenericConfigException.java | 2 +-
.../apache/ofbiz/base/config/JNDIConfigUtil.java | 2 +-
.../ofbiz/base/config/MainResourceHandler.java | 2 +-
.../apache/ofbiz/base/config/ResourceHandler.java | 2 +-
.../apache/ofbiz/base/config/ResourceLoader.java | 2 +-
.../org/apache/ofbiz/base/config/UrlLoader.java | 2 +-
.../ofbiz/base/container/AdminServerContainer.java | 2 +-
.../org/apache/ofbiz/base/container/Container.java | 2 +-
.../ofbiz/base/container/ContainerException.java | 2 +-
.../ofbiz/base/container/ContainerLoader.java | 2 +-
.../base/container/NamingServiceContainer.java | 2 +-
.../ofbiz/base/conversion/AbstractConverter.java | 2 +-
.../conversion/AbstractLocalizedConverter.java | 2 +-
.../base/conversion/AbstractModelConverter.java | 2 +-
.../ofbiz/base/conversion/BooleanConverters.java | 2 +-
.../base/conversion/CollectionConverters.java | 2 +-
.../ofbiz/base/conversion/ConversionException.java | 2 +-
.../apache/ofbiz/base/conversion/Converter.java | 2 +-
.../ofbiz/base/conversion/ConverterCreator.java | 2 +-
.../ofbiz/base/conversion/ConverterLoader.java | 2 +-
.../apache/ofbiz/base/conversion/Converters.java | 2 +-
.../ofbiz/base/conversion/DateTimeConverters.java | 2 +-
.../base/conversion/GenericSingletonToList.java | 2 +-
.../base/conversion/GenericSingletonToSet.java | 2 +-
.../ofbiz/base/conversion/JSONConverters.java | 2 +-
.../ofbiz/base/conversion/LocalizedConverter.java | 2 +-
.../ofbiz/base/conversion/MiscConverters.java | 2 +-
.../ofbiz/base/conversion/ModelConverter.java | 2 +-
.../ofbiz/base/conversion/ModelConverters.java | 2 +-
.../ofbiz/base/conversion/NetConverters.java | 2 +-
.../ofbiz/base/conversion/NumberConverters.java | 2 +-
.../apache/ofbiz/base/crypto/BlowFishCrypt.java | 2 +-
.../apache/ofbiz/base/crypto/ConfigCryptoUtil.java | 2 +-
.../org/apache/ofbiz/base/crypto/HashCrypt.java | 2 +-
.../java/org/apache/ofbiz/base/crypto/Main.java | 2 +-
.../ofbiz/base/crypto/ReEncryptSecretsMain.java | 2 +-
.../ofbiz/base/html/CustomPermissivePolicy.java | 2 +-
.../apache/ofbiz/base/html/CustomSafePolicy.java | 2 +-
.../ofbiz/base/html/SanitizerCustomPolicy.java | 2 +-
.../apache/ofbiz/base/lang/ComparableRange.java | 2 +-
.../java/org/apache/ofbiz/base/lang/Factory.java | 2 +-
.../main/java/org/apache/ofbiz/base/lang/JSON.java | 2 +-
.../java/org/apache/ofbiz/base/lang/Range.java | 2 +-
.../apache/ofbiz/base/lang/SourceMonitored.java | 2 +-
.../base/location/ClasspathLocationResolver.java | 2 +-
.../base/location/ComponentLocationResolver.java | 2 +-
.../ofbiz/base/location/FlexibleLocation.java | 2 +-
.../ofbiz/base/location/LocationResolver.java | 2 +-
.../base/location/OFBizHomeLocationResolver.java | 2 +-
.../base/location/StandardUrlLocationResolver.java | 2 +-
.../org/apache/ofbiz/base/metrics/Metrics.java | 2 +-
.../org/apache/ofbiz/base/model/DomainModel.java | 2 +-
.../ofbiz/base/secret/FallbackSecretProvider.java | 2 +-
.../ofbiz/base/secret/FileBasedSecretProvider.java | 2 +-
.../apache/ofbiz/base/secret/SecretAuditSink.java | 2 +-
.../apache/ofbiz/base/secret/SecretProvider.java | 2 +-
.../ofbiz/base/secret/SecretProviderFactory.java | 2 +-
.../ofbiz/base/secret/SecretProviderUtil.java | 2 +-
.../ofbiz/base/secret/SecretValueResolver.java | 2 +-
.../apache/ofbiz/base/util/AliasKeyManager.java | 2 +-
.../org/apache/ofbiz/base/util/CacheFilter.java | 2 +-
.../java/org/apache/ofbiz/base/util/DateRange.java | 2 +-
.../java/org/apache/ofbiz/base/util/Debug.java | 2 +-
.../java/org/apache/ofbiz/base/util/FileUtil.java | 2 +-
.../apache/ofbiz/base/util/GeneralException.java | 2 +-
.../ofbiz/base/util/GeneralRuntimeException.java | 2 +-
.../org/apache/ofbiz/base/util/HttpClient.java | 2 +-
.../ofbiz/base/util/HttpClientException.java | 2 +-
.../ofbiz/base/util/HttpRequestFileUpload.java | 2 +-
.../apache/ofbiz/base/util/IndentingWriter.java | 2 +-
.../apache/ofbiz/base/util/JNDIContextFactory.java | 2 +-
.../org/apache/ofbiz/base/util/KeyStoreUtil.java | 2 +-
.../org/apache/ofbiz/base/util/MessageString.java | 2 +-
.../org/apache/ofbiz/base/util/ObjectType.java | 2 +-
.../org/apache/ofbiz/base/util/Observable.java | 2 +-
.../java/org/apache/ofbiz/base/util/Observer.java | 2 +-
.../org/apache/ofbiz/base/util/PatternFactory.java | 2 +-
.../ofbiz/base/util/RMIExtendedSocketFactory.java | 2 +-
.../apache/ofbiz/base/util/ReferenceCleaner.java | 2 +-
.../org/apache/ofbiz/base/util/RequestWrapper.java | 4 ++--
.../java/org/apache/ofbiz/base/util/SSLUtil.java | 2 +-
.../org/apache/ofbiz/base/util/ScriptHelper.java | 2 +-
.../org/apache/ofbiz/base/util/ScriptUtil.java | 2 +-
.../java/org/apache/ofbiz/base/util/Scriptlet.java | 2 +-
.../org/apache/ofbiz/base/util/StringUtil.java | 2 +-
.../org/apache/ofbiz/base/util/TimeDuration.java | 2 +-
.../org/apache/ofbiz/base/util/URLConnector.java | 2 +-
.../java/org/apache/ofbiz/base/util/UtilCodec.java | 2 +-
.../org/apache/ofbiz/base/util/UtilDateTime.java | 2 +-
.../org/apache/ofbiz/base/util/UtilGenerics.java | 2 +-
.../java/org/apache/ofbiz/base/util/UtilHtml.java | 2 +-
.../java/org/apache/ofbiz/base/util/UtilHttp.java | 2 +-
.../java/org/apache/ofbiz/base/util/UtilIO.java | 2 +-
.../java/org/apache/ofbiz/base/util/UtilMisc.java | 2 +-
.../org/apache/ofbiz/base/util/UtilNumber.java | 2 +-
.../org/apache/ofbiz/base/util/UtilObject.java | 2 +-
.../org/apache/ofbiz/base/util/UtilProperties.java | 2 +-
.../org/apache/ofbiz/base/util/UtilRandom.java | 2 +-
.../java/org/apache/ofbiz/base/util/UtilTimer.java | 2 +-
.../java/org/apache/ofbiz/base/util/UtilURL.java | 2 +-
.../org/apache/ofbiz/base/util/UtilValidate.java | 2 +-
.../java/org/apache/ofbiz/base/util/UtilXml.java | 2 +-
.../apache/ofbiz/base/util/cache/CacheLine.java | 2 +-
.../ofbiz/base/util/cache/CacheListener.java | 2 +-
.../ofbiz/base/util/cache/CacheSoftReference.java | 2 +-
.../ofbiz/base/util/cache/HardRefCacheLine.java | 2 +-
.../ofbiz/base/util/cache/SoftRefCacheLine.java | 2 +-
.../apache/ofbiz/base/util/cache/UtilCache.java | 2 +-
.../base/util/collections/FlexibleMapAccessor.java | 2 +-
.../util/collections/FlexibleServletAccessor.java | 2 +-
.../ofbiz/base/util/collections/GenericMap.java | 2 +-
.../util/collections/GenericMapCollection.java | 2 +-
.../base/util/collections/GenericMapEntry.java | 2 +-
.../base/util/collections/GenericMapEntrySet.java | 2 +-
.../base/util/collections/GenericMapKeySet.java | 2 +-
.../ofbiz/base/util/collections/GenericMapSet.java | 2 +-
.../base/util/collections/GenericMapValues.java | 2 +-
.../base/util/collections/IteratorWrapper.java | 2 +-
.../apache/ofbiz/base/util/collections/LRUMap.java | 2 +-
.../ofbiz/base/util/collections/LifoSet.java | 2 +-
.../ofbiz/base/util/collections/LocalizedMap.java | 2 +-
.../ofbiz/base/util/collections/MapComparator.java | 2 +-
.../ofbiz/base/util/collections/MapContext.java | 2 +-
.../ofbiz/base/util/collections/MapStack.java | 2 +-
.../util/collections/MultivaluedMapContext.java | 2 +-
.../collections/MultivaluedMapContextAdapter.java | 2 +-
.../ofbiz/base/util/collections/PagedList.java | 2 +-
.../base/util/collections/ReadOnlyMapEntry.java | 2 +-
.../util/collections/ResourceBundleMapWrapper.java | 2 +-
.../base/util/string/FlexibleStringExpander.java | 2 +-
.../ofbiz/base/util/string/IUelMappingLibrary.java | 2 +-
.../ofbiz/base/util/string/JuelConnector.java | 2 +-
.../ofbiz/base/util/string/NodeELResolver.java | 2 +-
.../ofbiz/base/util/string/UelFunctions.java | 2 +-
.../apache/ofbiz/base/util/string/UelMapping.java | 2 +-
.../org/apache/ofbiz/base/util/string/UelUtil.java | 2 +-
.../base/util/template/OfbizBeansWrapper.java | 2 +-
.../ofbiz/base/util/template/XslTransform.java | 2 +-
.../MultivaluedMapContextAdapterTests.java | 2 +-
.../collections/MultivaluedMapContextTests.java | 2 +-
.../container/ComponentContainerTestSupport.java | 2 +-
.../base/conversion/TestDomainModelConversion.java | 2 +-
.../ofbiz/base/crypto/ConfigCryptoUtilTest.java | 2 +-
.../base/secret/FallbackSecretProviderTest.java | 2 +-
.../base/secret/FileBasedSecretProviderTest.java | 2 +-
.../base/secret/SecretProviderFactoryTest.java | 2 +-
.../base/secret/SecretProviderHelpersTest.java | 2 +-
.../ofbiz/base/secret/SecretValueResolverTest.java | 2 +-
.../org/apache/ofbiz/base/util/UtilHtmlTest.java | 2 +-
.../org/apache/ofbiz/base/util/UtilURLTests.java | 2 +-
.../base/util/template/FreeMarkerWorkerTests.java | 2 +-
.../catalina/container/CatalinaContainer.java | 2 +-
.../container/CorrelationFieldProvider.java | 2 +-
.../ofbiz/catalina/container/CorrelationValve.java | 2 +-
.../container/CrossSubdomainSessionValve.java | 2 +-
.../ofbiz/catalina/container/FilterJars.java | 2 +-
.../container/HashedCredentialHandler.java | 2 +-
.../ofbiz/catalina/container/OFBizRealm.java | 2 +-
.../container/SimpleCredentialHandler.java | 2 +-
.../catalina/container/SslAcceleratorValve.java | 2 +-
.../catalina/container/CorrelationValveTests.java | 2 +-
.../org/apache/ofbiz/common/CdyneServices.java | 2 +-
.../java/org/apache/ofbiz/common/CommonEvents.java | 2 +-
.../org/apache/ofbiz/common/CommonServices.java | 2 +-
.../org/apache/ofbiz/common/CommonWorkers.java | 2 +-
.../apache/ofbiz/common/DataModelConstants.java | 2 +-
.../java/org/apache/ofbiz/common/FindServices.java | 2 +-
.../java/org/apache/ofbiz/common/FtpServices.java | 2 +-
.../ofbiz/common/JsLanguageFileMappingCreator.java | 2 +-
.../ofbiz/common/JsLanguageFilesMapping.java | 2 +-
.../ofbiz/common/JsLanguageFilesMappingUtil.java | 2 +-
.../org/apache/ofbiz/common/KeywordSearchUtil.java | 2 +-
.../org/apache/ofbiz/common/UrlServletHelper.java | 2 +-
.../ofbiz/common/authentication/AuthHelper.java | 2 +-
.../authentication/AuthenticationComparator.java | 2 +-
.../common/authentication/api/Authenticator.java | 2 +-
.../authentication/api/AuthenticatorException.java | 2 +-
.../example/TestFailAuthenticator.java | 2 +-
.../example/TestPassAuthenticator.java | 2 +-
.../apache/ofbiz/common/email/EmailServices.java | 2 +-
.../ofbiz/common/email/MailSmtpConfigUtil.java | 2 +-
.../ofbiz/common/email/NotificationServices.java | 2 +-
.../common/email/SmtpOAuth2TokenProvider.java | 2 +-
.../org/apache/ofbiz/common/geo/GeoServices.java | 2 +-
.../org/apache/ofbiz/common/geo/GeoWorker.java | 2 +-
.../apache/ofbiz/common/image/ImageTransform.java | 2 +-
.../common/login/LdapAuthenticationServices.java | 2 +-
.../apache/ofbiz/common/login/LoginServices.java | 2 +-
.../apache/ofbiz/common/period/PeriodWorker.java | 2 +-
.../common/preferences/PreferenceServices.java | 2 +-
.../ofbiz/common/preferences/PreferenceWorker.java | 2 +-
.../ofbiz/common/scripting/ContextHelper.java | 2 +-
.../ofbiz/common/scripting/ScriptHelperImpl.java | 2 +-
.../apache/ofbiz/common/status/StatusServices.java | 2 +-
.../apache/ofbiz/common/status/StatusWorker.java | 2 +-
.../ofbiz/common/telecom/TelecomServices.java | 2 +-
.../ofbiz/common/email/EmailServicesDkimTests.java | 2 +-
.../common/email/EmailServicesInjectionTests.java | 2 +-
.../apache/ofbiz/common/test/PerformFindTests.java | 2 +-
.../java/org/apache/ofbiz/datafile/DataFile.java | 2 +-
.../apache/ofbiz/datafile/DataFile2EntityXml.java | 2 +-
.../apache/ofbiz/datafile/DataFileException.java | 2 +-
.../org/apache/ofbiz/datafile/ModelDataFile.java | 2 +-
.../apache/ofbiz/datafile/ModelDataFileReader.java | 2 +-
.../java/org/apache/ofbiz/datafile/ModelField.java | 2 +-
.../org/apache/ofbiz/datafile/ModelRecord.java | 2 +-
.../java/org/apache/ofbiz/datafile/Record.java | 2 +-
.../org/apache/ofbiz/datafile/RecordIterator.java | 2 +-
.../apache/ofbiz/entity/DataSourceContainer.java | 2 +-
.../apache/ofbiz/entity/DelegatorContainer.java | 2 +-
.../apache/ofbiz/entity/EntityCryptoException.java | 2 +-
.../apache/ofbiz/entity/EntityLockedException.java | 2 +-
.../ofbiz/entity/GenericCreateException.java | 2 +-
.../ofbiz/entity/GenericDataSourceException.java | 2 +-
.../ofbiz/entity/GenericDuplicateKeyException.java | 2 +-
.../ofbiz/entity/GenericEntityConfException.java | 2 +-
.../ofbiz/entity/GenericEntityException.java | 2 +-
.../entity/GenericEntityNotFoundException.java | 2 +-
.../apache/ofbiz/entity/GenericFindException.java | 2 +-
.../apache/ofbiz/entity/GenericModelException.java | 2 +-
.../ofbiz/entity/GenericNoSuchEntityException.java | 2 +-
.../entity/GenericNotImplementedException.java | 2 +-
.../java/org/apache/ofbiz/entity/GenericPK.java | 2 +-
.../ofbiz/entity/GenericRemoveException.java | 2 +-
.../entity/GenericResultSetClosedException.java | 2 +-
.../apache/ofbiz/entity/GenericStoreException.java | 2 +-
.../java/org/apache/ofbiz/entity/GenericValue.java | 2 +-
.../apache/ofbiz/entity/cache/AbstractCache.java | 2 +-
.../entity/cache/AbstractEntityConditionCache.java | 2 +-
.../java/org/apache/ofbiz/entity/cache/Cache.java | 2 +-
.../org/apache/ofbiz/entity/cache/EntityCache.java | 2 +-
.../apache/ofbiz/entity/cache/EntityListCache.java | 2 +-
.../ofbiz/entity/cache/EntityObjectCache.java | 2 +-
.../ofbiz/entity/condition/EntityClause.java | 2 +-
.../entity/condition/EntityComparisonOperator.java | 2 +-
.../ofbiz/entity/condition/EntityCondition.java | 2 +-
.../entity/condition/EntityConditionBuilder.java | 2 +-
.../entity/condition/EntityConditionList.java | 2 +-
.../entity/condition/EntityConditionListBase.java | 2 +-
.../entity/condition/EntityConditionParam.java | 2 +-
.../entity/condition/EntityConditionValue.java | 2 +-
.../condition/EntityDateFilterCondition.java | 2 +-
.../apache/ofbiz/entity/condition/EntityExpr.java | 2 +-
.../ofbiz/entity/condition/EntityFieldMap.java | 2 +-
.../ofbiz/entity/condition/EntityFieldValue.java | 2 +-
.../ofbiz/entity/condition/EntityFunction.java | 2 +-
.../ofbiz/entity/condition/EntityJoinOperator.java | 2 +-
.../ofbiz/entity/condition/EntityNotCondition.java | 2 +-
.../ofbiz/entity/condition/EntityOperator.java | 2 +-
.../ofbiz/entity/condition/EntityWhereString.java | 2 +-
.../apache/ofbiz/entity/condition/OrderByItem.java | 2 +-
.../apache/ofbiz/entity/condition/OrderByList.java | 2 +-
.../entity/config/model/ConnectionFactory.java | 2 +-
.../ofbiz/entity/config/model/Datasource.java | 2 +-
.../entity/config/model/DebugXaResources.java | 2 +-
.../entity/config/model/DelegatorElement.java | 2 +-
.../ofbiz/entity/config/model/EntityConfig.java | 2 +-
.../entity/config/model/EntityDataReader.java | 2 +-
.../ofbiz/entity/config/model/EntityEcaReader.java | 2 +-
.../entity/config/model/EntityGroupReader.java | 2 +-
.../entity/config/model/EntityModelReader.java | 2 +-
.../ofbiz/entity/config/model/FieldType.java | 2 +-
.../apache/ofbiz/entity/config/model/GroupMap.java | 2 +-
.../ofbiz/entity/config/model/InlineJdbc.java | 2 +-
.../ofbiz/entity/config/model/JdbcElement.java | 2 +-
.../apache/ofbiz/entity/config/model/JndiJdbc.java | 2 +-
.../apache/ofbiz/entity/config/model/ReadData.java | 2 +-
.../apache/ofbiz/entity/config/model/Resource.java | 2 +-
.../ofbiz/entity/config/model/ResourceLoader.java | 2 +-
.../ofbiz/entity/config/model/SqlLoadPath.java | 2 +-
.../entity/config/model/TransactionFactory.java | 2 +-
.../config/model/TransactionManagerJndi.java | 2 +-
.../ofbiz/entity/config/model/TyrexDataSource.java | 2 +-
.../entity/config/model/UserTransactionJndi.java | 2 +-
.../ofbiz/entity/connection/ConnectionFactory.java | 2 +-
.../entity/connection/DBCPConnectionFactory.java | 2 +-
.../entity/connection/DebugManagedDataSource.java | 2 +-
.../apache/ofbiz/entity/datasource/GenericDAO.java | 2 +-
.../ofbiz/entity/datasource/GenericHelper.java | 2 +-
.../ofbiz/entity/datasource/GenericHelperDAO.java | 2 +-
.../entity/datasource/GenericHelperFactory.java | 2 +-
.../ofbiz/entity/datasource/GenericHelperInfo.java | 2 +-
.../ofbiz/entity/datasource/ReadOnlyHelperDAO.java | 2 +-
.../apache/ofbiz/entity/eca/EntityEcaHandler.java | 2 +-
.../apache/ofbiz/entity/finder/ByAndFinder.java | 2 +-
.../ofbiz/entity/finder/ByConditionFinder.java | 2 +-
.../ofbiz/entity/finder/EntityFinderUtil.java | 2 +-
.../org/apache/ofbiz/entity/finder/Finder.java | 2 +-
.../org/apache/ofbiz/entity/finder/ListFinder.java | 2 +-
.../ofbiz/entity/jdbc/AbstractCursorHandler.java | 2 +-
.../ofbiz/entity/jdbc/ConnectionFactoryLoader.java | 2 +-
.../apache/ofbiz/entity/jdbc/CursorConnection.java | 2 +-
.../apache/ofbiz/entity/jdbc/CursorResultSet.java | 2 +-
.../apache/ofbiz/entity/jdbc/CursorStatement.java | 2 +-
.../org/apache/ofbiz/entity/jdbc/DatabaseUtil.java | 2 +-
.../entity/jdbc/ExecQueryCallbackFunctionIF.java | 2 +-
.../apache/ofbiz/entity/jdbc/JdbcValueHandler.java | 2 +-
.../org/apache/ofbiz/entity/jdbc/SQLProcessor.java | 2 +-
.../org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java | 2 +-
.../ofbiz/entity/model/DynamicViewEntity.java | 2 +-
.../org/apache/ofbiz/entity/model/ModelChild.java | 2 +-
.../ofbiz/entity/model/ModelEntityChecker.java | 2 +-
.../org/apache/ofbiz/entity/model/ModelField.java | 2 +-
.../apache/ofbiz/entity/model/ModelFieldType.java | 2 +-
.../ofbiz/entity/model/ModelFieldTypeReader.java | 2 +-
.../ofbiz/entity/model/ModelGroupReader.java | 2 +-
.../org/apache/ofbiz/entity/model/ModelIndex.java | 2 +-
.../org/apache/ofbiz/entity/model/ModelInfo.java | 2 +-
.../org/apache/ofbiz/entity/model/ModelKeyMap.java | 2 +-
.../org/apache/ofbiz/entity/model/ModelReader.java | 2 +-
.../org/apache/ofbiz/entity/model/ModelUtil.java | 2 +-
.../apache/ofbiz/entity/model/ModelViewEntity.java | 2 +-
.../ofbiz/entity/serialize/SerializeException.java | 2 +-
.../ofbiz/entity/serialize/XmlSerializable.java | 2 +-
.../ofbiz/entity/serialize/XmlSerializer.java | 2 +-
.../ofbiz/entity/testtools/EntityTestCase.java | 2 +-
.../ofbiz/entity/transaction/DebugXaResource.java | 2 +-
.../entity/transaction/DumbTransactionFactory.java | 2 +-
.../transaction/GenericTransactionException.java | 2 +-
.../entity/transaction/GenericXaResource.java | 2 +-
.../transaction/GeronimoTransactionFactory.java | 2 +-
.../entity/transaction/JNDITransactionFactory.java | 2 +-
.../entity/transaction/TransactionFactory.java | 2 +-
.../transaction/TransactionFactoryLoader.java | 2 +-
.../ofbiz/entity/transaction/TransactionUtil.java | 2 +-
.../org/apache/ofbiz/entity/util/Converters.java | 2 +-
.../ofbiz/entity/util/DistributedCacheClear.java | 2 +-
.../ofbiz/entity/util/EntityBatchIterator.java | 2 +-
.../apache/ofbiz/entity/util/EntityDataAssert.java | 2 +-
.../apache/ofbiz/entity/util/EntityDataLoader.java | 2 +-
.../ofbiz/entity/util/EntityFindOptions.java | 2 +-
.../ofbiz/entity/util/EntityListIterator.java | 2 +-
.../org/apache/ofbiz/entity/util/EntityQuery.java | 2 +-
.../apache/ofbiz/entity/util/EntitySaxReader.java | 2 +-
.../ofbiz/entity/util/EntityStoreOptions.java | 2 +-
.../apache/ofbiz/entity/util/EntityTypeUtil.java | 2 +-
.../org/apache/ofbiz/entity/util/EntityUtil.java | 2 +-
.../ofbiz/entity/util/EntityUtilProperties.java | 2 +-
.../org/apache/ofbiz/entity/util/SequenceUtil.java | 2 +-
.../apache/ofbiz/entity/DelegatorUnitTests.java | 2 +-
.../entity/condition/EntityFunctionTests.java | 2 +-
.../model/ModelViewEntityComplexAliasTests.java | 2 +-
.../ofbiz/entity/test/EntityCryptoTestSuite.java | 2 +-
.../ofbiz/entity/test/EntityQueryTestSuite.java | 2 +-
.../apache/ofbiz/entity/test/EntityTestSuite.java | 2 +-
.../ofbiz/entity/test/EntityUtilTestSuite.java | 2 +-
.../apache/ofbiz/entityext/EntityGroupUtil.java | 2 +-
.../ofbiz/entityext/EntityServiceFactory.java | 2 +-
.../ofbiz/entityext/EntityWatchServices.java | 2 +-
.../ofbiz/entityext/cache/EntityCacheServices.java | 2 +-
.../entityext/data/EntityDataLoadContainer.java | 2 +-
.../ofbiz/entityext/data/EntityDataServices.java | 2 +-
.../ofbiz/entityext/data/UpgradeServices.java | 2 +-
.../ofbiz/entityext/eca/DelegatorEcaHandler.java | 2 +-
.../ofbiz/entityext/eca/EntityEcaAction.java | 2 +-
.../ofbiz/entityext/eca/EntityEcaCondition.java | 2 +-
.../ofbiz/entityext/eca/EntityEcaException.java | 2 +-
.../apache/ofbiz/entityext/eca/EntityEcaRule.java | 2 +-
.../ofbiz/entityext/eca/EntityEcaSetField.java | 2 +-
.../apache/ofbiz/entityext/eca/EntityEcaUtil.java | 2 +-
.../synchronization/EntitySyncContext.java | 2 +-
.../synchronization/EntitySyncServices.java | 2 +-
.../org/apache/ofbiz/minilang/MiniLangElement.java | 2 +-
.../apache/ofbiz/minilang/MiniLangException.java | 2 +-
.../ofbiz/minilang/MiniLangRuntimeException.java | 2 +-
.../org/apache/ofbiz/minilang/MiniLangUtil.java | 2 +-
.../apache/ofbiz/minilang/MiniLangValidate.java | 2 +-
.../apache/ofbiz/minilang/SimpleMapProcessor.java | 2 +-
.../org/apache/ofbiz/minilang/SimpleMethod.java | 2 +-
.../apache/ofbiz/minilang/SimpleServiceEngine.java | 2 +-
.../apache/ofbiz/minilang/ValidationException.java | 2 +-
.../minilang/artifact/ArtifactInfoContext.java | 2 +-
.../apache/ofbiz/minilang/method/FieldObject.java | 2 +-
.../ofbiz/minilang/method/MessageElement.java | 2 +-
.../ofbiz/minilang/method/MethodContext.java | 2 +-
.../apache/ofbiz/minilang/method/MethodObject.java | 2 +-
.../ofbiz/minilang/method/MethodOperation.java | 2 +-
.../apache/ofbiz/minilang/method/StringObject.java | 2 +-
.../minilang/method/callops/CallClassMethod.java | 2 +-
.../minilang/method/callops/CallObjectMethod.java | 2 +-
.../ofbiz/minilang/method/callops/CallScript.java | 2 +-
.../ofbiz/minilang/method/callops/CallService.java | 2 +-
.../minilang/method/callops/CallServiceAsynch.java | 2 +-
.../method/callops/CallSimpleMapProcessor.java | 2 +-
.../minilang/method/callops/CallSimpleMethod.java | 2 +-
.../minilang/method/callops/FlexibleMessage.java | 2 +-
.../ofbiz/minilang/method/callops/Return.java | 2 +-
.../minilang/method/callops/SetServiceFields.java | 2 +-
.../method/conditional/CombinedCondition.java | 2 +-
.../ofbiz/minilang/method/conditional/Compare.java | 2 +-
.../method/conditional/CompareCondition.java | 2 +-
.../method/conditional/CompareFieldCondition.java | 2 +-
.../minilang/method/conditional/Conditional.java | 2 +-
.../method/conditional/ConditionalFactory.java | 2 +-
.../ofbiz/minilang/method/conditional/ElseIf.java | 2 +-
.../method/conditional/EmptyCondition.java | 2 +-
.../method/conditional/HasPermissionCondition.java | 2 +-
.../minilang/method/conditional/MasterIf.java | 2 +-
.../method/conditional/RegexpCondition.java | 2 +-
.../conditional/ValidateMethodCondition.java | 2 +-
.../minilang/method/entityops/ClearCacheLine.java | 2 +-
.../method/entityops/ClearEntityCaches.java | 2 +-
.../minilang/method/entityops/CloneValue.java | 2 +-
.../minilang/method/entityops/CreateValue.java | 2 +-
.../ofbiz/minilang/method/entityops/EntityAnd.java | 2 +-
.../minilang/method/entityops/EntityCondition.java | 2 +-
.../minilang/method/entityops/EntityCount.java | 2 +-
.../minilang/method/entityops/EntityData.java | 2 +-
.../ofbiz/minilang/method/entityops/EntityOne.java | 2 +-
.../minilang/method/entityops/EntityOperation.java | 2 +-
.../minilang/method/entityops/FilterListByAnd.java | 2 +-
.../method/entityops/FilterListByDate.java | 2 +-
.../ofbiz/minilang/method/entityops/FindByAnd.java | 2 +-
.../method/entityops/FindByPrimaryKey.java | 2 +-
.../minilang/method/entityops/GetRelated.java | 2 +-
.../minilang/method/entityops/GetRelatedOne.java | 2 +-
.../minilang/method/entityops/MakeNextSeqId.java | 2 +-
.../ofbiz/minilang/method/entityops/MakeValue.java | 2 +-
.../minilang/method/entityops/OrderValueList.java | 2 +-
.../minilang/method/entityops/RefreshValue.java | 2 +-
.../minilang/method/entityops/RemoveByAnd.java | 2 +-
.../minilang/method/entityops/RemoveList.java | 2 +-
.../minilang/method/entityops/RemoveRelated.java | 2 +-
.../minilang/method/entityops/RemoveValue.java | 2 +-
.../method/entityops/SequencedIdToEnv.java | 2 +-
.../method/entityops/SetCurrentUserLogin.java | 2 +-
.../minilang/method/entityops/SetNonpkFields.java | 2 +-
.../minilang/method/entityops/SetPkFields.java | 2 +-
.../ofbiz/minilang/method/entityops/StoreList.java | 2 +-
.../minilang/method/entityops/StoreValue.java | 2 +-
.../method/entityops/TransactionBegin.java | 2 +-
.../method/entityops/TransactionCommit.java | 2 +-
.../method/entityops/TransactionRollback.java | 2 +-
.../ofbiz/minilang/method/envops/AddError.java | 2 +-
.../ofbiz/minilang/method/envops/Assert.java | 2 +-
.../apache/ofbiz/minilang/method/envops/Break.java | 2 +-
.../ofbiz/minilang/method/envops/CheckErrors.java | 2 +-
.../ofbiz/minilang/method/envops/CheckId.java | 2 +-
.../ofbiz/minilang/method/envops/ClearField.java | 2 +-
.../ofbiz/minilang/method/envops/Continue.java | 2 +-
.../ofbiz/minilang/method/envops/CreateObject.java | 2 +-
.../ofbiz/minilang/method/envops/FieldToList.java | 2 +-
.../minilang/method/envops/FirstFromList.java | 2 +-
.../ofbiz/minilang/method/envops/Iterate.java | 2 +-
.../ofbiz/minilang/method/envops/IterateMap.java | 2 +-
.../ofbiz/minilang/method/envops/ListToList.java | 2 +-
.../apache/ofbiz/minilang/method/envops/Loop.java | 2 +-
.../ofbiz/minilang/method/envops/MapToMap.java | 2 +-
.../apache/ofbiz/minilang/method/envops/Now.java | 2 +-
.../ofbiz/minilang/method/envops/OrderMapList.java | 2 +-
.../ofbiz/minilang/method/envops/SetCalendar.java | 2 +-
.../ofbiz/minilang/method/envops/SetOperation.java | 2 +-
.../ofbiz/minilang/method/envops/StringAppend.java | 2 +-
.../ofbiz/minilang/method/envops/StringToList.java | 2 +-
.../ofbiz/minilang/method/envops/ToString.java | 2 +-
.../apache/ofbiz/minilang/method/envops/While.java | 2 +-
.../minilang/method/eventops/FieldToRequest.java | 2 +-
.../minilang/method/eventops/FieldToSession.java | 2 +-
.../method/eventops/RequestParametersToList.java | 2 +-
.../minilang/method/eventops/RequestToField.java | 2 +-
.../minilang/method/eventops/SessionToField.java | 2 +-
.../method/eventops/WebappPropertyToField.java | 2 +-
.../minilang/method/ifops/CheckPermission.java | 2 +-
.../ofbiz/minilang/method/ifops/IfInstanceOf.java | 2 +-
.../ofbiz/minilang/method/ifops/IfNotEmpty.java | 2 +-
.../ofbiz/minilang/method/otherops/Calculate.java | 2 +-
.../apache/ofbiz/minilang/method/otherops/Log.java | 2 +-
.../minilang/method/otherops/PropertyToField.java | 2 +-
.../ofbiz/minilang/method/otherops/Trace.java | 2 +-
.../minilang/method/serviceops/FieldToResult.java | 2 +-
.../ofbiz/minilang/operation/BaseCompare.java | 2 +-
.../apache/ofbiz/minilang/operation/Compare.java | 2 +-
.../ofbiz/minilang/operation/CompareField.java | 2 +-
.../ofbiz/minilang/operation/ConstantOper.java | 2 +-
.../apache/ofbiz/minilang/operation/Convert.java | 2 +-
.../org/apache/ofbiz/minilang/operation/Copy.java | 2 +-
.../ofbiz/minilang/operation/InFieldOper.java | 2 +-
.../ofbiz/minilang/operation/MakeInString.java | 2 +-
.../minilang/operation/MakeInStringOperation.java | 2 +-
.../ofbiz/minilang/operation/MapProcessor.java | 2 +-
.../apache/ofbiz/minilang/operation/NotEmpty.java | 2 +-
.../ofbiz/minilang/operation/PropertyOper.java | 2 +-
.../apache/ofbiz/minilang/operation/Regexp.java | 2 +-
.../minilang/operation/SimpleMapOperation.java | 2 +-
.../ofbiz/minilang/operation/SimpleMapProcess.java | 2 +-
.../ofbiz/minilang/operation/ValidateMethod.java | 2 +-
.../apache/ofbiz/minilang/test/MiniLangTests.java | 2 +-
.../ofbiz/ws/rs/ServiceNameContextHolder.java | 2 +-
.../apache/ofbiz/ws/rs/annotation/AuthToken.java | 2 +-
.../org/apache/ofbiz/ws/rs/annotation/Secured.java | 2 +-
.../ofbiz/ws/rs/common/AuthenticationScheme.java | 2 +-
.../apache/ofbiz/ws/rs/core/OFBizApiConfig.java | 2 +-
.../apache/ofbiz/ws/rs/core/ResponseStatus.java | 2 +-
.../ofbiz/ws/rs/examples/RestExampleServices.java | 2 +-
.../ofbiz/ws/rs/examples/RestOrderExample.java | 2 +-
.../ofbiz/ws/rs/examples/RestOrderItemExample.java | 2 +-
.../ws/rs/filters/ServiceContextCleanupFilter.java | 2 +-
.../ofbiz/ws/rs/listener/ApiContextListener.java | 2 +-
.../org/apache/ofbiz/ws/rs/model/ModelApi.java | 2 +-
.../apache/ofbiz/ws/rs/model/ModelApiReader.java | 2 +-
.../org/apache/ofbiz/ws/rs/model/ModelExample.java | 2 +-
.../org/apache/ofbiz/ws/rs/model/ModelMapping.java | 2 +-
.../apache/ofbiz/ws/rs/model/ModelOperation.java | 2 +-
.../apache/ofbiz/ws/rs/model/ModelQueryParam.java | 2 +-
.../apache/ofbiz/ws/rs/model/ModelResource.java | 2 +-
.../ofbiz/ws/rs/openapi/OFBizOpenApiReader.java | 2 +-
.../ofbiz/ws/rs/openapi/OFBizOpenApiUiFilter.java | 2 +-
.../ofbiz/ws/rs/openapi/OFBizResourceScanner.java | 2 +-
.../ofbiz/ws/rs/process/RestRequestHandler.java | 2 +-
.../ofbiz/ws/rs/process/ServiceRequestHandler.java | 2 +-
.../ofbiz/ws/rs/resources/ApiRootResource.java | 2 +-
.../ws/rs/resources/AuthenticationResource.java | 2 +-
.../ofbiz/ws/rs/resources/OpenApiResource.java | 2 +-
.../org/apache/ofbiz/ws/rs/response/Error.java | 2 +-
.../org/apache/ofbiz/ws/rs/response/Success.java | 2 +-
.../ofbiz/ws/rs/security/auth/APIAuthFilter.java | 2 +-
.../ofbiz/ws/rs/security/auth/APICorsFilter.java | 2 +-
.../ws/rs/security/auth/HttpBasicAuthFilter.java | 2 +-
.../apache/ofbiz/ws/rs/services/RestServices.java | 2 +-
.../rs/spi/impl/GenericServiceExceptionMapper.java | 2 +-
.../ws/rs/spi/impl/GlobalExceptionMapper.java | 2 +-
.../apache/ofbiz/ws/rs/spi/impl/JacksonConfig.java | 2 +-
.../ofbiz/ws/rs/spi/impl/LinkSerializer.java | 2 +-
.../org/apache/ofbiz/ws/rs/util/OpenApiUtil.java | 2 +-
.../org/apache/ofbiz/ws/rs/util/RestApiUtil.java | 2 +-
.../ofbiz/ws/rs/util/RestListResponseBuilder.java | 2 +-
.../apache/ofbiz/ws/rs/util/RestQueryOptions.java | 2 +-
.../apache/ofbiz/ws/rs/util/RestServiceUtil.java | 2 +-
.../ofbiz/ws/rs/util/ServiceRequestWorker.java | 2 +-
.../ofbiz/ws/rs/core/OFBizApiConfigTest.java | 2 +-
.../ofbiz/ws/rs/core/ResponseStatusTest.java | 2 +-
.../ws/rs/listener/ApiContextListenerTest.java | 2 +-
.../ofbiz/ws/rs/model/ModelApiReaderTest.java | 2 +-
.../ws/rs/openapi/OFBizOpenApiReaderTest.java | 2 +-
.../ws/rs/process/RestRequestHandlerTest.java | 2 +-
.../ofbiz/ws/rs/resources/ApiRootResourceTest.java | 2 +-
.../ofbiz/ws/rs/resources/OpenApiResourceTest.java | 2 +-
.../ws/rs/spi/impl/GlobalExceptionMapperTest.java | 2 +-
.../ofbiz/ws/rs/test/RestTestHttpRequest.java | 2 +-
.../apache/ofbiz/ws/rs/test/RestTestServices.java | 2 +-
.../apache/ofbiz/ws/rs/util/OpenApiUtilTest.java | 2 +-
.../ws/rs/util/RestApiUtilPaginationTest.java | 2 +-
.../apache/ofbiz/ws/rs/util/RestApiUtilTest.java | 2 +-
.../ws/rs/util/RestListResponseBuilderTest.java | 2 +-
.../ofbiz/ws/rs/util/RestQueryOptionsTest.java | 2 +-
.../apache/ofbiz/security/CsrfDefenseStrategy.java | 2 +-
.../java/org/apache/ofbiz/security/CsrfUtil.java | 2 +-
.../ofbiz/security/ICsrfDefenseStrategy.java | 2 +-
.../ofbiz/security/NoCsrfDefenseStrategy.java | 2 +-
.../apache/ofbiz/security/SecuredFreemarker.java | 2 +-
.../org/apache/ofbiz/security/SecuredUpload.java | 2 +-
.../java/org/apache/ofbiz/security/Security.java | 2 +-
.../security/SecurityConfigurationException.java | 2 +-
.../org/apache/ofbiz/security/SecurityFactory.java | 2 +-
.../org/apache/ofbiz/security/SecurityUtil.java | 2 +-
.../org/apache/ofbiz/service/DispatchContext.java | 2 +-
.../ofbiz/service/ExecutionServiceException.java | 2 +-
.../ofbiz/service/GeneralServiceException.java | 2 +-
.../ofbiz/service/GenericAbstractDispatcher.java | 2 +-
.../ofbiz/service/GenericDispatcherFactory.java | 2 +-
.../org/apache/ofbiz/service/GenericRequester.java | 2 +-
.../apache/ofbiz/service/GenericResultWaiter.java | 2 +-
.../ofbiz/service/GenericServiceCallback.java | 2 +-
.../ofbiz/service/GenericServiceException.java | 2 +-
.../org/apache/ofbiz/service/LocalDispatcher.java | 2 +-
.../ofbiz/service/LocalDispatcherFactory.java | 2 +-
.../java/org/apache/ofbiz/service/ModelParam.java | 2 +-
.../org/apache/ofbiz/service/ModelPermGroup.java | 2 +-
.../org/apache/ofbiz/service/ModelPermission.java | 2 +-
.../org/apache/ofbiz/service/ModelService.java | 2 +-
.../apache/ofbiz/service/ModelServiceIface.java | 2 +-
.../apache/ofbiz/service/ModelServiceReader.java | 2 +-
.../org/apache/ofbiz/service/RunningService.java | 2 +-
.../apache/ofbiz/service/ServiceAuthException.java | 2 +-
.../org/apache/ofbiz/service/ServiceContainer.java | 2 +-
.../apache/ofbiz/service/ServiceDispatcher.java | 2 +-
.../ofbiz/service/ServiceErrorException.java | 2 +-
.../ofbiz/service/ServiceSynchronization.java | 2 +-
.../java/org/apache/ofbiz/service/ServiceUtil.java | 2 +-
.../ofbiz/service/ServiceValidationException.java | 2 +-
.../org/apache/ofbiz/service/ServiceXaWrapper.java | 2 +-
.../ofbiz/service/calendar/ExpressionUiHelper.java | 2 +-
.../ofbiz/service/calendar/RecurrenceInfo.java | 2 +-
.../service/calendar/RecurrenceInfoException.java | 2 +-
.../ofbiz/service/calendar/RecurrenceRule.java | 2 +-
.../service/calendar/RecurrenceRuleException.java | 2 +-
.../ofbiz/service/calendar/RecurrenceUtil.java | 2 +-
.../ofbiz/service/calendar/TemporalExpression.java | 2 +-
.../calendar/TemporalExpressionPrinter.java | 2 +-
.../calendar/TemporalExpressionVisitor.java | 2 +-
.../service/calendar/TemporalExpressionWorker.java | 2 +-
.../service/calendar/TemporalExpressions.java | 2 +-
.../service/config/ServiceConfigException.java | 2 +-
.../service/config/ServiceConfigListener.java | 2 +-
.../ofbiz/service/config/ServiceConfigUtil.java | 2 +-
.../ofbiz/service/config/model/Authorization.java | 2 +-
.../apache/ofbiz/service/config/model/Engine.java | 2 +-
.../ofbiz/service/config/model/GlobalServices.java | 2 +-
.../ofbiz/service/config/model/JmsService.java | 2 +-
.../ofbiz/service/config/model/Notification.java | 2 +-
.../service/config/model/NotificationGroup.java | 2 +-
.../apache/ofbiz/service/config/model/Notify.java | 2 +-
.../ofbiz/service/config/model/Parameter.java | 2 +-
.../ofbiz/service/config/model/ResourceLoader.java | 2 +-
.../ofbiz/service/config/model/RunFromPool.java | 2 +-
.../apache/ofbiz/service/config/model/Server.java | 2 +-
.../ofbiz/service/config/model/ServiceConfig.java | 2 +-
.../ofbiz/service/config/model/ServiceEcas.java | 2 +-
.../ofbiz/service/config/model/ServiceEngine.java | 2 +-
.../ofbiz/service/config/model/ServiceGroups.java | 2 +-
.../service/config/model/ServiceLocation.java | 2 +-
.../ofbiz/service/config/model/StartupService.java | 2 +-
.../ofbiz/service/config/model/ThreadPool.java | 2 +-
.../apache/ofbiz/service/eca/ServiceEcaAction.java | 2 +-
.../ofbiz/service/eca/ServiceEcaCondition.java | 2 +-
.../apache/ofbiz/service/eca/ServiceEcaRule.java | 2 +-
.../ofbiz/service/eca/ServiceEcaSetField.java | 2 +-
.../apache/ofbiz/service/eca/ServiceEcaUtil.java | 2 +-
.../ofbiz/service/engine/AbstractEngine.java | 2 +-
.../ofbiz/service/engine/GenericAsyncEngine.java | 2 +-
.../apache/ofbiz/service/engine/GenericEngine.java | 2 +-
.../ofbiz/service/engine/GenericEngineFactory.java | 2 +-
.../apache/ofbiz/service/engine/GroovyEngine.java | 2 +-
.../ofbiz/service/engine/InterfaceEngine.java | 2 +-
.../apache/ofbiz/service/engine/RouteEngine.java | 2 +-
.../ofbiz/service/engine/SOAPClientEngine.java | 2 +-
.../apache/ofbiz/service/engine/ScriptEngine.java | 2 +-
.../ofbiz/service/engine/SoapSerializer.java | 2 +-
.../service/engine/StandardClojureEngine.java | 2 +-
.../ofbiz/service/engine/TrackedServiceEngine.java | 2 +-
.../org/apache/ofbiz/service/group/GroupModel.java | 2 +-
.../ofbiz/service/group/GroupServiceModel.java | 2 +-
.../ofbiz/service/group/ServiceGroupEngine.java | 2 +-
.../ofbiz/service/group/ServiceGroupReader.java | 2 +-
.../ofbiz/service/jms/AbstractJmsListener.java | 2 +-
.../ofbiz/service/jms/GenericMessageListener.java | 2 +-
.../ofbiz/service/jms/JmsListenerFactory.java | 2 +-
.../apache/ofbiz/service/jms/JmsQueueListener.java | 2 +-
.../apache/ofbiz/service/jms/JmsSerializer.java | 2 +-
.../apache/ofbiz/service/jms/JmsServiceEngine.java | 2 +-
.../apache/ofbiz/service/jms/JmsTopicListener.java | 2 +-
.../org/apache/ofbiz/service/job/AbstractJob.java | 2 +-
.../ofbiz/service/job/GenericServiceJob.java | 2 +-
.../ofbiz/service/job/InvalidJobException.java | 2 +-
.../java/org/apache/ofbiz/service/job/Job.java | 2 +-
.../org/apache/ofbiz/service/job/JobManager.java | 2 +-
.../ofbiz/service/job/JobManagerException.java | 2 +-
.../org/apache/ofbiz/service/job/JobPoller.java | 2 +-
.../org/apache/ofbiz/service/job/JobServices.java | 2 +-
.../java/org/apache/ofbiz/service/job/JobUtil.java | 2 +-
.../ofbiz/service/job/PersistedServiceJob.java | 2 +-
.../org/apache/ofbiz/service/job/PurgeJob.java | 2 +-
.../ofbiz/service/mail/JavaMailContainer.java | 2 +-
.../ofbiz/service/mail/MimeMessageWrapper.java | 2 +-
.../ofbiz/service/mail/ServiceMcaAction.java | 2 +-
.../ofbiz/service/mail/ServiceMcaCondition.java | 2 +-
.../apache/ofbiz/service/mail/ServiceMcaRule.java | 2 +-
.../apache/ofbiz/service/mail/ServiceMcaUtil.java | 2 +-
.../ofbiz/service/rmi/ExampleRemoteClient.java | 2 +-
.../apache/ofbiz/service/rmi/RemoteDispatcher.java | 2 +-
.../ofbiz/service/rmi/RemoteDispatcherImpl.java | 2 +-
.../ofbiz/service/rmi/RmiServiceContainer.java | 2 +-
.../apache/ofbiz/service/rmi/RmiServiceEngine.java | 2 +-
.../rmi/socket/ssl/SSLClientSocketFactory.java | 2 +-
.../rmi/socket/ssl/SSLServerSocketFactory.java | 2 +-
.../service/semaphore/SemaphoreFailException.java | 2 +-
.../service/semaphore/SemaphoreWaitException.java | 2 +-
.../ofbiz/service/semaphore/ServiceSemaphore.java | 2 +-
.../ofbiz/service/testtools/OFBizTestCase.java | 2 +-
.../apache/ofbiz/service/tracker/JobTracker.java | 2 +-
.../ofbiz/service/tracker/JobTrackerFactory.java | 2 +-
.../ofbiz/service/tracker/JobTrackerListener.java | 2 +-
.../service/test/GroovyDslServiceEngineTests.java | 2 +-
.../ofbiz/service/test/ServiceEngineTests.java | 2 +-
.../ofbiz/service/test/ServiceEntityAutoTests.java | 2 +-
.../ofbiz/service/test/ServicePermissionTests.java | 2 +-
.../org/apache/ofbiz/base/start/AdminClient.java | 2 +-
.../java/org/apache/ofbiz/base/start/Start.java | 2 +-
.../apache/ofbiz/base/start/StartupCommand.java | 2 +-
.../ofbiz/base/start/StartupCommandUtil.java | 2 +-
.../ofbiz/base/start/StartupControlPanel.java | 2 +-
.../apache/ofbiz/base/start/StartupException.java | 2 +-
.../ofbiz/base/start/OfbizStartupUnitTests.java | 2 +-
.../apache/ofbiz/testtools/BatchRunServices.java | 2 +-
.../apache/ofbiz/testtools/BatchRunTracker.java | 2 +-
.../ofbiz/testtools/EntityXmlAssertTest.java | 2 +-
.../apache/ofbiz/testtools/GroovyScriptAssert.java | 2 +-
.../apache/ofbiz/testtools/HttpsTestSupport.java | 2 +-
.../apache/ofbiz/testtools/Junit3ResultBridge.java | 2 +-
.../apache/ofbiz/testtools/JunitJupiterTest.java | 2 +-
.../apache/ofbiz/testtools/JunitSuiteWrapper.java | 2 +-
.../ofbiz/testtools/JupiterTestExtension.java | 2 +-
.../apache/ofbiz/testtools/JupiterTestHelper.java | 2 +-
.../org/apache/ofbiz/testtools/ModelTestSuite.java | 2 +-
.../apache/ofbiz/testtools/ReportingSupport.java | 2 +-
.../org/apache/ofbiz/testtools/ServiceTest.java | 2 +-
.../apache/ofbiz/testtools/SimpleMethodTest.java | 2 +-
.../org/apache/ofbiz/testtools/SuiteEntry.java | 2 +-
.../apache/ofbiz/testtools/SuiteReportLogger.java | 2 +-
.../apache/ofbiz/testtools/SuiteReportSink.java | 2 +-
.../ofbiz/testtools/SuiteXmlReportWriter.java | 2 +-
.../apache/ofbiz/testtools/TestRunContainer.java | 2 +-
.../org/apache/ofbiz/testtools/TestRunRecord.java | 2 +-
.../apache/ofbiz/testtools/TestRunServices.java | 2 +-
.../org/apache/ofbiz/testtools/TestRunTracker.java | 2 +-
.../ofbiz/testtools/BatchRunServicesTest.java | 2 +-
.../ofbiz/testtools/BatchRunTrackerTest.java | 2 +-
.../ofbiz/testtools/Junit3ResultBridgeTest.java | 2 +-
.../ofbiz/testtools/JupiterClassRunnerTest.java | 2 +-
.../testtools/JupiterInjectionGuardsTest.java | 2 +-
.../apache/ofbiz/testtools/ModelTestSuiteTest.java | 2 +-
.../org/apache/ofbiz/testtools/RecordingSink.java | 2 +-
.../org/apache/ofbiz/testtools/SuiteEntryTest.java | 2 +-
.../ofbiz/testtools/SuiteReportLoggerTest.java | 2 +-
.../ofbiz/testtools/SuiteReportSinkTest.java | 2 +-
.../ofbiz/testtools/SuiteXmlReportWriterTest.java | 2 +-
.../ofbiz/testtools/TestRunContainerTest.java | 2 +-
.../ofbiz/testtools/TestRunServicesTest.java | 2 +-
.../apache/ofbiz/testtools/TestRunTrackerTest.java | 2 +-
.../org/apache/ofbiz/webapp/AfterLoginEvents.java | 2 +-
.../apache/ofbiz/webapp/OfbizPathShortener.java | 2 +-
.../org/apache/ofbiz/webapp/OfbizUrlBuilder.java | 2 +-
.../org/apache/ofbiz/webapp/SeoConfigUtil.java | 2 +-
.../java/org/apache/ofbiz/webapp/WebAppUtil.java | 2 +-
.../ofbiz/webapp/control/ConfigXMLReader.java | 2 +-
.../apache/ofbiz/webapp/control/ContextFilter.java | 2 +-
.../control/ControlActivationEventListener.java | 2 +-
.../ofbiz/webapp/control/ControlEventListener.java | 2 +-
.../apache/ofbiz/webapp/control/ControlFilter.java | 2 +-
.../ofbiz/webapp/control/ControlServlet.java | 2 +-
.../apache/ofbiz/webapp/control/LoginCheck.java | 2 +-
.../ofbiz/webapp/control/LoginEventListener.java | 2 +-
.../apache/ofbiz/webapp/control/LoginWorker.java | 2 +-
.../webapp/control/MethodNotAllowedException.java | 2 +-
.../ofbiz/webapp/control/ProtectViewWorker.java | 2 +-
.../ofbiz/webapp/control/RequestHandler.java | 2 +-
.../webapp/control/RequestHandlerException.java | 2 +-
...questHandlerExceptionAllowExternalRequests.java | 2 +-
.../ofbiz/webapp/control/SameSiteFilter.java | 2 +-
.../control/WebAppConfigurationException.java | 2 +-
.../org/apache/ofbiz/webapp/event/CoreEvents.java | 2 +-
.../apache/ofbiz/webapp/event/EventFactory.java | 2 +-
.../apache/ofbiz/webapp/event/EventHandler.java | 2 +-
.../ofbiz/webapp/event/EventHandlerException.java | 2 +-
.../webapp/event/FileUploadProgressListener.java | 2 +-
.../ofbiz/webapp/event/JavaEventHandler.java | 2 +-
.../webapp/event/RequestBodyMapHandlerFactory.java | 2 +-
.../ofbiz/webapp/event/SOAPEventHandler.java | 2 +-
.../ofbiz/webapp/event/ServiceEventHandler.java | 2 +-
.../webapp/event/ServiceMultiEventHandler.java | 2 +-
.../ofbiz/webapp/event/SimpleEventHandler.java | 2 +-
.../org/apache/ofbiz/webapp/event/TestEvent.java | 2 +-
.../ofbiz/webapp/ftl/CsrfTokenAjaxTransform.java | 2 +-
.../webapp/ftl/CsrfTokenPairNonAjaxTransform.java | 2 +-
.../ofbiz/webapp/ftl/FreeMarkerViewHandler.java | 2 +-
.../ftl/JsLanguageFilesMappingTransform.java | 2 +-
.../org/apache/ofbiz/webapp/ftl/LoopWriter.java | 2 +-
.../ofbiz/webapp/ftl/OfbizAmountTransform.java | 2 +-
.../apache/ofbiz/webapp/ftl/OfbizCacheStorage.java | 2 +-
.../ofbiz/webapp/ftl/OfbizContentTransform.java | 2 +-
.../ofbiz/webapp/ftl/OfbizCurrencyTransform.java | 2 +-
.../ofbiz/webapp/ftl/OfbizNumberTransform.java | 2 +-
.../ofbiz/webapp/ftl/OfbizScreenTransform.java | 2 +-
.../apache/ofbiz/webapp/ftl/OfbizUrlTransform.java | 2 +-
.../webapp/ftl/RenderWrappedTextTransform.java | 2 +-
.../webapp/ftl/ScriptTagsFooterTransform.java | 2 +-
.../ofbiz/webapp/ftl/SetContextFieldTransform.java | 2 +-
.../webapp/ftl/SetRequestAttributeMethod.java | 2 +-
.../apache/ofbiz/webapp/stats/ServerHitBin.java | 2 +-
.../apache/ofbiz/webapp/stats/VisitHandler.java | 2 +-
.../apache/ofbiz/webapp/taglib/ContentUrlTag.java | 2 +-
.../ofbiz/webapp/view/AbstractViewHandler.java | 2 +-
.../apache/ofbiz/webapp/view/ApacheFopWorker.java | 2 +-
.../apache/ofbiz/webapp/view/JspViewHandler.java | 2 +-
.../org/apache/ofbiz/webapp/view/ViewFactory.java | 2 +-
.../org/apache/ofbiz/webapp/view/ViewHandler.java | 2 +-
.../ofbiz/webapp/view/ViewHandlerException.java | 2 +-
.../apache/ofbiz/webapp/webdav/PropFindHelper.java | 2 +-
.../apache/ofbiz/webapp/webdav/RequestHandler.java | 2 +-
.../ofbiz/webapp/webdav/RequestHandlerFactory.java | 2 +-
.../apache/ofbiz/webapp/webdav/ResponseHelper.java | 2 +-
.../apache/ofbiz/webapp/webdav/WebDavServlet.java | 2 +-
.../org/apache/ofbiz/webapp/webdav/WebDavUtil.java | 2 +-
.../ofbiz/webapp/website/WebSiteProperties.java | 2 +-
.../apache/ofbiz/webapp/website/WebSiteWorker.java | 2 +-
.../org/apache/ofbiz/webapp/WebAppUtilTests.java | 2 +-
.../org/apache/ofbiz/webtools/GenericWebEvent.java | 2 +-
.../org/apache/ofbiz/webtools/UtilCacheEvents.java | 2 +-
.../apache/ofbiz/webtools/WebToolsDbEvents.java | 2 +-
.../ofbiz/webtools/artifactinfo/RunTestEvents.java | 2 +-
.../webtools/secret/SecretAuditContainer.java | 2 +-
.../ofbiz/webtools/secret/SecretAuditEvent.java | 25 +++++++++++-----------
.../ofbiz/webtools/secret/SecretAuditLogger.java | 2 +-
.../ofbiz/webtools/secret/SecretAuditQueue.java | 2 +-
.../ofbiz/webtools/secret/SecretManagerEvents.java | 2 +-
.../webtools/secret/SecretManagerServices.java | 2 +-
.../webtools/secret/SecretAuditContainerTest.java | 2 +-
.../webtools/secret/SecretAuditQueueTest.java | 2 +-
.../webtools/secret/SecretManagerEventsTest.java | 2 +-
.../webtools/secret/SecretManagerServicesTest.java | 2 +-
.../org/apache/ofbiz/widget/WidgetFactory.java | 2 +-
.../java/org/apache/ofbiz/widget/WidgetLoader.java | 2 +-
.../java/org/apache/ofbiz/widget/WidgetWorker.java | 2 +-
.../ofbiz/widget/artifact/ArtifactInfoContext.java | 2 +-
.../widget/artifact/ArtifactInfoGatherer.java | 2 +-
.../apache/ofbiz/widget/cache/AbstractCache.java | 2 +-
.../ofbiz/widget/cache/GenericWidgetOutput.java | 2 +-
.../org/apache/ofbiz/widget/cache/ScreenCache.java | 2 +-
.../ofbiz/widget/cache/WidgetContextCacheKey.java | 2 +-
.../widget/content/ContentWorkerInterface.java | 2 +-
.../content/DataResourceWorkerInterface.java | 2 +-
.../widget/content/StaticContentUrlProvider.java | 2 +-
.../ofbiz/widget/content/WidgetContentWorker.java | 2 +-
.../widget/content/WidgetDataResourceWorker.java | 2 +-
.../ofbiz/widget/model/AbstractModelAction.java | 2 +-
.../ofbiz/widget/model/AbstractModelCondition.java | 2 +-
.../ofbiz/widget/model/CommonWidgetModels.java | 2 +-
.../org/apache/ofbiz/widget/model/FieldInfo.java | 2 +-
.../org/apache/ofbiz/widget/model/FormFactory.java | 2 +-
.../org/apache/ofbiz/widget/model/GridFactory.java | 2 +-
.../org/apache/ofbiz/widget/model/HtmlWidget.java | 2 +-
.../ofbiz/widget/model/IterateSectionWidget.java | 2 +-
.../org/apache/ofbiz/widget/model/MenuFactory.java | 2 +-
.../org/apache/ofbiz/widget/model/ModelAction.java | 2 +-
.../apache/ofbiz/widget/model/ModelActionUtil.java | 2 +-
.../ofbiz/widget/model/ModelActionVisitor.java | 2 +-
.../apache/ofbiz/widget/model/ModelCondition.java | 2 +-
.../ofbiz/widget/model/ModelConditionFactory.java | 2 +-
.../ofbiz/widget/model/ModelConditionVisitor.java | 2 +-
.../ofbiz/widget/model/ModelFieldVisitor.java | 2 +-
.../org/apache/ofbiz/widget/model/ModelForm.java | 2 +-
.../apache/ofbiz/widget/model/ModelFormAction.java | 2 +-
.../apache/ofbiz/widget/model/ModelFormField.java | 2 +-
.../ofbiz/widget/model/ModelFormFieldBuilder.java | 2 +-
.../org/apache/ofbiz/widget/model/ModelGrid.java | 2 +-
.../org/apache/ofbiz/widget/model/ModelMenu.java | 2 +-
.../apache/ofbiz/widget/model/ModelMenuAction.java | 2 +-
.../ofbiz/widget/model/ModelMenuCondition.java | 2 +-
.../apache/ofbiz/widget/model/ModelMenuItem.java | 2 +-
.../org/apache/ofbiz/widget/model/ModelScreen.java | 2 +-
.../ofbiz/widget/model/ModelScreenCondition.java | 2 +-
.../ofbiz/widget/model/ModelScreenWidget.java | 2 +-
.../apache/ofbiz/widget/model/ModelSingleForm.java | 2 +-
.../org/apache/ofbiz/widget/model/ModelTheme.java | 2 +-
.../org/apache/ofbiz/widget/model/ModelTree.java | 2 +-
.../apache/ofbiz/widget/model/ModelTreeAction.java | 2 +-
.../ofbiz/widget/model/ModelTreeCondition.java | 2 +-
.../org/apache/ofbiz/widget/model/ModelWidget.java | 2 +-
.../ofbiz/widget/model/ModelWidgetCondition.java | 2 +-
.../ofbiz/widget/model/ModelWidgetVisitor.java | 2 +-
.../apache/ofbiz/widget/model/ScreenFactory.java | 2 +-
.../ofbiz/widget/model/ScriptLinkHelper.java | 2 +-
.../apache/ofbiz/widget/model/ThemeFactory.java | 2 +-
.../org/apache/ofbiz/widget/model/TreeFactory.java | 2 +-
.../ofbiz/widget/model/WidgetSecureLocation.java | 2 +-
.../widget/model/XmlAbstractWidgetVisitor.java | 2 +-
.../ofbiz/widget/model/XmlWidgetActionVisitor.java | 2 +-
.../widget/model/XmlWidgetConditionVisitor.java | 2 +-
.../ofbiz/widget/model/XmlWidgetFieldVisitor.java | 2 +-
.../ofbiz/widget/model/XmlWidgetVisitor.java | 2 +-
.../ofbiz/widget/portal/PortalPageWorker.java | 2 +-
.../apache/ofbiz/widget/renderer/FormRenderer.java | 2 +-
.../ofbiz/widget/renderer/FormStringRenderer.java | 2 +-
.../ofbiz/widget/renderer/MenuStringRenderer.java | 2 +-
.../ofbiz/widget/renderer/MenuWrapTransform.java | 2 +-
.../apache/ofbiz/widget/renderer/Paginator.java | 2 +-
.../widget/renderer/ScreenRenderException.java | 2 +-
.../ofbiz/widget/renderer/ScreenRenderer.java | 2 +-
.../widget/renderer/ScreenStringRenderer.java | 2 +-
.../ofbiz/widget/renderer/TreeStringRenderer.java | 2 +-
.../apache/ofbiz/widget/renderer/UtilHelpText.java | 2 +-
.../apache/ofbiz/widget/renderer/VisualTheme.java | 2 +-
.../ofbiz/widget/renderer/fo/FoFormRenderer.java | 2 +-
.../widget/renderer/fo/ScreenFopViewHandler.java | 2 +-
.../widget/renderer/html/HtmlMenuRenderer.java | 2 +-
.../renderer/html/HtmlMenuRendererImage.java | 2 +-
.../widget/renderer/html/HtmlMenuWrapper.java | 2 +-
.../widget/renderer/html/HtmlMenuWrapperImage.java | 2 +-
.../widget/renderer/html/HtmlTreeRenderer.java | 2 +-
.../widget/renderer/html/HtmlWidgetRenderer.java | 2 +-
.../ofbiz/widget/renderer/macro/FtlWriter.java | 2 +-
.../widget/renderer/macro/MacroCommonRenderer.java | 2 +-
.../widget/renderer/macro/MacroFormRenderer.java | 2 +-
.../widget/renderer/macro/MacroMenuRenderer.java | 2 +-
.../widget/renderer/macro/MacroScreenRenderer.java | 2 +-
.../renderer/macro/MacroScreenViewHandler.java | 2 +-
.../widget/renderer/macro/MacroTreeRenderer.java | 2 +-
.../macro/RenderableFtlFormElementsBuilder.java | 2 +-
.../renderer/macro/renderable/RenderableFtl.java | 2 +-
.../macro/renderable/RenderableFtlMacroCall.java | 2 +-
.../macro/renderable/RenderableFtlNoop.java | 2 +-
.../macro/renderable/RenderableFtlSequence.java | 2 +-
.../macro/renderable/RenderableFtlVerbatim.java | 2 +-
.../macro/renderable/RenderableFtlVisitor.java | 2 +-
.../renderer/xlsx/ScreenXlsxViewHandler.java | 2 +-
.../widget/renderer/xlsx/XlsxFormRenderer.java | 2 +-
.../renderer/xlsx/XlsxScreenStringRenderer.java | 2 +-
.../org/apache/ofbiz/widget/WidgetWorkerTest.java | 2 +-
.../ofbiz/widget/renderer/macro/FtlWriterTest.java | 2 +-
.../widget/renderer/macro/MacroCallMatcher.java | 2 +-
.../MacroCallParameterBooleanValueMatcher.java | 2 +-
.../MacroCallParameterIntegerValueMatcher.java | 2 +-
.../macro/MacroCallParameterMapValueMatcher.java | 2 +-
.../renderer/macro/MacroCallParameterMatcher.java | 2 +-
...croCallParameterStringValueEndsWithMatcher.java | 2 +-
.../MacroCallParameterStringValueMatcher.java | 2 +-
...oCallParameterStringValueStartsWithMatcher.java | 2 +-
.../renderer/macro/MacroFormRendererTest.java | 2 +-
.../macro/MacroRenderersTemplateTextGuardTest.java | 2 +-
...nderableFtlFormElementsBuilderDatetimeTest.java | 2 +-
.../RenderableFtlFormElementsBuilderTest.java | 2 +-
.../widget/renderer/xlsx/XlsxFormRendererTest.java | 2 +-
1121 files changed, 1133 insertions(+), 1133 deletions(-)
(ofbiz-framework) 01/02: Start Java license headers with /* instead of /****
Posted by mr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mridulpathak pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 71aaba7f0b48a69ca40c8cb698bac2d3e799e484
Author: Mridul Pathak <mr...@gmail.com>
AuthorDate: Tue Oct 27 18:13:26 2026 +0530
Start Java license headers with /* instead of /****
From JDK 23, javac reports [dangling-doc-comments] for every /** comment that is attached to no declaration, which includes the license headers that open with a line of asterisks. This changes only the first line of those headers to the /* form shown in APACHE2_HEADER and already used by the other Java files. The change is script-generated; to reproduce it, run from the repository root:
git ls-files -z '*.java' | xargs -0 perl -pi -e 's{^/\*{79}$}{/*} if $. == 1; close ARGV if eof'
---
.../src/main/java/org/apache/ofbiz/accounting/AccountingException.java | 2 +-
.../accounting/src/main/java/org/apache/ofbiz/accounting/GlEvents.java | 2 +-
.../java/org/apache/ofbiz/accounting/agreement/AgreementServices.java | 2 +-
.../java/org/apache/ofbiz/accounting/finaccount/FinAccountServices.java | 2 +-
.../main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java | 2 +-
.../main/java/org/apache/ofbiz/accounting/invoice/InvoiceWorker.java | 2 +-
.../java/org/apache/ofbiz/accounting/ledger/GeneralLedgerServices.java | 2 +-
.../java/org/apache/ofbiz/accounting/payment/BillingAccountWorker.java | 2 +-
.../org/apache/ofbiz/accounting/payment/GiftCertificateServices.java | 2 +-
.../org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java | 2 +-
.../java/org/apache/ofbiz/accounting/payment/PaymentMethodServices.java | 2 +-
.../main/java/org/apache/ofbiz/accounting/payment/PaymentWorker.java | 2 +-
.../main/java/org/apache/ofbiz/accounting/period/PeriodServices.java | 2 +-
.../main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/accounting/util/UtilAccounting.java | 2 +-
.../src/main/java/org/apache/ofbiz/content/ContentManagementEvents.java | 2 +-
.../main/java/org/apache/ofbiz/content/ContentManagementServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java | 2 +-
.../content/src/main/java/org/apache/ofbiz/content/ConvertTree.java | 2 +-
.../src/main/java/org/apache/ofbiz/content/cms/ContentJsonEvents.java | 2 +-
.../src/main/java/org/apache/ofbiz/content/content/ContentEvents.java | 2 +-
.../main/java/org/apache/ofbiz/content/content/ContentKeywordIndex.java | 2 +-
.../org/apache/ofbiz/content/content/ContentPermissionServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/content/content/ContentSearch.java | 2 +-
.../main/java/org/apache/ofbiz/content/content/ContentSearchEvents.java | 2 +-
.../java/org/apache/ofbiz/content/content/ContentSearchSession.java | 2 +-
.../src/main/java/org/apache/ofbiz/content/content/ContentServices.java | 2 +-
.../java/org/apache/ofbiz/content/content/ContentServicesComplex.java | 2 +-
.../main/java/org/apache/ofbiz/content/content/ContentUrlFilter.java | 2 +-
.../src/main/java/org/apache/ofbiz/content/content/ContentWorker.java | 2 +-
.../src/main/java/org/apache/ofbiz/content/content/ContentWrapper.java | 2 +-
.../main/java/org/apache/ofbiz/content/content/PermissionRecorder.java | 2 +-
.../java/org/apache/ofbiz/content/content/UploadContentAndImage.java | 2 +-
.../content/src/main/java/org/apache/ofbiz/content/data/DataEvents.java | 2 +-
.../src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java | 2 +-
.../src/main/java/org/apache/ofbiz/content/data/DataServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/content/ftp/FtpClientInterface.java | 2 +-
.../content/src/main/java/org/apache/ofbiz/content/ftp/FtpServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/content/ftp/SecureFtpClient.java | 2 +-
.../src/main/java/org/apache/ofbiz/content/ftp/SimpleFtpClient.java | 2 +-
.../src/main/java/org/apache/ofbiz/content/ftp/SshClientHelper.java | 2 +-
.../src/main/java/org/apache/ofbiz/content/ftp/SshFtpClient.java | 2 +-
.../src/main/java/org/apache/ofbiz/content/layout/LayoutEvents.java | 2 +-
.../src/main/java/org/apache/ofbiz/content/layout/LayoutWorker.java | 2 +-
.../src/main/java/org/apache/ofbiz/content/output/OutputServices.java | 2 +-
.../org/apache/ofbiz/content/permission/EntityPermissionChecker.java | 2 +-
.../src/main/java/org/apache/ofbiz/content/survey/PdfFormHelper.java | 2 +-
.../main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/content/survey/SurveyEvents.java | 2 +-
.../src/main/java/org/apache/ofbiz/content/survey/SurveyWrapper.java | 2 +-
.../java/org/apache/ofbiz/content/view/SimpleContentViewHandler.java | 2 +-
.../org/apache/ofbiz/content/webapp/ftl/CheckPermissionTransform.java | 2 +-
.../ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java | 2 +-
.../apache/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java | 2 +-
.../apache/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java | 2 +-
.../ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java | 2 +-
.../org/apache/ofbiz/content/webapp/ftl/LoopSubContentTransform.java | 2 +-
.../apache/ofbiz/content/webapp/ftl/OfbizContentAltUrlTransforms.java | 2 +-
.../org/apache/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java | 2 +-
.../java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java | 2 +-
.../org/apache/ofbiz/content/webapp/ftl/RenderContentTransform.java | 2 +-
.../org/apache/ofbiz/content/webapp/ftl/RenderSubContentAsText.java | 2 +-
.../apache/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java | 2 +-
.../org/apache/ofbiz/content/webapp/ftl/RenderSubContentTransform.java | 2 +-
.../ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java | 2 +-
.../apache/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java | 2 +-
.../apache/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java | 2 +-
.../src/test/java/org/apache/ofbiz/content/data/DataServicesTest.java | 2 +-
.../src/main/java/org/apache/ofbiz/humanres/HumanResEvents.java | 2 +-
.../src/main/java/org/apache/ofbiz/manufacturing/bom/BOMHelper.java | 2 +-
.../src/main/java/org/apache/ofbiz/manufacturing/bom/BOMNode.java | 2 +-
.../src/main/java/org/apache/ofbiz/manufacturing/bom/BOMServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/manufacturing/bom/BOMTree.java | 2 +-
.../java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRun.java | 2 +-
.../org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java | 2 +-
.../org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java | 2 +-
.../apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java | 2 +-
.../apache/ofbiz/manufacturing/mrp/InventoryEventPlannedServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/manufacturing/mrp/MrpServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/manufacturing/mrp/ProposedOrder.java | 2 +-
.../java/org/apache/ofbiz/manufacturing/routing/RoutingServices.java | 2 +-
.../java/org/apache/ofbiz/marketing/marketing/MarketingServices.java | 2 +-
.../java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java | 2 +-
.../marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java | 2 +-
.../src/main/java/org/apache/ofbiz/order/order/OrderChangeHelper.java | 2 +-
.../src/main/java/org/apache/ofbiz/order/order/OrderContentWrapper.java | 2 +-
.../order/src/main/java/org/apache/ofbiz/order/order/OrderEvents.java | 2 +-
.../src/main/java/org/apache/ofbiz/order/order/OrderReadHelper.java | 2 +-
.../order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java | 2 +-
.../order/src/main/java/org/apache/ofbiz/order/quote/QuoteServices.java | 2 +-
.../java/org/apache/ofbiz/order/shoppingcart/CartEventListener.java | 2 +-
.../org/apache/ofbiz/order/shoppingcart/CartItemModifyException.java | 2 +-
.../main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java | 2 +-
.../java/org/apache/ofbiz/order/shoppingcart/ItemNotFoundException.java | 2 +-
.../src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java | 2 +-
.../java/org/apache/ofbiz/order/shoppingcart/ShoppingCartEvents.java | 2 +-
.../java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java | 2 +-
.../java/org/apache/ofbiz/order/shoppingcart/ShoppingCartServices.java | 2 +-
.../main/java/org/apache/ofbiz/order/shoppingcart/WebShoppingCart.java | 2 +-
.../apache/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java | 2 +-
.../org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java | 2 +-
.../ofbiz/order/shoppingcart/product/ProductStoreCartAwareEvents.java | 2 +-
.../ofbiz/order/shoppingcart/shipping/ShippingEstimateWrapper.java | 2 +-
.../org/apache/ofbiz/order/shoppingcart/shipping/ShippingEvents.java | 2 +-
.../java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java | 2 +-
.../java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java | 2 +-
.../order/src/main/java/org/apache/ofbiz/order/task/TaskEvents.java | 2 +-
.../order/src/main/java/org/apache/ofbiz/order/task/TaskWorker.java | 2 +-
.../src/main/java/org/apache/ofbiz/order/test/OrderTestServices.java | 2 +-
.../apache/ofbiz/party/communication/CommunicationEventServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/party/contact/ContactHelper.java | 2 +-
.../main/java/org/apache/ofbiz/party/contact/ContactMechServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/party/contact/ContactMechWorker.java | 2 +-
.../main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java | 2 +-
.../party/src/main/java/org/apache/ofbiz/party/party/PartyHelper.java | 2 +-
.../main/java/org/apache/ofbiz/party/party/PartyRelationshipHelper.java | 2 +-
.../java/org/apache/ofbiz/party/party/PartyRelationshipServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/party/party/PartyTypeHelper.java | 2 +-
.../src/main/java/org/apache/ofbiz/product/catalog/CatalogWorker.java | 2 +-
.../java/org/apache/ofbiz/product/category/CatalogUrlDirective.java | 2 +-
.../main/java/org/apache/ofbiz/product/category/CatalogUrlFilter.java | 2 +-
.../java/org/apache/ofbiz/product/category/CatalogUrlSeoFilter.java | 2 +-
.../main/java/org/apache/ofbiz/product/category/CatalogUrlServlet.java | 2 +-
.../java/org/apache/ofbiz/product/category/CategoryContentWrapper.java | 2 +-
.../java/org/apache/ofbiz/product/category/CategoryControlServlet.java | 2 +-
.../main/java/org/apache/ofbiz/product/category/CategoryServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/product/category/CategoryWorker.java | 2 +-
.../java/org/apache/ofbiz/product/category/SeoCatalogUrlServlet.java | 2 +-
.../java/org/apache/ofbiz/product/category/SeoContentUrlFilter.java | 2 +-
.../main/java/org/apache/ofbiz/product/category/SeoContextFilter.java | 2 +-
.../main/java/org/apache/ofbiz/product/category/SeoControlServlet.java | 2 +-
.../src/main/java/org/apache/ofbiz/product/category/SeoUrlUtil.java | 2 +-
.../apache/ofbiz/product/category/ftl/CatalogAltUrlSeoTransform.java | 2 +-
.../org/apache/ofbiz/product/category/ftl/CatalogUrlSeoTransform.java | 2 +-
.../apache/ofbiz/product/category/ftl/OfbizCatalogAltUrlTransform.java | 2 +-
.../org/apache/ofbiz/product/category/ftl/OfbizCatalogUrlTransform.java | 2 +-
.../main/java/org/apache/ofbiz/product/category/ftl/SeoTransform.java | 2 +-
.../java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java | 2 +-
.../apache/ofbiz/product/config/ProductConfigItemContentWrapper.java | 2 +-
.../main/java/org/apache/ofbiz/product/config/ProductConfigWorker.java | 2 +-
.../main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java | 2 +-
.../org/apache/ofbiz/product/config/ProductConfigWrapperException.java | 2 +-
.../main/java/org/apache/ofbiz/product/feature/ParametricSearch.java | 2 +-
.../java/org/apache/ofbiz/product/feature/ProductFeatureServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/product/image/ScaleImage.java | 2 +-
.../main/java/org/apache/ofbiz/product/imagemanagement/CropImage.java | 2 +-
.../main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java | 2 +-
.../org/apache/ofbiz/product/imagemanagement/ImageManagementHelper.java | 2 +-
.../apache/ofbiz/product/imagemanagement/ImageManagementServices.java | 2 +-
.../java/org/apache/ofbiz/product/imagemanagement/ImageUrlServlet.java | 2 +-
.../java/org/apache/ofbiz/product/imagemanagement/ReplaceImage.java | 2 +-
.../main/java/org/apache/ofbiz/product/imagemanagement/RotateImage.java | 2 +-
.../main/java/org/apache/ofbiz/product/inventory/InventoryServices.java | 2 +-
.../main/java/org/apache/ofbiz/product/migrate/MigrationServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/product/price/PriceServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/product/product/KeywordIndex.java | 2 +-
.../java/org/apache/ofbiz/product/product/ProductContentWrapper.java | 2 +-
.../src/main/java/org/apache/ofbiz/product/product/ProductEvents.java | 2 +-
.../org/apache/ofbiz/product/product/ProductPromoContentWrapper.java | 2 +-
.../main/java/org/apache/ofbiz/product/product/ProductSearchEvents.java | 2 +-
.../src/main/java/org/apache/ofbiz/product/product/ProductServices.java | 2 +-
.../main/java/org/apache/ofbiz/product/product/ProductUtilServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/product/product/ProductWorker.java | 2 +-
.../src/main/java/org/apache/ofbiz/product/product/VariantEvents.java | 2 +-
.../src/main/java/org/apache/ofbiz/product/promo/PromoServices.java | 2 +-
.../org/apache/ofbiz/product/spreadsheetimport/ImportProductHelper.java | 2 +-
.../apache/ofbiz/product/spreadsheetimport/ImportProductServices.java | 2 +-
.../main/java/org/apache/ofbiz/product/store/ProductStoreEvents.java | 2 +-
.../java/org/apache/ofbiz/product/store/ProductStoreSurveyWrapper.java | 2 +-
.../main/java/org/apache/ofbiz/product/store/ProductStoreWorker.java | 2 +-
.../org/apache/ofbiz/product/subscription/SubscriptionServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/shipment/packing/PackingEvent.java | 2 +-
.../main/java/org/apache/ofbiz/shipment/packing/PackingServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java | 2 +-
.../main/java/org/apache/ofbiz/shipment/packing/PackingSessionLine.java | 2 +-
.../main/java/org/apache/ofbiz/shipment/picklist/PickListServices.java | 2 +-
.../main/java/org/apache/ofbiz/shipment/shipment/ShipmentEvents.java | 2 +-
.../main/java/org/apache/ofbiz/shipment/shipment/ShipmentServices.java | 2 +-
.../main/java/org/apache/ofbiz/shipment/shipment/ShipmentWorker.java | 2 +-
.../main/java/org/apache/ofbiz/shipment/verify/VerifyPickServices.java | 2 +-
.../main/java/org/apache/ofbiz/shipment/verify/VerifyPickSession.java | 2 +-
.../java/org/apache/ofbiz/shipment/verify/VerifyPickSessionRow.java | 2 +-
.../org/apache/ofbiz/shipment/weightPackage/WeightPackageServices.java | 2 +-
.../org/apache/ofbiz/shipment/weightPackage/WeightPackageSession.java | 2 +-
.../apache/ofbiz/shipment/weightPackage/WeightPackageSessionLine.java | 2 +-
.../src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java | 2 +-
.../java/org/apache/ofbiz/securityext/migrate/MigrationServices.java | 2 +-
.../org/apache/ofbiz/securityext/security/OFBizApplicationSecurity.java | 2 +-
.../org/apache/ofbiz/workeffort/content/WorkEffortContentWrapper.java | 2 +-
.../main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java | 2 +-
.../java/org/apache/ofbiz/workeffort/workeffort/ICalHandlerFactory.java | 2 +-
.../java/org/apache/ofbiz/workeffort/workeffort/ICalRecurConverter.java | 2 +-
.../main/java/org/apache/ofbiz/workeffort/workeffort/ICalWorker.java | 2 +-
.../org/apache/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java | 2 +-
.../ofbiz/workeffort/workeffort/WorkEffortPartyAssignmentServices.java | 2 +-
.../java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearch.java | 2 +-
.../org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchEvents.java | 2 +-
.../org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java | 2 +-
.../java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java | 2 +-
.../java/org/apache/ofbiz/workeffort/workeffort/WorkEffortWorker.java | 2 +-
docs/asciidoc/resource/source.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java | 2 +-
.../main/java/org/apache/ofbiz/base/component/ComponentException.java | 2 +-
.../java/org/apache/ofbiz/base/component/ComponentResourceHandler.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/concurrent/ConstantFuture.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/concurrent/ExecutionPool.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/config/FileLoader.java | 2 +-
.../main/java/org/apache/ofbiz/base/config/GenericConfigException.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/config/JNDIConfigUtil.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/config/ResourceHandler.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/config/ResourceLoader.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/config/UrlLoader.java | 2 +-
.../main/java/org/apache/ofbiz/base/container/AdminServerContainer.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/container/Container.java | 2 +-
.../main/java/org/apache/ofbiz/base/container/ContainerException.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java | 2 +-
.../java/org/apache/ofbiz/base/container/NamingServiceContainer.java | 2 +-
.../main/java/org/apache/ofbiz/base/conversion/AbstractConverter.java | 2 +-
.../org/apache/ofbiz/base/conversion/AbstractLocalizedConverter.java | 2 +-
.../java/org/apache/ofbiz/base/conversion/AbstractModelConverter.java | 2 +-
.../main/java/org/apache/ofbiz/base/conversion/BooleanConverters.java | 2 +-
.../java/org/apache/ofbiz/base/conversion/CollectionConverters.java | 2 +-
.../main/java/org/apache/ofbiz/base/conversion/ConversionException.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/conversion/Converter.java | 2 +-
.../main/java/org/apache/ofbiz/base/conversion/ConverterCreator.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/conversion/ConverterLoader.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/conversion/Converters.java | 2 +-
.../main/java/org/apache/ofbiz/base/conversion/DateTimeConverters.java | 2 +-
.../java/org/apache/ofbiz/base/conversion/GenericSingletonToList.java | 2 +-
.../java/org/apache/ofbiz/base/conversion/GenericSingletonToSet.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/conversion/JSONConverters.java | 2 +-
.../main/java/org/apache/ofbiz/base/conversion/LocalizedConverter.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/conversion/MiscConverters.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/conversion/ModelConverter.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/conversion/ModelConverters.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/conversion/NetConverters.java | 2 +-
.../main/java/org/apache/ofbiz/base/conversion/NumberConverters.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/crypto/BlowFishCrypt.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/crypto/ConfigCryptoUtil.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/crypto/HashCrypt.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/crypto/Main.java | 2 +-
.../main/java/org/apache/ofbiz/base/crypto/ReEncryptSecretsMain.java | 2 +-
.../main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/html/CustomSafePolicy.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/html/SanitizerCustomPolicy.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/lang/ComparableRange.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/lang/Factory.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/lang/JSON.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/lang/Range.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/lang/SourceMonitored.java | 2 +-
.../java/org/apache/ofbiz/base/location/ClasspathLocationResolver.java | 2 +-
.../java/org/apache/ofbiz/base/location/ComponentLocationResolver.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/location/FlexibleLocation.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/location/LocationResolver.java | 2 +-
.../java/org/apache/ofbiz/base/location/OFBizHomeLocationResolver.java | 2 +-
.../org/apache/ofbiz/base/location/StandardUrlLocationResolver.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/metrics/Metrics.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/model/DomainModel.java | 2 +-
.../main/java/org/apache/ofbiz/base/secret/FallbackSecretProvider.java | 2 +-
.../main/java/org/apache/ofbiz/base/secret/FileBasedSecretProvider.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/secret/SecretAuditSink.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/secret/SecretProvider.java | 2 +-
.../main/java/org/apache/ofbiz/base/secret/SecretProviderFactory.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/secret/SecretProviderUtil.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/secret/SecretValueResolver.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/util/AliasKeyManager.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/util/CacheFilter.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/util/DateRange.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/util/Debug.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/util/FileUtil.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/util/GeneralException.java | 2 +-
.../main/java/org/apache/ofbiz/base/util/GeneralRuntimeException.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/util/HttpClient.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/util/HttpClientException.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/util/HttpRequestFileUpload.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/util/IndentingWriter.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/util/JNDIContextFactory.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/util/KeyStoreUtil.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/util/MessageString.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/util/Observable.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/util/Observer.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/util/PatternFactory.java | 2 +-
.../main/java/org/apache/ofbiz/base/util/RMIExtendedSocketFactory.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/util/ReferenceCleaner.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/util/RequestWrapper.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/util/SSLUtil.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/util/ScriptHelper.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptUtil.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/util/Scriptlet.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/util/TimeDuration.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/util/URLConnector.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/util/UtilGenerics.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHtml.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/util/UtilIO.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/util/UtilNumber.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/util/UtilRandom.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/util/UtilTimer.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/util/UtilURL.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java | 2 +-
framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/util/cache/CacheLine.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/util/cache/CacheListener.java | 2 +-
.../main/java/org/apache/ofbiz/base/util/cache/CacheSoftReference.java | 2 +-
.../main/java/org/apache/ofbiz/base/util/cache/HardRefCacheLine.java | 2 +-
.../main/java/org/apache/ofbiz/base/util/cache/SoftRefCacheLine.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/util/cache/UtilCache.java | 2 +-
.../org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java | 2 +-
.../org/apache/ofbiz/base/util/collections/FlexibleServletAccessor.java | 2 +-
.../org/apache/ofbiz/base/util/collections/GenericMapCollection.java | 2 +-
.../java/org/apache/ofbiz/base/util/collections/GenericMapEntry.java | 2 +-
.../java/org/apache/ofbiz/base/util/collections/GenericMapEntrySet.java | 2 +-
.../java/org/apache/ofbiz/base/util/collections/GenericMapKeySet.java | 2 +-
.../main/java/org/apache/ofbiz/base/util/collections/GenericMapSet.java | 2 +-
.../java/org/apache/ofbiz/base/util/collections/GenericMapValues.java | 2 +-
.../java/org/apache/ofbiz/base/util/collections/IteratorWrapper.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/util/collections/LRUMap.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/util/collections/LifoSet.java | 2 +-
.../main/java/org/apache/ofbiz/base/util/collections/LocalizedMap.java | 2 +-
.../main/java/org/apache/ofbiz/base/util/collections/MapComparator.java | 2 +-
.../main/java/org/apache/ofbiz/base/util/collections/MapContext.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/util/collections/MapStack.java | 2 +-
.../org/apache/ofbiz/base/util/collections/MultivaluedMapContext.java | 2 +-
.../ofbiz/base/util/collections/MultivaluedMapContextAdapter.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/util/collections/PagedList.java | 2 +-
.../java/org/apache/ofbiz/base/util/collections/ReadOnlyMapEntry.java | 2 +-
.../apache/ofbiz/base/util/collections/ResourceBundleMapWrapper.java | 2 +-
.../java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java | 2 +-
.../main/java/org/apache/ofbiz/base/util/string/IUelMappingLibrary.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/util/string/JuelConnector.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/util/string/UelMapping.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/util/string/UelUtil.java | 2 +-
.../java/org/apache/ofbiz/base/util/template/OfbizBeansWrapper.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/util/template/XslTransform.java | 2 +-
.../ofbiz/base/collections/MultivaluedMapContextAdapterTests.java | 2 +-
.../org/apache/ofbiz/base/collections/MultivaluedMapContextTests.java | 2 +-
.../org/apache/ofbiz/base/container/ComponentContainerTestSupport.java | 2 +-
.../org/apache/ofbiz/base/conversion/TestDomainModelConversion.java | 2 +-
.../test/java/org/apache/ofbiz/base/crypto/ConfigCryptoUtilTest.java | 2 +-
.../java/org/apache/ofbiz/base/secret/FallbackSecretProviderTest.java | 2 +-
.../java/org/apache/ofbiz/base/secret/FileBasedSecretProviderTest.java | 2 +-
.../java/org/apache/ofbiz/base/secret/SecretProviderFactoryTest.java | 2 +-
.../java/org/apache/ofbiz/base/secret/SecretProviderHelpersTest.java | 2 +-
.../test/java/org/apache/ofbiz/base/secret/SecretValueResolverTest.java | 2 +-
.../base/src/test/java/org/apache/ofbiz/base/util/UtilHtmlTest.java | 2 +-
.../base/src/test/java/org/apache/ofbiz/base/util/UtilURLTests.java | 2 +-
.../java/org/apache/ofbiz/base/util/template/FreeMarkerWorkerTests.java | 2 +-
.../java/org/apache/ofbiz/catalina/container/CatalinaContainer.java | 2 +-
.../org/apache/ofbiz/catalina/container/CorrelationFieldProvider.java | 2 +-
.../main/java/org/apache/ofbiz/catalina/container/CorrelationValve.java | 2 +-
.../org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java | 2 +-
.../src/main/java/org/apache/ofbiz/catalina/container/FilterJars.java | 2 +-
.../org/apache/ofbiz/catalina/container/HashedCredentialHandler.java | 2 +-
.../src/main/java/org/apache/ofbiz/catalina/container/OFBizRealm.java | 2 +-
.../org/apache/ofbiz/catalina/container/SimpleCredentialHandler.java | 2 +-
.../java/org/apache/ofbiz/catalina/container/SslAcceleratorValve.java | 2 +-
.../java/org/apache/ofbiz/catalina/container/CorrelationValveTests.java | 2 +-
.../common/src/main/java/org/apache/ofbiz/common/CdyneServices.java | 2 +-
.../common/src/main/java/org/apache/ofbiz/common/CommonEvents.java | 2 +-
.../common/src/main/java/org/apache/ofbiz/common/CommonServices.java | 2 +-
.../common/src/main/java/org/apache/ofbiz/common/CommonWorkers.java | 2 +-
.../src/main/java/org/apache/ofbiz/common/DataModelConstants.java | 2 +-
.../common/src/main/java/org/apache/ofbiz/common/FindServices.java | 2 +-
framework/common/src/main/java/org/apache/ofbiz/common/FtpServices.java | 2 +-
.../main/java/org/apache/ofbiz/common/JsLanguageFileMappingCreator.java | 2 +-
.../src/main/java/org/apache/ofbiz/common/JsLanguageFilesMapping.java | 2 +-
.../main/java/org/apache/ofbiz/common/JsLanguageFilesMappingUtil.java | 2 +-
.../common/src/main/java/org/apache/ofbiz/common/KeywordSearchUtil.java | 2 +-
.../common/src/main/java/org/apache/ofbiz/common/UrlServletHelper.java | 2 +-
.../main/java/org/apache/ofbiz/common/authentication/AuthHelper.java | 2 +-
.../apache/ofbiz/common/authentication/AuthenticationComparator.java | 2 +-
.../java/org/apache/ofbiz/common/authentication/api/Authenticator.java | 2 +-
.../apache/ofbiz/common/authentication/api/AuthenticatorException.java | 2 +-
.../ofbiz/common/authentication/example/TestFailAuthenticator.java | 2 +-
.../ofbiz/common/authentication/example/TestPassAuthenticator.java | 2 +-
.../src/main/java/org/apache/ofbiz/common/email/EmailServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/common/email/MailSmtpConfigUtil.java | 2 +-
.../main/java/org/apache/ofbiz/common/email/NotificationServices.java | 2 +-
.../java/org/apache/ofbiz/common/email/SmtpOAuth2TokenProvider.java | 2 +-
.../common/src/main/java/org/apache/ofbiz/common/geo/GeoServices.java | 2 +-
.../common/src/main/java/org/apache/ofbiz/common/geo/GeoWorker.java | 2 +-
.../src/main/java/org/apache/ofbiz/common/image/ImageTransform.java | 2 +-
.../java/org/apache/ofbiz/common/login/LdapAuthenticationServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/common/login/LoginServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/common/period/PeriodWorker.java | 2 +-
.../java/org/apache/ofbiz/common/preferences/PreferenceServices.java | 2 +-
.../main/java/org/apache/ofbiz/common/preferences/PreferenceWorker.java | 2 +-
.../src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java | 2 +-
.../main/java/org/apache/ofbiz/common/scripting/ScriptHelperImpl.java | 2 +-
.../src/main/java/org/apache/ofbiz/common/status/StatusServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/common/status/StatusWorker.java | 2 +-
.../src/main/java/org/apache/ofbiz/common/telecom/TelecomServices.java | 2 +-
.../test/java/org/apache/ofbiz/common/email/EmailServicesDkimTests.java | 2 +-
.../java/org/apache/ofbiz/common/email/EmailServicesInjectionTests.java | 2 +-
.../src/test/java/org/apache/ofbiz/common/test/PerformFindTests.java | 2 +-
.../datafile/src/main/java/org/apache/ofbiz/datafile/DataFile.java | 2 +-
.../src/main/java/org/apache/ofbiz/datafile/DataFile2EntityXml.java | 2 +-
.../src/main/java/org/apache/ofbiz/datafile/DataFileException.java | 2 +-
.../datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFile.java | 2 +-
.../src/main/java/org/apache/ofbiz/datafile/ModelDataFileReader.java | 2 +-
.../datafile/src/main/java/org/apache/ofbiz/datafile/ModelField.java | 2 +-
.../datafile/src/main/java/org/apache/ofbiz/datafile/ModelRecord.java | 2 +-
framework/datafile/src/main/java/org/apache/ofbiz/datafile/Record.java | 2 +-
.../src/main/java/org/apache/ofbiz/datafile/RecordIterator.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/DataSourceContainer.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/DelegatorContainer.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/EntityCryptoException.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/EntityLockedException.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/GenericCreateException.java | 2 +-
.../main/java/org/apache/ofbiz/entity/GenericDataSourceException.java | 2 +-
.../main/java/org/apache/ofbiz/entity/GenericDuplicateKeyException.java | 2 +-
.../main/java/org/apache/ofbiz/entity/GenericEntityConfException.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/GenericEntityException.java | 2 +-
.../java/org/apache/ofbiz/entity/GenericEntityNotFoundException.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/GenericFindException.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/GenericModelException.java | 2 +-
.../main/java/org/apache/ofbiz/entity/GenericNoSuchEntityException.java | 2 +-
.../java/org/apache/ofbiz/entity/GenericNotImplementedException.java | 2 +-
framework/entity/src/main/java/org/apache/ofbiz/entity/GenericPK.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/GenericRemoveException.java | 2 +-
.../java/org/apache/ofbiz/entity/GenericResultSetClosedException.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/GenericStoreException.java | 2 +-
.../entity/src/main/java/org/apache/ofbiz/entity/GenericValue.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/cache/AbstractCache.java | 2 +-
.../org/apache/ofbiz/entity/cache/AbstractEntityConditionCache.java | 2 +-
framework/entity/src/main/java/org/apache/ofbiz/entity/cache/Cache.java | 2 +-
.../entity/src/main/java/org/apache/ofbiz/entity/cache/EntityCache.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/cache/EntityListCache.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/cache/EntityObjectCache.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/condition/EntityClause.java | 2 +-
.../org/apache/ofbiz/entity/condition/EntityComparisonOperator.java | 2 +-
.../main/java/org/apache/ofbiz/entity/condition/EntityCondition.java | 2 +-
.../java/org/apache/ofbiz/entity/condition/EntityConditionBuilder.java | 2 +-
.../java/org/apache/ofbiz/entity/condition/EntityConditionList.java | 2 +-
.../java/org/apache/ofbiz/entity/condition/EntityConditionListBase.java | 2 +-
.../java/org/apache/ofbiz/entity/condition/EntityConditionParam.java | 2 +-
.../java/org/apache/ofbiz/entity/condition/EntityConditionValue.java | 2 +-
.../org/apache/ofbiz/entity/condition/EntityDateFilterCondition.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/condition/EntityExpr.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/condition/EntityFieldMap.java | 2 +-
.../main/java/org/apache/ofbiz/entity/condition/EntityFieldValue.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/condition/EntityFunction.java | 2 +-
.../main/java/org/apache/ofbiz/entity/condition/EntityJoinOperator.java | 2 +-
.../main/java/org/apache/ofbiz/entity/condition/EntityNotCondition.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/condition/EntityOperator.java | 2 +-
.../main/java/org/apache/ofbiz/entity/condition/EntityWhereString.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/condition/OrderByItem.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/condition/OrderByList.java | 2 +-
.../java/org/apache/ofbiz/entity/config/model/ConnectionFactory.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/config/model/Datasource.java | 2 +-
.../java/org/apache/ofbiz/entity/config/model/DebugXaResources.java | 2 +-
.../java/org/apache/ofbiz/entity/config/model/DelegatorElement.java | 2 +-
.../main/java/org/apache/ofbiz/entity/config/model/EntityConfig.java | 2 +-
.../java/org/apache/ofbiz/entity/config/model/EntityDataReader.java | 2 +-
.../main/java/org/apache/ofbiz/entity/config/model/EntityEcaReader.java | 2 +-
.../java/org/apache/ofbiz/entity/config/model/EntityGroupReader.java | 2 +-
.../java/org/apache/ofbiz/entity/config/model/EntityModelReader.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/config/model/FieldType.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/config/model/GroupMap.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/config/model/InlineJdbc.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/config/model/JdbcElement.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/config/model/JndiJdbc.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/config/model/ReadData.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/config/model/Resource.java | 2 +-
.../main/java/org/apache/ofbiz/entity/config/model/ResourceLoader.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/config/model/SqlLoadPath.java | 2 +-
.../java/org/apache/ofbiz/entity/config/model/TransactionFactory.java | 2 +-
.../org/apache/ofbiz/entity/config/model/TransactionManagerJndi.java | 2 +-
.../main/java/org/apache/ofbiz/entity/config/model/TyrexDataSource.java | 2 +-
.../java/org/apache/ofbiz/entity/config/model/UserTransactionJndi.java | 2 +-
.../main/java/org/apache/ofbiz/entity/connection/ConnectionFactory.java | 2 +-
.../java/org/apache/ofbiz/entity/connection/DBCPConnectionFactory.java | 2 +-
.../java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/datasource/GenericHelper.java | 2 +-
.../main/java/org/apache/ofbiz/entity/datasource/GenericHelperDAO.java | 2 +-
.../java/org/apache/ofbiz/entity/datasource/GenericHelperFactory.java | 2 +-
.../main/java/org/apache/ofbiz/entity/datasource/GenericHelperInfo.java | 2 +-
.../main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/eca/EntityEcaHandler.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/finder/ByAndFinder.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/finder/ByConditionFinder.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/finder/EntityFinderUtil.java | 2 +-
.../entity/src/main/java/org/apache/ofbiz/entity/finder/Finder.java | 2 +-
.../entity/src/main/java/org/apache/ofbiz/entity/finder/ListFinder.java | 2 +-
.../main/java/org/apache/ofbiz/entity/jdbc/AbstractCursorHandler.java | 2 +-
.../main/java/org/apache/ofbiz/entity/jdbc/ConnectionFactoryLoader.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/jdbc/CursorConnection.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/jdbc/CursorResultSet.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/jdbc/CursorStatement.java | 2 +-
.../entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java | 2 +-
.../java/org/apache/ofbiz/entity/jdbc/ExecQueryCallbackFunctionIF.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/jdbc/JdbcValueHandler.java | 2 +-
.../entity/src/main/java/org/apache/ofbiz/entity/jdbc/SQLProcessor.java | 2 +-
.../entity/src/main/java/org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/model/DynamicViewEntity.java | 2 +-
.../entity/src/main/java/org/apache/ofbiz/entity/model/ModelChild.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/model/ModelEntityChecker.java | 2 +-
.../entity/src/main/java/org/apache/ofbiz/entity/model/ModelField.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/model/ModelFieldType.java | 2 +-
.../main/java/org/apache/ofbiz/entity/model/ModelFieldTypeReader.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/model/ModelGroupReader.java | 2 +-
.../entity/src/main/java/org/apache/ofbiz/entity/model/ModelIndex.java | 2 +-
.../entity/src/main/java/org/apache/ofbiz/entity/model/ModelInfo.java | 2 +-
.../entity/src/main/java/org/apache/ofbiz/entity/model/ModelKeyMap.java | 2 +-
.../entity/src/main/java/org/apache/ofbiz/entity/model/ModelReader.java | 2 +-
.../entity/src/main/java/org/apache/ofbiz/entity/model/ModelUtil.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java | 2 +-
.../main/java/org/apache/ofbiz/entity/serialize/SerializeException.java | 2 +-
.../main/java/org/apache/ofbiz/entity/serialize/XmlSerializable.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/testtools/EntityTestCase.java | 2 +-
.../main/java/org/apache/ofbiz/entity/transaction/DebugXaResource.java | 2 +-
.../org/apache/ofbiz/entity/transaction/DumbTransactionFactory.java | 2 +-
.../apache/ofbiz/entity/transaction/GenericTransactionException.java | 2 +-
.../java/org/apache/ofbiz/entity/transaction/GenericXaResource.java | 2 +-
.../org/apache/ofbiz/entity/transaction/GeronimoTransactionFactory.java | 2 +-
.../org/apache/ofbiz/entity/transaction/JNDITransactionFactory.java | 2 +-
.../java/org/apache/ofbiz/entity/transaction/TransactionFactory.java | 2 +-
.../org/apache/ofbiz/entity/transaction/TransactionFactoryLoader.java | 2 +-
.../main/java/org/apache/ofbiz/entity/transaction/TransactionUtil.java | 2 +-
.../entity/src/main/java/org/apache/ofbiz/entity/util/Converters.java | 2 +-
.../main/java/org/apache/ofbiz/entity/util/DistributedCacheClear.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/util/EntityBatchIterator.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/util/EntityDataAssert.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/util/EntityDataLoader.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/util/EntityFindOptions.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java | 2 +-
.../entity/src/main/java/org/apache/ofbiz/entity/util/EntityQuery.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/util/EntityStoreOptions.java | 2 +-
.../src/main/java/org/apache/ofbiz/entity/util/EntityTypeUtil.java | 2 +-
.../entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtil.java | 2 +-
.../main/java/org/apache/ofbiz/entity/util/EntityUtilProperties.java | 2 +-
.../entity/src/main/java/org/apache/ofbiz/entity/util/SequenceUtil.java | 2 +-
.../src/test/java/org/apache/ofbiz/entity/DelegatorUnitTests.java | 2 +-
.../java/org/apache/ofbiz/entity/condition/EntityFunctionTests.java | 2 +-
.../org/apache/ofbiz/entity/model/ModelViewEntityComplexAliasTests.java | 2 +-
.../test/java/org/apache/ofbiz/entity/test/EntityCryptoTestSuite.java | 2 +-
.../test/java/org/apache/ofbiz/entity/test/EntityQueryTestSuite.java | 2 +-
.../src/test/java/org/apache/ofbiz/entity/test/EntityTestSuite.java | 2 +-
.../src/test/java/org/apache/ofbiz/entity/test/EntityUtilTestSuite.java | 2 +-
.../src/main/java/org/apache/ofbiz/entityext/EntityGroupUtil.java | 2 +-
.../src/main/java/org/apache/ofbiz/entityext/EntityServiceFactory.java | 2 +-
.../src/main/java/org/apache/ofbiz/entityext/EntityWatchServices.java | 2 +-
.../main/java/org/apache/ofbiz/entityext/cache/EntityCacheServices.java | 2 +-
.../java/org/apache/ofbiz/entityext/data/EntityDataLoadContainer.java | 2 +-
.../main/java/org/apache/ofbiz/entityext/data/EntityDataServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/entityext/data/UpgradeServices.java | 2 +-
.../main/java/org/apache/ofbiz/entityext/eca/DelegatorEcaHandler.java | 2 +-
.../src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaAction.java | 2 +-
.../main/java/org/apache/ofbiz/entityext/eca/EntityEcaCondition.java | 2 +-
.../main/java/org/apache/ofbiz/entityext/eca/EntityEcaException.java | 2 +-
.../src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaRule.java | 2 +-
.../src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaSetField.java | 2 +-
.../src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaUtil.java | 2 +-
.../org/apache/ofbiz/entityext/synchronization/EntitySyncContext.java | 2 +-
.../org/apache/ofbiz/entityext/synchronization/EntitySyncServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/MiniLangElement.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/MiniLangException.java | 2 +-
.../main/java/org/apache/ofbiz/minilang/MiniLangRuntimeException.java | 2 +-
.../minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangUtil.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/MiniLangValidate.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/SimpleMapProcessor.java | 2 +-
.../minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/SimpleServiceEngine.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/ValidationException.java | 2 +-
.../java/org/apache/ofbiz/minilang/artifact/ArtifactInfoContext.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/method/FieldObject.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/method/MethodContext.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/method/MethodObject.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/method/MethodOperation.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/method/StringObject.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/callops/CallClassMethod.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/callops/CallObjectMethod.java | 2 +-
.../main/java/org/apache/ofbiz/minilang/method/callops/CallScript.java | 2 +-
.../main/java/org/apache/ofbiz/minilang/method/callops/CallService.java | 2 +-
.../org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java | 2 +-
.../apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/callops/FlexibleMessage.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/method/callops/Return.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java | 2 +-
.../org/apache/ofbiz/minilang/method/conditional/CombinedCondition.java | 2 +-
.../main/java/org/apache/ofbiz/minilang/method/conditional/Compare.java | 2 +-
.../org/apache/ofbiz/minilang/method/conditional/CompareCondition.java | 2 +-
.../apache/ofbiz/minilang/method/conditional/CompareFieldCondition.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/conditional/Conditional.java | 2 +-
.../apache/ofbiz/minilang/method/conditional/ConditionalFactory.java | 2 +-
.../main/java/org/apache/ofbiz/minilang/method/conditional/ElseIf.java | 2 +-
.../org/apache/ofbiz/minilang/method/conditional/EmptyCondition.java | 2 +-
.../ofbiz/minilang/method/conditional/HasPermissionCondition.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/conditional/MasterIf.java | 2 +-
.../org/apache/ofbiz/minilang/method/conditional/RegexpCondition.java | 2 +-
.../ofbiz/minilang/method/conditional/ValidateMethodCondition.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/entityops/ClearCacheLine.java | 2 +-
.../org/apache/ofbiz/minilang/method/entityops/ClearEntityCaches.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/entityops/CloneValue.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/entityops/CreateValue.java | 2 +-
.../main/java/org/apache/ofbiz/minilang/method/entityops/EntityAnd.java | 2 +-
.../org/apache/ofbiz/minilang/method/entityops/EntityCondition.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/entityops/EntityCount.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/entityops/EntityData.java | 2 +-
.../main/java/org/apache/ofbiz/minilang/method/entityops/EntityOne.java | 2 +-
.../org/apache/ofbiz/minilang/method/entityops/EntityOperation.java | 2 +-
.../org/apache/ofbiz/minilang/method/entityops/FilterListByAnd.java | 2 +-
.../org/apache/ofbiz/minilang/method/entityops/FilterListByDate.java | 2 +-
.../main/java/org/apache/ofbiz/minilang/method/entityops/FindByAnd.java | 2 +-
.../org/apache/ofbiz/minilang/method/entityops/FindByPrimaryKey.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/entityops/GetRelated.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/entityops/GetRelatedOne.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/entityops/MakeNextSeqId.java | 2 +-
.../main/java/org/apache/ofbiz/minilang/method/entityops/MakeValue.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/entityops/OrderValueList.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/entityops/RefreshValue.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/entityops/RemoveByAnd.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/entityops/RemoveList.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/entityops/RemoveRelated.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/entityops/RemoveValue.java | 2 +-
.../org/apache/ofbiz/minilang/method/entityops/SequencedIdToEnv.java | 2 +-
.../org/apache/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/entityops/SetNonpkFields.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/entityops/SetPkFields.java | 2 +-
.../main/java/org/apache/ofbiz/minilang/method/entityops/StoreList.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/entityops/StoreValue.java | 2 +-
.../org/apache/ofbiz/minilang/method/entityops/TransactionBegin.java | 2 +-
.../org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java | 2 +-
.../org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/method/envops/AddError.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/method/envops/Assert.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/method/envops/Break.java | 2 +-
.../main/java/org/apache/ofbiz/minilang/method/envops/CheckErrors.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/method/envops/CheckId.java | 2 +-
.../main/java/org/apache/ofbiz/minilang/method/envops/ClearField.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/method/envops/Continue.java | 2 +-
.../main/java/org/apache/ofbiz/minilang/method/envops/CreateObject.java | 2 +-
.../main/java/org/apache/ofbiz/minilang/method/envops/FieldToList.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/envops/FirstFromList.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/method/envops/Iterate.java | 2 +-
.../main/java/org/apache/ofbiz/minilang/method/envops/IterateMap.java | 2 +-
.../main/java/org/apache/ofbiz/minilang/method/envops/ListToList.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/method/envops/Loop.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/method/envops/MapToMap.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/method/envops/Now.java | 2 +-
.../main/java/org/apache/ofbiz/minilang/method/envops/OrderMapList.java | 2 +-
.../main/java/org/apache/ofbiz/minilang/method/envops/SetCalendar.java | 2 +-
.../main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java | 2 +-
.../main/java/org/apache/ofbiz/minilang/method/envops/StringAppend.java | 2 +-
.../main/java/org/apache/ofbiz/minilang/method/envops/StringToList.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/method/envops/ToString.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/method/envops/While.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/eventops/FieldToRequest.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/eventops/FieldToSession.java | 2 +-
.../apache/ofbiz/minilang/method/eventops/RequestParametersToList.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/eventops/RequestToField.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/eventops/SessionToField.java | 2 +-
.../apache/ofbiz/minilang/method/eventops/WebappPropertyToField.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/ifops/CheckPermission.java | 2 +-
.../main/java/org/apache/ofbiz/minilang/method/ifops/IfInstanceOf.java | 2 +-
.../main/java/org/apache/ofbiz/minilang/method/ifops/IfNotEmpty.java | 2 +-
.../main/java/org/apache/ofbiz/minilang/method/otherops/Calculate.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/method/otherops/Log.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/otherops/PropertyToField.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/method/otherops/Trace.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/serviceops/FieldToResult.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/operation/BaseCompare.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/operation/Compare.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/operation/CompareField.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/operation/ConstantOper.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/operation/Convert.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/operation/Copy.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/operation/InFieldOper.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/operation/MakeInString.java | 2 +-
.../java/org/apache/ofbiz/minilang/operation/MakeInStringOperation.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/operation/MapProcessor.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/operation/NotEmpty.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/operation/PropertyOper.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/operation/Regexp.java | 2 +-
.../java/org/apache/ofbiz/minilang/operation/SimpleMapOperation.java | 2 +-
.../main/java/org/apache/ofbiz/minilang/operation/SimpleMapProcess.java | 2 +-
.../main/java/org/apache/ofbiz/minilang/operation/ValidateMethod.java | 2 +-
.../src/test/java/org/apache/ofbiz/minilang/test/MiniLangTests.java | 2 +-
.../src/main/java/org/apache/ofbiz/ws/rs/ServiceNameContextHolder.java | 2 +-
.../src/main/java/org/apache/ofbiz/ws/rs/annotation/AuthToken.java | 2 +-
.../src/main/java/org/apache/ofbiz/ws/rs/annotation/Secured.java | 2 +-
.../main/java/org/apache/ofbiz/ws/rs/common/AuthenticationScheme.java | 2 +-
.../src/main/java/org/apache/ofbiz/ws/rs/core/OFBizApiConfig.java | 2 +-
.../src/main/java/org/apache/ofbiz/ws/rs/core/ResponseStatus.java | 2 +-
.../main/java/org/apache/ofbiz/ws/rs/examples/RestExampleServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/ws/rs/examples/RestOrderExample.java | 2 +-
.../main/java/org/apache/ofbiz/ws/rs/examples/RestOrderItemExample.java | 2 +-
.../org/apache/ofbiz/ws/rs/filters/ServiceContextCleanupFilter.java | 2 +-
.../main/java/org/apache/ofbiz/ws/rs/listener/ApiContextListener.java | 2 +-
.../rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelApi.java | 2 +-
.../src/main/java/org/apache/ofbiz/ws/rs/model/ModelApiReader.java | 2 +-
.../src/main/java/org/apache/ofbiz/ws/rs/model/ModelExample.java | 2 +-
.../src/main/java/org/apache/ofbiz/ws/rs/model/ModelMapping.java | 2 +-
.../src/main/java/org/apache/ofbiz/ws/rs/model/ModelOperation.java | 2 +-
.../src/main/java/org/apache/ofbiz/ws/rs/model/ModelQueryParam.java | 2 +-
.../src/main/java/org/apache/ofbiz/ws/rs/model/ModelResource.java | 2 +-
.../main/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiReader.java | 2 +-
.../main/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiUiFilter.java | 2 +-
.../main/java/org/apache/ofbiz/ws/rs/openapi/OFBizResourceScanner.java | 2 +-
.../main/java/org/apache/ofbiz/ws/rs/process/RestRequestHandler.java | 2 +-
.../main/java/org/apache/ofbiz/ws/rs/process/ServiceRequestHandler.java | 2 +-
.../src/main/java/org/apache/ofbiz/ws/rs/resources/ApiRootResource.java | 2 +-
.../java/org/apache/ofbiz/ws/rs/resources/AuthenticationResource.java | 2 +-
.../src/main/java/org/apache/ofbiz/ws/rs/resources/OpenApiResource.java | 2 +-
.../rest-api/src/main/java/org/apache/ofbiz/ws/rs/response/Error.java | 2 +-
.../rest-api/src/main/java/org/apache/ofbiz/ws/rs/response/Success.java | 2 +-
.../main/java/org/apache/ofbiz/ws/rs/security/auth/APIAuthFilter.java | 2 +-
.../main/java/org/apache/ofbiz/ws/rs/security/auth/APICorsFilter.java | 2 +-
.../java/org/apache/ofbiz/ws/rs/security/auth/HttpBasicAuthFilter.java | 2 +-
.../src/main/java/org/apache/ofbiz/ws/rs/services/RestServices.java | 2 +-
.../org/apache/ofbiz/ws/rs/spi/impl/GenericServiceExceptionMapper.java | 2 +-
.../java/org/apache/ofbiz/ws/rs/spi/impl/GlobalExceptionMapper.java | 2 +-
.../src/main/java/org/apache/ofbiz/ws/rs/spi/impl/JacksonConfig.java | 2 +-
.../src/main/java/org/apache/ofbiz/ws/rs/spi/impl/LinkSerializer.java | 2 +-
.../rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java | 2 +-
.../rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestApiUtil.java | 2 +-
.../main/java/org/apache/ofbiz/ws/rs/util/RestListResponseBuilder.java | 2 +-
.../src/main/java/org/apache/ofbiz/ws/rs/util/RestQueryOptions.java | 2 +-
.../src/main/java/org/apache/ofbiz/ws/rs/util/RestServiceUtil.java | 2 +-
.../src/main/java/org/apache/ofbiz/ws/rs/util/ServiceRequestWorker.java | 2 +-
.../src/test/java/org/apache/ofbiz/ws/rs/core/OFBizApiConfigTest.java | 2 +-
.../src/test/java/org/apache/ofbiz/ws/rs/core/ResponseStatusTest.java | 2 +-
.../java/org/apache/ofbiz/ws/rs/listener/ApiContextListenerTest.java | 2 +-
.../src/test/java/org/apache/ofbiz/ws/rs/model/ModelApiReaderTest.java | 2 +-
.../java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiReaderTest.java | 2 +-
.../java/org/apache/ofbiz/ws/rs/process/RestRequestHandlerTest.java | 2 +-
.../test/java/org/apache/ofbiz/ws/rs/resources/ApiRootResourceTest.java | 2 +-
.../test/java/org/apache/ofbiz/ws/rs/resources/OpenApiResourceTest.java | 2 +-
.../java/org/apache/ofbiz/ws/rs/spi/impl/GlobalExceptionMapperTest.java | 2 +-
.../src/test/java/org/apache/ofbiz/ws/rs/test/RestTestHttpRequest.java | 2 +-
.../src/test/java/org/apache/ofbiz/ws/rs/test/RestTestServices.java | 2 +-
.../src/test/java/org/apache/ofbiz/ws/rs/util/OpenApiUtilTest.java | 2 +-
.../java/org/apache/ofbiz/ws/rs/util/RestApiUtilPaginationTest.java | 2 +-
.../src/test/java/org/apache/ofbiz/ws/rs/util/RestApiUtilTest.java | 2 +-
.../java/org/apache/ofbiz/ws/rs/util/RestListResponseBuilderTest.java | 2 +-
.../src/test/java/org/apache/ofbiz/ws/rs/util/RestQueryOptionsTest.java | 2 +-
.../src/main/java/org/apache/ofbiz/security/CsrfDefenseStrategy.java | 2 +-
.../security/src/main/java/org/apache/ofbiz/security/CsrfUtil.java | 2 +-
.../src/main/java/org/apache/ofbiz/security/ICsrfDefenseStrategy.java | 2 +-
.../src/main/java/org/apache/ofbiz/security/NoCsrfDefenseStrategy.java | 2 +-
.../src/main/java/org/apache/ofbiz/security/SecuredFreemarker.java | 2 +-
.../security/src/main/java/org/apache/ofbiz/security/Security.java | 2 +-
.../java/org/apache/ofbiz/security/SecurityConfigurationException.java | 2 +-
.../src/main/java/org/apache/ofbiz/security/SecurityFactory.java | 2 +-
.../security/src/main/java/org/apache/ofbiz/security/SecurityUtil.java | 2 +-
.../service/src/main/java/org/apache/ofbiz/service/DispatchContext.java | 2 +-
.../main/java/org/apache/ofbiz/service/ExecutionServiceException.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/GeneralServiceException.java | 2 +-
.../main/java/org/apache/ofbiz/service/GenericAbstractDispatcher.java | 2 +-
.../main/java/org/apache/ofbiz/service/GenericDispatcherFactory.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/GenericRequester.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/GenericResultWaiter.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/GenericServiceCallback.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/GenericServiceException.java | 2 +-
.../service/src/main/java/org/apache/ofbiz/service/LocalDispatcher.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/LocalDispatcherFactory.java | 2 +-
.../service/src/main/java/org/apache/ofbiz/service/ModelParam.java | 2 +-
.../service/src/main/java/org/apache/ofbiz/service/ModelPermGroup.java | 2 +-
.../service/src/main/java/org/apache/ofbiz/service/ModelPermission.java | 2 +-
.../service/src/main/java/org/apache/ofbiz/service/ModelService.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/ModelServiceIface.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/ModelServiceReader.java | 2 +-
.../service/src/main/java/org/apache/ofbiz/service/RunningService.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/ServiceAuthException.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/ServiceContainer.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/ServiceErrorException.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/ServiceSynchronization.java | 2 +-
.../service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java | 2 +-
.../main/java/org/apache/ofbiz/service/ServiceValidationException.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/ServiceXaWrapper.java | 2 +-
.../main/java/org/apache/ofbiz/service/calendar/ExpressionUiHelper.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java | 2 +-
.../java/org/apache/ofbiz/service/calendar/RecurrenceInfoException.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java | 2 +-
.../java/org/apache/ofbiz/service/calendar/RecurrenceRuleException.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/calendar/RecurrenceUtil.java | 2 +-
.../main/java/org/apache/ofbiz/service/calendar/TemporalExpression.java | 2 +-
.../org/apache/ofbiz/service/calendar/TemporalExpressionPrinter.java | 2 +-
.../org/apache/ofbiz/service/calendar/TemporalExpressionVisitor.java | 2 +-
.../org/apache/ofbiz/service/calendar/TemporalExpressionWorker.java | 2 +-
.../java/org/apache/ofbiz/service/calendar/TemporalExpressions.java | 2 +-
.../java/org/apache/ofbiz/service/config/ServiceConfigException.java | 2 +-
.../java/org/apache/ofbiz/service/config/ServiceConfigListener.java | 2 +-
.../main/java/org/apache/ofbiz/service/config/ServiceConfigUtil.java | 2 +-
.../main/java/org/apache/ofbiz/service/config/model/Authorization.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/config/model/Engine.java | 2 +-
.../main/java/org/apache/ofbiz/service/config/model/GlobalServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/config/model/JmsService.java | 2 +-
.../main/java/org/apache/ofbiz/service/config/model/Notification.java | 2 +-
.../java/org/apache/ofbiz/service/config/model/NotificationGroup.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/config/model/Notify.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/config/model/Parameter.java | 2 +-
.../main/java/org/apache/ofbiz/service/config/model/ResourceLoader.java | 2 +-
.../main/java/org/apache/ofbiz/service/config/model/RunFromPool.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/config/model/Server.java | 2 +-
.../main/java/org/apache/ofbiz/service/config/model/ServiceConfig.java | 2 +-
.../main/java/org/apache/ofbiz/service/config/model/ServiceEcas.java | 2 +-
.../main/java/org/apache/ofbiz/service/config/model/ServiceEngine.java | 2 +-
.../main/java/org/apache/ofbiz/service/config/model/ServiceGroups.java | 2 +-
.../java/org/apache/ofbiz/service/config/model/ServiceLocation.java | 2 +-
.../main/java/org/apache/ofbiz/service/config/model/StartupService.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/config/model/ThreadPool.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/eca/ServiceEcaAction.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/eca/ServiceEcaCondition.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/eca/ServiceEcaSetField.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/eca/ServiceEcaUtil.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/engine/AbstractEngine.java | 2 +-
.../main/java/org/apache/ofbiz/service/engine/GenericAsyncEngine.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/engine/GenericEngine.java | 2 +-
.../main/java/org/apache/ofbiz/service/engine/GenericEngineFactory.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/engine/GroovyEngine.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/engine/InterfaceEngine.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/engine/RouteEngine.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/engine/SOAPClientEngine.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/engine/ScriptEngine.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/engine/SoapSerializer.java | 2 +-
.../java/org/apache/ofbiz/service/engine/StandardClojureEngine.java | 2 +-
.../main/java/org/apache/ofbiz/service/engine/TrackedServiceEngine.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/group/GroupModel.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/group/GroupServiceModel.java | 2 +-
.../main/java/org/apache/ofbiz/service/group/ServiceGroupEngine.java | 2 +-
.../main/java/org/apache/ofbiz/service/group/ServiceGroupReader.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/jms/AbstractJmsListener.java | 2 +-
.../main/java/org/apache/ofbiz/service/jms/GenericMessageListener.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/jms/JmsListenerFactory.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/jms/JmsQueueListener.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/jms/JmsSerializer.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/jms/JmsServiceEngine.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/jms/JmsTopicListener.java | 2 +-
.../service/src/main/java/org/apache/ofbiz/service/job/AbstractJob.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/job/GenericServiceJob.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/job/InvalidJobException.java | 2 +-
framework/service/src/main/java/org/apache/ofbiz/service/job/Job.java | 2 +-
.../service/src/main/java/org/apache/ofbiz/service/job/JobManager.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/job/JobManagerException.java | 2 +-
.../service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java | 2 +-
.../service/src/main/java/org/apache/ofbiz/service/job/JobServices.java | 2 +-
.../service/src/main/java/org/apache/ofbiz/service/job/JobUtil.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/job/PersistedServiceJob.java | 2 +-
.../service/src/main/java/org/apache/ofbiz/service/job/PurgeJob.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/mail/JavaMailContainer.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/mail/MimeMessageWrapper.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/mail/ServiceMcaAction.java | 2 +-
.../main/java/org/apache/ofbiz/service/mail/ServiceMcaCondition.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/mail/ServiceMcaRule.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/mail/ServiceMcaUtil.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/rmi/ExampleRemoteClient.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcher.java | 2 +-
.../main/java/org/apache/ofbiz/service/rmi/RemoteDispatcherImpl.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/rmi/RmiServiceContainer.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/rmi/RmiServiceEngine.java | 2 +-
.../org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java | 2 +-
.../org/apache/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java | 2 +-
.../java/org/apache/ofbiz/service/semaphore/SemaphoreFailException.java | 2 +-
.../java/org/apache/ofbiz/service/semaphore/SemaphoreWaitException.java | 2 +-
.../main/java/org/apache/ofbiz/service/semaphore/ServiceSemaphore.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/testtools/OFBizTestCase.java | 2 +-
.../src/main/java/org/apache/ofbiz/service/tracker/JobTracker.java | 2 +-
.../main/java/org/apache/ofbiz/service/tracker/JobTrackerFactory.java | 2 +-
.../main/java/org/apache/ofbiz/service/tracker/JobTrackerListener.java | 2 +-
.../java/org/apache/ofbiz/service/test/GroovyDslServiceEngineTests.java | 2 +-
.../src/test/java/org/apache/ofbiz/service/test/ServiceEngineTests.java | 2 +-
.../test/java/org/apache/ofbiz/service/test/ServiceEntityAutoTests.java | 2 +-
.../test/java/org/apache/ofbiz/service/test/ServicePermissionTests.java | 2 +-
.../start/src/main/java/org/apache/ofbiz/base/start/AdminClient.java | 2 +-
framework/start/src/main/java/org/apache/ofbiz/base/start/Start.java | 2 +-
.../start/src/main/java/org/apache/ofbiz/base/start/StartupCommand.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/start/StartupCommandUtil.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/start/StartupControlPanel.java | 2 +-
.../src/main/java/org/apache/ofbiz/base/start/StartupException.java | 2 +-
.../test/java/org/apache/ofbiz/base/start/OfbizStartupUnitTests.java | 2 +-
.../src/main/java/org/apache/ofbiz/testtools/BatchRunServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/testtools/BatchRunTracker.java | 2 +-
.../src/main/java/org/apache/ofbiz/testtools/EntityXmlAssertTest.java | 2 +-
.../src/main/java/org/apache/ofbiz/testtools/GroovyScriptAssert.java | 2 +-
.../src/main/java/org/apache/ofbiz/testtools/HttpsTestSupport.java | 2 +-
.../src/main/java/org/apache/ofbiz/testtools/Junit3ResultBridge.java | 2 +-
.../src/main/java/org/apache/ofbiz/testtools/JunitJupiterTest.java | 2 +-
.../src/main/java/org/apache/ofbiz/testtools/JunitSuiteWrapper.java | 2 +-
.../src/main/java/org/apache/ofbiz/testtools/JupiterTestExtension.java | 2 +-
.../src/main/java/org/apache/ofbiz/testtools/JupiterTestHelper.java | 2 +-
.../src/main/java/org/apache/ofbiz/testtools/ModelTestSuite.java | 2 +-
.../src/main/java/org/apache/ofbiz/testtools/ReportingSupport.java | 2 +-
.../testtools/src/main/java/org/apache/ofbiz/testtools/ServiceTest.java | 2 +-
.../src/main/java/org/apache/ofbiz/testtools/SimpleMethodTest.java | 2 +-
.../testtools/src/main/java/org/apache/ofbiz/testtools/SuiteEntry.java | 2 +-
.../src/main/java/org/apache/ofbiz/testtools/SuiteReportLogger.java | 2 +-
.../src/main/java/org/apache/ofbiz/testtools/SuiteReportSink.java | 2 +-
.../src/main/java/org/apache/ofbiz/testtools/SuiteXmlReportWriter.java | 2 +-
.../src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java | 2 +-
.../src/main/java/org/apache/ofbiz/testtools/TestRunRecord.java | 2 +-
.../src/main/java/org/apache/ofbiz/testtools/TestRunServices.java | 2 +-
.../src/main/java/org/apache/ofbiz/testtools/TestRunTracker.java | 2 +-
.../src/test/java/org/apache/ofbiz/testtools/BatchRunServicesTest.java | 2 +-
.../src/test/java/org/apache/ofbiz/testtools/BatchRunTrackerTest.java | 2 +-
.../test/java/org/apache/ofbiz/testtools/Junit3ResultBridgeTest.java | 2 +-
.../test/java/org/apache/ofbiz/testtools/JupiterClassRunnerTest.java | 2 +-
.../java/org/apache/ofbiz/testtools/JupiterInjectionGuardsTest.java | 2 +-
.../src/test/java/org/apache/ofbiz/testtools/ModelTestSuiteTest.java | 2 +-
.../src/test/java/org/apache/ofbiz/testtools/RecordingSink.java | 2 +-
.../src/test/java/org/apache/ofbiz/testtools/SuiteEntryTest.java | 2 +-
.../src/test/java/org/apache/ofbiz/testtools/SuiteReportLoggerTest.java | 2 +-
.../src/test/java/org/apache/ofbiz/testtools/SuiteReportSinkTest.java | 2 +-
.../test/java/org/apache/ofbiz/testtools/SuiteXmlReportWriterTest.java | 2 +-
.../src/test/java/org/apache/ofbiz/testtools/TestRunContainerTest.java | 2 +-
.../src/test/java/org/apache/ofbiz/testtools/TestRunServicesTest.java | 2 +-
.../src/test/java/org/apache/ofbiz/testtools/TestRunTrackerTest.java | 2 +-
.../webapp/src/main/java/org/apache/ofbiz/webapp/AfterLoginEvents.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/OfbizPathShortener.java | 2 +-
.../webapp/src/main/java/org/apache/ofbiz/webapp/OfbizUrlBuilder.java | 2 +-
.../webapp/src/main/java/org/apache/ofbiz/webapp/SeoConfigUtil.java | 2 +-
framework/webapp/src/main/java/org/apache/ofbiz/webapp/WebAppUtil.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java | 2 +-
.../org/apache/ofbiz/webapp/control/ControlActivationEventListener.java | 2 +-
.../main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/control/ControlFilter.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/control/ControlServlet.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/control/LoginCheck.java | 2 +-
.../main/java/org/apache/ofbiz/webapp/control/LoginEventListener.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java | 2 +-
.../java/org/apache/ofbiz/webapp/control/MethodNotAllowedException.java | 2 +-
.../main/java/org/apache/ofbiz/webapp/control/ProtectViewWorker.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java | 2 +-
.../java/org/apache/ofbiz/webapp/control/RequestHandlerException.java | 2 +-
.../webapp/control/RequestHandlerExceptionAllowExternalRequests.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/control/SameSiteFilter.java | 2 +-
.../org/apache/ofbiz/webapp/control/WebAppConfigurationException.java | 2 +-
.../webapp/src/main/java/org/apache/ofbiz/webapp/event/CoreEvents.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/event/EventFactory.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/event/EventHandler.java | 2 +-
.../main/java/org/apache/ofbiz/webapp/event/EventHandlerException.java | 2 +-
.../java/org/apache/ofbiz/webapp/event/FileUploadProgressListener.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/event/JavaEventHandler.java | 2 +-
.../org/apache/ofbiz/webapp/event/RequestBodyMapHandlerFactory.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/event/SOAPEventHandler.java | 2 +-
.../main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java | 2 +-
.../java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/event/SimpleEventHandler.java | 2 +-
.../webapp/src/main/java/org/apache/ofbiz/webapp/event/TestEvent.java | 2 +-
.../main/java/org/apache/ofbiz/webapp/ftl/CsrfTokenAjaxTransform.java | 2 +-
.../java/org/apache/ofbiz/webapp/ftl/CsrfTokenPairNonAjaxTransform.java | 2 +-
.../main/java/org/apache/ofbiz/webapp/ftl/FreeMarkerViewHandler.java | 2 +-
.../org/apache/ofbiz/webapp/ftl/JsLanguageFilesMappingTransform.java | 2 +-
.../webapp/src/main/java/org/apache/ofbiz/webapp/ftl/LoopWriter.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/ftl/OfbizAmountTransform.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCacheStorage.java | 2 +-
.../main/java/org/apache/ofbiz/webapp/ftl/OfbizContentTransform.java | 2 +-
.../main/java/org/apache/ofbiz/webapp/ftl/OfbizCurrencyTransform.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/ftl/OfbizNumberTransform.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/ftl/OfbizScreenTransform.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/ftl/OfbizUrlTransform.java | 2 +-
.../java/org/apache/ofbiz/webapp/ftl/RenderWrappedTextTransform.java | 2 +-
.../java/org/apache/ofbiz/webapp/ftl/ScriptTagsFooterTransform.java | 2 +-
.../main/java/org/apache/ofbiz/webapp/ftl/SetContextFieldTransform.java | 2 +-
.../java/org/apache/ofbiz/webapp/ftl/SetRequestAttributeMethod.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/stats/ServerHitBin.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/stats/VisitHandler.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/taglib/ContentUrlTag.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/view/AbstractViewHandler.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/view/ApacheFopWorker.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/view/JspViewHandler.java | 2 +-
.../webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewFactory.java | 2 +-
.../webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewHandler.java | 2 +-
.../main/java/org/apache/ofbiz/webapp/view/ViewHandlerException.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/webdav/PropFindHelper.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/webdav/RequestHandler.java | 2 +-
.../main/java/org/apache/ofbiz/webapp/webdav/RequestHandlerFactory.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/webdav/ResponseHelper.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/webdav/WebDavServlet.java | 2 +-
.../webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavUtil.java | 2 +-
.../main/java/org/apache/ofbiz/webapp/website/WebSiteProperties.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/website/WebSiteWorker.java | 2 +-
.../webapp/src/test/java/org/apache/ofbiz/webapp/WebAppUtilTests.java | 2 +-
.../src/main/java/org/apache/ofbiz/webtools/GenericWebEvent.java | 2 +-
.../src/main/java/org/apache/ofbiz/webtools/UtilCacheEvents.java | 2 +-
.../src/main/java/org/apache/ofbiz/webtools/WebToolsDbEvents.java | 2 +-
.../main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java | 2 +-
.../java/org/apache/ofbiz/webtools/secret/SecretAuditContainer.java | 2 +-
.../main/java/org/apache/ofbiz/webtools/secret/SecretAuditEvent.java | 2 +-
.../main/java/org/apache/ofbiz/webtools/secret/SecretAuditLogger.java | 2 +-
.../main/java/org/apache/ofbiz/webtools/secret/SecretAuditQueue.java | 2 +-
.../main/java/org/apache/ofbiz/webtools/secret/SecretManagerEvents.java | 2 +-
.../java/org/apache/ofbiz/webtools/secret/SecretManagerServices.java | 2 +-
.../java/org/apache/ofbiz/webtools/secret/SecretAuditContainerTest.java | 2 +-
.../java/org/apache/ofbiz/webtools/secret/SecretAuditQueueTest.java | 2 +-
.../java/org/apache/ofbiz/webtools/secret/SecretManagerEventsTest.java | 2 +-
.../org/apache/ofbiz/webtools/secret/SecretManagerServicesTest.java | 2 +-
.../widget/src/main/java/org/apache/ofbiz/widget/WidgetFactory.java | 2 +-
.../widget/src/main/java/org/apache/ofbiz/widget/WidgetLoader.java | 2 +-
.../widget/src/main/java/org/apache/ofbiz/widget/WidgetWorker.java | 2 +-
.../main/java/org/apache/ofbiz/widget/artifact/ArtifactInfoContext.java | 2 +-
.../java/org/apache/ofbiz/widget/artifact/ArtifactInfoGatherer.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/cache/AbstractCache.java | 2 +-
.../main/java/org/apache/ofbiz/widget/cache/GenericWidgetOutput.java | 2 +-
.../widget/src/main/java/org/apache/ofbiz/widget/cache/ScreenCache.java | 2 +-
.../main/java/org/apache/ofbiz/widget/cache/WidgetContextCacheKey.java | 2 +-
.../java/org/apache/ofbiz/widget/content/ContentWorkerInterface.java | 2 +-
.../org/apache/ofbiz/widget/content/DataResourceWorkerInterface.java | 2 +-
.../java/org/apache/ofbiz/widget/content/StaticContentUrlProvider.java | 2 +-
.../main/java/org/apache/ofbiz/widget/content/WidgetContentWorker.java | 2 +-
.../java/org/apache/ofbiz/widget/content/WidgetDataResourceWorker.java | 2 +-
.../main/java/org/apache/ofbiz/widget/model/AbstractModelAction.java | 2 +-
.../main/java/org/apache/ofbiz/widget/model/AbstractModelCondition.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/model/CommonWidgetModels.java | 2 +-
.../widget/src/main/java/org/apache/ofbiz/widget/model/FieldInfo.java | 2 +-
.../widget/src/main/java/org/apache/ofbiz/widget/model/FormFactory.java | 2 +-
.../widget/src/main/java/org/apache/ofbiz/widget/model/GridFactory.java | 2 +-
.../widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java | 2 +-
.../main/java/org/apache/ofbiz/widget/model/IterateSectionWidget.java | 2 +-
.../widget/src/main/java/org/apache/ofbiz/widget/model/MenuFactory.java | 2 +-
.../widget/src/main/java/org/apache/ofbiz/widget/model/ModelAction.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/model/ModelActionUtil.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/model/ModelActionVisitor.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/model/ModelCondition.java | 2 +-
.../main/java/org/apache/ofbiz/widget/model/ModelConditionFactory.java | 2 +-
.../main/java/org/apache/ofbiz/widget/model/ModelConditionVisitor.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/model/ModelFieldVisitor.java | 2 +-
.../widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/model/ModelFormAction.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java | 2 +-
.../main/java/org/apache/ofbiz/widget/model/ModelFormFieldBuilder.java | 2 +-
.../widget/src/main/java/org/apache/ofbiz/widget/model/ModelGrid.java | 2 +-
.../widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenu.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/model/ModelMenuAction.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/model/ModelMenuCondition.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/model/ModelMenuItem.java | 2 +-
.../widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreen.java | 2 +-
.../main/java/org/apache/ofbiz/widget/model/ModelScreenCondition.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/model/ModelScreenWidget.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/model/ModelSingleForm.java | 2 +-
.../widget/src/main/java/org/apache/ofbiz/widget/model/ModelTheme.java | 2 +-
.../widget/src/main/java/org/apache/ofbiz/widget/model/ModelTree.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/model/ModelTreeAction.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/model/ModelTreeCondition.java | 2 +-
.../widget/src/main/java/org/apache/ofbiz/widget/model/ModelWidget.java | 2 +-
.../main/java/org/apache/ofbiz/widget/model/ModelWidgetCondition.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/model/ModelWidgetVisitor.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/model/ScreenFactory.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/model/ScriptLinkHelper.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/model/ThemeFactory.java | 2 +-
.../widget/src/main/java/org/apache/ofbiz/widget/model/TreeFactory.java | 2 +-
.../main/java/org/apache/ofbiz/widget/model/WidgetSecureLocation.java | 2 +-
.../java/org/apache/ofbiz/widget/model/XmlAbstractWidgetVisitor.java | 2 +-
.../main/java/org/apache/ofbiz/widget/model/XmlWidgetActionVisitor.java | 2 +-
.../java/org/apache/ofbiz/widget/model/XmlWidgetConditionVisitor.java | 2 +-
.../main/java/org/apache/ofbiz/widget/model/XmlWidgetFieldVisitor.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/model/XmlWidgetVisitor.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/portal/PortalPageWorker.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java | 2 +-
.../main/java/org/apache/ofbiz/widget/renderer/FormStringRenderer.java | 2 +-
.../main/java/org/apache/ofbiz/widget/renderer/MenuStringRenderer.java | 2 +-
.../main/java/org/apache/ofbiz/widget/renderer/MenuWrapTransform.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/renderer/Paginator.java | 2 +-
.../java/org/apache/ofbiz/widget/renderer/ScreenRenderException.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/renderer/ScreenRenderer.java | 2 +-
.../java/org/apache/ofbiz/widget/renderer/ScreenStringRenderer.java | 2 +-
.../main/java/org/apache/ofbiz/widget/renderer/TreeStringRenderer.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/renderer/UtilHelpText.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/renderer/VisualTheme.java | 2 +-
.../main/java/org/apache/ofbiz/widget/renderer/fo/FoFormRenderer.java | 2 +-
.../java/org/apache/ofbiz/widget/renderer/fo/ScreenFopViewHandler.java | 2 +-
.../java/org/apache/ofbiz/widget/renderer/html/HtmlMenuRenderer.java | 2 +-
.../org/apache/ofbiz/widget/renderer/html/HtmlMenuRendererImage.java | 2 +-
.../java/org/apache/ofbiz/widget/renderer/html/HtmlMenuWrapper.java | 2 +-
.../org/apache/ofbiz/widget/renderer/html/HtmlMenuWrapperImage.java | 2 +-
.../java/org/apache/ofbiz/widget/renderer/html/HtmlTreeRenderer.java | 2 +-
.../java/org/apache/ofbiz/widget/renderer/html/HtmlWidgetRenderer.java | 2 +-
.../src/main/java/org/apache/ofbiz/widget/renderer/macro/FtlWriter.java | 2 +-
.../org/apache/ofbiz/widget/renderer/macro/MacroCommonRenderer.java | 2 +-
.../java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java | 2 +-
.../java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java | 2 +-
.../org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java | 2 +-
.../org/apache/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java | 2 +-
.../java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java | 2 +-
.../ofbiz/widget/renderer/macro/RenderableFtlFormElementsBuilder.java | 2 +-
.../apache/ofbiz/widget/renderer/macro/renderable/RenderableFtl.java | 2 +-
.../ofbiz/widget/renderer/macro/renderable/RenderableFtlMacroCall.java | 2 +-
.../ofbiz/widget/renderer/macro/renderable/RenderableFtlNoop.java | 2 +-
.../ofbiz/widget/renderer/macro/renderable/RenderableFtlSequence.java | 2 +-
.../ofbiz/widget/renderer/macro/renderable/RenderableFtlVerbatim.java | 2 +-
.../ofbiz/widget/renderer/macro/renderable/RenderableFtlVisitor.java | 2 +-
.../org/apache/ofbiz/widget/renderer/xlsx/ScreenXlsxViewHandler.java | 2 +-
.../java/org/apache/ofbiz/widget/renderer/xlsx/XlsxFormRenderer.java | 2 +-
.../org/apache/ofbiz/widget/renderer/xlsx/XlsxScreenStringRenderer.java | 2 +-
.../widget/src/test/java/org/apache/ofbiz/widget/WidgetWorkerTest.java | 2 +-
.../test/java/org/apache/ofbiz/widget/renderer/macro/FtlWriterTest.java | 2 +-
.../java/org/apache/ofbiz/widget/renderer/macro/MacroCallMatcher.java | 2 +-
.../widget/renderer/macro/MacroCallParameterBooleanValueMatcher.java | 2 +-
.../widget/renderer/macro/MacroCallParameterIntegerValueMatcher.java | 2 +-
.../ofbiz/widget/renderer/macro/MacroCallParameterMapValueMatcher.java | 2 +-
.../apache/ofbiz/widget/renderer/macro/MacroCallParameterMatcher.java | 2 +-
.../renderer/macro/MacroCallParameterStringValueEndsWithMatcher.java | 2 +-
.../widget/renderer/macro/MacroCallParameterStringValueMatcher.java | 2 +-
.../renderer/macro/MacroCallParameterStringValueStartsWithMatcher.java | 2 +-
.../org/apache/ofbiz/widget/renderer/macro/MacroFormRendererTest.java | 2 +-
.../widget/renderer/macro/MacroRenderersTemplateTextGuardTest.java | 2 +-
.../renderer/macro/RenderableFtlFormElementsBuilderDatetimeTest.java | 2 +-
.../widget/renderer/macro/RenderableFtlFormElementsBuilderTest.java | 2 +-
.../org/apache/ofbiz/widget/renderer/xlsx/XlsxFormRendererTest.java | 2 +-
1117 files changed, 1117 insertions(+), 1117 deletions(-)
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/AccountingException.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/AccountingException.java
index 96157730d1..26dcf53b50 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/AccountingException.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/AccountingException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/GlEvents.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/GlEvents.java
index 6df4227f89..221a8520ac 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/GlEvents.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/GlEvents.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/agreement/AgreementServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/agreement/AgreementServices.java
index 65db9e599e..e080da0232 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/agreement/AgreementServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/agreement/AgreementServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/finaccount/FinAccountServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/finaccount/FinAccountServices.java
index b3d4616671..0248e0c15c 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/finaccount/FinAccountServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/finaccount/FinAccountServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java
index 8b5f4b2ff3..573c850cce 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceWorker.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceWorker.java
index ef5c2c7af2..19691d75a5 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceWorker.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceWorker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/ledger/GeneralLedgerServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/ledger/GeneralLedgerServices.java
index 5e1ed51b2c..3d7505c03b 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/ledger/GeneralLedgerServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/ledger/GeneralLedgerServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/BillingAccountWorker.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/BillingAccountWorker.java
index 07021b59b8..ad67153bba 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/BillingAccountWorker.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/BillingAccountWorker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java
index a1351aa958..e195ca8491 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java
index a059ccfc6f..e5ca581211 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentMethodServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentMethodServices.java
index 1ba7131845..2062da46e8 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentMethodServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentMethodServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentWorker.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentWorker.java
index fca2440f1d..4dab3999c9 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentWorker.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentWorker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/period/PeriodServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/period/PeriodServices.java
index 62b8b98899..80b3d5d286 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/period/PeriodServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/period/PeriodServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java
index 485b79dfa6..990ea5bf0b 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/util/UtilAccounting.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/util/UtilAccounting.java
index cb1137fcd2..c2eefbf1c6 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/util/UtilAccounting.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/util/UtilAccounting.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementEvents.java b/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementEvents.java
index e5968b3fdd..f53e71c587 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementEvents.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementEvents.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java b/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java
index 3c2d9da6f3..c0b56700e3 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java b/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java
index 092907f809..fceded7305 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/ConvertTree.java b/applications/content/src/main/java/org/apache/ofbiz/content/ConvertTree.java
index ac11beb006..0e9cb62000 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/ConvertTree.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/ConvertTree.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/cms/ContentJsonEvents.java b/applications/content/src/main/java/org/apache/ofbiz/content/cms/ContentJsonEvents.java
index ac0262c7d6..8568f56b47 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/cms/ContentJsonEvents.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/cms/ContentJsonEvents.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentEvents.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentEvents.java
index d519cdd3af..7450e626d8 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentEvents.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentEvents.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentKeywordIndex.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentKeywordIndex.java
index 576d323f6e..f408698195 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentKeywordIndex.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentKeywordIndex.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentPermissionServices.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentPermissionServices.java
index ec17dbc7f5..51cd3c5b8e 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentPermissionServices.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentPermissionServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearch.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearch.java
index 8358abfb95..075a6251a0 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearch.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearch.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchEvents.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchEvents.java
index 47a1f6df9e..36cd0ef2b0 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchEvents.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchEvents.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchSession.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchSession.java
index a4cd0947d3..71997d31ee 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchSession.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchSession.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServices.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServices.java
index 3f133ed049..f269df0a9f 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServices.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServicesComplex.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServicesComplex.java
index 6e63339931..bdf672a9f6 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServicesComplex.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServicesComplex.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentUrlFilter.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentUrlFilter.java
index e68f6ba077..2494f351a0 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentUrlFilter.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentUrlFilter.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java
index 914f51ba61..da71aa3bf1 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWrapper.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWrapper.java
index 9b584dfe86..bd181951e3 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWrapper.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWrapper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/PermissionRecorder.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/PermissionRecorder.java
index 1a72dd641d..ea4bbb7b96 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/content/PermissionRecorder.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/PermissionRecorder.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/UploadContentAndImage.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/UploadContentAndImage.java
index b593df64a6..68ae9c8bb0 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/content/UploadContentAndImage.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/UploadContentAndImage.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/data/DataEvents.java b/applications/content/src/main/java/org/apache/ofbiz/content/data/DataEvents.java
index 8661d0bbb7..a2a045239f 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/data/DataEvents.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/data/DataEvents.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java b/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
index 368e1f94e8..825e805212 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java b/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java
index 5b22a67b43..4c4eb6b03b 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/ftp/FtpClientInterface.java b/applications/content/src/main/java/org/apache/ofbiz/content/ftp/FtpClientInterface.java
index 90ae808a33..aae57fe749 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/ftp/FtpClientInterface.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/ftp/FtpClientInterface.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/ftp/FtpServices.java b/applications/content/src/main/java/org/apache/ofbiz/content/ftp/FtpServices.java
index 5be08700dd..1142cc643b 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/ftp/FtpServices.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/ftp/FtpServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/ftp/SecureFtpClient.java b/applications/content/src/main/java/org/apache/ofbiz/content/ftp/SecureFtpClient.java
index 505cbc210c..5ce027ad74 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/ftp/SecureFtpClient.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/ftp/SecureFtpClient.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/ftp/SimpleFtpClient.java b/applications/content/src/main/java/org/apache/ofbiz/content/ftp/SimpleFtpClient.java
index c064c1e919..e3d381599d 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/ftp/SimpleFtpClient.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/ftp/SimpleFtpClient.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/ftp/SshClientHelper.java b/applications/content/src/main/java/org/apache/ofbiz/content/ftp/SshClientHelper.java
index 5d3e803863..6f4fa298c2 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/ftp/SshClientHelper.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/ftp/SshClientHelper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/ftp/SshFtpClient.java b/applications/content/src/main/java/org/apache/ofbiz/content/ftp/SshFtpClient.java
index 9a051c3230..7a50f27e84 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/ftp/SshFtpClient.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/ftp/SshFtpClient.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutEvents.java b/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutEvents.java
index 260c970e21..07f147d70b 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutEvents.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutEvents.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutWorker.java b/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutWorker.java
index 46aade9207..dc91cd698f 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutWorker.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutWorker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/output/OutputServices.java b/applications/content/src/main/java/org/apache/ofbiz/content/output/OutputServices.java
index 62ce72e555..bb128cb033 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/output/OutputServices.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/output/OutputServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/permission/EntityPermissionChecker.java b/applications/content/src/main/java/org/apache/ofbiz/content/permission/EntityPermissionChecker.java
index 5a55041573..066098f486 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/permission/EntityPermissionChecker.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/permission/EntityPermissionChecker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfFormHelper.java b/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfFormHelper.java
index d5a4ce81d6..4432afe621 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfFormHelper.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfFormHelper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java b/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java
index 9cca9fe0b1..0db140fd8a 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyEvents.java b/applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyEvents.java
index c294f48e5b..d12ad856b4 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyEvents.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyEvents.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyWrapper.java b/applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyWrapper.java
index 754cf211a2..4daee38de8 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyWrapper.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyWrapper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/view/SimpleContentViewHandler.java b/applications/content/src/main/java/org/apache/ofbiz/content/view/SimpleContentViewHandler.java
index 14ffb96082..63e431a997 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/view/SimpleContentViewHandler.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/view/SimpleContentViewHandler.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/CheckPermissionTransform.java b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/CheckPermissionTransform.java
index 5a13ee840c..13db013dee 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/CheckPermissionTransform.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/CheckPermissionTransform.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java
index 977d06f078..034749327a 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java
index d92500f59a..79dee6a26b 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java
index 227467685e..074e1ea935 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java
index 918c36f1eb..b693793b07 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LoopSubContentTransform.java b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LoopSubContentTransform.java
index 2aefc4d92b..1c2a31ac42 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LoopSubContentTransform.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LoopSubContentTransform.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/OfbizContentAltUrlTransforms.java b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/OfbizContentAltUrlTransforms.java
index f1284bf015..06815de0ca 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/OfbizContentAltUrlTransforms.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/OfbizContentAltUrlTransforms.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java
index 60e19789bb..dff64cf2d0 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java
index 42e38c22ec..7e23ca8401 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentTransform.java b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentTransform.java
index e9a689da02..b0f3476d92 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentTransform.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentTransform.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentAsText.java b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentAsText.java
index 9a5764ede7..1e0bfbe2c4 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentAsText.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentAsText.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java
index 61d628419b..495f955325 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentTransform.java b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentTransform.java
index ba18078110..d9ff7c8e4e 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentTransform.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderSubContentTransform.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java
index 7e6efa574e..c4e5d1179f 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java
index a4c27ba3b8..43a4743ca1 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java
index 9e91df5140..eb02f8a84c 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/content/src/test/java/org/apache/ofbiz/content/data/DataServicesTest.java b/applications/content/src/test/java/org/apache/ofbiz/content/data/DataServicesTest.java
index ba2bcc0748..eaf6e8bc93 100644
--- a/applications/content/src/test/java/org/apache/ofbiz/content/data/DataServicesTest.java
+++ b/applications/content/src/test/java/org/apache/ofbiz/content/data/DataServicesTest.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/humanres/src/main/java/org/apache/ofbiz/humanres/HumanResEvents.java b/applications/humanres/src/main/java/org/apache/ofbiz/humanres/HumanResEvents.java
index 96a68f0825..764474dee3 100644
--- a/applications/humanres/src/main/java/org/apache/ofbiz/humanres/HumanResEvents.java
+++ b/applications/humanres/src/main/java/org/apache/ofbiz/humanres/HumanResEvents.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMHelper.java b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMHelper.java
index 2d0850576b..04d17ce841 100644
--- a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMHelper.java
+++ b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMHelper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMNode.java b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMNode.java
index cc4ef7ccad..3aa98de8fc 100644
--- a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMNode.java
+++ b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMNode.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMServices.java b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMServices.java
index 97910d453a..39d5edab67 100644
--- a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMServices.java
+++ b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMTree.java b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMTree.java
index 33ecd0563d..89ef230d4d 100644
--- a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMTree.java
+++ b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMTree.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRun.java b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRun.java
index d54df837fc..24f69c4a77 100644
--- a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRun.java
+++ b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRun.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java
index 90f4b12d79..d5f78a8bc7 100644
--- a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java
+++ b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java
index 8720bbcf03..d9d5931b48 100644
--- a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java
+++ b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
index 423bbfa5ec..9101cff3b5 100644
--- a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
+++ b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/InventoryEventPlannedServices.java b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/InventoryEventPlannedServices.java
index ae61c06f6a..1b6cd40348 100644
--- a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/InventoryEventPlannedServices.java
+++ b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/InventoryEventPlannedServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/MrpServices.java b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/MrpServices.java
index cac5ed6fd7..0e1de2c971 100644
--- a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/MrpServices.java
+++ b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/MrpServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/ProposedOrder.java b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/ProposedOrder.java
index 6ed6d9b48b..057000e32c 100644
--- a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/ProposedOrder.java
+++ b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/ProposedOrder.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/routing/RoutingServices.java b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/routing/RoutingServices.java
index 768c54b757..cc3cd0d3cb 100644
--- a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/routing/RoutingServices.java
+++ b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/routing/RoutingServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/marketing/src/main/java/org/apache/ofbiz/marketing/marketing/MarketingServices.java b/applications/marketing/src/main/java/org/apache/ofbiz/marketing/marketing/MarketingServices.java
index bd0d3f8592..68d02ed753 100644
--- a/applications/marketing/src/main/java/org/apache/ofbiz/marketing/marketing/MarketingServices.java
+++ b/applications/marketing/src/main/java/org/apache/ofbiz/marketing/marketing/MarketingServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java b/applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java
index 073d42404e..351a4d813a 100644
--- a/applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java
+++ b/applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java b/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java
index 248ed57d67..cdbc6b1789 100644
--- a/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java
+++ b/applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderChangeHelper.java b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderChangeHelper.java
index b45d561050..71df68dd4f 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderChangeHelper.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderChangeHelper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderContentWrapper.java b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderContentWrapper.java
index 090b20046e..9e17c72422 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderContentWrapper.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderContentWrapper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderEvents.java b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderEvents.java
index 6c0d319a9e..2cee47b1eb 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderEvents.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderEvents.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReadHelper.java b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReadHelper.java
index 94754511a6..7a0adaf15b 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReadHelper.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReadHelper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java
index fd4741e415..6b95d514fd 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/quote/QuoteServices.java b/applications/order/src/main/java/org/apache/ofbiz/order/quote/QuoteServices.java
index 414fd8e545..d6cbaa69d5 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/quote/QuoteServices.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/quote/QuoteServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CartEventListener.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CartEventListener.java
index fbdbe22da3..a4dc8b5d62 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CartEventListener.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CartEventListener.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CartItemModifyException.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CartItemModifyException.java
index 0d398b72ac..771be84583 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CartItemModifyException.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CartItemModifyException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java
index d09160f036..edba39c39a 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ItemNotFoundException.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ItemNotFoundException.java
index c6c7769ea1..0befe60a85 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ItemNotFoundException.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ItemNotFoundException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java
index ed806aea54..424c384982 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartEvents.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartEvents.java
index 2fb0b58910..098e09ab0b 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartEvents.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartEvents.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java
index 67629629c1..12b5f5d171 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartServices.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartServices.java
index 20f2dd8493..8e13930cff 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartServices.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/WebShoppingCart.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/WebShoppingCart.java
index 06ca20b2a5..05aac67e5e 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/WebShoppingCart.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/WebShoppingCart.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java
index a4006797dd..adafb509ac 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
index 431fea301b..7c30ce3bb0 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductStoreCartAwareEvents.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductStoreCartAwareEvents.java
index 14cec30a40..e77cf73d45 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductStoreCartAwareEvents.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductStoreCartAwareEvents.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/shipping/ShippingEstimateWrapper.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/shipping/ShippingEstimateWrapper.java
index c00317bf58..8bd921fc42 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/shipping/ShippingEstimateWrapper.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/shipping/ShippingEstimateWrapper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/shipping/ShippingEvents.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/shipping/ShippingEvents.java
index 1164cbd2ac..c7cd3d0a3e 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/shipping/ShippingEvents.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/shipping/ShippingEvents.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java
index f2a9410ea1..a75f84cad1 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java
index fe86371f53..7e5509e683 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/task/TaskEvents.java b/applications/order/src/main/java/org/apache/ofbiz/order/task/TaskEvents.java
index 1524f2804a..a67b866c79 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/task/TaskEvents.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/task/TaskEvents.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/task/TaskWorker.java b/applications/order/src/main/java/org/apache/ofbiz/order/task/TaskWorker.java
index 7d77f5d1a7..6aa5257f5c 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/task/TaskWorker.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/task/TaskWorker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/test/OrderTestServices.java b/applications/order/src/main/java/org/apache/ofbiz/order/test/OrderTestServices.java
index 6fe2407913..dc03ca859b 100644
--- a/applications/order/src/main/java/org/apache/ofbiz/order/test/OrderTestServices.java
+++ b/applications/order/src/main/java/org/apache/ofbiz/order/test/OrderTestServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java b/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java
index d2c108592e..0f08cc247a 100644
--- a/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java
+++ b/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactHelper.java b/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactHelper.java
index 2830e3078e..432e0e8afe 100644
--- a/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactHelper.java
+++ b/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactHelper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java b/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java
index 4963fd0f98..19df5aa8f6 100644
--- a/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java
+++ b/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechWorker.java b/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechWorker.java
index 93ed9529a9..04d19319c4 100644
--- a/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechWorker.java
+++ b/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechWorker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java b/applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java
index 17b44b90fe..ae4a2f0ce5 100644
--- a/applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java
+++ b/applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyHelper.java b/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyHelper.java
index 2bbc85275e..fea2eb65e5 100644
--- a/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyHelper.java
+++ b/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyHelper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyRelationshipHelper.java b/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyRelationshipHelper.java
index 3e96bb048c..334bfe0e77 100644
--- a/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyRelationshipHelper.java
+++ b/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyRelationshipHelper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyRelationshipServices.java b/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyRelationshipServices.java
index 22ebe890aa..db7301aa99 100644
--- a/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyRelationshipServices.java
+++ b/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyRelationshipServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed partyIdTo the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyTypeHelper.java b/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyTypeHelper.java
index b891a827cc..dead0399a5 100644
--- a/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyTypeHelper.java
+++ b/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyTypeHelper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/catalog/CatalogWorker.java b/applications/product/src/main/java/org/apache/ofbiz/product/catalog/CatalogWorker.java
index 9c4ed5b039..84ff097dac 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/catalog/CatalogWorker.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/catalog/CatalogWorker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlDirective.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlDirective.java
index 297934b977..db31818bbb 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlDirective.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlDirective.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlFilter.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlFilter.java
index 3580025bf1..654b6882f6 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlFilter.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlFilter.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlSeoFilter.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlSeoFilter.java
index 5f4d5e28f3..36f1097fae 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlSeoFilter.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlSeoFilter.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlServlet.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlServlet.java
index afbf46a062..f3aa1d7348 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlServlet.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlServlet.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryContentWrapper.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryContentWrapper.java
index 072367e406..90846e10c6 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryContentWrapper.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryContentWrapper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryControlServlet.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryControlServlet.java
index d9945f2207..682e443900 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryControlServlet.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryControlServlet.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryServices.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryServices.java
index 92a62a6c43..8521545a2d 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryServices.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryWorker.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryWorker.java
index 405395dc54..1269ab82a5 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryWorker.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryWorker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoCatalogUrlServlet.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoCatalogUrlServlet.java
index cbceb2bdc3..771f20a6b9 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoCatalogUrlServlet.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoCatalogUrlServlet.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContentUrlFilter.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContentUrlFilter.java
index 20177f0d03..91721964d1 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContentUrlFilter.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContentUrlFilter.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java
index 537efaf066..f63785e8e8 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoControlServlet.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoControlServlet.java
index ac49959f54..2e80638093 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoControlServlet.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoControlServlet.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoUrlUtil.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoUrlUtil.java
index a66091732e..f0364466f4 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoUrlUtil.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoUrlUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/CatalogAltUrlSeoTransform.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/CatalogAltUrlSeoTransform.java
index fbf7e206b9..a25bbed33a 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/CatalogAltUrlSeoTransform.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/CatalogAltUrlSeoTransform.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/CatalogUrlSeoTransform.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/CatalogUrlSeoTransform.java
index 732a6c0127..2f038ef9ce 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/CatalogUrlSeoTransform.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/CatalogUrlSeoTransform.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/OfbizCatalogAltUrlTransform.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/OfbizCatalogAltUrlTransform.java
index e908194703..9bb816b72f 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/OfbizCatalogAltUrlTransform.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/OfbizCatalogAltUrlTransform.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/OfbizCatalogUrlTransform.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/OfbizCatalogUrlTransform.java
index c06cf3e5bd..3817fd7a5c 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/OfbizCatalogUrlTransform.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/OfbizCatalogUrlTransform.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/SeoTransform.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/SeoTransform.java
index b804ef4464..e0e0495ada 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/SeoTransform.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/SeoTransform.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java b/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java
index 510ff6329a..8ca6edf112 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigItemContentWrapper.java b/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigItemContentWrapper.java
index 7655442e29..01b392dc17 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigItemContentWrapper.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigItemContentWrapper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWorker.java b/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWorker.java
index 3fb2f3f7ed..08ea4d2e17 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWorker.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWorker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java b/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java
index 05c0c7bec4..a9795b5325 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapperException.java b/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapperException.java
index 4b6ecd47d7..dc3969086f 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapperException.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapperException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/feature/ParametricSearch.java b/applications/product/src/main/java/org/apache/ofbiz/product/feature/ParametricSearch.java
index aa5a6843bb..fe9c43999b 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/feature/ParametricSearch.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/feature/ParametricSearch.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/feature/ProductFeatureServices.java b/applications/product/src/main/java/org/apache/ofbiz/product/feature/ProductFeatureServices.java
index 44e905d3a9..3d4a068b90 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/feature/ProductFeatureServices.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/feature/ProductFeatureServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/image/ScaleImage.java b/applications/product/src/main/java/org/apache/ofbiz/product/image/ScaleImage.java
index bb21064881..3d9c7fd573 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/image/ScaleImage.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/image/ScaleImage.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/CropImage.java b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/CropImage.java
index 6bc636f648..578ad00346 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/CropImage.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/CropImage.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java
index 71b63f0be5..31c8e5e9b8 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ImageManagementHelper.java b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ImageManagementHelper.java
index ba6b189094..ff19f0c6bf 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ImageManagementHelper.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ImageManagementHelper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ImageManagementServices.java b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ImageManagementServices.java
index ad1e93df62..3f3cf11534 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ImageManagementServices.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ImageManagementServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ImageUrlServlet.java b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ImageUrlServlet.java
index ccefe658ea..5ab797779e 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ImageUrlServlet.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ImageUrlServlet.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ReplaceImage.java b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ReplaceImage.java
index 1420635dcb..449db85ae0 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ReplaceImage.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ReplaceImage.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/RotateImage.java b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/RotateImage.java
index 6137acf264..c4e112aadc 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/RotateImage.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/RotateImage.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/inventory/InventoryServices.java b/applications/product/src/main/java/org/apache/ofbiz/product/inventory/InventoryServices.java
index 060d011f83..6e6ebfa3a9 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/inventory/InventoryServices.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/inventory/InventoryServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/migrate/MigrationServices.java b/applications/product/src/main/java/org/apache/ofbiz/product/migrate/MigrationServices.java
index 0ed7d342d0..6dfc97a1f4 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/migrate/MigrationServices.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/migrate/MigrationServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java b/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java
index 66376141b4..bbf500f3be 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/product/KeywordIndex.java b/applications/product/src/main/java/org/apache/ofbiz/product/product/KeywordIndex.java
index dab74a7d0d..e7fbae08d8 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/product/KeywordIndex.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/product/KeywordIndex.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductContentWrapper.java b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductContentWrapper.java
index 2bc1e74ad3..6d4a318e6a 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductContentWrapper.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductContentWrapper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductEvents.java b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductEvents.java
index f170ef0f03..86e0018999 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductEvents.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductEvents.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductPromoContentWrapper.java b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductPromoContentWrapper.java
index 14f111e16f..056f45db90 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductPromoContentWrapper.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductPromoContentWrapper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchEvents.java b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchEvents.java
index f641df0e95..7bee73dfa0 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchEvents.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchEvents.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java
index d08b2ce3ce..8680966cbd 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductUtilServices.java b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductUtilServices.java
index 36ea58b4c5..399e1db70e 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductUtilServices.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductUtilServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java
index 6a89d27967..28f2b8e021 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/product/VariantEvents.java b/applications/product/src/main/java/org/apache/ofbiz/product/product/VariantEvents.java
index c7ed042908..b40093939d 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/product/VariantEvents.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/product/VariantEvents.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/promo/PromoServices.java b/applications/product/src/main/java/org/apache/ofbiz/product/promo/PromoServices.java
index f5cea59ce0..c490ca4e7e 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/promo/PromoServices.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/promo/PromoServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/spreadsheetimport/ImportProductHelper.java b/applications/product/src/main/java/org/apache/ofbiz/product/spreadsheetimport/ImportProductHelper.java
index 1afb3af73b..3a58ae5913 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/spreadsheetimport/ImportProductHelper.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/spreadsheetimport/ImportProductHelper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/spreadsheetimport/ImportProductServices.java b/applications/product/src/main/java/org/apache/ofbiz/product/spreadsheetimport/ImportProductServices.java
index 9f7ee63b18..d46ec05f52 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/spreadsheetimport/ImportProductServices.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/spreadsheetimport/ImportProductServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreEvents.java b/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreEvents.java
index c04d778a32..9ba2a0a114 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreEvents.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreEvents.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreSurveyWrapper.java b/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreSurveyWrapper.java
index 11958bcd5f..db367d4df1 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreSurveyWrapper.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreSurveyWrapper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreWorker.java b/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreWorker.java
index d337c584ef..7dd06a1f66 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreWorker.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreWorker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/subscription/SubscriptionServices.java b/applications/product/src/main/java/org/apache/ofbiz/product/subscription/SubscriptionServices.java
index 01a7f917d6..f28d5c72f9 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/product/subscription/SubscriptionServices.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/product/subscription/SubscriptionServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingEvent.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingEvent.java
index 9f2b2ccf61..f3b8873733 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingEvent.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingEvent.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingServices.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingServices.java
index ed6792b2f9..36bf2654d0 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingServices.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java
index aa20d59223..4987362baf 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSessionLine.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSessionLine.java
index 07ce872eb0..332a27fd58 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSessionLine.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSessionLine.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/picklist/PickListServices.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/picklist/PickListServices.java
index 98b74d2e2f..927a8e6d89 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/shipment/picklist/PickListServices.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/picklist/PickListServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentEvents.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentEvents.java
index ac82103e10..71167ee3e9 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentEvents.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentEvents.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentServices.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentServices.java
index 2289ee4b5b..fde4729025 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentServices.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentWorker.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentWorker.java
index 1b855c6f96..b3f8f40336 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentWorker.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentWorker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickServices.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickServices.java
index 6abc9c302f..69659620c8 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickServices.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickSession.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickSession.java
index c0a8ad1aa4..ab9f05fd66 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickSession.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickSession.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickSessionRow.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickSessionRow.java
index e540c4bb08..cc0ce11cee 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickSessionRow.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/verify/VerifyPickSessionRow.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageServices.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageServices.java
index 6de5cae838..4d8d789772 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageServices.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageSession.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageSession.java
index 252472f7b3..57a03f63f6 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageSession.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageSession.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageSessionLine.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageSessionLine.java
index 6ed58bf55f..b3a8a1bcdb 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageSessionLine.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageSessionLine.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java b/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java
index 38415c1d84..f953e99942 100644
--- a/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java
+++ b/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/securityext/src/main/java/org/apache/ofbiz/securityext/migrate/MigrationServices.java b/applications/securityext/src/main/java/org/apache/ofbiz/securityext/migrate/MigrationServices.java
index 8d58fa2c77..af040777a5 100644
--- a/applications/securityext/src/main/java/org/apache/ofbiz/securityext/migrate/MigrationServices.java
+++ b/applications/securityext/src/main/java/org/apache/ofbiz/securityext/migrate/MigrationServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/securityext/src/main/java/org/apache/ofbiz/securityext/security/OFBizApplicationSecurity.java b/applications/securityext/src/main/java/org/apache/ofbiz/securityext/security/OFBizApplicationSecurity.java
index d205a49f87..a6e06f4305 100644
--- a/applications/securityext/src/main/java/org/apache/ofbiz/securityext/security/OFBizApplicationSecurity.java
+++ b/applications/securityext/src/main/java/org/apache/ofbiz/securityext/security/OFBizApplicationSecurity.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/content/WorkEffortContentWrapper.java b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/content/WorkEffortContentWrapper.java
index 9bc50a2984..36ad37713b 100644
--- a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/content/WorkEffortContentWrapper.java
+++ b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/content/WorkEffortContentWrapper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java
index 5dbcc2b144..9e5c4f89e8 100644
--- a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java
+++ b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalHandlerFactory.java b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalHandlerFactory.java
index 0bb5d78992..5d3ecd56ef 100644
--- a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalHandlerFactory.java
+++ b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalHandlerFactory.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalRecurConverter.java b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalRecurConverter.java
index 12803c8260..a3d741c248 100644
--- a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalRecurConverter.java
+++ b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalRecurConverter.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalWorker.java b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalWorker.java
index 2f6a11403e..83fcd07c45 100644
--- a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalWorker.java
+++ b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalWorker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java
index f6129301a7..66131ff5e6 100644
--- a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java
+++ b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortPartyAssignmentServices.java b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortPartyAssignmentServices.java
index a838d7406e..a53282ca67 100644
--- a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortPartyAssignmentServices.java
+++ b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortPartyAssignmentServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearch.java b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearch.java
index 7b617a6497..bd7f42fe0b 100644
--- a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearch.java
+++ b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearch.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchEvents.java b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchEvents.java
index ced899c523..f8a048ab6b 100644
--- a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchEvents.java
+++ b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchEvents.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java
index a01d17f2e1..8f535cd510 100644
--- a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java
+++ b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java
index 9f65de4f2e..42114ecccd 100644
--- a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java
+++ b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortWorker.java b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortWorker.java
index 2251140244..40a726973b 100644
--- a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortWorker.java
+++ b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortWorker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/docs/asciidoc/resource/source.java b/docs/asciidoc/resource/source.java
index 409fe374f8..0a0ca27ba1 100644
--- a/docs/asciidoc/resource/source.java
+++ b/docs/asciidoc/resource/source.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java b/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java
index f57da3a807..46f21f2d2c 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentException.java b/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentException.java
index 5ef6eb50b4..ff26cd886c 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentException.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentResourceHandler.java b/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentResourceHandler.java
index c82a74f8a6..8914774a6f 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentResourceHandler.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentResourceHandler.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/concurrent/ConstantFuture.java b/framework/base/src/main/java/org/apache/ofbiz/base/concurrent/ConstantFuture.java
index 0bad18de61..c59b3b5936 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/concurrent/ConstantFuture.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/concurrent/ConstantFuture.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/concurrent/ExecutionPool.java b/framework/base/src/main/java/org/apache/ofbiz/base/concurrent/ExecutionPool.java
index eac1d4e825..82a4b9874b 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/concurrent/ExecutionPool.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/concurrent/ExecutionPool.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/config/FileLoader.java b/framework/base/src/main/java/org/apache/ofbiz/base/config/FileLoader.java
index e912f792fa..249248d726 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/config/FileLoader.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/config/FileLoader.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/config/GenericConfigException.java b/framework/base/src/main/java/org/apache/ofbiz/base/config/GenericConfigException.java
index 841b8ea265..b21869479f 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/config/GenericConfigException.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/config/GenericConfigException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/config/JNDIConfigUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/config/JNDIConfigUtil.java
index e6eaa14c7f..4d5b47475d 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/config/JNDIConfigUtil.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/config/JNDIConfigUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java b/framework/base/src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java
index d3e6836e45..b2720d0534 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/config/ResourceHandler.java b/framework/base/src/main/java/org/apache/ofbiz/base/config/ResourceHandler.java
index 0e77cfc315..6d04e7e9b4 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/config/ResourceHandler.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/config/ResourceHandler.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/config/ResourceLoader.java b/framework/base/src/main/java/org/apache/ofbiz/base/config/ResourceLoader.java
index b6bf546411..ca6c70e972 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/config/ResourceLoader.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/config/ResourceLoader.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/config/UrlLoader.java b/framework/base/src/main/java/org/apache/ofbiz/base/config/UrlLoader.java
index 116c01d665..a5689aea7e 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/config/UrlLoader.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/config/UrlLoader.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/container/AdminServerContainer.java b/framework/base/src/main/java/org/apache/ofbiz/base/container/AdminServerContainer.java
index f775a9bfed..d84d1531ed 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/container/AdminServerContainer.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/container/AdminServerContainer.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/container/Container.java b/framework/base/src/main/java/org/apache/ofbiz/base/container/Container.java
index 065bc40f85..edefc7746e 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/container/Container.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/container/Container.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerException.java b/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerException.java
index ab4e16db85..c34edc6270 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerException.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java b/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java
index ba7decfaa5..3eb21eaa86 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/container/NamingServiceContainer.java b/framework/base/src/main/java/org/apache/ofbiz/base/container/NamingServiceContainer.java
index 53255e2859..979ed5bd00 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/container/NamingServiceContainer.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/container/NamingServiceContainer.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/AbstractConverter.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/AbstractConverter.java
index 4c06e45df4..ebfb446393 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/AbstractConverter.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/AbstractConverter.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/AbstractLocalizedConverter.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/AbstractLocalizedConverter.java
index f49c336555..38655e739b 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/AbstractLocalizedConverter.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/AbstractLocalizedConverter.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/AbstractModelConverter.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/AbstractModelConverter.java
index 8feb151b23..f49c8275eb 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/AbstractModelConverter.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/AbstractModelConverter.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/BooleanConverters.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/BooleanConverters.java
index 16568997e3..7db0366fe2 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/BooleanConverters.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/BooleanConverters.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/CollectionConverters.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/CollectionConverters.java
index 75a93bda16..4de3137abf 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/CollectionConverters.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/CollectionConverters.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/ConversionException.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/ConversionException.java
index a3381e61a9..6cc716512e 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/ConversionException.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/ConversionException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/Converter.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/Converter.java
index 95e18b82a5..c63dac94ce 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/Converter.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/Converter.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/ConverterCreator.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/ConverterCreator.java
index 94726985df..70d19a082f 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/ConverterCreator.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/ConverterCreator.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/ConverterLoader.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/ConverterLoader.java
index 73195d62f6..efec5043c1 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/ConverterLoader.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/ConverterLoader.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/Converters.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/Converters.java
index f8c38eac2e..0033ed68c5 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/Converters.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/Converters.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/DateTimeConverters.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/DateTimeConverters.java
index e638c27661..1c0440bfa2 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/DateTimeConverters.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/DateTimeConverters.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/GenericSingletonToList.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/GenericSingletonToList.java
index 12f5fc014a..2c8660c968 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/GenericSingletonToList.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/GenericSingletonToList.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/GenericSingletonToSet.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/GenericSingletonToSet.java
index faef2ba277..4ab2506701 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/GenericSingletonToSet.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/GenericSingletonToSet.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/JSONConverters.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/JSONConverters.java
index 157c524f73..50418f4e39 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/JSONConverters.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/JSONConverters.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/LocalizedConverter.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/LocalizedConverter.java
index 38cb2d31a8..b8296962ea 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/LocalizedConverter.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/LocalizedConverter.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/MiscConverters.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/MiscConverters.java
index 0c4f8d85c0..1c7e5ebc08 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/MiscConverters.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/MiscConverters.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/ModelConverter.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/ModelConverter.java
index 8eb68750ca..2ae7ecc283 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/ModelConverter.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/ModelConverter.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/ModelConverters.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/ModelConverters.java
index dc5a302b79..0ad666a93a 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/ModelConverters.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/ModelConverters.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NetConverters.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NetConverters.java
index aa81a58600..c42eb7c669 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NetConverters.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NetConverters.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NumberConverters.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NumberConverters.java
index af657fb32a..16696cb292 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NumberConverters.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NumberConverters.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/crypto/BlowFishCrypt.java b/framework/base/src/main/java/org/apache/ofbiz/base/crypto/BlowFishCrypt.java
index 9654e1055e..ce847a6632 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/crypto/BlowFishCrypt.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/crypto/BlowFishCrypt.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/crypto/ConfigCryptoUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/crypto/ConfigCryptoUtil.java
index e970103b3a..fd66cbdd65 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/crypto/ConfigCryptoUtil.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/crypto/ConfigCryptoUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/crypto/HashCrypt.java b/framework/base/src/main/java/org/apache/ofbiz/base/crypto/HashCrypt.java
index 6f12e2fa68..8408fdb5cf 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/crypto/HashCrypt.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/crypto/HashCrypt.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/crypto/Main.java b/framework/base/src/main/java/org/apache/ofbiz/base/crypto/Main.java
index 75d509ce76..74a51c2d94 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/crypto/Main.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/crypto/Main.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/crypto/ReEncryptSecretsMain.java b/framework/base/src/main/java/org/apache/ofbiz/base/crypto/ReEncryptSecretsMain.java
index c21e7a8bd1..50d401df2d 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/crypto/ReEncryptSecretsMain.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/crypto/ReEncryptSecretsMain.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java b/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java
index ef41e7b4bd..51c42456f2 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomSafePolicy.java b/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomSafePolicy.java
index 6d378b7a5f..9afd3a09c5 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomSafePolicy.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomSafePolicy.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/html/SanitizerCustomPolicy.java b/framework/base/src/main/java/org/apache/ofbiz/base/html/SanitizerCustomPolicy.java
index bc0d827fd8..3778faa650 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/html/SanitizerCustomPolicy.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/html/SanitizerCustomPolicy.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/lang/ComparableRange.java b/framework/base/src/main/java/org/apache/ofbiz/base/lang/ComparableRange.java
index 34fa0dfbbb..bb2afc7ce7 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/lang/ComparableRange.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/lang/ComparableRange.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/lang/Factory.java b/framework/base/src/main/java/org/apache/ofbiz/base/lang/Factory.java
index 29b073c102..d84e127fae 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/lang/Factory.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/lang/Factory.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/lang/JSON.java b/framework/base/src/main/java/org/apache/ofbiz/base/lang/JSON.java
index 04e9aeb85c..7e1cef98f2 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/lang/JSON.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/lang/JSON.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/lang/Range.java b/framework/base/src/main/java/org/apache/ofbiz/base/lang/Range.java
index a3a0609493..d9dd589168 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/lang/Range.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/lang/Range.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/lang/SourceMonitored.java b/framework/base/src/main/java/org/apache/ofbiz/base/lang/SourceMonitored.java
index af5de1df45..ac39f91a62 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/lang/SourceMonitored.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/lang/SourceMonitored.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/location/ClasspathLocationResolver.java b/framework/base/src/main/java/org/apache/ofbiz/base/location/ClasspathLocationResolver.java
index 23c7f5c8ef..93eb2c47e7 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/location/ClasspathLocationResolver.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/location/ClasspathLocationResolver.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/location/ComponentLocationResolver.java b/framework/base/src/main/java/org/apache/ofbiz/base/location/ComponentLocationResolver.java
index 15af5f34d1..c8fb348ef5 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/location/ComponentLocationResolver.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/location/ComponentLocationResolver.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/location/FlexibleLocation.java b/framework/base/src/main/java/org/apache/ofbiz/base/location/FlexibleLocation.java
index ccf766cf45..9ae05deec8 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/location/FlexibleLocation.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/location/FlexibleLocation.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/location/LocationResolver.java b/framework/base/src/main/java/org/apache/ofbiz/base/location/LocationResolver.java
index 14cca67bdc..f533aebcde 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/location/LocationResolver.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/location/LocationResolver.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/location/OFBizHomeLocationResolver.java b/framework/base/src/main/java/org/apache/ofbiz/base/location/OFBizHomeLocationResolver.java
index 31caa77d38..1b874333f8 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/location/OFBizHomeLocationResolver.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/location/OFBizHomeLocationResolver.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/location/StandardUrlLocationResolver.java b/framework/base/src/main/java/org/apache/ofbiz/base/location/StandardUrlLocationResolver.java
index 87d5e046db..be6eff1eb7 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/location/StandardUrlLocationResolver.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/location/StandardUrlLocationResolver.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/metrics/Metrics.java b/framework/base/src/main/java/org/apache/ofbiz/base/metrics/Metrics.java
index 26dec9f04b..b4bdfde4dd 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/metrics/Metrics.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/metrics/Metrics.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/model/DomainModel.java b/framework/base/src/main/java/org/apache/ofbiz/base/model/DomainModel.java
index 98ade52d78..b7443c966e 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/model/DomainModel.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/model/DomainModel.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/secret/FallbackSecretProvider.java b/framework/base/src/main/java/org/apache/ofbiz/base/secret/FallbackSecretProvider.java
index cf3f879e7c..9844581b49 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/secret/FallbackSecretProvider.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/secret/FallbackSecretProvider.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/secret/FileBasedSecretProvider.java b/framework/base/src/main/java/org/apache/ofbiz/base/secret/FileBasedSecretProvider.java
index 6bcffc8cb0..c8638ac651 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/secret/FileBasedSecretProvider.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/secret/FileBasedSecretProvider.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/secret/SecretAuditSink.java b/framework/base/src/main/java/org/apache/ofbiz/base/secret/SecretAuditSink.java
index cffa4ad0bf..4e28d1c8d3 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/secret/SecretAuditSink.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/secret/SecretAuditSink.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/secret/SecretProvider.java b/framework/base/src/main/java/org/apache/ofbiz/base/secret/SecretProvider.java
index 2f04ba69ed..c10a31cb17 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/secret/SecretProvider.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/secret/SecretProvider.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/secret/SecretProviderFactory.java b/framework/base/src/main/java/org/apache/ofbiz/base/secret/SecretProviderFactory.java
index 1dde85ea99..d673fbd72c 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/secret/SecretProviderFactory.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/secret/SecretProviderFactory.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/secret/SecretProviderUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/secret/SecretProviderUtil.java
index 6888200ef8..292e01cc4a 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/secret/SecretProviderUtil.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/secret/SecretProviderUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/secret/SecretValueResolver.java b/framework/base/src/main/java/org/apache/ofbiz/base/secret/SecretValueResolver.java
index 8c40a13a71..739f4ce3c2 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/secret/SecretValueResolver.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/secret/SecretValueResolver.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/AliasKeyManager.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/AliasKeyManager.java
index c20d45a28f..477ffe86d1 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/AliasKeyManager.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/AliasKeyManager.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/CacheFilter.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/CacheFilter.java
index 960e5a5068..fecb2a91c2 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/CacheFilter.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/CacheFilter.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/DateRange.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/DateRange.java
index 60c31aa036..2e6f546c88 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/DateRange.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/DateRange.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/Debug.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/Debug.java
index a12c321020..25099eec84 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/Debug.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/Debug.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/FileUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/FileUtil.java
index 80d517a43a..82866e3381 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/FileUtil.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/FileUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/GeneralException.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/GeneralException.java
index 28f30fa75f..7e6d6d0beb 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/GeneralException.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/GeneralException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/GeneralRuntimeException.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/GeneralRuntimeException.java
index 6dfc58e2f8..d1795db123 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/GeneralRuntimeException.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/GeneralRuntimeException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpClient.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpClient.java
index 6c5f37d219..ac8f8d5d3c 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpClient.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpClient.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpClientException.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpClientException.java
index 63f8bd8fd5..d2e4809212 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpClientException.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpClientException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpRequestFileUpload.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpRequestFileUpload.java
index fcc06e328c..b49f73f443 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpRequestFileUpload.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpRequestFileUpload.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/IndentingWriter.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/IndentingWriter.java
index 0779b5b99f..19c8e4e9cf 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/IndentingWriter.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/IndentingWriter.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/JNDIContextFactory.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/JNDIContextFactory.java
index 862a32a49e..2779b0c15c 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/JNDIContextFactory.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/JNDIContextFactory.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/KeyStoreUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/KeyStoreUtil.java
index 196a914d38..bb2a6dc68a 100755
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/KeyStoreUtil.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/KeyStoreUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/MessageString.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/MessageString.java
index 2a08f6553e..9a65d2aaea 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/MessageString.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/MessageString.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java
index a63e198f69..0c3cc9d5d2 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/Observable.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/Observable.java
index 81150f2a92..37c8c65546 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/Observable.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/Observable.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/Observer.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/Observer.java
index db7b151098..1a118faed5 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/Observer.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/Observer.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/PatternFactory.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/PatternFactory.java
index 9d52d5b580..9a340c9ad8 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/PatternFactory.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/PatternFactory.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/RMIExtendedSocketFactory.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/RMIExtendedSocketFactory.java
index 6767f596d7..1356f8e991 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/RMIExtendedSocketFactory.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/RMIExtendedSocketFactory.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/ReferenceCleaner.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/ReferenceCleaner.java
index 4d6e6fedef..e12ada2132 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/ReferenceCleaner.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/ReferenceCleaner.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/RequestWrapper.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/RequestWrapper.java
index 549d8142b5..dc4bdd1a51 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/RequestWrapper.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/RequestWrapper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/SSLUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/SSLUtil.java
index daa438f26f..21a6a21cd4 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/SSLUtil.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/SSLUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptHelper.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptHelper.java
index 9a0170e6b9..9de3c52285 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptHelper.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptHelper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptUtil.java
index 49db8e8206..ff7fd7db8c 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptUtil.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/Scriptlet.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/Scriptlet.java
index d732f94499..633cf46c14 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/Scriptlet.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/Scriptlet.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java
index d43e156e58..7b5fb6a9d9 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/TimeDuration.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/TimeDuration.java
index 78f6e2892f..411ce11925 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/TimeDuration.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/TimeDuration.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/URLConnector.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/URLConnector.java
index dab315f783..d96b3b54b5 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/URLConnector.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/URLConnector.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
index 6475906032..8b4d08e0ed 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java
index fcdc5bcbf1..2dbf68c2ea 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilGenerics.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilGenerics.java
index 854591a774..533e3d7e9f 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilGenerics.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilGenerics.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHtml.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHtml.java
index f16db4b957..051759db3c 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHtml.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHtml.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
index 16f6218c31..e362d1dbca 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilIO.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilIO.java
index 4147c8a3cd..9f9de5f5c6 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilIO.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilIO.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java
index c5caccf742..3e8cb58c16 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilNumber.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilNumber.java
index dbd21ff664..777d72532c 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilNumber.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilNumber.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java
index 00fb095a72..a07477718b 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java
index b9508b115a..c161c31835 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilRandom.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilRandom.java
index 95224913ce..8785cb046a 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilRandom.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilRandom.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilTimer.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilTimer.java
index f2cd5719bc..ca6b64e6e7 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilTimer.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilTimer.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilURL.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilURL.java
index d6cae1877a..f271ef86c8 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilURL.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilURL.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java
index 4ecd701ef8..4b7a837b51 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java
index 9b07332810..677488ff64 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/CacheLine.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/CacheLine.java
index 9549a24fa6..ab0123e3c1 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/CacheLine.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/CacheLine.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/CacheListener.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/CacheListener.java
index bb85fb1c1a..96e36adea8 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/CacheListener.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/CacheListener.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/CacheSoftReference.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/CacheSoftReference.java
index 1cbe75586c..6e1a3a6922 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/CacheSoftReference.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/CacheSoftReference.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/HardRefCacheLine.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/HardRefCacheLine.java
index 22e78b2cec..92b45cd5c4 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/HardRefCacheLine.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/HardRefCacheLine.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/SoftRefCacheLine.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/SoftRefCacheLine.java
index 2a4c300392..67e042f29f 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/SoftRefCacheLine.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/SoftRefCacheLine.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/UtilCache.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/UtilCache.java
index 3f70266c00..913a93a648 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/UtilCache.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/UtilCache.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java
index 02cb4d2584..88aad20613 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleServletAccessor.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleServletAccessor.java
index 4f32e56730..6a02cd8cea 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleServletAccessor.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleServletAccessor.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapCollection.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapCollection.java
index d2b5f4beef..7df4b0e9e0 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapCollection.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapCollection.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapEntry.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapEntry.java
index b1790a1ab1..1419da409f 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapEntry.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapEntry.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapEntrySet.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapEntrySet.java
index a0249b51c7..02b1a083ec 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapEntrySet.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapEntrySet.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapKeySet.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapKeySet.java
index 81293fe0b4..c0a653c030 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapKeySet.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapKeySet.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapSet.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapSet.java
index 899d9887ab..cc01a4ae0d 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapSet.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapSet.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapValues.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapValues.java
index 54938a18ba..566645d789 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapValues.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapValues.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/IteratorWrapper.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/IteratorWrapper.java
index 47ab36aaca..b8d9aedc23 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/IteratorWrapper.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/IteratorWrapper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/LRUMap.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/LRUMap.java
index 628618f0d6..cab7b9748c 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/LRUMap.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/LRUMap.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/LifoSet.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/LifoSet.java
index 1c66779cf0..7b7607c67b 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/LifoSet.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/LifoSet.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/LocalizedMap.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/LocalizedMap.java
index 40c6c2bb7a..76a79f856a 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/LocalizedMap.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/LocalizedMap.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapComparator.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapComparator.java
index 657887160c..f10db2ca5b 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapComparator.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapComparator.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapContext.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapContext.java
index 9399609593..7b1ce0cc27 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapContext.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapContext.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapStack.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapStack.java
index 3030a6bc58..65d3a24b22 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapStack.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapStack.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MultivaluedMapContext.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MultivaluedMapContext.java
index bf17a8f061..cc8141b9b5 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MultivaluedMapContext.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MultivaluedMapContext.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MultivaluedMapContextAdapter.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MultivaluedMapContextAdapter.java
index aefc78c6df..0a2f92d4a3 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MultivaluedMapContextAdapter.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MultivaluedMapContextAdapter.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/PagedList.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/PagedList.java
index 34f80fd304..10f9ac09c6 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/PagedList.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/PagedList.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/ReadOnlyMapEntry.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/ReadOnlyMapEntry.java
index 53b0375015..0d8d49d32d 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/ReadOnlyMapEntry.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/ReadOnlyMapEntry.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/ResourceBundleMapWrapper.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/ResourceBundleMapWrapper.java
index e5e63b92d1..066a60b4ec 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/ResourceBundleMapWrapper.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/ResourceBundleMapWrapper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java
index a306fa8285..32a4c620a9 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/IUelMappingLibrary.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/IUelMappingLibrary.java
index ee96cdbd3c..bdc73d02a5 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/IUelMappingLibrary.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/IUelMappingLibrary.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/JuelConnector.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/JuelConnector.java
index 8aae7caabd..42ece01133 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/JuelConnector.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/JuelConnector.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java
index 4ed6d70a76..1264b19ca5 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java
index 1a6b87e8ac..e936d14706 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelMapping.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelMapping.java
index c73937377d..9760a93dd1 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelMapping.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelMapping.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelUtil.java
index e0a89ae14f..844119bc17 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelUtil.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/template/OfbizBeansWrapper.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/template/OfbizBeansWrapper.java
index a440721e74..0e3a9250d2 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/template/OfbizBeansWrapper.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/template/OfbizBeansWrapper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/template/XslTransform.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/template/XslTransform.java
index 53cba52653..f92a4b6cc6 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/template/XslTransform.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/template/XslTransform.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/test/java/org/apache/ofbiz/base/collections/MultivaluedMapContextAdapterTests.java b/framework/base/src/test/java/org/apache/ofbiz/base/collections/MultivaluedMapContextAdapterTests.java
index fca270cd40..2d878e7e32 100644
--- a/framework/base/src/test/java/org/apache/ofbiz/base/collections/MultivaluedMapContextAdapterTests.java
+++ b/framework/base/src/test/java/org/apache/ofbiz/base/collections/MultivaluedMapContextAdapterTests.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/test/java/org/apache/ofbiz/base/collections/MultivaluedMapContextTests.java b/framework/base/src/test/java/org/apache/ofbiz/base/collections/MultivaluedMapContextTests.java
index 88684a83ac..aa65ea2e01 100644
--- a/framework/base/src/test/java/org/apache/ofbiz/base/collections/MultivaluedMapContextTests.java
+++ b/framework/base/src/test/java/org/apache/ofbiz/base/collections/MultivaluedMapContextTests.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/test/java/org/apache/ofbiz/base/container/ComponentContainerTestSupport.java b/framework/base/src/test/java/org/apache/ofbiz/base/container/ComponentContainerTestSupport.java
index a3c4dcf845..ae650246a9 100644
--- a/framework/base/src/test/java/org/apache/ofbiz/base/container/ComponentContainerTestSupport.java
+++ b/framework/base/src/test/java/org/apache/ofbiz/base/container/ComponentContainerTestSupport.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/test/java/org/apache/ofbiz/base/conversion/TestDomainModelConversion.java b/framework/base/src/test/java/org/apache/ofbiz/base/conversion/TestDomainModelConversion.java
index a6bcd4c319..31a89832d3 100644
--- a/framework/base/src/test/java/org/apache/ofbiz/base/conversion/TestDomainModelConversion.java
+++ b/framework/base/src/test/java/org/apache/ofbiz/base/conversion/TestDomainModelConversion.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/test/java/org/apache/ofbiz/base/crypto/ConfigCryptoUtilTest.java b/framework/base/src/test/java/org/apache/ofbiz/base/crypto/ConfigCryptoUtilTest.java
index cecd24fd3d..7962adc3bd 100644
--- a/framework/base/src/test/java/org/apache/ofbiz/base/crypto/ConfigCryptoUtilTest.java
+++ b/framework/base/src/test/java/org/apache/ofbiz/base/crypto/ConfigCryptoUtilTest.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/test/java/org/apache/ofbiz/base/secret/FallbackSecretProviderTest.java b/framework/base/src/test/java/org/apache/ofbiz/base/secret/FallbackSecretProviderTest.java
index 8ef2fdfc02..723f143cf5 100644
--- a/framework/base/src/test/java/org/apache/ofbiz/base/secret/FallbackSecretProviderTest.java
+++ b/framework/base/src/test/java/org/apache/ofbiz/base/secret/FallbackSecretProviderTest.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/test/java/org/apache/ofbiz/base/secret/FileBasedSecretProviderTest.java b/framework/base/src/test/java/org/apache/ofbiz/base/secret/FileBasedSecretProviderTest.java
index 91705d4369..9672b4e478 100644
--- a/framework/base/src/test/java/org/apache/ofbiz/base/secret/FileBasedSecretProviderTest.java
+++ b/framework/base/src/test/java/org/apache/ofbiz/base/secret/FileBasedSecretProviderTest.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/test/java/org/apache/ofbiz/base/secret/SecretProviderFactoryTest.java b/framework/base/src/test/java/org/apache/ofbiz/base/secret/SecretProviderFactoryTest.java
index 0b68400e01..d6623484d2 100644
--- a/framework/base/src/test/java/org/apache/ofbiz/base/secret/SecretProviderFactoryTest.java
+++ b/framework/base/src/test/java/org/apache/ofbiz/base/secret/SecretProviderFactoryTest.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/test/java/org/apache/ofbiz/base/secret/SecretProviderHelpersTest.java b/framework/base/src/test/java/org/apache/ofbiz/base/secret/SecretProviderHelpersTest.java
index 434fc31d21..811013845b 100644
--- a/framework/base/src/test/java/org/apache/ofbiz/base/secret/SecretProviderHelpersTest.java
+++ b/framework/base/src/test/java/org/apache/ofbiz/base/secret/SecretProviderHelpersTest.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/test/java/org/apache/ofbiz/base/secret/SecretValueResolverTest.java b/framework/base/src/test/java/org/apache/ofbiz/base/secret/SecretValueResolverTest.java
index 14ff3c2277..74e6ffaa5c 100644
--- a/framework/base/src/test/java/org/apache/ofbiz/base/secret/SecretValueResolverTest.java
+++ b/framework/base/src/test/java/org/apache/ofbiz/base/secret/SecretValueResolverTest.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilHtmlTest.java b/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilHtmlTest.java
index 5eec96325f..3c2b9e011f 100644
--- a/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilHtmlTest.java
+++ b/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilHtmlTest.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilURLTests.java b/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilURLTests.java
index ab7414f5a5..0eb020868f 100644
--- a/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilURLTests.java
+++ b/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilURLTests.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/test/java/org/apache/ofbiz/base/util/template/FreeMarkerWorkerTests.java b/framework/base/src/test/java/org/apache/ofbiz/base/util/template/FreeMarkerWorkerTests.java
index 1b5ef0e72f..6e051b5eee 100644
--- a/framework/base/src/test/java/org/apache/ofbiz/base/util/template/FreeMarkerWorkerTests.java
+++ b/framework/base/src/test/java/org/apache/ofbiz/base/util/template/FreeMarkerWorkerTests.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java
index 84c8460381..ab5f87cc88 100644
--- a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java
+++ b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CorrelationFieldProvider.java b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CorrelationFieldProvider.java
index 668b8275d6..361d466d71 100644
--- a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CorrelationFieldProvider.java
+++ b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CorrelationFieldProvider.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CorrelationValve.java b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CorrelationValve.java
index 9044080dfb..ba18dd9dcd 100644
--- a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CorrelationValve.java
+++ b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CorrelationValve.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java
index 836a8ce152..b691e1a58b 100644
--- a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java
+++ b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/FilterJars.java b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/FilterJars.java
index f05f7ff0b6..2b3cb6c1bb 100644
--- a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/FilterJars.java
+++ b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/FilterJars.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/HashedCredentialHandler.java b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/HashedCredentialHandler.java
index 26bd0f6094..5a1c209dc6 100644
--- a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/HashedCredentialHandler.java
+++ b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/HashedCredentialHandler.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/OFBizRealm.java b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/OFBizRealm.java
index 3b99dd458d..000522b57d 100644
--- a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/OFBizRealm.java
+++ b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/OFBizRealm.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/SimpleCredentialHandler.java b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/SimpleCredentialHandler.java
index dc7f1250b0..9d5ab0c44c 100644
--- a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/SimpleCredentialHandler.java
+++ b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/SimpleCredentialHandler.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/SslAcceleratorValve.java b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/SslAcceleratorValve.java
index a91f3c25c8..5838b8a0e4 100644
--- a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/SslAcceleratorValve.java
+++ b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/SslAcceleratorValve.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/catalina/src/test/java/org/apache/ofbiz/catalina/container/CorrelationValveTests.java b/framework/catalina/src/test/java/org/apache/ofbiz/catalina/container/CorrelationValveTests.java
index 8a6b1d4991..21f770335b 100644
--- a/framework/catalina/src/test/java/org/apache/ofbiz/catalina/container/CorrelationValveTests.java
+++ b/framework/catalina/src/test/java/org/apache/ofbiz/catalina/container/CorrelationValveTests.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/CdyneServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/CdyneServices.java
index 6f69c5a3e2..7a97b727dd 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/CdyneServices.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/CdyneServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java b/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java
index c0eff0b5a3..4f8f4bbcdf 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/CommonServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/CommonServices.java
index 29cad0b7f2..5868e12f75 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/CommonServices.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/CommonServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/CommonWorkers.java b/framework/common/src/main/java/org/apache/ofbiz/common/CommonWorkers.java
index 53dd903a79..4d3200968e 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/CommonWorkers.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/CommonWorkers.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/DataModelConstants.java b/framework/common/src/main/java/org/apache/ofbiz/common/DataModelConstants.java
index f19d1bafb9..fc2d2d113c 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/DataModelConstants.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/DataModelConstants.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/FindServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/FindServices.java
index 73522f4a4a..0a3b35b037 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/FindServices.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/FindServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/FtpServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/FtpServices.java
index 3c3778050f..91f0be8585 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/FtpServices.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/FtpServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFileMappingCreator.java b/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFileMappingCreator.java
index 3146c2b193..6f5c82c37d 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFileMappingCreator.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFileMappingCreator.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFilesMapping.java b/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFilesMapping.java
index 578098ec9f..399237c602 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFilesMapping.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFilesMapping.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFilesMappingUtil.java b/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFilesMappingUtil.java
index aa0699a181..4bbb882362 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFilesMappingUtil.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFilesMappingUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/KeywordSearchUtil.java b/framework/common/src/main/java/org/apache/ofbiz/common/KeywordSearchUtil.java
index 6dd847247e..d5380e9686 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/KeywordSearchUtil.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/KeywordSearchUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/UrlServletHelper.java b/framework/common/src/main/java/org/apache/ofbiz/common/UrlServletHelper.java
index 8857cb547a..91e212f1b3 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/UrlServletHelper.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/UrlServletHelper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthHelper.java b/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthHelper.java
index 62daa5a1cf..b001208121 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthHelper.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthHelper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthenticationComparator.java b/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthenticationComparator.java
index 2a141a04d7..b474e505fe 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthenticationComparator.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthenticationComparator.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/authentication/api/Authenticator.java b/framework/common/src/main/java/org/apache/ofbiz/common/authentication/api/Authenticator.java
index b21b7b5db2..73af9a7347 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/authentication/api/Authenticator.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/authentication/api/Authenticator.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/authentication/api/AuthenticatorException.java b/framework/common/src/main/java/org/apache/ofbiz/common/authentication/api/AuthenticatorException.java
index 1b8b79f0a9..8317f2c247 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/authentication/api/AuthenticatorException.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/authentication/api/AuthenticatorException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/authentication/example/TestFailAuthenticator.java b/framework/common/src/main/java/org/apache/ofbiz/common/authentication/example/TestFailAuthenticator.java
index f1e286885c..3334d4b7a6 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/authentication/example/TestFailAuthenticator.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/authentication/example/TestFailAuthenticator.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/authentication/example/TestPassAuthenticator.java b/framework/common/src/main/java/org/apache/ofbiz/common/authentication/example/TestPassAuthenticator.java
index 4f794fea24..d6827064be 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/authentication/example/TestPassAuthenticator.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/authentication/example/TestPassAuthenticator.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
index 550a5c7313..04bf6cdf29 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/email/MailSmtpConfigUtil.java b/framework/common/src/main/java/org/apache/ofbiz/common/email/MailSmtpConfigUtil.java
index 9e77718251..e6a86a1c39 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/email/MailSmtpConfigUtil.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/email/MailSmtpConfigUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/email/NotificationServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/email/NotificationServices.java
index c334224e50..ffbe7b9bce 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/email/NotificationServices.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/email/NotificationServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/email/SmtpOAuth2TokenProvider.java b/framework/common/src/main/java/org/apache/ofbiz/common/email/SmtpOAuth2TokenProvider.java
index 2719f5e38c..81cf550415 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/email/SmtpOAuth2TokenProvider.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/email/SmtpOAuth2TokenProvider.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/geo/GeoServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/geo/GeoServices.java
index f95f3c7a73..72711e6c47 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/geo/GeoServices.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/geo/GeoServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/geo/GeoWorker.java b/framework/common/src/main/java/org/apache/ofbiz/common/geo/GeoWorker.java
index 7b82a4737e..58da620751 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/geo/GeoWorker.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/geo/GeoWorker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/image/ImageTransform.java b/framework/common/src/main/java/org/apache/ofbiz/common/image/ImageTransform.java
index 2afe037dc1..73683b0494 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/image/ImageTransform.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/image/ImageTransform.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/login/LdapAuthenticationServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/login/LdapAuthenticationServices.java
index 0f72f882f0..6a6d01156b 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/login/LdapAuthenticationServices.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/login/LdapAuthenticationServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java
index 7743b03d8a..c7d7af68ce 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/period/PeriodWorker.java b/framework/common/src/main/java/org/apache/ofbiz/common/period/PeriodWorker.java
index fc2cbc6901..0d0992e10d 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/period/PeriodWorker.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/period/PeriodWorker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceServices.java
index 3d6eb7f1cf..21a1553a1d 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceServices.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceWorker.java b/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceWorker.java
index cbf866c4f2..7f20d2b8fe 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceWorker.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceWorker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java b/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java
index 7dac52b666..a1a462b355 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ScriptHelperImpl.java b/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ScriptHelperImpl.java
index b081b3f507..6a01e0a71b 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ScriptHelperImpl.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ScriptHelperImpl.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusServices.java
index 540a287809..a49189d258 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusServices.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusWorker.java b/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusWorker.java
index f66fd2bf6b..e45cfc876a 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusWorker.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusWorker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/telecom/TelecomServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/telecom/TelecomServices.java
index 4ec0302fd2..9bcec9d387 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/telecom/TelecomServices.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/telecom/TelecomServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/test/java/org/apache/ofbiz/common/email/EmailServicesDkimTests.java b/framework/common/src/test/java/org/apache/ofbiz/common/email/EmailServicesDkimTests.java
index ad23d36428..690cf49e78 100644
--- a/framework/common/src/test/java/org/apache/ofbiz/common/email/EmailServicesDkimTests.java
+++ b/framework/common/src/test/java/org/apache/ofbiz/common/email/EmailServicesDkimTests.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/test/java/org/apache/ofbiz/common/email/EmailServicesInjectionTests.java b/framework/common/src/test/java/org/apache/ofbiz/common/email/EmailServicesInjectionTests.java
index deb5741774..44034e8010 100644
--- a/framework/common/src/test/java/org/apache/ofbiz/common/email/EmailServicesInjectionTests.java
+++ b/framework/common/src/test/java/org/apache/ofbiz/common/email/EmailServicesInjectionTests.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/common/src/test/java/org/apache/ofbiz/common/test/PerformFindTests.java b/framework/common/src/test/java/org/apache/ofbiz/common/test/PerformFindTests.java
index e046dce97b..b28c87f4aa 100644
--- a/framework/common/src/test/java/org/apache/ofbiz/common/test/PerformFindTests.java
+++ b/framework/common/src/test/java/org/apache/ofbiz/common/test/PerformFindTests.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFile.java b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFile.java
index 342243625d..9dff476e29 100644
--- a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFile.java
+++ b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFile.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFile2EntityXml.java b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFile2EntityXml.java
index 183358b488..5d48c658cd 100644
--- a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFile2EntityXml.java
+++ b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFile2EntityXml.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFileException.java b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFileException.java
index e88992707b..fbc431c850 100644
--- a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFileException.java
+++ b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFileException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFile.java b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFile.java
index 142ac60ca0..98539f949d 100644
--- a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFile.java
+++ b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFile.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFileReader.java b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFileReader.java
index c771917368..ed45a39fac 100644
--- a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFileReader.java
+++ b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFileReader.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelField.java b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelField.java
index 0dd6398068..8e4e55c1c8 100644
--- a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelField.java
+++ b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelField.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelRecord.java b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelRecord.java
index e33fc34a79..c1778f04a4 100644
--- a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelRecord.java
+++ b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelRecord.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/Record.java b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/Record.java
index 8c7ab88861..4f5716c62b 100644
--- a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/Record.java
+++ b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/Record.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/RecordIterator.java b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/RecordIterator.java
index 46bc8a3b68..112420ac57 100644
--- a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/RecordIterator.java
+++ b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/RecordIterator.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/DataSourceContainer.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/DataSourceContainer.java
index 8600b843b2..d5ae855daf 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/DataSourceContainer.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/DataSourceContainer.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorContainer.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorContainer.java
index 3bfe152bb5..6f6ae730d6 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorContainer.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorContainer.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/EntityCryptoException.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/EntityCryptoException.java
index dc2a50fde2..62fb14b08a 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/EntityCryptoException.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/EntityCryptoException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/EntityLockedException.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/EntityLockedException.java
index 0741174c5c..62069adec1 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/EntityLockedException.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/EntityLockedException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericCreateException.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericCreateException.java
index 06e73a4b7a..d1078f4634 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericCreateException.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericCreateException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDataSourceException.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDataSourceException.java
index a2278ac1fa..297547635d 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDataSourceException.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDataSourceException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDuplicateKeyException.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDuplicateKeyException.java
index c5354ff220..d4a8904257 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDuplicateKeyException.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDuplicateKeyException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntityConfException.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntityConfException.java
index 1d17ab6684..d3e50c9700 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntityConfException.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntityConfException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntityException.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntityException.java
index 5e96df9d1f..1f5df7792a 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntityException.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntityException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntityNotFoundException.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntityNotFoundException.java
index 63581c44a5..b9372c841c 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntityNotFoundException.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntityNotFoundException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericFindException.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericFindException.java
index a6f8fdc3d6..e5ea7439b5 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericFindException.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericFindException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericModelException.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericModelException.java
index 861b4c998d..eb21aee362 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericModelException.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericModelException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericNoSuchEntityException.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericNoSuchEntityException.java
index 61a8d44080..77a718d107 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericNoSuchEntityException.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericNoSuchEntityException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericNotImplementedException.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericNotImplementedException.java
index 2ca54778f4..1a7f92517d 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericNotImplementedException.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericNotImplementedException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericPK.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericPK.java
index 403123ff60..3844967e3c 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericPK.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericPK.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericRemoveException.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericRemoveException.java
index 45de0df465..7fe05e4cae 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericRemoveException.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericRemoveException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericResultSetClosedException.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericResultSetClosedException.java
index 54fd81f02b..abe608035b 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericResultSetClosedException.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericResultSetClosedException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericStoreException.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericStoreException.java
index 2eca4471da..a8fc66036f 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericStoreException.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericStoreException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericValue.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericValue.java
index b29f7e07e9..83183f437d 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericValue.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericValue.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/AbstractCache.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/AbstractCache.java
index e6bf75582d..043301cf5e 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/AbstractCache.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/AbstractCache.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/AbstractEntityConditionCache.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/AbstractEntityConditionCache.java
index a884c62bd6..939c098457 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/AbstractEntityConditionCache.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/AbstractEntityConditionCache.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/Cache.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/Cache.java
index d250b86515..7e2ac4f4e5 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/Cache.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/Cache.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityCache.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityCache.java
index b491911443..1569217a1f 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityCache.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityCache.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityListCache.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityListCache.java
index aaf4d9adc2..7bd9435d65 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityListCache.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityListCache.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityObjectCache.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityObjectCache.java
index 3a36d6e5f0..54427d063b 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityObjectCache.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityObjectCache.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityClause.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityClause.java
index 0e8a2f1115..43e5294fa2 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityClause.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityClause.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java
index 4e621d4fb8..ade8f89ce3 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityCondition.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityCondition.java
index 538800c1af..b4ec8ec153 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityCondition.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityCondition.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionBuilder.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionBuilder.java
index f458cdf17d..f2cfce85da 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionBuilder.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionBuilder.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionList.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionList.java
index 2e81594a1d..76813dffb9 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionList.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionList.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionListBase.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionListBase.java
index 0e5faf9bac..4980681860 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionListBase.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionListBase.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionParam.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionParam.java
index 2c00caa440..98596b9a84 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionParam.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionParam.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionValue.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionValue.java
index ef3bfe0ffd..4829817381 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionValue.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionValue.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityDateFilterCondition.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityDateFilterCondition.java
index d9baed3847..03365a9cfc 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityDateFilterCondition.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityDateFilterCondition.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityExpr.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityExpr.java
index 618a25ddb5..b1bce97b4f 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityExpr.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityExpr.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldMap.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldMap.java
index 67af58856b..6c3a6076b9 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldMap.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldMap.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldValue.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldValue.java
index 57daffa40c..b643e20b9d 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldValue.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldValue.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFunction.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFunction.java
index 15eceaccc0..773e4310db 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFunction.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFunction.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityJoinOperator.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityJoinOperator.java
index 2f25a2f7c6..89913b2eb2 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityJoinOperator.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityJoinOperator.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityNotCondition.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityNotCondition.java
index dafdc4eb7c..30c3f5a2d5 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityNotCondition.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityNotCondition.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityOperator.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityOperator.java
index e0138a5f45..05182daf26 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityOperator.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityOperator.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityWhereString.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityWhereString.java
index c70bf48fd0..df935ddccc 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityWhereString.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityWhereString.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/OrderByItem.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/OrderByItem.java
index d1458c491f..02f8934346 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/OrderByItem.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/OrderByItem.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/OrderByList.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/OrderByList.java
index f282867430..7ce134196d 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/OrderByList.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/OrderByList.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/ConnectionFactory.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/ConnectionFactory.java
index 2c362afdde..6a27a59073 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/ConnectionFactory.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/ConnectionFactory.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/Datasource.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/Datasource.java
index 2244d7766c..387df1010e 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/Datasource.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/Datasource.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/DebugXaResources.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/DebugXaResources.java
index 624964bf5d..ef41599231 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/DebugXaResources.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/DebugXaResources.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/DelegatorElement.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/DelegatorElement.java
index 358e2b4c32..121553d4d8 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/DelegatorElement.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/DelegatorElement.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityConfig.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityConfig.java
index ff65892e7a..c1318b26ba 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityConfig.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityConfig.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityDataReader.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityDataReader.java
index 91dbccb2a8..60b32f19a2 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityDataReader.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityDataReader.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityEcaReader.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityEcaReader.java
index 53ec2dfa31..683250c775 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityEcaReader.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityEcaReader.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityGroupReader.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityGroupReader.java
index b12724cabf..0c624aaf3d 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityGroupReader.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityGroupReader.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityModelReader.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityModelReader.java
index cebc36512e..06835bb63e 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityModelReader.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityModelReader.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/FieldType.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/FieldType.java
index ec4bc884d9..6df29abb68 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/FieldType.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/FieldType.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/GroupMap.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/GroupMap.java
index a6d906569d..9e176d0562 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/GroupMap.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/GroupMap.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/InlineJdbc.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/InlineJdbc.java
index 6f621270f7..03202eb733 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/InlineJdbc.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/InlineJdbc.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/JdbcElement.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/JdbcElement.java
index 6c3f9c9fcb..dfc60f45e1 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/JdbcElement.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/JdbcElement.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/JndiJdbc.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/JndiJdbc.java
index 821b521170..724ea68792 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/JndiJdbc.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/JndiJdbc.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/ReadData.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/ReadData.java
index f855fb2335..2236e25d3f 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/ReadData.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/ReadData.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/Resource.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/Resource.java
index 5fbf666fe4..5c42846907 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/Resource.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/Resource.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/ResourceLoader.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/ResourceLoader.java
index 04cb685029..788749ee55 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/ResourceLoader.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/ResourceLoader.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/SqlLoadPath.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/SqlLoadPath.java
index 0f74169d36..cf7bfbb3e3 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/SqlLoadPath.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/SqlLoadPath.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/TransactionFactory.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/TransactionFactory.java
index 4bebd8b032..9caf5ed0f9 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/TransactionFactory.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/TransactionFactory.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/TransactionManagerJndi.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/TransactionManagerJndi.java
index d9cf95b20a..7d6e343b0f 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/TransactionManagerJndi.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/TransactionManagerJndi.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/TyrexDataSource.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/TyrexDataSource.java
index 489bfbae74..99fc2bffaf 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/TyrexDataSource.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/TyrexDataSource.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/UserTransactionJndi.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/UserTransactionJndi.java
index c204573c54..1679d88fc5 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/UserTransactionJndi.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/UserTransactionJndi.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/ConnectionFactory.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/ConnectionFactory.java
index 147f5f7d1c..a0d5944e42 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/ConnectionFactory.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/ConnectionFactory.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DBCPConnectionFactory.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DBCPConnectionFactory.java
index a257e7bea0..0b5b11a5ae 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DBCPConnectionFactory.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DBCPConnectionFactory.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java
index b3e75df175..5bb74498a3 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java
index c53283306a..fa6e95ac08 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelper.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelper.java
index bc64d50ade..2f169933a8 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelper.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperDAO.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperDAO.java
index 8ea09c59a5..2ee6c99286 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperDAO.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperDAO.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperFactory.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperFactory.java
index 3f95d1150a..236862d1f9 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperFactory.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperFactory.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperInfo.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperInfo.java
index f0096452ff..e9d0c61fa8 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperInfo.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperInfo.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java
index 0511b31292..a99063c1e1 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/eca/EntityEcaHandler.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/eca/EntityEcaHandler.java
index 50bf61fecb..daf99924ea 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/eca/EntityEcaHandler.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/eca/EntityEcaHandler.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ByAndFinder.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ByAndFinder.java
index 0d22029bb1..fa0919348c 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ByAndFinder.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ByAndFinder.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ByConditionFinder.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ByConditionFinder.java
index eab01404be..af022fc659 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ByConditionFinder.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ByConditionFinder.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/EntityFinderUtil.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/EntityFinderUtil.java
index e3c729b9d5..06aee8da71 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/EntityFinderUtil.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/EntityFinderUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/Finder.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/Finder.java
index a4dc90238e..e7d3a6bc9f 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/Finder.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/Finder.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ListFinder.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ListFinder.java
index 56b5c2da75..dccb3e0258 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ListFinder.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ListFinder.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/AbstractCursorHandler.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/AbstractCursorHandler.java
index 79c7602d02..35b6199571 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/AbstractCursorHandler.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/AbstractCursorHandler.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/ConnectionFactoryLoader.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/ConnectionFactoryLoader.java
index ccae44568b..eebf2a5aab 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/ConnectionFactoryLoader.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/ConnectionFactoryLoader.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorConnection.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorConnection.java
index 7b036e3f61..a30c13dbe4 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorConnection.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorConnection.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorResultSet.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorResultSet.java
index ceaf2f4887..e4dce6c9bd 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorResultSet.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorResultSet.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorStatement.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorStatement.java
index 1196eab345..defaf8c4d9 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorStatement.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorStatement.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java
index 2ace7d39fb..2828ae47c1 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/ExecQueryCallbackFunctionIF.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/ExecQueryCallbackFunctionIF.java
index 0389bce6ad..6114f07a92 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/ExecQueryCallbackFunctionIF.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/ExecQueryCallbackFunctionIF.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/JdbcValueHandler.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/JdbcValueHandler.java
index c83c3e299c..fc0977135a 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/JdbcValueHandler.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/JdbcValueHandler.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SQLProcessor.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SQLProcessor.java
index 17ca5c4b25..50c57faf5a 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SQLProcessor.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SQLProcessor.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java
index 316cd33c07..2680f0adfc 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/DynamicViewEntity.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/DynamicViewEntity.java
index d0753b5038..cf68e3519a 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/DynamicViewEntity.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/DynamicViewEntity.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelChild.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelChild.java
index b509c63a79..aaea15cdff 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelChild.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelChild.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntityChecker.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntityChecker.java
index 9d31faa7d0..08d03e7d62 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntityChecker.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntityChecker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelField.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelField.java
index 07f3e36a8b..627855fd49 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelField.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelField.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelFieldType.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelFieldType.java
index edc1bb5832..46956d73a7 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelFieldType.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelFieldType.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelFieldTypeReader.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelFieldTypeReader.java
index 1e9f6018d5..ce43f2f6eb 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelFieldTypeReader.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelFieldTypeReader.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelGroupReader.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelGroupReader.java
index dbf84d09ca..7c7e97a499 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelGroupReader.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelGroupReader.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelIndex.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelIndex.java
index 144200c13f..16536f59de 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelIndex.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelIndex.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelInfo.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelInfo.java
index 1e62567284..a693d1d4d9 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelInfo.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelInfo.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelKeyMap.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelKeyMap.java
index d113c3d6ce..be0cae27dc 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelKeyMap.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelKeyMap.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelReader.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelReader.java
index 586adda86b..d0859022d7 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelReader.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelReader.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelUtil.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelUtil.java
index b8ed191df7..426fbfab6f 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelUtil.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java
index 7cbe2311eb..997156c21b 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/SerializeException.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/SerializeException.java
index caaca5b8ae..def70d8029 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/SerializeException.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/SerializeException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializable.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializable.java
index d7108bf0e9..a3c49acc6a 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializable.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializable.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java
index 5581c76f26..828aa77197 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/testtools/EntityTestCase.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/testtools/EntityTestCase.java
index e3b8c16c79..48f003f344 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/testtools/EntityTestCase.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/testtools/EntityTestCase.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DebugXaResource.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DebugXaResource.java
index 48270e7eb5..384ae167ba 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DebugXaResource.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DebugXaResource.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DumbTransactionFactory.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DumbTransactionFactory.java
index 626e23855d..bafeddcbd1 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DumbTransactionFactory.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DumbTransactionFactory.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericTransactionException.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericTransactionException.java
index 5fb47f8000..6d75f9ec28 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericTransactionException.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericTransactionException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericXaResource.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericXaResource.java
index 8f3fc38499..cc5d1a1cc1 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericXaResource.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericXaResource.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GeronimoTransactionFactory.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GeronimoTransactionFactory.java
index 2b9862e1e1..b57cc1c710 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GeronimoTransactionFactory.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GeronimoTransactionFactory.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/JNDITransactionFactory.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/JNDITransactionFactory.java
index 04cef7541c..a71979d260 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/JNDITransactionFactory.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/JNDITransactionFactory.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionFactory.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionFactory.java
index 04115f810a..53b13ef946 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionFactory.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionFactory.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionFactoryLoader.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionFactoryLoader.java
index af1b675696..c479b8edd6 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionFactoryLoader.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionFactoryLoader.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionUtil.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionUtil.java
index f0b4b3a80b..085257761a 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionUtil.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/Converters.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/Converters.java
index 8785cba832..29f83d28de 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/Converters.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/Converters.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/DistributedCacheClear.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/DistributedCacheClear.java
index 480b1cfb87..c33c43fbf1 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/DistributedCacheClear.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/DistributedCacheClear.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityBatchIterator.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityBatchIterator.java
index ec1ff57397..dcb83c66de 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityBatchIterator.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityBatchIterator.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataAssert.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataAssert.java
index f56157cfbb..6d217c462d 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataAssert.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataAssert.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataLoader.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataLoader.java
index 5899465593..b9d1b89fe9 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataLoader.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataLoader.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityFindOptions.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityFindOptions.java
index 67db584e99..c7f4de67d9 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityFindOptions.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityFindOptions.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java
index f79c4ebd07..cc85fff9f0 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityQuery.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityQuery.java
index e32f73f65e..5cc8f8d0c7 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityQuery.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityQuery.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java
index ee8b08fdc7..92a08a09b2 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityStoreOptions.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityStoreOptions.java
index be604255e2..b6023d7383 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityStoreOptions.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityStoreOptions.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityTypeUtil.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityTypeUtil.java
index 6c18631499..4393764892 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityTypeUtil.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityTypeUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtil.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtil.java
index 7a6d4b5a96..d22e85df68 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtil.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtilProperties.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtilProperties.java
index 56cc9c94d8..06eac3e8a2 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtilProperties.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtilProperties.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/SequenceUtil.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/SequenceUtil.java
index cd5ef0eee7..5398af3cbe 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/SequenceUtil.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/SequenceUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/test/java/org/apache/ofbiz/entity/DelegatorUnitTests.java b/framework/entity/src/test/java/org/apache/ofbiz/entity/DelegatorUnitTests.java
index 7cb86acf3c..3964d21759 100644
--- a/framework/entity/src/test/java/org/apache/ofbiz/entity/DelegatorUnitTests.java
+++ b/framework/entity/src/test/java/org/apache/ofbiz/entity/DelegatorUnitTests.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/test/java/org/apache/ofbiz/entity/condition/EntityFunctionTests.java b/framework/entity/src/test/java/org/apache/ofbiz/entity/condition/EntityFunctionTests.java
index 2195a72065..a21bed8f9c 100644
--- a/framework/entity/src/test/java/org/apache/ofbiz/entity/condition/EntityFunctionTests.java
+++ b/framework/entity/src/test/java/org/apache/ofbiz/entity/condition/EntityFunctionTests.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/test/java/org/apache/ofbiz/entity/model/ModelViewEntityComplexAliasTests.java b/framework/entity/src/test/java/org/apache/ofbiz/entity/model/ModelViewEntityComplexAliasTests.java
index 7b80b85b2f..a32ed6f2c0 100644
--- a/framework/entity/src/test/java/org/apache/ofbiz/entity/model/ModelViewEntityComplexAliasTests.java
+++ b/framework/entity/src/test/java/org/apache/ofbiz/entity/model/ModelViewEntityComplexAliasTests.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/test/java/org/apache/ofbiz/entity/test/EntityCryptoTestSuite.java b/framework/entity/src/test/java/org/apache/ofbiz/entity/test/EntityCryptoTestSuite.java
index b06a83443b..71f120187e 100644
--- a/framework/entity/src/test/java/org/apache/ofbiz/entity/test/EntityCryptoTestSuite.java
+++ b/framework/entity/src/test/java/org/apache/ofbiz/entity/test/EntityCryptoTestSuite.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/test/java/org/apache/ofbiz/entity/test/EntityQueryTestSuite.java b/framework/entity/src/test/java/org/apache/ofbiz/entity/test/EntityQueryTestSuite.java
index 79f9220e64..d27f5985da 100644
--- a/framework/entity/src/test/java/org/apache/ofbiz/entity/test/EntityQueryTestSuite.java
+++ b/framework/entity/src/test/java/org/apache/ofbiz/entity/test/EntityQueryTestSuite.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/test/java/org/apache/ofbiz/entity/test/EntityTestSuite.java b/framework/entity/src/test/java/org/apache/ofbiz/entity/test/EntityTestSuite.java
index 44c7f74466..e40e4c610a 100644
--- a/framework/entity/src/test/java/org/apache/ofbiz/entity/test/EntityTestSuite.java
+++ b/framework/entity/src/test/java/org/apache/ofbiz/entity/test/EntityTestSuite.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entity/src/test/java/org/apache/ofbiz/entity/test/EntityUtilTestSuite.java b/framework/entity/src/test/java/org/apache/ofbiz/entity/test/EntityUtilTestSuite.java
index 735a0c9e44..b6d0cdcd11 100644
--- a/framework/entity/src/test/java/org/apache/ofbiz/entity/test/EntityUtilTestSuite.java
+++ b/framework/entity/src/test/java/org/apache/ofbiz/entity/test/EntityUtilTestSuite.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityGroupUtil.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityGroupUtil.java
index 0b09f2824a..4b016ec454 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityGroupUtil.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityGroupUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityServiceFactory.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityServiceFactory.java
index 0fe2435dc2..54e29a935f 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityServiceFactory.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityServiceFactory.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityWatchServices.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityWatchServices.java
index 04f871280f..c90a07d836 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityWatchServices.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityWatchServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/cache/EntityCacheServices.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/cache/EntityCacheServices.java
index cf38361ca8..b96512630a 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/cache/EntityCacheServices.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/cache/EntityCacheServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataLoadContainer.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataLoadContainer.java
index 975fe8c23b..266928dacc 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataLoadContainer.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataLoadContainer.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataServices.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataServices.java
index 0776d7a61d..775411710b 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataServices.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/UpgradeServices.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/UpgradeServices.java
index 026bfcd003..7269ce1e9f 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/UpgradeServices.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/UpgradeServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/DelegatorEcaHandler.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/DelegatorEcaHandler.java
index c5a18a5102..aaf15d5d7d 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/DelegatorEcaHandler.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/DelegatorEcaHandler.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaAction.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaAction.java
index 01261d151e..1157bd78e5 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaAction.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaAction.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaCondition.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaCondition.java
index a3e6a2c9f0..ffd69e751b 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaCondition.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaCondition.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaException.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaException.java
index 86bfd65f49..2a2c8afb75 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaException.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaRule.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaRule.java
index a19b44050d..6ac03274dc 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaRule.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaRule.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaSetField.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaSetField.java
index ed4105d0a5..b5ef39e650 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaSetField.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaSetField.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaUtil.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaUtil.java
index 13c7dbba27..ca969778d2 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaUtil.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncContext.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncContext.java
index d1e34b743f..8b49debd6b 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncContext.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncContext.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncServices.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncServices.java
index 63dfd82c2a..ffa53fbe64 100644
--- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncServices.java
+++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangElement.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangElement.java
index 7a2b148be5..4d6f19a12f 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangElement.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangElement.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangException.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangException.java
index ab08906d81..2938db06df 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangException.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangRuntimeException.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangRuntimeException.java
index 09aa891888..6650b6afca 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangRuntimeException.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangRuntimeException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangUtil.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangUtil.java
index 9cfae8d6ed..65066b9814 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangUtil.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangValidate.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangValidate.java
index 47f42d80a0..a83751fd0c 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangValidate.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangValidate.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMapProcessor.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMapProcessor.java
index ffabe7b465..cb9e8e94db 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMapProcessor.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMapProcessor.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java
index ae8dc7d640..d4d23cedaa 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleServiceEngine.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleServiceEngine.java
index b82cad9ce1..09a9a9fe66 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleServiceEngine.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleServiceEngine.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/ValidationException.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/ValidationException.java
index 278496990b..ce10ae09ba 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/ValidationException.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/ValidationException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/artifact/ArtifactInfoContext.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/artifact/ArtifactInfoContext.java
index e0f5d9c7ad..68236117b9 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/artifact/ArtifactInfoContext.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/artifact/ArtifactInfoContext.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/FieldObject.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/FieldObject.java
index fb0ae502a3..763de0f77d 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/FieldObject.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/FieldObject.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java
index fe9471f2be..48f93e0183 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodContext.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodContext.java
index b6bddf9e08..f2b7a976f0 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodContext.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodContext.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodObject.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodObject.java
index e330d2f9c3..630027a491 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodObject.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodObject.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodOperation.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodOperation.java
index 9579ffb8ee..3ad0dd4537 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodOperation.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodOperation.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/StringObject.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/StringObject.java
index 6a7901f4cf..8ebb839878 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/StringObject.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/StringObject.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallClassMethod.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallClassMethod.java
index d2cd7ab456..0da148ca36 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallClassMethod.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallClassMethod.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallObjectMethod.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallObjectMethod.java
index 38dbd0ae2e..938d04748e 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallObjectMethod.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallObjectMethod.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallScript.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallScript.java
index 0e2abd2499..41897d0234 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallScript.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallScript.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallService.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallService.java
index cbc3364a91..5fd3589cd4 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallService.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallService.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java
index ce9aecc712..fe32abfc07 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java
index 4001f099aa..b918f38c8e 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java
index 689743170f..8bc2619c99 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/FlexibleMessage.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/FlexibleMessage.java
index 8cb5f0798b..bf45fdd7fa 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/FlexibleMessage.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/FlexibleMessage.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/Return.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/Return.java
index 0bbe752827..9b807b91a2 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/Return.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/Return.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java
index 5f08cf112d..9ff309c8f2 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CombinedCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CombinedCondition.java
index ee9a9b6487..87af8f07ff 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CombinedCondition.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CombinedCondition.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/Compare.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/Compare.java
index fcb4e894e0..952e876d3c 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/Compare.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/Compare.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareCondition.java
index 0c238b3c4a..d0d9aa0ca3 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareCondition.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareCondition.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareFieldCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareFieldCondition.java
index 280f03dfbb..d654bca3c8 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareFieldCondition.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareFieldCondition.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/Conditional.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/Conditional.java
index 3aaaaefdd4..4767a92451 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/Conditional.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/Conditional.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ConditionalFactory.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ConditionalFactory.java
index 82b1ac7453..e03e27e744 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ConditionalFactory.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ConditionalFactory.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ElseIf.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ElseIf.java
index 2f0b736907..ed79015bd7 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ElseIf.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ElseIf.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/EmptyCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/EmptyCondition.java
index a7f27e1a7a..349d28163a 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/EmptyCondition.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/EmptyCondition.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/HasPermissionCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/HasPermissionCondition.java
index b0ccfe2594..b6bc9d3f3a 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/HasPermissionCondition.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/HasPermissionCondition.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/MasterIf.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/MasterIf.java
index d07f7ce1de..46d9b5c9f8 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/MasterIf.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/MasterIf.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/RegexpCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/RegexpCondition.java
index a653ca03cb..a29e3547b2 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/RegexpCondition.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/RegexpCondition.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java
index 108e21e4fc..327202301a 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearCacheLine.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearCacheLine.java
index e9c6818ca3..d37e00d478 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearCacheLine.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearCacheLine.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearEntityCaches.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearEntityCaches.java
index f7f3b3caa1..320cf69a30 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearEntityCaches.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearEntityCaches.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CloneValue.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CloneValue.java
index 47b3468e99..8e05afc51a 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CloneValue.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CloneValue.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CreateValue.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CreateValue.java
index baf255f5a9..fc98b11f76 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CreateValue.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CreateValue.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityAnd.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityAnd.java
index fda9580ee2..d5e2ad2c34 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityAnd.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityAnd.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCondition.java
index 54b94910be..372e04d877 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCondition.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCondition.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCount.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCount.java
index 375a288e8d..d5850ac17a 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCount.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCount.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityData.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityData.java
index 58a8b84897..9dff374a12 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityData.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityData.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityOne.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityOne.java
index a032bad3cb..812583d235 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityOne.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityOne.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityOperation.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityOperation.java
index 06ad8a7db8..5b43046829 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityOperation.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityOperation.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByAnd.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByAnd.java
index 67ce0e11d5..8aa4f2fb45 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByAnd.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByAnd.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByDate.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByDate.java
index 6f8908fb96..e8cf858446 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByDate.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByDate.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByAnd.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByAnd.java
index b6d6c4b48c..650ccfd145 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByAnd.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByAnd.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByPrimaryKey.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByPrimaryKey.java
index aefc13a95e..09364318b8 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByPrimaryKey.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByPrimaryKey.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelated.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelated.java
index bf2bcadf06..1e80e5c761 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelated.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelated.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelatedOne.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelatedOne.java
index cad03fd069..d5ffa90dc5 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelatedOne.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelatedOne.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeNextSeqId.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeNextSeqId.java
index a5a93d47e6..41969e662b 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeNextSeqId.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeNextSeqId.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeValue.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeValue.java
index 5caee9ff9e..6b10323cb7 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeValue.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeValue.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/OrderValueList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/OrderValueList.java
index b745d28d9b..9ab29e446d 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/OrderValueList.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/OrderValueList.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RefreshValue.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RefreshValue.java
index 0e7b6f02ed..a7e15bab7b 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RefreshValue.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RefreshValue.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveByAnd.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveByAnd.java
index 18570f42a4..6ad5d21953 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveByAnd.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveByAnd.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveList.java
index 1b60d04c8d..ed17126eab 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveList.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveList.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveRelated.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveRelated.java
index 9918c4dca5..000f9ce6f4 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveRelated.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveRelated.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveValue.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveValue.java
index a007f5c66e..efeb6102a5 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveValue.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveValue.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SequencedIdToEnv.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SequencedIdToEnv.java
index 304ec6549b..d3b0923d69 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SequencedIdToEnv.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SequencedIdToEnv.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java
index 6d77cb838f..b321482666 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetNonpkFields.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetNonpkFields.java
index 2e87818d12..778cd56e91 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetNonpkFields.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetNonpkFields.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetPkFields.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetPkFields.java
index 2b77116501..87161129f1 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetPkFields.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetPkFields.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/StoreList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/StoreList.java
index 3582efc33c..8859cd5225 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/StoreList.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/StoreList.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/StoreValue.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/StoreValue.java
index b188d550f8..47a431210f 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/StoreValue.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/StoreValue.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionBegin.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionBegin.java
index 6800ed1afe..fc7f3d4268 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionBegin.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionBegin.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java
index d21728ce07..b017b9af67 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java
index 2209ab1528..3fd31d15a7 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/AddError.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/AddError.java
index eebac90d9b..cf96633d7d 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/AddError.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/AddError.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Assert.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Assert.java
index e5b7a4cb47..4aa124a0c5 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Assert.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Assert.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Break.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Break.java
index 2abe418046..1c2973bd08 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Break.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Break.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckErrors.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckErrors.java
index 11d6356906..201c82677d 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckErrors.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckErrors.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckId.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckId.java
index 789feecc77..4751e50b10 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckId.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckId.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ClearField.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ClearField.java
index 0bc352806f..037fb5f28e 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ClearField.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ClearField.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Continue.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Continue.java
index f4297afb26..f7dd697fe1 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Continue.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Continue.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CreateObject.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CreateObject.java
index 4b6d3eef27..3d07fab197 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CreateObject.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CreateObject.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FieldToList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FieldToList.java
index 82484dbf79..941d92e4ff 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FieldToList.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FieldToList.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FirstFromList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FirstFromList.java
index 23c17bf366..46f71a670d 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FirstFromList.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FirstFromList.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Iterate.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Iterate.java
index 0f51294baf..c592365310 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Iterate.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Iterate.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/IterateMap.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/IterateMap.java
index 94886656e0..780d91a1bc 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/IterateMap.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/IterateMap.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ListToList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ListToList.java
index d5fdfce4ee..ffcdd7db11 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ListToList.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ListToList.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Loop.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Loop.java
index 0316dc1afd..b653b59bbe 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Loop.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Loop.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/MapToMap.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/MapToMap.java
index f13ea22378..c6d787ca88 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/MapToMap.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/MapToMap.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Now.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Now.java
index c7c2dddfe0..2494985234 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Now.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Now.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/OrderMapList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/OrderMapList.java
index db0b96b728..106aaa4f8a 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/OrderMapList.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/OrderMapList.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetCalendar.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetCalendar.java
index fe9f0283d6..81fc93d582 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetCalendar.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetCalendar.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java
index 86de3cbf25..69e569a585 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringAppend.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringAppend.java
index d6420f279d..b53eeeed5d 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringAppend.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringAppend.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringToList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringToList.java
index ad3ea6c19b..e9f3fe416d 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringToList.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringToList.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ToString.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ToString.java
index 4273d90e7e..00a3b35482 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ToString.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ToString.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/While.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/While.java
index f42a567eb0..c85baf8de4 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/While.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/While.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/FieldToRequest.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/FieldToRequest.java
index 6d46cd0f3a..b1d79aeb66 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/FieldToRequest.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/FieldToRequest.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/FieldToSession.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/FieldToSession.java
index 2e8580f4eb..d9e5f1800c 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/FieldToSession.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/FieldToSession.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestParametersToList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestParametersToList.java
index 42cae57974..92868b6b85 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestParametersToList.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestParametersToList.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestToField.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestToField.java
index 448ae44493..5c7368224e 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestToField.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestToField.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/SessionToField.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/SessionToField.java
index 1696ccf3c7..050b15a3ac 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/SessionToField.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/SessionToField.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/WebappPropertyToField.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/WebappPropertyToField.java
index 76d4efda24..cc535ba848 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/WebappPropertyToField.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/WebappPropertyToField.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/CheckPermission.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/CheckPermission.java
index 5d14b724be..ebe7511075 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/CheckPermission.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/CheckPermission.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/IfInstanceOf.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/IfInstanceOf.java
index ace6d0f3f0..af807f0ff1 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/IfInstanceOf.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/IfInstanceOf.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/IfNotEmpty.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/IfNotEmpty.java
index 69bf72cbe3..fcdb7ec1aa 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/IfNotEmpty.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/IfNotEmpty.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Calculate.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Calculate.java
index 66dc295965..b87c69c8ff 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Calculate.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Calculate.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Log.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Log.java
index 64a3f86d67..e1eaf37b0d 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Log.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Log.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/PropertyToField.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/PropertyToField.java
index 7e4d5e612e..74a5beb10b 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/PropertyToField.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/PropertyToField.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Trace.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Trace.java
index 5c85fa13db..7b47cea77f 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Trace.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Trace.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/serviceops/FieldToResult.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/serviceops/FieldToResult.java
index 85e875a2b2..8f7d5a01cf 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/serviceops/FieldToResult.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/serviceops/FieldToResult.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/BaseCompare.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/BaseCompare.java
index a26ced5065..0df4e9cf2a 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/BaseCompare.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/BaseCompare.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Compare.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Compare.java
index 4f0671615c..1db9c47f0b 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Compare.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Compare.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/CompareField.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/CompareField.java
index b2e88c4491..58a952cd66 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/CompareField.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/CompareField.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/ConstantOper.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/ConstantOper.java
index 9d75dce681..c6fabd9f0c 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/ConstantOper.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/ConstantOper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Convert.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Convert.java
index edd57a1b49..8eeadb8dff 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Convert.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Convert.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Copy.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Copy.java
index 0af5a5aaf5..3eb5c093a5 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Copy.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Copy.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/InFieldOper.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/InFieldOper.java
index 37b5a6fa0d..91a2e6b51d 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/InFieldOper.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/InFieldOper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MakeInString.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MakeInString.java
index ab584a48b6..598fc56b92 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MakeInString.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MakeInString.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MakeInStringOperation.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MakeInStringOperation.java
index fd4057b9e2..5b3a4ad535 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MakeInStringOperation.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MakeInStringOperation.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MapProcessor.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MapProcessor.java
index e0aad32958..2e7af375fc 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MapProcessor.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MapProcessor.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/NotEmpty.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/NotEmpty.java
index feb03c33de..6a9d8ef726 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/NotEmpty.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/NotEmpty.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/PropertyOper.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/PropertyOper.java
index 8a094659ee..a029c78c7a 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/PropertyOper.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/PropertyOper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Regexp.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Regexp.java
index e51a4f7e65..d7db872c4e 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Regexp.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Regexp.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/SimpleMapOperation.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/SimpleMapOperation.java
index f0f0f32019..61a45f04fd 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/SimpleMapOperation.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/SimpleMapOperation.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/SimpleMapProcess.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/SimpleMapProcess.java
index d6579efec4..3f1e538c31 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/SimpleMapProcess.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/SimpleMapProcess.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/ValidateMethod.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/ValidateMethod.java
index 1645553166..d283bc54f2 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/ValidateMethod.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/ValidateMethod.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/minilang/src/test/java/org/apache/ofbiz/minilang/test/MiniLangTests.java b/framework/minilang/src/test/java/org/apache/ofbiz/minilang/test/MiniLangTests.java
index f825803ea4..604c9150d5 100644
--- a/framework/minilang/src/test/java/org/apache/ofbiz/minilang/test/MiniLangTests.java
+++ b/framework/minilang/src/test/java/org/apache/ofbiz/minilang/test/MiniLangTests.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/ServiceNameContextHolder.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/ServiceNameContextHolder.java
index 14d4cbd9a7..634952dc0e 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/ServiceNameContextHolder.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/ServiceNameContextHolder.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/annotation/AuthToken.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/annotation/AuthToken.java
index 53ea1d7018..7c957c551d 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/annotation/AuthToken.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/annotation/AuthToken.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/annotation/Secured.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/annotation/Secured.java
index 19ea8e9ef5..26e90932c4 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/annotation/Secured.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/annotation/Secured.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/common/AuthenticationScheme.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/common/AuthenticationScheme.java
index 06d8daf210..7f50cd48cf 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/common/AuthenticationScheme.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/common/AuthenticationScheme.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/core/OFBizApiConfig.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/core/OFBizApiConfig.java
index 8a3ddc4a6e..291424ac81 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/core/OFBizApiConfig.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/core/OFBizApiConfig.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/core/ResponseStatus.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/core/ResponseStatus.java
index 4e1e95268d..0b5413d1ef 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/core/ResponseStatus.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/core/ResponseStatus.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/examples/RestExampleServices.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/examples/RestExampleServices.java
index 94506df4c6..adde725864 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/examples/RestExampleServices.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/examples/RestExampleServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/examples/RestOrderExample.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/examples/RestOrderExample.java
index d643b6c71a..5b4b3734d0 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/examples/RestOrderExample.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/examples/RestOrderExample.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/examples/RestOrderItemExample.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/examples/RestOrderItemExample.java
index 009c77086b..646c7b351f 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/examples/RestOrderItemExample.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/examples/RestOrderItemExample.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/filters/ServiceContextCleanupFilter.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/filters/ServiceContextCleanupFilter.java
index 2de4c60265..4a9f4b61ac 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/filters/ServiceContextCleanupFilter.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/filters/ServiceContextCleanupFilter.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/listener/ApiContextListener.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/listener/ApiContextListener.java
index 427704c754..d8f96f9308 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/listener/ApiContextListener.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/listener/ApiContextListener.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelApi.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelApi.java
index 963987fcd0..6a78692d55 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelApi.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelApi.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelApiReader.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelApiReader.java
index 6674c7b437..4ba83e7e70 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelApiReader.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelApiReader.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelExample.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelExample.java
index f002515c00..137b02dd84 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelExample.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelExample.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelMapping.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelMapping.java
index 782409cb76..7258ff11e6 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelMapping.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelMapping.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelOperation.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelOperation.java
index 0bdaca5d20..1f3e277dbc 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelOperation.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelOperation.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelQueryParam.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelQueryParam.java
index 1047ab2461..992298a7ec 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelQueryParam.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelQueryParam.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelResource.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelResource.java
index 51ef1efcec..b854a1c15a 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelResource.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelResource.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiReader.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiReader.java
index ca5961aa56..d050a4a474 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiReader.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiReader.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiUiFilter.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiUiFilter.java
index 4466069fa0..a720643dbb 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiUiFilter.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiUiFilter.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizResourceScanner.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizResourceScanner.java
index d448241ab8..b059989d05 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizResourceScanner.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizResourceScanner.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/process/RestRequestHandler.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/process/RestRequestHandler.java
index 41e590c8f9..1954e4c912 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/process/RestRequestHandler.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/process/RestRequestHandler.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/process/ServiceRequestHandler.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/process/ServiceRequestHandler.java
index 235b257e46..aec3a0c566 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/process/ServiceRequestHandler.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/process/ServiceRequestHandler.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/ApiRootResource.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/ApiRootResource.java
index 4619124e2d..f065d33f61 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/ApiRootResource.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/ApiRootResource.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/AuthenticationResource.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/AuthenticationResource.java
index 8a69d7c9a4..9209f8dd80 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/AuthenticationResource.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/AuthenticationResource.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/OpenApiResource.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/OpenApiResource.java
index 864590d574..6a3f418824 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/OpenApiResource.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/OpenApiResource.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/response/Error.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/response/Error.java
index edfb0d005f..19e81a4fc9 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/response/Error.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/response/Error.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/response/Success.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/response/Success.java
index f01b775c75..a1f6fb5bab 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/response/Success.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/response/Success.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/APIAuthFilter.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/APIAuthFilter.java
index 7620350c9c..2231a7d410 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/APIAuthFilter.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/APIAuthFilter.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/APICorsFilter.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/APICorsFilter.java
index 96b510b8e1..e6ed399b3a 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/APICorsFilter.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/APICorsFilter.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/HttpBasicAuthFilter.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/HttpBasicAuthFilter.java
index 68f558ec24..be1b96ce8d 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/HttpBasicAuthFilter.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/HttpBasicAuthFilter.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/services/RestServices.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/services/RestServices.java
index ec8f41f70c..62d1c2f1f0 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/services/RestServices.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/services/RestServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GenericServiceExceptionMapper.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GenericServiceExceptionMapper.java
index 905678158b..f9effd2cb4 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GenericServiceExceptionMapper.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GenericServiceExceptionMapper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GlobalExceptionMapper.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GlobalExceptionMapper.java
index ab6c9cb843..a65a4d3a07 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GlobalExceptionMapper.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GlobalExceptionMapper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/JacksonConfig.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/JacksonConfig.java
index cc0df7798b..f83c93dc5b 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/JacksonConfig.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/JacksonConfig.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/LinkSerializer.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/LinkSerializer.java
index a348e25f98..79f8089cb7 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/LinkSerializer.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/LinkSerializer.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java
index ae2f8e9bca..9dd71ac0ed 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestApiUtil.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestApiUtil.java
index a2894fa8c0..1c686844b5 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestApiUtil.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestApiUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestListResponseBuilder.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestListResponseBuilder.java
index d1fe5dfac6..f14cf3aaf6 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestListResponseBuilder.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestListResponseBuilder.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestQueryOptions.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestQueryOptions.java
index c12755cd89..6b20ee90e1 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestQueryOptions.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestQueryOptions.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestServiceUtil.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestServiceUtil.java
index 10c70e30de..189fd5281a 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestServiceUtil.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestServiceUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/ServiceRequestWorker.java b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/ServiceRequestWorker.java
index a359aa0f94..bd8ea783a5 100644
--- a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/ServiceRequestWorker.java
+++ b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/ServiceRequestWorker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/core/OFBizApiConfigTest.java b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/core/OFBizApiConfigTest.java
index 940dbafd2f..dc52511563 100644
--- a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/core/OFBizApiConfigTest.java
+++ b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/core/OFBizApiConfigTest.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/core/ResponseStatusTest.java b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/core/ResponseStatusTest.java
index 8cb1837b30..8d44d7ce2a 100644
--- a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/core/ResponseStatusTest.java
+++ b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/core/ResponseStatusTest.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/listener/ApiContextListenerTest.java b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/listener/ApiContextListenerTest.java
index a6f301204b..7dcefcc415 100644
--- a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/listener/ApiContextListenerTest.java
+++ b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/listener/ApiContextListenerTest.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/model/ModelApiReaderTest.java b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/model/ModelApiReaderTest.java
index b0502d7468..09c2ad569d 100644
--- a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/model/ModelApiReaderTest.java
+++ b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/model/ModelApiReaderTest.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiReaderTest.java b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiReaderTest.java
index 6cf5851cc9..0f9f976a92 100644
--- a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiReaderTest.java
+++ b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiReaderTest.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/process/RestRequestHandlerTest.java b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/process/RestRequestHandlerTest.java
index 611d17645d..356777708a 100644
--- a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/process/RestRequestHandlerTest.java
+++ b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/process/RestRequestHandlerTest.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/resources/ApiRootResourceTest.java b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/resources/ApiRootResourceTest.java
index 8bf48f37cd..e0d5681c5a 100644
--- a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/resources/ApiRootResourceTest.java
+++ b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/resources/ApiRootResourceTest.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/resources/OpenApiResourceTest.java b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/resources/OpenApiResourceTest.java
index 729becf5ac..61b3dddd1b 100644
--- a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/resources/OpenApiResourceTest.java
+++ b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/resources/OpenApiResourceTest.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/spi/impl/GlobalExceptionMapperTest.java b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/spi/impl/GlobalExceptionMapperTest.java
index 423ba68e30..ff3ecf81a5 100644
--- a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/spi/impl/GlobalExceptionMapperTest.java
+++ b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/spi/impl/GlobalExceptionMapperTest.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/test/RestTestHttpRequest.java b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/test/RestTestHttpRequest.java
index a0e6a23210..974ad2911d 100644
--- a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/test/RestTestHttpRequest.java
+++ b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/test/RestTestHttpRequest.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/test/RestTestServices.java b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/test/RestTestServices.java
index d1ac521d50..da5ed1dabe 100644
--- a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/test/RestTestServices.java
+++ b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/test/RestTestServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/util/OpenApiUtilTest.java b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/util/OpenApiUtilTest.java
index 0efbfe30ec..c84459c6aa 100644
--- a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/util/OpenApiUtilTest.java
+++ b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/util/OpenApiUtilTest.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/util/RestApiUtilPaginationTest.java b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/util/RestApiUtilPaginationTest.java
index 97de4c80c9..5f3cbecfcd 100644
--- a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/util/RestApiUtilPaginationTest.java
+++ b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/util/RestApiUtilPaginationTest.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/util/RestApiUtilTest.java b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/util/RestApiUtilTest.java
index 112fa2d74a..11df04ebb2 100644
--- a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/util/RestApiUtilTest.java
+++ b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/util/RestApiUtilTest.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/util/RestListResponseBuilderTest.java b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/util/RestListResponseBuilderTest.java
index 90a745d0ee..22cae5bc72 100644
--- a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/util/RestListResponseBuilderTest.java
+++ b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/util/RestListResponseBuilderTest.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/util/RestQueryOptionsTest.java b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/util/RestQueryOptionsTest.java
index 011c801ffa..381b5cdb50 100644
--- a/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/util/RestQueryOptionsTest.java
+++ b/framework/rest-api/src/test/java/org/apache/ofbiz/ws/rs/util/RestQueryOptionsTest.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/security/src/main/java/org/apache/ofbiz/security/CsrfDefenseStrategy.java b/framework/security/src/main/java/org/apache/ofbiz/security/CsrfDefenseStrategy.java
index 5d9d65ca16..5166cf4a0a 100644
--- a/framework/security/src/main/java/org/apache/ofbiz/security/CsrfDefenseStrategy.java
+++ b/framework/security/src/main/java/org/apache/ofbiz/security/CsrfDefenseStrategy.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/security/src/main/java/org/apache/ofbiz/security/CsrfUtil.java b/framework/security/src/main/java/org/apache/ofbiz/security/CsrfUtil.java
index b9009f69d1..a6bd208ac5 100644
--- a/framework/security/src/main/java/org/apache/ofbiz/security/CsrfUtil.java
+++ b/framework/security/src/main/java/org/apache/ofbiz/security/CsrfUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/security/src/main/java/org/apache/ofbiz/security/ICsrfDefenseStrategy.java b/framework/security/src/main/java/org/apache/ofbiz/security/ICsrfDefenseStrategy.java
index acb07d7624..129005cce0 100644
--- a/framework/security/src/main/java/org/apache/ofbiz/security/ICsrfDefenseStrategy.java
+++ b/framework/security/src/main/java/org/apache/ofbiz/security/ICsrfDefenseStrategy.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/security/src/main/java/org/apache/ofbiz/security/NoCsrfDefenseStrategy.java b/framework/security/src/main/java/org/apache/ofbiz/security/NoCsrfDefenseStrategy.java
index b1a0834b1b..28be6dae40 100644
--- a/framework/security/src/main/java/org/apache/ofbiz/security/NoCsrfDefenseStrategy.java
+++ b/framework/security/src/main/java/org/apache/ofbiz/security/NoCsrfDefenseStrategy.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/security/src/main/java/org/apache/ofbiz/security/SecuredFreemarker.java b/framework/security/src/main/java/org/apache/ofbiz/security/SecuredFreemarker.java
index 1a52887e37..94b85facb1 100644
--- a/framework/security/src/main/java/org/apache/ofbiz/security/SecuredFreemarker.java
+++ b/framework/security/src/main/java/org/apache/ofbiz/security/SecuredFreemarker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/security/src/main/java/org/apache/ofbiz/security/Security.java b/framework/security/src/main/java/org/apache/ofbiz/security/Security.java
index dc441ef273..d82ac21326 100644
--- a/framework/security/src/main/java/org/apache/ofbiz/security/Security.java
+++ b/framework/security/src/main/java/org/apache/ofbiz/security/Security.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/security/src/main/java/org/apache/ofbiz/security/SecurityConfigurationException.java b/framework/security/src/main/java/org/apache/ofbiz/security/SecurityConfigurationException.java
index 34096e3c6b..d06d5e110a 100644
--- a/framework/security/src/main/java/org/apache/ofbiz/security/SecurityConfigurationException.java
+++ b/framework/security/src/main/java/org/apache/ofbiz/security/SecurityConfigurationException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/security/src/main/java/org/apache/ofbiz/security/SecurityFactory.java b/framework/security/src/main/java/org/apache/ofbiz/security/SecurityFactory.java
index 6544059f26..af560418d0 100644
--- a/framework/security/src/main/java/org/apache/ofbiz/security/SecurityFactory.java
+++ b/framework/security/src/main/java/org/apache/ofbiz/security/SecurityFactory.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/security/src/main/java/org/apache/ofbiz/security/SecurityUtil.java b/framework/security/src/main/java/org/apache/ofbiz/security/SecurityUtil.java
index b00d7e1cd2..5154b7369a 100644
--- a/framework/security/src/main/java/org/apache/ofbiz/security/SecurityUtil.java
+++ b/framework/security/src/main/java/org/apache/ofbiz/security/SecurityUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/DispatchContext.java b/framework/service/src/main/java/org/apache/ofbiz/service/DispatchContext.java
index 3d88b53261..73938c89a0 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/DispatchContext.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/DispatchContext.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ExecutionServiceException.java b/framework/service/src/main/java/org/apache/ofbiz/service/ExecutionServiceException.java
index 9356ad0f69..5cb05bce76 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/ExecutionServiceException.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/ExecutionServiceException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/GeneralServiceException.java b/framework/service/src/main/java/org/apache/ofbiz/service/GeneralServiceException.java
index 05b5b89852..63dd1542b6 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/GeneralServiceException.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/GeneralServiceException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/GenericAbstractDispatcher.java b/framework/service/src/main/java/org/apache/ofbiz/service/GenericAbstractDispatcher.java
index e3e979ce44..10e3dfdf9b 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/GenericAbstractDispatcher.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/GenericAbstractDispatcher.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/GenericDispatcherFactory.java b/framework/service/src/main/java/org/apache/ofbiz/service/GenericDispatcherFactory.java
index 3bfab03111..043f9496dc 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/GenericDispatcherFactory.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/GenericDispatcherFactory.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/GenericRequester.java b/framework/service/src/main/java/org/apache/ofbiz/service/GenericRequester.java
index 276b0ac7ca..3a8a5e7882 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/GenericRequester.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/GenericRequester.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/GenericResultWaiter.java b/framework/service/src/main/java/org/apache/ofbiz/service/GenericResultWaiter.java
index 8b61bcb719..66204b5a39 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/GenericResultWaiter.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/GenericResultWaiter.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/GenericServiceCallback.java b/framework/service/src/main/java/org/apache/ofbiz/service/GenericServiceCallback.java
index 68e9848d5b..5a3a13293c 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/GenericServiceCallback.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/GenericServiceCallback.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/GenericServiceException.java b/framework/service/src/main/java/org/apache/ofbiz/service/GenericServiceException.java
index 805d8ddb54..5392172fe2 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/GenericServiceException.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/GenericServiceException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/LocalDispatcher.java b/framework/service/src/main/java/org/apache/ofbiz/service/LocalDispatcher.java
index dabe9eb830..1e85551728 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/LocalDispatcher.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/LocalDispatcher.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/LocalDispatcherFactory.java b/framework/service/src/main/java/org/apache/ofbiz/service/LocalDispatcherFactory.java
index ffdc255e26..4e4e5976fb 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/LocalDispatcherFactory.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/LocalDispatcherFactory.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ModelParam.java b/framework/service/src/main/java/org/apache/ofbiz/service/ModelParam.java
index 7161c490cf..55057dddf3 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/ModelParam.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/ModelParam.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ModelPermGroup.java b/framework/service/src/main/java/org/apache/ofbiz/service/ModelPermGroup.java
index b9e20f24dc..978e4d8b9f 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/ModelPermGroup.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/ModelPermGroup.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ModelPermission.java b/framework/service/src/main/java/org/apache/ofbiz/service/ModelPermission.java
index 2c502958ab..8df069b073 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/ModelPermission.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/ModelPermission.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java b/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java
index 3dfc3bc1d0..fe0fedd1e3 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceIface.java b/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceIface.java
index d7148967b1..a7e66674c0 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceIface.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceIface.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceReader.java b/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceReader.java
index 3beec16fb4..6b31f9fce0 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceReader.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceReader.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/RunningService.java b/framework/service/src/main/java/org/apache/ofbiz/service/RunningService.java
index 7c285a8048..f7901e6b62 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/RunningService.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/RunningService.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceAuthException.java b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceAuthException.java
index 08b932c5dd..3149859639 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceAuthException.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceAuthException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceContainer.java b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceContainer.java
index 0fd234b144..a3922954ab 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceContainer.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceContainer.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java
index 81de6e7557..1c2f57e3b8 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceErrorException.java b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceErrorException.java
index 4d4cb7ab79..3bf61a8d8b 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceErrorException.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceErrorException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceSynchronization.java b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceSynchronization.java
index 582626e5b3..2f795c665c 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceSynchronization.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceSynchronization.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java
index 2a8a9ba2b4..02a8b9107c 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceValidationException.java b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceValidationException.java
index 92573b5c1e..b963537f82 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceValidationException.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceValidationException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceXaWrapper.java b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceXaWrapper.java
index 0934b90885..d6cf3d98d3 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceXaWrapper.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceXaWrapper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/ExpressionUiHelper.java b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/ExpressionUiHelper.java
index 699ef89cef..c8d69cc659 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/ExpressionUiHelper.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/ExpressionUiHelper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java
index d4b322f0b7..1e751fd08f 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfoException.java b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfoException.java
index e682fcb89c..8561fb54b7 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfoException.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfoException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java
index 38bceed5b1..303a52d64b 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRuleException.java b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRuleException.java
index 046861932d..f390e5ef68 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRuleException.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRuleException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceUtil.java b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceUtil.java
index 0344f7adaa..3a4257339b 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceUtil.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpression.java b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpression.java
index b5d2e40475..5074096a38 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpression.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpression.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressionPrinter.java b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressionPrinter.java
index 07f6040a91..53efc33466 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressionPrinter.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressionPrinter.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressionVisitor.java b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressionVisitor.java
index 2ba1d58b81..611855423f 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressionVisitor.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressionVisitor.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressionWorker.java b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressionWorker.java
index 4bb6f5757e..c18bece6a2 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressionWorker.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressionWorker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressions.java b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressions.java
index 5d0e6dbfc9..9b2b217c4d 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressions.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressions.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigException.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigException.java
index d1c1506031..e44f5603ee 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigException.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigListener.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigListener.java
index 6c26c614d0..d579e41b93 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigListener.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigListener.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigUtil.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigUtil.java
index e7359126b3..f2a63b402b 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigUtil.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Authorization.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Authorization.java
index ae43f5f7d4..6731d4c169 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Authorization.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Authorization.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Engine.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Engine.java
index c667e2875c..9d2b1c621b 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Engine.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Engine.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/GlobalServices.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/GlobalServices.java
index 4cc5552714..752fda2e70 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/GlobalServices.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/GlobalServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/JmsService.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/JmsService.java
index 331001b7da..c0d6d8ea90 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/JmsService.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/JmsService.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Notification.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Notification.java
index 877280e7d3..901a64f82f 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Notification.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Notification.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/NotificationGroup.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/NotificationGroup.java
index c670cdf059..d8e2d0906f 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/NotificationGroup.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/NotificationGroup.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Notify.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Notify.java
index a2aa6ccc49..d44473e7e7 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Notify.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Notify.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Parameter.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Parameter.java
index b3fe7eff2c..5c57d36a04 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Parameter.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Parameter.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ResourceLoader.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ResourceLoader.java
index 1468ed21a9..f2ff7874cb 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ResourceLoader.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ResourceLoader.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/RunFromPool.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/RunFromPool.java
index 2c709cf21a..e7f4866f44 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/RunFromPool.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/RunFromPool.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Server.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Server.java
index 94bb716d16..88a26ae66a 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Server.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Server.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceConfig.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceConfig.java
index 09a8910372..abddb9188c 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceConfig.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceConfig.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceEcas.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceEcas.java
index a00aa747dd..45a5f9709d 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceEcas.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceEcas.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceEngine.java
index 392e0572db..04990cc8b6 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceEngine.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceEngine.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceGroups.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceGroups.java
index 8df58d5d86..7d9773649b 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceGroups.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceGroups.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceLocation.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceLocation.java
index a52757d08e..99bcbd696b 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceLocation.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceLocation.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/StartupService.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/StartupService.java
index db3352a75b..31f9bfa3ed 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/StartupService.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/StartupService.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ThreadPool.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ThreadPool.java
index da93086e28..f9be57da75 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ThreadPool.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ThreadPool.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaAction.java b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaAction.java
index 826f6e39b4..d0f77498d5 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaAction.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaAction.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaCondition.java b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaCondition.java
index 1ba92a2d1b..d2d1e22cec 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaCondition.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaCondition.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java
index caa8a855f5..3d411bd12b 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaSetField.java b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaSetField.java
index 9366ce6bdd..cd8e1e5449 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaSetField.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaSetField.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaUtil.java b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaUtil.java
index f45e741531..cdaddb692e 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaUtil.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/AbstractEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/AbstractEngine.java
index 65f77ea9df..df9d0b150c 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/AbstractEngine.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/AbstractEngine.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/GenericAsyncEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/GenericAsyncEngine.java
index 60a3b40b00..afcf797380 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/GenericAsyncEngine.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/GenericAsyncEngine.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/GenericEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/GenericEngine.java
index 2472378b3e..d2c4f34f62 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/GenericEngine.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/GenericEngine.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/GenericEngineFactory.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/GenericEngineFactory.java
index abd519c530..0a83dcf7dc 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/GenericEngineFactory.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/GenericEngineFactory.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/GroovyEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/GroovyEngine.java
index 4543a110f7..60316cdd7c 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/GroovyEngine.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/GroovyEngine.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/InterfaceEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/InterfaceEngine.java
index 4dc746ec5f..87b4d578e3 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/InterfaceEngine.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/InterfaceEngine.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/RouteEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/RouteEngine.java
index 9b2833a2a1..d5b11bca7c 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/RouteEngine.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/RouteEngine.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/SOAPClientEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/SOAPClientEngine.java
index d3db5eb641..7faf15a3d3 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/SOAPClientEngine.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/SOAPClientEngine.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/ScriptEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/ScriptEngine.java
index 33c81dbe26..2ad8306339 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/ScriptEngine.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/ScriptEngine.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/SoapSerializer.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/SoapSerializer.java
index d441af2ed5..1b3891de83 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/SoapSerializer.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/SoapSerializer.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/StandardClojureEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/StandardClojureEngine.java
index 4918129b19..4166741706 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/StandardClojureEngine.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/StandardClojureEngine.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/TrackedServiceEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/TrackedServiceEngine.java
index e29171bdc8..2edf323f01 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/TrackedServiceEngine.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/TrackedServiceEngine.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupModel.java b/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupModel.java
index c3af6c8a37..baff53edc5 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupModel.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupModel.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupServiceModel.java b/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupServiceModel.java
index bbac8e0bb4..4b82e02b47 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupServiceModel.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupServiceModel.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/group/ServiceGroupEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/group/ServiceGroupEngine.java
index 0af1ad1e67..91f408c866 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/group/ServiceGroupEngine.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/group/ServiceGroupEngine.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/group/ServiceGroupReader.java b/framework/service/src/main/java/org/apache/ofbiz/service/group/ServiceGroupReader.java
index cbd819c4aa..b99c1249f8 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/group/ServiceGroupReader.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/group/ServiceGroupReader.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/jms/AbstractJmsListener.java b/framework/service/src/main/java/org/apache/ofbiz/service/jms/AbstractJmsListener.java
index 9a89726306..bf3b306d37 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/jms/AbstractJmsListener.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/jms/AbstractJmsListener.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/jms/GenericMessageListener.java b/framework/service/src/main/java/org/apache/ofbiz/service/jms/GenericMessageListener.java
index 8fc5cd3f30..119cc8934c 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/jms/GenericMessageListener.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/jms/GenericMessageListener.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsListenerFactory.java b/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsListenerFactory.java
index a8825ab933..537859793c 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsListenerFactory.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsListenerFactory.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsQueueListener.java b/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsQueueListener.java
index ed6224bd4b..3cc5a4eb16 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsQueueListener.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsQueueListener.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsSerializer.java b/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsSerializer.java
index cf21cf03f1..85f20a6db4 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsSerializer.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsSerializer.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsServiceEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsServiceEngine.java
index bf2c544376..1cc7ef9554 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsServiceEngine.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsServiceEngine.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsTopicListener.java b/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsTopicListener.java
index 80fe4a2a64..25ee9a11c4 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsTopicListener.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsTopicListener.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/job/AbstractJob.java b/framework/service/src/main/java/org/apache/ofbiz/service/job/AbstractJob.java
index 5f00e9af94..cf8ad74c04 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/job/AbstractJob.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/job/AbstractJob.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/job/GenericServiceJob.java b/framework/service/src/main/java/org/apache/ofbiz/service/job/GenericServiceJob.java
index 1bb68003c2..34d45f8c45 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/job/GenericServiceJob.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/job/GenericServiceJob.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/job/InvalidJobException.java b/framework/service/src/main/java/org/apache/ofbiz/service/job/InvalidJobException.java
index 37408377cd..7dd6d27f7b 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/job/InvalidJobException.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/job/InvalidJobException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/job/Job.java b/framework/service/src/main/java/org/apache/ofbiz/service/job/Job.java
index de4b0b3923..0ba9d0ce50 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/job/Job.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/job/Job.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/job/JobManager.java b/framework/service/src/main/java/org/apache/ofbiz/service/job/JobManager.java
index 3d80a45ecc..38f9e880eb 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/job/JobManager.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/job/JobManager.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/job/JobManagerException.java b/framework/service/src/main/java/org/apache/ofbiz/service/job/JobManagerException.java
index 765890df97..a5edcd69aa 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/job/JobManagerException.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/job/JobManagerException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java b/framework/service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java
index c41e9022f2..f95a83081f 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/job/JobServices.java b/framework/service/src/main/java/org/apache/ofbiz/service/job/JobServices.java
index 3b82354a17..86a7b1f50a 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/job/JobServices.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/job/JobServices.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/job/JobUtil.java b/framework/service/src/main/java/org/apache/ofbiz/service/job/JobUtil.java
index 651d17f60d..e65ede9513 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/job/JobUtil.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/job/JobUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/job/PersistedServiceJob.java b/framework/service/src/main/java/org/apache/ofbiz/service/job/PersistedServiceJob.java
index 59db635726..5eba4991df 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/job/PersistedServiceJob.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/job/PersistedServiceJob.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/job/PurgeJob.java b/framework/service/src/main/java/org/apache/ofbiz/service/job/PurgeJob.java
index fc9e29bb4f..330a78d641 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/job/PurgeJob.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/job/PurgeJob.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/mail/JavaMailContainer.java b/framework/service/src/main/java/org/apache/ofbiz/service/mail/JavaMailContainer.java
index e6f5627cb2..c4cb0cb067 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/mail/JavaMailContainer.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/mail/JavaMailContainer.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/mail/MimeMessageWrapper.java b/framework/service/src/main/java/org/apache/ofbiz/service/mail/MimeMessageWrapper.java
index 562b661f02..7abec0e389 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/mail/MimeMessageWrapper.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/mail/MimeMessageWrapper.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaAction.java b/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaAction.java
index b3562dafd3..c44fd01c26 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaAction.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaAction.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaCondition.java b/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaCondition.java
index 6d10afea5e..5617878298 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaCondition.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaCondition.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaRule.java b/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaRule.java
index 04fc2bf5b6..51f15ee552 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaRule.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaRule.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaUtil.java b/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaUtil.java
index e104d8d972..8e2e80edcb 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaUtil.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/ExampleRemoteClient.java b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/ExampleRemoteClient.java
index 9981fb0391..52ddd9530a 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/ExampleRemoteClient.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/ExampleRemoteClient.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcher.java b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcher.java
index 0246bac219..2e39c1c008 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcher.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcher.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcherImpl.java b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcherImpl.java
index 7111c67881..39253f23d6 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcherImpl.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcherImpl.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RmiServiceContainer.java b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RmiServiceContainer.java
index 729342dc7f..8b358e61b1 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RmiServiceContainer.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RmiServiceContainer.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RmiServiceEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RmiServiceEngine.java
index 8a116560c1..bcd9394934 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RmiServiceEngine.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RmiServiceEngine.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java
index c2e18852e1..97e4bbdcb9 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java
index 653ab235d6..bf57a3f0c0 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/semaphore/SemaphoreFailException.java b/framework/service/src/main/java/org/apache/ofbiz/service/semaphore/SemaphoreFailException.java
index 7b9fba3f8b..31d6351657 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/semaphore/SemaphoreFailException.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/semaphore/SemaphoreFailException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/semaphore/SemaphoreWaitException.java b/framework/service/src/main/java/org/apache/ofbiz/service/semaphore/SemaphoreWaitException.java
index c1b488886c..83dfb2c909 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/semaphore/SemaphoreWaitException.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/semaphore/SemaphoreWaitException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/semaphore/ServiceSemaphore.java b/framework/service/src/main/java/org/apache/ofbiz/service/semaphore/ServiceSemaphore.java
index 212e8ee52e..38c361adeb 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/semaphore/ServiceSemaphore.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/semaphore/ServiceSemaphore.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/testtools/OFBizTestCase.java b/framework/service/src/main/java/org/apache/ofbiz/service/testtools/OFBizTestCase.java
index 595ba346b8..9e15927db8 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/testtools/OFBizTestCase.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/testtools/OFBizTestCase.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/tracker/JobTracker.java b/framework/service/src/main/java/org/apache/ofbiz/service/tracker/JobTracker.java
index 8c7c710290..d862044450 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/tracker/JobTracker.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/tracker/JobTracker.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/tracker/JobTrackerFactory.java b/framework/service/src/main/java/org/apache/ofbiz/service/tracker/JobTrackerFactory.java
index 853d4a7572..2eb2bb0022 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/tracker/JobTrackerFactory.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/tracker/JobTrackerFactory.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/tracker/JobTrackerListener.java b/framework/service/src/main/java/org/apache/ofbiz/service/tracker/JobTrackerListener.java
index c3bd9ab1bd..18d837ec07 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/tracker/JobTrackerListener.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/tracker/JobTrackerListener.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/test/java/org/apache/ofbiz/service/test/GroovyDslServiceEngineTests.java b/framework/service/src/test/java/org/apache/ofbiz/service/test/GroovyDslServiceEngineTests.java
index 56e991f563..940a020732 100644
--- a/framework/service/src/test/java/org/apache/ofbiz/service/test/GroovyDslServiceEngineTests.java
+++ b/framework/service/src/test/java/org/apache/ofbiz/service/test/GroovyDslServiceEngineTests.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/test/java/org/apache/ofbiz/service/test/ServiceEngineTests.java b/framework/service/src/test/java/org/apache/ofbiz/service/test/ServiceEngineTests.java
index c821e936c3..76be1990fa 100644
--- a/framework/service/src/test/java/org/apache/ofbiz/service/test/ServiceEngineTests.java
+++ b/framework/service/src/test/java/org/apache/ofbiz/service/test/ServiceEngineTests.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/test/java/org/apache/ofbiz/service/test/ServiceEntityAutoTests.java b/framework/service/src/test/java/org/apache/ofbiz/service/test/ServiceEntityAutoTests.java
index 8c96a66b38..dc8c6c35db 100644
--- a/framework/service/src/test/java/org/apache/ofbiz/service/test/ServiceEntityAutoTests.java
+++ b/framework/service/src/test/java/org/apache/ofbiz/service/test/ServiceEntityAutoTests.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/service/src/test/java/org/apache/ofbiz/service/test/ServicePermissionTests.java b/framework/service/src/test/java/org/apache/ofbiz/service/test/ServicePermissionTests.java
index d8419b279e..115c530186 100644
--- a/framework/service/src/test/java/org/apache/ofbiz/service/test/ServicePermissionTests.java
+++ b/framework/service/src/test/java/org/apache/ofbiz/service/test/ServicePermissionTests.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/start/src/main/java/org/apache/ofbiz/base/start/AdminClient.java b/framework/start/src/main/java/org/apache/ofbiz/base/start/AdminClient.java
index a7b46e1db2..c844040ba6 100644
--- a/framework/start/src/main/java/org/apache/ofbiz/base/start/AdminClient.java
+++ b/framework/start/src/main/java/org/apache/ofbiz/base/start/AdminClient.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/start/src/main/java/org/apache/ofbiz/base/start/Start.java b/framework/start/src/main/java/org/apache/ofbiz/base/start/Start.java
index a8c2ef4ecd..47156a1686 100644
--- a/framework/start/src/main/java/org/apache/ofbiz/base/start/Start.java
+++ b/framework/start/src/main/java/org/apache/ofbiz/base/start/Start.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupCommand.java b/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupCommand.java
index 7254b4574d..8edca1e277 100644
--- a/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupCommand.java
+++ b/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupCommand.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupCommandUtil.java b/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupCommandUtil.java
index dbd556f913..7dfa9205f3 100644
--- a/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupCommandUtil.java
+++ b/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupCommandUtil.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupControlPanel.java b/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupControlPanel.java
index 2800de2ac8..9b63a2ce4a 100644
--- a/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupControlPanel.java
+++ b/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupControlPanel.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupException.java b/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupException.java
index 84fe983ece..51482725b9 100644
--- a/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupException.java
+++ b/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupException.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/start/src/test/java/org/apache/ofbiz/base/start/OfbizStartupUnitTests.java b/framework/start/src/test/java/org/apache/ofbiz/base/start/OfbizStartupUnitTests.java
... 2299 lines suppressed ...
(ofbiz-framework) 02/02: Fix documentation comments that are not attached to any declaration
Posted by mr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mridulpathak pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 522792d5cf32fde3ce3ca738ac7df846f0cee4df
Author: Mridul Pathak <mr...@gmail.com>
AuthorDate: Tue Oct 27 18:13:26 2026 +0530
Fix documentation comments that are not attached to any declaration
- Start the license headers of GenericMap, ReportHelper and SecuredUpload with /*, since a typo and a leading blank line kept the script from matching them.
- Move the record component comments of SecretAuditEvent into @param tags of the record Javadoc.
- Put @Override after the Javadoc of the isFinished method in RequestWrapper.
- Remove a //// separator line in TechDataServices, which javac reads as a Markdown documentation comment.
---
.../manufacturing/techdata/TechDataServices.java | 1 -
.../ofbiz/marketing/report/ReportHelper.java | 2 +-
.../org/apache/ofbiz/base/util/RequestWrapper.java | 2 +-
.../ofbiz/base/util/collections/GenericMap.java | 2 +-
.../org/apache/ofbiz/security/SecuredUpload.java | 2 +-
.../ofbiz/webtools/secret/SecretAuditEvent.java | 23 +++++++++++-----------
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/techdata/TechDataServices.java b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/techdata/TechDataServices.java
index 4b85ad190b..b0b9cb7153 100644
--- a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/techdata/TechDataServices.java
+++ b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/techdata/TechDataServices.java
@@ -388,7 +388,6 @@ public class TechDataServices {
return dateTo;
}
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/** Used to find the last day in the TechDataCalendarWeek where capacity != 0, ending at dayEnd, dayEnd included.
* @param techDataCalendarWeek The TechDataCalendarWeek cover
* @param dayEnd
diff --git a/applications/marketing/src/main/java/org/apache/ofbiz/marketing/report/ReportHelper.java b/applications/marketing/src/main/java/org/apache/ofbiz/marketing/report/ReportHelper.java
index 21b695d6de..92d3505d4d 100644
--- a/applications/marketing/src/main/java/org/apache/ofbiz/marketing/report/ReportHelper.java
+++ b/applications/marketing/src/main/java/org/apache/ofbiz/marketing/report/ReportHelper.java
@@ -1,5 +1,5 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/RequestWrapper.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/RequestWrapper.java
index dc4bdd1a51..a3291ae6ff 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/RequestWrapper.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/RequestWrapper.java
@@ -93,10 +93,10 @@ public class RequestWrapper extends HttpServletRequestWrapper {
return len;
}
- @Override
/**
* Needed by Servlet 3.1 No worry this is not used in OFBiz code
*/
+ @Override
public boolean isFinished() {
return false;
}
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMap.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMap.java
index 441b67aed7..c4c075cb60 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMap.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMap.java
@@ -1,4 +1,4 @@
-/*******n***********************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java b/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
index 378b7d5469..d6abc6befe 100644
--- a/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
+++ b/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
@@ -1,5 +1,5 @@
-/*******************************************************************************
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/secret/SecretAuditEvent.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/secret/SecretAuditEvent.java
index ba3b9fca8d..4b48a30178 100644
--- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/secret/SecretAuditEvent.java
+++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/secret/SecretAuditEvent.java
@@ -32,29 +32,30 @@ import java.util.Objects;
* <p><strong>Security invariant:</strong> this record never holds a secret value,
* vault path, or authentication credential. {@code secretKeyRef} is the logical
* key name only (e.g. {@code jdbc-password.default}).</p>
+ *
+ * @param userLoginId Null for scheduler/system jobs that have no login session.
+ * @param clientIpAddress Null for non-HTTP call sites (scheduler jobs, runSync calls).
+ * @param secretKeyRef Logical key name — e.g. {@code jdbc-password.default}. Never a vault path or ARN.
+ * @param secretTarget {@code SYSTEM_PROPERTY | PASSWORDS_FILE | UNKNOWN}
+ * @param action Required. One of the action values defined in the audit taxonomy (Section 4 of the design).
+ * @param accessMode {@code PROVIDER_CALL | CACHE_HIT | FALLBACK_FILE | ENV_VAR | NOT_APPLICABLE}
+ * @param providerType Active provider name at call time — from {@code SecretProviderFactory.getProviderName()}.
+ * @param outcome Required. One of the outcome values defined in the audit taxonomy (Section 4 of the design).
+ * @param errorCategory Null unless {@code outcome=FAILURE}. One of: {@code AUTH_FAILED | NETWORK_TIMEOUT | PROVIDER_ERROR | INVALID_CONFIG}
+ * @param systemResourceId Nullable — populated for SYNC / STORE / ROTATION_POLL events against a SystemProperty row.
+ * @param systemPropertyId Nullable — populated for SYNC / STORE / ROTATION_POLL events against a SystemProperty row.
*/
public record SecretAuditEvent(
- /** Null for scheduler/system jobs that have no login session. */
String userLoginId,
- /** Null for non-HTTP call sites (scheduler jobs, runSync calls). */
String clientIpAddress,
- /** Logical key name — e.g. {@code jdbc-password.default}. Never a vault path or ARN. */
String secretKeyRef,
- /** {@code SYSTEM_PROPERTY | PASSWORDS_FILE | UNKNOWN} */
String secretTarget,
- /** Required. One of the action values defined in the audit taxonomy (Section 4 of the design). */
String action,
- /** {@code PROVIDER_CALL | CACHE_HIT | FALLBACK_FILE | ENV_VAR | NOT_APPLICABLE} */
String accessMode,
- /** Active provider name at call time — from {@code SecretProviderFactory.getProviderName()}. */
String providerType,
- /** Required. One of the outcome values defined in the audit taxonomy (Section 4 of the design). */
String outcome,
- /** Null unless {@code outcome=FAILURE}. One of: {@code AUTH_FAILED | NETWORK_TIMEOUT | PROVIDER_ERROR | INVALID_CONFIG} */
String errorCategory,
- /** Nullable — populated for SYNC / STORE / ROTATION_POLL events against a SystemProperty row. */
String systemResourceId,
- /** Nullable — populated for SYNC / STORE / ROTATION_POLL events against a SystemProperty row. */
String systemPropertyId) {
public static Builder builder() {