Commit Graph
135 Commits
Author SHA1 Message Date
Deepak Dixit 15bc40e491 Reverted: Minilang code readability and consistency improvements done at r#1768222, this commit reversed key and description of drop-down in the code.
(OFBIZ-9114)

Thanks  Wei Zhang for reporting the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1772880 13f79535-47bb-0310-9956-ffa450edef68
2016-12-06 12:37:42 +00:00
Deepak Dixit 547951e4d1 Completed: Upgrade Tomcat embed websocket jar to 8.0.39
(OFBIZ-9124)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1771935 13f79535-47bb-0310-9956-ffa450edef68
2016-11-29 18:05:49 +00:00
Jacques Le Roux 791d6333e7 Fixed: Search operation on 'AllExamplesWithDesiredCustomerFeaturesReport' entity
causing exception
(OFBIZ-8822)

Steps to regenerate:
1. Go to Entity Data Maintenance in webtools
2. Search entity 'AllExamplesWithDesiredCustomerFeaturesReport'. 
Click and go to the overview page.
3. Click on the Search button.

Thanks: to Pritam Kute for report and Pallavi Goyal for patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1768779 13f79535-47bb-0310-9956-ffa450edef68
2016-11-08 20:36:12 +00:00
Divesh Dutta a4567c2486 Improvement: Minilang code readability and consistency improvements.
(OFBIZ-8929) (OFBIZ-8930) (OFBIZ-8953) (OFBIZ-8965) (OFBIZ-8972) (OFBIZ-8986) (OFBIZ-8991) 

Thanks: Ankush Upadhyay, Anuj Jain, Abhijeet for your patches. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1768222 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 14:34:00 +00:00
Divesh Dutta 77af05bc8e Improvement: Miniland code readability and consistency improvements
(OFBIZ-8744) (OFBIZ-8745) (OFBIZ-8746) (OFBIZ-8748) (OFBIZ-8829) (OFBIZ-8830) (OFBIZ-8907) (OFBIZ-8908) (OFBIZ-8924) (OFBIZ-8925) 

Thanks: Ankush Upadhyay , Sega patidar , Abhijeet Ashapure for your patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1768219 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 14:14:04 +00:00
Arun Patidar 8bb8f78872 Improved: Removed semicolon from all Groovy files of all components.
(OFBIZ-8652)

Thanks: Rohit Koushal, Jacques Le Roux and Rishi Solanki for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1767764 13f79535-47bb-0310-9956-ffa450edef68
2016-11-02 19:09:13 +00:00
Arun Patidar 8b01e9b709 Implemented: Added CRUD services for CountryAddressFormat, ExampleFeatureApplType, GoodIdentificationType, InventoryItemType, InventoryItemTypeAttr, InvoiceContentType, InvoiceItemTypeAttr, InvoiceItemTypeMap, InvoiceType, NeedType, OrderAdjustmentTypeAttr, SalesOrderItemFact, SegmentGroupType, ShipmentGatewayConfigType, ShipmentGatewayDhl, ShipmentGatewayFedex, ShipmentType, ShippingDocument and ShoppingListType entities.
(OFBIZ-8087) (OFBIZ-8204) (OFBIZ-8245) (OFBIZ-8248) (OFBIZ-8249) (OFBIZ-8257) (OFBIZ-8261) (OFBIZ-8267) (OFBIZ-8270) (OFBIZ-8279) (OFBIZ-8284) (OFBIZ-8437) (OFBIZ-8439) (OFBIZ-8455) (OFBIZ-8460) (OFBIZ-8461)
(OFBIZ-8470) (OFBIZ-8473) (OFBIZ-8478)

Thanks: Rohit Koushal, Aman Mishra, Chinmay Patidar and Amit Gadaley for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1767101 13f79535-47bb-0310-9956-ffa450edef68
2016-10-29 09:01:09 +00:00
Arun Patidar 56e6fa0354 Implemented: Added CRUD services for FinAccountTransType, FinAccountTransTypeAttr, FinAccountType, FinAccountTypeAttr, FixedAssetAttribute, FixedAssetIdentType, FixedAssetProductType,
FixedAssetStdCostType,FixedAssetType, FixedAssetTypeAttr, GlAccountClass, GlAccountGroup, GlAccountGroupMember, GlAccountGroupType, GlAccountRole, GlAccountType, GlBudgetXref, FacilityCarrierShipment,
FacilityLocationGeoPoint and ExampleType entities.

(OFBIZ-8205) (OFBIZ-8206) (OFBIZ-8207) (OFBIZ-8209) (OFBIZ-8210) (OFBIZ-8211) (OFBIZ-8212) (OFBIZ-8213) (OFBIZ-8214) (OFBIZ-8215)
(OFBIZ-8216) (OFBIZ-8217) (OFBIZ-8218)  (OFBIZ-8219) (OFBIZ-8220) (OFBIZ-8221) (OFBIZ-8233) (OFBIZ-8234) (OFBIZ-8235)  (OFBIZ-8236)

Thanks: Rahul Singh Kushwah and Rishi Solanki for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1765077 13f79535-47bb-0310-9956-ffa450edef68
2016-10-15 14:37:51 +00:00
Mridul Pathak 203bce1b2c Improved: Removed unused imports from groovy files in example component.
(OFBIZ-8483)

Thanks: Gopal Yadav for contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1765054 13f79535-47bb-0310-9956-ffa450edef68
2016-10-15 13:00:53 +00:00
Jacopo Cappellato 96b22285f4 Implemented: removed the "controller" related logic, that is now provided by the
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
2016-09-18 08:08:30 +00:00
Taher A. Alkhateeb 8aa65b91c9 Improved: local library classpath setup in OFBiz
Now that all local jars are removed from OFBiz, there is no need to either
keep the "lib" directory in components or to automatically load these libs
if they exist. If users want to add custom libraries, then can place them
directly in the top level directory "lib".

Hence this commit removes the remaining lib directories in the accounting,
example and ldap components and fixes build.gradle to not iterate the lib
directories in components for loading jars inside of them.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761302 13f79535-47bb-0310-9956-ffa450edef68
2016-09-18 06:58:27 +00:00
Deepak Dixit 96371e329f (OFBIZ-7991) Applied patch from jira issue
=====================================
Add UI labels for success / error messages in example component
=====================================
Thanks Tanmay for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1759081 13f79535-47bb-0310-9956-ffa450edef68
2016-09-03 12:14:36 +00:00
Jacques Le Roux 354e809e29 A modified patch from Pierre Smits for "Remove legal statement from existing readme files" https://issues.apache.org/jira/browse/OFBIZ-8085
After commit, please rename readme files of components
manufacturing
assetmaint
birt
ecommerce
lucene
myportal
passport
projectmgr
scrum
solr

jleroux: Due to content I guess Pierre meant to add the .md suffix
I have also removed the useless ASL2 header of example/lib/README file

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1758702 13f79535-47bb-0310-9956-ffa450edef68
2016-09-01 05:11:45 +00:00
Pranay Pandey e44ba95d72 [OFBIZ-7311] - Applied the patch from the ticket. Removing the unused references of the maincss.css from source code, following is done-
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/specialpurpose@1758389 13f79535-47bb-0310-9956-ffa450edef68
2016-08-30 13:37:27 +00:00
Deepak Dixit adc715c257 (OFBIZ-7625) Added file missing in last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1757961 13f79535-47bb-0310-9956-ffa450edef68
2016-08-27 07:47:32 +00:00
Deepak Dixit 84a2c23810 (OFBIZ-7625) Applied patch from jira issue
===================================
Add "changeByUserLoginId" field for ExampleStatus
===================================
Thanks Nameet and Renuka for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1757960 13f79535-47bb-0310-9956-ffa450edef68
2016-08-27 07:42:02 +00:00
Jacques Le Roux f9c9d7a5f6 A 1st step for "Upgrade Tomcat to 8.5.3 (or 8.0.36)" - https://issues.apache.org/jira/browse/OFBIZ-7348
This is a security issue which was pending for too long. It only updates Tomcat to 8.0.36 because I got issues with 8.5.3 when just changing to 8.0.36 in build.gradle files worked.

I also changed the version number in LICENSE, even if some libs are only downloaded by Gradle as dependencies of the main present in build.gradle, this is a WIP.

I have investigated if we really need to have all the external jar libs in LICENSE even if we don't deliver them in 1st place, but are still used when building, see http://markmail.org/message/emnu6s5wu2yuyith


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1757318 13f79535-47bb-0310-9956-ffa450edef68
2016-08-23 07:35:32 +00:00
Jacques Le Roux 9179f9c8ba 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/specialpurpose@1755306 13f79535-47bb-0310-9956-ffa450edef68
2016-08-05 12:27:21 +00:00
Taher A. Alkhateeb 29ef12a634 Fix and improve the library dependencies in Gradle - OFBIZ-7534
- Convert many compile dependencies to runtime dependencies in Gradle
- Move dependencies from framework to specialpurpose 
  (only one in example component)
- put a comment above dependencies which we think should be removed
  completely subject to further testing and confirmation from the
  community.

After investigating the libs we realized that most of the dependencies
in OFBiz are runtime rather than compile time. Furthermore, we also
suspect that many of the runtime dependencies are not needed, however
further testing is needed before we can confirm and remove them from
build.gradle


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1754640 13f79535-47bb-0310-9956-ffa450edef68
2016-07-31 08:54:26 +00:00
Pranay Pandey c3631771ed [OFBIZ-7865] No functional change. Corrected formatting of Example component ftl files for improved readability.
Thanks Vaibhav Jain for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1752964 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 14:02:45 +00:00
Deepak Dixit 8f3141cd46 (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/specialpurpose@1752920 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 10:30:49 +00:00
Mridul Pathak efe3862baf [OFBIZ-7525] UiLabels missing on Examples PDF. Thanks Ankit Joshi for contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1752896 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 06:37:45 +00:00
Taher A. Alkhateeb 2963cd7188 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/specialpurpose@1752838 13f79535-47bb-0310-9956-ffa450edef68
2016-07-15 14:17:14 +00:00
Gil Portenseigne 9008b981b5 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/specialpurpose@1752231 13f79535-47bb-0310-9956-ffa450edef68
2016-07-11 23:04:54 +00:00
Taher A. Alkhateeb 25ffc93eb5 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/specialpurpose@1752033 13f79535-47bb-0310-9956-ffa450edef68
2016-07-09 18:10:19 +00:00
Jacques Le Roux 54917e8bbd A last slightly modified patch from James Yong for "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
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
2016-06-29 14:06:29 +00:00
Jacques Le Roux ee836db2ea A patch from Amardeep Singh Jhajj for "Add websocket support in OFBiz" https://issues.apache.org/jira/browse/OFBIZ-7073
It also contains a slightly modified patch from Amardeep Singh Jhajj for "WebSocket Example - Push Notifications" - https://issues.apache.org/jira/browse/OFBIZ-7467 - It's adding working example (in example application) of WebSocket support

I tried to use websockets in OFBiz. I simply added tomcat-embed-websocket.jar in catalina lib and created one webapp for websocket and also added server endpoint class.
It didn't work. After that, I tried the same thing with plain j2ee application with embedded tomcat. It worked there.
I researched on above issue in OFBiz and got the reason. Websockets implementation need jar scanning enabled and it is currently disabled in OFBiz. Below is the code snippet of disabling jar scan from CatalinaContainer.java:

    JarScanner jarScanner = context.getJarScanner();
    if (jarScanner instanceof StandardJarScanner) {
        StandardJarScanner standardJarScanner = (StandardJarScanner) jarScanner;
        standardJarScanner.setScanClassPath(false);
    }

Jar scanning enabling increase OFBiz server startup time upto couples of minutes (in my case, it took approx 8 minutes), so we don't want this much of startup time for OFBiz.
I got the following document where I found the reason why websocket is not working if scanning disabled.

    https://wiki.apache.org/tomcat/HowTo/FasterStartUp

Here tips are given to decrease the startup time. This tips also include disabling of jar scanning. 
We can say disabling jar scanning is right approach because if we enable it then scanner will scan all the jars loaded in OFBiz startup that we don't want.
But, If we want websockets working then we have to enable jar scanning.
For enabling jar scanning, we need below code:

    standardJarScanner.setScanClassPath(true); // Will increase server startup time.

Solution: We can add filter on jar scanning. It will allow only some kind of jars only. For example: jars having websockets endpoints. I am attaching patch for the same here.
I added filter like if jar name string contains "discoverable" word then only it will be considered for jar scan. We can change jar name of our jars using build.xml to make it discoverable for jar scanning.
For example: I have added my websocket endpoint class in "specialpurpose/ecommerce/src" and changed the "name" property in build.xml of ecommerce component from "ofbiz-ecommerce"
to "ofbiz-ecommerce-discoverable". Here is the code snippet from build.xml:

    <property name="name" value="ofbiz-ecommerce-discoverable"/>

This change will create the jar with name "ofbiz-ecommerce-discoverable.jar" in "ecommerce/build/lib/".
Now created jar will be scanned in jar scanner as its name contains "discoverable" word in it.
This change will not increase server start up time more than couple of seconds (in my case, it just two seconds). So scanning time totally depends on the list of jars scanned.
Conclusion: We can use websocket support with the help of jar filters.

The very basic working example of sending push notifications to all connected clients using WebSocket added by Amardeep Singh Jhajj works as follow:
1. Adds support to show push notifications over every screen of an example application using WebSocket when any example created or updated.
2. As it's an example, so for now push notifications will only for example creation and update using SECA's.
3. Push notification will be shown on screen for 5 seconds only, we can close it before 5 seconds using close button if needed.
The UI of notification pop-up can be changed. I kept it simple (No fancy work) to just demonstrate the WebSocket usage.
To see it in action, Please follow the steps given in OFBIZ-7073 and apply patch given here.


jleroux: I committed the 2 patches at the same time because the changes in .classpath and the LICENSE files were in the example patch for OFBIZ-7467. 

I also slightly modified the example patch in order to provide an example where no sync issues are possible by using a Collections.synchronizedSet for the javax.websocket.Session Set. I also used synchronized loops as it's requested for synchronizedSet where it's used. I know it rather symbolic in the example component but it will remember developers about the possible sync issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1750557 13f79535-47bb-0310-9956-ffa450edef68
2016-06-28 18:50:04 +00:00
Jacques Le Roux f84f07a0fa A temporary workaround for "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
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
2016-06-23 16:40:22 +00:00
Jacques Le Roux 96cdb9c9d6 Oops typo, seems I touched a key there :/
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1749663 13f79535-47bb-0310-9956-ffa450edef68
2016-06-22 12:47:02 +00:00
Jacques Le Roux 4deae05a38 Fixes a "typo" in last commit for "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
We used targetNamespace (should only be used in schema) instead of xsi:schemaLocation



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1749634 13f79535-47bb-0310-9956-ffa450edef68
2016-06-22 05:58:26 +00:00
Jacques Le Roux a98ac13d9d Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
This is the 2nd step: puts back the original names, so it will be transparent for remaining references in xml catalogs, Java code, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1749489 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:37:47 +00:00
Jacques Le Roux b20816bfa8 Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061 by replacing xsd files references in xml files by -ns.xsd files and removing the concerned xsd files
This is a 1st step, in a 2nd I will put back the original names, so it will be transparent for remaining reference in xml catalogs, Java code, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1749488 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:14:16 +00:00
Deepak Dixit 1bd0c04a73 (OFBIZ-7238) Relocate .groovy files in the specialpurpose/example component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1747787 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 19:40:19 +00:00
Jacques Le Roux 5e65059e4d 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/specialpurpose@1747712 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 14:04:30 +00:00
Jacques Le Roux 941d9ec1fe 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/specialpurpose@1746302 13f79535-47bb-0310-9956-ffa450edef68
2016-05-31 16:48:09 +00:00
Nicolas Malin 07612a215e add missing content-type on ExampleReportXls to force the mime file type send to user. Correct previous commit related to OFBIZ-6931.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1746087 13f79535-47bb-0310-9956-ffa450edef68
2016-05-30 07:13:02 +00:00
Nicolas Malin 64038c5f45 Add xls screen renderer to convert a screen definition like an html flow directly ready by a spreadsheet application
In addition, add an export example button on FindExample screen and add complete macro ftl renderer unit test. Issue OFBIZ-6931 proposed by Leila Mekika. Thanks to her, jacques and pierre for theirs remarks.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1746045 13f79535-47bb-0310-9956-ffa450edef68
2016-05-29 18:38:26 +00:00
Deepak Dixit c4b52ebe5c (OFBIZ-6810) Removed some unused screen and ftl, found during ftl cleanup. I took extra care while removing these code this should not break anything.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1745500 13f79535-47bb-0310-9956-ffa450edef68
2016-05-25 15:05:50 +00:00
Deepak Dixit 2c25412d8e (OFBIZ-7021) Renamed remaining specialpurpose component ftl file name from lower camel case to upper camel case pattern.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1745115 13f79535-47bb-0310-9956-ffa450edef68
2016-05-23 06:59:04 +00:00
Mridul Pathak ef509a2511 [OFBIZ-7035] Have https://localhost:8443/example/control/fonts.pdf open in a new window. Thanks Pierre Smits for reporting the improvement and Suraj Khurana for providing the patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1744883 13f79535-47bb-0310-9956-ffa450edef68
2016-05-21 09:48:41 +00:00
Ashish Vijaywargiya c6ee20b04c Applied patch for jira issue - OFBIZ-7054. Example -> PDF should be open in a new window.
Thanks Harsh for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1744850 13f79535-47bb-0310-9956-ffa450edef68
2016-05-21 06:43:00 +00:00
Deepak Dixit dd5cf2fe5f (OFBIZ-7021) Renamed framework common component ftl file name from lower camel case to upper camel case pattern.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1744783 13f79535-47bb-0310-9956-ffa450edef68
2016-05-20 18:52:54 +00:00
Ashish Vijaywargiya ab83f575ed Applied patch for jira issue OFBIZ-7036 - Have https://localhost:8443/example/control/ExampleReportPdfBarcode open in a new window. Thanks Pierre for reporting the issue and thanks Harsh for providing the patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1742699 13f79535-47bb-0310-9956-ffa450edef68
2016-05-07 10:20:51 +00:00
Jacques Le Roux 840a9e820d "Continue the work on the form widget grid element" - https://issues.apache.org/jira/browse/OFBIZ-7029
This 
Updates the XSD documentation
Removes the list type when the grid element is used

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1741866 13f79535-47bb-0310-9956-ffa450edef68
2016-05-01 14:45:46 +00:00
Jacques Le Roux 260fc9208c Fixes "ExampleCompoundWidgets throws errors" - https://issues.apache.org/jira/browse/OFBIZ-7023
Actually this is due to both compound-widgets.xsd and ExampleCompoundWidgets.xml errors. Both have not visible effects but in logs

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1741022 13f79535-47bb-0310-9956-ffa450edef68
2016-04-26 13:35:07 +00:00
Deepak Dixit 1676df0606 (OFBIZ-6831) relocate .ftl files in the specialpurpose/example component.
Thanks Pierre for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1740583 13f79535-47bb-0310-9956-ffa450edef68
2016-04-22 18:53:41 +00:00
Deepak Dixit b4f65d473b (OFBIZ-6823) relocate .ftl files in the framework/common component
Thanks Pierre for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1740497 13f79535-47bb-0310-9956-ffa450edef68
2016-04-22 12:28:46 +00:00
Jacques Le Roux 44036fc73c A combined patch from Adrian's, James Yong's and my work for "Add Support For Compound Screen Widget XML Files" - https://issues.apache.org/jira/browse/OFBIZ-4090 and "Add Example for Compound Screen Widget" - https://issues.apache.org/jira/browse/OFBIZ-6990
Adrian: This adds the ability to include screen widgets, form widgets, menu widgets, and simple methods in a single XML file. This approach could be used in situations where the widgets share a logical grouping - so they can be kept in one place.

James: An example to test out Compound Screen Widget

jlerouxc: here are the changes and tests globally
# As James mentionned we no longer need *-v2.xsd files, I removed them from Adrian's patch
# I created a compound-widgets.xsd based on Adrian's and James Yong's previous work. From Paul Foxworthy's comment in OFBIZ-4090, I decided to name the root compound-widgets (hence the file name). I arranged its elements in another way, see below with ExampleCompoundWidgets.xml
# I slightly modified James Yong's ExampleCompoundScreenWidget.xml file and renamed it ExampleCompoundWidgets.xml. I added an "s" because there are several OFBiz widgets gathered in one place. For the modifications: I simply changed the names and arranged the elements in another way which I find better suited. I'm used to 1st create the query, then the menus, the screens and their forms. We rarely use widget-trees but it's there also. Finally the simple-method at end if any. The order is not enforced though, so everybody can use her/his own :)
# I added a French label
# I completed the widget-catalog.xml with this new entry and tested locally in Eclipse by reloading the XML catalog entries.

I hope I did not miss nor mixed things, the local instance I used is a bit overcrowded with pending changes...




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1738958 13f79535-47bb-0310-9956-ffa450edef68
2016-04-13 15:38:16 +00:00
Jacques Le Roux 800a0c22a7 Removes old simple-methods.xsd from the trunk as it's useless now (was replaced by simple-methods-v2.xsd)
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
2016-03-30 09:13:03 +00:00
Deepak Dixit f1a8d15c4d (OFBIZ-6288) Replace html widget rendering with Macro widget rendering in ExamplePrintServices.java file.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1731353 13f79535-47bb-0310-9956-ffa450edef68
2016-02-20 09:09:50 +00:00