Author SHA1 Message Date
Jacques Le Roux 305f2c5abb Fixed: Update Solr and Lucene to address several CVEs (including Log4j) (OFBIZ-12464)
Solr and Lucene 8.11.1 are now available in Maven Central
2021-12-18 17:02:51 +01:00
Jacques Le Roux f000c69a0d Fixed: Update Solr and Lucene to address several CVEs (including Log4j) (OFBIZ-12464)
Solr is not yet available on Maven :/

We will also need to update Tika, and I guess the list will continue...

Conflicts handled by hand in lucene/build.gradle
2021-12-17 05:20:38 +01:00
Jacques Le Roux d0f98efd7d Fixed: Update Solr and Lucene to address several CVEs (including Log4j) (OFBIZ-12464)
See SOLR-15843 and
https://solr.apache.org/guide/8_11/solr-upgrade-notes.html
https://solr.apache.org/docs/8_11_1/changes/Changes.html#v8.11.1.bug_fixes

Also fixes luceneMatchVersion in solrconfig.xml, was forgotten last times
And clarifies comments about that

Conflicts handled by hand lucene/build.gradle
2021-12-16 17:50:47 +01:00
Jacques Le Roux b5663ec6c2 Improved: Upgrade Solr and Lucene to 8.11 (OFBIZ-12388)
https://solr.apache.org/docs/8_11_0/changes/Changes.html

Conflicts handled by hand in lucene/build.gradle
2021-12-16 17:48:59 +01:00
Jacques Le Roux 3ba155e910 Improved: put bin in gitignore
I see no reason to have .DS_Store there
2021-11-18 09:27:51 +01:00
Jacques Le Roux 5864e97680 Improved: Fix OFBiz specific Javascript security issues reported by GH CodeQL (OFBIZ-12366)
Revert previous commit, something wrong happened with Eclipse imports order
feature. Anyway it needs to be a frameworkd class or js file for CodeQL to run
2021-11-14 20:15:54 +01:00
Jacques Le Roux f8c85ccb37 Improved: Fix OFBiz specific Javascript security issues reported by GH CodeQL (OFBIZ-12366)
No functional change (imports order) to test CodeQL setting
2021-11-14 19:10:04 +01:00
Jacques Le Roux fc6cf7bf07 Improved: Fix OFBiz specific Javascript security issues reported by GH CodeQL (OFBIZ-12366)
Fixes CmsMultiSiteDemoData.xml by using dompurify

I did not went so far that fixing CmsSiteDemoData.xml. After all it's only demo
data
2021-11-14 17:00:13 +01:00
Nicolas Malin df7ae11c73 Fixed: Add to cart is not working for products with selectable features (OFBIZ-11970)
Two issues were present, first was due to incorrect markup and the second was due to ajax request and response view of the additem request.
In additem request last saved view or the view of the last request is rendered on successful operation and in this case the last request/view is the one which is used to render UOM dropdown.

Thanks: Akash Jain and Ravi Lodhi
2021-09-28 14:12:10 +02:00
Nicolas Malin 6d5aca3d2a Fixed: Incorrect price for selected variant shown (OFBIZ-12236)
When the webshop (ecommerce component) has been set up for retail (B2C), with the tax setting 'Show prices with VAT tax included' set to 'Y' in store 9000 the appropriat Tax Auth Geo and Tax Auth set in store 9000 the flag 'Include Tax In Price' set to 'Y' for the Tax Auth the price for a virtual product is shown including VAT.

However, for a selected variant the price shown is without VAT

Thanks: Pierre Smits to raise this issue and Priya Sharma for solved it
2021-09-27 16:29:18 +02:00
Jacques Le Roux 905e7b0253 Fixed: The Solr version included in OFBiz has an SSRF vulnerability (CVE-2021-27905) (OFBIZ-12316)
Fixes conflicts from cherry pick
2021-09-15 13:44:06 +02:00
Jacques Le Roux cdf6bd69e5 Fixed: The Solr version included in OFBiz has an SSRF vulnerability (CVE-2021-27905) (OFBIZ-12316)
This post-auth security issue was reported to the security team by weinull orz
<weinull@outlook.com> As he suggested the solution is to update Solr to its last
version (8.9.0)

This solution contains a (justified) rant!

Thanks: weinull orz

Conflicts handled by hand (hence the numerous unnecessary automatic changes due to my editor (Scite) config
#	lucene/build.gradle
#	solr/build.gradle
#	solr/home/solrdefault/conf/solrconfig.xml
#	solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
2021-09-15 10:34:29 +02:00
Jacques Le Roux 18c0c436af Fixed: Add http to https redirect rule for ofbiz.apache.org (OFBIZ-10590)
This prevented to run the stable demo, hence the next
2021-07-20 07:38:46 +02:00
Jacques Le Roux f7f7776514 Improved: removes mention of Birt in plugins LICENSE file
We no longer embed files from Birt project. For years now we use Gradle to load
org.eclipse.birt.runtime:viewservlets:4.5.0 that is only "loaded at runtime"
2021-06-17 18:35:18 +02:00
Jacques Le Roux 485e3b89d7 Fixed: Empty field is reflecting on Contact list section on Profile Page (OFBIZ-10386)
Steps to generate:

Open https://demo-trunk.ofbiz.apache.org/ecomseo/viewprofile

On the profile page, Go down to Contact list
Empty fields are displaying before Verify Subscription button

Expected: The field should have some specifications to be filled up

Thanks: Archana Asthana for report, Devanshu Vyas for suggestion, Praveen Patil
for patch and Thirumurugan for confirming
2021-05-29 15:47:48 +02:00
Jacques Le Roux 340c98b3b0 Improved: Comment out the SOAP and HTTP engines (OFBIZ-12212)
The SOAP and HTTP engines are open doors to security issues.
At https://markmail.org/message/pgtjyh23bazq4s2w I proposed to comment them out
as we did for RMI in the past.
Of cause it must be clearly documented how to use them if needed.

Here is the email content:

    After the recent fix for the CVE-2021-26295[1] we discussed with the security
    team about the opportunity need to comment out the SOAP and HTTP engines
    like we did in the past for RMI[2], this obviously for security reason.

    [1] OFBIZ-12167 "Adds a blacklist (to be
    renamed soon to denylist) in Java serialisation (CVE-2021-26295)"
    [2] OFBIZ-6942 "Comment out RMI related
    code because of the Java deserialization issue [CVE-2016-2170] "

I just put a small comment in webtools and scrumm controllers, it should be
enough.

The tests pass

Conflicts handled by hand
  scrum/servicedef/services.xml
2021-03-29 13:23:43 +02:00
Michael Brohl a356edc9b7 Improved: Switch from jCenter to mavenCentral to handle the jCenter
shutdown (OFBIZ-12171)

See comments in framework build.gradle for details.
2021-02-27 14:42:46 +01:00
Jacques Le Roux d94d5910f7 Fixed: Exception error on ecommerce portal while trying to register new user
(OFBIZ-)

Missing import statement in the groovy script on the new customer registration
page.

Thanks: Pradeep Choudhary
2021-02-27 14:10:31 +01:00
Jacques Le Roux f70aef14a4 Improved: Default ordering of webapps titles in main menu (OFBIZ-12166)
This 1st step sorts the plugins. We need to discuss more...
2021-02-15 12:35:59 +01:00
Deepak Dixit 27baf80c98 Fixed: Fitering on StatusId in FindTask does not work (#56)
(OFBIZ-10914)
2021-02-12 15:42:03 +05:30
Pawan Verma 7afe2b73e5 Fixed: Visit disabling causes NullPointerException on ecomm groovy script(OFBIZ-12173)
Used UtilHttp.getSessionId() instead of visit to get session Id.

Thanks: Giulio, Jacopo and Deepak.
2021-02-12 09:26:36 +05:30
Deepak Dixit e897ffc7ce Updated code as per lucene dependency update (OFBIZ-12100) 2021-01-04 14:42:10 +05:30
Deepak Dixit 0caff3bb10 Fixed: Updated lucene and solr dependecy to fix the test case failure relate…d to tika-parser dependency update
(OFBIZ-12100)
Manually backported cahnges from commit #1c355bb6d89739cb796bc1e17a7ad2a4a4fa8995
2021-01-04 14:40:10 +05:30
Jacques Le Roux 5ab0a6aa2f Fixed: Issue: Displaying company and product information at product backlog, subcomponent of Scrum Application
(OFBIZ-)

Steps to regenerate:
    Navigate to Applications
    Scrum
    Click on '+ Add product'
    Enter: Company and Product Owner
    Product Name
    Description

Issue: the information given in 4, 5, 6 steps are not displayed at the
Product backlog (view product) screen.

Thanks: Dikpal Kanungo for report and Anushi Gupta for the fix
2020-12-28 11:55:14 +01:00
Jacques Le Roux e3adeec062 Fixed: Lucene TopScoreDocCollector::create wrong call the 2 in Search.groovy scripts (OFBIZ-12087)
I guess it's due to an update of Lucene, easy fix

# Conflicts:
#	ecommerce/groovyScripts/content/Search.groovy
2020-12-07 13:21:24 +01:00
Jacques Le Roux 49b96e47cc * Fixed: Secure the uploads (OFBIZ-12080)
2020/08/10 the OFBiz security team received a security report by Harshit Shukla
<harshit.shukz@gmail.com>, roughly it was (quoting part of it to simplify):

<<I have identified a Remote Code Execution (RCE) Vulnerability. The reason
behind this RCE is lack of file extension check at
catalog/control/UploadCategoryImage?productCategoryId=CATALOG1_BEST_SELL&pload_file_type=category>>

Using this post-auth RCE in OFBiz demos, Harshit was able to get some AWS
credentials by uploading a webshell (based on [0]).
By security, it was then decided by the Infra and OFBiz security teams to shut
down the demos.

After discussing the elements reported with Mark J Cox (VP of ASF security team)
we in common decided that no CVE was necessary.

# Conflicts handled by hand:
#	birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtServices.java
2020-12-01 09:54:55 +01:00
Saurabh Dixit 3cc8f47135 Fixed: Product summary cards don't have uniform height. (OFBIZ-11910) (#46)
Done following:
1. Used bootstrap card-deck to equalize the height/width of all the product summary cards.

Reference:
https://v4-alpha.getbootstrap.com/components/card/#card-decks

Thanks Guys: Alex Bodnaru for report and suggestion, Saurabh Dixit for the patch, and Daniel Watford for the test
2020-11-30 11:38:26 +01:00
Jacques Le Roux cde1c6ac61 Fixed: Wrong quote marks (OFBIZ-11972)
Thanks: Alex Bodnaru
2020-10-06 16:03:28 +02:00
holivier ccfb388999 Improved: Error messages when generating HTML and PDF file from AsciiDoc files (OFBIZ-11893)
re-encode birt image Report-Master.png to be supported by asciidoctor
2020-10-05 11:32:12 +02:00
Jacques Le Roux b8c43a178a Fixed: Flexible reports use an old noNamespaceSchemaLocation (OFBIZ-12039)
While working on using flexible reports during this discussion
(https://markmail.org/message/qgebmemkqb6ddgzw)
I found this kind of errors in log:

XmlFileLoader: File Internal Content process error. Line: 20. Error message:
TargetNamespace.2: Expecting no namespace, but the schema document has a target
 namespace of 'http://ofbiz.apache.org/Widget-Form'.

Turned out that it was due to an old use of noNamespaceSchemaLocation when
dynamically creating forms.

The fix is to use the same definition than in current forms.

Thanks: Georg Potthast for starting the discussion

# Conflicts:
#	birt/src/main/java/org/apache/ofbiz/birt/BirtWorker.java
#	birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtServices.java
2020-10-04 11:38:14 +02:00
Jacques Le Roux ad04cda8f0 Fixed: Complete Birt Flexible Reports documentation (OFBIZ-9188)
Removes "NOTE: This feature will begin to be officially available with the
R17.12 branch first release"

# Conflicts resolved by hand
#	birt/src/docs/asciidoc/_include/bt-creating reports.adoc
#	birt/src/docs/asciidoc/birt.adoc
2020-10-03 11:07:58 +02:00
Jacques Le Roux 1205ac591c Improved: display/selection of unit of measure is broken/plugins (OFBIZ-11993)
Better code

Thanks: Alex

Conflicts handled by hand ProductDetail.ftl
2020-09-14 08:00:48 +02:00
Akash Jain faf008c152 Fixed: Error on removing scrum members (OFBIZ-7249)
Thanks, Anurag Chandak for report.
2020-09-01 15:18:05 +05:30
Suraj Khurana d4e9a765ff Fixed: Typo in class name.
(OFBIZ-11978)
Thanks Alex Bodnaru for reporting and providing the patch.
2020-09-01 15:11:22 +05:30
Jacques Le Roux ab61110dc5 Fixed: display/selection of unit of measure is broken/plugins (OFBIZ-11993)
Allows selection of uom for multiple products on the same web page

Thanks: Alex
2020-08-31 10:07:56 +02:00
Jacques Le Roux c4a031dcb2 Fixed: multiflex css is linking to wrong location (OFBIZ-11977)
Thanks: Alex
2020-08-30 11:19:10 +02:00
Akash Jain 8c6c0f5834 Fixed: Distorted Final Checkout Review page when Credit card is selected as Payment option (OFBIZ-11920)
Thanks, Rashi Dhagat for reporting.
2020-08-25 21:18:46 +05:30
Akash Jain 05d8e9fa3e Fixed: Product link on Order confirmation page is not responding (OFBIZ-11735)
Thanks, Rashi Dhagat for reporting.
2020-08-03 18:16:29 +05:30
Jacques Le Roux c05bc3af1b Improved: Update markup of Quick Checkout Page according Bootstrap v4.0.0 (OFBIZ-10136)
Fixes a typo
2020-07-25 10:06:52 +02:00
Aditya Sharma 64b0f25e34 Fixed: ui for the product summary in promotion product list (OFBIZ-11906)
The product summary in the row is too slim, leaving 75% of the place unused.
Added CSS that forces to take 100% width
Thanks Alex Bodnaru for reporting and providing the patch
2020-07-24 16:08:07 +05:30
Jacques Le Roux 7a51784e2a Improved: Rename a few map files (OFBIZ-11882)
Renames a few files to suppress warnings in the browser console.

Thanks: Alex Bodnaru
2020-07-23 09:11:48 +02:00
Pawan Verma b93265d798 Fixed: Send me this every month link is not working in order items section(OFBIZ-10891)
Thanks, Ashish for the report, Vivek for lookup and Amit for the patch.
2020-07-11 10:32:17 +05:30
Jacques Le Roux 918d3e8518 Fixed: Error while uploading file in Ecommerce Profile's File Manager (OFBIZ-10746)
This is only fixing the UI where you did not see the file to upload you selected

There is still an issue to upload the file

Thanks: Priya Sharma for testing
2020-06-23 14:36:33 +02:00
Aditya Sharma 2b3252cf37 Improved: Breadcrumbs should be shown on all the pages of eCommerce application
(OFBIZ-2584)
Right now in OOTB eCommerce application breadcrumbs are only shown for catalog pages. It should be available on other pages too.

Added breadcrumb for ContactUs and Anonymous ContactUs page

Thanks Pranay Pandey for reporting the issue and Aishwary Shrivastava for providing the patch
2020-06-02 19:23:36 +05:30
Jacques Le Roux 09c9bab4d0 Improved: adds pull_request_template.md (OFBIZ-11722) 2020-05-31 09:47:17 +02:00
Pawan Verma aa7008407b Fixed: Improve the buttons on edit credit card page
(OFBIZ-10975)

Thanks: Sourabh and Suraj for your contribution.
2020-05-10 14:12:38 +05:30
Jacques Le Roux a64dea4ffe Reverted: Revert "Adds the meta CSRF token for Ajax"
This reverts commit 11250f22d8.

Revert "Improved: POC for CSRF Token"

This reverts commit d52374422e.

I forgot that I committed these changes in ecommerce w/o committing in framework
2020-04-27 18:30:03 +02:00
Jacques Le Roux 11250f22d8 Adds the meta CSRF token for Ajax 2020-04-04 18:36:02 +02:00
Jacques Le Roux d52374422e Improved: POC for CSRF Token
(OFBIZ-11306)

There is no need to change it in common-controller because, apart the ecommerce
application, there are no applications that requires an anonymous flow.
It should be only changed in ecommerce controller.
2020-04-04 18:36:02 +02:00
Pawan Verma fcbb750cf6 Fixed: Product Images not rendering on One Page Checkout
(OFBIZ-11400)

Thanks: Archana Asthana for the report and Devanshu Vyas for the patch.
2020-03-28 12:42:52 +01:00
Jacques Le Roux ba31a241ac Fixed: Ensure that the SameSite attribute is set to 'strict' for all cookies.
(OFBIZ-11470)

As reported by OWASP ZAP:
A cookie has been set without the SameSite attribute, which means that the
cookie can be sent as a result of a 'cross-site' request. The SameSite attribute
is an effective counter measure to cross-site request forgery, cross-site script
inclusion, and timing attacks.

The solution was not obvious in OFBiz for 2 reasons:

1. There is no HttpServletResponse::setHeader. So we need to use a filter
  (SameSiteFilter) and even that is not enough because of 2:
2. To prevent session fixation we force Tomcat to generates a new jsessionId,
ultimately put in cookie, in LoginWorker::login. So we need to add a call to
SameSiteFilter::addSameSiteCookieAttribute in
UtilHttp::setResponseBrowserDefaultSecurityHeaders.
2020-03-20 17:53:57 +01:00
Jacques Le Roux c7c511eda6 Improved: no functional change
Follows the "How to apply the Apache License to your work" section at
https://www.apache.org/licenses/LICENSE-2.0
2020-03-14 12:38:21 +01:00
Jacques Le Roux b0dd29895f Implemented: have a license
(OFBIZ-11451)

Fixes missing sections in LICENCE and adds NOTICE

I have also removed the plugins prefix in "URIs" because we are under plugins

Thanks: Jacopo for spotting missing sections
2020-03-14 08:27:24 +01:00
Pierre Smits 706fc86892 Implemented: have a license
(OFBIZ-11451)
2020-03-13 16:06:45 +01:00
Suraj Khurana c117078a61 Fixed: Unable to remove items from onePageCheckout screen of e-commerce.
(OFBIZ-10800)

Thanks Arpit Mor for reporting and Dhaval Wagela for the patch.
2020-03-02 12:20:33 +05:30
Jacques Le Roux c84b388b85 Fixed: replaceFirst sensible to variable pattern
(OFBIZ-11396)

When using variable pattern with replaceFirst you may cross issues if the
pattern contains specific tokens. For instance on Windows with the path
"C:\projectsASF\Git\ofbiz-framework/" you have inside the token "\p" which has
a special meaning.
2020-02-22 07:42:01 +01:00
Jacques Le Roux bffd5d9d0d Improved: no functional change
This file inadvertently slipped in with a previous commit, it's not needed.
2020-02-19 14:09:44 +01:00
Jacques Le Roux 6d9314e8bf Improved: no functional change
This was added for OFBIZ-9198 but was superfluous since the same is already in
the included ecommerce controller
2020-02-19 14:03:19 +01:00
Jacques Le Roux 90b2d6c9bf Fixed: The "stream" request-map in ecommerce and commonext controllers
requires authentication
(OFBIZ-11349)

Thanks: Michael for reporting a possible issue when only commenting the "stream"
request-map in commonext controller. And Jacopo to suggest to require
authentication (after suggesting to comment out)

It should be also noted that when the CSRF defense implementation will be in
place, all XSS vulnerabilities w/o authentication will not longer be possible.
Because then all requests shall contains a CSRF token.
2020-02-19 14:01:04 +01:00
Jacques Le Roux 8926d686c9 Improved: Temporarily comment out the "stream" request-map in ecommerce
controller for security reason
(OFBIZ-11348)

No functional change, simply amend the comment
2020-02-14 10:25:03 +01:00
Jacques Le Roux bd600a3dd4 Fixed: Temporarily comment out the "stream" request-map in ecommerce controller
for security reason
(OFBIZ-11348)

A vulnerability has been reported to the OFBiz security team. We were able to
quickly and quietly fix it in supported versions, but in the ecommerce component.
To be able to release the 17.12.01 version with this vulnerability fixed we need
to temporarily comment out the "stream" request-map in ecommerce controller.
We will later fix the specific issue in ecommerce to put back the functionnalities
allowed by the "stream" request-map in ecommerce controller.
2020-02-13 06:54:31 +01:00
Aditya Sharma 93f513517f Implemented: Cookie Consent In E-Commerce
(OFBIZ-11333)
Implemented internationalisation by initialising the plugin in header.ftl and using uiLabels for title, message and labels.
Thanks Michael Brohl for your inputs
2020-02-11 14:27:43 +05:30
Aditya Sharma 8b45efaee3 Implemented: Cookie Consent In E-Commerce
(OFBIZ-11333)
The Cookie Law is a piece of privacy legislation that requires websites to get consent from visitors to store or retrieve any information on their computer, smartphone or tablet. It was designed to protect online privacy, by making consumers aware of how information about them is collected and used online, and give them a choice to allow it or not.

The EU Cookie Legislation began as a directive from the European Union. Some variation on the policy has since been adopted by all countries within the EU.

The EU Cookie Legislation requires 4 actions from website owners who use cookies:
1. When someone visits your website, you need to let them know that your site uses cookies.
2. You need to provide detailed information regarding how that cookie data will be utilized.
3. You need to provide visitors with some means of accepting or refusing the use of cookies in your site.
4. If they refuse, you need to ensure that cookies will not be placed on their machine.

Used bsgdprcookies plugin to implement the feature. Thanks Deepak Nigam for initiating and providing initial patch. Thanks Deepak Nigam, Pierre Smits, Michael Brohl, Jacques Le Roux and Swapnil M Mane for inputs.
2020-02-11 14:27:24 +05:30
Aditya Sharma 53e1b6f9a4 Improved: no functional change
Added .gitignore file
2020-02-10 10:48:36 +05:30
Nicolas Malin 6296ab4078 Fixed: Error when initialize billFromParty from groovy context in loadSalesOrderItemFact service
After the conversion from bsh to groovy, the script that resolve
billFromParty need to propage the value on context Map to be available
on minilang context
2020-02-06 13:03:41 +01:00
Pawan Verma ca08d3f8bb Fixed: service 'loadSalesOrderItemFact' has hard coded currencyUomId
(OFBIZ-11033)

Used PartyAccountingPreference.baseCurrencyUomId instead of hard coded USD.

Thanks: Pierre Smits for your contribution.
2020-01-30 18:56:28 +05:30
Jacques Le Roux b6b745a7a1 Fixed: User should not be directed to main page after adding product to cart
from showcart page
(OFBIZ-11223)

    Navigate to URL: https://demo-trunk.ofbiz.apache.org/ecomseo/
    Click on View Cart at top-right of the page (User will be directed to showcart page)
    Enter product number (Eg: GZ-2644)
    Enter quantity
    Click on add to cart

Product is added to the cart but user is directed to main page of ecommerce. 


Thanks: Arpit Mor for report, Sourabh Punyani for the fix
2020-01-26 06:27:33 +01:00
akash 3045557f32 Fixed: User is unable to create return.
(OFBIZ-10850)
Thanks, Ashish and Ankush Upadhyay for your contribution.
2020-01-25 18:37:54 +05:30
Pawan Verma 2d3ca0534e Merge branch 'release18.12' of https://gitbox.apache.org/repos/asf/ofbiz-plugins into release18.12 2020-01-25 11:42:55 +05:30
Pawan Verma af2fde4fd3 Fixed: Corrected file path for ProcessPaymentSettings.groovy
(OFBIZ-11324)
2020-01-25 11:42:34 +05:30
James Yong 4b7a3b3789 Fixed: processorder is submitted as GET instead of POST
(OFBIZ-11319)

During checkout of shopping cart, it is observed that the processorder of the form action is submitted as GET which is incorrect.

Thanks: Jacques for the review
2020-01-19 00:30:13 +08:00
Mathieu Lirzin 20a82a9598 Fixed: Add XML declaration in “web.xml” files (OFBIZ-6993)
These declarations avoid SAXParseException traceback when parsing web.xml
the first time in WebappUtil.parseWebXmlFile

A schema conformance issue has been fixed in ecommerce “web.xml”.

(cherry picked from commit 1158664ba3)

# Conflicts handled by hand
#	msggateway/webapp/msggateway/WEB-INF/web.xml
2019-12-19 06:50:23 +01:00
Jacopo Cappellato ad91ba42c0 Fixed: Add missing view permissions checks to various screens. 2019-11-16 08:16:44 +01:00
Jacques Le Roux 2520f9357e Fixed: Link in verification email for Newsletter gives security error
(OFBIZ-9804)

Changes ContactListEmailTemplate.ftl to also use GET. 
Because we dont' want a form to ask, but only to hide parameters.
See details in Jira.

Handles the emails also in ecomseo after OFBIZ-11278

I have still to see why I get this message at the end of the process:
"Invalid verify code for the New Product Announcements"
ie when using the link in the last (3rd) email:
"Subscribe Contact List New Product Announcements"
This will be another Jira..!
2019-11-10 11:05:30 +01:00
Jacques Le Roux 8a0ae58940 Fixed: double forward slashes in ecommerce emails
(OFBIZ-2618)

I reopened this issue because while working on OFBIZ-9804 I found that
since maybe r1052457 some baseEcommerceSecureUrl in screens like 
ContactListSubscribeEmail are not working anymore.
While at it I remove the commented out lines
2019-11-10 04:40:40 +01:00
Jacques Le Roux c432d0483a "Applied fix from plugins for revision: 1868545"
------------------------------------------------------------------------
r1868545 | jleroux | 2019-10-17 14:19:33 +0200 (jeu. 17 oct. 2019) | 16 lignes

Fixed: EditExample always update status, because current Status not shown
(OFBIZ-11230)

In the EditExample Form, the drop-down is populates with the Valid change status 
only. So current status is not in the list and the status print in the drop-down 
is the next authorized. I want to modify exampleName or exampleType, I go to 
editExample and change what I want and validate. The problem is status is also 
changed!

There are 12 other same or similar cases. For the first of them (in FinAccount) 
there is the same bug: when I change FinAccount Name, status change too. If I 
add current="first-in-list" in the tag drop-down it works 

jleroux: Quote is a peculiar case due to OFBIZ-7337 which was a wrong fix
 
Thanks: Oliver for the analysis and the fix 
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1868547 13f79535-47bb-0310-9956-ffa450edef68
2019-10-17 12:20:10 +00:00
Jacques Le Roux 802adf0385 "Applied fix from plugins for revision: 1867849"
------------------------------------------------------------------------
r1867849 | jleroux | 2019-10-01 19:32:02 +0200 (mar. 01 oct. 2019) | 18 lignes

Fixed: Issue with "User name filed" while creating the new user
(OFBIZ-11226)

Steps to regenerate:

    Open URL https://demo-trunk.ofbiz.apache.org
    2. Click on the "Register" button for creating a new customer
    3. Enter all the mandatory details for the registring a new customer
    4. Enter the user name with a dot (.), for example: "demo.user"
    5. Click on the "Save" button

Actual: Error message "Username can only have letters, digits and the _- 
        characters" is displaying on the screen.

Expected: Dot (.) should be also allowed in validation rules when we enter user 
name manually with a dot (.)

Thanks: Vedansh Tiwari for report
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1867850 13f79535-47bb-0310-9956-ffa450edef68
2019-10-01 17:32:53 +00:00
Jacques Le Roux 4492b0cc55 "Applied fix from plugins for revision: 1867717"
------------------------------------------------------------------------
r1867717 | jleroux | 2019-09-29 11:43:42 +0200 (dim. 29 sept. 2019) | 11 lignes

Fixed: Freemarker error on reviewProduct page on storefront
(OFBIZ-11108)

Steps to regenerate:
1)Navigate to https://demo-trunk.ofbiz.apache.org/ecommerce/control/main
2) User should not be logged in
3) Click on any product
4) Click on Be The First To Review This Product! link
5) FTL error for the null check is occurring

Thanks: Minal Phalak for the patch and Suraj for review
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1867720 13f79535-47bb-0310-9956-ffa450edef68
2019-09-29 11:00:35 +00:00
Jacques Le Roux 3b54c81e1b "Applied fix from plugins for revision: 1867712"
------------------------------------------------------------------------
r1867712 | jleroux | 2019-09-29 11:31:59 +0200 (dim. 29 sept. 2019) | 9 lignes

Improved: UI issue on ecommerce Product page
(OFBIZ-10884)

Navigate to demo-trunk ecom
Click on Product titled as Enchiladas, It redirects to the product page
On the Product page, Multiple horizontal lines are displayed 

Thanks: Garima jain for report, Sourabh Punyani for initial patch and Jayesh 
Agrawal for updated patch
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1867713 13f79535-47bb-0310-9956-ffa450edef68
2019-09-29 09:34:24 +00:00
Nicolas Malin e9bae9a7bd Improved: Any ecommerce user has the ability to reset anothers password (including admin) via "Forget Your Password"
(OFBIZ-4361)

Update ecommerce plugin to use the forget passord process with jwtToken :
  * Add jwtToken managment on update password page
  * Change changepassword to passwordChange on controller for align with common-controller



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1867648 13f79535-47bb-0310-9956-ffa450edef68
2019-09-27 19:26:26 +00:00
Pawan Verma 9a9ba5703d Applied fix from trunk for revision: 1865828
===

Fixed: Scrum parties don't have partyTypeId set
(OFBIZ-11013)
Added missing partyTypeId data for the Scrum Parties.

Thanks: Pierre Smits for your contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1865833 13f79535-47bb-0310-9956-ffa450edef68
2019-08-24 09:48:03 +00:00
Jacques Le Roux ff56f6c6b4 "Applied fix from plugins for revision: 1865398"
------------------------------------------------------------------------
r1865398 | jleroux | 2019-08-18 17:16:12 +0200 (dim. 18 août 2019) | 5 lignes

Fixed: <description> of <visual-theme> in Theme.xml does not work
(OFBIZ-9867)

There is no str:label in UelFunctions class but util:label
Missed theses files in previous commit (damn plugins)
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1865399 13f79535-47bb-0310-9956-ffa450edef68
2019-08-18 15:17:30 +00:00
Jacques Le Roux 08f7e7bebe "Applied fix from plugins for revision: 1865347"
------------------------------------------------------------------------
r1865347 | jleroux | 2019-08-17 13:34:01 +0200 (sam. 17 août 2019) | 9 lignes

Fixed: Issue loading solr component (JNDI timeout)
(OFBIZ-11156)

We need to provide a JNDI environment property for Solr to load faster

Fixes previous commit where I hastily harcoded in jndi.properties file

Used a system property which can be used to define a JNDI environment 
property
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1865350 13f79535-47bb-0310-9956-ffa450edef68
2019-08-17 11:39:20 +00:00
Aditya Sharma 840966e2f1 Applied fix from trunk for revision: 1863839
===

Fixed: Check embedded Javascript libs vulnerabilities using retire.js
(OFBIZ-10678)
For solving CVE-2018-14041, Bootstrap upgraded to latest 4.3.1
Thanks Jacques Le Roux for the reviews


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1863852 13f79535-47bb-0310-9956-ffa450edef68
2019-07-27 09:37:36 +00:00
Jacques Le Roux 94f2947278 "Applied fix from plugins for revision: 1862466 "
------------------------------------------------------------------------
r1862466 | jleroux | 2019-07-03 15:30:28 +0200 (mer. 03 juil. 2019) | 20 lignes

Fixed: Error message is displayed when user having space in username logs 
in at ecommerce
(OFBIZ-10671)

Steps to regenerate:
 # Open URL: [https://demo-trunk.ofbiz.apache.org/ecommerce/control/main]
 # Click on register in header section
 # Provide all the mandatory information but provide a user name such that is 
    contains a space (like: Walter White or Jesse Pinkman)
 # Click on save button

Actual: When user clicks on save button then he is redirected to main page of 
ecommerce and an error message is displayed. 
Similarly when user with space in username tries to login, error message is 
displayed. 

Praven: Added standard regex for username allowed alphabets, numbers, and _-
jleroux: actually "-" was  missing in the regepx definition.

Thanks: Arpit Mor for report and Praveen Sharma for the fix
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1862469 13f79535-47bb-0310-9956-ffa450edef68
2019-07-03 13:32:10 +00:00
Jacques Le Roux 14e58e127d "Applied fix from plugins for revision: 1861986"
------------------------------------------------------------------------
r1861986 | jleroux | 2019-06-24 12:31:11 +0200 (lun. 24 juin 2019) | 6 lignes

Fixed: Last Categories section is blank 
(OFBIZ-10858)

Fixes typos in descriptions

Thanks: Priya Sharma
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1861987 13f79535-47bb-0310-9956-ffa450edef68
2019-06-24 10:32:05 +00:00
Jacques Le Roux d241da1275 "Applied fix from plugins for revision: 1861904"
------------------------------------------------------------------------
r1861904 | jleroux | 2019-06-23 11:09:00 +0200 (dim. 23 juin 2019) | 26 lignes

Fixed: Last Categories section is blank 
(OFBIZ-10858)

Issue 1:
1. Open https://demo-trunk.ofbiz.apache.org/ecomseo
2. Click on a category from the Categories section
3. Refresh the page
Actual:
1. Last Categories is blank
2. If we refresh the page then only the search category visible with the last 
row blank with a bullet.

Issue 2:
1. Open https://demo-trunk.ofbiz.apache.org/ecomseo
2. Click on a category from the Categories section
3. Again, open the https://demo-trunk.ofbiz.apache.org/ecomseo in the new tab
Actual: 1st row is blank with searched categories

As per the initial observation, the issue persists for some specific categories 
like Dropship Products, Account Activation and Services.
For all other categories, the last categories section is populated correctly. 
So there could be some issue with the data.

jleroux: on Priya warning I modified the descriptions

Thanks: Rashi Dhagat for reporting, Priya Sharma for the fix
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1861906 13f79535-47bb-0310-9956-ffa450edef68
2019-06-23 09:11:49 +00:00
Swapnil Mane e970e53fb1 Applied fix from trunk for revision: 1861824
===

Fixed: UI issue on the Contact Us page of ecommerce application
(OFBIZ-11061)

Steps to regenerate:

1. Navigate to https://demo-trunk.ofbiz.apache.org/ecomseo/
2. Click on Login
3. Enter valid username and password
4. Click on login button
5. Click on Contact Us

Actual: From, subject and message label are not displayed properly on some resolution.

Note: This issue is resolution specific if you are unable to generate the issue then increase the resolution of your screen or zoom in the page on browser

Thanks:  Arpit Mor for reporting and Sasikant Biswal for providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1861826 13f79535-47bb-0310-9956-ffa450edef68
2019-06-22 09:15:26 +00:00
Suraj Khurana caf1a38c8d Applied fix from trunk for revision: 1860801
===

Fixed: Blank page appears after using Tell-A-Friend functionality while adding item to cart.
(OFBIZ-10885)
Thanks Ravi Lodhi for reporting and Nitish Mishra for providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1860803 13f79535-47bb-0310-9956-ffa450edef68
2019-06-08 06:47:15 +00:00
Deepak Dixit 5b546b1aba Applied fix from trunk for revision: 1860648
===

Fixed: Wrong page title displayed on contact us page of ecommerce
(OFBIZ-11062)
Thanks Arpit Mor and Ayushi Rathod for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1860649 13f79535-47bb-0310-9956-ffa450edef68
2019-06-05 09:46:02 +00:00
Suraj Khurana 349deceab7 Applied fix from trunk for revision: 1859906
===

Fixed: Unable to find any product in Quick Add functionality.
(OFBIZ-10978)
Thanks Vivek Bisen for providing the patch, Pawan Verma and Jacques Le Roux for review.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1859907 13f79535-47bb-0310-9956-ffa450edef68
2019-05-25 05:07:01 +00:00
Jacques Le Roux 49289bc161 "Applied fix from plugins for revision: 1859893"
------------------------------------------------------------------------
r1859893 | jleroux | 2019-05-24 19:15:04 +0200 (ven. 24 mai 2019) | 4 lignes

Fixed: Services allow arbitrary HTML for parameters with allow-html set to "safe"
(OFBIZ-5254)

Once again forgot to commit this changes in plugins :/
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1859894 13f79535-47bb-0310-9956-ffa450edef68
2019-05-24 17:16:44 +00:00
Jacques Le Roux c828fa3735 "Applied fix from plugins for revision: 1859735 "
------------------------------------------------------------------------
r1859735 | jleroux | 2019-05-22 18:41:04 +0200 (mer. 22 mai 2019) | 12 lignes

Fixed: massPrintOrders service does not work
(OFBIZ-11049)

This problem was similar to what was resolved by r1806237 for OFBIZ-9138.

This fixes it by using the same solution than in r1806237. If the visual theme 
is unknown in the the service  context  get the default theme from 
general.properties using ThemeFactory::resolveTheme.

sendPrintFromScreen, createFileFromScreen, sendBirtMail, getXslFo and 
printReportPdf (in example) were concerned

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1859737 13f79535-47bb-0310-9956-ffa450edef68
2019-05-22 16:41:59 +00:00
Jacques Le Roux 45feca67b3 "Applied fix from plugins for revision: 1859012"
------------------------------------------------------------------------
r1859012 | jleroux | 2019-05-09 16:32:35 +0200 (jeu. 09 mai 2019) | 6 lignes

Fixed: Touch F8 in webpos does not work and generate an error
(OFBIZ-11010)

Adds missing data for POS_SALES_CHANNEL fix this issue, was removed in r1754402.

Thanks: Pawan Verma
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1859013 13f79535-47bb-0310-9956-ffa450edef68
2019-05-09 14:33:36 +00:00
Jacopo Cappellato 40484c0f36 Applied fix from trunk for revision: 1858435
===

Fixed: improved the configuration for the "add forum message" form (the source 
tab is not needed in the ecommerce application).



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1858439 13f79535-47bb-0310-9956-ffa450edef68
2019-04-30 14:58:45 +00:00
Jacques Le Roux 31327e2f59 "Applied fix from plugins for revision: 1858312"
------------------------------------------------------------------------
r1858312 | jleroux | 2019-04-28 12:51:46 +0200 (dim. 28 avr. 2019) | 17 lignes

Fixed: Remove link is not working in shopping list
(OFBIZ-10967)

Steps to reproduce
1. Login with valid username and password.
2. Navigate to ecommerce.
2.1 Adds product/s to the cart
2.2 Add it/them in a shopping list.
4. Navigate to shopping list section.
5. Click on link “Remove"
Expected Result: Product should be removed from shopping list.
Actual Result: Remove link is not working.

jleroux: OFBIZ-7291 broke it. That can be tested on old demo (R13)
Fixed by using a simple submit field

Thanks: Ashish Sharma for report
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1858313 13f79535-47bb-0310-9956-ffa450edef68
2019-04-28 10:52:24 +00:00
Suraj Khurana 9320c40558 Applied fix from trunk for revision: 1858289
===

Fixed: Shortkeys missing on WebPOS.
(OFBIZ-10961)
It was broken after jQuery update on rev #1850712.
Thanks Padmavati Rawat for reporting and Rohit Koushal for providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1858290 13f79535-47bb-0310-9956-ffa450edef68
2019-04-27 16:40:08 +00:00
Suraj Khurana 4952ed4713 Applied fix from trunk for revision: 1858285
===

Fixed: FindTask does not allow for all statuses possible to be selected.
(OFBIZ-10913)
Thanks Pierre Smits for repoting, Deepak Dixit for comments/findings and Pawan Verma for providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1858286 13f79535-47bb-0310-9956-ffa450edef68
2019-04-27 16:15:02 +00:00
Deepak Dixit 64ff2f81c1 Applied fix from trunk for revision: 1858265
===

Improved: UI issue on ecommerce main page
(OFBIZ-10849)
1. Navigate to demo-trunk ecom
2. Scroll the page and see the last category section in the right column of the screen.
3. The last category section seems to be distorted because of the empty list Screenshot attached for the same.

The patch contains the following:
- Fixed the category section rendering.

- Improved the markup of survey section of the main page.
- Improved the UI/UX of view cart screen 

Thanks  Garima jain  and Nitish Mishra for  your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1858266 13f79535-47bb-0310-9956-ffa450edef68
2019-04-27 11:43:45 +00:00
Suraj Khurana 8be85cc8e8 Applied fix from trunk for revision: 1858244
===

Fixed: Can't set (expected) start and end date of project when creating a project. 
(OFBIZ-10927)
Thanks Pierre Smits for reporting, Pawan Verma for the patch and Jacques for review.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1858245 13f79535-47bb-0310-9956-ffa450edef68
2019-04-27 06:44:36 +00:00
Jacques Le Roux b9ac3ac4d2 "Applied fix from plugins for revision: 1858141 "
------------------------------------------------------------------------
r1858141 | jleroux | 2019-04-25 16:27:36 +0200 (jeu. 25 avr. 2019) | 11 lignes

Fixed: Ensure html verbosity is following general setup
(OFBIZ-10940)

Currently the configuration of the Birt and Scrum component does not follow the 
- de facto - standard of having the html code reference the OFBiz widget and 
templates. 
See [1] vs [2]
[1] view-source:https://demo-trunk.ofbiz.apache.org/birt/control/main
[2] view-source:https://demo-trunk.ofbiz.apache.org/accounting/control/main

Thanks: Pierre Smits
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1858142 13f79535-47bb-0310-9956-ffa450edef68
2019-04-25 14:28:18 +00:00
Jacques Le Roux a2fe68212c Fixed: Update Tomcat to 9.0.18 due to CVE-2019-0232
(OFBIZ-10920)

CVE-2019-0232 Apache Tomcat Remote Code Execution on Windows

Severity: Important

Vendor: The Apache Software Foundation

Versions Affected:
Apache Tomcat 9.0.0.M1 to 9.0.17
Apache Tomcat 8.5.0 to 8.5.39
Apache Tomcat 7.0.0 to 7.0.93

Description:
When running on Windows with enableCmdLineArguments enabled, the CGI
Servlet is vulnerable to Remote Code Execution due to a bug in the way
the JRE passes command line arguments to Windows. The CGI Servlet is
disabled by default. The CGI option enableCmdLineArguments is disabled
by default in Tomcat 9.0.x (and will be disabled by default in all
versions in response to this vulnerability). For a detailed explanation
of the JRE behaviour, see Markus Wulftange's blog [1] and this archived
MSDN blog [2].

Mitigation:
Users of affected versions should apply one of the following mitigations:
- Ensure the CGI Servlet initialisation parameter enableCmdLineArguments
    is set to false
- Upgrade to Apache Tomcat 9.0.18 or later when released
- Upgrade to Apache Tomcat 8.5.40 or later when released
- Upgrade to Apache Tomcat 7.0.93 or later when released
This announcement is being made before the releases are available as the
change to fix this issue is obviously security related.

Credit:
This issue was identified by an external security researcher and
reported to the Apache Tomcat security team via the bug bounty program
sponsored by the EU FOSSA-2 project.


jleroux: actually Tomcat 9.0.19 was released, here it is

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1857587 13f79535-47bb-0310-9956-ffa450edef68
2019-04-15 14:42:28 +00:00
Jacques Le Roux 7d6fbeebb9 "Applied fix from plugins for revision: 1857173 "
------------------------------------------------------------------------
r1857173 | jleroux | 2019-04-09 13:49:10 +0200 (mar. 09 avr. 2019) | 8 lignes

Fixed: Error message is displayed while click on create new quotes.
(OFBIZ-10882)

This feature has been removed with OFBIZ-10882, 

This removes the "Create New Quote" link, the redundant "Save" link (there is a 
Save button) and the OrderCreateQuoteFromShoppingList label which was only used 
there
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1857175 13f79535-47bb-0310-9956-ffa450edef68
2019-04-09 11:51:06 +00:00
Deepak Dixit 9d0e6c2528 Applied fix from trunk for revision: 1857120
===

Improved: Amount field is editable at Product Detail Page 
(OFBIZ-10663)
Added mising css and js code to show/hide the amount field based on Product.requireAmount field.
Thanks  Dikpal Kanungo for reporting the issue.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1857121 13f79535-47bb-0310-9956-ffa450edef68
2019-04-08 16:53:30 +00:00
Jacques Le Roux 15480125b8 "Applied fix from plugins for revision: 1856917 "
------------------------------------------------------------------------
r1856917 | jleroux | 2019-04-04 14:17:35 +0200 (jeu. 04 avr. 2019) | 12 lignes

Fixed: Unable to create new quote from cart at eCommerce store
(OFBIZ-10886)

Actually we decided that an external user should not be able to create quotes
but only requests for quote.

This disables creating quotes from the ecommerce. An authorised user can still
do the same from the backedn (order manager)

Thanks: Sanjay Yadav for initial report, Sasikant Biswal for trying, Pierre for
mentioning that this should not be open to external users and Pawan Verma for 
the fix
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1856918 13f79535-47bb-0310-9956-ffa450edef68
2019-04-04 12:19:18 +00:00
Jacques Le Roux 5a4dcd611d "Applied fix from plugins for revision: 1856802"
------------------------------------------------------------------------
r1856802 | jleroux | 2019-04-02 09:52:53 +0200 (mar. 02 avr. 2019) | 17 lignes

Fixed: Error message is displayed in shopping cart when click on recalculate 
cart link
(OFBIZ-10852)

Login with valid username and password.
Navigate to ecommerce.
Add multiple product in shopping cart.
Select one product and click on remove selected.
Product should be removed.
Select another product and click on recalculate cart.

Expected result: Product should be recalculate.
Actual result: Error message is displayed as 404. Screen print attached

jleroux: I did not see the error message but the fix makes sense anyway

Thanks: Ashish Sharma for report Sasikant Biswal for the fix
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1856803 13f79535-47bb-0310-9956-ffa450edef68
2019-04-02 07:57:15 +00:00
Jacques Le Roux a4cee4a745 "Applied fix from plugins for revision: 1856212 "
------------------------------------------------------------------------
r1856212 | jleroux | 2019-03-25 18:47:52 +0100 (lun. 25 mars 2019) | 9 lignes

Fixed: Update Tomcat to 9.0.16 due to CVE-2019-0199
(OFBIZ-10873)

The HTTP/2 implementation accepted streams with excessive numbers of
SETTINGS frames and also permitted clients to keep streams open without
reading/writing request/response data. By keeping streams open for
requests that utilised the Servlet API's blocking I/O, clients were able
to cause server-side threads to block eventually leading to thread
exhaustion and a DoS.
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1856214 13f79535-47bb-0310-9956-ffa450edef68
2019-03-25 17:50:29 +00:00
Aditya Sharma 3a73856173 Applied fix from trunk for revision: 1855084
===

Improved: Replace document.write() occurrences with some legitimate code
(OFBIZ-10759)
Removed document.write.lastFocusedName as code works without it


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1855092 13f79535-47bb-0310-9956-ffa450edef68
2019-03-09 06:51:09 +00:00
Suraj Khurana 6d0cc93ee9 Applied fix from trunk for revision: 1855082
===

Fixed: Product image is not displayed on showcart page of ecommerce.
(OFBIZ-10738)
Thanks Arpit Mor for reporting the issue and Praveen Sharma for providing the patch.
It was occuring due to incorrect encoder type used and so URL was not creating properly to render the image.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1855089 13f79535-47bb-0310-9956-ffa450edef68
2019-03-09 06:39:33 +00:00
Deepak Dixit aefe7895ac Applied fix from trunk for revision: 1853904
===

Improved: Updated plugin code to fix console warning related to deprecated method. Removed Double constructor call as its depracated since jdk 9. Also replace the CellType::getCellTypeEnum method call with CellTyoe::getCellType
(OFBIZ-10757)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1854692 13f79535-47bb-0310-9956-ffa450edef68
2019-03-03 10:52:01 +00:00
Deepak Dixit c5a05c83ff Applied fix from trunk for revision: 1854684
===

Preparation for JDK11 update, Updated following code to fix warning with respect to JDK11
- Replaced Class::newInstance occurrences
(OFBIZ-10757)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1854690 13f79535-47bb-0310-9956-ffa450edef68
2019-03-03 10:46:27 +00:00
Jacques Le Roux a331d3dee8 Improved: no functional change
Copies Solr doc from trunk

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1854518 13f79535-47bb-0310-9956-ffa450edef68
2019-02-28 10:31:29 +00:00
Swapnil Mane 96fc00f7d0 Applied fix from trunk for revision: 1852988
===

Fixed: 404 error while creating/updating contact information from the checkout page
(OFBIZ-10827)

Thanks: Ravi Lodhi for reporting the issue and Pawan Verma for providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1852990 13f79535-47bb-0310-9956-ffa450edef68
2019-02-05 11:56:38 +00:00
Jacques Le Roux a67d054c35 "Applied fix from plugins for revision: 1851885 "
------------------------------------------------------------------------
r1851885 | jleroux | 2019-01-23 08:14:21 +0100 (mer. 23 janv. 2019) | 10 lignes

Fixed: Implemented: Navigate from a domain to another with automated signed in 
authentication
(OFBIZ-10307)

Non functional change

Removes now useless "webappName" var after I put in the SecuredUserLoginId 
cookies.

Thanks: Michael for spotting it in OFBIZ-10814
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1851887 13f79535-47bb-0310-9956-ffa450edef68
2019-01-23 07:17:11 +00:00
Aditya Sharma c62accc95c Applied fix from trunk for revision: 1851316
===

Improved: Replace Inline js with External js in renderDateFindField macro
(OFBIZ-9850)
Added an example in FormWidgetExamples for the field.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1851318 13f79535-47bb-0310-9956-ffa450edef68
2019-01-15 04:59:33 +00:00
Deepak Dixit 7ffe31bed9 Applied fix from trunk for revision: 1851185
===

Improved: Convert Promotion Screen of e-commerce as per Bootstrap Styling
(OFBIZ-10793)
Thanks  Nitish Mishra for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1851186 13f79535-47bb-0310-9956-ffa450edef68
2019-01-12 19:16:59 +00:00
Deepak Dixit 249ed1b30f Applied fix from trunk for revision: 1851140
===

Fixed:List Request page seems distorted of ecommerce component
(OFBIZ-10621)
Thanks  Garima jain for reporting the issue.
Set the col class based on right/left screen inclusion


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1851142 13f79535-47bb-0310-9956-ffa450edef68
2019-01-12 06:50:54 +00:00
Deepak Dixit 7bf63fad20 Applied fix from trunk for revision: 1851139
===

Only formatting , No function chages
(OFBIZ-10790)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1851141 13f79535-47bb-0310-9956-ffa450edef68
2019-01-12 06:48:31 +00:00
Deepak Dixit dc87292455 Applied fix from trunk for revision: 1851135
===

Improved: Improve ecommerce main-decorator 
(OFBIZ-10790)
Added two new section in ecommerce main-decorator, now we don't need to pass right/left bar screen name, instead we can include it directly in decoratot-section.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1851136 13f79535-47bb-0310-9956-ffa450edef68
2019-01-12 06:16:36 +00:00
Jacques Le Roux 684a5a1220 "Applied fix from plugins for revision: 1851068 "
------------------------------------------------------------------------
r1851068 | jleroux | 2019-01-11 17:12:01 +0100 (ven. 11 janv. 2019) | 12 lignes

Fixed: Add session tracking mode and make cookie secure
(OFBIZ-6655)

Following "Session timeout for webapps" discussion on dev ML 
https://markmail.org/message/p6fbiojjrwb2ybxd

We decided to put back the session-timeout value in web.xml files and to remove
the line
    session.setMaxInactiveInterval(60*60); //in seconds
from ControlEventListener.java

Thanks: Deepak Nigam for report and Girish Vasmatkar for discussion
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1851073 13f79535-47bb-0310-9956-ffa450edef68
2019-01-11 16:15:16 +00:00
Deepak Dixit 2ded55743a Applied fix from trunk for revision: 1851009
===

Improved: Update multifex theme as per new markup 
(OFBIZ-10118)
Thanks Ayushi Rathod, Parakh Maheshwari and Nitish Mishra for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1851010 13f79535-47bb-0310-9956-ffa450edef68
2019-01-11 06:23:45 +00:00
Deepak Dixit b7949d22a8 Applied fix from trunk for revision: 1851002
===

Fixed: Page dropdown list on categorydetail page broken
(OFBIZ-10787)
Thanks Sebastian Wachinger for reporting the issue.
Corrected the condition to display pagination options


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1851004 13f79535-47bb-0310-9956-ffa450edef68
2019-01-11 06:04:35 +00:00
Aditya Sharma f2c26f9d97 Applied fix from trunk for revision: 1850712
===

Improved: Replace jQuery.bind() with jQuery.on()
(OFBIZ-10758)
As of jQuery 3.0, .bind() has been deprecated. It was superseded by the .on() method for attaching event handlers to a document.
Additional change:
Improved boolean returns with single statement, replacing if blocks with explicit boolean return.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1850714 13f79535-47bb-0310-9956-ffa450edef68
2019-01-08 05:25:10 +00:00
Nicolas Malin e029947649 Created feature branch 18.12 for the ofbiz-plugins.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release18.12@1849862 13f79535-47bb-0310-9956-ffa450edef68
2018-12-28 14:37:05 +00:00
Suraj Khurana 0b6a1feced Fixed: Quantity of the product added in the cart should not be negative.
(OFBIZ-10668)
Thanks Dikpal Kanungo for reporting and Prakhar Kumar for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1849532 13f79535-47bb-0310-9956-ffa450edef68
2018-12-22 10:14:26 +00:00
Jacques Le Roux d00f9fc378 Improved: Plugins Asciidoc documentation must be standalone
(OFBIZ-10658)

Removes toc information after ":toclevels:" 3 is used in build.gradle


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1849119 13f79535-47bb-0310-9956-ffa450edef68
2018-12-17 17:42:20 +00:00
Jacques Le Roux adeaa4a869 Improved: Better explain fields in FormWidgetExampleForms
(OFBIZ-6734)

Removes 3 useless TODO

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1849116 13f79535-47bb-0310-9956-ffa450edef68
2018-12-17 17:36:56 +00:00
Jacques Le Roux e5f5603563 Improved: Resolve possible conflicts for masked date input feature
(OFBIZ-10719)

As it's useless and confusing, for now comments out the only occurrence

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1849084 13f79535-47bb-0310-9956-ffa450edef68
2018-12-17 12:49:50 +00:00
Jacques Le Roux 7934c1c8ed Improved: In widget forms display element has not time type
(OFBIZ-6731)

bq. <date-time input-method="time-dropdown"
is used instead we have 11 matches in code.

Removes the occurrence in example component


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1849027 13f79535-47bb-0310-9956-ffa450edef68
2018-12-16 13:14:30 +00:00
Deepak Dixit d2101257df Fixed: visual-editor not working on ecommerce (OFBIZ-10708)
The main issue was in js file loading, jQuery is being initialised twice thus eltre might not be available in the prototype of reinitialised jQuery object.
Thanks Aditya Sharama for the discussion

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1848921 13f79535-47bb-0310-9956-ffa450edef68
2018-12-14 10:32:46 +00:00
Jacques Le Roux 695301d303 Improved: Fix or Silence various warnings
(OFBIZ-10701)

In order to detect potential issues early, the linting compiler option should be 
used by default and disabled with {{./gradlew -PXlint:none build}}.

Additionally it is important to reduce the number of warnings otherwise new 
warnings will remain unnoticed.

The warning related to the com.googlecode.concurrentlinkedhashmap dependency 
should resolves itself once we handle upgrade to Caffeine like proposed in 
OFBIZ-6747.

Thanks: Mathieu Lirzin

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1848673 13f79535-47bb-0310-9956-ffa450edef68
2018-12-11 13:33:49 +00:00
Jacques Le Roux 7a48532e18 Fixed: User's name is displayed on ecommerce even after user logs out
(OFBIZ-10666)

Steps to regenerate:
Open URL: https://demo-trunk.ofbiz.apache.org/ecommerce/control/main. 
  Welcome is displayed and user's name is not displayed when URL is opened.
Login at ecommerce, username will be displayed after user logs in.
Logout of ecommerce by clicking on logout. User will be logged out and login 
  link will be displayed in place of logout link, but the name of user is still 
  displayed.

Actual: Username is still displayed after user logs out
Expected: Username should not be displayed after the user logs out

Note: Similar issue also exists when the user clicks on (Not You?) link.

Thanks: Arpit Mor for detailled report, Deepak Dixit for discussion

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1848398 13f79535-47bb-0310-9956-ffa450edef68
2018-12-07 13:14:48 +00:00
Jacques Le Roux 769084a49b Fixed: Standalone Asciidoc plugins documents can't render logo correctly in PDF
(OFBIZ-10677)

Forgot to commit the birt.adoc file with the way to generate the logo

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1848396 13f79535-47bb-0310-9956-ffa450edef68
2018-12-07 13:07:37 +00:00
Shi Jinghai ec605656ca Improved: OFBizPricatUtil class don't use a org.apache.ofbiz.pricat package
(OFBIZ-10655)

I didn't realized OFBizPricatUtil under org.apache.poi package is a bug 
for OFBiz project at the first sight of this issue. When I tried to think from 
Jacques view as our project SQA, I understood this OFBizPricatUtil may be missed 
during code style check, and this is a major problem :).

Now I moved the OFBizPricatUtil under org.apache.ofbiz.pricat.util package and 
changed two other files accordingly.

I upgraded the implement to match the POI 3.7 used in the OFBiz plugins 
trunk, and I also tested it with POI 4.0.0 and it worked fine.

Thanks: Jacques for pointing out this issue


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1848009 13f79535-47bb-0310-9956-ffa450edef68
2018-12-02 18:51:51 +00:00
Michael Brohl 08bb7bddeb Fixed: Update and fix openstreetmap.org integration.
(OFBIZ-10553)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1847711 13f79535-47bb-0310-9956-ffa450edef68
2018-11-29 10:47:11 +00:00
Jacques Le Roux e4e7d859e7 Documented: Standalone Asciidoc plugins documents can't render logo correctly in
PDF
(OFBIZ-10677)

It does not work, I'll revisit that later.

Using Buildbot to copy the logo locally would work, but only to generate for us.
Not for users who would want to generate locally. They could use a manual copy.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1847708 13f79535-47bb-0310-9956-ffa450edef68
2018-11-29 09:59:40 +00:00
Jacques Le Roux baae0891eb Reverted: User should be redirected to view cart page after adding the product
from compare product screen
(OFBIZ-10667)

Revert r1847478

There was a problem with this fix. It changes the behaviour of additem when you 
add an item from the main or another page.

The behaviour is defined by the "Always View Cart After Adding An Item." 
checkbox in the cart view.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1847530 13f79535-47bb-0310-9956-ffa450edef68
2018-11-27 11:27:39 +00:00
Jacques Le Roux a801e93e0e Fixed: User should be redirected to view cart page after adding the product
from compare product screen
(OFBIZ-10667)

Currently user is navigating add item page instead of view cart page while 
adding product to cart from compare product screen. User gets stuck after 
navigating over add item page.

Steps to replicate the issue: 
 1. Go to eCommerce application.
 2. Click on add to compare button for the products - 
    Round Gizmo and Tiny Chrome Widget.
 3. Click on 'Compare Products' from right bar.
 4. Click on 'Add to cart' over compare product screen.

Expected behaviour : User should be redirected to view cart page instead 
of add item page.

Thanks: Ratnesh Upadhyay for report and Ritesh Kumar for the fix

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1847528 13f79535-47bb-0310-9956-ffa450edef68
2018-11-27 11:18:07 +00:00
Jacques Le Roux 0b9bc64ace Fixed: Instructions for Configurable PC don't work
(OFBIZ-10542)

This concerns only R16, R17 and the trunk. The "Instructions" button was not 
present in R13.

This kind of message shows:
Trunk:
<a href="javascript:showErrorAlert('The following errors occurred','');"
R16:
<a href="javascript:showErrorAlert(" the="" following="" errors="" occurred","")

The same exists for all configurable products, notably Gold Pizza

Thanks: Priya Sharma

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1847398 13f79535-47bb-0310-9956-ffa450edef68
2018-11-25 08:40:23 +00:00
Akash Jain 29b5f15861 Improved: Corrected all the checkboxes and radio buttons in all the ecommerce FTLs, applied patch from jira issue.
(OFBIZ-7670)
Thanks, Chandrashekhar Dhakad for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1847363 13f79535-47bb-0310-9956-ffa450edef68
2018-11-24 13:07:42 +00:00
Deepak Dixit f5e575a025 Improved: Use input type=submit for form submission
(OFBIZ-10482)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1847351 13f79535-47bb-0310-9956-ffa450edef68
2018-11-24 09:38:14 +00:00
Deepak Dixit cc74c200ec Improved: Removed some unused commented code
(OFBIZ-10482)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1847350 13f79535-47bb-0310-9956-ffa450edef68
2018-11-24 09:27:27 +00:00
Suraj Khurana 9418ad3bab Fixed: Error message is displayed on ecommerce when user tries to use Split shipment functionality.
(OFBIZ-10623)
Thanks Arpit Mor for reporting and Praveen Sharma for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1847348 13f79535-47bb-0310-9956-ffa450edef68
2018-11-24 09:07:33 +00:00
Deepak Dixit d4fa2f9f6d Fixed: Quote list is not showing on ecommerce
(OFBIZ-10628)
Thanks  Mohammed Rehan Khan for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1847346 13f79535-47bb-0310-9956-ffa450edef68
2018-11-24 08:48:01 +00:00
Jacques Le Roux 16328e2185 Fixed: Plugins Asciidoc documentation must be standalone
(OFBIZ-10658)

Completes the standalone document part as required by guidelines.

Note that using ":toclevels: 3" does not work when generating with Gradle 
because of the OOTB definition "'toclevels': '5'" in build.gradle

It does when used apart in Asciidoc editors. I believe OOTB a 3 levels is enough
 and the numbers are superfluous if not unpleasant.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1847272 13f79535-47bb-0310-9956-ffa450edef68
2018-11-23 14:27:05 +00:00
Jacques Le Roux 5cfeab364f Documented: no functional changes
Last touch on Birt doc

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1847196 13f79535-47bb-0310-9956-ffa450edef68
2018-11-22 17:59:53 +00:00
Jacques Le Roux e17875795b Documented: no functional changes
Formats too long lines in bt-*.adoc files

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1847192 13f79535-47bb-0310-9956-ffa450edef68
2018-11-22 17:01:41 +00:00
Jacques Le Roux d315facebd Documented: no functional changes
Formats too long lines in wa-cross-domains-SSO.adoc 
Fixes references in bt-creating reports.adoc
Fixes text in bt-report master creation.adoc

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1847177 13f79535-47bb-0310-9956-ffa450edef68
2018-11-22 15:07:19 +00:00
Jacques Le Roux 4ef341f142 Improved: Update build.gradle to the latest dependencies
(OFBIZ-10214)

4 updates were not possible:
  Tika 1.18 max
  Poi 3.17 max
I did not update
  sshd-core
  cas-server-core

Please refer to the Jira for more information

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1847026 13f79535-47bb-0310-9956-ffa450edef68
2018-11-20 16:42:05 +00:00
Jacques Le Roux 634ba04427 Improved: Convert Birt component doc from Markdown to AsciiDoc
(OFBIZ-10647)

Following [this thread|https://markmail.org/message/nujdq5rmegcg3p4z], convert 
Birt component doc from Markdown to AsciiDoc.

While doing so move images from 
[wiki|https://cwiki.apache.org/confluence/display/OFBIZ/Birt+Flexible+Reports] 
to source and update 
the [blog|https://blogs.apache.org/ofbiz/entry/the-birt-flexible-reports-a]

 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1846531 13f79535-47bb-0310-9956-ffa450edef68
2018-11-13 19:20:19 +00:00
Jacques Le Roux a8d7cd417d Improved: Have eCommerce component reflect the new situation re iDEAL
(OFBIZ-5445)

Remove IDEAL related code from the ecommerce component.

When the IDEAL solution isn't part of the accounting component, the code in 
ecommerce should be removed as well. 

Thanks: Pierre Smits

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1846229 13f79535-47bb-0310-9956-ffa450edef68
2018-11-09 10:30:52 +00:00
Jacques Le Roux f16195f359 Fixed: Correct behaviour of Autologin cookies
(OFBIZ-10635)

Renames "keep-autologin-cookie" to "use-autologin-cookie", and only create 
Autologin cookies when needed. No need to create Autologin cookies in 
applications that don't need it.

Don't pass webAppName to LoginWorker::getSecuredUserLoginId, that can be handled
with improved LoginWorker::getSecuredLoginIdCookieName

Removes LoginWorker::autoLogoutCleanCookies, no longer needed since only those
needed are created and kept (1 year at least after creation).

For both autoLogin and securedLoginId cookies sets the path to the application.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1845558 13f79535-47bb-0310-9956-ffa450edef68
2018-11-02 09:46:42 +00:00
Jacques Le Roux 0b8e3f2290 Improved: Update Solr and Lucene from 7.3.1 to Solr 7.5.0
(OFBIZ-10589)

https://lucene.apache.org/solr/guide/7_5/solr-upgrade-notes.html 
should help people to adapt to 7.5 from 7.3

There are more information in the Jira

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1845150 13f79535-47bb-0310-9956-ffa450edef68
2018-10-29 17:26:25 +00:00
Jacques Le Roux b0b2f230f0 Implemented: Navigate from a domain to another with automated signed
in authentication
(OFBIZ-10307)

Forgot this with r1844880

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1845141 13f79535-47bb-0310-9956-ffa450edef68
2018-10-29 16:56:20 +00:00
Jacques Le Roux fddaa1482e Improved: Cart summary section distorted
(OFBIZ-10385)

Navigate to the storefront.
https://demo-trunk.ofbiz.apache.org/ecommerce/control/main 
Add items to the cart.
Check the cart summary section.
Actual:
Cart summary section getting distorted on adding items to the cart

After an issue with r1841672, Garima Jain fixed it by
"Modifiyng the grid classes so that the UI looks good on large screen desktop 
as well as on medium screen desktop width < 1440px or greater than 1024px.

Thanks: Padmavati Rawat for report, Surak for previous commit and Garima for 
the last fix

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1845123 13f79535-47bb-0310-9956-ffa450edef68
2018-10-29 13:32:52 +00:00
Suraj Khurana c73e1347ed Improved: Consistency and Readability improvements for include-menu tag.
(OFBIZ-8972)
Thanks Ankush Upadhyay for reporting and Devanshu Vyas for providing the updated patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1845090 13f79535-47bb-0310-9956-ffa450edef68
2018-10-29 08:31:17 +00:00
Suraj Khurana c57f7a7154 Improved: Consistency and Readability improvements for event tag (controller.xml).
(OFBIZ-8965)
Thanks Ankush Upadhyay for reporting and Devanshu Vyas for providing the updated patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1845087 13f79535-47bb-0310-9956-ffa450edef68
2018-10-29 08:16:50 +00:00
Suraj Khurana 04b720a946 Improved: Consistency and Readability improvements for condition tag.
(OFBIZ-8991)
Thanks Ankush Upadhyay for reporting and Devanshu Vyas for providing the updated patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1845075 13f79535-47bb-0310-9956-ffa450edef68
2018-10-29 06:35:15 +00:00
Suraj Khurana 53ff3ff66e Fixed: Added missing import.
(OFBIZ-10314)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1844966 13f79535-47bb-0310-9956-ffa450edef68
2018-10-27 13:21:20 +00:00
Suraj Khurana 6e84e0983f Fixed: Multiple records are shown in search modal in webpos.
(OFBIZ-10314)
Thanks Archana Asthana for reporting and Shikha Jaiswal for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1844957 13f79535-47bb-0310-9956-ffa450edef68
2018-10-27 12:47:45 +00:00
Ashish Vijaywargiya 71f737fddb Fixed: ECommerce landing page breaks if popular category does not exists.
(OFBIZ-10617)
Thanks Rehan for reporting the issue and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1844946 13f79535-47bb-0310-9956-ffa450edef68
2018-10-27 08:21:09 +00:00
Jacques Le Roux 7f6b866ccf Implemented: Navigate from a domain to another with automated signed in
authentication
(OFBIZ-10307)

This uses a JWT Token authentication to get from one domain, where you are 
signed in, to another domain where you get signed in automatically. 
Something like ExternalLoginKey or Tomcat SSO, but not on the same domain.

In the example component, the FormWidgetExamples screen contains 2 new fields 
in the LinksExampleForm which demonstrate the use from a local instance to the
trunk demo instance.

A simple documentation is available in 
  framework\webapp\src\docs\asciidoc\_include\wa-cross-domains-SSO.adoc

Thanks: Taher for review

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1844880 13f79535-47bb-0310-9956-ffa450edef68
2018-10-26 09:32:46 +00:00
Jacques Le Roux 0cd8756918 Improved: Remove few request-map "edit" attributes in controllers
(OFBIZ-10608)

As documented, currently

    Reserved for future use (not used yet).

I checked, it's still not implemented. So no need to confuse people for now, 
better to remove until it's really used.




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1844744 13f79535-47bb-0310-9956-ffa450edef68
2018-10-24 08:57:03 +00:00
Jacques Le Roux 9aa3fa8888 Documented: Convert Birt Flexible Reports documentation to Asciidoc
(OFBIZ-10594)

The documentation about the Flexible Reports was done with Markdown 
files with links to Confluence for images. 

This convert them to Asciidoc and removes the Markdown files 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1842781 13f79535-47bb-0310-9956-ffa450edef68
2018-10-04 07:45:13 +00:00
Jacques Le Roux de4149e3a8 Documented: Complete Birt Flexible Reports documentation
(OFBIZ-9188)

Add a note:
this feature will be officially available with the R17.12 branch first release

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1842780 13f79535-47bb-0310-9956-ffa450edef68
2018-10-04 07:42:50 +00:00
Suraj Khurana 909c2c5996 Improved: Cart summary section distroted after add to cart on Medium screen devices.
(OFBIZ-10385)
Thanks Padmavati Rawat for reporting and Garima Jain for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1841672 13f79535-47bb-0310-9956-ffa450edef68
2018-09-22 12:16:42 +00:00
Aditya Sharma 4703e7f373 Fixed: Webpos Keyboard Shortcut keys does not work correctly
(OFBIZ-7945)
Updated wrong function calls in switch case of activateHotKeys(). As support for Pin Payment transactions is still to be added under OFBIZ-5241. Commented code for Pin payment transaction and updated other shortcuts accordingly.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1841650 13f79535-47bb-0310-9956-ffa450edef68
2018-09-22 05:52:53 +00:00
Suraj Khurana 13fa3e0d8a Improved: Arranged passport UI labels in alphabetic order.
(OFBIZ-7285)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1840926 13f79535-47bb-0310-9956-ffa450edef68
2018-09-14 13:45:26 +00:00
Suraj Khurana c49e42526c Improved: Arranged myportal UI labels in alphabetic order.
(OFBIZ-7282)
Thanks Shivangi for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1840923 13f79535-47bb-0310-9956-ffa450edef68
2018-09-14 13:23:03 +00:00
Suraj Khurana a33ce18085 Improved: Arranged example UI labels in alphabetic order.
(OFBIZ-7281)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1840920 13f79535-47bb-0310-9956-ffa450edef68
2018-09-14 13:03:48 +00:00
Suraj Khurana 064510efd0 Improved: Arranged ebaystore UI labels in alphabetic order.
(OFBIZ-7280)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1840912 13f79535-47bb-0310-9956-ffa450edef68
2018-09-14 12:03:28 +00:00
Suraj Khurana f85ee26e66 Improved: Arranged scrum UI labels in alphabetic order.
(OFBIZ-7370)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1840908 13f79535-47bb-0310-9956-ffa450edef68
2018-09-14 10:57:41 +00:00
Suraj Khurana 9dfe76971f Improved: Arranged projectmgr UI labels in alphabetic order.
(OFBIZ-7371)
Thanks Shivangi for your contribution and Jacques for review.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1840790 13f79535-47bb-0310-9956-ffa450edef68
2018-09-13 09:37:00 +00:00
Suraj Khurana 0d27498587 Improved: Arranged webpos UI labels in alphabetic order.
(OFBIZ-7320)
Thanks Shivangi for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1840665 13f79535-47bb-0310-9956-ffa450edef68
2018-09-12 11:58:17 +00:00
Nicolas Malin 0058d13c54 Implemented: Calculate estimated shipment delivery time
(OFBIZ-10372)
resynchronise ShoppingCart.makeAllShipGroupInfos function on ebay component with trunk at revision 1840579

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1840581 13f79535-47bb-0310-9956-ffa450edef68
2018-09-11 14:49:49 +00:00
Jacques Le Roux 8b1fbebcff Improved: Ecommerce : Arrange UI Labels in alphabetic order according to best
practice.
(OFBIZ-7325)

jleroux: I slightly moved 2 blocks which were not exactly at the right places.
Not sure of order for uppercase before lowercase, anyway not a big deal.

Thanks: Shivangi Tanwar

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1840568 13f79535-47bb-0310-9956-ffa450edef68
2018-09-11 13:54:07 +00:00
Jacques Le Roux 83bf75872f Improved: Renames setLocaleFromBrowser to SetTimeZoneFromBrowser
everywhere it's needed.
(OFBIZ-10472)

FORGOT IT in WEBPOS!



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1840446 13f79535-47bb-0310-9956-ffa450edef68
2018-09-10 09:52:43 +00:00
Deepak Dixit 8a5dba006b Fixed: Use assign tag instead of local in Tree.ftl,as its causing data load error. Tree.ftl used in DemoTree.xml to demonstrate the entity-engine-transform-xml feature.
Thanks Swapnil Mane for reporting the issue

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1840354 13f79535-47bb-0310-9956-ffa450edef68
2018-09-08 11:44:45 +00:00
Deepak Dixit 63c0163669 Improved: Replace #assign with #local in all the ftl macros
(OFBIZ-10516)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1840350 13f79535-47bb-0310-9956-ffa450edef68
2018-09-08 09:38:11 +00:00
Deepak Dixit 756159c5f5 Fixed: Freemarker error on shopping list page on eCommerce storefront
(OFBIZ-10459)
Apply slightly modified patch, Thanks Pritam Kute for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1840349 13f79535-47bb-0310-9956-ffa450edef68
2018-09-08 09:23:45 +00:00
Jacques Le Roux edb2e18fa0 Improved: UI for all promotions listing disturbed
(OFBIZ-10462)
The "checkout section" in the ecommerce main page is not easily legible
(OFBIZ-10414)

Steps to regenerate the issue are as follows:
1) Navigate to storefront
2) Click on "View All Promotions" button.

Expected:
All promotions should be in a listed format.

Actual:
All promotions are listed inline.

jleroux: I also added a space after uiLabelMap.CommonDetails in 
ShowAllPromotions template in order

This also improves OFBIZ-10414

Thanks: Pritam Kute

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1840263 13f79535-47bb-0310-9956-ffa450edef68
2018-09-06 20:42:10 +00:00
Suraj Khurana 6579ae5e8c Fixed: Java object rendering on billing section of one page anonymous checkout process.
(OFBIZ-10425)
Thanks Jason Hao for reporting and Priya Sharma for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1838816 13f79535-47bb-0310-9956-ffa450edef68
2018-08-24 10:55:54 +00:00
Aditya Sharma ac1d793e7d Improved: Change the uggly favicon with the new one ! | Using new OFBiz logo
(OFBIZ-10522)
Reverted unwanted changes

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1838798 13f79535-47bb-0310-9956-ffa450edef68
2018-08-24 09:20:53 +00:00
Aditya Sharma ba17a2ed01 Improved: Change the uggly favicon with the new one ! | Using new OFBiz logo
(OFBIZ-10522)
Updated the icon for the ecommerce.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1838797 13f79535-47bb-0310-9956-ffa450edef68
2018-08-24 09:18:59 +00:00
Jacques Le Roux 9e1aca3047 Fixed: Search in Ecommerce no longer works
(OFBIZ-10531)

I guess that when I worked on OFBIZ-9164 I broke that.

I found 3 occurences where the dispatcher was not in the session because the 
session comes from the request and the request has not it in.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1838381 13f79535-47bb-0310-9956-ffa450edef68
2018-08-19 15:30:42 +00:00
Suraj Khurana 855cc73dc1 Fixed: Could not find simple-method createWorkEffortSkillStandard as it was called as simple method and it is converted to entity-auto service.
(OFBIZ-10524)
Thanks Fernando Ortega for reporting the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1838249 13f79535-47bb-0310-9956-ffa450edef68
2018-08-17 11:08:18 +00:00
Jacques Le Roux cff2d7ef71 Fixed: Update Apache Tomcat to 9.0.10 because of CVE-2018-8037
(OFBIZ-10517)

If an async request was completed by the application at the same time as the 
container triggered the async timeout, a race condition existed that could 
result in a user seeing a response intended for a different user. 
An additional issue was present in the NIO and NIO2 connectors that did not 
correctly track the closure of the connection when an async request was 
completed by the application and timed out by the container at the same time.
This could also result in a user seeing a response intended for another user. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1837857 13f79535-47bb-0310-9956-ffa450edef68
2018-08-11 10:37:40 +00:00
Suraj Khurana ac6ba4388b Fixed: Party Search doesn't consider Billing Address and Shipping Address checkbox in WebPos.
(OFBIZ-7709)
Thanks Vishal for your patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1837845 13f79535-47bb-0310-9956-ffa450edef68
2018-08-11 06:18:18 +00:00
Suraj Khurana 99fb5202d3 Fixed: Not able to select Virtual Product in WebPos.
(OFBIZ-7719)
Thanks Vishal for your patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1837796 13f79535-47bb-0310-9956-ffa450edef68
2018-08-10 12:26:48 +00:00
Gil Portenseigne bd389e0fd0 Improved : Remove all unnecessary boxing and unboxing in Java classes
(OFBIZ-10504)

Thanks Taher, Jacques, Mathieu and Rishi for the review

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1837578 13f79535-47bb-0310-9956-ffa450edef68
2018-08-07 07:36:13 +00:00
Suraj Khurana 6662fe8677 Improved: Rename deletePartyContactMechPurpose* services with proper names.
Thanks everyone for discussions.
(OFBIZ-10398)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1836895 13f79535-47bb-0310-9956-ffa450edef68
2018-07-28 12:31:12 +00:00
Deepak Dixit 443411cdf4 Improved: Use application/javascript instead of text/javascript
(OFBIZ-10492)
Replace text/javascript with application/javascript in all the script tag

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1836889 13f79535-47bb-0310-9956-ffa450edef68
2018-07-28 11:50:09 +00:00
Deepak Dixit bee4c75cfb Improved: Remove use of deprecated language attribute from script tag
(OFBIZ-10491)
I did note test the dockbook rendering, but it should work

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1836551 13f79535-47bb-0310-9956-ffa450edef68
2018-07-24 12:42:53 +00:00
Deepak Dixit 1f164336e9 Improved: Remove use of deprecated language attribute from script tag
(OFBIZ-10491)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1836546 13f79535-47bb-0310-9956-ffa450edef68
2018-07-24 11:27:20 +00:00
Aditya Sharma 86066d6ae8 Fixed: UI issue on blog screens on storefront
(OFBIZ-10466)
Thanks: Pritam Kute for reporting the issue and providing the patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1836107 13f79535-47bb-0310-9956-ffa450edef68
2018-07-17 11:48:47 +00:00
Jacques Le Roux c25d1c7611 Improved: Update Solr and Lucene from 7.2.1 to Solr 7.3.1 for security reason
(CVE-2018-8010)
(OFBIZ-10415)

Forgot to update SearchWorker class

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1833317 13f79535-47bb-0310-9956-ffa450edef68
2018-06-11 11:17:54 +00:00
Jacques Le Roux 50c6d3604a Fixed: Click on category the filter function doesn't work
(OFBIZ-10423)

Click on the left category, the page doesn't refresh, there are two issues.

productCategoryId not set in 
   ecommerce/groovyScripts/catalog/AjaxBreadcrumbs.groovy
updated data will fill in #div3, but the div id is missing in 
   ecommerce/widget/CommonScreens.xml
 
Thanks: Jason Hao

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1832800 13f79535-47bb-0310-9956-ffa450edef68
2018-06-04 08:34:35 +00:00
Jacques Le Roux 56bbe808d2 Fixed: jquery.jgrowl.min.css url out of date
(OFBIZ-10421)

jleroux: this is only in ecommerce and R16 is not concerned

Thanks: Jason Hao

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1832727 13f79535-47bb-0310-9956-ffa450edef68
2018-06-02 09:11:22 +00:00
Jacques Le Roux 066e64eac0 Improved: Update Solr and Lucene from 7.2.1 to Solr 7.3.1 for security reason
(CVE-2018-8010)
(OFBIZ-10415)

I'm not sure we are affected but better be safe than sorry
see 
SOLR-12316
https://wiki.apache.org/solr/SolrSecurity
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-8010

The Lucene and Solr tests pass

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1832533 13f79535-47bb-0310-9956-ffa450edef68
2018-05-30 11:04:35 +00:00
Deepak Dixit df49ca5eb7 Implemented: Upgraded to latest Tomcat (9.0.7), Updated tomcat embed websocket jar to 9.0.7
(OFBIZ-10036)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1831084 13f79535-47bb-0310-9956-ffa450edef68
2018-05-07 08:55:30 +00:00
Deepak Dixit cb29f5b873 Fixed: The viewSize should be converted Integer for multiplication
Found one occurence in plugins component

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1830856 13f79535-47bb-0310-9956-ffa450edef68
2018-05-03 18:34:54 +00:00
Rishi Solanki c1c14b8e9c Improved: Remove empty field values from xml data files so that it will not override existing data with empty values. Removed all empty data fields from data files plugins components.
(OFBIZ-10282)
Thanks to Arun Patidar for reporting and review.
Thanks to Suraj Khurana for providing patch for the improvement.
Thanks to Jacques for discussion and finalizing the work.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1830546 13f79535-47bb-0310-9956-ffa450edef68
2018-04-30 10:56:31 +00:00
Rishi Solanki 67148d9997 Improved: UI Label Issue on WebPos screen. Removed unnecessary class that was causing text in white colour.
(OFBIZ-10312)
Thanks Archana Asthana for reporting the issue and Pawan Verma for providing fix.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1830451 13f79535-47bb-0310-9956-ffa450edef68
2018-04-28 13:31:24 +00:00
Rishi Solanki ec98c96794 Improved: Fields going outside. Fix the alignment and widht to adjust the text box in the window.
(OFBIZ-10316)
Thanks Padmavati Rawat for reporting the issue and Pawan Verma for providing fix.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1830448 13f79535-47bb-0310-9956-ffa450edef68
2018-04-28 12:26:51 +00:00
Jacques Le Roux b1fd51c50d Fixed: One Page Checkout page cannot move to Step 5 due to javascript errors
(OFBIZ-10329)

When you click on continue to step 5 you encounter some javascript exception
which makes the checkout process hit the wall.

additional-methods.min.js was missing in ecommerce
 
Thanks: Sameer Gajanan Apte

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1828569 13f79535-47bb-0310-9956-ffa450edef68
2018-04-06 21:06:48 +00:00
Jacques Le Roux af2d526991 Improved: fixed a typo in Creating reports.md
I locally updated Pandoc and it now generates HTML5 code
So when using the -s argument it now generates this warning

[WARNING] This document format requires a nonempty <title> element
  Please specify either 'title' or 'pagetitle' in the metadata.
  Falling back to 'README'

This means that since HTML5 requires a title Pandoc generates it using the file
name

There are 2 options:

* add the -quiet option to hide the warning (lazy/easy)
* add the 'title' or 'pagetitle' in the metadata a bit heavy, default is OK with
  me 

I decided to not change anything since this will anyway certainly changed with 
our new way of documenting

So here are new generated HTML5 pages, also fixes a typo in Creating reports.md

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1826200 13f79535-47bb-0310-9956-ffa450edef68
2018-03-08 10:42:54 +00:00
Deepak Dixit f17180db01 Improved: Added examples for call_fieldlookup3 i.e. Popup lookup field with description and Layered lookup field with autocompletion, description at right and optional target.
(OFBIZ-10012)
Thanks Aditya Sharma for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1825208 13f79535-47bb-0310-9956-ffa450edef68
2018-02-24 10:42:46 +00:00
Arun Patidar 6ceab5c79a Fixed: Changed org.ofbiz package to org.apache.ofbiz in missing files.
(OFBIZ-10235)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1825199 13f79535-47bb-0310-9956-ffa450edef68
2018-02-24 08:51:18 +00:00
Jacques Le Roux 683df915aa Fixed: Logout do not remove autoLogin
(OFBIZ-4959)

Logout method do not disable autoLogin functionality. 
Instead of that it just initializes autoLogin in session and request.

jleroux: this was also needed by OFBIZ-10206 "Security issue in Token Based 
Authentication". 
This creates a keep-autologin-cookie boolean attribute in the webapp element of 
the  ofbiz-component.xml, documented in ofbiz-component.xsd
This attribute is used to get the value from the ofbiz-component.xml files in a
new autoLogoutCleanCookies() LoginWorker method. This method is used not only 
when login out but also when login in. This to be sure that in every cases the 
cookies related to the webapps are removed.
For now only the ecommerce, ecomseo et webpos webapps are keeping and using 
their autologin cookies

Thanks: Roberto Benítez Monje for report and Taher for discussion and suggestion

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1824803 13f79535-47bb-0310-9956-ffa450edef68
2018-02-19 19:23:36 +00:00
Deepak Dixit 95170aed5f Improved: Done some markup cleanup, Removed some unusd html tag. Added css rule to set padding=0 for ul (OFBIZ-9760)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1824654 13f79535-47bb-0310-9956-ffa450edef68
2018-02-18 10:03:06 +00:00
Deepak Dixit 7aeaf226aa Improved: UI improvement on various pages
1) Improvement of various button UI.

2) Improvement in layout at some screens.

3) Alignment issues of some card-header.

Thanks Nitish for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1824650 13f79535-47bb-0310-9956-ffa450edef68
2018-02-18 09:17:21 +00:00
Deepak Dixit ecf7f285b1 Improved: Update markup of various product page according to standard markup given by Bootstrap v4.0.0 (OFBIZ-10160)
Thanks Mayank for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1824648 13f79535-47bb-0310-9956-ffa450edef68
2018-02-18 09:09:04 +00:00
Deepak Dixit 16947071d5 Improved: Fix UI issue for error messages.(OFBIZ-10185)
Thanks  Mayank Lambhate for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1824646 13f79535-47bb-0310-9956-ffa450edef68
2018-02-18 09:00:54 +00:00
Rishi Solanki b00f7efc1d Fixed: Error on My Portal Request Overview Page. Issue was due to an incorrect path of OverViewRequestItems.ftl in ViewRequest screen.
(OFBIZ-10183)
Thanks Ratnesh Upadhyay for reporting the issue and Yogesh Naroliya for providing patch to fix the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1822512 13f79535-47bb-0310-9956-ffa450edef68
2018-01-29 15:01:59 +00:00
Deepak Dixit fb9f826f3d Improved: Update markup of Shopping Lists page according to standard markup given by Bootstrap v4.0.0 (OFBIZ-10119)
Thanks Parakh Maheshwari for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1822395 13f79535-47bb-0310-9956-ffa450edef68
2018-01-27 11:47:08 +00:00
Deepak Dixit a05a7cc708 Improved: Improvement in UI of various pages of ecommerce(OFBIZ-10182)
Thanks  Nitish Mishra for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1822391 13f79535-47bb-0310-9956-ffa450edef68
2018-01-27 11:41:03 +00:00
Deepak Dixit b3d7080811 Improved: Update markup of Checkout page according to standard markup given by Bootstrap v4.0.s (OFBIZ-10105)
Thanks Mayank for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1822389 13f79535-47bb-0310-9956-ffa450edef68
2018-01-27 11:16:45 +00:00
Arun Patidar 9f84e6c979 FIXED:popup image takes full width of browser window for ecommerce multiflex theme.
(OFBIZ-8411)
Thanks Wai and Aishwary for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1822377 13f79535-47bb-0310-9956-ffa450edef68
2018-01-27 09:30:20 +00:00
Deepak Dixit 0255eb3b98 Improved: Update markup of qucik add page according to standard markup given by Bootstrap v4.0.0 (OFBIZ-10161)
Thanks Nitish Mishra for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1822145 13f79535-47bb-0310-9956-ffa450edef68
2018-01-24 18:06:18 +00:00
Deepak Dixit 4f99bbfa72 Improved: Update markup of advanced seach page page according to standard markup given by Bootstrap v4.0.0 (OFBIZ-10162)
Thanks Nitish Mishra for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1822143 13f79535-47bb-0310-9956-ffa450edef68
2018-01-24 17:56:49 +00:00
Deepak Dixit f995012c19 Improved: Update markup of quick reorder section according to standard markup given by Bootstrap v4.0.0 (OFBIZ-10163)
Thanks Nitish Mishra for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1822139 13f79535-47bb-0310-9956-ffa450edef68
2018-01-24 17:51:27 +00:00
Deepak Dixit dc38b42349 Improved: Update markup of Last Products section according to standard markup given by Bootstrap v4.0.0 (OFBIZ-10169)
Thanks  Nitish Mishra for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1822133 13f79535-47bb-0310-9956-ffa450edef68
2018-01-24 17:46:20 +00:00
Deepak Dixit c8d1ee4d2a Improved: Update Bootstrap 4.0 library to stable version from bootstrap 4.0 beta-2 (OFBIZ-10179)
Thanks  Parakh Maheshwari for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1822129 13f79535-47bb-0310-9956-ffa450edef68
2018-01-24 17:39:22 +00:00
Jacques Le Roux 04121ce947 Improved: Update Solr/Lucene to 7.2.1.
(OFBIZ-10166)

Reminder: to make sure the LUCENE_VERSION constant in SearchWorker.java 
matches the dependency version. Also the same dependency version should be used 
by Solr and Lucene

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1821184 13f79535-47bb-0310-9956-ffa450edef68
2018-01-15 17:40:49 +00:00
Michael Brohl 0839184e2d Improved: Update Solr/Lucene to 7.2.1.
(OFBIZ-10166)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1821176 13f79535-47bb-0310-9956-ffa450edef68
2018-01-15 16:10:32 +00:00
Jacques Le Roux a1cc1c7558 Improved: Replace Asm select plugin with Select2.
(OFBIZ-10113)

This was missing from r1821001

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1821121 13f79535-47bb-0310-9956-ffa450edef68
2018-01-14 22:56:32 +00:00
Deepak Dixit 42e2440481 Fixed: Incorreect closign of div tag on one page checkout page.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1821053 13f79535-47bb-0310-9956-ffa450edef68
2018-01-13 08:57:33 +00:00
Deepak Dixit b3efcef195 Improved: Update markup of Quick Checkout Page according to standard markup given by Bootstrap v4.0.0 (OFBIZ-10136)
Thanks Mayank Lambhate for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1821051 13f79535-47bb-0310-9956-ffa450edef68
2018-01-13 08:49:54 +00:00
Deepak Dixit a6b28d1be5 Improved: Update markup of OrderHistory page according to standard markup given by Bootstrap v4.0.0 (OFBIZ-10135)
Thanks Nitish Mishra for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1821049 13f79535-47bb-0310-9956-ffa450edef68
2018-01-13 08:41:31 +00:00
Deepak Dixit 222513624a Fixed: Recent markup changed breaks Product view page, https://demo-trunk.ofbiz.apache.org/ecommerce/round-gizmo-GZ-2644-p (OFBIZ-10117)
Thanks Parakh and Mayank for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1821045 13f79535-47bb-0310-9956-ffa450edef68
2018-01-13 06:45:19 +00:00
Deepak Dixit a9a2dccfbb Improved: Message page markup improvement (OFBIZ-10090)
Thanks Nitish Mishra for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1821044 13f79535-47bb-0310-9956-ffa450edef68
2018-01-13 06:41:21 +00:00
Jacques Le Roux 40d5d80e36 Improved: Clean images, among them logos, in all locations used
(OFBIZ-10128)

Fix my previous commits, there is no themes webapp so no URL at 
/themes/common/webapp/images/ofbiz_logo.png
It's only images/ofbiz_logo.png

Also I previously wrongly changed from
VT_HDR_IMAGE_Url
not
VT_HDR_IMAGE_URL
now fixed


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1820982 13f79535-47bb-0310-9956-ffa450edef68
2018-01-12 13:49:09 +00:00
Jacques Le Roux d03b68751c Fixed: Birt plugin depends on example plugin
(OFBIZ-9383)

The BIRT demo data for flexible reports depends on the Example entity from the 
Example plugin.

We should either provide BIRT's own example data with example reports 
OR 
setup a gradle dependency on the example plugin so that everything is in place.

jleroux: this simply duplicates example data in birt component. There are
cases where duplication is the simplest solution even at the cost of possible
divergence in the future (not a problem for the birt component, so it's OK)


Thanks: Michael Brohl for report and Taher for discussion

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1820973 13f79535-47bb-0310-9956-ffa450edef68
2018-01-12 12:22:29 +00:00
Taher A. Alkhateeb f53dc226e8 Reverted: faulty code that caused a regression in installing birt plugin
(OFBIZ-9383)

The code removed used to draw a fixed hard dependency between the BIRT and
example components thus causing the build system to crash when issuing the
command ./gradlew pullPlugin -PpluginId=birt. To be replaced later with a
proper dependency declaration using the plugin manager dependency definitions.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1820962 13f79535-47bb-0310-9956-ffa450edef68
2018-01-12 10:45:06 +00:00
James Yong dae259b009 Improved: ID should be the abbreviation for identity in English
(OFBIZ-100131)

Also cover non-English translations

Thanks: Jacques for the additional patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1820450 13f79535-47bb-0310-9956-ffa450edef68
2018-01-07 12:11:37 +00:00
Jacques Le Roux 83d2b52109 Improved: [DEPRECATION] Replace BigDecimal.ROUND_* by RoundingMode.*
(OFBIZ-9571)

Of course doing too much things at the same time forgot the import :/

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1820388 13f79535-47bb-0310-9956-ffa450edef68
2018-01-06 12:14:55 +00:00
Jacques Le Roux 800b191f2f Improved: [DEPRECATION] Replace BigDecimal.ROUND_* by RoundingMode.*
(OFBIZ-9571)

This was missing in r1804953 and it's now a good opportunity to test the new
ofbizTrunkFrameworkPlugins builder alone

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1820385 13f79535-47bb-0310-9956-ffa450edef68
2018-01-06 12:02:05 +00:00
Jacques Le Roux 2590f490e8 No functional change,
Removes the test error in plugins  used to test the new Buildbot config.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1820077 13f79535-47bb-0310-9956-ffa450edef68
2018-01-04 12:28:47 +00:00
Jacques Le Roux 3ae7f7ca7f No functional change,
Voluntarily put a test error in plugins to test the new Buildbot config.

It will be removed as soon as Buildbot will run w/o duplicate warnings

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1820072 13f79535-47bb-0310-9956-ffa450edef68
2018-01-04 12:02:31 +00:00
Jacques Le Roux 7d9b898e92 Improved: Handle service response effectively
(OFBIZ-9981)

As per discussion on Dev ML:
==========================
Every service calling from java/groovy must handle errors by service util 
methods such as isError, returnError etc. 
and similarly in case of XML <call-service, there should be <check-error/> 
to make sure service was executed successfully.

Apart from this, one suggestion is to include *Debug.logError* in 
*ServiceUtil.returnProblem* so that in case of any error occurred and handled, 
it will always be logged on the console.
==========================

jleroux: this is the plugins part with some slight changes

Thanks: Suraj Khurana and Anushi Gupta

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1819735 13f79535-47bb-0310-9956-ffa450edef68
2017-12-31 12:30:48 +00:00
Jacques Le Roux c86a769119 Completed: Update Lucene and Solr to 7.2
(OFBIZ-10130)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1819597 13f79535-47bb-0310-9956-ffa450edef68
2017-12-30 13:22:14 +00:00
Jacques Le Roux 1e1e7a0d8f Fixed: Exception Error rendering on all View Category pages
(OFBIZ-10006)

Steps to regenerate:
1. Open https://demo-trunk.ofbiz.apache.org/ecommerce/control/main
2. Go to Category section
3. Click any category
Exception Error renders

jleroux: the patch fixes the issue in log but the feature still does not work. 
I mean when you click on a category in the tree nothing happens. 
I see no related js error in browser console.

Thanks: Archana Asthana for report and Aman Agrawal for patch



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1819592 13f79535-47bb-0310-9956-ffa450edef68
2017-12-30 11:35:38 +00:00
502 changed files with 33990 additions and 7190 deletions
+11
View File
@@ -0,0 +1,11 @@
Improved:
Implemented:
Documented:
Completed:
Reverted:
Fixed:
(OFBIZ-)
Explanation
Thanks:
+1
View File
@@ -0,0 +1 @@
/bin/
+227
View File
@@ -0,0 +1,227 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
=========================================================================
This product bundles "jQuery" and "jQuery" plugins and extensions, which are available
under the "MIT" license. For details, see:
webpos/webapp/webpos/images/js/jquery.hotkeys-0.7.9.min.js
webpos/webapp/webpos/images/js/WebPosHotkeys.js
=========================================================================
This product bundles "Webhelp for DocBook", which is available
under the "MIT" License. For details, see cmssite/template/docbook/webhelp/
=========================================================================
This product bundles "DocBook XSL Stylesheets 1.77.1", which is available
under the "MIT" license.
For details, see cmssite/template/docbook/
=========================================================================
This product bundles "Bootstrap", which is available
under the "MIT" license.
For details, see:
ecommerce/webapp/ecommerce/js
ecommerce/webapp/ecommerce/css
+5
View File
@@ -0,0 +1,5 @@
Apache OFBiz
Copyright 2001-2020 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+2 -2
View File
@@ -18,7 +18,7 @@
specific language governing permissions and limitations
under the License.
-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<property key="AssetMaintApplication">
<value xml:lang="de">Instandhaltungsanwendung</value>
<value xml:lang="en">Asset Maintenance Application</value>
@@ -102,7 +102,7 @@
<value xml:lang="zh-TW">上級工作投入</value>
</property>
<property key="AssetMaintPartId">
<value xml:lang="en">Part Id</value>
<value xml:lang="en">Part ID</value>
<value xml:lang="fr">Réf. de la pièce</value>
<value xml:lang="it">Codice parte</value>
<value xml:lang="ja">部品ID</value>
+1 -1
View File
@@ -18,7 +18,7 @@
specific language governing permissions and limitations
under the License.
-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<property key="IsMgrApplication">
<value xml:lang="en">Information Systems Management Application</value>
<value xml:lang="fr">Gestion du parc informatique</value>
+1 -1
View File
@@ -19,7 +19,7 @@
-->
<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
<!-- ========================================================= -->
<!-- ======================== Defaults ======================= -->
+3 -1
View File
@@ -20,7 +20,7 @@
<ofbiz-component name="assetmaint" enabled="true"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
<!-- define resource loaders; most common is to use the component resource loader -->
<resource-loader name="main" type="component"/>
@@ -41,6 +41,7 @@
<webapp name="assetmaint"
title="AssetMaint"
position="19"
server="default-server"
location="webapp/assetmaint"
base-permission="ASSETMAINT"
@@ -49,6 +50,7 @@
<webapp name="ismgr"
title="IS Mgr"
position="20"
server="default-server"
app-bar-display="false"
location="webapp/ismgr"
+1 -1
View File
@@ -19,7 +19,7 @@ under the License.
-->
<service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
<!-- ECAs used to extend service permission checking -->
<eca service="fixedAssetPermissionCheck" event="return" run-on-failure="true">
+1 -1
View File
@@ -14,7 +14,7 @@ under the License.
-->
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
<description>Assetmaint Services: Fixed Asset </description>
<vendor>OFBiz</vendor>
<version>1.0</version>
@@ -55,7 +55,7 @@ public class FixedAssetMaintServices {
String productId = (String)context.get("productId");
String facilityId = (String)context.get("facilityId");
Double quantity = (Double)context.get("quantity");
double requestedQty = quantity.doubleValue();
double requestedQty = quantity;
try {
GenericValue product = ProductWorker.findProduct(delegator, productId);
@@ -87,13 +87,13 @@ public class FixedAssetMaintServices {
while (requestedQty > 0 && itr.hasNext()) {
GenericValue inventoryItem = itr.next();
String inventoryItemId = inventoryItem.getString("inventoryItemId");
atp = inventoryItem.getDouble("availableToPromiseTotal").doubleValue();
atp = inventoryItem.getDouble("availableToPromiseTotal");
findCurrInventoryParams = UtilMisc.toMap("inventoryItemId", inventoryItemId);
Double issueQuantity = null;
if (requestedQty > atp) {
issueQuantity = new Double(atp);
issueQuantity = atp;
} else {
issueQuantity = new Double(requestedQty);
issueQuantity = requestedQty;
}
Map<String, Object> itemIssuanceCtx = new HashMap<String, Object>();
itemIssuanceCtx.put("userLogin", userLogin);
@@ -106,7 +106,7 @@ public class FixedAssetMaintServices {
if (ServiceUtil.isError(result)) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AssetMaintProblemCallingService", locale), null, null, result);
}
requestedQty = requestedQty - issueQuantity.doubleValue();
requestedQty = requestedQty - issueQuantity;
}
} catch (GenericEntityException e) {
Debug.logError("Problem in retriving data from database", module);
+1 -1
View File
@@ -20,7 +20,7 @@
<test-suite suite-name="assetmainttests"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
<test-case case-name="assetmaint-tests">
<simple-method-test location="component://assetmaint/minilang/test/FixedAssetMaintTests.xml"/>
+14 -1
View File
@@ -18,7 +18,7 @@
under the License.
-->
<web-app version="3.0">
<web-app version="4.0" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd">
<display-name>Apache OFBiz - Asset Maintenance</display-name>
<description>Asset Management component of the Apache OFBiz Project</description>
@@ -77,6 +77,11 @@
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -85,6 +90,10 @@
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -103,6 +112,10 @@
<url-pattern>/control/*</url-pattern>
</servlet-mapping>
<session-config>
<session-timeout>60</session-timeout><!-- in minutes -->
</session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
+14 -1
View File
@@ -18,7 +18,7 @@
under the License.
-->
<web-app version="3.0">
<web-app version="4.0" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd">
<display-name>Apache OFBiz - Information Systems</display-name>
<description>Information Systems Management application of the Apache OFBiz Project</description>
@@ -72,6 +72,11 @@
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -80,6 +85,10 @@
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -98,6 +107,10 @@
<url-pattern>/control/*</url-pattern>
</servlet-mapping>
<session-config>
<session-timeout>60</session-timeout><!-- in minutes -->
</session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
+1 -1
View File
@@ -18,7 +18,7 @@
specific language governing permissions and limitations
under the License.
-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<property key="BusinessIntelligenceApplication">
<value xml:lang="en">Business Intelligence Application</value>
<value xml:lang="fr">Application d'informatique décisionnelle</value>
+1 -1
View File
@@ -19,7 +19,7 @@ under the License.
-->
<entitygroup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitygroup.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitygroup.xsd">
<!-- ========================================================= -->
<!-- Dimensions -->
+1 -1
View File
@@ -19,7 +19,7 @@ under the License.
-->
<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
<!-- ========================================================= -->
<!-- ======================== Defaults ======================= -->
<!-- ========================================================= -->
+14 -4
View File
@@ -354,6 +354,16 @@ under the License.
<!-- =============== -->
<!-- facts handling -->
<!-- =============== -->
<script>groovy:
import org.apache.ofbiz.order.order.OrderReadHelper
orderReadHelper = new OrderReadHelper(orderHeader)
context.billFromParty = orderReadHelper.getBillFromParty()
</script>
<set field="partyAccountingPreferencesCallMap.organizationPartyId" from-field="billFromParty.partyId"/>
<call-service service-name="getPartyAccountingPreferences" in-map-name="partyAccountingPreferencesCallMap">
<result-to-field result-name="partyAccountingPreference" field="accPref"/>
</call-service>
<set field="fact.quantity" from-field="orderItem.quantity" type="BigDecimal"/>
<set field="fact.extGrossAmount" value="0" type="BigDecimal"/>
<set field="fact.extGrossCost" value="0" type="BigDecimal"/>
@@ -374,7 +384,7 @@ under the License.
<!-- extGrossAmount -->
<set field="convertUomCurrencyMap.uomId" from-field="orderHeader.currencyUom"/>
<set field="convertUomCurrencyMap.uomIdTo" value="USD"/>
<set field="convertUomCurrencyMap.uomIdTo" from-field="accPref.baseCurrencyUomId"/>
<set field="convertUomCurrencyMap.nowDate" from-field="orderStatus.statusDatetime"/>
<call-service service-name="convertUomCurrency" in-map-name="convertUomCurrencyMap">
<result-to-field result-name="conversionFactor" field="exchangeRate"/>
@@ -406,7 +416,7 @@ under the License.
<first-from-list list="costs" entry="cost"/>
<set field="convertUomCurrencyMap.uomId" from-field="cost.currencyUomId"/>
<set field="convertUomCurrencyMap.uomIdTo" value="USD"/>
<set field="convertUomCurrencyMap.uomIdTo" from-field="accPref.baseCurrencyUomId"/>
<set field="convertUomCurrencyMap.nowDate" from-field="orderStatus.statusDatetime"/>
<call-service service-name="convertUomCurrency" in-map-name="convertUomCurrencyMap">
<result-to-field result-name="conversionFactor" field="exchangeRate"/>
@@ -492,7 +502,7 @@ under the License.
</iterate>
<if-compare field="countGS" operator="equals" value="0">
<set field="convertUomCurrencyMap.uomId" from-field="orderHeader.currencyUom"/>
<set field="convertUomCurrencyMap.uomIdTo" value="USD"/>
<set field="convertUomCurrencyMap.uomIdTo" from-field="accPref.baseCurrencyUomId"/>
<set field="convertUomCurrencyMap.nowDate" from-field="orderStatus.statusDatetime"/>
<call-service service-name="convertUomCurrency" in-map-name="convertUomCurrencyMap">
<result-to-field result-name="conversionFactor" field="exchangeRate"/>
@@ -555,7 +565,7 @@ under the License.
</calculate>
<set field="convertUomCurrencyMap.uomId" from-field="orderHeader.currencyUom"/>
<set field="convertUomCurrencyMap.uomIdTo" value="USD"/>
<set field="convertUomCurrencyMap.uomIdTo" from-field="accPref.baseCurrencyUomId"/>
<set field="convertUomCurrencyMap.nowDate" from-field="orderStatus.statusDatetime"/>
<call-service service-name="convertUomCurrency" in-map-name="convertUomCurrencyMap">
<result-to-field result-name="conversionFactor" field="exchangeRate"/>
+2 -1
View File
@@ -20,7 +20,7 @@ under the License.
<ofbiz-component name="bi" enabled="true"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
@@ -43,6 +43,7 @@ under the License.
<webapp name="bi"
title="Business Intelligence"
position="16"
menu-name="secondary"
server="default-server"
location="webapp/bi"
+1 -1
View File
@@ -19,7 +19,7 @@ under the License.
-->
<service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
<!-- dimension entities -->
<eca service="createProduct" event="global-commit-post-run">
+1 -1
View File
@@ -19,7 +19,7 @@ under the License.
-->
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
<service name="storeGenericDimension" engine="java"
location="org.apache.ofbiz.bi.util.DimensionServices" invoke="storeGenericDimension" auth="true">
+14 -1
View File
@@ -18,7 +18,7 @@
under the License.
-->
<web-app version="3.0">
<web-app version="4.0" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd">
<display-name>Apache OFBiz - Business Intelligence</display-name>
<description>Business Intelligence component of the Apache OFBiz Project</description>
@@ -57,6 +57,11 @@
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -65,6 +70,10 @@
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -83,6 +92,10 @@
<url-pattern>/control/*</url-pattern>
</servlet-mapping>
<session-config>
<session-timeout>60</session-timeout><!-- in minutes -->
</session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
+3
View File
@@ -99,6 +99,9 @@ under the License.
<screen name="main">
<section>
<condition>
<if-has-permission permission="BI" action="_VIEW"/>
</condition>
<actions>
<set field="titleProperty" value="BusinessIntelligenceMainPage"/>
<set field="headerItem" value="main"/>
-7
View File
@@ -23,10 +23,3 @@ dependencies {
exclude group: 'org.eclipse.birt.runtime.3_7_1', module: 'org.apache.batik.pdf'
}
}
// If the example plugin misses the birt component can't build.
// If you want to use the birt component independently of the example plugin
// simply comment out or remove the line below.
apply from: '../example/build.gradle'
// Then the flexible report example will not work
// It's not an issue out of demonstration
// If needed simply remove the birt data related to the example component
+1 -1
View File
@@ -20,7 +20,7 @@
-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<property key="BirtErrorCannotDetermineDataSource">
<value xml:lang="en">Failed to determine data source for report</value>
<value xml:lang="fr">La détermination de la source de données à échoué</value>
+1 -1
View File
@@ -18,7 +18,7 @@
specific language governing permissions and limitations
under the License.
-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<property key="BirtApplication">
<value xml:lang="en">Eclipse BIRT Application</value>
<value xml:lang="fr">Application Eclipse Birt</value>
+1 -1
View File
@@ -24,5 +24,5 @@
dataResourceName="BIRT" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="HELP_BIRT" contentTypeId="DOCUMENT" contentName="BIRT Overview" templateDataResourceId="HELP_TEMPL"
dataResourceId="HELP_BIRT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_BIRT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="" mapKey="BIRT_main"/>
<ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_BIRT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" mapKey="BIRT_main"/>
</entity-engine-xml>
+6 -6
View File
@@ -22,7 +22,7 @@
portletName="Sale Orders by Channel"
screenName="SaleOrdersByChannelReport"
screenLocation="component://birt/widget/order/OrderScreens.xml"
description=""/>
/>
<PortletPortletCategory portalPortletId="OrderByChannel" portletCategoryId="REPORT"/>
<PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="OrderByChannel" portletSeqId="00001" columnSeqId="00001" sequenceNum="6"/>
@@ -30,7 +30,7 @@
portletName="Orders with discount code"
screenName="SaleOrderDiscountCodeReport"
screenLocation="component://birt/widget/order/OrderScreens.xml"
description=""/>
/>
<PortletPortletCategory portalPortletId="OrderDiscountCode" portletCategoryId="REPORT"/>
<PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="OrderDiscountCode" portletSeqId="00001" columnSeqId="00001" sequenceNum="7"/>
@@ -38,7 +38,7 @@
portletName="Last 3 Months Sales Report"
screenName="Last3MonthsSalesReport"
screenLocation="component://birt/widget/order/OrderScreens.xml"
description=""/>
/>
<PortletPortletCategory portalPortletId="Last3MSalesReport" portletCategoryId="REPORT"/>
<PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="Last3MSalesReport" portletSeqId="00001" columnSeqId="00002" sequenceNum="8"/>
@@ -46,7 +46,7 @@
portletName="Coupon Sales Report"
screenName="CouponSalesReport"
screenLocation="component://birt/widget/order/OrderScreens.xml"
description=""/>
/>
<PortletPortletCategory portalPortletId="CouponSalesReport" portletCategoryId="REPORT"/>
<PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="CouponSalesReport" portletSeqId="00001" columnSeqId="00002" sequenceNum="9"/>
@@ -54,7 +54,7 @@
portletName="Sales Report"
screenName="SalesReport"
screenLocation="component://birt/widget/order/OrderScreens.xml"
description=""/>
/>
<PortletPortletCategory portalPortletId="SalesReport" portletCategoryId="REPORT"/>
<PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="SalesReport" portletSeqId="00001" columnSeqId="00002" sequenceNum="10"/>
@@ -62,7 +62,7 @@
portletName="Product Demand Report"
screenName="ProductDemandReport"
screenLocation="component://birt/widget/order/OrderScreens.xml"
description=""/>
/>
<PortletPortletCategory portalPortletId="PDR_Report" portletCategoryId="REPORT"/>
<PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="PDR_Report" portletSeqId="00001" columnSeqId="00002" sequenceNum="12"/>
</entity-engine-xml>
+93
View File
@@ -0,0 +1,93 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<entity-engine-xml>
<ExampleType exampleTypeId="REAL_WORLD" description="Real World"/>
<ExampleType exampleTypeId="MADE_UP" description="Made Up"/>
<ExampleType exampleTypeId="CONTRIVED" description="Contrived" parentTypeId="MADE_UP"/>
<ExampleType exampleTypeId="INSPIRED" description="Inspired" parentTypeId="MADE_UP"/>
<ExampleFeatureApplType exampleFeatureApplTypeId="REQUIRED" description="Required"/>
<ExampleFeatureApplType exampleFeatureApplTypeId="DESIRED" description="Desired"/>
<ExampleFeatureApplType exampleFeatureApplTypeId="NOT_ALLOWED" description="Not Allowed"/>
<StatusType description="Example" statusTypeId="EXAMPLE_STATUS" hasTable="N"/>
<StatusItem description="In Design" sequenceId="01" statusCode="IN_DESIGN" statusId="EXST_IN_DESIGN" statusTypeId="EXAMPLE_STATUS"/>
<StatusItem description="Defined" sequenceId="02" statusCode="DEFINED" statusId="EXST_DEFINED" statusTypeId="EXAMPLE_STATUS"/>
<StatusItem description="Approved" sequenceId="03" statusCode="APPROVED" statusId="EXST_APPROVED" statusTypeId="EXAMPLE_STATUS"/>
<StatusItem description="Implemented" sequenceId="04" statusCode="IMPLEMENTED" statusId="EXST_IMPLEMENTED" statusTypeId="EXAMPLE_STATUS"/>
<StatusItem description="Tested" sequenceId="05" statusCode="TESTED" statusId="EXST_TESTED" statusTypeId="EXAMPLE_STATUS"/>
<StatusItem description="Complete" sequenceId="06" statusCode="COMPLETE" statusId="EXST_COMPLETE" statusTypeId="EXAMPLE_STATUS"/>
<StatusItem description="Cancelled" sequenceId="99" statusCode="CANCELLED" statusId="EXST_CANCELLED" statusTypeId="EXAMPLE_STATUS"/>
<StatusValidChange statusId="EXST_IN_DESIGN" statusIdTo="EXST_DEFINED" transitionName="Definition Complete"/>
<StatusValidChange statusId="EXST_DEFINED" statusIdTo="EXST_APPROVED" transitionName="Approve"/>
<StatusValidChange statusId="EXST_APPROVED" statusIdTo="EXST_IMPLEMENTED" transitionName="Implementation Complete"/>
<StatusValidChange statusId="EXST_IMPLEMENTED" statusIdTo="EXST_TESTED" transitionName="Testing Complete"/>
<StatusValidChange statusId="EXST_TESTED" statusIdTo="EXST_COMPLETE" transitionName="Example Completed"/>
<StatusValidChange statusId="EXST_IN_DESIGN" statusIdTo="EXST_CANCELLED" transitionName="Cancel Example"/>
<StatusValidChange statusId="EXST_DEFINED" statusIdTo="EXST_CANCELLED" transitionName="Cancel Example"/>
<StatusValidChange statusId="EXST_APPROVED" statusIdTo="EXST_CANCELLED" transitionName="Cancel Example"/>
<StatusValidChange statusId="EXST_IMPLEMENTED" statusIdTo="EXST_CANCELLED" transitionName="Cancel Example"/>
<StatusValidChange statusId="EXST_TESTED" statusIdTo="EXST_CANCELLED" transitionName="Cancel Example"/>
<EnumerationType description="Example Feature Source" enumTypeId="EXMPL_FEAT_SOURCE" hasTable="N"/>
<Enumeration description="Customer" enumCode="CUSTOMER" enumId="EXFTSRC_CUSTOMER" sequenceId="01" enumTypeId="EXMPL_FEAT_SOURCE"/>
<Enumeration description="Partner" enumCode="PARTNER" enumId="EXFTSRC_PARTNER" sequenceId="02" enumTypeId="EXMPL_FEAT_SOURCE"/>
<Enumeration description="Employee" enumCode="EMPLOYEE" enumId="EXFTSRC_EMPLOYEE" sequenceId="03" enumTypeId="EXMPL_FEAT_SOURCE"/>
<Example exampleId="EX01" exampleName="Example 1" exampleTypeId="CONTRIVED" statusId="EXST_IN_DESIGN"/>
<Example exampleId="EX02" exampleName="Example 2" exampleTypeId="CONTRIVED" statusId="EXST_IN_DESIGN"/>
<Example exampleId="EX03" exampleName="Example 3" exampleTypeId="CONTRIVED" statusId="EXST_IN_DESIGN"/>
<Example exampleId="EX04" exampleName="Example 4" exampleTypeId="REAL_WORLD" statusId="EXST_IN_DESIGN"/>
<Example exampleId="EX05" exampleName="Example 5" exampleTypeId="REAL_WORLD" statusId="EXST_IN_DESIGN"/>
<Example exampleId="EX06" exampleName="Example 6" exampleTypeId="MADE_UP" statusId="EXST_IN_DESIGN"/>
<Example exampleId="EX07" exampleName="Example 7" exampleTypeId="MADE_UP" statusId="EXST_IN_DESIGN"/>
<Example exampleId="EX08" exampleName="Example 8" exampleTypeId="MADE_UP" statusId="EXST_IN_DESIGN"/>
<Example exampleId="EX09" exampleName="Example 9" exampleTypeId="MADE_UP" statusId="EXST_IN_DESIGN"/>
<Example exampleId="EX10" exampleName="Example 10" exampleTypeId="MADE_UP" statusId="EXST_IN_DESIGN"/>
<Example exampleId="EX11" exampleName="Example 11" exampleTypeId="INSPIRED" statusId="EXST_IN_DESIGN" description="mMy inspired example 11 description"/>
<Example exampleId="EX12" exampleName="Example 12" exampleTypeId="INSPIRED" statusId="EXST_IN_DESIGN" description="mMy inspired example 12 description"/>
<create>
<Example exampleId="EX13" exampleName="Example 13" exampleTypeId="INSPIRED" statusId="EXST_IN_DESIGN"/>
<Example exampleId="EX14" exampleName="Example 14" exampleTypeId="INSPIRED" statusId="EXST_IN_DESIGN"/>
</create>
<create-replace>
<Example exampleId="EX12" exampleName="Example 12 after replace" exampleTypeId="INSPIRED" statusId="EXST_IN_DESIGN"/>
</create-replace>
<create-update>
<Example exampleId="EX12" exampleName="Example 11 after update" exampleTypeId="INSPIRED" statusId="EXST_IN_DESIGN"/>
</create-update>
<delete>
<Example exampleId="EX09"/>
</delete>
<Example exampleId="EX10" exampleName="Example 10 after update"/>
<ExampleItem exampleId="EX01" exampleItemSeqId="00001" description="EX1-001" amount="10"/>
<ExampleItem exampleId="EX01" exampleItemSeqId="00002" description="EX1-002" amount="20"/>
<ExampleItem exampleId="EX02" exampleItemSeqId="00001" description="EX2-001" amount="10"/>
<ExampleItem exampleId="EX02" exampleItemSeqId="00002" description="EX2-002" amount="20"/>
<ExampleItem exampleId="EX02" exampleItemSeqId="00003" description="EX2-003" amount="30"/>
<ExampleStatus exampleId="EX01" statusDate="2010-01-02 00:00:00" statusEndDate="2011-01-02 00:00:00" statusId="EXST_IN_DESIGN"/>
<ExampleStatus exampleId="EX01" statusDate="2011-01-02 00:00:01" statusEndDate="2012-01-02 00:00:00" statusId="EXST_DEFINED"/>
<ExampleStatus exampleId="EX01" statusDate="2012-01-02 00:00:00" statusEndDate="2013-01-02 00:00:00" statusId="EXST_APPROVED"/>
<ExampleStatus exampleId="EX02" statusDate="2010-01-02 00:00:00" statusEndDate="2011-01-02 00:00:00" statusId="EXST_IN_DESIGN"/>
<ExampleStatus exampleId="EX02" statusDate="2011-01-02 00:00:01" statusEndDate="2012-01-02 00:00:00" statusId="EXST_DEFINED"/>
<ExampleStatus exampleId="EX02" statusDate="2012-01-02 00:00:00" statusEndDate="2013-01-02 00:00:00" statusId="EXST_APPROVED"/>
</entity-engine-xml>
+48
View File
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<entity-engine-xml>
<DataResource dataResourceId="HELP_EXAMPLE" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="plugins/example/data/helpdata/HELP_EXAMPLE.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS"
dataResourceName="Framework Example" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="HELP_EXAMPLE" contentTypeId="DOCUMENT" contentName="Framework Example" templateDataResourceId="HELP_TEMPL"
dataResourceId="HELP_EXAMPLE" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_EXAMPLE" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/>
<DataResource dataResourceId="HELP_EXAMPLE_FR" localeString="fr" dataResourceTypeId="OFBIZ_FILE"
objectInfo="plugins/example/data/helpdata/HELP_EXAMPLE_FR.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS"
dataResourceName="Exemple pour le développement" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="HELP_EXAMPLE_FR" contentTypeId="DOCUMENT" contentName="Exemple pour le développement" templateDataResourceId="HELP_TEMPL"
dataResourceId="HELP_EXAMPLE_FR" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html" localeString="fr" />
<ContentAssoc contentId="HELP_EXAMPLE" contentIdTo="HELP_EXAMPLE_FR" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-01-12 01:01:01"/>
<DataResource dataResourceId="EXAMPLE_main" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="plugins/example/data/helpdata/HELP_EXAMPLE_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Example help main page" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="EXAMPLE_main" contentTypeId="DOCUMENT" contentName="Example main menu." templateDataResourceId="HELP_TEMPL" dataResourceId="EXAMPLE_main" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="HELP_EXAMPLE" contentIdTo="EXAMPLE_main" mapKey="EXAMPLE_main" fromDate="2006-01-12 01:01:01" contentAssocTypeId="TREE_CHILD" sequenceNum="000"/>
<ContentAssoc contentId="HELP_EXAMPLE" contentIdTo="EXAMPLE_main" mapKey="EXAMPLE_FindExample" fromDate="2006-01-12 01:01:02" sequenceNum="000" contentAssocTypeId="INSTANCE"/>
<DataResource dataResourceId="EXAMPLE_docbook" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="plugins/example/data/helpdata/HELP_EXAMPLE_docbook.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Example docBook usage" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="EXAMPLE_docbook" contentTypeId="DOCUMENT" contentName="Example Docbook usage" templateDataResourceId="HELP_TEMPL" dataResourceId="EXAMPLE_docbook" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
<ContentAssoc contentId="HELP_EXAMPLE" contentIdTo="EXAMPLE_docbook" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EXAMPLE_docbook"/>
</entity-engine-xml>
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<entity-engine-xml>
<!-- PortalPortlet Seed Data: system pages -->
<PortalPage portalPageId="EXAMPLE" sequenceNum="0" portalPageName="Example Portal Page" description="The default example OFBiz portal page" ownerUserLoginId="_NA_"/>
<PortalPageColumn portalPageId="EXAMPLE" columnSeqId="00001" columnWidthPixels="400"/>
<PortalPageColumn portalPageId="EXAMPLE" columnSeqId="00002"/><!-- no width in pixels or percent, use the rest of the space available -->
<PortalPagePortlet portalPageId="EXAMPLE" portalPortletId="EXAMPLE_1" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
<PortalPagePortlet portalPageId="EXAMPLE" portalPortletId="EXAMPLE_3" portletSeqId="00001" columnSeqId="00002" sequenceNum="1"/>
<PortalPage portalPageId="EXAMPLE1" sequenceNum="100" parentPortalPageId="EXAMPLE" portalPageName="Example Portal Page 1" description="Portal page 1" ownerUserLoginId="_NA_"/>
<PortalPageColumn portalPageId="EXAMPLE1" columnSeqId="00001"/>
<PortalPagePortlet portalPageId="EXAMPLE1" portalPortletId="EXAMPLE_1" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/>
<PortalPage portalPageId="EXAMPLE2" sequenceNum="200" parentPortalPageId="EXAMPLE" portalPageName="Example Portal Page 2" description="Portal page 2" ownerUserLoginId="_NA_"/>
<PortalPageColumn portalPageId="EXAMPLE2" columnSeqId="00001"/>
<PortalPagePortlet portalPageId="EXAMPLE2" portalPortletId="EXAMPLE_1" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/>
</entity-engine-xml>
+39
View File
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<entity-engine-xml>
<PortalPortlet portalPortletId="EXAMPLE_1" portletName="Example 1" description="Example portlet n. 1"
screenName="ExamplePortlet1" screenLocation="component://example/widget/example/PortletScreens.xml"
editFormName="ExamplePortlet1Edit" editFormLocation="component://example/widget/example/PortletEditForms.xml"
screenshot="/images/ofbiz_logo.png"/>
<PortalPortlet portalPortletId="EXAMPLE_2" portletName="Example 2" description="Example portlet n. 2"
screenName="ExamplePortlet2" screenLocation="component://example/widget/example/PortletScreens.xml"
editFormName="ExamplePortlet2Edit" editFormLocation="component://example/widget/example/PortletEditForms.xml"
screenshot="/images/opentravelsystem_logo.jpg"/>
<PortalPortlet portalPortletId="EXAMPLE_3" portletName="Example 3" description="Example portlet n. 3"
screenName="ExamplePortlet3" screenLocation="component://example/widget/example/PortletScreens.xml"
editFormName="ExamplePortlet3Edit" editFormLocation="component://example/widget/example/PortletEditForms.xml"/>
<PortletCategory portletCategoryId="EXAMPLE" description="Example Portlet(s)"/>
<PortletPortletCategory portalPortletId="EXAMPLE_1" portletCategoryId="EXAMPLE"/>
<PortletPortletCategory portalPortletId="EXAMPLE_2" portletCategoryId="EXAMPLE"/>
<PortletPortletCategory portalPortletId="EXAMPLE_3" portletCategoryId="EXAMPLE"/>
</entity-engine-xml>
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<entity-engine-xml>
<!-- Example security -->
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="EXAMPLE_ADMIN"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="EXAMPLE_CREATE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="EXAMPLE_DELETE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="EXAMPLE_UPDATE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" permissionId="EXAMPLE_VIEW"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="VIEWADMIN" permissionId="EXAMPLE_VIEW"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="BIZADMIN" permissionId="EXAMPLE_ADMIN"/>
</entity-engine-xml>
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<entity-engine-xml>
<!-- Example security -->
<SecurityPermission description="View operations in the Example Management Screens." permissionId="EXAMPLE_VIEW"/>
<SecurityPermission description="Create operations in the Example Management Screens." permissionId="EXAMPLE_CREATE"/>
<SecurityPermission description="Update operations in the Example Management Screens." permissionId="EXAMPLE_UPDATE"/>
<SecurityPermission description="Delete operations in the Example Management Screens." permissionId="EXAMPLE_DELETE"/>
<SecurityPermission description="ALL operations in the Example Management Screens." permissionId="EXAMPLE_ADMIN"/>
<!-- super user -->
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="EXAMPLE_ADMIN"/>
</entity-engine-xml>
+22
View File
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<entity-engine-xml>
</entity-engine-xml>
-48
View File
@@ -1,48 +0,0 @@
# Report creation - Admin/Super-User #
## Introduction ##
A flexible report is an OFBiz content of FLEXIBLE\_REPORT type that allows a final user to make use of the reporting module to obtain flexible reports, ie reports which are created from an entity or view definition and even from a service. A flexible report is created from a Report Master (content REPORT_MASTER), and an optional XML override of the parent form.
## Pre-requisite ##
- OFBiz framework
- The Birt plugin
- The BIRT Report Designer
## Report creation ##
1. Get to Birt component in OFBiz ![Birt menus](https://cwiki.apache.org/confluence/download/attachments/68720496/Birt%20Menus.png?api=v2)
2. Click on the "Flexible Report" menu (varies depending on themes)
3. Click on the "Generate report" button, you get to this screen:
4. Fill the form:
![Example Report](https://cwiki.apache.org/confluence/download/attachments/68720496/Example%20Report.png?api=v2)
* The list "Choose report topic" will let you choose among predefined report masters your topic of interest.
* The report name is a simple short name from which the file name will be generated.
* The description is a short description which will allow you to recognise the report and its topic.
* The box "Generate filters in design" will add in the design the visualisation of the filters filled in the filtering form.
Finally, if you don't find what you want, you will need to create a new Report Master...
Once the form is validated, OFBiz will show you the "Edit Report" screen. ![Edit Report screen](https://cwiki.apache.org/confluence/download/attachments/68720496/Edit%20Report%20screen.png?api=v2)
## Report information ##
This first panel allows you to change the report description and status. Actually it does not make sense changing the status to published before having downloaded the .rptdesign file (Birt Report Designer file) from the server (in database), edited and uploaded it back to the server. This is explained in the section below. Changing the status allows users to use your reports. But if you publish without any change the report will render as empty.
## The .rptdesign report file: donwload, edit, upload and publish it ##
To really use the report you need to download the .rptdesign file from the server in a location from where you can edit it with the BIRT Report Designer. So you need to install first the BIRT Report Designer. Then you can edit the .rptdesign file in the BIRT Report Designer. For that refer to the ["Using the Birt Report Designer.md.html" file](https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk/birt/documents/Using%20the%20Birt%20Report%20Designer.md.html). You can also find the Markdonw version in the same directory: ofbiz-framework/plugins/birt/documents
### Editing the downloaded file ###
Once you installed the BIRT Report Designer and have downloaded the .rptdesign file, you can edit it with the Birt Report Designer. When you have edited it suiting your needs you must upload it to the server for your changes to be taken into account by OFBiz.
<span style="color:red">**This is when things begin to be really interesting**.</span> You can then test your report using the "Preview" panel. There you can temporarily filter the result, and use the export format you prefer, once done click "Send". You can then decide to change the report content in the Birt Report Designer again or keep your changes. Once done in the Birt Report Designer, simply select the changed file to upload, and upload it again. You can re-test your changes and continue until you really get what you want! You can then publish the report to allow users to select and use it. There are 2 ways to publish a report from the "Manage reports" screen or directly in the "Report information" panel. We will see the "Manage reports" screen below.
## Filters Overriding ##
You may want to overide the default filters. You can then use the Xml "Override filters" panel to override and personnalize the form, once done click "Save". If you ignore that step, it will **NOT** prevent the report creation, **it is already done**, it will just be with the generic filtering form inherited from the master from.
>_Note_: if no preview is available, it is usually due to a mistake in the master form code. You can edit it in the database.
## Manage reports ##
The "Manage reports" button get you to a screen which allows to edit (get back to current page), publish or delete a report.
## Use a report ##
Users can select and use any published report from that screen. When they select a report they then get the same "Preview" Panel and can do the same things than in the "Edit Report" screen. Refer users to
@@ -1,18 +0,0 @@
# Using a flexible report - User #
## Introduction ##
A flexible report is an OFBiz content of FLEXIBLE_REPORT type which allows the final user to obtain reports using the Birt reporting module. It will be produced at a specific time of your choosing, with your chosen output format, filtering the data with a few parameters defined during report design creation.
## Pre-requisite ##
- OFBiz
- The Birt plugin
- Pre-published reports created from report masters
## Using the report ##
1. go to the Birt component or to another page harboring reports.
2. In the Birt component, click "Use a report".
3. Select your report and hit "Send".
4. The next screen will allow you to filter your data through a set of pre-defined criteria. Should you leave it empty, you will retrieve unfiltered data.
5. Select the desired export format
6. Upon validation, your report is now loaded and can be saved.
>_Note_: Report loading can be a bit long depending on the data treatment
@@ -1,72 +0,0 @@
# Using the Birt Report Designer - Admin/Super-User #
## Introduction ##
The creation of a flexible report goes through a design step of the initial flexible report output under the Birt Report Designer.
This document describes the simplest designs to connect to the data. It is not exhaustive, and simply attempts to cover basic needs. You will find much more documentation online. In our approach, the connection to the data is generated automatically by OFBiz, only the design part of the report will be discussed.
## Installing the BIRT Report Designer ##
Installing the BIRT Report Designer is easy. If you use Eclipse, you can include it as a plugin. You can also install the whole BIRT Report Designer. I use Eclipse but I prefer the second way, to not mix things. So simply download and install the whole all-in-one thing. Or install the plugin if you prefer and use its "Report Design" view which allows to edit .rptdesign files.
>_Note_: if you installed the BIRT Report Designer under say, a Birt directory, then by default the reports will be accessed from the Birt\workspace\Report Builder directly and this is where you should put the .rptdesign files when downloading them. Your mileage may wary...
## Different areas of the screen and their role ##
### Navigator - Report Builder ###
This is where you should find the .rptdesign files you downloaded.
![Report Builder](https://cwiki.apache.org/confluence/download/attachments/68720496/Report%20Builder.png?api=v2)
### Data Explorer ###
The Data Explorer defaults to the right of your screen. It gives you access to two things. The data fields available for the report, and the filter fields that can be used for this report.
![Data Explorer](https://cwiki.apache.org/confluence/download/attachments/68720496/Data%20Explorer.png?api=v2)
### Palette ###
The palette provides the various tools you can insert in the report. Simple text, image, table of data, layout table, graph, aggregation, etc. All objects are added to the report by drag & drop.
![Palette](https://cwiki.apache.org/confluence/download/attachments/68720496/Palette.png?api=v2)
### Tabs ###
At the right bottom of the window is a series of five tabs.
We will use two:
- Layout, which will allow most of the design.
- Master Page, which will give access by its owners to standard parameters such as the orientation or size of the report.
The preview is not accessible because it can not be executed outside of OFBiz. Any changes to the scripts will be erased during the upload in OFBiz.
### Simple design without break ###
The simplest possible design is to insert in a table (table in the palette), a part or all of the data set data fields. To do this, right-click on Data Set in the Data Explorer -> Insert in Layout, and then select the fields you want to see appear.
### Simple design with break ###
A break is a collection of data made by Birt from the data. It permits to classify according to a field, and to give details for each category, then to aggregate certain fields, etc.
1. Insert a table (Table) in the report -> OK
2. Right-click on the table -> Edit Data Binding, select all fields
3. In the data set field, change "None" in "Data Set", validate
4. Right-click the table -> Insert Group. Configure your group, eg: ![group](https://cwiki.apache.org/confluence/download/attachments/68720496/Group.png?api=v2)
5. Your table then has five lines:
* A global title line
* A title line of the group
* A group detail line
* A footer of the group
* A global footer line
6. Then insert some elements in the design: in the global header, everything that does not depend on the group, for example the title of the report. In the header of the group, everything that is common to the whole group and that you want to see in its title. In the details, the fields that may appear for each group line. As in the image below, the fields might be inserted by Copy/Paste from the Data Set, and titles via a text element of the palette. You can add lines and columns by right clicking on the end of the line (gray rectangle when the table is selected), etc. ![Design with break](https://cwiki.apache.org/confluence/download/attachments/68720496/Design%20with%20break.png?api=v2)
#### Construction of aggregation ####
The aggregations may be on the whole table, or only on a group. They are characterized by an expression to aggregate (made up of different data fields), a possible filter on the data lines, and an aggregation function, eg:
![Aggregation builder](https://cwiki.apache.org/confluence/download/attachments/68720496/Aggregation%20builder.png?api=v2)
#### Expression builder ####
The *fx* (for expression and filter) buttons are used to open a complex expression construction window. It is possible to use predefined functions, Javascript, data fields, already built aggregations, and so on. This window can also be used by including a data element, which allows to construct non-aggregated data expressions.
![Expression builder](https://cwiki.apache.org/confluence/download/attachments/68720496/Expression%20builder.png?api=v2)
Footer lines often allow you to place aggregations, such as sums on the group or table rows, eg
![Design with break complete](https://cwiki.apache.org/confluence/download/attachments/68720496/Design%20with%20break%20complete.png?api=v2)
> Warning: any unused line must be deleted, otherwise it generates white spaces on the report.
## Layout Management ##
### General settings ###
Right button leads to Properties Editor tab at bottom. Then click on the Master Page tab, just above. In the Property Editor you will see a series of general properties that will allow you to modify the general form of the report.
### Styles ###
By right-clicking on any item in the table, you have access to the menu of styles. From there they can be edited, applied, created. A style can be applied to the whole picture, to a row or column, to a cell, or to an element in that cell (text, data, ...).
+3 -3
View File
@@ -19,12 +19,12 @@ under the License.
-->
<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
<title>View definitions for master report services</title>
<description>None</description>
<version>1.0</version>
<view-entity entity-name="OrderAndProductStore" package-name="org.ofbiz.birt">
<view-entity entity-name="OrderAndProductStore" package-name="org.apache.ofbiz.birt">
<member-entity entity-alias="OH" entity-name="OrderHeader"/>
<member-entity entity-alias="PS" entity-name="ProductStore"/>
<alias-all entity-alias="PS"/>
@@ -34,7 +34,7 @@ under the License.
</view-link>
</view-entity>
<view-entity entity-name="InvoiceItemProductAndParty" package-name="org.ofbiz.birt">
<view-entity entity-name="InvoiceItemProductAndParty" package-name="org.apache.ofbiz.birt">
<member-entity entity-alias="INV" entity-name="Invoice"/>
<member-entity entity-alias="INITM" entity-name="InvoiceItem"/>
<member-entity entity-alias="PA" entity-name="Party"/>
+13 -1
View File
@@ -20,7 +20,7 @@ under the License.
<ofbiz-component name="birt" enabled="true"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
<resource-loader name="main" type="component"/>
@@ -31,6 +31,14 @@ under the License.
<entity-resource type="data" reader-name="demo" loader="main" location="data/BirtSecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/BirtMasterData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/example/ExampleTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/example/ExampleSecurityPermissionSeedData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/example/ExampleSecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/example/ExamplePortletData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/example/ExamplePortalSeedData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/example/ExampleHelpData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/example/ExampleDemoData.xml"/>
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/ServiceReportsView.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
@@ -39,11 +47,13 @@ under the License.
<webapp name="accounting"
title="Accounting"
server="default-server"
position="5"
location="webapp/accounting"
base-permission="OFBTOOLS,ACCOUNTING"
mount-point="/accounting"/>
<webapp name="facility"
title="Facility"
position="3"
description="FacilityComponentDescription"
server="default-server"
location="webapp/facility"
@@ -51,6 +61,7 @@ under the License.
mount-point="/facility"/>
<webapp name="order"
title="Order"
position="4"
description="OrderComponentDescription"
server="default-server"
location="webapp/ordermgr"
@@ -59,6 +70,7 @@ under the License.
<webapp name="birt"
title="BIRT"
position="17"
server="default-server"
location="webapp/birt"
base-permission="OFBTOOLS,WEBTOOLS"
+1 -1
View File
@@ -19,7 +19,7 @@ under the License.
-->
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
<description>OFBiz BIRT Services</description>
<vendor>OFBiz</vendor>
<version>1.0</version>
@@ -0,0 +1,77 @@
=== Report creation
==== Introduction
A flexible report is an OFBiz content of FLEXIBLE_REPORT type that allows a final user to make use of the reporting
module to obtain flexible reports, ie reports which are created from an entity or view definition and even from a
service. A flexible report is created from a Report Master (content REPORT_MASTER), and an optional XML override of the
parent form.
==== Pre-requisite
* OFBiz framework
* The Birt plugin
* The BIRT Report Designer: <<#_using_the_birt_report_designer,Using the Birt Report Designer>>
'''
. Get to Birt component in OFBiz image:Birt-Menus.png[Birt menus]
. Click on the "Flexible Report" menu (varies depending on themes)
. Click on the "Generate report" button, you get to this screen:
. Fill the form: image:Example-Report.png[Example Report]
** The list "Choose report topic" will let you choose among predefined report masters your topic of interest.
** The report name is a simple short name from which the file name will be generated.
** The description is a short description which will allow you to recognise the report and its topic.
** The box "Generate filters in design" will add in the design the visualisation of the filters filled in the filtering form.
Once the form is validated, OFBiz will show you the "Edit Report" screen.
image::Edit-Report-screen.png[Edit Report screen]
==== Report information
This first panel allows you to change the report description and status. Actually it does not make sense changing the
status to published before having downloaded the .rptdesign file (Birt Report Designer file) from the server (in
database), edited and uploaded it back to the server. This is explained in the section below. Changing the status allows
users to use your reports. But if you publish without any change the report will render as empty.
==== The .rptdesign report file: download, edit, upload and publish it
To really use the report you need to download the .rptdesign file from the server in a location from where you can edit
it with the BIRT Report Designer. So you need to install first the BIRT Report Designer. Then you can edit the
.rptdesign file in the BIRT Report Designer. For that refer to <<#_using_the_birt_report_designer,Using the Birt Report
Designer>>.
===== Editing the downloaded file
Once you installed the BIRT Report Designer and have downloaded the .rptdesign file, you can edit it with the Birt
Report Designer. When you have edited it suiting your needs you must upload it to the server for your changes to be
taken into account by OFBiz.
*This is when things begin to be really interesting*. You can then test your report using the "Preview" panel. There you
can temporarily filter the result, and use the export format you prefer, once done click "Send". You can then decide to
change the report content in the Birt Report Designer again or keep your changes. Once done in the Birt Report Designer,
simply select the changed file to upload, and upload it again. You can re-test your changes and continue until you
really get what you want! You can then publish the report to allow users to select and use it. There are 2 ways to
publish a report from the "Manage reports" screen or directly in the "Report information" panel. We will see the "Manage
reports" screen below.
==== Filters Overriding
You may want to overide the default filters. You can then use the Xml "Override filters" panel to override and
personnalize the form, once done click "Save". If you ignore that step, it will *NOT* prevent the report creation, *it
is already done*, it will just be with the generic filtering form inherited from the master from.
NOTE: if no preview is available, it is usually due to a mistake in the master form code. You can edit it in the
database.
==== Manage reports
The "Manage reports" button get you to a screen which allows to edit (get back to current page), publish or delete a
report.
==== Use a report
Users can select and use any published report from that screen. When they select a report they then get the same
"Preview" Panel and can do the same things than in the "Edit Report" screen. Refer users to
@@ -0,0 +1,25 @@
=== Using a flexible report
==== Introduction
NOTE: this feature will be officially available with the R17.12 branch first release
A flexible report is an OFBiz content of FLEXIBLE_REPORT type which allows the final user to obtain reports using the
Birt reporting module. It will be produced at a specific time of your choosing, with your chosen output format,
filtering the data with a few parameters defined during report design creation.
==== Pre-requisite
* OFBiz
* The Birt plugin
* Pre-published reports created from report masters
==== Using the report
. go to the Birt component or to another page harboring reports.
. In the Birt component, click "Use a report".
. Select your report and hit "Send".
. The next screen will allow you to filter your data through a set of pre-defined criteria. Should you leave it empty, you will retrieve unfiltered data.
. Select the desired export format
. Upon validation, your report is now loaded and can be saved.
@@ -1,27 +1,35 @@
# Report master creation #
=== Report master creation
## Introduction ##
A report master is an OFBiz content which allows a user to generate data reports. It defines data connexion, and a general filtering form for data. It can be based on an entity, a dedicated service, or in a wider sense on any shape a data connexion can take and return back a map.
==== Introduction
## Pre-requisite ##
- OFBiz
- Birt plugin
NOTE: this feature will be officially available with the R17.12 branch first release
## Report Master based on an entity/view ##
A report master is an OFBiz content which allows a user to generate data reports.
It defines data connexion, and a general filtering form for data.
It can be based on an entity, a dedicated service, or in a wider sense on any shape
a data connexion can take and return back a map.
==== Pre-requisite
1. Create or choice a database entity or view
2. Create the general filtering form within the file plugins/birt/widget/birt/BirtMasterForms.xml. The only informations to be changed are entity-name and form name.
* OFBiz
* Birt plugin
```xml
<form name="CTNT_MASTER_EXAMPLE" type="single" extends="AbstractFlexibleReportSearchForm">
==== Report Master based on an entity/view
. Create or choice a database entity or view
. Create the general filtering form within the file plugins/birt/widget/birt/BirtMasterForms.xml. The only informations to be changed are entity-name and form name.
[source,xml]
----
<form name="CTNT_MASTER_EXAMPLE" type="single" extends="AbstractFlexibleReportSearchForm">
<auto-fields-entity entity-name="Example" default-field-type="find"/>
</form>
```
----
[start=3]
. Add the informations about this Master in the database using the file
plugins/birt/data/BirtMasterData.xml
3. Add the informations about this Master in the database using the file plugins/birt/data/BirtMasterData.xml
```xml
[source,xml]
----
<DataResource dataResourceId="DR_MASTER_EXAMPLE" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FORM_COMBINED" />
<ElectronicText dataResourceId="DR_MASTER_EXAMPLE">
<textData><![CDATA[<!--default domain form-->
@@ -32,53 +40,75 @@ A report master is an OFBiz content which allows a user to generate data reports
<Content contentId="CTNT_MASTER_EXAMPLE" contentTypeId="REPORT_MASTER" dataResourceId="DR_MASTER_EXAMPLE" statusId="CTNT_PUBLISHED" contentName="Example" description="Master Content for Example" />
<!-- Data retrieval will be done using perform find on entity Example-->
<ContentAttribute contentId="CTNT_MASTER_EXAMPLE" attrName="Entity" attrValue="Example"/>
```
----
The form in the database is the form that will allow users to change form parameters. You can add any field you desire. Some field names are though reserved: reportContentId, overrideFilters, entityViewName, birtContentType.
The form in the database is the form that will allow users to change form parameters.
You can add any field you desire. Some field names are though reserved: reportContentId, overrideFilters,
entityViewName, birtContentType.
[start=4]
. Add in the file content/config/contentEntityLabels.xml the Property that will allow translation
for your report master description.
4. Add in the file content/config/contentEntityLabels.xml the Property that will allow translation for your report master description.
```xml
[source,xml]
----
<property key="Content.description.CTNT_MASTER_EXAMPLE">
<value xml:lang="en">Example</value>
<value xml:lang="fr">Exemple</value>
</property>
```
----
Your Report Master is created ! You can now create reports using it.
Your Report Master is created ! You can now create reports using it.
## Report Master based on a service ##
Create in plugins/birt/src/org/ofbiz/birt/birt/BirtMasterReportServices.java 2 dedicated services (see examples there)
==== Report Master based on a service
1. The first one, which name will return 4 items:
* an object of type Map<String, String> called dataMap. **Keys**: data field names. **Values**: data types (OFBiz types).
* an object of type Map<String, String> called fieldDisplayLabels. **Keys**: data field names. **Values**: the names displayed to the user. This output is optional, should it be missing, the keys will be displayed.
* an object of type Map<String, String> called filterMap. **Keys**: data filtering field names (exact names used for the form fields). **Values**: data type (OFBiz type). This output is optional, if missing, filters can not be displayed on the report.
* an object of type Map<String, String> called filterDisplayLabels. **Keys**: data filtering field names (exact names used for the form fields). **Values**: names to be displayed to the user. This output is optional, should it be missing, the keys will be displayed.
2. The second service will actually get the data. It receives an object (Object type) called reportContext. From this object, you can obtain the map parameters using the following code:
In plugins/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtMasterReportServices.java there is 2 sets of dedicated services (see examples there)
```java
Map<String, Object> parameters = (Map<String, Object>) reportContext.getParameterValue("parameters");
```
. In each set the first service, will return 4 items:
** an object of type Map<String, String> called dataMap.
*Keys*: data field names. *Values*: data types (OFBiz types).
** an object of type Map<String, String> called fieldDisplayLabels.
*Keys*: data field names. *Values*: the names displayed to the user.
This output is optional, should it be missing, the keys will be displayed.
** an object of type Map<String, String> called filterMap.
*Keys*: data filtering field names (exact names used for the form fields).
*Values*: data type (OFBiz type).
This output is optional, if missing, filters can not be displayed on the report.
** an object of type Map<String, String> called filterDisplayLabels.
*Keys*: data filtering field names (exact names used for the form fields).
*Values*: names to be displayed to the user.
This output is optional, should it be missing, the keys will be displayed.
. The second service will actually get the data. It receives an object (Object type) called reportContext.
From this object, you can obtain the map parameters using the following code:
[source,java]
----
Map<String, Object> parameters = UtilGenerics.checkMap(reportContext.getParameterValue("parameters"));
----
This Map will give access fields of the filtering form.
This service will return a list called list of type List<GenericValue>, containing the data. A Map<String, Object> would also do.
This service will return a list of type List<GenericValue>, containing the data.
A Map<String, Object> would also do.
3. create the parent form in the file plugins/birt/widget/birt/BirtMasterForms.xml.
Field names created here must be then names used on the Map parameters of the previous service, and also corresponding to the map filterMap.
Then,
```xml
. create the parent form in the file plugins/birt/widget/birt/BirtMasterForms.xml.
Field names created here must be the names used on the Map parameters of the previous service,
and also corresponding to the map filterMap.
[source,xml]
----
<form name="CTNT_MASTER_TURNOVER" type="single" extends="AbstractFlexibleReportSearchForm">
<field name="fromDate"><date-time type="date"/></field>
<field name="thruDate"><date-time type="date"/></field>
<field name="productCategoryId"><lookup target-form-name="LookupProductCategory"/></field>
<field name="productStoreId"><lookup target-form-name="LookupProductStore"/></field>
</form>
```
----
[start=2]
. Create the master in database following.
4. Create the master in database following.
```xml
[source,xml]
----
<CustomMethod customMethodId="CM_FB_TURNOVER" customMethodTypeId="FLEXIBLE_BIRT" customMethodName="flexibleReportTurnOver" description="service to resolve invoice for turnover report domain"/>
<DataResource dataResourceId="DR_MASTER_TURNOVER" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FORM_COMBINED" />
<ElectronicText dataResourceId="DR_MASTER_TURNOVER">
@@ -93,21 +123,28 @@ Field names created here must be then names used on the Map parameters of the pr
Second, the custom method gives the service to retrieve all data in the report design.
Here : flexibleReportTurnOverPrepareFields (customMethodName + "prepareFields") then flexibleReportTurnOver-->
<ContentAttribute contentId="CTNT_MASTER_TURNOVER" attrName="Service" attrValue="default"/>
```
----
The form in the database is the form that will allow users to change form parameters. You can add any field you desire. Some field names are reserved: reportContentId, overrideFilters, entityViewName, birtContentType.
The form in the database is the form that will allow users to change form parameters.
You can add any field you desire. Some field names are reserved: reportContentId, overrideFilters,
entityViewName, birtContentType.
[start=3]
. Import these data in the base using Webtools XML import (or the longer "gradlew 'ofbiz -l readers=seed,ext' command).
. Add in the file content/config/contentEntityLabels.xml the Property which will translate your report Master description.
5. Import these data in the base using Webtools XML import (or the longer "gradlew 'ofbiz -l readers=seed,ext' command).
6. Add in the file content/config/contentEntityLabels.xml the Property which will translate your report Master description.
```xml
[source,xml]
----
<property key="Content.description.CTNT_MASTER_TURNOVER">
<value xml:lang="en">Turnover (product)</value>
<value xml:lang="fr">Rotation (des stocks)</value>
</property>
```
----
==== Entities diagram
Entities diagram
-----------------
The following diagram shows the Entities linked with Content to store report_master/report.
![Report_Master](https://cwiki.apache.org/confluence/download/attachments/68720496/Report_Master.png?api=v2)
image::Report-Master.png[Report Master]
@@ -0,0 +1,116 @@
=== Using the Birt Report Designer
==== Introduction
NOTE: this feature will be officially available with the R17.12 branch first release
The creation of a flexible report goes through a design step of the initial flexible report output under the Birt Report
Designer.
This document describes the simplest designs to connect to the data. It is not exhaustive, and simply attempts to cover
basic needs. You will find much more documentation online. In our approach, the connection to the data is generated
automatically by OFBiz, only the design part of the report will be discussed.
==== Installing the BIRT Report Designer
Installing the BIRT Report Designer is easy. If you use Eclipse, you can include it as a plugin. You can also install
the whole BIRT Report Designer. I use Eclipse but I prefer the second way, to not mix things. So simply download and
install the whole all-in-one thing. Or install the plugin if you prefer and use its "Report Design" view which allows to
edit .rptdesign files.
NOTE: if you installed the BIRT Report Designer under say, a Birt directory, then by default the reports will be
accessed from the Birt\workspace\Report Builder directly and this is where you should put the .rptdesign files when
downloading them. Your mileage may wary...
==== Different areas of the screen and their role
===== Navigator - Report Builder
This is where you should find the .rptdesign files you downloaded.
image::Report-Builder.png[Report Builder]
===== Data Explorer
The Data Explorer defaults to the right of your screen. It gives you access to two things. The data fields available for
the report, and the filter fields that can be used for this report.
image::Data-Explorer.png[Data Explorer]
===== Palette
The palette provides the various tools you can insert in the report. Simple text, image, table of data, layout table,
graph, aggregation, etc. All objects are added to the report by drag & drop.
image::Palette.png[Palette]
===== Tabs
At the right bottom of the window is a series of five tabs.
We will use two:
* Layout, which will allow most of the design.
* Master Page, which will give access by its owners to standard parameters such as the orientation or size of the report.
The preview is not accessible because it can not be executed outside of OFBiz. Any changes to the scripts will be erased
during the upload in OFBiz.
===== Simple design without break
The simplest possible design is to insert in a table (table in the palette), a part or all of the data set data fields.
To do this, right-click on Data Set in the Data Explorer \-> Insert in Layout, and then select the fields you want to
see appear.
===== Simple design with break
A break is a collection of data made by Birt from the data. It permits to classify according to a field, and to give
details for each category, then to aggregate certain fields, etc.
. Insert a table (Table) in the report \-> OK
. Right-click on the table \-> Edit Data Binding, select all fields
. In the data set field, change "None" in "Data Set", validate
. Right-click the table \-> Insert Group. Configure your group, eg: image:Group.png[group]
. Your table then has five lines:
** A global title line
** A title line of the group
** A group detail line
** A footer of the group
** A global footer line
. Then insert some elements in the design: in the global header, everything that does not depend on the group, for example the title of the report. In the header of the group, everything that is common to the whole group and that you want to see in its title. In the details, the fields that may appear for each group line. As in the image below, the fields might be inserted by Copy/Paste from the Data Set, and titles via a text element of the palette. You can add lines and columns by right clicking on the end of the line (gray rectangle when the table is selected), etc.
image::Design-with-break.png[Design with break]
====== Construction of aggregation
The aggregations may be on the whole table, or only on a group. They are characterized by an expression to aggregate
(made up of different data fields), a possible filter on the data lines, and an aggregation function, eg:
image::Aggregation-builder.png[Aggregation builder]
====== Expression builder
The _fx_ (for expression and filter) buttons are used to open a complex expression construction window. It is possible
to use predefined functions, Javascript, data fields, already built aggregations, and so on. This window can also be
used by including a data element, which allows to construct non-aggregated data expressions.
image::Expression-builder.png[Expression builder]
Footer lines often allow you to place aggregations, such as sums on the group or table rows, eg
image::Design-with-break-complete.png[Design with break complete]
WARNING: any unused line must be deleted, otherwise it generates white spaces on the report.
==== Layout Management
===== General settings
Right button leads to Properties Editor tab at bottom. Then click on the Master Page tab, just above. In the Property
Editor you will see a series of general properties that will allow you to modify the general form of the report.
===== Styles
By right-clicking on any item in the table, you have access to the menu of styles. From there they can be edited,
applied, created. A style can be applied to the whole picture, to a row or column, to a cell, or to an element in that
cell (text, data, ...).
+42
View File
@@ -0,0 +1,42 @@
////
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
////
= Birt Apache OFBiz® plugin
The Apache OFBiz Project
Release 17.12
:imagesdir: ./images
ifdef::backend-pdf[]
:title-logo-image: image::OFBiz-Logo.svg[Apache OFBiz Logo, pdfwidth=4.25in, align=center]
:source-highlighter: rouge
endif::[]
The birt plugin is one of the OFBiz plugins.
== OFBiz Flexible Reports
One of the functionalities of the birt plugin are the "OFBiz Flexible Reports"
There is an anounce with some history in the OFBiz blog:
https://blogs.apache.org/ofbiz/entry/the-birt-flexible-reports-a[Reporting in Apache OFBiz® and the OFBiz Flexible Reports]
=== Technical Documentation
include::_include/bt-creating reports.adoc[leveloffset=+1]
include::_include/bt-using the birt report designer.adoc[leveloffset=+1]
include::_include/bt-report master creation.adoc[leveloffset=+1]
=== User documentation
include::_include/bt-how to use flexible reports.adoc[leveloffset=+1]
Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 196 KiB

@@ -22,7 +22,6 @@ import java.io.File;
import java.io.OutputStream;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.logging.Level;
@@ -219,7 +218,6 @@ public final class BirtWorker {
throw new GenericServiceException("Service and entity name cannot be both empty");
}
String modelType = null;
String modelElementName = null;
String workflowType = null;
if (UtilValidate.isEmpty(serviceName)) {
@@ -230,8 +228,6 @@ public final class BirtWorker {
workflowType = "Service";
}
//resolve the path location to store the RptDesign file, check if the file already exists under this name and increment index name if needed
List<GenericValue> listRptDesigns = null;
EntityCondition entityConditionRpt = EntityCondition.makeCondition("contentTypeId", "RPTDESIGN");
String templatePathLocation = BirtUtil.resolveTemplatePathLocation();
File templatePathLocationDir = new File(templatePathLocation);
@@ -263,7 +259,10 @@ public final class BirtWorker {
String reportForm = (String) resultElectronicText.get("textData");
if (!reportForm.startsWith("<?xml")) {
StringBuffer xmlHeaderForm = new StringBuffer("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
xmlHeaderForm.append("<forms xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"http://ofbiz.apache.org/dtds/widget-form.xsd\">");
xmlHeaderForm.append("<forms xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" "
+ "xmlns=\"http://ofbiz.apache.org/Widget-Form\" "
+ "xsi:schemaLocation=\"http://ofbiz.apache.org/Widget-Form "
+ "http://ofbiz.apache.org/dtds/widget-form.xsd\">");
xmlHeaderForm.append(reportForm);
xmlHeaderForm.append("</forms>");
reportForm = xmlHeaderForm.toString();
@@ -272,20 +271,45 @@ public final class BirtWorker {
reportForm = reportFormExpd.expandString(context);
//create content and dataressource strucutre
dispatcher.runSync("createDataResource", UtilMisc.toMap("dataResourceId", dataResourceId, "dataResourceTypeId", "ELECTRONIC_TEXT", "dataTemplateTypeId", "FORM_COMBINED", "userLogin", userLogin));
dispatcher.runSync("createElectronicTextForm", UtilMisc.toMap("dataResourceId", dataResourceId, "textData", reportForm, "userLogin", userLogin));
dispatcher.runSync("createContent", UtilMisc.toMap("contentId", contentId, "contentTypeId", "FLEXIBLE_REPORT", "dataResourceId", dataResourceId, "statusId", "CTNT_IN_PROGRESS", "contentName", reportName, "description", description, "userLogin", userLogin));
Map<String, Object> result = null;
result = dispatcher.runSync("createDataResource", UtilMisc.toMap("dataResourceId", dataResourceId, "dataResourceTypeId", "ELECTRONIC_TEXT", "dataTemplateTypeId", "FORM_COMBINED", "userLogin", userLogin));
if (ServiceUtil.isError(result)) {
throw new GeneralException(ServiceUtil.getErrorMessage(result));
}
result = dispatcher.runSync("createElectronicTextForm", UtilMisc.toMap("dataResourceId", dataResourceId, "textData", reportForm, "userLogin", userLogin));
if (ServiceUtil.isError(result)) {
throw new GeneralException(ServiceUtil.getErrorMessage(result));
}
result = dispatcher.runSync("createContent", UtilMisc.toMap("contentId", contentId, "contentTypeId", "FLEXIBLE_REPORT", "dataResourceId", dataResourceId, "statusId", "CTNT_IN_PROGRESS", "contentName", reportName, "description", description, "userLogin", userLogin));
if (ServiceUtil.isError(result)) {
throw new GeneralException(ServiceUtil.getErrorMessage(result));
}
String dataResourceIdRpt = delegator.getNextSeqId("DataResource");
String contentIdRpt = delegator.getNextSeqId("Content");
String rptDesignName = BirtUtil.encodeReportName(reportName);
if (!rptDesignName.endsWith(".rptdesign")) {
rptDesignName = rptDesignName.concat(".rptdesign");
}
dispatcher.runSync("createDataResource", UtilMisc.toMap("dataResourceId", dataResourceIdRpt, "dataResourceTypeId", "LOCAL_FILE", "mimeTypeId", "text/rptdesign", "dataResourceName", rptDesignName, "objectInfo", templateFileLocation, "userLogin", userLogin));
dispatcher.runSync("createContent", UtilMisc.toMap("contentId", contentIdRpt, "contentTypeId", "RPTDESIGN", "dataResourceId", dataResourceIdRpt, "statusId", "CTNT_PUBLISHED", "contentName", reportName, "description", description + " (.rptDesign file)", "userLogin", userLogin));
dispatcher.runSync("createContentAssoc", UtilMisc.toMap("contentId", masterContentId, "contentIdTo", contentId, "contentAssocTypeId", "SUB_CONTENT", "userLogin", userLogin));
dispatcher.runSync("createContentAssoc", UtilMisc.toMap("contentId", contentId, "contentIdTo", contentIdRpt, "contentAssocTypeId", "SUB_CONTENT", "userLogin", userLogin));
dispatcher.runSync("createContentAttribute", UtilMisc.toMap("contentId", contentId, "attrName", workflowType, "attrValue", modelElementName, "userLogin", userLogin));
result = dispatcher.runSync("createDataResource", UtilMisc.toMap("dataResourceId", dataResourceIdRpt, "dataResourceTypeId", "LOCAL_FILE", "mimeTypeId", "text/rptdesign", "dataResourceName", rptDesignName, "objectInfo", templateFileLocation, "userLogin", userLogin));
if (ServiceUtil.isError(result)) {
throw new GeneralException(ServiceUtil.getErrorMessage(result));
}
result = dispatcher.runSync("createContent", UtilMisc.toMap("contentId", contentIdRpt, "contentTypeId", "RPTDESIGN", "dataResourceId", dataResourceIdRpt, "statusId", "CTNT_PUBLISHED", "contentName", reportName, "description", description + " (.rptDesign file)", "userLogin", userLogin));
if (ServiceUtil.isError(result)) {
throw new GeneralException(ServiceUtil.getErrorMessage(result));
}
result = dispatcher.runSync("createContentAssoc", UtilMisc.toMap("contentId", masterContentId, "contentIdTo", contentId, "contentAssocTypeId", "SUB_CONTENT", "userLogin", userLogin));
if (ServiceUtil.isError(result)) {
throw new GeneralException(ServiceUtil.getErrorMessage(result));
}
result = dispatcher.runSync("createContentAssoc", UtilMisc.toMap("contentId", contentId, "contentIdTo", contentIdRpt, "contentAssocTypeId", "SUB_CONTENT", "userLogin", userLogin));
if (ServiceUtil.isError(result)) {
throw new GeneralException(ServiceUtil.getErrorMessage(result));
}
result = dispatcher.runSync("createContentAttribute", UtilMisc.toMap("contentId", contentId, "attrName", workflowType, "attrValue", modelElementName, "userLogin", userLogin));
if (ServiceUtil.isError(result)) {
throw new GeneralException(ServiceUtil.getErrorMessage(result));
}
return contentId;
}
@@ -28,7 +28,6 @@ import org.eclipse.birt.report.engine.api.EngineConfig;
import org.eclipse.birt.report.engine.api.IReportEngine;
import org.eclipse.birt.report.engine.api.IReportEngineFactory;
import org.apache.ofbiz.base.container.Container;
import org.apache.ofbiz.base.container.ContainerConfig;
import org.apache.ofbiz.base.container.ContainerException;
import org.apache.ofbiz.base.start.StartupCommand;
import org.apache.ofbiz.base.util.Debug;
@@ -44,11 +44,10 @@ import org.apache.ofbiz.birt.BirtFactory;
import org.apache.ofbiz.birt.BirtWorker;
import org.apache.ofbiz.common.email.NotificationServices;
import org.apache.ofbiz.entity.Delegator;
import org.apache.ofbiz.entity.util.EntityUtilProperties;
import org.apache.ofbiz.security.Security;
import org.apache.ofbiz.service.DispatchContext;
import org.apache.ofbiz.service.LocalDispatcher;
import org.apache.ofbiz.service.GenericServiceException;
import org.apache.ofbiz.service.LocalDispatcher;
import org.apache.ofbiz.service.ServiceUtil;
import org.apache.ofbiz.widget.model.ThemeFactory;
import org.apache.ofbiz.widget.renderer.ScreenRenderer;
@@ -91,6 +90,9 @@ public class BirtEmailServices {
String birtImageDirectory = (String) serviceContext.remove(BirtWorker.getBirtImageDirectory());
String birtContentType = (String) serviceContext.remove(BirtWorker.getBirtContentType());
VisualTheme visualTheme = (VisualTheme) context.get("visualTheme");
if (visualTheme == null) {
visualTheme = ThemeFactory.resolveVisualTheme(null);
}
if (visualTheme == null) visualTheme = ThemeFactory.resolveVisualTheme(null);
if (bodyParameters == null) {
bodyParameters = MapStack.create();
@@ -257,9 +259,15 @@ public class BirtEmailServices {
Map<String, Object> result = ServiceUtil.returnSuccess();
try {
if (isMultiPart) {
dispatcher.runSync("sendMailMultiPart", serviceContext);
Map<String, Object> resultMap = dispatcher.runSync("sendMailMultiPart", serviceContext);
if (ServiceUtil.isError(resultMap)) {
return ServiceUtil.returnError(ServiceUtil.getErrorMessage(resultMap));
}
} else {
dispatcher.runSync("sendMail", serviceContext);
Map<String, Object> resultMap = dispatcher.runSync("sendMail", serviceContext);
if (ServiceUtil.isError(resultMap)) {
return ServiceUtil.returnError(ServiceUtil.getErrorMessage(resultMap));
}
}
} catch (GenericServiceException e) {
String errMsg = UtilProperties.getMessage(resource, "BirtErrorInSendingEmail", UtilMisc.toMap("errorString", e.toString()), locale);
@@ -87,7 +87,7 @@ public class BirtMasterReportServices {
}
public static Map<String, Object> workEffortPerPerson(DispatchContext dctx, Map<String, Object> context) {
Delegator delegator = (Delegator) dctx.getDelegator();
Delegator delegator = dctx.getDelegator();
IReportContext reportContext = (IReportContext) context.get("reportContext");
Map<String, Object> parameters = UtilGenerics.checkMap(reportContext.getParameterValue("parameters"));
List<GenericValue> listWorkEffortTime = null;
@@ -208,7 +208,7 @@ public class BirtMasterReportServices {
}
public static Map<String, Object> turnOver(DispatchContext dctx, Map<String, Object> context) {
Delegator delegator = (Delegator) dctx.getDelegator();
Delegator delegator = dctx.getDelegator();
Locale locale = (Locale) context.get("locale");
IReportContext reportContext = (IReportContext) context.get("reportContext");
Map<String, Object> parameters = UtilGenerics.checkMap(reportContext.getParameterValue("parameters"));
@@ -76,7 +76,6 @@ import org.eclipse.birt.report.model.api.SimpleMasterPageHandle;
import org.eclipse.birt.report.model.api.SlotHandle;
import org.eclipse.birt.report.model.api.VariableElementHandle;
import org.eclipse.birt.report.model.api.activity.SemanticException;
import org.eclipse.birt.report.model.elements.SimpleMasterPage;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
@@ -136,6 +135,10 @@ public class BirtServices {
String birtType = null;
try {
Map<String, Object> convertRes = dispatcher.runSync("convertFieldTypeToBirtType", UtilMisc.toMap("fieldType", fieldType, "userLogin", userLogin));
if (ServiceUtil.isError(convertRes)) {
String errMsg = UtilProperties.getMessage(resource_error, "BirtErrorConversionFieldToBirtFailed", locale);
return ServiceUtil.returnError(errMsg + ServiceUtil.getErrorMessage(convertRes));
}
birtType = (String) convertRes.get("birtType");
if (UtilValidate.isEmpty(birtType)) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorConversionFieldToBirtFailed", locale));
@@ -278,6 +281,9 @@ public class BirtServices {
Map<String, Object> resultFormDisplay;
try {
resultFormDisplay = dispatcher.runSync("prepareFlexibleReportSearchFormToEdit", UtilMisc.toMap("reportContentId", reportContentId, "userLogin", userLogin, "locale", locale));
if (ServiceUtil.isError(resultFormDisplay)) {
return ServiceUtil.returnError(ServiceUtil.getErrorMessage(resultFormDisplay));
}
textForm = (String) resultFormDisplay.get("textForm");
} catch (GenericServiceException e) {
Debug.logError(e, module);
@@ -311,12 +317,19 @@ public class BirtServices {
try {
GenericValue content = EntityQuery.use(delegator).from("Content").where("contentId", reportContentId).queryOne();
String dataResourceId = content.getString("dataResourceId");
StringBuffer newForm = new StringBuffer("<?xml version=\"1.0\" encoding=\"UTF-8\"?> <forms xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"http://ofbiz.apache.org/dtds/widget-form.xsd\">");
StringBuffer newForm = new StringBuffer("<?xml version=\"1.0\" encoding=\"UTF-8\"?> <forms xmlns:xsi=\"http://www.w3"
+ ".org/2001/XMLSchema-instance\" "
+ "xmlns=\"http://ofbiz.apache.org/Widget-Form\" "
+ "xsi:schemaLocation=\"http://ofbiz.apache.org/Widget-Form "
+ "http://ofbiz.apache.org/dtds/widget-form.xsd\">");
newForm.append(overrideFilters);
newForm.append("</forms>");
Document xmlForm = UtilXml.readXmlDocument(newForm.toString());
dispatcher.runSync("updateElectronicTextForm", UtilMisc.toMap("dataResourceId", dataResourceId, "textData", UtilXml.writeXmlDocument(xmlForm),
Map<String, Object> result = dispatcher.runSync("updateElectronicTextForm", UtilMisc.toMap("dataResourceId", dataResourceId, "textData", UtilXml.writeXmlDocument(xmlForm),
"userLogin", userLogin, "locale", locale));
if (ServiceUtil.isError(result)) {
return ServiceUtil.returnError(ServiceUtil.getErrorMessage(result));
}
} catch (GeneralException | SAXException | ParserConfigurationException | IOException e) {
Debug.logError(e, module);
return ServiceUtil.returnError("Error in overrideReportForm service."); //TODO labelise
@@ -412,7 +425,7 @@ public class BirtServices {
if (customMethod == null) {
return ServiceUtil.returnError("CustomMethod not exist : " + customMethodId); //TODO labelise
}
String customMethodName = (String) customMethod.getString("customMethodName");
String customMethodName = customMethod.getString("customMethodName");
if ("default".equalsIgnoreCase(serviceName)) {
serviceName = customMethodName + "PrepareFields";
}
@@ -425,11 +438,14 @@ public class BirtServices {
}
contentId = BirtWorker.recordReportContent(delegator, dispatcher, context);
String rptDesignFileName = BirtUtil.resolveRptDesignFilePathFromContent(delegator, contentId);
Map<String, Object> resultService = dispatcher.runSync(serviceName, UtilMisc.toMap("locale", locale, "userLogin", userLogin));
Map<String, String> dataMap = UtilGenerics.checkMap(resultService.get("dataMap"));
Map<String, String> filterMap = UtilGenerics.checkMap(resultService.get("filterMap"));
Map<String, String> fieldDisplayLabels = UtilGenerics.checkMap(resultService.get("fieldDisplayLabels"));
Map<String, String> filterDisplayLabels = UtilGenerics.checkMap(resultService.get("filterDisplayLabels"));
Map<String, Object> serviceResult = dispatcher.runSync(serviceName, UtilMisc.toMap("locale", locale, "userLogin", userLogin));
if (ServiceUtil.isError(serviceResult)) {
return ServiceUtil.returnError(ServiceUtil.getErrorMessage(serviceResult));
}
Map<String, String> dataMap = UtilGenerics.checkMap(serviceResult.get("dataMap"));
Map<String, String> filterMap = UtilGenerics.checkMap(serviceResult.get("filterMap"));
Map<String, String> fieldDisplayLabels = UtilGenerics.checkMap(serviceResult.get("fieldDisplayLabels"));
Map<String, String> filterDisplayLabels = UtilGenerics.checkMap(serviceResult.get("filterDisplayLabels"));
Map<String, Object> resultGeneration = dispatcher.runSync("createFlexibleReport", UtilMisc.toMap(
"locale", locale,
"dataMap", dataMap,
@@ -577,7 +593,9 @@ public class BirtServices {
try {
for (String contentId : listContentId) {
Map<String, Object> returnMap = dispatcher.runSync("deleteFlexibleReport", UtilMisc.toMap("contentId", contentId, "userLogin", userLogin, "locale", locale));
ServiceUtil.isError(returnMap);
if (ServiceUtil.isError(returnMap)) {
return ServiceUtil.returnError(ServiceUtil.getErrorMessage(returnMap));
}
}
} catch (GenericServiceException e) {
Debug.logError(e, module);
@@ -630,8 +648,14 @@ public class BirtServices {
}
try {
delegator.removeByAnd("ContentAttribute", UtilMisc.toMap("contentId", contentId));
dispatcher.runSync("removeContentAndRelated", UtilMisc.toMap("contentId", contentId, "userLogin", userLogin, "locale", locale));
dispatcher.runSync("removeContentAndRelated", UtilMisc.toMap("contentId", contentIdRpt, "userLogin", userLogin, "locale", locale));
Map<String, Object> result = dispatcher.runSync("removeContentAndRelated", UtilMisc.toMap("contentId", contentId, "userLogin", userLogin, "locale", locale));
if (ServiceUtil.isError(result)) {
return ServiceUtil.returnError(ServiceUtil.getErrorMessage(result));
}
result = dispatcher.runSync("removeContentAndRelated", UtilMisc.toMap("contentId", contentIdRpt, "userLogin", userLogin, "locale", locale));
if (ServiceUtil.isError(result)) {
return ServiceUtil.returnError(ServiceUtil.getErrorMessage(result));
}
} catch (GenericServiceException | GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError("Error in deleteFlexibleReport service."); //TODO labelise
@@ -725,7 +749,7 @@ public class BirtServices {
// user file is deleted straight away to prevent the use of the report as script entry (security)
Path path = Paths.get(nameTempRpt);
Files.deleteIfExists(path);
} catch (Exception e) {
} catch (DesignFileException | IOException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorInuploadRptDesignNoFile", locale));
}
@@ -736,7 +760,7 @@ public class BirtServices {
Iterator<DesignElementHandle> iterCube = cubesFromUser.iterator();
while (iterCube.hasNext()) {
DesignElementHandle item = (DesignElementHandle) iterCube.next();
DesignElementHandle item = iterCube.next();
DesignElementHandle copy = item.copy().getHandle(item.getModule());
try {
designStored.getCubes().add(copy);
@@ -752,7 +776,7 @@ public class BirtServices {
Iterator<DesignElementHandle> iter = bodyFromUser.iterator();
while (iter.hasNext()) {
DesignElementHandle item = (DesignElementHandle) iter.next();
DesignElementHandle item = iter.next();
DesignElementHandle copy = item.copy().getHandle(item.getModule());
try {
designStored.getBody().add(copy);
@@ -777,7 +801,8 @@ public class BirtServices {
List<DesignElementHandle> listMasterPages = designFromUser.getMasterPages().getContents();
for (DesignElementHandle masterPage : listMasterPages) {
if (masterPage instanceof SimpleMasterPageHandle) {
designStored.getMasterPages().add((SimpleMasterPage) ((SimpleMasterPageHandle) masterPage).copy()); // TODO check what to use in place of add (deprecated)
SimpleMasterPageHandle masterPageHandle = (SimpleMasterPageHandle) masterPage;
designStored.getMasterPages().add(masterPageHandle.copy().getHandle(masterPage.getModule()));
}
}
} catch (Exception e) {
@@ -805,7 +830,7 @@ public class BirtServices {
@SuppressWarnings("unchecked")
Iterator<DesignElementHandle> iterStored = stylesStored.iterator();
while (iterStored.hasNext()) {
DesignElementHandle item = (DesignElementHandle) iterStored.next();
DesignElementHandle item = iterStored.next();
listStyleNames.add(item.getName());
}
@@ -814,7 +839,7 @@ public class BirtServices {
// adding to styles those which are not already present
while (iterUser.hasNext()) {
DesignElementHandle item = (DesignElementHandle) iterUser.next();
DesignElementHandle item = iterUser.next();
if (!listStyleNames.contains(item.getName())) {
DesignElementHandle copy = item.copy().getHandle(item.getModule());
try {
@@ -34,7 +34,6 @@ import org.apache.ofbiz.entity.condition.EntityCondition;
import org.apache.ofbiz.entity.condition.EntityConditionList;
import org.apache.ofbiz.entity.condition.EntityExpr;
import org.apache.ofbiz.entity.util.EntityQuery;
import org.eclipse.birt.report.engine.api.HTMLServerImageHandler;
import org.eclipse.birt.report.engine.api.RenderOption;
import org.eclipse.birt.report.model.api.elements.DesignChoiceConstants;
@@ -42,7 +41,6 @@ public final class BirtUtil {
public final static String module = BirtUtil.class.getName();
private final static HTMLServerImageHandler imageHandler = new HTMLServerImageHandler(); // TODO not used yet or to remove
private final static Map<String, String> entityFieldTypeBirtTypeMap = MapUtils.unmodifiableMap(UtilMisc.toMap(
"id", DesignChoiceConstants.COLUMN_DATA_TYPE_STRING,
"url", DesignChoiceConstants.COLUMN_DATA_TYPE_STRING,
@@ -20,7 +20,6 @@
package org.apache.ofbiz.birt.flexible;
import java.io.IOException;
import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Map;
@@ -87,10 +86,10 @@ public class ReportDesignGenerator {
public ReportDesignGenerator(Map<String, Object> context, DispatchContext dctx) throws GeneralException, SemanticException {
locale = (Locale) context.get("locale");
dataMap = UtilGenerics.checkMap(context.get("dataMap"));
filterMap = (LinkedHashMap<String, String>) context.get("filterMap");
filterMap = UtilGenerics.cast(context.get("filterMap"));
serviceName = (String) context.get("serviceName");
fieldDisplayLabels = UtilGenerics.checkMap(context.get("fieldDisplayLabels"));
filterDisplayLabels = (LinkedHashMap<String, String>) context.get("filterDisplayLabels");
filterDisplayLabels = UtilGenerics.cast(context.get("filterDisplayLabels"));
rptDesignName = (String) context.get("rptDesignName");
String writeFilters = (String) context.get("writeFilters");
if (UtilValidate.isEmpty(dataMap)) {
@@ -156,7 +155,7 @@ public class ReportDesignGenerator {
} else {
displayFilterName = filter;
}
ScalarParameterHandle scalParam = ((ElementFactory) factory).newScalarParameter(filter);
ScalarParameterHandle scalParam = factory.newScalarParameter(filter);
// scalParam.setDisplayName(displayFilterName); // TODO has no incidence at all right now, is only displayed when using birt's report parameter system. Not our case. I leave it here if any idea arise of how to translate these.
scalParam.setPromptText(displayFilterName);
if ("javaObject".equals(birtType)) { //Fields of type='blob' are rejected by Birt: org.eclipse.birt.report.model.api.metadata.PropertyValueException: The choice value "javaObject" is not allowed.
@@ -81,10 +81,10 @@ public class BirtViewHandler implements ViewHandler {
// add dynamic parameter for page
if (UtilValidate.isEmpty(page) || "ExecuteFlexibleReport".equals(page)) {
page = (String) request.getParameter("rptDesignFile");
page = request.getParameter("rptDesignFile");
}
if (UtilValidate.isEmpty(page)) {
Locale locale = (Locale) request.getLocale();
Locale locale = request.getLocale();
throw new ViewHandlerException(UtilProperties.getMessage(resource_error, "BirtErrorNotPublishedReport", locale));
}
if (page.startsWith("component://")) {
@@ -112,13 +112,13 @@ public class BirtViewHandler implements ViewHandler {
}
// set override content type
String overrideContentType = (String) request.getParameter(BirtWorker.getBirtContentType());
String overrideContentType = request.getParameter(BirtWorker.getBirtContentType());
if (UtilValidate.isNotEmpty(overrideContentType)) {
contentType = overrideContentType;
}
// set output file name to get also file extension
String outputFileName = (String) request.getParameter(BirtWorker.getBirtOutputFileName());
String outputFileName = request.getParameter(BirtWorker.getBirtOutputFileName());
if (UtilValidate.isNotEmpty(outputFileName)) {
outputFileName = BirtUtil.encodeReportName(outputFileName);
String format = BirtUtil.getMimeTypeFileExtension(contentType);
+14 -1
View File
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
under the License.
-->
<web-app version="3.0">
<web-app version="4.0" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd">
<display-name>Apache OFBiz - Accounting Manager</display-name>
<description>Accounting Manager Module of the Apache OFBiz Project</description>
@@ -63,6 +63,11 @@ under the License.
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -71,6 +76,10 @@ under the License.
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -89,6 +98,10 @@ under the License.
<url-pattern>/control/*</url-pattern>
</servlet-mapping>
<session-config>
<session-timeout>60</session-timeout><!-- in minutes -->
</session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
+13 -11
View File
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
under the License.
-->
<web-app version="3.0">
<web-app version="4.0" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd">
<display-name>Apache OFBiz - BIRT Component</display-name>
<description>BIRT Component of the Apache OFBiz Project</description>
@@ -35,16 +35,6 @@ under the License.
<param-name>mainDecoratorLocation</param-name>
<param-value>component://birt/widget/birt/BirtScreens.xml</param-value>
</context-param>
<context-param>
<description>Enable widget boundary comments. See org.apache.ofbiz.widget.model.ModelWidget.widgetBoundaryCommentsEnabled().</description>
<param-name>widgetVerbose</param-name>
<param-value>false</param-value>
</context-param>
<context-param>
<description>Remove unnecessary whitespace from HTML output.</description>
<param-name>compressHTML</param-name>
<param-value>false</param-value>
</context-param>
<filter>
<display-name>ControlFilter</display-name>
@@ -64,6 +54,11 @@ under the License.
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -72,6 +67,10 @@ under the License.
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -142,6 +141,9 @@ under the License.
<url-pattern>/extract</url-pattern>
</servlet-mapping>
<session-config>
<session-timeout>60</session-timeout><!-- in minutes -->
</session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
+14 -1
View File
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
under the License.
-->
<web-app version="3.0">
<web-app version="4.0" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd">
<display-name>Apache OFBiz - Facility Manager</display-name>
<description>Facility Manager Module of the Apache OFBiz Project</description>
@@ -63,6 +63,11 @@ under the License.
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -71,6 +76,10 @@ under the License.
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -100,6 +109,10 @@ under the License.
<url-pattern>/ShippingAPI.dll</url-pattern>
</servlet-mapping>
<session-config>
<session-timeout>60</session-timeout><!-- in minutes -->
</session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
+14 -1
View File
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
under the License.
-->
<web-app version="3.0">
<web-app version="4.0" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd">
<display-name>Apache OFBiz - Order Manager</display-name>
<description>Order Manager Module of the Apache OFBiz Project</description>
@@ -58,6 +58,11 @@ under the License.
<filter-name>ContextFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
</filter>
<filter>
<display-name>SameSiteFilter</display-name>
<filter-name>SameSiteFilter</filter-name>
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ControlFilter</filter-name>
<url-pattern>/*</url-pattern>
@@ -66,6 +71,10 @@ under the License.
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SameSiteFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -96,6 +105,10 @@ under the License.
<url-pattern>/products/*</url-pattern>
</servlet-mapping>
<session-config>
<session-timeout>60</session-timeout><!-- in minutes -->
</session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
+6 -4
View File
@@ -44,8 +44,9 @@ under the License.
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>${(decoratedContent.subcontent.title.render)!"WebSite 1 Generic Title (Set subcontent 'title' on your content!)"}</title>
<link rel="shortcut icon" href="/images/ofbiz.ico" />
<script language="javascript" src="/common/js/util/fieldlookup.js" type="text/javascript"></script>
<script language="javascript" src="/common/js/util/OfbizUtil.js" type="text/javascript"></script>
<script src="/common/js/util/dompurify/dist/purify.min.js" type="application/javascript"></script>
<script src="/common/js/util/fieldlookup.js" type="application/javascript"></script>
<script src="/common/js/util/OfbizUtil.js" type="application/javascript"></script>
<link rel="stylesheet" href="/ecommerce/images/ecommain.css" type="text/css"/>
<link rel="stylesheet" href="/ecommerce/images/blog.css" type="text/css"/>
<link rel="stylesheet" href="/contentimages/css/contentForum.css" type="text/css"/>
@@ -125,8 +126,9 @@ under the License.
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>${(decoratedContent.subcontent.title.render)!"WebSite 2 Generic Title (Set subcontent 'title' on your content!)"}</title>
<link rel="shortcut icon" href="/images/ofbiz.ico" />
<script language="javascript" src="/common/js/util/fieldlookup.js" type="text/javascript"></script>
<script language="javascript" src="/common/js/util/OfbizUtil.js" type="text/javascript"></script>
<script src="/common/js/util/dompurify/dist/purify.min.js" type="application/javascript"></script>
<script src="/common/js/util/fieldlookup.js" type="application/javascript"></script>
<script src="/common/js/util/OfbizUtil.js" type="application/javascript"></script>
<link rel="stylesheet" href="/ecommerce/images/ecommain.css" type="text/css"/>
<link rel="stylesheet" href="/ecommerce/images/blog.css" type="text/css"/>
<link rel="stylesheet" href="/contentimages/css/contentForum.css" type="text/css"/>
+8 -8
View File
@@ -21,7 +21,7 @@ under the License.
<entity-engine-xml>
<!-- Making the CmsSite as a default site in multisite setup -->
<WebSite webSiteId="CmsSite" siteName="CMS Web Site" hostedPathAlias="cmssite" isDefault="Y"/>
<Content contentId="CMSS_PPOINT" contentTypeId="WEB_SITE_PUB_PT" contentName="CMS Site Publish Point" description=""/>
<Content contentId="CMSS_PPOINT" contentTypeId="WEB_SITE_PUB_PT" contentName="CMS Site Publish Point"/>
<WebSiteContent webSiteId="CmsSite" contentId="CMSS_PPOINT" webSiteContentTypeId="PUBLISH_POINT" fromDate="2001-01-01 00:00:00"/>
<!-- Main Decorator -->
@@ -41,11 +41,11 @@ under the License.
<Content contentId="CMSS_HHEAD" contentTypeId="DOCUMENT" contentName="CMS Site HTML Head" dataResourceId="CMSS_HHEAD"/>
<ContentPurpose contentId="CMSS_HHEAD" contentPurposeTypeId="SECTION"/>
<DataResource dataResourceId="FIELD_LOOKUP_JS" dataResourceTypeId="LINK" mimeTypeId="text/js" objectInfo="/common/js/util/fieldlookup.js"/>
<DataResource dataResourceId="FIELD_LOOKUP_JS" dataResourceTypeId="LINK" mimeTypeId="application/javascript" objectInfo="/common/js/util/fieldlookup.js"/>
<Content contentId="FIELD_LOOKUP_JS" contentTypeId="DOCUMENT" contentName="Field Lookup JS" dataResourceId="FIELD_LOOKUP_JS"/>
<ContentAssoc contentId="CMSS_HHEAD" contentIdTo="FIELD_LOOKUP_JS" sequenceNum="1" contentAssocTypeId="SUB_CONTENT" mapKey="js" fromDate="2014-10-02 00:00:00"/>
<DataResource dataResourceId="OFBIZ_UTIL_JS" dataResourceTypeId="LINK" mimeTypeId="text/js" objectInfo="/common/js/util/OfbizUtil.js"/>
<DataResource dataResourceId="OFBIZ_UTIL_JS" dataResourceTypeId="LINK" mimeTypeId="application/javascript" objectInfo="/common/js/util/OfbizUtil.js"/>
<Content contentId="OFBIZ_UTIL_JS" contentTypeId="DOCUMENT" contentName="OFBiz Util JS" dataResourceId="OFBIZ_UTIL_JS"/>
<ContentAssoc contentId="CMSS_HHEAD" contentIdTo="OFBIZ_UTIL_JS" sequenceNum="2" contentAssocTypeId="SUB_CONTENT" mapKey="js" fromDate="2014-10-02 00:00:00"/>
@@ -217,7 +217,7 @@ under the License.
<!-- =========================official OFBiz website ============================================ -->
<WebSite webSiteId="OfbizSite" siteName="OFBiz Web Site"/>
<Content contentId="OFBIZ_PPOINT" contentTypeId="WEB_SITE_PUB_PT" contentName="OFBiz Site Publish Point" description=""/>
<Content contentId="OFBIZ_PPOINT" contentTypeId="WEB_SITE_PUB_PT" contentName="OFBiz Site Publish Point"/>
<WebSiteContent webSiteId="OfbizSite" contentId="OFBIZ_PPOINT" webSiteContentTypeId="PUBLISH_POINT" fromDate="2001-01-01 00:00:00"/>
<DataResource dataResourceId="OFBIZ_HOME" dataResourceTypeId="URL_RESOURCE" dataTemplateTypeId="SCREEN_COMBINED"
objectInfo="component://cmssite/widget/OfbizsiteScreens.xml#main"/>
@@ -234,17 +234,17 @@ under the License.
<DataResource dataResourceId="APACHE_OFBIZ" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="plugins/cmssite/documents/ApacheOfbiz.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Apache OFBiz document" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="APACHE_OFBIZ_HTML" contentTypeId="DOCUMENT" templateDataResourceId="DOCBOOK_HTML_TEMPL" dataResourceId="APACHE_OFBIZ" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="The User &amp; Technical Apache OFBiz document in one page HTML" mimeTypeId="text/html"/>
<ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_HTML" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01" sequenceNum=""/>
<ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_HTML" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01"/>/>
<Content contentId="APACHE_OFBIZ_PDF" contentTypeId="DOCUMENT" templateDataResourceId="DOCBOOK_PDF_TEMPL" dataResourceId="APACHE_OFBIZ" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="The general Apache document in PDF format" mimeTypeId="application/pdf"/>
<ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_PDF" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01" sequenceNum=""/>
<ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_PDF" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01"/>/>
<DataResource dataResourceId="APACHE_OFBIZ_TECH" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="plugins/cmssite/documents/ApacheOfbizTechnical.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Apache OFBiz document" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="APACHE_OFBIZ_T_HTML" contentTypeId="DOCUMENT" templateDataResourceId="DOCBOOK_HTML_TEMPL" dataResourceId="APACHE_OFBIZ_TECH" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="The Apache OFBiz Technical Guide in one page HTML" mimeTypeId="text/html"/>
<ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_T_HTML" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01" sequenceNum=""/>
<ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_T_HTML" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01"/>/>
<DataResource dataResourceId="APACHE_OFBIZ_USER" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="plugins/cmssite/documents/ApacheOfbizUser.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Apache OFBiz User document" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="APACHE_OFBIZ_U_HTML" contentTypeId="DOCUMENT" templateDataResourceId="DOCBOOK_HTML_TEMPL" dataResourceId="APACHE_OFBIZ_USER" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="The Apache OFBizUser Guide in one page HTML" mimeTypeId="text/html"/>
<ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_U_HTML" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01" sequenceNum=""/>
<ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_U_HTML" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01"/>/>
<ContentAssoc contentId="CMSS_PPOINT" contentIdTo="PUBLIC_DOCS" contentAssocTypeId="SUB_CONTENT" fromDate="2001-01-01 00:00:00"/>
+8 -3
View File
@@ -20,13 +20,18 @@ under the License.
<ofbiz-component name="cmssite" enabled="true"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
<resource-loader name="main" type="component"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/CmsMultiSiteDemoData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/CmsSiteDemoData.xml"/>
<webapp name="cmssite" title="CMS Site" menu-name="secondary" app-bar-display="false"
server="default-server" location="webapp/cmssite" mount-point="/cmssite"/>
<webapp name="cmssite"
title="CMS Site"
menu-name="secondary"
app-bar-display="false"
server="default-server"
location="webapp/cmssite"
mount-point="/cmssite"/>
</ofbiz-component>
@@ -42,7 +42,6 @@ import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpUpgradeHandler;
import javax.servlet.http.Part;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilHttp;
@@ -83,12 +82,12 @@ public class MultiSiteRequestWrapper implements HttpServletRequest {
}
@Override
public Enumeration getHeaderNames() {
public Enumeration<String> getHeaderNames() {
return request.getHeaderNames();
}
@Override
public Enumeration getHeaders(String arg0) {
public Enumeration<String> getHeaders(String arg0) {
return request.getHeaders(arg0);
}
@@ -201,7 +200,7 @@ public class MultiSiteRequestWrapper implements HttpServletRequest {
}
@Override
public Enumeration getAttributeNames() {
public Enumeration<String> getAttributeNames() {
return request.getAttributeNames();
}
@@ -251,7 +250,7 @@ public class MultiSiteRequestWrapper implements HttpServletRequest {
}
@Override
public Enumeration getLocales() {
public Enumeration<Locale> getLocales() {
return request.getLocales();
}
@@ -261,12 +260,12 @@ public class MultiSiteRequestWrapper implements HttpServletRequest {
}
@Override
public Map getParameterMap() {
public Map<String, String[]> getParameterMap() {
return request.getParameterMap();
}
@Override
public Enumeration getParameterNames() {
public Enumeration<String> getParameterNames() {
return request.getParameterNames();
}
@@ -406,7 +405,7 @@ public class MultiSiteRequestWrapper implements HttpServletRequest {
}
@Override
public HttpUpgradeHandler upgrade (Class handlerClass) throws IOException, ServletException {
public <T extends HttpUpgradeHandler> T upgrade (Class<T> handlerClass) throws IOException, ServletException {
return request.upgrade(handlerClass);
}
}
@@ -24,7 +24,6 @@ import java.util.Locale;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
@@ -37,7 +36,6 @@ import org.apache.ofbiz.base.util.UtilHttp;
import org.apache.ofbiz.base.util.UtilMisc;
import org.apache.ofbiz.base.util.UtilValidate;
import org.apache.ofbiz.entity.Delegator;
import org.apache.ofbiz.entity.DelegatorFactory;
import org.apache.ofbiz.entity.GenericEntityException;
import org.apache.ofbiz.entity.GenericValue;
import org.apache.ofbiz.entity.util.EntityQuery;
@@ -53,7 +51,7 @@ import org.apache.ofbiz.webapp.stats.VisitHandler;
// Used to filter website on the basis of hosted pathAlias.
public class WebSiteFilter implements Filter {
public static final String MODULE = WebSiteFilter.class.getName();
public static final String module = WebSiteFilter.class.getName();
protected FilterConfig m_config = null;
@@ -87,7 +85,7 @@ public class WebSiteFilter implements Filter {
webSite = EntityQuery.use(delegator).from("WebSite").where("isDefault", "Y").cache().queryFirst();
}
} catch (GenericEntityException e) {
Debug.logError(e, MODULE);
Debug.logError(e, module);
}
if (webSite != null) {
webSiteId = webSite.getString("webSiteId");
@@ -95,7 +93,7 @@ public class WebSiteFilter implements Filter {
try {
productStore = webSite.getRelatedOne("ProductStore", false);
} catch (GenericEntityException e) {
Debug.logError(e, MODULE);
Debug.logError(e, module);
}
String newLocale = request.getParameter("newLocale");
@@ -122,7 +120,7 @@ public class WebSiteFilter implements Filter {
try {
cart.setCurrency(dispatcher, productStore.getString("defaultCurrencyUomId"));
} catch (CartItemModifyException e) {
Debug.logError(e, MODULE);
Debug.logError(e, module);
}
}
session.removeAttribute("webSiteId");
@@ -151,7 +149,7 @@ public class WebSiteFilter implements Filter {
try {
security = SecurityFactory.getInstance(delegator);
} catch (SecurityConfigurationException e) {
Debug.logError(e, MODULE);
Debug.logError(e, module);
}
request.setAttribute("delegator", delegator);
request.setAttribute("dispatcher", dispatcher);
+1 -1
View File
@@ -32,7 +32,7 @@ under the License.
<#assign nothing = thisContent.setSortOrder("caSequenceNum")/>
<#assign nothing = thisContent.setMapKeyFilter("js")/>
<#list thisContent.subcontent_all as content>
<script src="${content.render!}" type="text/javascript"></script>
<script src="${content.render!}" type="application/javascript"></script>
</#list>
<#assign nothing = thisContent.setMapKeyFilter("css")/>
<#list thisContent.subcontent_all as content>
@@ -242,7 +242,7 @@ body { background-image: url('</xsl:text>
unnecessary bloat to each chunk. -->
<xsl:if test="$annotation.support != 0 and //annotation">
<xsl:call-template name="add.annotation.links"/>
<script type="text/javascript">
<script type="application/javascript">
<xsl:text>
// Create PopupWindow objects</xsl:text>
<xsl:for-each select="//annotation">
@@ -6,13 +6,13 @@
<xsl:param name="scripts" select="normalize-space($annotation.js)"/>
<xsl:choose>
<xsl:when test="contains($scripts, ' ')">
<script type="text/javascript" src="{substring-before($scripts, ' ')}"/>
<script type="application/javascript" src="{substring-before($scripts, ' ')}"/>
<xsl:call-template name="add.annotation.links">
<xsl:with-param name="scripts" select="substring-after($scripts, ' ')"/>
</xsl:call-template>
</xsl:when>
<xsl:otherwise>
<script type="text/javascript" src="{$scripts}"/>
<script type="application/javascript" src="{$scripts}"/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
+1 -1
View File
@@ -302,7 +302,7 @@ body { background-image: url('</xsl:text>
unnecessary bloat to each chunk. -->
<xsl:if test="$annotation.support != 0 and //annotation">
<xsl:call-template name="add.annotation.links"/>
<script type="text/javascript">
<script type="application/javascript">
<xsl:text>&#10;// Create PopupWindow objects</xsl:text>
<xsl:for-each select="//annotation">
<xsl:text>&#10;var popup_</xsl:text>
+2 -2
View File
@@ -2424,7 +2424,7 @@ parameter.</para>
</refnamediv>
<refsynopsisdiv>
<programlisting xml:id="html.script.type.frag">&lt;xsl:param name="html.script.type"&gt;text/javascript&lt;/xsl:param&gt;</programlisting>
<programlisting xml:id="html.script.type.frag">&lt;xsl:param name="html.script.type"&gt;application/javascript&lt;/xsl:param&gt;</programlisting>
</refsynopsisdiv>
<refsection><info><title>Description</title></info>
@@ -2432,7 +2432,7 @@ parameter.</para>
<para>The type of script to place in the HTML <tag>script</tag> element.
Specifically, the value of the <tag>script</tag> element's <tag>type</tag>
attribute.
The default value is <literal>text/javascript</literal>.
The default value is <literal>application/javascript</literal>.
This param is used only when the stylesheet parameter
<tag>html.script</tag> is non-blank and specifies the location of a script.</para>
@@ -276,7 +276,7 @@ body { background-image: url('</xsl:text>
unnecessary bloat to each chunk. -->
<xsl:if test="$annotation.support != 0 and //annotation">
<xsl:call-template name="add.annotation.links"/>
<script type="text/javascript">
<script type="application/javascript">
<xsl:text>
// Create PopupWindow objects</xsl:text>
<xsl:for-each select="//annotation">
@@ -14,7 +14,7 @@
</refnamediv>
<refsynopsisdiv>
<src:fragment xml:id="html.script.type.frag"><xsl:param name="html.script.type">text/javascript</xsl:param></src:fragment>
<src:fragment xml:id="html.script.type.frag"><xsl:param name="html.script.type">application/javascript</xsl:param></src:fragment>
</refsynopsisdiv>
<refsection><info><title>Description</title></info>
@@ -22,7 +22,7 @@
<para>The type of script to place in the HTML <tag>script</tag> element.
Specifically, the value of the <tag>script</tag> element's <tag>type</tag>
attribute.
The default value is <literal>text/javascript</literal>.
The default value is <literal>application/javascript</literal>.
This param is used only when the stylesheet parameter
<tag>html.script</tag> is non-blank and specifies the location of a script.</para>
@@ -4,7 +4,7 @@
/* Usage:
<html>
<head>
<script LANGUAGE="JavaScript1.2" src="overlay.js"></script>
<script src="overlay.js"></script>
...rest of head...
</head>
<body onload="overlaySetup(corner)">
@@ -70,7 +70,7 @@ function xbLibrary(path)
xbLibrary.prototype.loadScript =
function (scriptName)
{
document.write('<script language="javascript" src="' + this.path + '/' + scriptName + '"><\/script>');
document.write('<script src="' + this.path + '/' + scriptName + '"><\/script>');
};
// default xbLibrary
+26 -26
View File
@@ -148,7 +148,7 @@
<xsl:if test="$overlay != 0 or $keyboard.nav != 0
or $dynamic.toc != 0 or $active.toc != 0
or $overlay.logo != ''">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -159,7 +159,7 @@
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -182,7 +182,7 @@
</xsl:if>
<xsl:if test="$dynamic.toc != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
function init() {
@@ -310,7 +310,7 @@ function init() {
<xsl:if test="$overlay != 0 or $keyboard.nav != 0
or $dynamic.toc != 0 or $active.toc != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -321,7 +321,7 @@ function init() {
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -429,7 +429,7 @@ function init() {
<xsl:if test="$overlay != 0 or $keyboard.nav != 0
or $dynamic.toc != 0 or $active.toc != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -440,7 +440,7 @@ function init() {
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -513,7 +513,7 @@ function init() {
<xsl:if test="$overlay != 0 or $keyboard.nav != 0
or $dynamic.toc != 0 or $active.toc != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -524,7 +524,7 @@ function init() {
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -587,7 +587,7 @@ function init() {
<xsl:if test="$overlay != 0 or $keyboard.nav != 0
or $dynamic.toc != 0 or $active.toc != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -598,7 +598,7 @@ function init() {
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -924,7 +924,7 @@ function init() {
<xsl:if test="$overlay != 0 or $keyboard.nav != 0
or $dynamic.toc != 0 or $active.toc != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -935,7 +935,7 @@ function init() {
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -1047,7 +1047,7 @@ function init() {
<xsl:if test="$overlay != 0 or $keyboard.nav != 0
or $dynamic.toc != 0 or $active.toc != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -1132,7 +1132,7 @@ function init() {
<xsl:if test="$overlay != 0 or $keyboard.nav != 0
or $dynamic.toc != 0 or $active.toc != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -1143,7 +1143,7 @@ function init() {
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -1215,7 +1215,7 @@ function init() {
<xsl:if test="$overlay != 0 or $keyboard.nav != 0
or $dynamic.toc != 0 or $active.toc != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -1226,7 +1226,7 @@ function init() {
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -1401,7 +1401,7 @@ function init() {
<xsl:if test="$overlay != 0 or $keyboard.nav != 0
or $dynamic.toc != 0 or $active.toc != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -1412,7 +1412,7 @@ function init() {
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -1519,7 +1519,7 @@ function init() {
<xsl:if test="$overlay != 0 or $keyboard.nav != 0
or $dynamic.toc != 0 or $active.toc != 0">
<script language="javajcript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -1530,7 +1530,7 @@ function init() {
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -1595,7 +1595,7 @@ function init() {
<xsl:if test="$overlay != 0 or $keyboard.nav != 0
or $dynamic.toc != 0 or $active.toc != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -1621,7 +1621,7 @@ function init() {
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -1688,7 +1688,7 @@ function init() {
<xsl:if test="$overlay != 0 or $keyboard.nav != 0
or $dynamic.toc != 0 or $active.toc != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -1699,7 +1699,7 @@ function init() {
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -36,7 +36,7 @@
<xsl:template name="ua.js">
<!-- Danger Will Robinson: template shadows parameter -->
<xsl:param name="language" select="'javascript'"/>
<script type="text/javascript" language="{$language}">
<script type="application/javascript">
<xsl:attribute name="src">
<xsl:call-template name="script-file">
<xsl:with-param name="js" select="$ua.js"/>
@@ -49,7 +49,7 @@
<xsl:template name="xbDOM.js">
<!-- Danger Will Robinson: template shadows parameter -->
<xsl:param name="language" select="'javascript'"/>
<script type="text/javascript" language="{$language}">
<script type="application/javascript">
<xsl:attribute name="src">
<xsl:call-template name="script-file">
<xsl:with-param name="js" select="$xbDOM.js"/>
@@ -62,7 +62,7 @@
<xsl:template name="xbStyle.js">
<!-- Danger Will Robinson: template shadows parameter -->
<xsl:param name="language" select="'javascript'"/>
<script type="text/javascript" language="{$language}">
<script type="application/javascript">
<xsl:attribute name="src">
<xsl:call-template name="script-file">
<xsl:with-param name="js" select="$xbStyle.js"/>
@@ -75,7 +75,7 @@
<xsl:template name="xbLibrary.js">
<!-- Danger Will Robinson: template shadows parameter -->
<xsl:param name="language" select="'javascript'"/>
<script type="text/javascript" language="{$language}">
<script type="application/javascript">
<xsl:attribute name="src">
<xsl:call-template name="script-file">
<xsl:with-param name="js" select="$xbLibrary.js"/>
@@ -88,7 +88,7 @@
<xsl:template name="xbCollapsibleLists.js">
<!-- Danger Will Robinson: template shadows parameter -->
<xsl:param name="language" select="'javascript'"/>
<script type="text/javascript" language="{$language}">
<script type="application/javascript">
<xsl:attribute name="src">
<xsl:call-template name="script-file">
<xsl:with-param name="js" select="$xbCollapsibleLists.js"/>
@@ -101,7 +101,7 @@
<xsl:template name="overlay.js">
<!-- Danger Will Robinson: template shadows parameter -->
<xsl:param name="language" select="'javascript'"/>
<script type="text/javascript" language="{$language}">
<script type="application/javascript">
<xsl:attribute name="src">
<xsl:call-template name="script-file">
<xsl:with-param name="js" select="$overlay.js"/>
@@ -114,7 +114,7 @@
<xsl:template name="slides.js">
<!-- Danger Will Robinson: template shadows parameter -->
<xsl:param name="language" select="'javascript'"/>
<script type="text/javascript" language="{$language}">
<script type="application/javascript">
<xsl:attribute name="src">
<xsl:call-template name="script-file">
<xsl:with-param name="js" select="$slides.js"/>
@@ -427,7 +427,7 @@
<!-- Scripts -->
<xsl:if test="$overlay != 0 or $keyboard.nav != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -438,7 +438,7 @@
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -646,7 +646,7 @@
<!-- Scripts -->
<xsl:if test="$overlay != 0 or $keyboard.nav != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -657,7 +657,7 @@
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -869,7 +869,7 @@
<!-- Scripts -->
<xsl:if test="$overlay != 0 or $keyboard.nav != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -880,7 +880,7 @@
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -1054,7 +1054,7 @@
<!-- Scripts -->
<xsl:if test="$overlay != 0 or $keyboard.nav != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -1065,7 +1065,7 @@
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -45,7 +45,7 @@
</xsl:call-template>
<xsl:if test="$keyboard.nav != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -56,7 +56,7 @@
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('../browser');
@@ -152,7 +152,7 @@
</xsl:call-template>
<xsl:if test="$keyboard.nav != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -163,7 +163,7 @@
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('../browser');
@@ -265,7 +265,7 @@
</xsl:call-template>
<xsl:if test="$keyboard.nav != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -276,7 +276,7 @@
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('../browser');
@@ -388,7 +388,7 @@
</xsl:call-template>
<xsl:if test="$keyboard.nav != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -399,7 +399,7 @@
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('../browser');
@@ -147,7 +147,7 @@
<xsl:apply-templates select="/processing-instruction('dbhtml')" mode="css.pi"/>
<xsl:if test="$overlay != 0 or $keyboard.nav != 0 or $dynamic.toc != 0 or $active.toc != 0 or $overlay.logo != ''">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -158,7 +158,7 @@
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -181,7 +181,7 @@
</xsl:if>
<xsl:if test="$dynamic.toc != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
function init() {
@@ -306,7 +306,7 @@ function init() {
</xsl:call-template>
<xsl:if test="$overlay != 0 or $keyboard.nav != 0 or $dynamic.toc != 0 or $active.toc != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -317,7 +317,7 @@ function init() {
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -423,7 +423,7 @@ function init() {
</xsl:call-template>
<xsl:if test="$overlay != 0 or $keyboard.nav != 0 or $dynamic.toc != 0 or $active.toc != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -434,7 +434,7 @@ function init() {
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -505,7 +505,7 @@ function init() {
</xsl:call-template>
<xsl:if test="$overlay != 0 or $keyboard.nav != 0 or $dynamic.toc != 0 or $active.toc != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -516,7 +516,7 @@ function init() {
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -577,7 +577,7 @@ function init() {
</xsl:call-template>
<xsl:if test="$overlay != 0 or $keyboard.nav != 0 or $dynamic.toc != 0 or $active.toc != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -588,7 +588,7 @@ function init() {
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -907,7 +907,7 @@ function init() {
</xsl:call-template>
<xsl:if test="$overlay != 0 or $keyboard.nav != 0 or $dynamic.toc != 0 or $active.toc != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -918,7 +918,7 @@ function init() {
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -1029,7 +1029,7 @@ function init() {
</xsl:call-template>
<xsl:if test="$overlay != 0 or $keyboard.nav != 0 or $dynamic.toc != 0 or $active.toc != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -1113,7 +1113,7 @@ function init() {
</xsl:call-template>
<xsl:if test="$overlay != 0 or $keyboard.nav != 0 or $dynamic.toc != 0 or $active.toc != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -1124,7 +1124,7 @@ function init() {
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -1195,7 +1195,7 @@ function init() {
</xsl:call-template>
<xsl:if test="$overlay != 0 or $keyboard.nav != 0 or $dynamic.toc != 0 or $active.toc != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -1206,7 +1206,7 @@ function init() {
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -1377,7 +1377,7 @@ function init() {
</xsl:call-template>
<xsl:if test="$overlay != 0 or $keyboard.nav != 0 or $dynamic.toc != 0 or $active.toc != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -1388,7 +1388,7 @@ function init() {
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -1491,7 +1491,7 @@ function init() {
<xsl:apply-templates select="/processing-instruction('dbhtml')" mode="css.pi"/>
<xsl:if test="$overlay != 0 or $keyboard.nav != 0 or $dynamic.toc != 0 or $active.toc != 0">
<script language="javajcript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -1502,7 +1502,7 @@ function init() {
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -1566,7 +1566,7 @@ function init() {
<xsl:apply-templates select="/processing-instruction('dbhtml')" mode="css.pi"/>
<xsl:if test="$overlay != 0 or $keyboard.nav != 0 or $dynamic.toc != 0 or $active.toc != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -1589,7 +1589,7 @@ function init() {
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -1652,7 +1652,7 @@ function init() {
<xsl:apply-templates select="/processing-instruction('dbhtml')" mode="css.pi"/>
<xsl:if test="$overlay != 0 or $keyboard.nav != 0 or $dynamic.toc != 0 or $active.toc != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -1663,7 +1663,7 @@ function init() {
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -37,7 +37,7 @@
<xsl:template name="ua.js">
<!-- Danger Will Robinson: template shadows parameter -->
<xsl:param name="language" select="'javascript'"/>
<script type="text/javascript" language="{$language}">
<script type="application/javascript">
<xsl:attribute name="src">
<xsl:call-template name="script-file">
<xsl:with-param name="js" select="$ua.js"/>
@@ -50,7 +50,7 @@
<xsl:template name="xbDOM.js">
<!-- Danger Will Robinson: template shadows parameter -->
<xsl:param name="language" select="'javascript'"/>
<script type="text/javascript" language="{$language}">
<script type="application/javascript">
<xsl:attribute name="src">
<xsl:call-template name="script-file">
<xsl:with-param name="js" select="$xbDOM.js"/>
@@ -63,7 +63,7 @@
<xsl:template name="xbStyle.js">
<!-- Danger Will Robinson: template shadows parameter -->
<xsl:param name="language" select="'javascript'"/>
<script type="text/javascript" language="{$language}">
<script type="application/javascript">
<xsl:attribute name="src">
<xsl:call-template name="script-file">
<xsl:with-param name="js" select="$xbStyle.js"/>
@@ -76,7 +76,7 @@
<xsl:template name="xbLibrary.js">
<!-- Danger Will Robinson: template shadows parameter -->
<xsl:param name="language" select="'javascript'"/>
<script type="text/javascript" language="{$language}">
<script type="application/javascript">
<xsl:attribute name="src">
<xsl:call-template name="script-file">
<xsl:with-param name="js" select="$xbLibrary.js"/>
@@ -89,7 +89,7 @@
<xsl:template name="xbCollapsibleLists.js">
<!-- Danger Will Robinson: template shadows parameter -->
<xsl:param name="language" select="'javascript'"/>
<script type="text/javascript" language="{$language}">
<script type="application/javascript">
<xsl:attribute name="src">
<xsl:call-template name="script-file">
<xsl:with-param name="js" select="$xbCollapsibleLists.js"/>
@@ -102,7 +102,7 @@
<xsl:template name="overlay.js">
<!-- Danger Will Robinson: template shadows parameter -->
<xsl:param name="language" select="'javascript'"/>
<script type="text/javascript" language="{$language}">
<script type="application/javascript">
<xsl:attribute name="src">
<xsl:call-template name="script-file">
<xsl:with-param name="js" select="$overlay.js"/>
@@ -115,7 +115,7 @@
<xsl:template name="slides.js">
<!-- Danger Will Robinson: template shadows parameter -->
<xsl:param name="language" select="'javascript'"/>
<script type="text/javascript" language="{$language}">
<script type="application/javascript">
<xsl:attribute name="src">
<xsl:call-template name="script-file">
<xsl:with-param name="js" select="$slides.js"/>
@@ -425,7 +425,7 @@
<!-- Scripts -->
<xsl:if test="$overlay != 0 or $keyboard.nav != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -436,7 +436,7 @@
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -644,7 +644,7 @@
<!-- Scripts -->
<xsl:if test="$overlay != 0 or $keyboard.nav != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -655,7 +655,7 @@
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -864,7 +864,7 @@
<!-- Scripts -->
<xsl:if test="$overlay != 0 or $keyboard.nav != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -875,7 +875,7 @@
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -1049,7 +1049,7 @@
<!-- Scripts -->
<xsl:if test="$overlay != 0 or $keyboard.nav != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -1060,7 +1060,7 @@
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('</xsl:text>
@@ -46,7 +46,7 @@
</xsl:call-template>
<xsl:if test="$keyboard.nav != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -57,7 +57,7 @@
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('../browser');
@@ -152,7 +152,7 @@
</xsl:call-template>
<xsl:if test="$keyboard.nav != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -163,7 +163,7 @@
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('../browser');
@@ -264,7 +264,7 @@
</xsl:call-template>
<xsl:if test="$keyboard.nav != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -275,7 +275,7 @@
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('../browser');
@@ -383,7 +383,7 @@
</xsl:call-template>
<xsl:if test="$keyboard.nav != 0">
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text> </xsl:text>
</script>
</xsl:if>
@@ -394,7 +394,7 @@
<xsl:with-param name="language" select="'javascript'"/>
</xsl:call-template>
<xsl:call-template name="xbLibrary.js"/>
<script language="javascript" type="text/javascript">
<script type="application/javascript">
<xsl:text disable-output-escaping="yes">
&lt;!--
xblibrary = new xbLibrary('../browser');
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"><head>
<meta http-equiv="X-UA-Compatible" content="IE=7"></meta>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
<title>Introduction</title><meta name="generator" content="DocBook XSL Stylesheets V1.77.1"></meta><meta name="description" content="Overview of the package."></meta><link rel="home" href="index.html" title="README: Web-based Help from DocBook XML"></link><link rel="up" href="index.html" title="README: Web-based Help from DocBook XML"></link><link rel="prev" href="index.html" title="README: Web-based Help from DocBook XML"></link><link rel="next" href="ch02.html" title="Using the package"></link><script type="text/javascript">
<title>Introduction</title><meta name="generator" content="DocBook XSL Stylesheets V1.77.1"></meta><meta name="description" content="Overview of the package."></meta><link rel="home" href="index.html" title="README: Web-based Help from DocBook XML"></link><link rel="up" href="index.html" title="README: Web-based Help from DocBook XML"></link><link rel="prev" href="index.html" title="README: Web-based Help from DocBook XML"></link><link rel="next" href="ch02.html" title="Using the package"></link><script type="application/javascript">
//The id for tree cookie
var treeCookieId = "treeview-1055";
var language = "en";
@@ -85,7 +85,7 @@ border: none; background: none; font-weight: none; color: none; }
.ui-tabs { padding: .2em;}
.ui-tabs .ui-tabs-nav li { top: 0px; margin: -2px 0 1px; text-transform: uppercase; font-size: 10.5px;}
.ui-tabs .ui-tabs-nav li a { padding: .25em 2em .25em 1em; margin: .5em; text-shadow: 0 1px 0 rgba(255,255,255,.5); }
</style><script type="text/javascript" src="../common/browserDetect.js"></script><script type="text/javascript" src="../common/jquery/jquery-1.4.2.min.js"></script><script type="text/javascript" src="../common/jquery/jquery-ui-1.8.2.custom.min.js"></script><script type="text/javascript" src="../common/jquery/jquery.cookie.js"></script><script type="text/javascript" src="../common/jquery/treeview/jquery.treeview.min.js"></script><script type="text/javascript" src="search/l10n.js"></script><script type="text/javascript" src="search/htmlFileInfoList.js"></script><script type="text/javascript" src="search/nwSearchFnt.js"></script><script type="text/javascript" src="search/stemmers/en_stemmer.js"><!--//make this scalable to other languages as well.--></script><script type="text/javascript" src="search/index-1.js"></script><script type="text/javascript" src="search/index-2.js"></script><script type="text/javascript" src="search/index-3.js"></script></head><body><div id="header"><a target="_blank" href="#"><img style="margin-right: 2px; height: 59px; padding-right: 25px; padding-top: 8px" align="right" src="../common/images/logo.png" alt=" Documentation"></img></a><h1>README: Web-based Help from DocBook XML<br></br>Introduction</h1><div id="navheader"><table class="navLinks"><tr><td><a id="showHideButton" href="javascript:showHideToc();" class="pointLeft" tabindex="5" title="Hide TOC tree">Sidebar
</style><script type="application/javascript" src="../common/browserDetect.js"></script><script type="application/javascript" src="../common/jquery/jquery-1.4.2.min.js"></script><script type="application/javascript" src="../common/jquery/jquery-ui-1.8.2.custom.min.js"></script><script type="application/javascript" src="../common/jquery/jquery.cookie.js"></script><script type="application/javascript" src="../common/jquery/treeview/jquery.treeview.min.js"></script><script type="application/javascript" src="search/l10n.js"></script><script type="application/javascript" src="search/htmlFileInfoList.js"></script><script type="application/javascript" src="search/nwSearchFnt.js"></script><script type="application/javascript" src="search/stemmers/en_stemmer.js"><!--//make this scalable to other languages as well.--></script><script type="application/javascript" src="search/index-1.js"></script><script type="application/javascript" src="search/index-2.js"></script><script type="application/javascript" src="search/index-3.js"></script></head><body><div id="header"><a target="_blank" href="#"><img style="margin-right: 2px; height: 59px; padding-right: 25px; padding-top: 8px" align="right" src="../common/images/logo.png" alt=" Documentation"></img></a><h1>README: Web-based Help from DocBook XML<br></br>Introduction</h1><div id="navheader"><table class="navLinks"><tr><td><a id="showHideButton" href="javascript:showHideToc();" class="pointLeft" tabindex="5" title="Hide TOC tree">Sidebar
</a></td><td><a accesskey="p" class="navLinkPrevious" tabindex="5" href="index.html">Prev</a> 
|
<a accesskey="n" class="navLinkNext" tabindex="5" href="ch02.html">Next</a></td></tr></table></div></div><div id="content"><noscript>JavaScript is disabled on your browser. Please enable JavaScript to enjoy all the features of this site.</noscript><div class="chapter"><div xmlns="" class="titlepage"><div><div><h1 xmlns="http://www.w3.org/1999/xhtml" class="title"><a id="id375622"></a>Introduction</h1></div></div></div>
@@ -106,4 +106,4 @@ border: none; background: none; font-weight: none; color: none; }
model for integrating this output format into your own
build system. Alternatively, you can use this Ant script
as a template for creating your own build script or you
can use the <a class="ulink" href="http://docbkx-tools.sourceforge.net/docbkx-samples/manual.html" target="_top">Docbkx Maven plugin</a>.</p></li></ul></div></div><script type="text/javascript" src="../common/main.js"></script><div class="navfooter"><hr></hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="index.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ch02.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></div><div id="sidebar"><div id="leftnavigation" style="padding-top:3px;"><div id="tabs"><ul><li><a href="#treeDiv" style="outline:0;" tabindex="1"><span class="contentsTab">Contents</span></a></li><li><a href="#searchDiv" style="outline:0;" tabindex="1" onclick="doSearch()"><span class="searchTab">Search</span></a></li></ul><div id="treeDiv"><img src="../common/images/loading.gif" alt="loading table of contents..." id="tocLoading" style="display:block;"></img><div id="ulTreeDiv" style="display:none"><ul id="tree" class="filetree"><li id="webhelp-currentid"><span class="file"><a href="ch01.html" tabindex="1">Introduction</a></span></li><li><span class="file"><a href="ch02.html" tabindex="1">Using the package</a></span><ul><li><span class="file"><a href="ch02s01.html" tabindex="1">Generating webhelp output</a></span></li><li><span class="file"><a href="ch02s02.html" tabindex="1">Using and customizing the output</a></span><ul><li><span class="file"><a href="ch02s02s01.html" tabindex="1">Recommended Apache configurations</a></span></li></ul></li><li><span class="file"><a href="ch02s03.html" tabindex="1">Search indexing</a></span></li><li><span class="file"><a href="ch02s04.html" tabindex="1">Adding support for other (non-CJKV) languages</a></span></li><li><span class="file"><a href="ch02s05.html" tabindex="1">Adding images</a></span></li></ul></li><li><span class="file"><a href="ch03.html" tabindex="1">Developer Docs</a></span><ul><li><span class="file"><a href="ch03s01.html" tabindex="1">Design</a></span></li><li><span class="file"><a href="ch03s02.html" tabindex="1">Search</a></span><ul><li><span class="file"><a href="ch03s02s01.html" tabindex="1">New Stemmers</a></span></li></ul></li></ul></li><li><span class="file"><a href="ch04.html" tabindex="1">FAQ</a></span></li></ul></div></div><div id="searchDiv"><div id="search"><form onsubmit="Verifie(searchForm);return false" name="searchForm" class="searchForm"><fieldset class="searchFieldSet"><legend>Search</legend><center><input id="textToSearch" name="textToSearch" type="search" class="searchText" tabindex="1"></input> &nbsp; <input onclick="Verifie(searchForm)" type="button" class="searchButton" value="Go" id="doSearch" tabindex="1"></input></center></fieldset></form></div><div id="searchResults"><center></center></div><p class="searchHighlight"><a href="#" onclick="toggleHighlight()">Search Highlighter (On/Off)</a></p></div></div></div></div></body></html>
can use the <a class="ulink" href="http://docbkx-tools.sourceforge.net/docbkx-samples/manual.html" target="_top">Docbkx Maven plugin</a>.</p></li></ul></div></div><script type="application/javascript" src="../common/main.js"></script><div class="navfooter"><hr></hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="index.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ch02.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></div><div id="sidebar"><div id="leftnavigation" style="padding-top:3px;"><div id="tabs"><ul><li><a href="#treeDiv" style="outline:0;" tabindex="1"><span class="contentsTab">Contents</span></a></li><li><a href="#searchDiv" style="outline:0;" tabindex="1" onclick="doSearch()"><span class="searchTab">Search</span></a></li></ul><div id="treeDiv"><img src="../common/images/loading.gif" alt="loading table of contents..." id="tocLoading" style="display:block;"></img><div id="ulTreeDiv" style="display:none"><ul id="tree" class="filetree"><li id="webhelp-currentid"><span class="file"><a href="ch01.html" tabindex="1">Introduction</a></span></li><li><span class="file"><a href="ch02.html" tabindex="1">Using the package</a></span><ul><li><span class="file"><a href="ch02s01.html" tabindex="1">Generating webhelp output</a></span></li><li><span class="file"><a href="ch02s02.html" tabindex="1">Using and customizing the output</a></span><ul><li><span class="file"><a href="ch02s02s01.html" tabindex="1">Recommended Apache configurations</a></span></li></ul></li><li><span class="file"><a href="ch02s03.html" tabindex="1">Search indexing</a></span></li><li><span class="file"><a href="ch02s04.html" tabindex="1">Adding support for other (non-CJKV) languages</a></span></li><li><span class="file"><a href="ch02s05.html" tabindex="1">Adding images</a></span></li></ul></li><li><span class="file"><a href="ch03.html" tabindex="1">Developer Docs</a></span><ul><li><span class="file"><a href="ch03s01.html" tabindex="1">Design</a></span></li><li><span class="file"><a href="ch03s02.html" tabindex="1">Search</a></span><ul><li><span class="file"><a href="ch03s02s01.html" tabindex="1">New Stemmers</a></span></li></ul></li></ul></li><li><span class="file"><a href="ch04.html" tabindex="1">FAQ</a></span></li></ul></div></div><div id="searchDiv"><div id="search"><form onsubmit="Verifie(searchForm);return false" name="searchForm" class="searchForm"><fieldset class="searchFieldSet"><legend>Search</legend><center><input id="textToSearch" name="textToSearch" type="search" class="searchText" tabindex="1"></input> &nbsp; <input onclick="Verifie(searchForm)" type="button" class="searchButton" value="Go" id="doSearch" tabindex="1"></input></center></fieldset></form></div><div id="searchResults"><center></center></div><p class="searchHighlight"><a href="#" onclick="toggleHighlight()">Search Highlighter (On/Off)</a></p></div></div></div></div></body></html>
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"><head>
<meta http-equiv="X-UA-Compatible" content="IE=7"></meta>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
<title>Using the package</title><meta name="generator" content="DocBook XSL Stylesheets V1.77.1"></meta><link rel="home" href="index.html" title="README: Web-based Help from DocBook XML"></link><link rel="up" href="index.html" title="README: Web-based Help from DocBook XML"></link><link rel="prev" href="ch01.html" title="Introduction"></link><link rel="next" href="ch02s01.html" title="Generating webhelp output"></link><script type="text/javascript">
<title>Using the package</title><meta name="generator" content="DocBook XSL Stylesheets V1.77.1"></meta><link rel="home" href="index.html" title="README: Web-based Help from DocBook XML"></link><link rel="up" href="index.html" title="README: Web-based Help from DocBook XML"></link><link rel="prev" href="ch01.html" title="Introduction"></link><link rel="next" href="ch02s01.html" title="Generating webhelp output"></link><script type="application/javascript">
//The id for tree cookie
var treeCookieId = "treeview-1055";
var language = "en";
@@ -85,9 +85,9 @@ border: none; background: none; font-weight: none; color: none; }
.ui-tabs { padding: .2em;}
.ui-tabs .ui-tabs-nav li { top: 0px; margin: -2px 0 1px; text-transform: uppercase; font-size: 10.5px;}
.ui-tabs .ui-tabs-nav li a { padding: .25em 2em .25em 1em; margin: .5em; text-shadow: 0 1px 0 rgba(255,255,255,.5); }
</style><script type="text/javascript" src="../common/browserDetect.js"></script><script type="text/javascript" src="../common/jquery/jquery-1.4.2.min.js"></script><script type="text/javascript" src="../common/jquery/jquery-ui-1.8.2.custom.min.js"></script><script type="text/javascript" src="../common/jquery/jquery.cookie.js"></script><script type="text/javascript" src="../common/jquery/treeview/jquery.treeview.min.js"></script><script type="text/javascript" src="search/l10n.js"></script><script type="text/javascript" src="search/htmlFileInfoList.js"></script><script type="text/javascript" src="search/nwSearchFnt.js"></script><script type="text/javascript" src="search/stemmers/en_stemmer.js"><!--//make this scalable to other languages as well.--></script><script type="text/javascript" src="search/index-1.js"></script><script type="text/javascript" src="search/index-2.js"></script><script type="text/javascript" src="search/index-3.js"></script></head><body><div id="header"><a target="_blank" href="#"><img style="margin-right: 2px; height: 59px; padding-right: 25px; padding-top: 8px" align="right" src="../common/images/logo.png" alt=" Documentation"></img></a><h1>README: Web-based Help from DocBook XML<br></br>Using the package</h1><div id="navheader"><table class="navLinks"><tr><td><a id="showHideButton" href="javascript:showHideToc();" class="pointLeft" tabindex="5" title="Hide TOC tree">Sidebar
</style><script type="application/javascript" src="../common/browserDetect.js"></script><script type="application/javascript" src="../common/jquery/jquery-1.4.2.min.js"></script><script type="application/javascript" src="../common/jquery/jquery-ui-1.8.2.custom.min.js"></script><script type="application/javascript" src="../common/jquery/jquery.cookie.js"></script><script type="application/javascript" src="../common/jquery/treeview/jquery.treeview.min.js"></script><script type="application/javascript" src="search/l10n.js"></script><script type="application/javascript" src="search/htmlFileInfoList.js"></script><script type="application/javascript" src="search/nwSearchFnt.js"></script><script type="application/javascript" src="search/stemmers/en_stemmer.js"><!--//make this scalable to other languages as well.--></script><script type="application/javascript" src="search/index-1.js"></script><script type="application/javascript" src="search/index-2.js"></script><script type="application/javascript" src="search/index-3.js"></script></head><body><div id="header"><a target="_blank" href="#"><img style="margin-right: 2px; height: 59px; padding-right: 25px; padding-top: 8px" align="right" src="../common/images/logo.png" alt=" Documentation"></img></a><h1>README: Web-based Help from DocBook XML<br></br>Using the package</h1><div id="navheader"><table class="navLinks"><tr><td><a id="showHideButton" href="javascript:showHideToc();" class="pointLeft" tabindex="5" title="Hide TOC tree">Sidebar
</a></td><td><a accesskey="p" class="navLinkPrevious" tabindex="5" href="ch01.html">Prev</a> 
|
<a accesskey="n" class="navLinkNext" tabindex="5" href="ch02s01.html">Next</a></td></tr></table></div></div><div id="content"><noscript>JavaScript is disabled on your browser. Please enable JavaScript to enjoy all the features of this site.</noscript><div class="chapter"><div xmlns="" class="titlepage"><div><div><h1 xmlns="http://www.w3.org/1999/xhtml" class="title"><a id="id375821"></a>Using the package</h1></div></div></div>
<div class="toc"><p><strong>Table of Contents</strong></p><dl><dt><span class="section"><a href="ch02s01.html">Generating webhelp output</a></span></dt><dt><span class="section"><a href="ch02s02.html">Using and customizing the output</a></span></dt><dd><dl><dt><span class="section"><a href="ch02s02s01.html">Recommended Apache configurations</a></span></dt></dl></dd><dt><span class="section"><a href="ch02s03.html">Search indexing</a></span></dt><dt><span class="section"><a href="ch02s04.html">Adding support for other (non-CJKV) languages</a></span></dt><dt><span class="section"><a href="ch02s05.html">Adding images</a></span></dt></dl></div><p class="summary">The following sections describe how to
install and use the package on Windows. </p></div><script type="text/javascript" src="../common/main.js"></script><div class="navfooter"><hr></hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch01.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ch02s01.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></div><div id="sidebar"><div id="leftnavigation" style="padding-top:3px;"><div id="tabs"><ul><li><a href="#treeDiv" style="outline:0;" tabindex="1"><span class="contentsTab">Contents</span></a></li><li><a href="#searchDiv" style="outline:0;" tabindex="1" onclick="doSearch()"><span class="searchTab">Search</span></a></li></ul><div id="treeDiv"><img src="../common/images/loading.gif" alt="loading table of contents..." id="tocLoading" style="display:block;"></img><div id="ulTreeDiv" style="display:none"><ul id="tree" class="filetree"><li><span class="file"><a href="ch01.html" tabindex="1">Introduction</a></span></li><li id="webhelp-currentid"><span class="file"><a href="ch02.html" tabindex="1">Using the package</a></span><ul><li><span class="file"><a href="ch02s01.html" tabindex="1">Generating webhelp output</a></span></li><li><span class="file"><a href="ch02s02.html" tabindex="1">Using and customizing the output</a></span><ul><li><span class="file"><a href="ch02s02s01.html" tabindex="1">Recommended Apache configurations</a></span></li></ul></li><li><span class="file"><a href="ch02s03.html" tabindex="1">Search indexing</a></span></li><li><span class="file"><a href="ch02s04.html" tabindex="1">Adding support for other (non-CJKV) languages</a></span></li><li><span class="file"><a href="ch02s05.html" tabindex="1">Adding images</a></span></li></ul></li><li><span class="file"><a href="ch03.html" tabindex="1">Developer Docs</a></span><ul><li><span class="file"><a href="ch03s01.html" tabindex="1">Design</a></span></li><li><span class="file"><a href="ch03s02.html" tabindex="1">Search</a></span><ul><li><span class="file"><a href="ch03s02s01.html" tabindex="1">New Stemmers</a></span></li></ul></li></ul></li><li><span class="file"><a href="ch04.html" tabindex="1">FAQ</a></span></li></ul></div></div><div id="searchDiv"><div id="search"><form onsubmit="Verifie(searchForm);return false" name="searchForm" class="searchForm"><fieldset class="searchFieldSet"><legend>Search</legend><center><input id="textToSearch" name="textToSearch" type="search" class="searchText" tabindex="1"></input> &nbsp; <input onclick="Verifie(searchForm)" type="button" class="searchButton" value="Go" id="doSearch" tabindex="1"></input></center></fieldset></form></div><div id="searchResults"><center></center></div><p class="searchHighlight"><a href="#" onclick="toggleHighlight()">Search Highlighter (On/Off)</a></p></div></div></div></div></body></html>
install and use the package on Windows. </p></div><script type="application/javascript" src="../common/main.js"></script><div class="navfooter"><hr></hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch01.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ch02s01.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></div><div id="sidebar"><div id="leftnavigation" style="padding-top:3px;"><div id="tabs"><ul><li><a href="#treeDiv" style="outline:0;" tabindex="1"><span class="contentsTab">Contents</span></a></li><li><a href="#searchDiv" style="outline:0;" tabindex="1" onclick="doSearch()"><span class="searchTab">Search</span></a></li></ul><div id="treeDiv"><img src="../common/images/loading.gif" alt="loading table of contents..." id="tocLoading" style="display:block;"></img><div id="ulTreeDiv" style="display:none"><ul id="tree" class="filetree"><li><span class="file"><a href="ch01.html" tabindex="1">Introduction</a></span></li><li id="webhelp-currentid"><span class="file"><a href="ch02.html" tabindex="1">Using the package</a></span><ul><li><span class="file"><a href="ch02s01.html" tabindex="1">Generating webhelp output</a></span></li><li><span class="file"><a href="ch02s02.html" tabindex="1">Using and customizing the output</a></span><ul><li><span class="file"><a href="ch02s02s01.html" tabindex="1">Recommended Apache configurations</a></span></li></ul></li><li><span class="file"><a href="ch02s03.html" tabindex="1">Search indexing</a></span></li><li><span class="file"><a href="ch02s04.html" tabindex="1">Adding support for other (non-CJKV) languages</a></span></li><li><span class="file"><a href="ch02s05.html" tabindex="1">Adding images</a></span></li></ul></li><li><span class="file"><a href="ch03.html" tabindex="1">Developer Docs</a></span><ul><li><span class="file"><a href="ch03s01.html" tabindex="1">Design</a></span></li><li><span class="file"><a href="ch03s02.html" tabindex="1">Search</a></span><ul><li><span class="file"><a href="ch03s02s01.html" tabindex="1">New Stemmers</a></span></li></ul></li></ul></li><li><span class="file"><a href="ch04.html" tabindex="1">FAQ</a></span></li></ul></div></div><div id="searchDiv"><div id="search"><form onsubmit="Verifie(searchForm);return false" name="searchForm" class="searchForm"><fieldset class="searchFieldSet"><legend>Search</legend><center><input id="textToSearch" name="textToSearch" type="search" class="searchText" tabindex="1"></input> &nbsp; <input onclick="Verifie(searchForm)" type="button" class="searchButton" value="Go" id="doSearch" tabindex="1"></input></center></fieldset></form></div><div id="searchResults"><center></center></div><p class="searchHighlight"><a href="#" onclick="toggleHighlight()">Search Highlighter (On/Off)</a></p></div></div></div></div></body></html>
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"><head>
<meta http-equiv="X-UA-Compatible" content="IE=7"></meta>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
<title>Generating webhelp output</title><meta name="generator" content="DocBook XSL Stylesheets V1.77.1"></meta><meta name="description" content="Installation instructions"></meta><link rel="home" href="index.html" title="README: Web-based Help from DocBook XML"></link><link rel="up" href="ch02.html" title="Using the package"></link><link rel="prev" href="ch02.html" title="Using the package"></link><link rel="next" href="ch02s02.html" title="Using and customizing the output"></link><script type="text/javascript">
<title>Generating webhelp output</title><meta name="generator" content="DocBook XSL Stylesheets V1.77.1"></meta><meta name="description" content="Installation instructions"></meta><link rel="home" href="index.html" title="README: Web-based Help from DocBook XML"></link><link rel="up" href="ch02.html" title="Using the package"></link><link rel="prev" href="ch02.html" title="Using the package"></link><link rel="next" href="ch02s02.html" title="Using and customizing the output"></link><script type="application/javascript">
//The id for tree cookie
var treeCookieId = "treeview-1055";
var language = "en";
@@ -85,7 +85,7 @@ border: none; background: none; font-weight: none; color: none; }
.ui-tabs { padding: .2em;}
.ui-tabs .ui-tabs-nav li { top: 0px; margin: -2px 0 1px; text-transform: uppercase; font-size: 10.5px;}
.ui-tabs .ui-tabs-nav li a { padding: .25em 2em .25em 1em; margin: .5em; text-shadow: 0 1px 0 rgba(255,255,255,.5); }
</style><script type="text/javascript" src="../common/browserDetect.js"></script><script type="text/javascript" src="../common/jquery/jquery-1.4.2.min.js"></script><script type="text/javascript" src="../common/jquery/jquery-ui-1.8.2.custom.min.js"></script><script type="text/javascript" src="../common/jquery/jquery.cookie.js"></script><script type="text/javascript" src="../common/jquery/treeview/jquery.treeview.min.js"></script><script type="text/javascript" src="search/l10n.js"></script><script type="text/javascript" src="search/htmlFileInfoList.js"></script><script type="text/javascript" src="search/nwSearchFnt.js"></script><script type="text/javascript" src="search/stemmers/en_stemmer.js"><!--//make this scalable to other languages as well.--></script><script type="text/javascript" src="search/index-1.js"></script><script type="text/javascript" src="search/index-2.js"></script><script type="text/javascript" src="search/index-3.js"></script></head><body><div id="header"><a target="_blank" href="#"><img style="margin-right: 2px; height: 59px; padding-right: 25px; padding-top: 8px" align="right" src="../common/images/logo.png" alt=" Documentation"></img></a><h1>README: Web-based Help from DocBook XML<br></br>Using the package</h1><div id="navheader"><table class="navLinks"><tr><td><a id="showHideButton" href="javascript:showHideToc();" class="pointLeft" tabindex="5" title="Hide TOC tree">Sidebar
</style><script type="application/javascript" src="../common/browserDetect.js"></script><script type="application/javascript" src="../common/jquery/jquery-1.4.2.min.js"></script><script type="application/javascript" src="../common/jquery/jquery-ui-1.8.2.custom.min.js"></script><script type="application/javascript" src="../common/jquery/jquery.cookie.js"></script><script type="application/javascript" src="../common/jquery/treeview/jquery.treeview.min.js"></script><script type="application/javascript" src="search/l10n.js"></script><script type="application/javascript" src="search/htmlFileInfoList.js"></script><script type="application/javascript" src="search/nwSearchFnt.js"></script><script type="application/javascript" src="search/stemmers/en_stemmer.js"><!--//make this scalable to other languages as well.--></script><script type="application/javascript" src="search/index-1.js"></script><script type="application/javascript" src="search/index-2.js"></script><script type="application/javascript" src="search/index-3.js"></script></head><body><div id="header"><a target="_blank" href="#"><img style="margin-right: 2px; height: 59px; padding-right: 25px; padding-top: 8px" align="right" src="../common/images/logo.png" alt=" Documentation"></img></a><h1>README: Web-based Help from DocBook XML<br></br>Using the package</h1><div id="navheader"><table class="navLinks"><tr><td><a id="showHideButton" href="javascript:showHideToc();" class="pointLeft" tabindex="5" title="Hide TOC tree">Sidebar
</a></td><td><a accesskey="p" class="navLinkPrevious" tabindex="5" href="ch02.html">Prev</a>
|
<a accesskey="u" class="navLinkUp" tabindex="5" href="ch02.html">Up</a>
@@ -196,4 +196,4 @@ suppress.footer.navigation=0</pre></li><li class="step"><p>Test the package by r
&lt;property name="output-dir" value="<em class="replaceable"><code>path-to/desired-output-dir</code></em>"/&gt;
&lt;import file="<em class="replaceable"><code>path-to/docbook-webhelp/</code></em>build.xml"/&gt;
&lt;/project&gt;</pre></li><li class="step"><p>From the directory containing your newly created <code class="filename">build.xml</code>
file, type <code class="code">ant webhelp</code> to build your document.</p></li></ol></li></ol></div></div><script type="text/javascript" src="../common/main.js"></script><div class="navfooter"><hr></hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch02s02.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></div><div id="sidebar"><div id="leftnavigation" style="padding-top:3px;"><div id="tabs"><ul><li><a href="#treeDiv" style="outline:0;" tabindex="1"><span class="contentsTab">Contents</span></a></li><li><a href="#searchDiv" style="outline:0;" tabindex="1" onclick="doSearch()"><span class="searchTab">Search</span></a></li></ul><div id="treeDiv"><img src="../common/images/loading.gif" alt="loading table of contents..." id="tocLoading" style="display:block;"></img><div id="ulTreeDiv" style="display:none"><ul id="tree" class="filetree"><li><span class="file"><a href="ch01.html" tabindex="1">Introduction</a></span></li><li><span class="file"><a href="ch02.html" tabindex="1">Using the package</a></span><ul><li id="webhelp-currentid"><span class="file"><a href="ch02s01.html" tabindex="1">Generating webhelp output</a></span></li><li><span class="file"><a href="ch02s02.html" tabindex="1">Using and customizing the output</a></span><ul><li><span class="file"><a href="ch02s02s01.html" tabindex="1">Recommended Apache configurations</a></span></li></ul></li><li><span class="file"><a href="ch02s03.html" tabindex="1">Search indexing</a></span></li><li><span class="file"><a href="ch02s04.html" tabindex="1">Adding support for other (non-CJKV) languages</a></span></li><li><span class="file"><a href="ch02s05.html" tabindex="1">Adding images</a></span></li></ul></li><li><span class="file"><a href="ch03.html" tabindex="1">Developer Docs</a></span><ul><li><span class="file"><a href="ch03s01.html" tabindex="1">Design</a></span></li><li><span class="file"><a href="ch03s02.html" tabindex="1">Search</a></span><ul><li><span class="file"><a href="ch03s02s01.html" tabindex="1">New Stemmers</a></span></li></ul></li></ul></li><li><span class="file"><a href="ch04.html" tabindex="1">FAQ</a></span></li></ul></div></div><div id="searchDiv"><div id="search"><form onsubmit="Verifie(searchForm);return false" name="searchForm" class="searchForm"><fieldset class="searchFieldSet"><legend>Search</legend><center><input id="textToSearch" name="textToSearch" type="search" class="searchText" tabindex="1"></input> &nbsp; <input onclick="Verifie(searchForm)" type="button" class="searchButton" value="Go" id="doSearch" tabindex="1"></input></center></fieldset></form></div><div id="searchResults"><center></center></div><p class="searchHighlight"><a href="#" onclick="toggleHighlight()">Search Highlighter (On/Off)</a></p></div></div></div></div></body></html>
file, type <code class="code">ant webhelp</code> to build your document.</p></li></ol></li></ol></div></div><script type="application/javascript" src="../common/main.js"></script><div class="navfooter"><hr></hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch02s02.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></div><div id="sidebar"><div id="leftnavigation" style="padding-top:3px;"><div id="tabs"><ul><li><a href="#treeDiv" style="outline:0;" tabindex="1"><span class="contentsTab">Contents</span></a></li><li><a href="#searchDiv" style="outline:0;" tabindex="1" onclick="doSearch()"><span class="searchTab">Search</span></a></li></ul><div id="treeDiv"><img src="../common/images/loading.gif" alt="loading table of contents..." id="tocLoading" style="display:block;"></img><div id="ulTreeDiv" style="display:none"><ul id="tree" class="filetree"><li><span class="file"><a href="ch01.html" tabindex="1">Introduction</a></span></li><li><span class="file"><a href="ch02.html" tabindex="1">Using the package</a></span><ul><li id="webhelp-currentid"><span class="file"><a href="ch02s01.html" tabindex="1">Generating webhelp output</a></span></li><li><span class="file"><a href="ch02s02.html" tabindex="1">Using and customizing the output</a></span><ul><li><span class="file"><a href="ch02s02s01.html" tabindex="1">Recommended Apache configurations</a></span></li></ul></li><li><span class="file"><a href="ch02s03.html" tabindex="1">Search indexing</a></span></li><li><span class="file"><a href="ch02s04.html" tabindex="1">Adding support for other (non-CJKV) languages</a></span></li><li><span class="file"><a href="ch02s05.html" tabindex="1">Adding images</a></span></li></ul></li><li><span class="file"><a href="ch03.html" tabindex="1">Developer Docs</a></span><ul><li><span class="file"><a href="ch03s01.html" tabindex="1">Design</a></span></li><li><span class="file"><a href="ch03s02.html" tabindex="1">Search</a></span><ul><li><span class="file"><a href="ch03s02s01.html" tabindex="1">New Stemmers</a></span></li></ul></li></ul></li><li><span class="file"><a href="ch04.html" tabindex="1">FAQ</a></span></li></ul></div></div><div id="searchDiv"><div id="search"><form onsubmit="Verifie(searchForm);return false" name="searchForm" class="searchForm"><fieldset class="searchFieldSet"><legend>Search</legend><center><input id="textToSearch" name="textToSearch" type="search" class="searchText" tabindex="1"></input> &nbsp; <input onclick="Verifie(searchForm)" type="button" class="searchButton" value="Go" id="doSearch" tabindex="1"></input></center></fieldset></form></div><div id="searchResults"><center></center></div><p class="searchHighlight"><a href="#" onclick="toggleHighlight()">Search Highlighter (On/Off)</a></p></div></div></div></div></body></html>
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"><head>
<meta http-equiv="X-UA-Compatible" content="IE=7"></meta>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
<title>Using and customizing the output</title><meta name="generator" content="DocBook XSL Stylesheets V1.77.1"></meta><link rel="home" href="index.html" title="README: Web-based Help from DocBook XML"></link><link rel="up" href="ch02.html" title="Using the package"></link><link rel="prev" href="ch02s01.html" title="Generating webhelp output"></link><link rel="next" href="ch02s02s01.html" title="Recommended Apache configurations"></link><script type="text/javascript">
<title>Using and customizing the output</title><meta name="generator" content="DocBook XSL Stylesheets V1.77.1"></meta><link rel="home" href="index.html" title="README: Web-based Help from DocBook XML"></link><link rel="up" href="ch02.html" title="Using the package"></link><link rel="prev" href="ch02s01.html" title="Generating webhelp output"></link><link rel="next" href="ch02s02s01.html" title="Recommended Apache configurations"></link><script type="application/javascript">
//The id for tree cookie
var treeCookieId = "treeview-1055";
var language = "en";
@@ -85,7 +85,7 @@ border: none; background: none; font-weight: none; color: none; }
.ui-tabs { padding: .2em;}
.ui-tabs .ui-tabs-nav li { top: 0px; margin: -2px 0 1px; text-transform: uppercase; font-size: 10.5px;}
.ui-tabs .ui-tabs-nav li a { padding: .25em 2em .25em 1em; margin: .5em; text-shadow: 0 1px 0 rgba(255,255,255,.5); }
</style><script type="text/javascript" src="../common/browserDetect.js"></script><script type="text/javascript" src="../common/jquery/jquery-1.4.2.min.js"></script><script type="text/javascript" src="../common/jquery/jquery-ui-1.8.2.custom.min.js"></script><script type="text/javascript" src="../common/jquery/jquery.cookie.js"></script><script type="text/javascript" src="../common/jquery/treeview/jquery.treeview.min.js"></script><script type="text/javascript" src="search/l10n.js"></script><script type="text/javascript" src="search/htmlFileInfoList.js"></script><script type="text/javascript" src="search/nwSearchFnt.js"></script><script type="text/javascript" src="search/stemmers/en_stemmer.js"><!--//make this scalable to other languages as well.--></script><script type="text/javascript" src="search/index-1.js"></script><script type="text/javascript" src="search/index-2.js"></script><script type="text/javascript" src="search/index-3.js"></script></head><body><div id="header"><a target="_blank" href="#"><img style="margin-right: 2px; height: 59px; padding-right: 25px; padding-top: 8px" align="right" src="../common/images/logo.png" alt=" Documentation"></img></a><h1>README: Web-based Help from DocBook XML<br></br>Using the package</h1><div id="navheader"><table class="navLinks"><tr><td><a id="showHideButton" href="javascript:showHideToc();" class="pointLeft" tabindex="5" title="Hide TOC tree">Sidebar
</style><script type="application/javascript" src="../common/browserDetect.js"></script><script type="application/javascript" src="../common/jquery/jquery-1.4.2.min.js"></script><script type="application/javascript" src="../common/jquery/jquery-ui-1.8.2.custom.min.js"></script><script type="application/javascript" src="../common/jquery/jquery.cookie.js"></script><script type="application/javascript" src="../common/jquery/treeview/jquery.treeview.min.js"></script><script type="application/javascript" src="search/l10n.js"></script><script type="application/javascript" src="search/htmlFileInfoList.js"></script><script type="application/javascript" src="search/nwSearchFnt.js"></script><script type="application/javascript" src="search/stemmers/en_stemmer.js"><!--//make this scalable to other languages as well.--></script><script type="application/javascript" src="search/index-1.js"></script><script type="application/javascript" src="search/index-2.js"></script><script type="application/javascript" src="search/index-3.js"></script></head><body><div id="header"><a target="_blank" href="#"><img style="margin-right: 2px; height: 59px; padding-right: 25px; padding-top: 8px" align="right" src="../common/images/logo.png" alt=" Documentation"></img></a><h1>README: Web-based Help from DocBook XML<br></br>Using the package</h1><div id="navheader"><table class="navLinks"><tr><td><a id="showHideButton" href="javascript:showHideToc();" class="pointLeft" tabindex="5" title="Hide TOC tree">Sidebar
</a></td><td><a accesskey="p" class="navLinkPrevious" tabindex="5" href="ch02s01.html">Prev</a>
|
<a accesskey="u" class="navLinkUp" tabindex="5" href="ch02.html">Up</a>
@@ -109,4 +109,4 @@ border: none; background: none; font-weight: none; color: none; }
any theme based your interest from this. (Themes are on right navigation bar.) Then
replace the css theme folder (theme-redmond) with it, and change the xsl to point to
the new css.</p></li><li class="listitem"><p><code class="filename">docs/common/jquery/treeview/jquery.treeview.css</code>: This styles
the toc Tree. Generally, you don't have to edit this file.</p></li></ul></div></div><script type="text/javascript" src="../common/main.js"></script><div class="navfooter"><hr></hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s01.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch02s02s01.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></div><div id="sidebar"><div id="leftnavigation" style="padding-top:3px;"><div id="tabs"><ul><li><a href="#treeDiv" style="outline:0;" tabindex="1"><span class="contentsTab">Contents</span></a></li><li><a href="#searchDiv" style="outline:0;" tabindex="1" onclick="doSearch()"><span class="searchTab">Search</span></a></li></ul><div id="treeDiv"><img src="../common/images/loading.gif" alt="loading table of contents..." id="tocLoading" style="display:block;"></img><div id="ulTreeDiv" style="display:none"><ul id="tree" class="filetree"><li><span class="file"><a href="ch01.html" tabindex="1">Introduction</a></span></li><li><span class="file"><a href="ch02.html" tabindex="1">Using the package</a></span><ul><li><span class="file"><a href="ch02s01.html" tabindex="1">Generating webhelp output</a></span></li><li id="webhelp-currentid"><span class="file"><a href="ch02s02.html" tabindex="1">Using and customizing the output</a></span><ul><li><span class="file"><a href="ch02s02s01.html" tabindex="1">Recommended Apache configurations</a></span></li></ul></li><li><span class="file"><a href="ch02s03.html" tabindex="1">Search indexing</a></span></li><li><span class="file"><a href="ch02s04.html" tabindex="1">Adding support for other (non-CJKV) languages</a></span></li><li><span class="file"><a href="ch02s05.html" tabindex="1">Adding images</a></span></li></ul></li><li><span class="file"><a href="ch03.html" tabindex="1">Developer Docs</a></span><ul><li><span class="file"><a href="ch03s01.html" tabindex="1">Design</a></span></li><li><span class="file"><a href="ch03s02.html" tabindex="1">Search</a></span><ul><li><span class="file"><a href="ch03s02s01.html" tabindex="1">New Stemmers</a></span></li></ul></li></ul></li><li><span class="file"><a href="ch04.html" tabindex="1">FAQ</a></span></li></ul></div></div><div id="searchDiv"><div id="search"><form onsubmit="Verifie(searchForm);return false" name="searchForm" class="searchForm"><fieldset class="searchFieldSet"><legend>Search</legend><center><input id="textToSearch" name="textToSearch" type="search" class="searchText" tabindex="1"></input> &nbsp; <input onclick="Verifie(searchForm)" type="button" class="searchButton" value="Go" id="doSearch" tabindex="1"></input></center></fieldset></form></div><div id="searchResults"><center></center></div><p class="searchHighlight"><a href="#" onclick="toggleHighlight()">Search Highlighter (On/Off)</a></p></div></div></div></div></body></html>
the toc Tree. Generally, you don't have to edit this file.</p></li></ul></div></div><script type="application/javascript" src="../common/main.js"></script><div class="navfooter"><hr></hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s01.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch02s02s01.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></div><div id="sidebar"><div id="leftnavigation" style="padding-top:3px;"><div id="tabs"><ul><li><a href="#treeDiv" style="outline:0;" tabindex="1"><span class="contentsTab">Contents</span></a></li><li><a href="#searchDiv" style="outline:0;" tabindex="1" onclick="doSearch()"><span class="searchTab">Search</span></a></li></ul><div id="treeDiv"><img src="../common/images/loading.gif" alt="loading table of contents..." id="tocLoading" style="display:block;"></img><div id="ulTreeDiv" style="display:none"><ul id="tree" class="filetree"><li><span class="file"><a href="ch01.html" tabindex="1">Introduction</a></span></li><li><span class="file"><a href="ch02.html" tabindex="1">Using the package</a></span><ul><li><span class="file"><a href="ch02s01.html" tabindex="1">Generating webhelp output</a></span></li><li id="webhelp-currentid"><span class="file"><a href="ch02s02.html" tabindex="1">Using and customizing the output</a></span><ul><li><span class="file"><a href="ch02s02s01.html" tabindex="1">Recommended Apache configurations</a></span></li></ul></li><li><span class="file"><a href="ch02s03.html" tabindex="1">Search indexing</a></span></li><li><span class="file"><a href="ch02s04.html" tabindex="1">Adding support for other (non-CJKV) languages</a></span></li><li><span class="file"><a href="ch02s05.html" tabindex="1">Adding images</a></span></li></ul></li><li><span class="file"><a href="ch03.html" tabindex="1">Developer Docs</a></span><ul><li><span class="file"><a href="ch03s01.html" tabindex="1">Design</a></span></li><li><span class="file"><a href="ch03s02.html" tabindex="1">Search</a></span><ul><li><span class="file"><a href="ch03s02s01.html" tabindex="1">New Stemmers</a></span></li></ul></li></ul></li><li><span class="file"><a href="ch04.html" tabindex="1">FAQ</a></span></li></ul></div></div><div id="searchDiv"><div id="search"><form onsubmit="Verifie(searchForm);return false" name="searchForm" class="searchForm"><fieldset class="searchFieldSet"><legend>Search</legend><center><input id="textToSearch" name="textToSearch" type="search" class="searchText" tabindex="1"></input> &nbsp; <input onclick="Verifie(searchForm)" type="button" class="searchButton" value="Go" id="doSearch" tabindex="1"></input></center></fieldset></form></div><div id="searchResults"><center></center></div><p class="searchHighlight"><a href="#" onclick="toggleHighlight()">Search Highlighter (On/Off)</a></p></div></div></div></div></body></html>
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"><head>
<meta http-equiv="X-UA-Compatible" content="IE=7"></meta>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
<title>Recommended Apache configurations</title><meta name="generator" content="DocBook XSL Stylesheets V1.77.1"></meta><link rel="home" href="index.html" title="README: Web-based Help from DocBook XML"></link><link rel="up" href="ch02s02.html" title="Using and customizing the output"></link><link rel="prev" href="ch02s02.html" title="Using and customizing the output"></link><link rel="next" href="ch02s03.html" title="Search indexing"></link><script type="text/javascript">
<title>Recommended Apache configurations</title><meta name="generator" content="DocBook XSL Stylesheets V1.77.1"></meta><link rel="home" href="index.html" title="README: Web-based Help from DocBook XML"></link><link rel="up" href="ch02s02.html" title="Using and customizing the output"></link><link rel="prev" href="ch02s02.html" title="Using and customizing the output"></link><link rel="next" href="ch02s03.html" title="Search indexing"></link><script type="application/javascript">
//The id for tree cookie
var treeCookieId = "treeview-1055";
var language = "en";
@@ -85,7 +85,7 @@ border: none; background: none; font-weight: none; color: none; }
.ui-tabs { padding: .2em;}
.ui-tabs .ui-tabs-nav li { top: 0px; margin: -2px 0 1px; text-transform: uppercase; font-size: 10.5px;}
.ui-tabs .ui-tabs-nav li a { padding: .25em 2em .25em 1em; margin: .5em; text-shadow: 0 1px 0 rgba(255,255,255,.5); }
</style><script type="text/javascript" src="../common/browserDetect.js"></script><script type="text/javascript" src="../common/jquery/jquery-1.4.2.min.js"></script><script type="text/javascript" src="../common/jquery/jquery-ui-1.8.2.custom.min.js"></script><script type="text/javascript" src="../common/jquery/jquery.cookie.js"></script><script type="text/javascript" src="../common/jquery/treeview/jquery.treeview.min.js"></script><script type="text/javascript" src="search/l10n.js"></script><script type="text/javascript" src="search/htmlFileInfoList.js"></script><script type="text/javascript" src="search/nwSearchFnt.js"></script><script type="text/javascript" src="search/stemmers/en_stemmer.js"><!--//make this scalable to other languages as well.--></script><script type="text/javascript" src="search/index-1.js"></script><script type="text/javascript" src="search/index-2.js"></script><script type="text/javascript" src="search/index-3.js"></script></head><body><div id="header"><a target="_blank" href="#"><img style="margin-right: 2px; height: 59px; padding-right: 25px; padding-top: 8px" align="right" src="../common/images/logo.png" alt=" Documentation"></img></a><h1>README: Web-based Help from DocBook XML<br></br>Using and customizing the output</h1><div id="navheader"><table class="navLinks"><tr><td><a id="showHideButton" href="javascript:showHideToc();" class="pointLeft" tabindex="5" title="Hide TOC tree">Sidebar
</style><script type="application/javascript" src="../common/browserDetect.js"></script><script type="application/javascript" src="../common/jquery/jquery-1.4.2.min.js"></script><script type="application/javascript" src="../common/jquery/jquery-ui-1.8.2.custom.min.js"></script><script type="application/javascript" src="../common/jquery/jquery.cookie.js"></script><script type="application/javascript" src="../common/jquery/treeview/jquery.treeview.min.js"></script><script type="application/javascript" src="search/l10n.js"></script><script type="application/javascript" src="search/htmlFileInfoList.js"></script><script type="application/javascript" src="search/nwSearchFnt.js"></script><script type="application/javascript" src="search/stemmers/en_stemmer.js"><!--//make this scalable to other languages as well.--></script><script type="application/javascript" src="search/index-1.js"></script><script type="application/javascript" src="search/index-2.js"></script><script type="application/javascript" src="search/index-3.js"></script></head><body><div id="header"><a target="_blank" href="#"><img style="margin-right: 2px; height: 59px; padding-right: 25px; padding-top: 8px" align="right" src="../common/images/logo.png" alt=" Documentation"></img></a><h1>README: Web-based Help from DocBook XML<br></br>Using and customizing the output</h1><div id="navheader"><table class="navLinks"><tr><td><a id="showHideButton" href="javascript:showHideToc();" class="pointLeft" tabindex="5" title="Hide TOC tree">Sidebar
</a></td><td><a accesskey="p" class="navLinkPrevious" tabindex="5" href="ch02s02.html">Prev</a>
|
<a accesskey="u" class="navLinkUp" tabindex="5" href="ch02s02.html">Up</a>
@@ -132,4 +132,4 @@ border: none; background: none; font-weight: none; color: none; }
such as bitmaps and JavaScript files. Note that caching JavaScript files could cause
your users to have stale search indexes if you update your document since the search
index is stored in JavaScript files.</p></td></tr><tr><td width="5%" valign="top" align="left"><p><a href="#CompressSetting"><span><img src="../common/images/callouts/3.png" alt="3" border="0"></img></span></a> </p></td><td valign="top" align="left"><p>These lines cause the the server to compress html, css, and JavaScript files and
the brower to uncompress them to improve download performance.</p></td></tr></table></div></div><script type="text/javascript" src="../common/main.js"></script><div class="navfooter"><hr></hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s02.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch02s02.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch02s03.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></div><div id="sidebar"><div id="leftnavigation" style="padding-top:3px;"><div id="tabs"><ul><li><a href="#treeDiv" style="outline:0;" tabindex="1"><span class="contentsTab">Contents</span></a></li><li><a href="#searchDiv" style="outline:0;" tabindex="1" onclick="doSearch()"><span class="searchTab">Search</span></a></li></ul><div id="treeDiv"><img src="../common/images/loading.gif" alt="loading table of contents..." id="tocLoading" style="display:block;"></img><div id="ulTreeDiv" style="display:none"><ul id="tree" class="filetree"><li><span class="file"><a href="ch01.html" tabindex="1">Introduction</a></span></li><li><span class="file"><a href="ch02.html" tabindex="1">Using the package</a></span><ul><li><span class="file"><a href="ch02s01.html" tabindex="1">Generating webhelp output</a></span></li><li><span class="file"><a href="ch02s02.html" tabindex="1">Using and customizing the output</a></span><ul><li id="webhelp-currentid"><span class="file"><a href="ch02s02s01.html" tabindex="1">Recommended Apache configurations</a></span></li></ul></li><li><span class="file"><a href="ch02s03.html" tabindex="1">Search indexing</a></span></li><li><span class="file"><a href="ch02s04.html" tabindex="1">Adding support for other (non-CJKV) languages</a></span></li><li><span class="file"><a href="ch02s05.html" tabindex="1">Adding images</a></span></li></ul></li><li><span class="file"><a href="ch03.html" tabindex="1">Developer Docs</a></span><ul><li><span class="file"><a href="ch03s01.html" tabindex="1">Design</a></span></li><li><span class="file"><a href="ch03s02.html" tabindex="1">Search</a></span><ul><li><span class="file"><a href="ch03s02s01.html" tabindex="1">New Stemmers</a></span></li></ul></li></ul></li><li><span class="file"><a href="ch04.html" tabindex="1">FAQ</a></span></li></ul></div></div><div id="searchDiv"><div id="search"><form onsubmit="Verifie(searchForm);return false" name="searchForm" class="searchForm"><fieldset class="searchFieldSet"><legend>Search</legend><center><input id="textToSearch" name="textToSearch" type="search" class="searchText" tabindex="1"></input> &nbsp; <input onclick="Verifie(searchForm)" type="button" class="searchButton" value="Go" id="doSearch" tabindex="1"></input></center></fieldset></form></div><div id="searchResults"><center></center></div><p class="searchHighlight"><a href="#" onclick="toggleHighlight()">Search Highlighter (On/Off)</a></p></div></div></div></div></body></html>
the brower to uncompress them to improve download performance.</p></td></tr></table></div></div><script type="application/javascript" src="../common/main.js"></script><div class="navfooter"><hr></hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s02.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch02s02.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch02s03.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></div><div id="sidebar"><div id="leftnavigation" style="padding-top:3px;"><div id="tabs"><ul><li><a href="#treeDiv" style="outline:0;" tabindex="1"><span class="contentsTab">Contents</span></a></li><li><a href="#searchDiv" style="outline:0;" tabindex="1" onclick="doSearch()"><span class="searchTab">Search</span></a></li></ul><div id="treeDiv"><img src="../common/images/loading.gif" alt="loading table of contents..." id="tocLoading" style="display:block;"></img><div id="ulTreeDiv" style="display:none"><ul id="tree" class="filetree"><li><span class="file"><a href="ch01.html" tabindex="1">Introduction</a></span></li><li><span class="file"><a href="ch02.html" tabindex="1">Using the package</a></span><ul><li><span class="file"><a href="ch02s01.html" tabindex="1">Generating webhelp output</a></span></li><li><span class="file"><a href="ch02s02.html" tabindex="1">Using and customizing the output</a></span><ul><li id="webhelp-currentid"><span class="file"><a href="ch02s02s01.html" tabindex="1">Recommended Apache configurations</a></span></li></ul></li><li><span class="file"><a href="ch02s03.html" tabindex="1">Search indexing</a></span></li><li><span class="file"><a href="ch02s04.html" tabindex="1">Adding support for other (non-CJKV) languages</a></span></li><li><span class="file"><a href="ch02s05.html" tabindex="1">Adding images</a></span></li></ul></li><li><span class="file"><a href="ch03.html" tabindex="1">Developer Docs</a></span><ul><li><span class="file"><a href="ch03s01.html" tabindex="1">Design</a></span></li><li><span class="file"><a href="ch03s02.html" tabindex="1">Search</a></span><ul><li><span class="file"><a href="ch03s02s01.html" tabindex="1">New Stemmers</a></span></li></ul></li></ul></li><li><span class="file"><a href="ch04.html" tabindex="1">FAQ</a></span></li></ul></div></div><div id="searchDiv"><div id="search"><form onsubmit="Verifie(searchForm);return false" name="searchForm" class="searchForm"><fieldset class="searchFieldSet"><legend>Search</legend><center><input id="textToSearch" name="textToSearch" type="search" class="searchText" tabindex="1"></input> &nbsp; <input onclick="Verifie(searchForm)" type="button" class="searchButton" value="Go" id="doSearch" tabindex="1"></input></center></fieldset></form></div><div id="searchResults"><center></center></div><p class="searchHighlight"><a href="#" onclick="toggleHighlight()">Search Highlighter (On/Off)</a></p></div></div></div></div></body></html>
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"><head>
<meta http-equiv="X-UA-Compatible" content="IE=7"></meta>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
<title>Search indexing</title><meta name="generator" content="DocBook XSL Stylesheets V1.77.1"></meta><link rel="home" href="index.html" title="README: Web-based Help from DocBook XML"></link><link rel="up" href="ch02.html" title="Using the package"></link><link rel="prev" href="ch02s02s01.html" title="Recommended Apache configurations"></link><link rel="next" href="ch02s04.html" title="Adding support for other (non-CJKV) languages"></link><script type="text/javascript">
<title>Search indexing</title><meta name="generator" content="DocBook XSL Stylesheets V1.77.1"></meta><link rel="home" href="index.html" title="README: Web-based Help from DocBook XML"></link><link rel="up" href="ch02.html" title="Using the package"></link><link rel="prev" href="ch02s02s01.html" title="Recommended Apache configurations"></link><link rel="next" href="ch02s04.html" title="Adding support for other (non-CJKV) languages"></link><script type="application/javascript">
//The id for tree cookie
var treeCookieId = "treeview-1055";
var language = "en";
@@ -85,7 +85,7 @@ border: none; background: none; font-weight: none; color: none; }
.ui-tabs { padding: .2em;}
.ui-tabs .ui-tabs-nav li { top: 0px; margin: -2px 0 1px; text-transform: uppercase; font-size: 10.5px;}
.ui-tabs .ui-tabs-nav li a { padding: .25em 2em .25em 1em; margin: .5em; text-shadow: 0 1px 0 rgba(255,255,255,.5); }
</style><script type="text/javascript" src="../common/browserDetect.js"></script><script type="text/javascript" src="../common/jquery/jquery-1.4.2.min.js"></script><script type="text/javascript" src="../common/jquery/jquery-ui-1.8.2.custom.min.js"></script><script type="text/javascript" src="../common/jquery/jquery.cookie.js"></script><script type="text/javascript" src="../common/jquery/treeview/jquery.treeview.min.js"></script><script type="text/javascript" src="search/l10n.js"></script><script type="text/javascript" src="search/htmlFileInfoList.js"></script><script type="text/javascript" src="search/nwSearchFnt.js"></script><script type="text/javascript" src="search/stemmers/en_stemmer.js"><!--//make this scalable to other languages as well.--></script><script type="text/javascript" src="search/index-1.js"></script><script type="text/javascript" src="search/index-2.js"></script><script type="text/javascript" src="search/index-3.js"></script></head><body><div id="header"><a target="_blank" href="#"><img style="margin-right: 2px; height: 59px; padding-right: 25px; padding-top: 8px" align="right" src="../common/images/logo.png" alt=" Documentation"></img></a><h1>README: Web-based Help from DocBook XML<br></br>Using the package</h1><div id="navheader"><table class="navLinks"><tr><td><a id="showHideButton" href="javascript:showHideToc();" class="pointLeft" tabindex="5" title="Hide TOC tree">Sidebar
</style><script type="application/javascript" src="../common/browserDetect.js"></script><script type="application/javascript" src="../common/jquery/jquery-1.4.2.min.js"></script><script type="application/javascript" src="../common/jquery/jquery-ui-1.8.2.custom.min.js"></script><script type="application/javascript" src="../common/jquery/jquery.cookie.js"></script><script type="application/javascript" src="../common/jquery/treeview/jquery.treeview.min.js"></script><script type="application/javascript" src="search/l10n.js"></script><script type="application/javascript" src="search/htmlFileInfoList.js"></script><script type="application/javascript" src="search/nwSearchFnt.js"></script><script type="application/javascript" src="search/stemmers/en_stemmer.js"><!--//make this scalable to other languages as well.--></script><script type="application/javascript" src="search/index-1.js"></script><script type="application/javascript" src="search/index-2.js"></script><script type="application/javascript" src="search/index-3.js"></script></head><body><div id="header"><a target="_blank" href="#"><img style="margin-right: 2px; height: 59px; padding-right: 25px; padding-top: 8px" align="right" src="../common/images/logo.png" alt=" Documentation"></img></a><h1>README: Web-based Help from DocBook XML<br></br>Using the package</h1><div id="navheader"><table class="navLinks"><tr><td><a id="showHideButton" href="javascript:showHideToc();" class="pointLeft" tabindex="5" title="Hide TOC tree">Sidebar
</a></td><td><a accesskey="p" class="navLinkPrevious" tabindex="5" href="ch02s02s01.html">Prev</a>
|
<a accesskey="u" class="navLinkUp" tabindex="5" href="ch02.html">Up</a>
@@ -116,4 +116,4 @@ border: none; background: none; font-weight: none; color: none; }
<code class="code">indexertask</code> to direct invocation. This seems to have remove the
<code class="envar">CLASSPATH</code> issue some people were having.</p></div><p>
</p></li></ul></div><a id="id376733" class="indexterm"></a><a id="id376745" class="indexterm"></a><p class="summary">To build the indexer, you must have installed the JDK version 1.5 or
higher and set the <code class="envar">ANT_HOME</code> environment variable. </p><a id="id376768" class="indexterm"></a><a id="id376777" class="indexterm"></a></div><script type="text/javascript" src="../common/main.js"></script><div class="navfooter"><hr></hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s02s01.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch02s04.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></div><div id="sidebar"><div id="leftnavigation" style="padding-top:3px;"><div id="tabs"><ul><li><a href="#treeDiv" style="outline:0;" tabindex="1"><span class="contentsTab">Contents</span></a></li><li><a href="#searchDiv" style="outline:0;" tabindex="1" onclick="doSearch()"><span class="searchTab">Search</span></a></li></ul><div id="treeDiv"><img src="../common/images/loading.gif" alt="loading table of contents..." id="tocLoading" style="display:block;"></img><div id="ulTreeDiv" style="display:none"><ul id="tree" class="filetree"><li><span class="file"><a href="ch01.html" tabindex="1">Introduction</a></span></li><li><span class="file"><a href="ch02.html" tabindex="1">Using the package</a></span><ul><li><span class="file"><a href="ch02s01.html" tabindex="1">Generating webhelp output</a></span></li><li><span class="file"><a href="ch02s02.html" tabindex="1">Using and customizing the output</a></span><ul><li><span class="file"><a href="ch02s02s01.html" tabindex="1">Recommended Apache configurations</a></span></li></ul></li><li id="webhelp-currentid"><span class="file"><a href="ch02s03.html" tabindex="1">Search indexing</a></span></li><li><span class="file"><a href="ch02s04.html" tabindex="1">Adding support for other (non-CJKV) languages</a></span></li><li><span class="file"><a href="ch02s05.html" tabindex="1">Adding images</a></span></li></ul></li><li><span class="file"><a href="ch03.html" tabindex="1">Developer Docs</a></span><ul><li><span class="file"><a href="ch03s01.html" tabindex="1">Design</a></span></li><li><span class="file"><a href="ch03s02.html" tabindex="1">Search</a></span><ul><li><span class="file"><a href="ch03s02s01.html" tabindex="1">New Stemmers</a></span></li></ul></li></ul></li><li><span class="file"><a href="ch04.html" tabindex="1">FAQ</a></span></li></ul></div></div><div id="searchDiv"><div id="search"><form onsubmit="Verifie(searchForm);return false" name="searchForm" class="searchForm"><fieldset class="searchFieldSet"><legend>Search</legend><center><input id="textToSearch" name="textToSearch" type="search" class="searchText" tabindex="1"></input> &nbsp; <input onclick="Verifie(searchForm)" type="button" class="searchButton" value="Go" id="doSearch" tabindex="1"></input></center></fieldset></form></div><div id="searchResults"><center></center></div><p class="searchHighlight"><a href="#" onclick="toggleHighlight()">Search Highlighter (On/Off)</a></p></div></div></div></div></body></html>
higher and set the <code class="envar">ANT_HOME</code> environment variable. </p><a id="id376768" class="indexterm"></a><a id="id376777" class="indexterm"></a></div><script type="application/javascript" src="../common/main.js"></script><div class="navfooter"><hr></hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s02s01.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch02s04.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></div><div id="sidebar"><div id="leftnavigation" style="padding-top:3px;"><div id="tabs"><ul><li><a href="#treeDiv" style="outline:0;" tabindex="1"><span class="contentsTab">Contents</span></a></li><li><a href="#searchDiv" style="outline:0;" tabindex="1" onclick="doSearch()"><span class="searchTab">Search</span></a></li></ul><div id="treeDiv"><img src="../common/images/loading.gif" alt="loading table of contents..." id="tocLoading" style="display:block;"></img><div id="ulTreeDiv" style="display:none"><ul id="tree" class="filetree"><li><span class="file"><a href="ch01.html" tabindex="1">Introduction</a></span></li><li><span class="file"><a href="ch02.html" tabindex="1">Using the package</a></span><ul><li><span class="file"><a href="ch02s01.html" tabindex="1">Generating webhelp output</a></span></li><li><span class="file"><a href="ch02s02.html" tabindex="1">Using and customizing the output</a></span><ul><li><span class="file"><a href="ch02s02s01.html" tabindex="1">Recommended Apache configurations</a></span></li></ul></li><li id="webhelp-currentid"><span class="file"><a href="ch02s03.html" tabindex="1">Search indexing</a></span></li><li><span class="file"><a href="ch02s04.html" tabindex="1">Adding support for other (non-CJKV) languages</a></span></li><li><span class="file"><a href="ch02s05.html" tabindex="1">Adding images</a></span></li></ul></li><li><span class="file"><a href="ch03.html" tabindex="1">Developer Docs</a></span><ul><li><span class="file"><a href="ch03s01.html" tabindex="1">Design</a></span></li><li><span class="file"><a href="ch03s02.html" tabindex="1">Search</a></span><ul><li><span class="file"><a href="ch03s02s01.html" tabindex="1">New Stemmers</a></span></li></ul></li></ul></li><li><span class="file"><a href="ch04.html" tabindex="1">FAQ</a></span></li></ul></div></div><div id="searchDiv"><div id="search"><form onsubmit="Verifie(searchForm);return false" name="searchForm" class="searchForm"><fieldset class="searchFieldSet"><legend>Search</legend><center><input id="textToSearch" name="textToSearch" type="search" class="searchText" tabindex="1"></input> &nbsp; <input onclick="Verifie(searchForm)" type="button" class="searchButton" value="Go" id="doSearch" tabindex="1"></input></center></fieldset></form></div><div id="searchResults"><center></center></div><p class="searchHighlight"><a href="#" onclick="toggleHighlight()">Search Highlighter (On/Off)</a></p></div></div></div></div></body></html>
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"><head>
<meta http-equiv="X-UA-Compatible" content="IE=7"></meta>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
<title>Adding support for other (non-CJKV) languages</title><meta name="generator" content="DocBook XSL Stylesheets V1.77.1"></meta><link rel="home" href="index.html" title="README: Web-based Help from DocBook XML"></link><link rel="up" href="ch02.html" title="Using the package"></link><link rel="prev" href="ch02s03.html" title="Search indexing"></link><link rel="next" href="ch02s05.html" title="Adding images"></link><script type="text/javascript">
<title>Adding support for other (non-CJKV) languages</title><meta name="generator" content="DocBook XSL Stylesheets V1.77.1"></meta><link rel="home" href="index.html" title="README: Web-based Help from DocBook XML"></link><link rel="up" href="ch02.html" title="Using the package"></link><link rel="prev" href="ch02s03.html" title="Search indexing"></link><link rel="next" href="ch02s05.html" title="Adding images"></link><script type="application/javascript">
//The id for tree cookie
var treeCookieId = "treeview-1055";
var language = "en";
@@ -85,7 +85,7 @@ border: none; background: none; font-weight: none; color: none; }
.ui-tabs { padding: .2em;}
.ui-tabs .ui-tabs-nav li { top: 0px; margin: -2px 0 1px; text-transform: uppercase; font-size: 10.5px;}
.ui-tabs .ui-tabs-nav li a { padding: .25em 2em .25em 1em; margin: .5em; text-shadow: 0 1px 0 rgba(255,255,255,.5); }
</style><script type="text/javascript" src="../common/browserDetect.js"></script><script type="text/javascript" src="../common/jquery/jquery-1.4.2.min.js"></script><script type="text/javascript" src="../common/jquery/jquery-ui-1.8.2.custom.min.js"></script><script type="text/javascript" src="../common/jquery/jquery.cookie.js"></script><script type="text/javascript" src="../common/jquery/treeview/jquery.treeview.min.js"></script><script type="text/javascript" src="search/l10n.js"></script><script type="text/javascript" src="search/htmlFileInfoList.js"></script><script type="text/javascript" src="search/nwSearchFnt.js"></script><script type="text/javascript" src="search/stemmers/en_stemmer.js"><!--//make this scalable to other languages as well.--></script><script type="text/javascript" src="search/index-1.js"></script><script type="text/javascript" src="search/index-2.js"></script><script type="text/javascript" src="search/index-3.js"></script></head><body><div id="header"><a target="_blank" href="#"><img style="margin-right: 2px; height: 59px; padding-right: 25px; padding-top: 8px" align="right" src="../common/images/logo.png" alt=" Documentation"></img></a><h1>README: Web-based Help from DocBook XML<br></br>Using the package</h1><div id="navheader"><table class="navLinks"><tr><td><a id="showHideButton" href="javascript:showHideToc();" class="pointLeft" tabindex="5" title="Hide TOC tree">Sidebar
</style><script type="application/javascript" src="../common/browserDetect.js"></script><script type="application/javascript" src="../common/jquery/jquery-1.4.2.min.js"></script><script type="application/javascript" src="../common/jquery/jquery-ui-1.8.2.custom.min.js"></script><script type="application/javascript" src="../common/jquery/jquery.cookie.js"></script><script type="application/javascript" src="../common/jquery/treeview/jquery.treeview.min.js"></script><script type="application/javascript" src="search/l10n.js"></script><script type="application/javascript" src="search/htmlFileInfoList.js"></script><script type="application/javascript" src="search/nwSearchFnt.js"></script><script type="application/javascript" src="search/stemmers/en_stemmer.js"><!--//make this scalable to other languages as well.--></script><script type="application/javascript" src="search/index-1.js"></script><script type="application/javascript" src="search/index-2.js"></script><script type="application/javascript" src="search/index-3.js"></script></head><body><div id="header"><a target="_blank" href="#"><img style="margin-right: 2px; height: 59px; padding-right: 25px; padding-top: 8px" align="right" src="../common/images/logo.png" alt=" Documentation"></img></a><h1>README: Web-based Help from DocBook XML<br></br>Using the package</h1><div id="navheader"><table class="navLinks"><tr><td><a id="showHideButton" href="javascript:showHideToc();" class="pointLeft" tabindex="5" title="Hide TOC tree">Sidebar
</a></td><td><a accesskey="p" class="navLinkPrevious" tabindex="5" href="ch02s03.html">Prev</a>
|
<a accesskey="u" class="navLinkUp" tabindex="5" href="ch02.html">Up</a>
@@ -98,4 +98,4 @@ border: none; background: none; font-weight: none; color: none; }
following languages. Therefore, to support these languages, you only need to implement the
stemmer in JavaScript and add it to the template. If you do undertake this task, please
consider contributing the JavaScript version back to this project and to <a class="ulink" href="http://snowball.tartarus.org/texts/stemmersoverview.html" target="_top">Martin Porter's
project</a>.</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Danish</p></li><li class="listitem"><p>Dutch</p></li><li class="listitem"><p>Finnish</p></li><li class="listitem"><p>Hungarian</p></li><li class="listitem"><p>Italian</p></li><li class="listitem"><p>Norwegian</p></li><li class="listitem"><p>Portuguese</p></li><li class="listitem"><p>Romanian</p></li><li class="listitem"><p>Russian</p></li><li class="listitem"><p>Spanish</p></li><li class="listitem"><p>Swedish</p></li><li class="listitem"><p>Turkish</p></li></ul></div><p><a id="id376892" class="indexterm"></a></p></div><script type="text/javascript" src="../common/main.js"></script><div class="navfooter"><hr></hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s03.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch02s05.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></div><div id="sidebar"><div id="leftnavigation" style="padding-top:3px;"><div id="tabs"><ul><li><a href="#treeDiv" style="outline:0;" tabindex="1"><span class="contentsTab">Contents</span></a></li><li><a href="#searchDiv" style="outline:0;" tabindex="1" onclick="doSearch()"><span class="searchTab">Search</span></a></li></ul><div id="treeDiv"><img src="../common/images/loading.gif" alt="loading table of contents..." id="tocLoading" style="display:block;"></img><div id="ulTreeDiv" style="display:none"><ul id="tree" class="filetree"><li><span class="file"><a href="ch01.html" tabindex="1">Introduction</a></span></li><li><span class="file"><a href="ch02.html" tabindex="1">Using the package</a></span><ul><li><span class="file"><a href="ch02s01.html" tabindex="1">Generating webhelp output</a></span></li><li><span class="file"><a href="ch02s02.html" tabindex="1">Using and customizing the output</a></span><ul><li><span class="file"><a href="ch02s02s01.html" tabindex="1">Recommended Apache configurations</a></span></li></ul></li><li><span class="file"><a href="ch02s03.html" tabindex="1">Search indexing</a></span></li><li id="webhelp-currentid"><span class="file"><a href="ch02s04.html" tabindex="1">Adding support for other (non-CJKV) languages</a></span></li><li><span class="file"><a href="ch02s05.html" tabindex="1">Adding images</a></span></li></ul></li><li><span class="file"><a href="ch03.html" tabindex="1">Developer Docs</a></span><ul><li><span class="file"><a href="ch03s01.html" tabindex="1">Design</a></span></li><li><span class="file"><a href="ch03s02.html" tabindex="1">Search</a></span><ul><li><span class="file"><a href="ch03s02s01.html" tabindex="1">New Stemmers</a></span></li></ul></li></ul></li><li><span class="file"><a href="ch04.html" tabindex="1">FAQ</a></span></li></ul></div></div><div id="searchDiv"><div id="search"><form onsubmit="Verifie(searchForm);return false" name="searchForm" class="searchForm"><fieldset class="searchFieldSet"><legend>Search</legend><center><input id="textToSearch" name="textToSearch" type="search" class="searchText" tabindex="1"></input> &nbsp; <input onclick="Verifie(searchForm)" type="button" class="searchButton" value="Go" id="doSearch" tabindex="1"></input></center></fieldset></form></div><div id="searchResults"><center></center></div><p class="searchHighlight"><a href="#" onclick="toggleHighlight()">Search Highlighter (On/Off)</a></p></div></div></div></div></body></html>
project</a>.</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Danish</p></li><li class="listitem"><p>Dutch</p></li><li class="listitem"><p>Finnish</p></li><li class="listitem"><p>Hungarian</p></li><li class="listitem"><p>Italian</p></li><li class="listitem"><p>Norwegian</p></li><li class="listitem"><p>Portuguese</p></li><li class="listitem"><p>Romanian</p></li><li class="listitem"><p>Russian</p></li><li class="listitem"><p>Spanish</p></li><li class="listitem"><p>Swedish</p></li><li class="listitem"><p>Turkish</p></li></ul></div><p><a id="id376892" class="indexterm"></a></p></div><script type="application/javascript" src="../common/main.js"></script><div class="navfooter"><hr></hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s03.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch02s05.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></div><div id="sidebar"><div id="leftnavigation" style="padding-top:3px;"><div id="tabs"><ul><li><a href="#treeDiv" style="outline:0;" tabindex="1"><span class="contentsTab">Contents</span></a></li><li><a href="#searchDiv" style="outline:0;" tabindex="1" onclick="doSearch()"><span class="searchTab">Search</span></a></li></ul><div id="treeDiv"><img src="../common/images/loading.gif" alt="loading table of contents..." id="tocLoading" style="display:block;"></img><div id="ulTreeDiv" style="display:none"><ul id="tree" class="filetree"><li><span class="file"><a href="ch01.html" tabindex="1">Introduction</a></span></li><li><span class="file"><a href="ch02.html" tabindex="1">Using the package</a></span><ul><li><span class="file"><a href="ch02s01.html" tabindex="1">Generating webhelp output</a></span></li><li><span class="file"><a href="ch02s02.html" tabindex="1">Using and customizing the output</a></span><ul><li><span class="file"><a href="ch02s02s01.html" tabindex="1">Recommended Apache configurations</a></span></li></ul></li><li><span class="file"><a href="ch02s03.html" tabindex="1">Search indexing</a></span></li><li id="webhelp-currentid"><span class="file"><a href="ch02s04.html" tabindex="1">Adding support for other (non-CJKV) languages</a></span></li><li><span class="file"><a href="ch02s05.html" tabindex="1">Adding images</a></span></li></ul></li><li><span class="file"><a href="ch03.html" tabindex="1">Developer Docs</a></span><ul><li><span class="file"><a href="ch03s01.html" tabindex="1">Design</a></span></li><li><span class="file"><a href="ch03s02.html" tabindex="1">Search</a></span><ul><li><span class="file"><a href="ch03s02s01.html" tabindex="1">New Stemmers</a></span></li></ul></li></ul></li><li><span class="file"><a href="ch04.html" tabindex="1">FAQ</a></span></li></ul></div></div><div id="searchDiv"><div id="search"><form onsubmit="Verifie(searchForm);return false" name="searchForm" class="searchForm"><fieldset class="searchFieldSet"><legend>Search</legend><center><input id="textToSearch" name="textToSearch" type="search" class="searchText" tabindex="1"></input> &nbsp; <input onclick="Verifie(searchForm)" type="button" class="searchButton" value="Go" id="doSearch" tabindex="1"></input></center></fieldset></form></div><div id="searchResults"><center></center></div><p class="searchHighlight"><a href="#" onclick="toggleHighlight()">Search Highlighter (On/Off)</a></p></div></div></div></div></body></html>
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"><head>
<meta http-equiv="X-UA-Compatible" content="IE=7"></meta>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
<title>Adding images</title><meta name="generator" content="DocBook XSL Stylesheets V1.77.1"></meta><link rel="home" href="index.html" title="README: Web-based Help from DocBook XML"></link><link rel="up" href="ch02.html" title="Using the package"></link><link rel="prev" href="ch02s04.html" title="Adding support for other (non-CJKV) languages"></link><link rel="next" href="ch03.html" title="Developer Docs"></link><script type="text/javascript">
<title>Adding images</title><meta name="generator" content="DocBook XSL Stylesheets V1.77.1"></meta><link rel="home" href="index.html" title="README: Web-based Help from DocBook XML"></link><link rel="up" href="ch02.html" title="Using the package"></link><link rel="prev" href="ch02s04.html" title="Adding support for other (non-CJKV) languages"></link><link rel="next" href="ch03.html" title="Developer Docs"></link><script type="application/javascript">
//The id for tree cookie
var treeCookieId = "treeview-1055";
var language = "en";
@@ -85,7 +85,7 @@ border: none; background: none; font-weight: none; color: none; }
.ui-tabs { padding: .2em;}
.ui-tabs .ui-tabs-nav li { top: 0px; margin: -2px 0 1px; text-transform: uppercase; font-size: 10.5px;}
.ui-tabs .ui-tabs-nav li a { padding: .25em 2em .25em 1em; margin: .5em; text-shadow: 0 1px 0 rgba(255,255,255,.5); }
</style><script type="text/javascript" src="../common/browserDetect.js"></script><script type="text/javascript" src="../common/jquery/jquery-1.4.2.min.js"></script><script type="text/javascript" src="../common/jquery/jquery-ui-1.8.2.custom.min.js"></script><script type="text/javascript" src="../common/jquery/jquery.cookie.js"></script><script type="text/javascript" src="../common/jquery/treeview/jquery.treeview.min.js"></script><script type="text/javascript" src="search/l10n.js"></script><script type="text/javascript" src="search/htmlFileInfoList.js"></script><script type="text/javascript" src="search/nwSearchFnt.js"></script><script type="text/javascript" src="search/stemmers/en_stemmer.js"><!--//make this scalable to other languages as well.--></script><script type="text/javascript" src="search/index-1.js"></script><script type="text/javascript" src="search/index-2.js"></script><script type="text/javascript" src="search/index-3.js"></script></head><body><div id="header"><a target="_blank" href="#"><img style="margin-right: 2px; height: 59px; padding-right: 25px; padding-top: 8px" align="right" src="../common/images/logo.png" alt=" Documentation"></img></a><h1>README: Web-based Help from DocBook XML<br></br>Using the package</h1><div id="navheader"><table class="navLinks"><tr><td><a id="showHideButton" href="javascript:showHideToc();" class="pointLeft" tabindex="5" title="Hide TOC tree">Sidebar
</style><script type="application/javascript" src="../common/browserDetect.js"></script><script type="application/javascript" src="../common/jquery/jquery-1.4.2.min.js"></script><script type="application/javascript" src="../common/jquery/jquery-ui-1.8.2.custom.min.js"></script><script type="application/javascript" src="../common/jquery/jquery.cookie.js"></script><script type="application/javascript" src="../common/jquery/treeview/jquery.treeview.min.js"></script><script type="application/javascript" src="search/l10n.js"></script><script type="application/javascript" src="search/htmlFileInfoList.js"></script><script type="application/javascript" src="search/nwSearchFnt.js"></script><script type="application/javascript" src="search/stemmers/en_stemmer.js"><!--//make this scalable to other languages as well.--></script><script type="application/javascript" src="search/index-1.js"></script><script type="application/javascript" src="search/index-2.js"></script><script type="application/javascript" src="search/index-3.js"></script></head><body><div id="header"><a target="_blank" href="#"><img style="margin-right: 2px; height: 59px; padding-right: 25px; padding-top: 8px" align="right" src="../common/images/logo.png" alt=" Documentation"></img></a><h1>README: Web-based Help from DocBook XML<br></br>Using the package</h1><div id="navheader"><table class="navLinks"><tr><td><a id="showHideButton" href="javascript:showHideToc();" class="pointLeft" tabindex="5" title="Hide TOC tree">Sidebar
</a></td><td><a accesskey="p" class="navLinkPrevious" tabindex="5" href="ch02s04.html">Prev</a>
|
<a accesskey="u" class="navLinkUp" tabindex="5" href="ch02.html">Up</a>
@@ -108,4 +108,4 @@ border: none; background: none; font-weight: none; color: none; }
# to the output directory, you can list patterns here.
# See the Ant documentation for fileset for documentation
# on patterns.
input-images-dirs=images/**,figures/**,graphics/**</pre></li></ul></div></div><script type="text/javascript" src="../common/main.js"></script><div class="navfooter"><hr></hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s04.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch03.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></div><div id="sidebar"><div id="leftnavigation" style="padding-top:3px;"><div id="tabs"><ul><li><a href="#treeDiv" style="outline:0;" tabindex="1"><span class="contentsTab">Contents</span></a></li><li><a href="#searchDiv" style="outline:0;" tabindex="1" onclick="doSearch()"><span class="searchTab">Search</span></a></li></ul><div id="treeDiv"><img src="../common/images/loading.gif" alt="loading table of contents..." id="tocLoading" style="display:block;"></img><div id="ulTreeDiv" style="display:none"><ul id="tree" class="filetree"><li><span class="file"><a href="ch01.html" tabindex="1">Introduction</a></span></li><li><span class="file"><a href="ch02.html" tabindex="1">Using the package</a></span><ul><li><span class="file"><a href="ch02s01.html" tabindex="1">Generating webhelp output</a></span></li><li><span class="file"><a href="ch02s02.html" tabindex="1">Using and customizing the output</a></span><ul><li><span class="file"><a href="ch02s02s01.html" tabindex="1">Recommended Apache configurations</a></span></li></ul></li><li><span class="file"><a href="ch02s03.html" tabindex="1">Search indexing</a></span></li><li><span class="file"><a href="ch02s04.html" tabindex="1">Adding support for other (non-CJKV) languages</a></span></li><li id="webhelp-currentid"><span class="file"><a href="ch02s05.html" tabindex="1">Adding images</a></span></li></ul></li><li><span class="file"><a href="ch03.html" tabindex="1">Developer Docs</a></span><ul><li><span class="file"><a href="ch03s01.html" tabindex="1">Design</a></span></li><li><span class="file"><a href="ch03s02.html" tabindex="1">Search</a></span><ul><li><span class="file"><a href="ch03s02s01.html" tabindex="1">New Stemmers</a></span></li></ul></li></ul></li><li><span class="file"><a href="ch04.html" tabindex="1">FAQ</a></span></li></ul></div></div><div id="searchDiv"><div id="search"><form onsubmit="Verifie(searchForm);return false" name="searchForm" class="searchForm"><fieldset class="searchFieldSet"><legend>Search</legend><center><input id="textToSearch" name="textToSearch" type="search" class="searchText" tabindex="1"></input> &nbsp; <input onclick="Verifie(searchForm)" type="button" class="searchButton" value="Go" id="doSearch" tabindex="1"></input></center></fieldset></form></div><div id="searchResults"><center></center></div><p class="searchHighlight"><a href="#" onclick="toggleHighlight()">Search Highlighter (On/Off)</a></p></div></div></div></div></body></html>
input-images-dirs=images/**,figures/**,graphics/**</pre></li></ul></div></div><script type="application/javascript" src="../common/main.js"></script><div class="navfooter"><hr></hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s04.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch03.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></div><div id="sidebar"><div id="leftnavigation" style="padding-top:3px;"><div id="tabs"><ul><li><a href="#treeDiv" style="outline:0;" tabindex="1"><span class="contentsTab">Contents</span></a></li><li><a href="#searchDiv" style="outline:0;" tabindex="1" onclick="doSearch()"><span class="searchTab">Search</span></a></li></ul><div id="treeDiv"><img src="../common/images/loading.gif" alt="loading table of contents..." id="tocLoading" style="display:block;"></img><div id="ulTreeDiv" style="display:none"><ul id="tree" class="filetree"><li><span class="file"><a href="ch01.html" tabindex="1">Introduction</a></span></li><li><span class="file"><a href="ch02.html" tabindex="1">Using the package</a></span><ul><li><span class="file"><a href="ch02s01.html" tabindex="1">Generating webhelp output</a></span></li><li><span class="file"><a href="ch02s02.html" tabindex="1">Using and customizing the output</a></span><ul><li><span class="file"><a href="ch02s02s01.html" tabindex="1">Recommended Apache configurations</a></span></li></ul></li><li><span class="file"><a href="ch02s03.html" tabindex="1">Search indexing</a></span></li><li><span class="file"><a href="ch02s04.html" tabindex="1">Adding support for other (non-CJKV) languages</a></span></li><li id="webhelp-currentid"><span class="file"><a href="ch02s05.html" tabindex="1">Adding images</a></span></li></ul></li><li><span class="file"><a href="ch03.html" tabindex="1">Developer Docs</a></span><ul><li><span class="file"><a href="ch03s01.html" tabindex="1">Design</a></span></li><li><span class="file"><a href="ch03s02.html" tabindex="1">Search</a></span><ul><li><span class="file"><a href="ch03s02s01.html" tabindex="1">New Stemmers</a></span></li></ul></li></ul></li><li><span class="file"><a href="ch04.html" tabindex="1">FAQ</a></span></li></ul></div></div><div id="searchDiv"><div id="search"><form onsubmit="Verifie(searchForm);return false" name="searchForm" class="searchForm"><fieldset class="searchFieldSet"><legend>Search</legend><center><input id="textToSearch" name="textToSearch" type="search" class="searchText" tabindex="1"></input> &nbsp; <input onclick="Verifie(searchForm)" type="button" class="searchButton" value="Go" id="doSearch" tabindex="1"></input></center></fieldset></form></div><div id="searchResults"><center></center></div><p class="searchHighlight"><a href="#" onclick="toggleHighlight()">Search Highlighter (On/Off)</a></p></div></div></div></div></body></html>

Some files were not shown because too many files have changed in this diff Show More