plugins
================================================================================
While checking there were no other cases like in OFBIZ-9432
(missing path to class), to be consistent I removed the trailing semicolons in
groovy scripts and made few formatting
================================================================================
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1800450 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-9385)
This is an improvement only because no cases were reported. But obviously in
case of unlucky exception after the EntityListIterator creation and before it's
closed the EntityListIterator remains in memory.
It should be closed in EntityListIterator.finalize() but the less happens there
the better.
The solution is to use try-with-ressources
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1797073 13f79535-47bb-0310-9956-ffa450edef68
with "id", "id-long" and "id-vlong" respectively which are primary keys for plugin components.
(OFBIZ-9351)
Thanks Aditya Sharma for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1796380 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-9167)
-go to https://localhost:8443/ordermgr/control/orderentry
-create order for DemoCustomer
-add an item
console output...
java.lang.NullPointerException
at org.apache.ofbiz.content.content.ContentWorker.
renderContentAsText(ContentWorker.java:368) ~[ofbiz.jar:?]
[...]
While at it I also found issues with cartLine.getName() in ftl files. It was
also missing the dispatcher.
This was broken by OFBIZ-9164
Thanks: Wai
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/plugins@1778889 13f79535-47bb-0310-9956-ffa450edef68
new ControlFilter, from the ContextFilter; modified existing applications to use
the two filters in a chain; removed from the other specialized filters all the
logic that was duplicated or extended from ContextFilter.
A web application, in order to leverage the OFBiz framework, requires that a
series of objects are in its contexts (servlet context, session and request)
such as "delegator", "delegatorName", "dispatcher", "security" etc. etc...
This setup is performed by the logic contained in the servlet filter implemented
by the ContextFilter class.
The execution of this logic is required for the application to run properly.
However, before this commit, in the ContextFilter there was other logic, related
to access control and redirection rules (some of them performed in coordination
with the ControlServlet), making it difficult to deploy this filter in all the
web applications, especially the ones that implement special handling of paths.
In fact, this filter was deployed in most but not all the web application in the
OFBiz codebase: specifically it was not deployed in web applications that
require the execution of other filters (e.g. CatalogUrlFilter, etc...) like the
ones in the "ecommerce" and "solr" components.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761304 13f79535-47bb-0310-9956-ffa450edef68
Notes:
* Also removes empty framework/base/lib/scripting and useless applications\content\lib\uno\README (miss doc in wiki)
* When jpim-0.1.jar will be (hopefully) replaced we can drop lib ref in framework/base/ofbiz-component.xml
* I wonder if we should let the geronimo component alone with only 2 classes, could we not put that in entity or entityext?
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1755306 13f79535-47bb-0310-9956-ffa450edef68
This is the first of two steps in the above mentioned JIRA. This
first step changes the java source directory for every component
from /src to /src/main/java. The next step will be adding unit
tests to every component in /src/test/java
Thank you to Deepak Dixit for tips on how to use the SVN commands
to make the appropriate file moving.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1752838 13f79535-47bb-0310-9956-ffa450edef68
This is the first patch that takes OFBiz to the point of no return
in terms of switching from Ant to Gradle build system. Specifically
this patch applies the following items:
- Delete all old Ant and Maven build scripts
- Delete 169 Jar libraries and replace them with remote ones in the
gradle build script
- update the gradle build scripts for the dependencies and other minor
changes needed for the script work correctly
All tests pass with the command ./gradlew cleanAll loadDefault testIntegration
Again, thank you for everyone who contributed valueble time and effort in this
process.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1752033 13f79535-47bb-0310-9956-ffa450edef68
I have uploaded a patch for the simple methods schema.
In general, the top level attributes are converted to simpleType, and attributeGroups to complexType.
Changed the following attribute name
1. ‘field’ to ‘fieldType’
2. ‘level’ to ‘levelType'
Denormalize the following attributeGroups
1. attlist.compare
2. attlist.compare-field
Left attributeGroup ‘typeDefaultString’ unchanged, cos it doesn’t matter. Not in use, it seem.
jleroux: we also fixed an issue with
<xs:element name="field" type="fieldType"/>
to
<xs:element ref="field"/>
In the patch
And I found a small issue (not minilang related) in ExampleCompoundWidgets.xml
- <sm:log message="CompoundWidgetsFunc runs" sm:level="info"/>
+ <sm:log message="CompoundWidgetsFunc runs" level="info"/>
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1750647 13f79535-47bb-0310-9956-ffa450edef68
Reverts the simple method to use the original schema without namespace. "Duplicates" simple-methods.xsd in simple-methods-ns.xsd as we did, to get the simple-method namespace for compound-widgets.
For myself: when we will do the 3rd more elegant option (no schema duplication), have been changed also:
minilang-catalog.xml
compound-widgets.xsd
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1749938 13f79535-47bb-0310-9956-ffa450edef68
I removed duplicate paths were componentname was uselessly repeated after component://componentname/script/org/ofbiz (projectmngr was the only one using there project instead)
I had few typos, easily fixed thanks to the tests. There could be still typos but they are unexpected and anyway no-brainer to fix
I'm still wondering about specialpurpose/example/minilang/README.txt.
I changed its content to
"The minilang directory is for static resources that are interpreted at run time rather than being compiled. This goes on the classpath, but does not get built or put into a JAR file."
not sure it makes any sense, I don't see how this relates to the classpath.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1747712 13f79535-47bb-0310-9956-ffa450edef68
I found missing UiLabels for shortcuts in webpos in trunk and Release 14.12, it was committed in Release 15.12 at -r1729098. I think you somehow missed to commit it in trunk and Release 14.12. Please have a look on patches attached and commit it in their respective branches.
jleroux:
I was curious about that so I checked and it's "a bit" more complicated. This is related with OFBIZ-6226 where Mridul Pathak committed in
Trunk - r1720910
14.12 - r1720916
12.04 - r1720930
But there was duplicated labels so I partially reverted (only the duplicated labels) at
Trunk - r1726529
14.12 - r1726539
12.04 - r1726540
Later I noticed r1720910 was committed in Trunk before R15.12 creation, so I reverted there also at revision: 1729098, but not partially hence the inconsistency. But actually I should have reverted all everywhere!
Remains that Mridul and Suraj were somewhere right. Like them I don't like the names of the labels, I believe that (eg) WebPosCheckout is far better than WebPosShortcutF7. So they were partiallly wrong at OFBIZ-6226, they duplicated labels but the names would be better if they were not refering to keyboard keys numbers...
I did not take care of R12.04
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1746283 13f79535-47bb-0310-9956-ffa450edef68
WebPos login page getting error "FileNotFoundException" at latest trunk. Here is the error:
Error rendering included template at location [component://webpos/template/Login.ftl]: java.io.FileNotFoundException:
This issue is due to the change done in r1736869. "Login.ftl" was not moved but its reference was changed in "specialpurpose/webpos/widget/CommonScreens.xml ". I found one more file which was not moved "RequirePasswordChange.ftl".
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1739427 13f79535-47bb-0310-9956-ffa450edef68
r1736866 for OFBIZ-6816 (humanres)
r1736867 for OFBIZ-6817 (manufacturing)
r1736868 for OFBIZ-6819 (order)
r1736869 for OFBIZ-6837 (webpos)
r1736870 for OFBIZ-6860 (myportal)
r1736876 for OFBIZ-6812 (project)
Partially because I did not revert the changes in screens files and I already restored the *.ftl files (+ ShowProductionRun.groovy) deleted in r1736867 in their initial locations.
I noticed there is another groovy file: OrderReportPrepare.groovy. It's not used OOTB (events in relation with JasperReport commented out in order controller)
Both groovy files will need to be moved to a right location before we move groovy files also.
They might not be the only ones in this case (wrong initial locations)...
Actually I did not review these patches enough when I committed them.
Apart r1736867 (manufacturing), the ftl files were not moved but simply copied from their initial locations to the templates components sub-folders.
In r1736867 the files were not moved but deleted and copied (this maybe a patch effect, not sure we can move files using patches, I'll try)
images
So this simply deletes the templates components sub-folders and their contents
I'll soon properly move the file, in the meantime the trunk will be in an inconsistent state (because of the the changes in screens files not reverted).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1737557 13f79535-47bb-0310-9956-ffa450edef68
Also renames simple-methods-v2.xsd in simple-methods.xsd and replaces simple-methods-v2.xsd references by simple-methods.xsd references everywhere it's needed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1737087 13f79535-47bb-0310-9956-ffa450edef68
Note that in supported releases it's hard to exploit, it's a Stored XSS https://www.owasp.org/index.php/Types_of_Cross-Site_Scripting which means you need 1st to somehow inject exploiting code in the DB.
This fixes it by changing the ContentWrapper interface
from
public interface ContentWrapper {
public StringUtil.StringWrapper get(String contentTypeId);
}
to
public interface ContentWrapper {
public StringUtil.StringWrapper get(String contentTypeId, String encoderType) {
}
And changing the Category, Party, Product, ProductPromo and WorkEffort ContentWrapperS accordingly. This means to use 2 types of encoderTypes: "html" and "url".
The "html" encoderType will be used for all ProductContentTypes but those who contain URL in their ContentTypeIdS (actually end with, "_URL") which will use "url" encoderType.
It concerns not only the get() method but also methods like getPartyContentAsText(), getProductContentAsText(), etc.
It seems a big change but it's straightforward. It's normally complete.
There are some (unrelated) tabs replaced by spaces here and there, and few trailing spaces removed but nothing big
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1705329 13f79535-47bb-0310-9956-ffa450edef68