svn commit: r926987 [18/26] - in /ofbiz/branches/multitenant201
Locked
svn commit: r926987 [18/26] - in /ofbiz/branches/multitenant201
 
|
Modified: ofbiz/branches/multitenant20100310/framework/example/webapp/example/WEB-INF/birt.tld
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/example/webapp/example/WEB-INF/birt.tld?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/example/webapp/example/WEB-INF/birt.tld (original) +++ ofbiz/branches/multitenant20100310/framework/example/webapp/example/WEB-INF/birt.tld Wed Mar 24 09:23:07 2010 @@ -21,54 +21,54 @@ specific language governing permissions under the License. --> <taglib> - <tlib-version>1.0</tlib-version> - <jsp-version>1.2</jsp-version> - <short-name>BIRT Tag Library</short-name> - <uri>http://www.eclipse.org/birt/taglibs/birt.tld</uri> - <description> - This Tag Library makes user develope JSP with BIRT Viewer component easily. - </description> - + <tlib-version>1.0</tlib-version> + <jsp-version>1.2</jsp-version> + <short-name>BIRT Tag Library</short-name> + <uri>http://www.eclipse.org/birt/taglibs/birt.tld</uri> + <description> + This Tag Library makes user develope JSP with BIRT Viewer component easily. + </description> + <!--**********************************************--> <!-- Viewer Tag --> <!--**********************************************--> - <tag> - <name>viewer</name> - <tag-class>org.eclipse.birt.report.taglib.ViewerTag</tag-class> - <body-content>JSP</body-content> - <description> - The viewer tag is to specify how to import and control BIRT Report Viewer into JSP page. - This tag will use Ajax framework to retrieve report content. - </description> - - <attribute> - <name>id</name> - <required>true</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the current viewer id. It should be unique. - It can contain number,letter or underline. - </description> - </attribute> + <tag> + <name>viewer</name> + <tag-class>org.eclipse.birt.report.taglib.ViewerTag</tag-class> + <body-content>JSP</body-content> + <description> + The viewer tag is to specify how to import and control BIRT Report Viewer into JSP page. + This tag will use Ajax framework to retrieve report content. + </description> + + <attribute> + <name>id</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the current viewer id. It should be unique. + It can contain number,letter or underline. + </description> + </attribute> <attribute> <name>pattern</name> <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies which servlet pattern to be used to preview report. - Default value is frameset. - ( frameset or run ) + Specifies which servlet pattern to be used to preview report. + Default value is frameset. + ( frameset or run ) </description> </attribute> - + <attribute> <name>baseURL</name> <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies base URL of BIRT viewer. - Default to the current context. + Specifies base URL of BIRT viewer. + Default to the current context. </description> </attribute> @@ -77,7 +77,7 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies the report title displayed at the top. + Specifies the report title displayed at the top. </description> </attribute> @@ -86,8 +86,8 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies whether the viewer occupies the whole page. - Default to false. + Specifies whether the viewer occupies the whole page. + Default to false. </description> </attribute> @@ -96,9 +96,9 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Sets the IFrame style "scrolling ". - If isHostPage is true, ignore this attribute. - ( auto | yes | no ) + Sets the IFrame style "scrolling ". + If isHostPage is true, ignore this attribute. + ( auto | yes | no ) </description> </attribute> @@ -107,9 +107,9 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Sets the style "position" of report container. - If isHostPage is true, ignore this attribute. - ( static | absolute | fixed | relative ) + Sets the style "position" of report container. + If isHostPage is true, ignore this attribute. + ( static | absolute | fixed | relative ) </description> </attribute> @@ -118,8 +118,8 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Sets the style of report container. - If isHostPage is true, ignore this attribute. + Sets the style of report container. + If isHostPage is true, ignore this attribute. </description> </attribute> @@ -128,8 +128,8 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Sets the height of report container in pixels. - If isHostPage is true, ignore this attribute. + Sets the height of report container in pixels. + If isHostPage is true, ignore this attribute. </description> </attribute> @@ -138,8 +138,8 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Sets the width of report container in pixels. - If isHostPage is true, ignore this attribute. + Sets the width of report container in pixels. + If isHostPage is true, ignore this attribute. </description> </attribute> @@ -148,8 +148,8 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Sets the top of report container in pixels. - If isHostPage is true, ignore this attribute. + Sets the top of report container in pixels. + If isHostPage is true, ignore this attribute. </description> </attribute> @@ -158,8 +158,8 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Sets the left of report container in pixels. - If isHostPage is true, ignore this attribute. + Sets the left of report container in pixels. + If isHostPage is true, ignore this attribute. </description> </attribute> @@ -168,212 +168,212 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies whether displays the iframe border. - Default to no. - If isHostPage is true, ignore this attribute. - ( Yes | No ) + Specifies whether displays the iframe border. + Default to no. + If isHostPage is true, ignore this attribute. + ( Yes | No ) </description> </attribute> - <attribute> - <name>reportDesign</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the report design file name. - ( Absolute path, relative path or URL ) - </description> - </attribute> - - <attribute> - <name>reportDocument</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the report document file name. - Noted: only support "file:" URL format. - ( Absolute path, relative path or URL ) - </description> - </attribute> - - <attribute> - <name>reportletId</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the instance id of reportlet. - The "reportDocument" attribute should be required. - Noted: frameset pattern doesn't support reportlet. - </description> - </attribute> - - <attribute> - <name>bookmark</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the targeted bookmark name. - </description> - </attribute> - - <attribute> - <name>locale</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the Locale information. - </description> - </attribute> - - <attribute> - <name>timeZone</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies a time zone id. For example: "America/Los_Angeles" or "GMT+1" or "GMT+01:00". - </description> - </attribute> - - <attribute> - <name>svg</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies whether supports the SVG output format or not. - </description> - </attribute> - - <attribute> - <name>format</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the output format of report. - </description> - </attribute> - - <attribute> - <name>emitterId</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the emitter id for the report output. - </description> - </attribute> - - <attribute> - <name>pageOverflow</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the page overflow setting for the PDF format. - One of the following values: - 0 for "auto", 1 for "actual size", 2 for "fit to page". - </description> - </attribute> - - <attribute> - <name>rtl</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies whether supports rtl page or not. - </description> - </attribute> - - <attribute> - <name>pageNum</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies output page number when render document file. - </description> - </attribute> - - <attribute> - <name>pageRange</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies page range when render document file. - </description> - </attribute> - - <attribute> - <name>resourceFolder</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the referenced resource folder. - Default value is defined in web.xml. - </description> - </attribute> - - <attribute> - <name>forceOverwriteDocument</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies whether forces to overwrite the generated document. - If allowPageBreak is false,ignore this attribute. - Default value is defined in web.xml. - </description> - </attribute> - - <attribute> - <name>showTitle</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies whether shows the report title. - Default to true. - </description> - </attribute> - - <attribute> - <name>showToolBar</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies whether shows the toolbar. - Default to true. - </description> - </attribute> - - <attribute> - <name>showNavigationBar</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies whether shows the Navigation Bar. - If allowPageBreak is false,ignore this attribute. - Default to true. - </description> - </attribute> - - <attribute> - <name>showParameterPage</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies whether show the parameter dialog or not. - Default to true. - </description> - </attribute> - - <attribute> - <name>isReportlet</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies whether render reportlet by bookmark. - Default to false. - </description> - </attribute> - - </tag> + <attribute> + <name>reportDesign</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the report design file name. + ( Absolute path, relative path or URL ) + </description> + </attribute> + + <attribute> + <name>reportDocument</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the report document file name. + Noted: only support "file:" URL format. + ( Absolute path, relative path or URL ) + </description> + </attribute> + + <attribute> + <name>reportletId</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the instance id of reportlet. + The "reportDocument" attribute should be required. + Noted: frameset pattern doesn't support reportlet. + </description> + </attribute> + + <attribute> + <name>bookmark</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the targeted bookmark name. + </description> + </attribute> + + <attribute> + <name>locale</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the Locale information. + </description> + </attribute> + + <attribute> + <name>timeZone</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies a time zone id. For example: "America/Los_Angeles" or "GMT+1" or "GMT+01:00". + </description> + </attribute> + + <attribute> + <name>svg</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies whether supports the SVG output format or not. + </description> + </attribute> + + <attribute> + <name>format</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the output format of report. + </description> + </attribute> + + <attribute> + <name>emitterId</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the emitter id for the report output. + </description> + </attribute> + + <attribute> + <name>pageOverflow</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the page overflow setting for the PDF format. + One of the following values: + 0 for "auto", 1 for "actual size", 2 for "fit to page". + </description> + </attribute> + + <attribute> + <name>rtl</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies whether supports rtl page or not. + </description> + </attribute> + + <attribute> + <name>pageNum</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies output page number when render document file. + </description> + </attribute> + + <attribute> + <name>pageRange</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies page range when render document file. + </description> + </attribute> + + <attribute> + <name>resourceFolder</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the referenced resource folder. + Default value is defined in web.xml. + </description> + </attribute> + + <attribute> + <name>forceOverwriteDocument</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies whether forces to overwrite the generated document. + If allowPageBreak is false,ignore this attribute. + Default value is defined in web.xml. + </description> + </attribute> + + <attribute> + <name>showTitle</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies whether shows the report title. + Default to true. + </description> + </attribute> + + <attribute> + <name>showToolBar</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies whether shows the toolbar. + Default to true. + </description> + </attribute> + + <attribute> + <name>showNavigationBar</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies whether shows the Navigation Bar. + If allowPageBreak is false,ignore this attribute. + Default to true. + </description> + </attribute> + + <attribute> + <name>showParameterPage</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies whether show the parameter dialog or not. + Default to true. + </description> + </attribute> - <!--**********************************************--> + <attribute> + <name>isReportlet</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies whether render reportlet by bookmark. + Default to false. + </description> + </attribute> + + </tag> + + <!--**********************************************--> <!-- Report Tag --> <!--**********************************************--> <tag> @@ -381,28 +381,28 @@ under the License. <tag-class>org.eclipse.birt.report.taglib.ReportTag</tag-class> <body-content>JSP</body-content> <description> - The report tag can provide fast report preview without Ajax framework. - The report content can be output to web browser directly. + The report tag can provide fast report preview without Ajax framework. + The report content can be output to web browser directly. </description> - <attribute> - <name>id</name> - <required>true</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the current viewer id. It should be unique. - It can contain number,letter or underline. - </description> - </attribute> - + <attribute> + <name>id</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the current viewer id. It should be unique. + It can contain number,letter or underline. + </description> + </attribute> + <attribute> <name>baseURL</name> <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies base URL of BIRT viewer. - Default to the current context. - If report container is DIV, ignore this attribute. + Specifies base URL of BIRT viewer. + Default to the current context. + If report container is DIV, ignore this attribute. </description> </attribute> @@ -411,8 +411,8 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies whether the viewer occupies the whole page. - Default to false. + Specifies whether the viewer occupies the whole page. + Default to false. </description> </attribute> @@ -421,9 +421,9 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Sets the DIV/IFrame style "scrolling ". - If isHostPage is true, ignore this attribute. - ( auto | yes | no ) + Sets the DIV/IFrame style "scrolling ". + If isHostPage is true, ignore this attribute. + ( auto | yes | no ) </description> </attribute> @@ -432,9 +432,9 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Sets the style "position" of report container. - If isHostPage is true, ignore this attribute. - ( static | absolute | fixed | relative ) + Sets the style "position" of report container. + If isHostPage is true, ignore this attribute. + ( static | absolute | fixed | relative ) </description> </attribute> @@ -443,8 +443,8 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Sets the style of report container. - If isHostPage is true, ignore this attribute. + Sets the style of report container. + If isHostPage is true, ignore this attribute. </description> </attribute> @@ -453,8 +453,8 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Sets the height of report container in pixels. - If isHostPage is true, ignore this attribute. + Sets the height of report container in pixels. + If isHostPage is true, ignore this attribute. </description> </attribute> @@ -463,8 +463,8 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Sets the width of report container in pixels. - If isHostPage is true, ignore this attribute. + Sets the width of report container in pixels. + If isHostPage is true, ignore this attribute. </description> </attribute> @@ -473,8 +473,8 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Sets the top of report container in pixels. - If isHostPage is true, ignore this attribute. + Sets the top of report container in pixels. + If isHostPage is true, ignore this attribute. </description> </attribute> @@ -483,8 +483,8 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Sets the left of report container in pixels. - If isHostPage is true, ignore this attribute. + Sets the left of report container in pixels. + If isHostPage is true, ignore this attribute. </description> </attribute> @@ -493,179 +493,179 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies whether displays the iframe border. - Available when user IFrame. - Default to no. - ( Yes | No ) - </description> - </attribute> - - <attribute> - <name>reportDesign</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the report design file name. - ( Absolute path, relative path or URL ) - </description> - </attribute> - - <attribute> - <name>reportDocument</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the report document file name. - Noted: only support "file:" URL format. - ( Absolute path, relative path or URL ) - </description> - </attribute> - - <attribute> - <name>reportletId</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the instance id of reportlet. - The "reportDocument" attribute should be required. - </description> - </attribute> - - <attribute> - <name>bookmark</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the targeted bookmark name. - </description> - </attribute> - - <attribute> - <name>locale</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the Locale information. - </description> - </attribute> - - <attribute> - <name>timeZone</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies a time zone id. For example: "America/Los_Angeles" or "GMT+1" or "GMT+01:00". - </description> - </attribute> - - <attribute> - <name>svg</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies whether supports the SVG output format or not. - </description> - </attribute> - - <attribute> - <name>format</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the output format of report. - </description> - </attribute> - - <attribute> - <name>emitterId</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the emitter id for the report output. - </description> - </attribute> - - <attribute> - <name>pageOverflow</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the page overflow setting for the PDF format. - One of the following values: - 0 for "auto", 1 for "actual size", 2 for "fit to page". - </description> - </attribute> - - <attribute> - <name>rtl</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies whether supports rtl page or not. - </description> - </attribute> - - <attribute> - <name>showParameterPage</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies whether show the parameter dialog or not. - Default to true. - If report container is DIV, ignore this attribute. - </description> - </attribute> - - <attribute> - <name>resourceFolder</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the referenced resource folder. - Default value is defined in web.xml. - </description> - </attribute> - - <attribute> - <name>reportContainer</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies iframe or div as report container. - Default to iframe. - ( iframe | div ) - </description> - </attribute> - - <attribute> - <name>pageNum</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies output page number when render document file. - </description> - </attribute> - - <attribute> - <name>pageRange</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies page range when render document file. - </description> - </attribute> - - <attribute> - <name>isReportlet</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies whether render reportlet by bookmark. - Default to false. - </description> - </attribute> - - </tag> + Specifies whether displays the iframe border. + Available when user IFrame. + Default to no. + ( Yes | No ) + </description> + </attribute> + + <attribute> + <name>reportDesign</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the report design file name. + ( Absolute path, relative path or URL ) + </description> + </attribute> + + <attribute> + <name>reportDocument</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the report document file name. + Noted: only support "file:" URL format. + ( Absolute path, relative path or URL ) + </description> + </attribute> + + <attribute> + <name>reportletId</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the instance id of reportlet. + The "reportDocument" attribute should be required. + </description> + </attribute> + + <attribute> + <name>bookmark</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the targeted bookmark name. + </description> + </attribute> + + <attribute> + <name>locale</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the Locale information. + </description> + </attribute> + + <attribute> + <name>timeZone</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies a time zone id. For example: "America/Los_Angeles" or "GMT+1" or "GMT+01:00". + </description> + </attribute> + + <attribute> + <name>svg</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies whether supports the SVG output format or not. + </description> + </attribute> + + <attribute> + <name>format</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the output format of report. + </description> + </attribute> + + <attribute> + <name>emitterId</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the emitter id for the report output. + </description> + </attribute> + + <attribute> + <name>pageOverflow</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the page overflow setting for the PDF format. + One of the following values: + 0 for "auto", 1 for "actual size", 2 for "fit to page". + </description> + </attribute> + + <attribute> + <name>rtl</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies whether supports rtl page or not. + </description> + </attribute> + + <attribute> + <name>showParameterPage</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies whether show the parameter dialog or not. + Default to true. + If report container is DIV, ignore this attribute. + </description> + </attribute> + + <attribute> + <name>resourceFolder</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the referenced resource folder. + Default value is defined in web.xml. + </description> + </attribute> + + <attribute> + <name>reportContainer</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies iframe or div as report container. + Default to iframe. + ( iframe | div ) + </description> + </attribute> + + <attribute> + <name>pageNum</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies output page number when render document file. + </description> + </attribute> + + <attribute> + <name>pageRange</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies page range when render document file. + </description> + </attribute> + + <attribute> + <name>isReportlet</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies whether render reportlet by bookmark. + Default to false. + </description> + </attribute> + + </tag> <!--**********************************************--> <!-- Report Parameter Tag --> @@ -675,14 +675,14 @@ under the License. <tag-class>org.eclipse.birt.report.taglib.ParamTag</tag-class> <body-content>JSP</body-content> <description> - The param tag specifies the parameters defined in report design file. + The param tag specifies the parameters defined in report design file. </description> <attribute> <name>name</name> <required>true</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies the report parameter name. + Specifies the report parameter name. </description> </attribute> <attribute> @@ -690,7 +690,7 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies the report parameter pattern format. + Specifies the report parameter pattern format. </description> </attribute> <attribute> @@ -698,7 +698,7 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies the report parameter value. If doesn't set, value is null. + Specifies the report parameter value. If doesn't set, value is null. </description> </attribute> <attribute> @@ -706,7 +706,7 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies the report parameter display text. + Specifies the report parameter display text. </description> </attribute> <attribute> @@ -714,8 +714,8 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies the delimiter for multiple values. - Defaults to pipe "|". + Specifies the delimiter for multiple values. + Defaults to pipe "|". </description> </attribute> <attribute> @@ -723,7 +723,7 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies whether the report parameter value is a locale/format related string. + Specifies whether the report parameter value is a locale/format related string. </description> </attribute> </tag> @@ -736,14 +736,14 @@ under the License. <tag-class>org.eclipse.birt.report.taglib.ParamValueTag</tag-class> <body-content>JSP</body-content> <description> - The param value tag specifies multiple values for a given param tag. + The param value tag specifies multiple values for a given param tag. </description> <attribute> <name>value</name> <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies the report parameter value. If doesn't set, value is null. + Specifies the report parameter value. If doesn't set, value is null. </description> </attribute> <attribute> @@ -751,7 +751,7 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies the report parameter display text. + Specifies the report parameter display text. </description> </attribute> </tag> @@ -764,27 +764,27 @@ under the License. <tag-class>org.eclipse.birt.report.taglib.RequesterTag</tag-class> <body-content>JSP</body-content> <description> - The parameterPage tag can help developers to display BIRT parameter page or create a user-defined parameter page. - This tag can collect these parameters and submit to BIRT servlet to handle request. + The parameterPage tag can help developers to display BIRT parameter page or create a user-defined parameter page. + This tag can collect these parameters and submit to BIRT servlet to handle request. </description> <attribute> - <name>id</name> - <required>true</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the parameter page id.It should be unique. - It can contain number,letter or underline. - </description> - </attribute> + <name>id</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the parameter page id.It should be unique. + It can contain number,letter or underline. + </description> + </attribute> <attribute> <name>name</name> <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies the parameter page name. - If attribute 'isCustom' is true, this name should be required and unique. + Specifies the parameter page name. + If attribute 'isCustom' is true, this name should be required and unique. </description> </attribute> @@ -793,9 +793,9 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies whether uses the user-defined parameter page. - If false, use the BIRT parameter dialog. - Default to false. + Specifies whether uses the user-defined parameter page. + If false, use the BIRT parameter dialog. + Default to false. </description> </attribute> @@ -804,27 +804,27 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies the report title displayed at the top. + Specifies the report title displayed at the top. </description> </attribute> - <attribute> + <attribute> <name>baseURL</name> <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies base URL of BIRT viewer. - Default to the current context. + Specifies base URL of BIRT viewer. + Default to the current context. </description> </attribute> - - <attribute> + + <attribute> <name>scrolling </name> <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Sets the DIV/IFrame style "scrolling ". - ( auto | yes | no ) + Sets the DIV/IFrame style "scrolling ". + ( auto | yes | no ) </description> </attribute> @@ -833,8 +833,8 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Sets the style "position" of parameter page. - ( static | absolute | fixed | relative ) + Sets the style "position" of parameter page. + ( static | absolute | fixed | relative ) </description> </attribute> @@ -843,7 +843,7 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Sets the style of parameter page. + Sets the style of parameter page. </description> </attribute> @@ -852,7 +852,7 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Sets the height of parameter page in pixels. + Sets the height of parameter page in pixels. </description> </attribute> @@ -861,7 +861,7 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Sets the width of parameter page in pixels. + Sets the width of parameter page in pixels. </description> </attribute> @@ -870,7 +870,7 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Sets the top of parameter page in pixels. + Sets the top of parameter page in pixels. </description> </attribute> @@ -879,7 +879,7 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Sets the left of parameter page in pixels. + Sets the left of parameter page in pixels. </description> </attribute> @@ -888,202 +888,202 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies whether displays the iframe border. - Default to no. - If set "isCustom" to true, ignore this attribute. - ( Yes | No ) + Specifies whether displays the iframe border. + Default to no. + If set "isCustom" to true, ignore this attribute. + ( Yes | No ) </description> </attribute> - <attribute> - <name>reportDesign</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the report design file name. - ( Absolute path, relative path or URL ) - </description> - </attribute> - - <attribute> - <name>reportDocument</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the report document file name. - Noted: only support "file:" URL format. - ( Absolute path, relative path or URL ) - </description> - </attribute> - - <attribute> - <name>reportletId</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the instance id of reportlet. - The "reportDocument" attribute should be required. - Noted: frameset pattern doesn't support reportlet. - </description> - </attribute> - - <attribute> - <name>pattern</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the servlet pattern for request submit. - BIRT supports three patterns: frameset, run and preview. - Can refer to the user-defined servlet pattern. - Default to frameset. - </description> - </attribute> - - <attribute> - <name>target</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the target window for request submit. - </description> - </attribute> - - <attribute> - <name>bookmark</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the targeted bookmark name. - </description> - </attribute> - - <attribute> - <name>locale</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the Locale information. - </description> - </attribute> - - <attribute> - <name>timeZone</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies a time zone id. For example: "America/Los_Angeles" or "GMT+1" or "GMT+01:00". - </description> - </attribute> - - <attribute> - <name>svg</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies whether supports the SVG output format or not. - </description> - </attribute> - - <attribute> - <name>format</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the output format of report. - </description> - </attribute> - - <attribute> - <name>emitterId</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the emitter id for the report output. - </description> - </attribute> - - <attribute> - <name>pageOverflow</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the page overflow setting for the PDF format. - One of the following values: - 0 for "auto", 1 for "actual size", 2 for "fit to page". - </description> - </attribute> - - <attribute> - <name>rtl</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies whether supports rtl page or not. - </description> - </attribute> - - <attribute> - <name>resourceFolder</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies the referenced resource folder. - Default value is defined in web.xml. - </description> - </attribute> - - <attribute> - <name>forceOverwriteDocument</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies whether forces to overwrite the generated document. - If allowPageBreak is false,ignore this attribute. - Default value is defined in web.xml. - </description> - </attribute> - - <attribute> - <name>showTitle</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies whether shows the report title. - Default to true. - </description> - </attribute> - - <attribute> - <name>showToolBar</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies whether shows the toolbar. - Default to true. - </description> - </attribute> - - <attribute> - <name>showNavigationBar</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies whether shows the Navigation Bar. - If allowPageBreak is false,ignore this attribute. - Default to true. - </description> - </attribute> - - <attribute> - <name>isReportlet</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description> - Specifies whether render reportlet by bookmark. - Default to false. - </description> - </attribute> - + <attribute> + <name>reportDesign</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the report design file name. + ( Absolute path, relative path or URL ) + </description> + </attribute> + + <attribute> + <name>reportDocument</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the report document file name. + Noted: only support "file:" URL format. + ( Absolute path, relative path or URL ) + </description> + </attribute> + + <attribute> + <name>reportletId</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the instance id of reportlet. + The "reportDocument" attribute should be required. + Noted: frameset pattern doesn't support reportlet. + </description> + </attribute> + + <attribute> + <name>pattern</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the servlet pattern for request submit. + BIRT supports three patterns: frameset, run and preview. + Can refer to the user-defined servlet pattern. + Default to frameset. + </description> + </attribute> + + <attribute> + <name>target</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the target window for request submit. + </description> + </attribute> + + <attribute> + <name>bookmark</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the targeted bookmark name. + </description> + </attribute> + + <attribute> + <name>locale</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the Locale information. + </description> + </attribute> + + <attribute> + <name>timeZone</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies a time zone id. For example: "America/Los_Angeles" or "GMT+1" or "GMT+01:00". + </description> + </attribute> + + <attribute> + <name>svg</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies whether supports the SVG output format or not. + </description> + </attribute> + + <attribute> + <name>format</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the output format of report. + </description> + </attribute> + + <attribute> + <name>emitterId</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the emitter id for the report output. + </description> + </attribute> + + <attribute> + <name>pageOverflow</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the page overflow setting for the PDF format. + One of the following values: + 0 for "auto", 1 for "actual size", 2 for "fit to page". + </description> + </attribute> + + <attribute> + <name>rtl</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies whether supports rtl page or not. + </description> + </attribute> + + <attribute> + <name>resourceFolder</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies the referenced resource folder. + Default value is defined in web.xml. + </description> + </attribute> + + <attribute> + <name>forceOverwriteDocument</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies whether forces to overwrite the generated document. + If allowPageBreak is false,ignore this attribute. + Default value is defined in web.xml. + </description> + </attribute> + + <attribute> + <name>showTitle</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies whether shows the report title. + Default to true. + </description> + </attribute> + + <attribute> + <name>showToolBar</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies whether shows the toolbar. + Default to true. + </description> + </attribute> + + <attribute> + <name>showNavigationBar</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies whether shows the Navigation Bar. + If allowPageBreak is false,ignore this attribute. + Default to true. + </description> + </attribute> + + <attribute> + <name>isReportlet</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description> + Specifies whether render reportlet by bookmark. + Default to false. + </description> + </attribute> + </tag> <!--**********************************************--> @@ -1094,15 +1094,15 @@ under the License. <tag-class>org.eclipse.birt.report.taglib.ParamDefTag</tag-class> <body-content>JSP</body-content> <description> - The param tag is used to generate html code for defined parameter in ParameterPage tag. + The param tag is used to generate html code for defined parameter in ParameterPage tag. </description> <attribute> <name>id</name> <required>true</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies the id of parameter control.It should be unique. - It can contain number,letter or underline. + Specifies the id of parameter control.It should be unique. + It can contain number,letter or underline. </description> </attribute> <attribute> @@ -1110,7 +1110,7 @@ under the License. <required>true</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies the report parameter name. + Specifies the report parameter name. </description> </attribute> <attribute> @@ -1118,8 +1118,8 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies the report parameter pattern format. - It is used to parse defined parameter value string. + Specifies the report parameter pattern format. + It is used to parse defined parameter value string. </description> </attribute> <attribute> @@ -1127,7 +1127,7 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies the report parameter value. If doesn't set, use default value. + Specifies the report parameter value. If doesn't set, use default value. </description> </attribute> <attribute> @@ -1135,7 +1135,7 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies the report parameter display text. + Specifies the report parameter display text. </description> </attribute> <attribute> @@ -1143,8 +1143,8 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies whether the report parameter value is a locale/format related string. - It is used to parse defined parameter value string. + Specifies whether the report parameter value is a locale/format related string. + It is used to parse defined parameter value string. </description> </attribute> <attribute> @@ -1152,7 +1152,7 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies the title attribute of parameter control. + Specifies the title attribute of parameter control. </description> </attribute> <attribute> @@ -1160,7 +1160,7 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies the css class attribute of parameter control. + Specifies the css class attribute of parameter control. </description> </attribute> <attribute> @@ -1168,8 +1168,8 @@ under the License. <required>false</required> <rtexprvalue>true</rtexprvalue> <description> - Specifies the parameter control style. + Specifies the parameter control style. </description> </attribute> - </tag> + </tag> </taglib> \ No newline at end of file Modified: ofbiz/branches/multitenant20100310/framework/example/widget/example/FormWidgetExampleForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/example/widget/example/FormWidgetExampleForms.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/example/widget/example/FormWidgetExampleForms.xml (original) +++ ofbiz/branches/multitenant20100310/framework/example/widget/example/FormWidgetExampleForms.xml Wed Mar 24 09:23:07 2010 @@ -79,7 +79,7 @@ under the License. <field name="field4" title="${uiLabelMap.ExampleDateField4Title}" tooltip="${uiLabelMap.ExampleDateField4Tooltip}"> - <date-time input-method="time-dropdown" clock="24"/> + <date-time input-method="time-dropdown" clock="24" default-value="${exampleDateField}"/> </field> <!-- ***************** --> <!-- *** field5 *** --> @@ -87,7 +87,7 @@ under the License. <field name="field5" title="${uiLabelMap.ExampleDateField5Title}" tooltip="${uiLabelMap.ExampleDateField4Tooltip}"> - <date-time input-method="time-dropdown" clock="12"/> + <date-time input-method="time-dropdown" clock="12" default-value="${exampleDateField}"/> </field> <!-- ***************** --> <!-- *** field6 *** --> Modified: ofbiz/branches/multitenant20100310/framework/images/webapp/images/calendarDateSelect/format/format_iso_date.js URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/images/webapp/images/calendarDateSelect/format/format_iso_date.js?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/images/webapp/images/calendarDateSelect/format/format_iso_date.js (original) +++ ofbiz/branches/multitenant20100310/framework/images/webapp/images/calendarDateSelect/format/format_iso_date.js Wed Mar 24 09:23:07 2010 @@ -1,5 +1,5 @@ Date.prototype.toFormattedString = function(include_time) { - var hour; + var hour; var str = this.getFullYear() + "-" + Date.padded2(this.getMonth() + 1) + "-" +Date.padded2(this.getDate()); if (include_time) { hour = this.getHours(); Modified: ofbiz/branches/multitenant20100310/framework/images/webapp/images/dojo/src/widget/templates/Editor2/Dialog/createlink.html URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/images/webapp/images/dojo/src/widget/templates/Editor2/Dialog/createlink.html?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/images/webapp/images/dojo/src/widget/templates/Editor2/Dialog/createlink.html (original) +++ ofbiz/branches/multitenant20100310/framework/images/webapp/images/dojo/src/widget/templates/Editor2/Dialog/createlink.html Wed Mar 24 09:23:07 2010 @@ -1,5 +1,5 @@ <table> -<tr><td>URL</td><td> <input type="text" dojoAttachPoint="link_href" name="dojo_createLink_href"/></td></tr> +<tr><td>URL</td><td> <input type="text" dojoAttachPoint="link_href" name="dojo_createLink_href" /></td></tr> <tr><td>Target </td><td><select dojoAttachPoint="link_target"> <option value="">Self</option> <option value="_blank">New Window</option> @@ -12,4 +12,4 @@ <td><button dojoType='Button' dojoAttachEvent='onClick:cancel'>Cancel</button></td> </tr></table> </td></tr> -</table> \ No newline at end of file +</table> Modified: ofbiz/branches/multitenant20100310/framework/images/webapp/images/dojo/src/widget/templates/Editor2/Dialog/insertimage.html URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/images/webapp/images/dojo/src/widget/templates/Editor2/Dialog/insertimage.html?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/images/webapp/images/dojo/src/widget/templates/Editor2/Dialog/insertimage.html (original) +++ ofbiz/branches/multitenant20100310/framework/images/webapp/images/dojo/src/widget/templates/Editor2/Dialog/insertimage.html Wed Mar 24 09:23:07 2010 @@ -62,7 +62,7 @@ <td nowrap="nowrap"> <span >HSpace</span> </td> <td> - <input type="text" size="2" dojoAttachPoint="image_hspace"/></td> + <input type="text" size="2" dojoAttachPoint="image_hspace" /></td> </tr> <tr> <td nowrap="nowrap"> @@ -111,4 +111,4 @@ <td><button dojoType='Button' dojoAttachEvent='onClick:cancel'>Cancel</button></td> </tr></table> </td></tr> -</table> \ No newline at end of file +</table> Modified: ofbiz/branches/multitenant20100310/framework/images/webapp/images/dojo/src/widget/templates/Wizard.html URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/images/webapp/images/dojo/src/widget/templates/Wizard.html?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/images/webapp/images/dojo/src/widget/templates/Wizard.html (original) +++ ofbiz/branches/multitenant20100310/framework/images/webapp/images/dojo/src/widget/templates/Wizard.html Wed Mar 24 09:23:07 2010 @@ -2,9 +2,9 @@ <div class="WizardText" dojoAttachPoint="wizardPanelContainerNode"> </div> <div class="WizardButtonHolder" dojoAttachPoint="wizardControlContainerNode"> - <input class="WizardButton" type="button" dojoAttachPoint="previousButton"/> - <input class="WizardButton" type="button" dojoAttachPoint="nextButton"/> - <input class="WizardButton" type="button" dojoAttachPoint="doneButton" style="display:none"/> - <input class="WizardButton" type="button" dojoAttachPoint="cancelButton"/> + <input class="WizardButton" type="button" dojoAttachPoint="previousButton" /> + <input class="WizardButton" type="button" dojoAttachPoint="nextButton" /> + <input class="WizardButton" type="button" dojoAttachPoint="doneButton" style="display:none" /> + <input class="WizardButton" type="button" dojoAttachPoint="cancelButton" /> </div> </div> Modified: ofbiz/branches/multitenant20100310/framework/images/webapp/images/fieldlookup.js URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/images/webapp/images/fieldlookup.js?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/images/webapp/images/fieldlookup.js (original) +++ ofbiz/branches/multitenant20100310/framework/images/webapp/images/fieldlookup.js Wed Mar 24 09:23:07 2010 @@ -192,7 +192,7 @@ var FieldLookupPopup = Class.create({ CURRENT_LOOKUP.removeLayer(); } //fade the background if the flag is set - if (!fadeBackground != "false") { + if (fadeBackground != "false") { this.createFadedBackground(); } //set dimension isn't set, set default parameters Modified: ofbiz/branches/multitenant20100310/framework/images/webapp/images/selectall.js URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/images/webapp/images/selectall.js?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/images/webapp/images/selectall.js (original) +++ ofbiz/branches/multitenant20100310/framework/images/webapp/images/selectall.js Wed Mar 24 09:23:07 2010 @@ -313,7 +313,7 @@ function ajaxSubmitFormUpdateAreas(form, $('content-messages' ).update(data._ERROR_MESSAGE_LIST_ + " " + data._ERROR_MESSAGE_); new Effect.Appear('content-messages',{duration: 0.5}); }else { - if($('content-messages')) { + if($('content-messages')) { $('content-messages').removeClassName('errorMessage'); new Effect.Fade('content-messages',{duration: 0.0}); } @@ -333,15 +333,15 @@ function ajaxAutoCompleter(areaCsvString var areaArray = areaCsvString.split(","); var numAreas = parseInt(areaArray.length / 3); for (var i = 0; i < numAreas * 3; i = i + 3) { - var optionsDivId = areaArray[i] + "_autoCompleterOptions"; - var indicatorId = areaArray[i] + "_indicator"; - $(areaArray[i]).insert({after: '<div class="autocomplete"' + 'id=' + optionsDivId + '></div>'}); + var optionsDivId = areaArray[i] + "_autoCompleterOptions"; + var indicatorId = areaArray[i] + "_indicator"; + $(areaArray[i]).insert({after: '<div class="autocomplete"' + 'id=' + optionsDivId + '></div>'}); new Ajax.Autocompleter($(areaArray[i]), optionsDivId, areaArray[i + 1], {parameters: areaArray[i + 2], indicator: indicatorId, afterUpdateElement : getSelectionId}); } } function getSelectionId(text, li) { - text.value = li.id; + text.value = li.id; } /** Enable auto-completion for drop-down elements. Modified: ofbiz/branches/multitenant20100310/framework/minilang/documents/MiniLang.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/minilang/documents/MiniLang.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/minilang/documents/MiniLang.xml (original) +++ ofbiz/branches/multitenant20100310/framework/minilang/documents/MiniLang.xml Wed Mar 24 09:23:07 2010 @@ -18,11 +18,11 @@ under the License. --> <section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../applications/content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Entity Engine</title> - <para> - A description of the Mini Language guide can be found at the <link xl:href="http://cwiki.apache.org/confluence/display/OFBIZ/Mini-Language+Guide">OFBiz documentation site</link> - </para> + version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" + xsi:schemaLocation="http://docbook.org/ns/docbook ../../../applications/content/dtd/docbook.xsd" + xmlns="http://docbook.org/ns/docbook"> + <title>The Entity Engine</title> + <para> + A description of the Mini Language guide can be found at the <link xl:href="http://cwiki.apache.org/confluence/display/OFBIZ/Mini-Language+Guide">OFBiz documentation site</link> + </para> </section> Modified: ofbiz/branches/multitenant20100310/framework/service/documents/ServiceEngine.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/service/documents/ServiceEngine.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/service/documents/ServiceEngine.xml (original) +++ ofbiz/branches/multitenant20100310/framework/service/documents/ServiceEngine.xml Wed Mar 24 09:23:07 2010 @@ -18,10 +18,10 @@ under the License. --> <section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" - xsi:schemaLocation="http://docbook.org/ns/docbook ../../../applications/content/dtd/docbook.xsd" - xmlns="http://docbook.org/ns/docbook"> - <title>The Service Engine</title> + version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" + xsi:schemaLocation="http://docbook.org/ns/docbook ../../../applications/content/dtd/docbook.xsd" + xmlns="http://docbook.org/ns/docbook"> + <title>The Service Engine</title> <para> A description of the service engine can be found at the <link xl:href="http://cwiki.apache.org/confluence/display/OFBTECH/Service+Engine+Guide">OFBiz documentation site</link> </para> Modified: ofbiz/branches/multitenant20100310/framework/service/dtd/service-group.xsd URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/service/dtd/service-group.xsd?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/service/dtd/service-group.xsd (original) +++ ofbiz/branches/multitenant20100310/framework/service/dtd/service-group.xsd Wed Mar 24 09:23:07 2010 @@ -82,9 +82,9 @@ under the License. </xs:schema> <!-- <service-group> - <group name="testOne" send-mode="none"> - <invoke name="testScv" mode="async"/> - <invoke name="testScv" mode="sync"/> - </group> + <group name="testOne" send-mode="none"> + <invoke name="testScv" mode="async"/> + <invoke name="testScv" mode="sync"/> + </group> </service-group> --> Modified: ofbiz/branches/multitenant20100310/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java (original) +++ ofbiz/branches/multitenant20100310/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java Wed Mar 24 09:23:07 2010 @@ -20,6 +20,9 @@ package org.ofbiz.service.engine; import java.util.Map; +import org.codehaus.groovy.runtime.InvokerHelper; +import groovy.lang.Binding; +import groovy.lang.Script; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.GroovyUtil; import static org.ofbiz.base.util.UtilGenerics.cast; @@ -34,6 +37,8 @@ import org.ofbiz.service.ServiceUtil; */ public final class GroovyEngine extends GenericAsyncEngine { + protected static final Object[] EMPTY_ARGS = {}; + public GroovyEngine(ServiceDispatcher dispatcher) { super(dispatcher); } @@ -58,22 +63,23 @@ public final class GroovyEngine extends if (UtilValidate.isEmpty(modelService.location)) { throw new GenericServiceException("Cannot run Groovy service with empty location"); } - - String location = this.getLocation(modelService); context.put("dctx", dispatcher.getLocalContext(localName)); - try { - Object resultObj = GroovyUtil.runScriptAtLocation(location, context); - - if (resultObj != null && resultObj instanceof Map) { + Script script = InvokerHelper.createScript(GroovyUtil.getScriptClassFromLocation(this.getLocation(modelService)), new Binding(context)); + Object resultObj = null; + if (UtilValidate.isEmpty(modelService.invoke)) { + resultObj = script.run(); + } else { + resultObj = script.invokeMethod(modelService.invoke, EMPTY_ARGS); + } + if (resultObj != null && resultObj instanceof Map<?, ?>) { return cast(resultObj); - } else if (context.get("result") != null && context.get("result") instanceof Map) { + } else if (context.get("result") != null && context.get("result") instanceof Map<?, ?>) { return cast(context.get("result")); } } catch (GeneralException e) { throw new GenericServiceException(e); } - return ServiceUtil.returnSuccess(); } } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |