Commit Graph
89 Commits
Author SHA1 Message Date
Adam Heath b273b52dad Finally created a script to find and fix tons of missing final newlines.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@982870 13f79535-47bb-0310-9956-ffa450edef68
2010-08-06 04:46:48 +00:00
Adam Heath ac2299c50e Fix a bunch of no final newline issues.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@965918 13f79535-47bb-0310-9956-ffa450edef68
2010-07-20 17:15:21 +00:00
Jacques Le Roux 9ef845d0ad A patch from BJ Freeman "complete web.xml for error reporting" (https://issues.apache.org/jira/browse/OFBIZ-3820) - OFBIZ-3820
BJ: when there is an error, the control servlet looks for an error path in <param-name>allowedPaths</param-name>
it does not find one throwing an exception which buries the orginal error.
instead of changing the code it is just easier to add the /error: path.
then the real error gets reported correctly.

JLR: This will maybe help to better understand some errors on demo servers, and can't hurt

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@954135 13f79535-47bb-0310-9956-ffa450edef68
2010-06-12 20:47:08 +00:00
Jacques Le Roux 6193dd4e53 <author>None</author> is totally useless and we don't need an author OOTB
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949101 13f79535-47bb-0310-9956-ffa450edef68
2010-05-28 05:41:23 +00:00
Jacques Le Roux 63fd94e778 Not sure why, but my regexp S/R in the commit r948846 boke some formatting. I also removed some useless other stuff in this commit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@948852 13f79535-47bb-0310-9956-ffa450edef68
2010-05-27 14:45:59 +00:00
Jacques Le Roux 2a1a5aee14 We don't need
<copyright>Copyright 2001-.* The Apache Software Foundation</copyright>
<copyright><year>.*</year><holder>Apache Foundation</holder></copyright>
<copyright><year>.*</year><holder>Apache Foundation.</holder></copyright>
<owner>Copyright 2001-.* The Apache Software Foundation</owner>

Less to update every year!

Thanks to BJ 1st effort at "update files from 2009 to 2010" (https://issues.apache.org/jira/browse/OFBIZ-3783) - OFBIZ-3783

Note: there are been a lot of efforts in 2009: there are plenty of data dated from this year!

I hope I did not broke anything (should not, but of course I did not try all changes...) Anyway, this can be easily reverted...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@948846 13f79535-47bb-0310-9956-ffa450edef68
2010-05-27 14:23:22 +00:00
Ashish Vijaywargiya db765efdd2 Reverting my commit r938446 based on the comments received on mailing list. For now I am keeping old email address in place (i.e ofbiztest@yahoo.com) keeping in mind that email will not go in spam folder. If others think test@example.com will also behave same then please go ahead commit the changes.
Very soon I will revert my changes on release10.04 branch.
Thanks to everybody who has provided their comments!  

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940814 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 11:57:35 +00:00
Ashish Vijaywargiya 148318f7fd Changing email address ofbiztest@yahoo.com -> ofbiztesting@gmail.com - this was creating too much problem since long in development effort.
Following points were there in my mind before doing this change.

-- AFAIK ofbiztest@yahoo.com email doesn't exists.
-- Bounce email issue if you have enabled Javamail container. This drastically slow down your system performance. 
-- Now anyone can use ofbiztesting@gmail.com account settings for Sendmail, Javamail container etc.
-- Send mail service triggered again and again with failure message on console if any of the email not found bccAddress inside ProductStoreEmailSettings entity. Again slow speed of your development machine.
-- Please let me know where to share the password of this account? Dev list?


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@938446 13f79535-47bb-0310-9956-ffa450edef68
2010-04-27 13:17:45 +00:00
Bruno Busco a4ef53cf69 A patch from Blas Rodriguez Somoza
OFBIZ-3678 - XHTML validation errors round 2 (specialpurpose/googlebase)
https://issues.apache.org/jira/browse/OFBIZ-3678

XHTML validation errors

    * Uppercase tags or attributes.




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@934187 13f79535-47bb-0310-9956-ffa450edef68
2010-04-14 20:38:57 +00:00
Jacques Le Roux 1a3962d883 A patch from Bob Morley "Resolve java warnings exposed in Eclipse (googlebase & googlecheckout part of OFBIZ-3100)" https://issues.apache.org/jira/browse/OFBIZ-3597 - OFBIZ-3597
I just replaced a few tabs



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@932855 13f79535-47bb-0310-9956-ffa450edef68
2010-04-11 09:06:03 +00:00
Bruno Busco 21f673c8ee A patch from Blas Rodriguez Somoza
OFBIZ-3615 - XHTML validation errors (specialpurpose_googlebase)
https://issues.apache.org/jira/browse/OFBIZ-3615

XHTML validation errors

    * attributes without values (checked)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@932726 13f79535-47bb-0310-9956-ffa450edef68
2010-04-10 14:13:58 +00:00
Jacques Le Roux c7b353d3e8 Closes "Using Widgets html form templates in FTL files" (https://issues.apache.org/jira/browse/OFBIZ-3541) - OFBIZ-3541
This concerns the lookups which are now rendered the same in ftl files and widget forms

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@931854 13f79535-47bb-0310-9956-ffa450edef68
2010-04-08 10:19:38 +00:00
Vikas Mayur a5ecacff91 Special Purpose application should not have OFBTOOLS permission in the component base permission set. Not sure of shark component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930839 13f79535-47bb-0310-9956-ffa450edef68
2010-04-05 11:14:54 +00:00
Vikas Mayur ba9e225b43 Catalog Tab Bars using FTL were replaced by menu widget in r705940. Removing the FTL tab bar occurrence which was probably not removed while replacing it
with menu widget.  


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930837 13f79535-47bb-0310-9956-ffa450edef68
2010-04-05 10:48:54 +00:00
Adam Heath 2eb1768f1d Fix lots of bad xhtml tags, need to have a space before the ending /.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@923545 13f79535-47bb-0310-9956-ffa450edef68
2010-03-16 01:56:41 +00:00
Adam Heath b17eb127ec Fix trailing whitespace, and mixed tab/space at the beginning of lines.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@899812 13f79535-47bb-0310-9956-ffa450edef68
2010-01-15 21:00:23 +00:00
Adam Heath 18d0ceeaf9 Remove most docs targets, they are all the same anyways.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@894031 13f79535-47bb-0310-9956-ffa450edef68
2009-12-26 22:28:48 +00:00
Adam Heath 1c269fc012 Convert all javadoc calls to use fileset instead of sourcepath; this
allows excludes to be processed correctly.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@894030 13f79535-47bb-0310-9956-ffa450edef68
2009-12-26 22:24:20 +00:00
Adam Heath 56dac0bf9e Add a classes target to common.xml, and switch most build.xml to use it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@894024 13f79535-47bb-0310-9956-ffa450edef68
2009-12-26 22:16:56 +00:00
Adam Heath 47b0a876ed Switch all javac15 to javac16.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@894022 13f79535-47bb-0310-9956-ffa450edef68
2009-12-26 22:12:04 +00:00
Jacques Le Roux c72b29cb1f Use UtilValidate.isNotEmpty methods instead of (obj != null) || (obj.length > 0) and (obj != null) || (obj.size > 0)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883549 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 23:41:34 +00:00
Ashish Vijaywargiya fc45518ad6 Applied patch from jira issue OFBIZ-3149 - Improve Category association in eBay.
Recently multi store support for Ebay has been implemented. For the multi store support we need ProductStore > ProdCatalog > ProductCategory association. For EBay we define specific categories of type EBAY_CATEGORY, only those products that are associated to an EBay category are eligible for eBay export. In the current implementation there is no proper prodCatalogCategoryTypeId which can be used to associate eBay category to ProdCatalog, one way to associate an eBay category to ProdCatalog is as a PCCT_BROWSE_ROOT category, thus we have two categories associated to the catalog as BROWSE_ROOT, the other one is for online store. Technically, this is wrong, a catalog should be associated with only one browse root category. Due to this wrong association the eBay category doesn't show up on the advance search page of EBAY webapp, instead online store's browse root category is shown which may also contain those products which are not meant to be exported to eBay. So this category associations need to be fixed, and following is how this can be resolved:

   1. Create a new ProdCatalogCatagoryType PCCT_EBAY_ROOT
   2. Define a worker method in CatalogWorker to derive the top level (root) ebay category
   3. Now in the advance search form, first look for top level ebay category associated to the selected catalog
          * If found, derive sub category list of the top level ebay category and display, else display the top level ebay category itself
          * If not found, derive the top level browse root category (PCCT_BROWSE_ROOT) and display the sub category list for it

Thanks Parimal Gain for the contribution.
Special thanks to Mridul Pathak (Zone of Sharp Mind :-)) for discussing implementation plans & providing wonderful notes.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832713 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 12:05:09 +00:00
Ashish Vijaywargiya 7c2d11d05a Applied patch from jira issue OFBIZ-3132 - Multiple productStore support to googleBase and eBay.
Changes includes following:
1) Created new search form for eBay and GoogleBase - It was not good to update *advancesearch*.ftl file present inside catalog component. Now it will be easy to maintain separate file for future deployments.
2) Restricted productStoreId and prodCatalogId field to search.
3) Added webSite drop-down on "Export to eBay" and "Export to GoogleBase" page.
4) Select webSite to get the webSiteUrl. 

Thanks Parimal for your contribution - this will surely help the community.
Special thanks to Mridul, Rishi, Chirag, Deepak & Me :-) for discussing requirement and also special thanks to Jacopo for the notes and discussion on requirements.
 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831534 13f79535-47bb-0310-9956-ffa450edef68
2009-10-31 12:01:52 +00:00
Ashish Vijaywargiya 6d2fb137cb Adding permission GOOGLEBASE_ADMIN & EBAY_ADMIN and associating it with the group FULLADMIN.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830889 13f79535-47bb-0310-9956-ffa450edef68
2009-10-29 10:58:01 +00:00
Marco Risaliti be861590ac Some missing italian translations of googlebase component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829592 13f79535-47bb-0310-9956-ffa450edef68
2009-10-25 14:54:35 +00:00
Bruno Busco 17288a9082 Part of OFBIZ-3067 - Menus and form widget files location
Party and Product components
Moved forms from webapp to widget folder
Removed empty folders

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829418 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 17:41:31 +00:00
Bruno Busco 4cf618421d Part of OFBIZ-3067 - Menus and form widget files location
Catalog component
Renamed order/widget/catalog/Menus.xml to order/widget/catalog/CatalogMenus.xml
Renamed order/widget/facility/Menus.xml to order/widget/facility/FacilityMenus.xml


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829314 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 07:14:26 +00:00
Bruno Busco a9c26eb1c1 Changed <container style="screenlet"> pattern to <screenlet...>.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@826483 13f79535-47bb-0310-9956-ffa450edef68
2009-10-18 18:24:32 +00:00
Ashish Vijaywargiya 7f971bac97 Now "product_type" tag will contain only values that are having ProductCategory.productCategoryTypeId = "GOOGLE_BASE_CATEGORY".
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822222 13f79535-47bb-0310-9956-ffa450edef68
2009-10-06 11:22:02 +00:00
Adrian Crum a4d68934c9 Converted GenericDelegator concrete class references to Delegator interface references.
This commit requires ant clean. Also, external libraries that reference GenericDelegator will need to be updated.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821643 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 00:08:27 +00:00
Ashish Vijaywargiya 066d3b6211 Encouraging use of Generics.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@818714 13f79535-47bb-0310-9956-ffa450edef68
2009-09-25 04:29:10 +00:00
Jacques Le Roux b7a941d4f6 Revert r813307 on Adrian's request
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813893 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 16:02:01 +00:00
Jacques Le Roux a7430a2fc2 A modified patch from Erwan de FERRIERES '"Automatic" sortable table headers" (https://issues.apache.org/jira/browse/OFBIZ-2921) - OFBIZ-2921
I was planning to wait longer, but I can't wait more. I have added a lot of small trivial changes in this patch and they are blocking me to go further on other issues...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813307 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 08:41:19 +00:00
Jacopo Cappellato 988b276bbd Fix for issue happening after that Xalan jars have been added to the classpath: namespaces were added to each and every element.
Thanks to Ashish Vijaywargiya for the bug report and tests.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@810857 13f79535-47bb-0310-9956-ffa450edef68
2009-09-03 09:55:14 +00:00
Ashish Vijaywargiya a974a553e4 Added GUI for GoogleBaseConfig entity - CRUD Operations.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@809582 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 13:31:27 +00:00
Ashish Vijaywargiya 1c7a068142 Moving screen definition to appropriate location.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@809555 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 12:24:10 +00:00
Ashish Vijaywargiya 6dc9720309 Another update on Google Base.
Following things are done in this commit:

1) Added new entity GoogleBaseConfig and reading the values from there. Also kept option to read configuration values from property file.
2) Added new ProductCategoryType record for Google Base - Thanks Jacopo for your suggestion on this.
3) Prepared data for demo purpose in DemoProduct.xml file - This demo contains the association of few product with Google Category.
4) Also prepared demo data for GoogleBaseConfig entity.
5) Provided option to have default value of webSiteUrl on the GoogleExport form - for this refer productsExportToGoogle.groovy file.

Thanks Pranay for discussing few things with me in b/w this phase of development.

In next Commit I will provide UI for GoogleBaseConfig entity(CRUD operations) so it will be easy for end user to update values in this entity easily instead of moving to webtools and do the needful.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@809552 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 12:06:14 +00:00
Ashish Vijaywargiya 4d5f5bfe32 Done following things on Google Base in this pass:
1) Added the priority tag so Product should be published in 15 - 30 minutes on Google Base instead of waiting for 24 hours.
2) Added ProductType default values - I have put a TODO in code and will work on that thing soon.
The correct product type selection is very important - This helps to enlist product in the resultant list easily or we can say fast.
3) Batch tag was not being created right in the generated string. Fixed that issue.

So the final sring looks like as shown below (Only for single product export): 

<?xml version="1.0" encoding="UTF-8"?>
<feed xmlns="http://www.w3.org/2005/Atom" xmlns:app="http://purl.org/atom/app#" xmlns:batch="http://schemas.google.com/gdata/batch" xmlns:g="http://base.google.com/ns/1.0" xmlns:gm="http://base.google.com/ns-metadata/1.0" xmlns:openSearch="http://a9.com/-/spec/opensearchrss/1.0/">
    <entry>
        <batch:operation type="insert"/>
        <app:control>
            <gm:publishing_priority>high</gm:publishing_priority>
        </app:control>
        <title>Round Gizmo</title>
        <content type="xhtml">Round Gizmo</content>
        <g:id>http://demo.ofbiz.org/ecommerce/control/product/~product_id=GZ-2644</g:id>
        <link href="http://demo.ofbiz.org/ecommerce/control/product/~product_id=GZ-2644" rel="alternate" type="text/html"/>
        <g:item_type>products</g:item_type>
        <g:product_type>Electronics</g:product_type>
        <g:product_type>Business &amp; Industrial</g:product_type>
        <g:price>38.40000000000</g:price>
        <g:currency>USD</g:currency>
        <g:target_country>US</g:target_country>
        <g:condition>new</g:condition>
        <g:image_link>http://demo.ofbiz.org/images/products/large/web_browser.png</g:image_link>
    </entry>
</feed>


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@808331 13f79535-47bb-0310-9956-ffa450edef68
2009-08-27 09:04:55 +00:00
Ashish Vijaywargiya 27bd1b0a89 Few more modifications in google base code.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@808099 13f79535-47bb-0310-9956-ffa450edef68
2009-08-26 16:20:35 +00:00
Ashish Vijaywargiya d55b5b5283 More imporvement in Google Base code to support namespace specific tags along with the generated XML feed.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@808053 13f79535-47bb-0310-9956-ffa450edef68
2009-08-26 15:28:10 +00:00
Ashish Vijaywargiya 71b953e08f The google base code was broken.
In the previous code the namespace specific tag support was not present in UtilXml so google base server was not accepting the request coming in the form <item_type>. The correct tag will be <g:item_type>.
Also did minor modification in code to avoid NPE.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@807959 13f79535-47bb-0310-9956-ffa450edef68
2009-08-26 10:55:53 +00:00
Adrian Crum ce1660b06a Chinese translation for the specialpurpose folder, provided by Shi Yusen - https://issues.apache.org/jira/browse/OFBIZ-2723.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@798580 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 15:59:04 +00:00
Jacques Le Roux 999bd7c577 Fix following Chris Howe's message in dev ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764195 13f79535-47bb-0310-9956-ffa450edef68
2009-04-11 13:00:24 +00:00
Jacques Le Roux b9c3ddef08 2d part and end of an effort to remove trailing spaces
[ \t]+$ => "" (empty)
Should be easier to review when committing changes with trailing spaces removed automatically by anyedit or such tool (please refer to http://docs.ofbiz.org/x/mg)

Of course this effort to remove trailing spaces has no functional implications.

Actually, I was doing a 1st commit and as it's long to upload, I got conflicts with r763135
In the meantime I did some refactoring also in *.java and *.groovy files :
){ => ) {
if( => if (
while( => while (
}else => } else
else{ => else {
switch( => switch (
try{ => try {
}catch => } catch
catch( => catch (
}finally{ => } finally {

So these changes are also in this commit, should not be a problem anyway.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:54:51 +00:00
Jacques Le Roux 76f5ca6638 Secure URLs, we don't need to duplicate in from-field when param-name is the same
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762215 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 06:25:24 +00:00
Jacques Le Roux e8426631e8 Securing URLs, link element in screens and menus : 22th set + tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761214 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 09:14:40 +00:00
Jacques Le Roux 2ae583d0a1 Securing URLs, link element in screens and menus : 10th set + tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@760787 13f79535-47bb-0310-9956-ffa450edef68
2009-04-01 05:50:07 +00:00
Adam Heath 6b103ddbfe Fix lines that *only* have whitespace.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759260 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 17:02:10 +00:00
Adam Heath ee5dbe2e09 Fix purely empty whitespace lines, and remove trailing whitespace.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757100 13f79535-47bb-0310-9956-ffa450edef68
2009-03-21 23:47:49 +00:00
Jacques Le Roux 0e0519e802 All tabs to 4 spaces in *.groovy, *.java, *.xml
Done with Eclipse S/R "\t"

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755696 13f79535-47bb-0310-9956-ffa450edef68
2009-03-18 18:43:49 +00:00