defined in the new ControlFilter class.
The old constant defined in ContextFilter will soon be removed together with the
debug field, that is not currently used.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1760949 13f79535-47bb-0310-9956-ffa450edef68
Modified the rdering of import statements, minor changes to remove some
unnecessary dependencies on util classes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1760947 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-7972)
This commit creates a basic plugin API for OFBiz that interoperates
with maven repositories. We are committing this code as "experimental"
to allow contributors to start experimenting with this system easily
as per the discussion on the above JIRA and in ML in the below thread.
This new plugin API is documented in README.md and provides the following
new gradle tasks for managing plugins:
- createPlugin: creates a new plugin based on templates, place it in
the plugins directory and activate it (add to component-load.xml)
- installPlugin: Activate a plugin and run its Install task. Plugin
must exist already in /specialpurpose
- uninstallPlugin: Deactivate a plugin and run its uninstall task
- removePlugin: Uninstall a plugin and then delete it from the filesystem
- pushPlugin: publish a plugin to local maven repository
- pullPlugin: download a plugin with its dependencies (plugins) from
a repository and install them
Discussion: http://markmail.org/message/h7fiicba2rtyl6cb
Thanks: Jacopo Capellato, Michael Brohl, Gil Portenseigne for feedback
and testing
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1760917 13f79535-47bb-0310-9956-ffa450edef68
currently available in the ContextFilter.
At the moment the filter is not used but, once the "controller" logic will be
removed by the ContextFilter, the applications' web.xml files will be updated
to deploy the two filters in a chain:
* ControlFilter will filter and redirect requests
* ContextFilter will set the required objects in the contexts (session and
request) like the delegator, dispatcher etc...
This separation of concerns will make the deplyment more flexible when
additional filters are required.
While the logic in this new filter is functionally mostly the same of that
currently in ContextFilter, this new implementation is more efficient and the
behavior and configuration parameters are clearly discribed.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1760725 13f79535-47bb-0310-9956-ffa450edef68
OFBIZ-8154
FieldDescription. is used in 2 places UtilHelpText.java (widget) WebToolsServices.java
HumanResServices. seems unused and should be removed
.portalPageName. is doubtful to be double checked
ProductShipmentUomAbbreviation_ used in PackOrder.ftl and WeightPackage.ftl
ProductStoreGroup.productStoreGroupName.NA not sure
TemporalExpression_ used in many place: ServiceDemoData.xml, ExpressionUiHelper.java, TempExprMaint.ftl and TemporalExpressions.java
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1760668 13f79535-47bb-0310-9956-ffa450edef68
OFBIZ-8154
Completes a TODO and removes useless tests on label keys replaced by bypass on entire ExampleEntityLabels and ProductPromoUiLabels files, still a WIP
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1760537 13f79535-47bb-0310-9956-ffa450edef68
if it is not set already by the client.
Before this change the filter used to override the character encoding, even if
it was specified in the http request.
Also removed some unused imports and comments.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1760528 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-8231)
When I access url https://localhost:8443/ecommerce/control/viewprofile for my profile, State/Province display in addresses shows the geo-id, which is fine for US entities where the GeoID is the state code, but for non-us entities, the GeoID is often something like CountryCode-StateCode, which isn't very nice.
Thanks: fumiyoshi.to for report and patch
jleroux: I have slightly changed the patch for 2 reasons:
* check for null exceptions
* use not deprecated version of getRelatedOne()
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1760406 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-8224)
This commit removes the support for the Bean Scripting Framework (BSF) from the OFBiz framework:
no application code was using this since several years and there are better and more modern tools at the present time.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1760384 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-8179)
Without functional changes, this design removes a cyclic dependency between the "entity" and "geronimo" components.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1760376 13f79535-47bb-0310-9956-ffa450edef68
OFBIZ-8154
We had 5237 "Not Used Labels". I wondered if they were all real. There is actually a huge bunch of *.description.* labels and alike which are certainly used, notably automatically by the widget dropdowns.
This commit removes them from the "Only Not Used Labels" result. Net result: from 5237 to decent 2188 "Not Used Labels", this begins to be useful...
It only begins because I removed from the "Not Used Labels" a number of other cases similar to the obvious *.description.* labels. those are
.transitionName.
.partyRelationshipName.
.geoName.
.categoryName.
.ProductPromoCondition..
.ProductPromoOperatorEquality..
.Example. // TODO check all is used here
But a number of others need to be verified, at least:
FormFieldTitle_???
FieldDescription.ProductStore.???
FieldDescription.ProdCatalog.???
HumanResServices.???
.portalPageName.???
ProductShipmentUomAbbreviation_???
ProductStoreGroup.productStoreGroupName._NA_???
TemporalExpression_???
Also to look at:
FormFieldTitle_timesheetPartyId x2
Labels after WorkEffortWorkEffortIdEmpty
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1760139 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-8118)(OFBIZ-8122)(OFBIZ-8123)(OFBIZ-8124)(OFBIZ-8125)(OFBIZ-8126)(OFBIZ-8127)(OFBIZ-8128)(OFBIZ-8129)
Menu names should be in camel case to maintain consistency. I've slightly modified the provided patch to eliminate names with "-" or all lower case also.
Thanks: Tanmay Muley for reporting and providing the patches.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1760059 13f79535-47bb-0310-9956-ffa450edef68
OFBIZ-8153
There are over 60 labels used in groovy files. These don't get reflected in the counts of the label manager and in the search for labels not used.
Thanks to Pierre Smits for report
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1759941 13f79535-47bb-0310-9956-ffa450edef68
By manipulating the UL parameter externalLoginKey it is possible to pass valid Freemarker directives to the Template Engine that are reflected on the webpage
With Freemarker it is possible to create and use Java classes that implement the TemplateModel, including the freemarker.template.utility.Execute class
An attacker can pass arbitary commands via this class, which are executed on the server.
This fixes it using 2 redundant mechanisms (better safe than sorry):
1) linkUrl = URLEncoder.encode(linkUrl, "UTF-8");
2) sr.append("\" linkUrl=r\"");
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1759555 13f79535-47bb-0310-9956-ffa450edef68
Simply replaces the parenthesis in ServiceUtil.getResource() by 2 spaces when parsing files with getLabelsFromJavaFiles() and getLabelsFromFtlFiles().
ServiceUtil.getResource() breaks the parsing
Note: no occurrences of ServiceUtil.getResource() yet in FTL files, and only 16 in Java files.
Also replaces "script" by "minilang" in getLabelsFromSimpleMethodFiles()
This adds a getResourceRegex in a new webtools.properties files. This property
* Allow to remove this string from files when parsing with Label Manager, else it breaks
* Moreover the string can't be in the LabelReferences.java file, to avoid side effects
I have also increased the transaction-timeout of the screen "SearchLabels" to 600.
Because when using the "Only Not Used Labels" option the 1st pass can be long. 10 min should plenty enough, even on old machines. Not blocking anyway, just a bad stack trace in log
I'm sorry you will see a lot of false changes because the LabelManagerScreens.xml had no svn:properties at all, here they are now.
We have 5237 "Not Used Labels". I wondered if they were all real, I just checked some an indeed, they were not used.
But there are also a huge bunch of *.description.* labels which certainly make sense. I'll remove them from the "Only Not Used Labels" result in another Jira I'll create
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1759457 13f79535-47bb-0310-9956-ffa450edef68
When I choose Japan in new customer screen, no states/province exists occurred, and I cannot register as a customer through ecommerce.
It is because of no data exist for Japan in CountryAddressFormat[GeoData.xml].
jleroux: I'm not sure it's really a bug, but anyway committing this is a good thing
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1759378 13f79535-47bb-0310-9956-ffa450edef68
* introduced a constant for the "control" mount point
* moved public fields and methods from the ContentUrlFilter to the OfbizContentAltUrlTransforms and made them private (since they are only used by this class)
* no more need for the UrlServletHelper to extend the ContextFilter
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1759368 13f79535-47bb-0310-9956-ffa450edef68
* removed an unused filter (UrlRegexpContextFilter)
* moved a series of methods from ContextFilter to WebAppUtil, where they make more sense; changed one of them to be a static method
* made private some methods of ContextFilter and WebAppUtil because they were not used outside of their classes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1759332 13f79535-47bb-0310-9956-ffa450edef68
No functional changes, simply use the try-with-resources statement everywhere it's possible, mostly to clean the finally statements and have consistent code
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1759088 13f79535-47bb-0310-9956-ffa450edef68
Hopefully, now that Gradle provides the tools to build effective unit tests (thanks to the great work by Taher), the test coverage of the framework will improve: contributions are welcome!
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1759071 13f79535-47bb-0310-9956-ffa450edef68
=====================================
Add UI labels for success / error messages in service component
=====================================
Thanks Tanmay for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1759068 13f79535-47bb-0310-9956-ffa450edef68
=====================================
Add UI labels for success / error messages in common component
=====================================
Thanks Tanmay for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1759061 13f79535-47bb-0310-9956-ffa450edef68
=================================
No need to show "---" after selecting any option from drop-down in Find Screens.
=================================
Thanks Renuka for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1759018 13f79535-47bb-0310-9956-ffa450edef68
At r1758927 I tried to fixe a bunch of closes missing, reported as warnings in Eclipse
Jacopo noticed and reported on dev ML http://markmail.org/message/b4hvzi7foftfq3j5 2 possible issues:
1) you are adding a close statement to code that already had the close statement in the "finally" block; your modification actually introduces a code pattern that is not correct (if an exception is thrown your close statement are not executed)
2) I suspect that you are closing the socket connection too early in PcChargeApi
1)The best option when closing resources (which implement AutoCloseable) is actually to use the try-with-resources statement. At least when there are no performance issues.
I have fixed the issue (only in DatabaseUtil.java) this way because
* there are not performance issues, we anyway create a Statement in both cases, we don't reuse one.
* The finally part is cleaner
I have also used the try-with-resources statement in other places where it fitted.
There is only 1 place where I was undecided: ScriptUtil.parseScript() which uses GroovyUtil.parseClass().
I put only a logError() there and returned null.
I did not throw an IOException because else it spreads everywhere in FlexibleStringExpander.
Here introducing Optional would be better, but I have no time or that today.
2) was not a problem
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758951 13f79535-47bb-0310-9956-ffa450edef68
Fixes a bunch of small leaks (closes missing, only warnings in Eclipse)
By-product: automatically sort few imports
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758927 13f79535-47bb-0310-9956-ffa450edef68
There are forms in the ecommerce component referencing the status. This issue is about applying the CommonLabel label where it is possible in these forms.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758774 13f79535-47bb-0310-9956-ffa450edef68
1) Removed 'maincss.css' entry from 'allowedPaths' param of from web.xml
Reason: Since, there is no file like 'maincss.css' exist under any includes directory.
2) Removed the unused references of maincss.css from FTLs, code
<link rel="stylesheet" href="${StringUtil.wrapString(baseUrl!)}/images/maincss.css" type="text/css"/>
has been removed.
Reason: This is an interesting thing, these FTLs were using the maincss.css located under the images directory.
When I look the history of these files, following were my findings,
The 'maincss.css' file under the 'images' directory exist in release4.0
http://svn.apache.org/repos/asf/ofbiz/branches/release4.0/framework/images/webapp/images/
after this release, this files no longer exist there.
3) Also, I have updated one file 'InventoryNoticeEmail.ftl' and used the basic HTML code to style, instead of using style defined in 'maincss.css' which were exist in release-4.0
4) Updated some references from 'maincss.css' to style.css in comments.
5) Also removed the entry of including '/images/maincss.css' and '/images/mainrtl.css' in SimpleDecorator
Since, these files no longer exist after release-4.0.
Thanks Wai for reviewing the work and thanks Swapnil M Mane for the contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758389 13f79535-47bb-0310-9956-ffa450edef68