Commit Graph
1896 Commits
Author SHA1 Message Date
Ashish Vijaywargiya da3b8a406f Improved: Clean up commented out code in Java source for Base component.
(OFBIZ-8036)
Thanks: Harsh for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761200 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 11:38:35 +00:00
Jacopo Cappellato a171b3ace6 Improved: non functional minor changes to the StringUtil.split(String, String)
method (mostly formatting and unnecessary initialization and type declarations)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1760948 13f79535-47bb-0310-9956-ffa450edef68
2016-09-15 15:25:50 +00:00
Jacopo Cappellato a9835e4825 Improved: Removal of support for the Bean Scripting Framework (BSF).
(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
2016-09-12 14:53:47 +00:00
Jacopo Cappellato 34339a976b Improved: Migrated unit tests for UtilCodec defined in the old "integration test" group to the new class that contains actual unit tests for the UtilCodec class.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1760047 13f79535-47bb-0310-9956-ffa450edef68
2016-09-09 15:54:01 +00:00
Jacopo Cappellato 2621cbc031 A couple of unit tests for the UtilCodec class.
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
2016-09-03 10:41:04 +00:00
Jacques Le Roux 38e9885d3d Fixes "a bunch of small leaks (closes missing, reported as warnings in Eclipse)" - https://issues.apache.org/jira/browse/OFBIZ-8115
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
2016-09-02 13:18:35 +00:00
Jacques Le Roux 8bf34869da Reverts r1758927 to check issues reported by Jacopo on dev ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758935 13f79535-47bb-0310-9956-ffa450edef68
2016-09-02 10:47:30 +00:00
Jacques Le Roux 6636d4ae01 Fixes "a bunch of small leaks (closes missing, reported as warnings in Eclipse)" - https://issues.apache.org/jira/browse/OFBIZ-8115
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
2016-09-02 10:07:31 +00:00
Arun Patidar 0632c9c17c Applied patch from jira issue - OFBIZ-7983 - Enforce noninstantiability to JNDIConfigUtil class. Thanks Rishi Solanki and Rohit Koushal for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1757989 13f79535-47bb-0310-9956-ffa450edef68
2016-08-27 11:05:48 +00:00
Jacques Le Roux 0f3463ac46 After r1756949, remove the base/lib and its reference in base ofbiz-component.xml
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1756984 13f79535-47bb-0310-9956-ffa450edef68
2016-08-20 05:56:41 +00:00
Nicolas Malin 747234bda3 With the suppression of all jar to download them form jcenter, the jpim.jar isn't present.
To resolve this issue we can convert the current use for import/export vcard by an other api ez-vcard (https://github.com/mangstadt/ez-vcard) under bsd licence and present on jcenter.

The refactoring raise some problem on existant code, we will try with Gil to improve the import/export to grow data conversion to functional framework.
Some improve on import :
 * check if more than one email is present before check the prefered else take the one
 * check if more than one phone is present before check the prefered else take the one
 * check if more than one address is present before check the prefered else take the one
 * When you load a party by vcard, initialize a reference by fn attribute on PartyIndentification to escape the second loading
Will need continue improve the import like correct Organization loading, update process, add service to detect already party present
I also improve the screen result to display all parties loaded by the import and all already present.
The solution isn't perfect but it's work and compile, first purpose to delete jpim.jar is done :)
Related issue OFBIZ-7961


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1756949 13f79535-47bb-0310-9956-ffa450edef68
2016-08-19 17:33:15 +00:00
Arun Patidar fe33f59f6e Applied patch from jira issue - OFBIZ-7811 - Enforce noninstantiability to FreeMarkerWorker class. Thanks Amit Gadaley and Rishi Solanki for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1755358 13f79535-47bb-0310-9956-ffa450edef68
2016-08-05 15:53:20 +00:00
Arun Patidar 3e170d76f5 Applied patch from jira issue - OFBIZ-7810 - Enforce noninstantiability to UelUtil class. Thanks Rohit Koushal and Rishi Solanki for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1755348 13f79535-47bb-0310-9956-ffa450edef68
2016-08-05 15:38:00 +00:00
Arun Patidar 75d23697c3 Applied patch from jira issue - OFBIZ-7809 - Enforce noninstantiability to UtilXml class. Thanks Chinmay Patidar and Rishi Solanki for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1755346 13f79535-47bb-0310-9956-ffa450edef68
2016-08-05 15:19:25 +00:00
Jacques Le Roux ef7996c983 Fixes "Remove warnings regarding missing component lib folders" - https://issues.apache.org/jira/browse/OFBIZ-7776 - by cleaning/clearing the references to non existent/empty dirs.
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@1755306 13f79535-47bb-0310-9956-ffa450edef68
2016-08-05 12:27:21 +00:00
Nicolas Malin 184d60206a Currently we have two methods for display log in OFBiz throught webtools :
* https://localhost:8443/webtools/control/LogView
* https://localhost:8443/webtools/control/FetchLogs
Each method use the same line rendering and the difference is : LogView display only runtime/logs/ofbiz.log (or you can surcharge it vith debug.properties) and FecthLogs list all file name ofbiz* present on runtime/logs/ofbiz.log and offert the possibility to search only line that macth a string.

I review the code to use only one script (remove LogView.groovy) and improve following points :
* Optimise the FetchLog.groovy to display with same velocity a file with or without string chain filtering
* Add a property to change the root log directory. Under linux we use /var/log/ofbiz/
* Add a regExp to match the file name of file present in the directory. Helpful when you want to see error.log
* Complete debug.properties with comment for describe example for new properties

And last point, add refresh button on the end page to reload the log without lost your state on the page.
Related issue OFBIZ-7944

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1755302 13f79535-47bb-0310-9956-ffa450edef68
2016-08-05 12:05:48 +00:00
Arun Patidar 1b4958e349 Applied patch from jira issue - OFBIZ-7807 - Enforce noninstantiability to UtilValidate class. Thanks Rahul Singh Kushwah and Rishi Solanki for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1754940 13f79535-47bb-0310-9956-ffa450edef68
2016-08-02 14:40:49 +00:00
Arun Patidar a5d0685903 Applied patch from jira issue - OFBIZ-7806 - Enforce noninstantiability to UtilProperties class. Thanks Aman Mishra and Rishi Solanki for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1754938 13f79535-47bb-0310-9956-ffa450edef68
2016-08-02 14:31:39 +00:00
Arun Patidar 7a0a1dcb79 Applied patch from jira issue - OFBIZ-7803 - Enforce noninstantiability to UtilMisc class. Thanks Rohit Koushal and Rishi Solanki for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1754937 13f79535-47bb-0310-9956-ffa450edef68
2016-08-02 14:26:33 +00:00
Jacques Le Roux f0e942d68d After removing the POS at r1754402 for OFBIZ-7804, I reviewed Taher's patch attached at OFBIZ-7924 "Remove old and deprecated OFBiz server commands" and noticed I forgot to remove the splash classes in base, doing it here.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1754433 13f79535-47bb-0310-9956-ffa450edef68
2016-07-28 16:56:55 +00:00
Jacques Le Roux 7ada24fd04 This removes the pos component. OFBIZ-7804 "Check if we should fix or remove the POS (hence WebPos?)"
Most is done already. Test pass but testFopMacroLibrary but I don't see how it could be related to these changes, could be a quirk on Windows, BuilBot will tell us. Anyway, I will later double-check to be sure, also to see if I did not miss anything else.

I have voluntarily left 2 or 3 moot points
I was unable to remove possible POS references in <property key="FieldDescription.ProductStore.isImmediatelyFulfilled"> for certain language I'm unable to read.
I have to check if we should keep or not this code snippet
                <!-- if inventory info is not available for all of the products, then don't do the issuance, ie there has to be at least SOME inventory info in the database to facilitate inventory-less POS terminals -->
                <entity-count entity-name="InventoryItem" count-field="iiCount">
                    <condition-expr field-name="facilityId" operator="equals" from-field="orderHeader.originFacilityId"/>
                </entity-count>
I simply commented out twice this snippet in InvoiceServices.java, because I wonder if it would not be useful when the webPos will be able to issue money change
//                if (null == adj.get("amount")) { // JLR 17/4/7 : fix a bug coming from POS in case of use of a discount (on item(s) or sale, sale here) and a cash amount higher than total (hence issuing change)
//                    continue;
//                }

While at it, since I modified OPTIONAL_LIBRARIES, I also changed these svn:properties: svn:eol-style = native & svn:mime-type = text/plain


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1754402 13f79535-47bb-0310-9956-ffa450edef68
2016-07-28 12:27:20 +00:00
Deepak Dixit f6ea4def32 (OFBIZ-6274) Change it loger level from info to all for org.apache.ofbiz, as all is top level logging level so if we turn on verbose/timing logging then it will working fine. As currently it set to info so timing/verbose log was not printed.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1753168 13f79535-47bb-0310-9956-ffa450edef68
2016-07-18 08:18:48 +00:00
Jacques Le Roux 84485f2a8e Fixes an issue in the log where only warning were shown. Related with <<Rename OFBiz artifacts from 'org.ofbiz.*' to org.apache.ofbiz.*'>> - https://issues.apache.org/jira/browse/OFBIZ-6274
We had already the org.apache logger. IIRW, it's because we use Apache libs (eg Tomcat) and we want to be warned when issues appear at this level. 
By adding the org.apache.ofbiz info logger we should keep warnings a the org.apache level and get info at the org.apache.ofbiz level

I'm though unsure why we needed 
<logger name="org.apache.ofbiz.base.converter.Converters" level="warn"/>
which seems contradictory. I Googled for an explanation but I'm still short of it. I'll check with http://logging.apache.org/log4j/2.x/manual/configuration.html.

For now it works, so I apply the patch because it's already a relief and will help to resolve the harder problem of instable tests results.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1753029 13f79535-47bb-0310-9956-ffa450edef68
2016-07-17 08:37:19 +00:00
Deepak Dixit 834691742b (OFBIZ-6274) Renamed OFBiz artefacts from org.ofbiz.* to org.apache.ofbiz.*.Thanks to Taher for working on it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752920 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 10:30:49 +00:00
Taher A. Alkhateeb b37ef2d280 Migrate ALL java files from /src to /src/main/java - OFBIZ-7790
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@1752838 13f79535-47bb-0310-9956-ffa450edef68
2016-07-15 14:17:14 +00:00
Gil Portenseigne 3130f0eb95 OFBIZ-7763 :
Remove all bsh libraries and bsh remaining fonctionnalities.
Bsh interpreter is replaced by GroovyShell evaluation.

To avoid groovyShell undefined var exception, the evaluated expression is analysed, detecting variables used and setting its to null if undefined in context.
Today only alphabetic variable with '_' are detected (i.e. my_variable==null).
Add in example a test replacement of &quot; syntax to simple quote.
Remove all found bsh references

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752231 13f79535-47bb-0310-9956-ffa450edef68
2016-07-11 23:04:54 +00:00
Jacques Le Roux 2dbfbea9f9 Temporarily comments because the "high-ascii" test is failing on BuildBot (only) when switching to Gradle
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752043 13f79535-47bb-0310-9956-ffa450edef68
2016-07-09 19:56:35 +00:00
Taher A. Alkhateeb 4d2b415a91 Another major patch for OFBIZ-7534 replacing Ant with Gradle
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@1752033 13f79535-47bb-0310-9956-ffa450edef68
2016-07-09 18:10:19 +00:00
Jacopo Cappellato 6d3f6d1ceb Removed two unused jars.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751951 13f79535-47bb-0310-9956-ffa450edef68
2016-07-08 18:05:44 +00:00
Jacopo Cappellato 539084a511 OFBIZ-7763 Removed a series of artifacts dependent on the old Beanshell jar that is going to be removed from the project; specifically:
* removed the code that implemented the deprecated "call-bsh" operation in Minilang
* removed the BeanShellContainer (it has been disabled a long time ago)
* removed the BeanShell service engine, no more used


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751947 13f79535-47bb-0310-9956-ffa450edef68
2016-07-08 17:53:59 +00:00
Jacopo Cappellato e0da901504 OFBIZ-7760 Removed from UtilCache the ability to persist entries in the file system.
This feature has been contributed a long time ago as an experimental feature but never really matured into a production ready artifact: since it was contributed, no users asked about how to use it, or tested it, or reported bugs or enhancement requests.
More importantly, the feature has always been disabled in the OFBiz framework (i.e. the widget code and the entity engine code were not using it).
This removal should not impact our user base; however, after the removal, an entry to the Attic will be created to keep track of it and to make it easier, to interested users, to get this code, improve it (e.g. by making it dependent on a live external jar, for example MapDB instead of JDBM) and possibly contribute it back to the project.
The most compelling reason for its removal is that the feature was based on a snapshot, unreleased version of JDBM, which is now a mostly dead project: for licensing reasons we are no more allowed to bundle jars in our releases. Additionally, having code that relies an old jar from a no more active project represents a maintenance issue for the community.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751817 13f79535-47bb-0310-9956-ffa450edef68
2016-07-07 17:00:05 +00:00
Arun Patidar 64b8f07724 Applied patch from jira issue - OFBIZ-7541 - Enforce noninstantiability to KeyStoreUtil class. Thanks Rishi Solanki and Pratik Kulshreshth for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751322 13f79535-47bb-0310-9956-ffa450edef68
2016-07-04 15:44:12 +00:00
Arun Patidar 19e96ab827 Applied patch from jira issue - OFBIZ-7593 - Enforce noninstantiability to UtilNumber class. Thanks Rishi Solanki and Rohit Koushal for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751307 13f79535-47bb-0310-9956-ffa450edef68
2016-07-04 15:19:07 +00:00
Arun Patidar 54a13d732f Applied patch from jira issue - OFBIZ-7600 - Enforce noninstantiability to UtilPlist class. Thanks Rishi Solanki for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751304 13f79535-47bb-0310-9956-ffa450edef68
2016-07-04 14:57:02 +00:00
Arun Patidar 96eb92df15 Applied patch from jira issue - OFBIZ-7590 - Enforce noninstantiability to UtilIO class. Thanks Rohit Koushal for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751300 13f79535-47bb-0310-9956-ffa450edef68
2016-07-04 14:51:45 +00:00
Arun Patidar e7f41ad116 Applied patch from jira issue - OFBIZ-7551 - Enforce noninstantiability to SSLUtil class. Thanks Rishi solanki and Rohit Koushal for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751040 13f79535-47bb-0310-9956-ffa450edef68
2016-07-02 08:50:31 +00:00
Arun Patidar f3ce2f02ec Applied patch from jira issue - OFBIZ-7562 - Enforce noninstantiability to UtilDateTime class. Thanks Rishi Solanki and Rohit Koushal for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751028 13f79535-47bb-0310-9956-ffa450edef68
2016-07-02 06:16:52 +00:00
Arun Patidar 542db954a5 Applied patch from jira issue - OFBIZ-7588 - Enforce noninstantiability to UtilGenerics class. Thanks Rishi Solanki and Rohit Koushal for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751027 13f79535-47bb-0310-9956-ffa450edef68
2016-07-02 06:06:43 +00:00
Arun Patidar bd0472e263 Applied patch from jira issue - OFBIZ-7589 - Enforce noninstantiability to UtilHttp class. Thanks Rishi Solanki and Rohit Koushal for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751026 13f79535-47bb-0310-9956-ffa450edef68
2016-07-02 05:56:47 +00:00
Arun Patidar 63308fd046 Applied patch from jira issue - OFBIZ-7601 - Enforce noninstantiability to UtilURL class. Thanks Rishi Solanki and Rohit Koushal for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751025 13f79535-47bb-0310-9956-ffa450edef68
2016-07-02 05:46:56 +00:00
Arun Patidar 3fb5c91e11 Applied patch from jira issue - OFBIZ-7591 - Enforce noninstantiability to UtilJavaParse class. Thanks Rishi Solanki and Rohit Koushal for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1750969 13f79535-47bb-0310-9956-ffa450edef68
2016-07-01 15:53:19 +00:00
Arun Patidar 76df6b013f Applied patch from jira issue - OFBIZ-7587 - Enforce noninstantiability to UtilFormatOut class. Thanks Rishi Solanki and Rohit Koushal for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1750968 13f79535-47bb-0310-9956-ffa450edef68
2016-07-01 15:47:16 +00:00
Arun Patidar 593f996d60 Applied patch from jira issue - OFBIZ-7540 - Enforce noninstantiability to FileUtil class. Thanks Rishi Solanki and Rohit Koushal for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1750663 13f79535-47bb-0310-9956-ffa450edef68
2016-06-29 15:20:09 +00:00
Arun Patidar 7f6a53c91f Applied patch from jira issue - OFBIZ-7479 - Enforce noninstantiability to BshUtil class. Thanks Rishi Solanki and Rahul Singh for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1750662 13f79535-47bb-0310-9956-ffa450edef68
2016-06-29 15:16:20 +00:00
Jacques Le Roux b43b62bef2 Updates Shiro to 1.2.5 (CVE-2016-4437) - https://issues.apache.org/jira/browse/OFBIZ-7373
Apache Shiro before 1.2.5, when a cipher key has not been configured for the "remember me" feature, allows remote attackers to execute arbitrary code or bypass intended access restrictions via an unspecified request parameter.

Details at https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-4437

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749220 13f79535-47bb-0310-9956-ffa450edef68
2016-06-19 22:30:06 +00:00
Jacques Le Roux 27b736e3ed No functional changes. While reviewing Wai's patch for OFBIZ-7112 I noticed that he (re)used this pattern introduced earlier:
(resource == null || resource.length() <= 0)
From Java spec. a String, Collection, Map or CharSequence can't have a negative length, so the pattern above can be reduced to 
  (resource == null || resource.length() == 0)
which can be replaced using 
  UtilValidate.isEmpty()
I checked, there are several other occurrences of this pattern (some very old, I guess most were routinely copied from an initial occurrence). I decided to replace all of them, here they are.

I did that already long ago for the 
  (resource == null || resource.length() == 0)
pattern. It remains 4 of them. Three are justified (because of the dependency on base component or because using isEmpty() on Object is disputable for performance reasons). I took care of the remaining one right aways (in SplashScreen.java)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747976 13f79535-47bb-0310-9956-ffa450edef68
2016-06-12 10:43:58 +00:00
Jacques Le Roux 0029608c28 This has slipped in inadvertently in a previous commit, removes!
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747783 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 19:25:25 +00:00
Jacques Le Roux ec66e361e1 A big but straightforward commit for "Move minilang scripts from component://componentname/script/org/ofbiz to component://componentname/minilang" - https://issues.apache.org/jira/browse/OFBIZ-7267
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@1747712 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 14:04:30 +00:00
Jacques Le Roux 3aadf4e8da A slightly modified patch from James Yong for "Autocompletion for Compound Widget" https://issues.apache.org/jira/browse/OFBIZ-7061
1. The following xsd are duplicated to use namespaces
  site-conf.xsd     ->  site-conf-ns.xsd
  widget-form.xsd   ->  widget-form-ns.xsd
  widget-screen.xsd ->  widget-screen-ns.xsd
  widget-menu.xsd   ->  widget-menu-ns.xsd
  simple-methods.xsd->  simple-methods-ns.xsd
For example, in site-conf-ns.xsd, we have the following document level attribute
  <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://ofbiz.apache.org/Site-Conf" targetNamespace="http://ofbiz.apache.org/Site-Conf">
instead of 
  <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">

2. The above schema are used into compound-widgets.xsd so that compound widgets use only one consolidated schema. 

3. Update ExampleCompoundWidgets.xml to use the new compound-widgets.xsd. For example
<compound-widgets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:sc="http://ofbiz.apache.org/Site-Conf"
        xmlns:sm="http://ofbiz.apache.org/Simple-Method"
        xmlns:wf="http://ofbiz.apache.org/Widget-Form"
        xmlns:wt="http://ofbiz.apache.org/Widget-Tree"
        xmlns:wm="http://ofbiz.apache.org/Widget-Menu"
        xmlns:ws="http://ofbiz.apache.org/Widget-Screen"
        xsi:noNamespaceSchemaLocation="../../../../framework/widget/dtd/compound-widgets.xsd">
    
    <sc:site-conf>
        <sc:request-map uri="CompoundWidgets1">
            <sc:security https="true" auth="true"/>
            <sc:event type="simple" invoke="CompoundWidgetsFunc" path="component://example/widget/example/ExampleCompoundWidgets.xml"/>
            <sc:response name="success" type="view" value="CompoundWidgets1"/>
        </sc:request-map>
        <sc:request-map uri="CompoundWidgets2"><sc:security https="true" auth="true"/><sc:response name="success" type="view" value="CompoundWidgets2"/></sc:request-map>

        <sc:view-map name="CompoundWidgets1" type="screen" page="component://example/widget/example/ExampleCompoundWidgets.xml#CompoundWidgets1"/>
        <sc:view-map name="CompoundWidgets2" type="screen" page="component://example/widget/example/ExampleCompoundWidgets.xml#CompoundWidgets2"/>
    </sc:site-conf>
...... the rest

4. Change java code to support reading xml with namespace (i.e. xml for compound widgets)

jleroux: I simply replaced tabs by spaces in Java files and removed this commented out line 
  <compound-widgets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/compound-widgets.xsd">
in ExampleCompoundWidgets.xml

We decided to duplicate the simple-methods.xsd rather than updating all concerned files. Else we would have to update the attributes at document level for rest of the controllers, menus, forms, simple methods and screens. For example, in controller.xml, we would have to change 
  xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd”
to 
  xmlns="http://ofbiz.apache.org/sc” xsi:schemaLocation="http://ofbiz.apache.org/dtds/site-conf-ns.xsd”>
But especially we would have to use the same syntax with namespaces prefixes than in ExampleCompoundWidgets.xml (see example above). This can be discussed because with auto-completion it's not a big deal, but could be overwhelming for existing custom projects...

James mentionned that "the schema location at compound-widgets.xsd is relative to the project...". I don't see any problems with that. We can keep as is as long as we maintain the relation (ie if the main XSDs are moved). Moreover with the previous addition of compound-widgets.xsd in widget-catalog.xml it seems all things work correctly (eg w/o the new *-ns.xsd yet committed, the auto-completion works well in ExampleCompoundWidgets.xml




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1746302 13f79535-47bb-0310-9956-ffa450edef68
2016-05-31 16:48:09 +00:00
Deepak Dixit 64d804e2e1 (OFBIZ-7141) Updated apache fop to 2.1 and also updated xmlgraphics-commons to 2.1.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1746270 13f79535-47bb-0310-9956-ffa450edef68
2016-05-31 12:49:12 +00:00