Re: svn commit: r1662488 [1/6] - in /ofbiz/branches/release14.12: applications/content/src/org/o
Locked
Re: svn commit: r1662488 [1/6] - in /ofbiz/branches/release14.12: applications/content/src/org/o
 
Administrator
|
I love how this was done :/
Jacques Le 26/02/2015 17:16, [hidden email] a écrit : > Author: adrianc > Date: Thu Feb 26 16:16:11 2015 > New Revision: 1662488 > > URL: http://svn.apache.org/r1662488 > Log: > Backported screen widget refactor from trunk. This refactor fixes numerous thread-safety issues and data integrity bugs. > > Added: > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/content/ > - copied from r1652852, ofbiz/trunk/framework/widget/src/org/ofbiz/widget/content/ > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/model/ > - copied from r1652852, ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/model/GridFactory.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/model/ModelGrid.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/model/ModelSingleForm.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/portal/ > - copied from r1652852, ofbiz/trunk/framework/widget/src/org/ofbiz/widget/portal/ > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/renderer/ > - copied from r1652852, ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/ > Removed: > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/ContentWorkerInterface.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/DataResourceWorkerInterface.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/ModelActionVisitor.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/ModelFieldVisitor.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/ModelWidget.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/ModelWidgetCondition.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/ModelWidgetVisitor.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/PortalPageWorker.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/PortalPageWorkerInterface.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/WidgetContentWorker.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/WidgetDataResourceWorker.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/WidgetPortalPageWorker.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/fo/ > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/form/ > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/html/ > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/menu/ > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/screen/ > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/text/ > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/tree/ > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/xml/ > Modified: > ofbiz/branches/release14.12/applications/content/src/org/ofbiz/content/cms/CmsEvents.java > ofbiz/branches/release14.12/applications/content/src/org/ofbiz/content/content/ContentWorker.java > ofbiz/branches/release14.12/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java > ofbiz/branches/release14.12/applications/content/src/org/ofbiz/content/output/OutputServices.java > ofbiz/branches/release14.12/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy > ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy > ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy > ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy > ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy > ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy > ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy > ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy > ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/jobshopmgt/ShowProductionRun.groovy > ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderDeliveryScheduleInfo.groovy > ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy > ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.groovy > ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigOptions.groovy > ofbiz/branches/release14.12/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy > ofbiz/branches/release14.12/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy > ofbiz/branches/release14.12/framework/common/src/org/ofbiz/common/email/EmailServices.java > ofbiz/branches/release14.12/framework/common/webcommon/WEB-INF/handlers-controller.xml > ofbiz/branches/release14.12/framework/common/widget/PortalPageScreens.xml > ofbiz/branches/release14.12/framework/resources/templates/web.xml > ofbiz/branches/release14.12/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java > ofbiz/branches/release14.12/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java > ofbiz/branches/release14.12/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java > ofbiz/branches/release14.12/framework/webtools/src/org/ofbiz/webtools/print/FoPrintServerEvents.java > ofbiz/branches/release14.12/framework/widget/config/conditional.xml > ofbiz/branches/release14.12/framework/widget/config/freemarkerTransforms.properties > ofbiz/branches/release14.12/framework/widget/dtd/widget-common.xsd > ofbiz/branches/release14.12/framework/widget/dtd/widget-form.xsd > ofbiz/branches/release14.12/framework/widget/dtd/widget-menu.xsd > ofbiz/branches/release14.12/framework/widget/dtd/widget-screen.xsd > ofbiz/branches/release14.12/framework/widget/dtd/widget-tree.xsd > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/WidgetFactory.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/WidgetWorker.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/artifact/ArtifactInfoGatherer.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/model/CommonWidgetModels.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/model/FormFactory.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/model/ModelForm.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/model/ModelFormField.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/model/ModelMenuItem.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/model/ModelScreenWidget.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/model/ModelWidgetVisitor.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/model/XmlWidgetFieldVisitor.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/model/XmlWidgetVisitor.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/renderer/FormRenderer.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/renderer/FormStringRenderer.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlScreenRenderer.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenRenderer.java > ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java > ofbiz/branches/release14.12/framework/widget/templates/htmlFormMacroLibrary.ftl > ofbiz/branches/release14.12/specialpurpose/birt/src/org/ofbiz/birt/BirtFactory.java > ofbiz/branches/release14.12/specialpurpose/birt/src/org/ofbiz/birt/email/BirtEmailServices.java > ofbiz/branches/release14.12/specialpurpose/birt/webapp/birt/WEB-INF/web.xml > ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Mrv.groovy > ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Search.groovy > ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentAddPrep.groovy > ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentPrep.groovy > ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/CurrentValPrep.groovy > ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/EditAddPrep.groovy > ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/FormPrep.groovy > ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/HtmlAreaPrep.groovy > ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/NodeTrailPrep.groovy > ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/OwnerContentPrep.groovy > ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/PermPrep.groovy > ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/PubInit.groovy > ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/RespondPermAndPrep.groovy > ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ResponsePrep.groovy > ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ViewPrep.groovy > ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/includes/MruAdd.groovy > ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml > ofbiz/branches/release14.12/specialpurpose/example/src/org/ofbiz/example/ExamplePrintServices.java > ofbiz/branches/release14.12/specialpurpose/googlecheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml > ofbiz/branches/release14.12/specialpurpose/googlecheckout/webapp/googlecheckout/WEB-INF/web.xml > ofbiz/branches/release14.12/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java > ofbiz/branches/release14.12/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java > ofbiz/branches/release14.12/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml > ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml > ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml > ofbiz/branches/release14.12/themes/bluelight/includes/appbarOpen.ftl > ofbiz/branches/release14.12/themes/droppingcrumbs/includes/appbarClose.ftl > ofbiz/branches/release14.12/themes/droppingcrumbs/includes/appbarOpen.ftl > ofbiz/branches/release14.12/themes/tomahawk/includes/appbarClose.ftl > ofbiz/branches/release14.12/themes/tomahawk/includes/appbarOpen.ftl > > Modified: ofbiz/branches/release14.12/applications/content/src/org/ofbiz/content/cms/CmsEvents.java > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/content/src/org/ofbiz/content/cms/CmsEvents.java?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/applications/content/src/org/ofbiz/content/cms/CmsEvents.java (original) > +++ ofbiz/branches/release14.12/applications/content/src/org/ofbiz/content/cms/CmsEvents.java Thu Feb 26 16:16:11 2015 > @@ -47,9 +47,9 @@ import org.ofbiz.entity.util.EntityUtilP > import org.ofbiz.service.LocalDispatcher; > import org.ofbiz.webapp.control.RequestHandler; > import org.ofbiz.webapp.website.WebSiteWorker; > -import org.ofbiz.widget.form.FormStringRenderer; > -import org.ofbiz.widget.form.MacroFormRenderer; > -import org.ofbiz.widget.screen.ScreenRenderer; > +import org.ofbiz.widget.renderer.FormStringRenderer; > +import org.ofbiz.widget.renderer.ScreenRenderer; > +import org.ofbiz.widget.renderer.macro.MacroFormRenderer; > > import freemarker.template.TemplateException; > > > Modified: ofbiz/branches/release14.12/applications/content/src/org/ofbiz/content/content/ContentWorker.java > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original) > +++ ofbiz/branches/release14.12/applications/content/src/org/ofbiz/content/content/ContentWorker.java Thu Feb 26 16:16:11 2015 > @@ -69,7 +69,7 @@ import freemarker.ext.dom.NodeModel; > /** > * ContentWorker Class > */ > -public class ContentWorker implements org.ofbiz.widget.ContentWorkerInterface { > +public class ContentWorker implements org.ofbiz.widget.content.ContentWorkerInterface { > > public static final String module = ContentWorker.class.getName(); > > > Modified: ofbiz/branches/release14.12/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java (original) > +++ ofbiz/branches/release14.12/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java Thu Feb 26 16:16:11 2015 > @@ -76,11 +76,11 @@ import org.ofbiz.entity.util.EntityQuery > import org.ofbiz.entity.util.EntityUtilProperties; > import org.ofbiz.service.GenericServiceException; > import org.ofbiz.service.LocalDispatcher; > -import org.ofbiz.widget.screen.MacroScreenRenderer; > -import org.ofbiz.widget.screen.ModelScreen; > -import org.ofbiz.widget.screen.ScreenFactory; > -import org.ofbiz.widget.screen.ScreenRenderer; > -import org.ofbiz.widget.screen.ScreenStringRenderer; > +import org.ofbiz.widget.model.ModelScreen; > +import org.ofbiz.widget.model.ScreenFactory; > +import org.ofbiz.widget.renderer.ScreenRenderer; > +import org.ofbiz.widget.renderer.ScreenStringRenderer; > +import org.ofbiz.widget.renderer.macro.MacroScreenRenderer; > import org.w3c.dom.Document; > import org.xml.sax.SAXException; > > @@ -90,7 +90,7 @@ import freemarker.template.TemplateExcep > /** > * DataResourceWorker Class > */ > -public class DataResourceWorker implements org.ofbiz.widget.DataResourceWorkerInterface { > +public class DataResourceWorker implements org.ofbiz.widget.content.DataResourceWorkerInterface { > > public static final String module = DataResourceWorker.class.getName(); > public static final String err_resource = "ContentErrorUiLabels"; > > Modified: ofbiz/branches/release14.12/applications/content/src/org/ofbiz/content/output/OutputServices.java > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/content/src/org/ofbiz/content/output/OutputServices.java?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/applications/content/src/org/ofbiz/content/output/OutputServices.java (original) > +++ ofbiz/branches/release14.12/applications/content/src/org/ofbiz/content/output/OutputServices.java Thu Feb 26 16:16:11 2015 > @@ -63,9 +63,9 @@ import org.ofbiz.entity.util.EntityUtilP > import org.ofbiz.service.DispatchContext; > import org.ofbiz.service.ServiceUtil; > import org.ofbiz.webapp.view.ApacheFopWorker; > -import org.ofbiz.widget.fo.FoFormRenderer; > -import org.ofbiz.widget.fo.FoScreenRenderer; > -import org.ofbiz.widget.screen.ScreenRenderer; > +import org.ofbiz.widget.renderer.fo.FoFormRenderer; > +import org.ofbiz.widget.renderer.fo.FoScreenRenderer; > +import org.ofbiz.widget.renderer.ScreenRenderer; > > > /** > > Modified: ofbiz/branches/release14.12/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy (original) > +++ ofbiz/branches/release14.12/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy Thu Feb 26 16:16:11 2015 > @@ -20,7 +20,7 @@ > import org.ofbiz.entity.* > import org.ofbiz.entity.condition.* > import org.ofbiz.base.util.* > -import org.ofbiz.widget.html.* > +import org.ofbiz.widget.renderer.html.* > > surveyQuestionId = parameters.surveyQuestionId; > context.surveyQuestionId = surveyQuestionId; > > Modified: ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy (original) > +++ ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy Thu Feb 26 16:16:11 2015 > @@ -17,7 +17,7 @@ > * under the License. > */ > > -import org.ofbiz.widget.html.HtmlFormWrapper; > +import org.ofbiz.widget.renderer.html.HtmlFormWrapper; > > productionRunId = parameters.productionRunId ?: parameters.workEffortId; > > > Modified: ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy (original) > +++ ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy Thu Feb 26 16:16:11 2015 > @@ -17,7 +17,7 @@ > * under the License. > */ > > -import org.ofbiz.widget.html.HtmlFormWrapper; > +import org.ofbiz.widget.renderer.html.HtmlFormWrapper; > > productionRunId = parameters.productionRunId ?: parameters.workEffortId; > > > Modified: ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy (original) > +++ ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy Thu Feb 26 16:16:11 2015 > @@ -18,7 +18,7 @@ > */ > > import org.ofbiz.entity.util.EntityUtil; > -import org.ofbiz.widget.html.HtmlFormWrapper; > +import org.ofbiz.widget.renderer.html.HtmlFormWrapper; > > productionRunId = parameters.productionRunId ?: parameters.workEffortId; > taskCosts = []; > > Modified: ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy (original) > +++ ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy Thu Feb 26 16:16:11 2015 > @@ -22,7 +22,7 @@ > > import org.ofbiz.entity.util.EntityUtil; > import org.ofbiz.entity.GenericValue; > -import org.ofbiz.widget.html.HtmlFormWrapper; > +import org.ofbiz.widget.renderer.html.HtmlFormWrapper; > import org.ofbiz.manufacturing.jobshopmgt.ProductionRun; > > import javolution.util.FastList; > > Modified: ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy (original) > +++ ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy Thu Feb 26 16:16:11 2015 > @@ -17,7 +17,7 @@ > * under the License. > */ > > -import org.ofbiz.widget.html.HtmlFormWrapper; > +import org.ofbiz.widget.renderer.html.HtmlFormWrapper; > > productionRunId = parameters.productionRunId ?: parameters.workEffortId; > > > Modified: ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy (original) > +++ ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy Thu Feb 26 16:16:11 2015 > @@ -21,7 +21,7 @@ > import java.util.*; > import org.ofbiz.base.util.*; > import org.ofbiz.entity.*; > -import org.ofbiz.widget.html.*; > +import org.ofbiz.widget.renderer.html.HtmlFormWrapper; > > if (security.hasEntityPermission("MANUFACTURING", "_VIEW", session)) { > context.hasPermission = Boolean.TRUE; > > Modified: ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy (original) > +++ ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy Thu Feb 26 16:16:11 2015 > @@ -18,7 +18,7 @@ > */ > > > -import org.ofbiz.widget.html.HtmlFormWrapper; > +import org.ofbiz.widget.renderer.html.HtmlFormWrapper; > import org.ofbiz.base.util.*; > > if (security.hasEntityPermission("MANUFACTURING", "_VIEW", session)) { > > Modified: ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/jobshopmgt/ShowProductionRun.groovy > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/jobshopmgt/ShowProductionRun.groovy?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/jobshopmgt/ShowProductionRun.groovy (original) > +++ ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/jobshopmgt/ShowProductionRun.groovy Thu Feb 26 16:16:11 2015 > @@ -25,7 +25,7 @@ import org.ofbiz.entity.util.EntityUtil; > import org.ofbiz.base.util.*; > import org.ofbiz.base.util.Debug; > import org.ofbiz.base.util.UtilValidate; > -import org.ofbiz.widget.html.HtmlFormWrapper; > +import org.ofbiz.widget.renderer.html.HtmlFormWrapper; > import org.ofbiz.manufacturing.jobshopmgt.ProductionRun; > > delegator = request.getAttribute("delegator"); > > Modified: ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderDeliveryScheduleInfo.groovy > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderDeliveryScheduleInfo.groovy?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderDeliveryScheduleInfo.groovy (original) > +++ ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderDeliveryScheduleInfo.groovy Thu Feb 26 16:16:11 2015 > @@ -19,7 +19,7 @@ > > import org.ofbiz.base.util.*; > import org.ofbiz.entity.*; > -import org.ofbiz.widget.html.*; > +import org.ofbiz.widget.renderer.html.HtmlFormWrapper; > > orderId = request.getParameter("orderId"); > orderTypeId = null; > > Modified: ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy (original) > +++ ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy Thu Feb 26 16:16:11 2015 > @@ -21,7 +21,7 @@ import org.ofbiz.base.util.* > import org.ofbiz.base.util.string.* > import org.ofbiz.entity.* > import org.ofbiz.entity.util.EntityUtilProperties; > -import org.ofbiz.widget.html.* > +import org.ofbiz.widget.renderer.html.HtmlFormWrapper; > > // make the image file formats > context.tenantId = delegator.getDelegatorTenantId(); > > Modified: ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.groovy > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.groovy?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.groovy (original) > +++ ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.groovy Thu Feb 26 16:16:11 2015 > @@ -20,7 +20,7 @@ > import org.ofbiz.entity.*; > import org.ofbiz.entity.util.*; > import org.ofbiz.base.util.*; > -import org.ofbiz.widget.html.*; > +import org.ofbiz.widget.renderer.html.HtmlFormWrapper; > > contentId = request.getParameter("contentId") ?: null; > > > Modified: ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigOptions.groovy > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigOptions.groovy?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigOptions.groovy (original) > +++ ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigOptions.groovy Thu Feb 26 16:16:11 2015 > @@ -17,7 +17,7 @@ > * under the License. > */ > > -import org.ofbiz.widget.html.* > +import org.ofbiz.widget.renderer.html.HtmlFormWrapper > > createConfigOptionWrapper = new HtmlFormWrapper("component://product/widget/catalog/ConfigForms.xml", "CreateConfigOption", request, response); > createConfigOptionWrapper.putInContext("configItemId", configItemId); > > Modified: ofbiz/branches/release14.12/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy (original) > +++ ofbiz/branches/release14.12/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy Thu Feb 26 16:16:11 2015 > @@ -18,7 +18,7 @@ > */ > > import org.ofbiz.entity.condition.* > -import org.ofbiz.widget.html.HtmlFormWrapper > +import org.ofbiz.widget.renderer.html.HtmlFormWrapper > > shipmentId = parameters.shipmentId; > shipment = from("Shipment").where("shipmentId", shipmentId).queryOne(); > > Modified: ofbiz/branches/release14.12/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy (original) > +++ ofbiz/branches/release14.12/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy Thu Feb 26 16:16:11 2015 > @@ -17,7 +17,7 @@ > * under the License. > */ > > -import org.ofbiz.widget.html.*; > +import org.ofbiz.widget.renderer.html.HtmlFormWrapper; > import org.ofbiz.entity.condition.EntityCondition; > > shipmentId = request.getParameter("shipmentId"); > > Modified: ofbiz/branches/release14.12/framework/common/src/org/ofbiz/common/email/EmailServices.java > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/common/src/org/ofbiz/common/email/EmailServices.java?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/framework/common/src/org/ofbiz/common/email/EmailServices.java (original) > +++ ofbiz/branches/release14.12/framework/common/src/org/ofbiz/common/email/EmailServices.java Thu Feb 26 16:16:11 2015 > @@ -73,9 +73,9 @@ import org.ofbiz.service.LocalDispatcher > import org.ofbiz.service.ServiceUtil; > import org.ofbiz.service.mail.MimeMessageWrapper; > import org.ofbiz.webapp.view.ApacheFopWorker; > -import org.ofbiz.widget.fo.FoScreenRenderer; > -import org.ofbiz.widget.html.HtmlScreenRenderer; > -import org.ofbiz.widget.screen.ScreenRenderer; > +import org.ofbiz.widget.renderer.fo.FoScreenRenderer; > +import org.ofbiz.widget.renderer.html.HtmlScreenRenderer; > +import org.ofbiz.widget.renderer.ScreenRenderer; > import org.xml.sax.SAXException; > > import com.sun.mail.smtp.SMTPAddressFailedException; > > Modified: ofbiz/branches/release14.12/framework/common/webcommon/WEB-INF/handlers-controller.xml > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/common/webcommon/WEB-INF/handlers-controller.xml?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/framework/common/webcommon/WEB-INF/handlers-controller.xml (original) > +++ ofbiz/branches/release14.12/framework/common/webcommon/WEB-INF/handlers-controller.xml Thu Feb 26 16:16:11 2015 > @@ -35,11 +35,11 @@ under the License. > <handler name="script" type="request" class="org.ofbiz.webapp.event.ScriptEventHandler"/> > > <!-- view handlers --> > - <handler name="screen" type="view" class="org.ofbiz.widget.screen.MacroScreenViewHandler"/> > - <handler name="screenxml" type="view" class="org.ofbiz.widget.screen.MacroScreenViewHandler"/> > - <handler name="screentext" type="view" class="org.ofbiz.widget.screen.MacroScreenViewHandler"/> > - <handler name="screencsv" type="view" class="org.ofbiz.widget.screen.MacroScreenViewHandler"/> > - <handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopViewHandler"/> > + <handler name="screen" type="view" class="org.ofbiz.widget.renderer.macro.MacroScreenViewHandler"/> > + <handler name="screenxml" type="view" class="org.ofbiz.widget.renderer.macro.MacroScreenViewHandler"/> > + <handler name="screentext" type="view" class="org.ofbiz.widget.renderer.macro.MacroScreenViewHandler"/> > + <handler name="screencsv" type="view" class="org.ofbiz.widget.renderer.macro.MacroScreenViewHandler"/> > + <handler name="screenfop" type="view" class="org.ofbiz.widget.renderer.fo.ScreenFopViewHandler"/> > <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/> > <handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/> > </site-conf> > > Modified: ofbiz/branches/release14.12/framework/common/widget/PortalPageScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/common/widget/PortalPageScreens.xml?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/framework/common/widget/PortalPageScreens.xml (original) > +++ ofbiz/branches/release14.12/framework/common/widget/PortalPageScreens.xml Thu Feb 26 16:16:11 2015 > @@ -94,7 +94,7 @@ under the License. > <set field="layoutSettings.javaScripts[]" value="/images/myportal.js" global="true"/> > <set field="layoutSettings.styleSheets[+0]" value="/images/myportal.css" global="true"/> > <entity-one entity-name="PortalPage" value-field="portalPage"/> > - <set field="portalPages" value="${groovy:org.ofbiz.widget.PortalPageWorker.getPortalPages(parameters.parentPortalPageId,context)}"/> > + <set field="portalPages" value="${groovy:org.ofbiz.widget.portal.PortalPageWorker.getPortalPages(parameters.parentPortalPageId,context)}"/> > </actions> > <widgets> > <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > > Modified: ofbiz/branches/release14.12/framework/resources/templates/web.xml > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/resources/templates/web.xml?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/framework/resources/templates/web.xml (original) > +++ ofbiz/branches/release14.12/framework/resources/templates/web.xml Thu Feb 26 16:16:11 2015 > @@ -26,7 +26,7 @@ > <context-param> > <param-name>widgetVerbose</param-name> > <param-value>false</param-value> > - <description>Enable widget boundary comments. See org.ofbiz.widget.ModelWidget.widgetBoundaryCommentsEnabled().</description> > + <description>Enable widget boundary comments. See org.ofbiz.widget.model.ModelWidget.widgetBoundaryCommentsEnabled().</description> > </context-param> > --> > <context-param> > > Modified: ofbiz/branches/release14.12/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java (original) > +++ ofbiz/branches/release14.12/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java Thu Feb 26 16:16:11 2015 > @@ -42,12 +42,13 @@ import org.ofbiz.base.util.FileUtil; > import org.ofbiz.base.util.GeneralException; > import org.ofbiz.base.util.UtilValidate; > import org.ofbiz.base.util.cache.UtilCache; > +import org.ofbiz.entity.Delegator; > +import org.ofbiz.entity.DelegatorFactory; > import org.ofbiz.entity.GenericEntityException; > import org.ofbiz.entity.config.model.DelegatorElement; > import org.ofbiz.entity.config.model.EntityConfig; > import org.ofbiz.entity.model.ModelEntity; > import org.ofbiz.entity.model.ModelReader; > -import org.ofbiz.entity.*; > import org.ofbiz.service.DispatchContext; > import org.ofbiz.service.GenericServiceException; > import org.ofbiz.service.ModelService; > @@ -55,10 +56,10 @@ import org.ofbiz.service.eca.ServiceEcaR > import org.ofbiz.webapp.control.ConfigXMLReader; > import org.ofbiz.webapp.control.ConfigXMLReader.ControllerConfig; > import org.ofbiz.webapp.control.WebAppConfigurationException; > -import org.ofbiz.widget.form.FormFactory; > -import org.ofbiz.widget.form.ModelForm; > -import org.ofbiz.widget.screen.ModelScreen; > -import org.ofbiz.widget.screen.ScreenFactory; > +import org.ofbiz.widget.model.FormFactory; > +import org.ofbiz.widget.model.ModelForm; > +import org.ofbiz.widget.model.ModelScreen; > +import org.ofbiz.widget.model.ScreenFactory; > import org.xml.sax.SAXException; > > public class ArtifactInfoFactory { > > Modified: ofbiz/branches/release14.12/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java (original) > +++ ofbiz/branches/release14.12/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java Thu Feb 26 16:16:11 2015 > @@ -33,7 +33,9 @@ import org.ofbiz.base.util.UtilMisc; > import org.ofbiz.base.util.UtilURL; > import org.ofbiz.widget.artifact.ArtifactInfoContext; > import org.ofbiz.widget.artifact.ArtifactInfoGatherer; > -import org.ofbiz.widget.form.ModelForm; > +import org.ofbiz.widget.model.ModelForm; > +import org.ofbiz.widget.model.ModelGrid; > +import org.ofbiz.widget.model.ModelSingleForm; > import org.xml.sax.SAXException; > > /** > @@ -73,7 +75,11 @@ public class FormWidgetArtifactInfo exte > ArtifactInfoContext infoContext = new ArtifactInfoContext(); > ArtifactInfoGatherer infoGatherer = new ArtifactInfoGatherer(infoContext); > try { > - infoGatherer.visit(this.modelForm); > + if (this.modelForm instanceof ModelSingleForm) { > + infoGatherer.visit((ModelSingleForm) this.modelForm); > + } else { > + infoGatherer.visit((ModelGrid) this.modelForm); > + } > } catch (Exception e) { > throw new GeneralException(e); > } > > Modified: ofbiz/branches/release14.12/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java (original) > +++ ofbiz/branches/release14.12/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java Thu Feb 26 16:16:11 2015 > @@ -35,7 +35,7 @@ import org.ofbiz.base.util.UtilMisc; > import org.ofbiz.base.util.UtilURL; > import org.ofbiz.widget.artifact.ArtifactInfoContext; > import org.ofbiz.widget.artifact.ArtifactInfoGatherer; > -import org.ofbiz.widget.screen.ModelScreen; > +import org.ofbiz.widget.model.ModelScreen; > import org.xml.sax.SAXException; > > /** > > Modified: ofbiz/branches/release14.12/framework/webtools/src/org/ofbiz/webtools/print/FoPrintServerEvents.java > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/webtools/src/org/ofbiz/webtools/print/FoPrintServerEvents.java?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/framework/webtools/src/org/ofbiz/webtools/print/FoPrintServerEvents.java (original) > +++ ofbiz/branches/release14.12/framework/webtools/src/org/ofbiz/webtools/print/FoPrintServerEvents.java Thu Feb 26 16:16:11 2015 > @@ -36,8 +36,8 @@ import org.ofbiz.base.util.Debug; > import org.ofbiz.base.util.UtilValidate; > import org.ofbiz.entity.GenericValue; > import org.ofbiz.entity.GenericEntityException; > -import org.ofbiz.widget.screen.ScreenRenderer; > -import org.ofbiz.widget.html.HtmlScreenRenderer; > +import org.ofbiz.widget.renderer.ScreenRenderer; > +import org.ofbiz.widget.renderer.html.HtmlScreenRenderer; > > /** > * FoPrintServerEvents > > Modified: ofbiz/branches/release14.12/framework/widget/config/conditional.xml > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/widget/config/conditional.xml?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/framework/widget/config/conditional.xml (original) > +++ ofbiz/branches/release14.12/framework/widget/config/conditional.xml Thu Feb 26 16:16:11 2015 > @@ -17,7 +17,7 @@ > specific language governing permissions and limitations > under the License. > --> > -<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> > +<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd"> > <property key="begins_with"> > <value xml:lang="ar">Ùبدأ ب</value> > <value xml:lang="cs">ZaÄÃná</value> > > Modified: ofbiz/branches/release14.12/framework/widget/config/freemarkerTransforms.properties > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/widget/config/freemarkerTransforms.properties?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/framework/widget/config/freemarkerTransforms.properties (original) > +++ ofbiz/branches/release14.12/framework/widget/config/freemarkerTransforms.properties Thu Feb 26 16:16:11 2015 > @@ -21,4 +21,4 @@ > > # entries are in the form: key=transform name, property=transform class name > > -menuWrap=org.ofbiz.widget.menu.MenuWrapTransform > +menuWrap=org.ofbiz.widget.renderer.MenuWrapTransform > > Modified: ofbiz/branches/release14.12/framework/widget/dtd/widget-common.xsd > URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/widget/dtd/widget-common.xsd?rev=1662488&r1=1662487&r2=1662488&view=diff > ============================================================================== > --- ofbiz/branches/release14.12/framework/widget/dtd/widget-common.xsd (original) > +++ ofbiz/branches/release14.12/framework/widget/dtd/widget-common.xsd Thu Feb 26 16:16:11 2015 > @@ -239,4 +239,431 @@ under the License. > <xs:attribute type="xs:string" name="field" use="required" /> > </xs:complexType> > </xs:element> > + > + <xs:element name="AllActions" abstract="true" /> > + <xs:element name="set" substitutionGroup="AllActions"> > + <xs:complexType> > + <xs:attribute type="xs:string" name="field" use="required" /> > + <xs:attribute type="xs:string" name="from-field" /> > + <xs:attribute type="xs:string" name="value" /> > + <xs:attribute type="xs:string" name="default-value" /> > + <xs:attribute name="global" default="false"> > + <xs:simpleType> > + <xs:restriction base="xs:token"> > + <xs:enumeration value="true" /> > + <xs:enumeration value="false" /> > + </xs:restriction> > + </xs:simpleType> > + </xs:attribute> > + <xs:attribute name="type"> > + <xs:simpleType> > + <xs:restriction base="xs:token"> > + <xs:enumeration value="PlainString" /> > + <xs:enumeration value="String" /> > + <xs:enumeration value="BigDecimal" /> > + <xs:enumeration value="Double" /> > + <xs:enumeration value="Float" /> > + <xs:enumeration value="List" /> > + <xs:enumeration value="Long" /> > + <xs:enumeration value="Integer" /> > + <xs:enumeration value="Date" /> > + <xs:enumeration value="Time" /> > + <xs:enumeration value="Timestamp" /> > + <xs:enumeration value="Boolean" /> > + <xs:enumeration value="Object" /> > + <xs:enumeration value="NewList" /> > + <xs:enumeration value="NewMap" /> > + </xs:restriction> > + </xs:simpleType> > + </xs:attribute> > + <xs:attribute name="to-scope" default="screen"> > + <xs:simpleType> > + <xs:restriction base="xs:token"> > + <xs:enumeration value="screen" /> > + <xs:enumeration value="user" /> > + <xs:enumeration value="application" /> > + </xs:restriction> > + </xs:simpleType> > + </xs:attribute> > + <xs:attribute name="from-scope" default="screen"> > + <xs:simpleType> > + <xs:restriction base="xs:token"> > + <xs:enumeration value="screen" /> > + <xs:enumeration value="user" /> > + <xs:enumeration value="application" /> > + </xs:restriction> > + </xs:simpleType> > + </xs:attribute> > + </xs:complexType> > + </xs:element> > + <xs:element name="property-map" substitutionGroup="AllActions"> > + <xs:complexType> > + <xs:attribute type="xs:string" name="resource" use="required" /> > + <xs:attribute type="xs:string" name="map-name" use="required" /> > + <xs:attribute name="global" default="false"> > + <xs:simpleType> > + <xs:restriction base="xs:token"> > + <xs:enumeration value="true" /> > + <xs:enumeration value="false" /> > + </xs:restriction> > + </xs:simpleType> > + </xs:attribute> > + </xs:complexType> > + </xs:element> > + <xs:element name="property-to-field" substitutionGroup="AllActions"> > + <xs:complexType> > + <xs:attribute type="xs:string" name="resource" use="required" /> > + <xs:attribute type="xs:string" name="property" use="required" /> > + <xs:attribute type="xs:string" name="field" use="required" /> > + <xs:attribute type="xs:string" name="default" /> > + <xs:attribute name="no-locale" default="false"> > + <xs:simpleType> > + <xs:restriction base="xs:token"> > + <xs:enumeration value="true" /> > + <xs:enumeration value="false" /> > + </xs:restriction> > + </xs:simpleType> > + </xs:attribute> > + <xs:attribute type="xs:string" name="arg-list-name" /> > + </xs:complexType> > + </xs:element> > + <xs:element name="script" substitutionGroup="AllActions"> > + <xs:complexType> > + <xs:attribute type="xs:string" name="location" use="required" /> > + </xs:complexType> > + </xs:element> > + <xs:element name="entity-one" substitutionGroup="AllActions"> > + <xs:complexType> > + <xs:sequence> > + <xs:element minOccurs="0" maxOccurs="unbounded" ref="field-map" /> > + <xs:element minOccurs="0" maxOccurs="unbounded" ref="select-field" /> > + </xs:sequence> > + <xs:attribute name="entity-name" type="xs:string" use="required" /> > + <xs:attribute name="value-field" type="xs:string" use="required" /> > + <xs:attribute name="use-cache" default="false"> > + <xs:simpleType> > + <xs:restriction base="xs:token"> > + <xs:enumeration value="true" /> > + <xs:enumeration value="false" /> > + </xs:restriction> > + </xs:simpleType> > + </xs:attribute> > + <xs:attribute name="auto-field-map" default="true"> > + <xs:simpleType> > + <xs:restriction base="xs:token"> > + <xs:enumeration value="true" /> > + <xs:enumeration value="false" /> > + </xs:restriction> > + </xs:simpleType> > + </xs:attribute> > + </xs:complexType> > + </xs:element> > + <xs:element name="get-related-one" substitutionGroup="AllActions"> > + <xs:complexType> > + <xs:attribute name="value-field" type="xs:string" use="required" /> > + <xs:attribute name="relation-name" type="xs:string" use="required" /> > + <xs:attribute name="use-cache" type="xs:string" default="false" /> > + <xs:attribute name="to-value-field" type="xs:string" use="required" /> > + </xs:complexType> > + </xs:element> > + <xs:element name="get-related" substitutionGroup="AllActions"> > + <xs:complexType> > + <xs:attribute type="xs:string" name="value-field" use="required" /> > + <xs:attribute type="xs:string" name="relation-name" use="required" /> > + <xs:attribute type="xs:string" name="map" /> > + <xs:attribute type="xs:string" name="order-by-list" /> > + <xs:attribute type="xs:string" name="use-cache" default="false" /> > + <xs:attribute type="xs:string" name="list" use="required" /> > + </xs:complexType> > + </xs:element> > + <xs:element name="condition-list"> > + <xs:complexType> > + <xs:choice maxOccurs="unbounded"> > + <xs:element ref="condition-expr" /> > + <xs:element ref="condition-list" /> > + <xs:element ref="condition-object" /> > + </xs:choice> > + <xs:attribute name="combine" default="and"> > + <xs:simpleType> > + <xs:restriction base="xs:token"> > + <xs:enumeration value="and" /> > + <xs:enumeration value="or" /> > + </xs:restriction> > + </xs:simpleType> > + </xs:attribute> > + </xs:complexType> > + </xs:element> > + <xs:element name="having-condition-list"> > + <xs:complexType> > + <xs:choice maxOccurs="unbounded"> > + <xs:element ref="condition-expr" /> > + <xs:element ref="condition-list" /> > + <xs:element ref="condition-object" /> > + </xs:choice> > + <xs:attribute name="combine" default="and"> > + <xs:simpleType> > + <xs:restriction base="xs:token"> > + <xs:enumeration value="and" /> > + <xs:enumeration value="or" /> > + </xs:restriction> > + </xs:simpleType> > + </xs:attribute> > + </xs:complexType> > + </xs:element> > + <xs:element name="condition-expr"> > + <xs:complexType> > + <xs:attribute type="xs:string" name="field-name" use="required" /> > + <xs:attribute name="operator" default="equals"> > + <xs:simpleType> > + <xs:restriction base="xs:token"> > + <xs:enumeration value="less" /> > + <xs:enumeration value="greater" /> > + <xs:enumeration value="less-equals" /> > + <xs:enumeration value="greater-equals" /> > + <xs:enumeration value="equals" /> > + <xs:enumeration value="not-equals" /> > + <xs:enumeration value="in" /> > + <xs:enumeration value="not-in" /> > + <xs:enumeration value="between" /> > + <xs:enumeration value="like" /> > + </xs:restriction> > + </xs:simpleType> > + </xs:attribute> > + <xs:attribute type="xs:string" name="from-field" /> > + <xs:attribute type="xs:string" name="value" /> > + <xs:attribute name="ignore-if-null" default="false"> > + <xs:simpleType> > + <xs:restriction base="xs:token"> > + <xs:enumeration value="true" /> > + <xs:enumeration value="false" /> > + </xs:restriction> > + </xs:simpleType> > + </xs:attribute> > + <xs:attribute name="ignore-if-empty" default="false"> > + <xs:simpleType> > + <xs:restriction base="xs:token"> > + <xs:enumeration value="true" /> > + <xs:enumeration value="false" /> > + </xs:restriction> > + </xs:simpleType> > + </xs:attribute> > + <xs:attribute name="ignore-case" default="false"> > + <xs:simpleType> > + <xs:restriction base="xs:token"> > + <xs:enumeration value="true" /> > + <xs:enumeration value="false" /> > + </xs:restriction> > + </xs:simpleType> > + </xs:attribute> > + <xs:attribute name="ignore" default="false"> > + <xs:annotation> > + <xs:documentation> > + Ignore the condition if flag is true. > + Defaults to false. > + </xs:documentation> > + </xs:annotation> > + </xs:attribute> > + </xs:complexType> > + </xs:element> > + <xs:element name="condition-object"> > + <xs:complexType> > + <xs:attribute type="xs:string" name="field" use="required" /> > + </xs:complexType> > + </xs:element> > + <xs:element name="select-field"> > + <xs:complexType> > + <xs:attribute type="xs:string" name="field-name" use="required" /> > + </xs:complexType> > + </xs:element> > + <xs:element name="order-by"> > + <xs:complexType> > + <xs:attribute type="xs:string" name="field-name" use="required" /> > + </xs:complexType> > + </xs:element> > + <xs:element name="limit-range"> > + <xs:complexType> > + <xs:attribute name="start" type="xs:string" use="required"> > + <xs:annotation> > + <xs:documentation>Should resolve into a non-negative integer.</xs:documentation> > + </xs:annotation> > + </xs:attribute> > + <xs:attribute name="size" type="xs:string" use="required"> > + <xs:annotation> > + <xs:documentation>Should resolve into a non-negative integer.</xs:documentation> > + </xs:annotation> > + </xs:attribute> > + </xs:complexType> > + </xs:element> > + <xs:element name="limit-view"> > + <xs:complexType> > + <xs:attribute name="view-index" type="xs:string" use="required"> > + <xs:annotation> > + <xs:documentation>Should resolve into a non-negative integer.</xs:documentation> > + </xs:annotation> > + </xs:attribute> > + <xs:attribute name="view-size" type="xs:string" use="required"> > + <xs:annotation> > + <xs:documentation>Should resolve into a positive integer.</xs:documentation> > + </xs:annotation> > + </xs:attribute> > + </xs:complexType> > + </xs:element> > + <xs:element name="use-iterator" /> > + <xs:element name="field-map"> > + <xs:complexType> > + <xs:attribute type="xs:string" name="field-name" use="required" /> > + <xs:attribute type="xs:string" name="from-field" /> > + <xs:attribute type="xs:string" name="value" /> > + </xs:complexType> > + </xs:element> > + <xs:element name="parameter"> > + <xs:complexType> > + <xs:attribute type="xs:string" name="param-name" use="required" /> > + <xs:attribute type="xs:string" name="from-field" /> > + <xs:attribute type="xs:string" name="value" /> > + </xs:complexType> > + </xs:element> > + <xs:element name="auto-parameters-service"> > + <xs:complexType> > + <xs:sequence> > + <xs:element minOccurs="0" maxOccurs="unbounded" ref="exclude" /> > + </xs:sequence> > + <xs:attribute name="service-name" type="xs:string"> > + <xs:annotation> > + <xs:documentation>The service name used to resolve parameters. If empty, use form defaultServiceName. Flexible string allowed.</xs:documentation> > + </xs:annotation> > + </xs:attribute> > + <xs:attribute name="send-if-empty" default="true"> > + <xs:simpleType> > + <xs:restriction base="xs:token"> > + <xs:enumeration value="true" /> > + <xs:enumeration value="false" /> > + </xs:restriction> > + </xs:simpleType> > + </xs:attribute> > + </xs:complexType> > + </xs:element> > + <xs:element name="auto-parameters-entity"> > + <xs:complexType> > + <xs:sequence> > + <xs:element minOccurs="0" maxOccurs="unbounded" ref="exclude" /> > + </xs:sequence> > + <xs:attribute name="entity-name" type="xs:string"> > + <xs:annotation> > + <xs:documentation>The entity name used to resolve parameters. If empty use form defaultEntityName attribute. Flexible string allowed.</xs:documentation> > + </xs:annotation> > + </xs:attribute> > + <xs:attribute name="include" default="pk"> > + <xs:simpleType> > + <xs:restriction base="xs:token"> > + <xs:enumeration value="pk" /> > + <xs:enumeration value="nonpk" /> > + <xs:enumeration value="all" /> > + </xs:restriction> > + </xs:simpleType> > + </xs:attribute> > + <xs:attribute name="send-if-empty" default="true"> > + <xs:simpleType> > + <xs:restriction base="xs:token"> > + <xs:enumeration value="true" /> > + <xs:enumeration value="false" /> > + </xs:restriction> > + </xs:simpleType> > + </xs:attribute> > + </xs:complexType> > + </xs:element> > + <xs:element name="exclude"> > + <xs:complexType> > + <xs:attribute name="field-name" type="xs:string" use="required" /> > + </xs:complexType> > + </xs:element> > + <xs:complexType name="link"> > + <xs:sequence> > + <xs:element minOccurs="0" maxOccurs="unbounded" ref="parameter" /> > + <xs:element minOccurs="0" name="image" type="image" /> > + </xs:sequence> > + <xs:attribute type="xs:string" name="text" /> > + <xs:attribute type="xs:string" name="id" /> > + <xs:attribute type="xs:string" name="style" /> > + <xs:attribute type="xs:string" name="name" /> > + <xs:attribute type="xs:string" name="title" /> > + <xs:attribute type="xs:nonNegativeInteger" name="size" /><!-- Text size limit --> > + <xs:attribute type="xs:string" name="target" /> > + <xs:attribute type="xs:string" name="target-window" /> > + <xs:attribute type="xs:string" name="prefix" /> > + <xs:attribute type="xs:string" name="width" /> > + <xs:attribute type="xs:string" name="height" /> > + <xs:attribute name="link-type" default="auto"> > + <xs:simpleType> > + <xs:restriction base="xs:token"> > + <xs:enumeration value="auto"> > + <xs:annotation> > + <xs:documentation> > + If selected the hidden-form type will be used if the url-mode is intra-app > + and the request specified has an event, otherwise the anchor type will be used, > + except if the ajax-window mode is specified. > + </xs:documentation> > + </xs:annotation> > + </xs:enumeration> > + <xs:enumeration value="anchor" /> > + <xs:enumeration value="hidden-form" /> > + <!-- FIXME: This is not a link type. It indicates the target window should be a popup dialog. --> > + <xs:enumeration value="ajax-window" /> > + </xs:restriction> > + </xs:simpleType> > + </xs:attribute> > + <xs:attribute name="url-mode" default="intra-app"> > + <xs:simpleType> > + <xs:restriction base="xs:token"> > + <xs:enumeration value="intra-app" /> > + <xs:enumeration value="inter-app" /> > + <xs:enumeration value="content" /> > + <xs:enumeration value="plain" /> > + </xs:restriction> > + </xs:simpleType> > + </xs:attribute> > + <xs:attribute name="full-path" default="false"> > + <xs:simpleType> > + <xs:restriction base="xs:token"> > + <xs:enumeration value="true" /> > + <xs:enumeration value="false" /> > + </xs:restriction> > + </xs:simpleType> > + </xs:attribute> > + <xs:attribute name="secure" default="false"> > + <xs:simpleType> > + <xs:restriction base="xs:token"> > + <xs:enumeration value="true" /> > + <xs:enumeration value="false" /> > + </xs:restriction> > + </xs:simpleType> > + </xs:attribute> > + <xs:attribute name="encode" default="false"> > + <xs:simpleType> > + <xs:restriction base="xs:token"> > + <xs:enumeration value="true" /> > + <xs:enumeration value="false" /> > + </xs:restriction> > + </xs:simpleType> > + </xs:attribute> > + </xs:complexType> > + <xs:complexType name="image" mixed="true"> > + <xs:attribute type="xs:string" name="src" /> > + <xs:attribute type="xs:string" name="id" /> > + <xs:attribute type="xs:string" name="style" /> > + <xs:attribute type="xs:string" name="width" /> > + <xs:attribute type="xs:string" name="height" /> > + <xs:attribute type="xs:string" name="border" /> > + <xs:attribute type="xs:string" name="alt" /> > + <xs:attribute type="xs:string" name="title" /> > + <xs:attribute name="url-mode" default="content"> > + <xs:simpleType> > + <xs:restriction base="xs:token"> > + <xs:enumeration value="ofbiz" /> > + <xs:enumeration value="content" /> > + <xs:enumeration value="raw" /> > + </xs:restriction> > + </xs:simpleType> > + </xs:attribute> > + </xs:complexType> > </xs:schema> > > > |
«
Return to OFBiz - Dev
|
1 view|%1 views
| Free forum by Nabble | Edit this page |