svn commit: r1652852 [1/22] - in /ofbiz/trunk: applications/content/src/org/o
Locked
svn commit: r1652852 [1/22] - in /ofbiz/trunk: applications/content/src/org/o
 
|
Author: adrianc
Date: Sun Jan 18 21:03:40 2015 New Revision: 1652852 URL: http://svn.apache.org/r1652852 Log: Reorganized the screen widget src folder so classes are more organized. This commit might break some Groovy scripts. There seemed to be a lot of C&P widget import statements, but there were no widget classes being used in the script, so I removed them. I might have overlooked something though. Added: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/content/ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/content/ContentWorkerInterface.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/content/DataResourceWorkerInterface.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/content/WidgetContentWorker.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/content/WidgetDataResourceWorker.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/AbstractModelAction.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/AbstractModelCondition.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/CommonWidgetModels.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/FieldInfo.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/FormFactory.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/HtmlWidget.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/IterateSectionWidget.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/MenuFactory.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelAction.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelActionVisitor.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelCondition.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelConditionFactory.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelConditionVisitor.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelFieldVisitor.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelForm.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelFormAction.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelFormField.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelFormFieldBuilder.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelMenu.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelMenuAction.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelMenuCondition.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelMenuItem.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelScreen.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelScreenCondition.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelScreenWidget.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelTree.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelTreeAction.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelTreeCondition.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelWidget.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelWidgetCondition.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelWidgetVisitor.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ScreenFactory.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/TreeFactory.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/XmlAbstractWidgetVisitor.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/XmlWidgetActionVisitor.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/XmlWidgetConditionVisitor.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/XmlWidgetFieldVisitor.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/XmlWidgetVisitor.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/portal/ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/portal/PortalPageWorker.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/portal/PortalPageWorkerInterface.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/portal/WidgetPortalPageWorker.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/FormRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/FormStringRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/MenuStringRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/MenuWrapTransform.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/Paginator.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/ScreenRenderException.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/ScreenRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/ScreenStringRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/TreeStringRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/UtilHelpText.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoFormRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoScreenRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/ScreenFopViewHandler.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlFormRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlFormWrapper.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlMenuRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlMenuRendererImage.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlMenuWrapper.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlMenuWrapperImage.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlScreenRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlTreeRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlWidgetRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroMenuRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroTreeRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/text/ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/text/TextFormRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/text/TextScreenRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/xml/ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/xml/XmlFormRenderer.java Removed: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/AbstractModelAction.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/AbstractModelCondition.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/CommonWidgetModels.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ContentWorkerInterface.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/DataResourceWorkerInterface.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelAction.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelActionVisitor.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelCondition.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelConditionFactory.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelConditionVisitor.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelFieldVisitor.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidget.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidgetCondition.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidgetVisitor.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/PortalPageWorker.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/PortalPageWorkerInterface.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetContentWorker.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetDataResourceWorker.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetPortalPageWorker.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/text/ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/xml/ Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java ofbiz/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ShowProductionRun.groovy ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderDeliveryScheduleInfo.groovy ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.groovy ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigOptions.groovy ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy ofbiz/trunk/framework/common/src/org/ofbiz/common/email/EmailServices.java ofbiz/trunk/framework/common/webcommon/WEB-INF/handlers-controller.xml ofbiz/trunk/framework/common/widget/PortalPageScreens.xml ofbiz/trunk/framework/resources/templates/web.xml ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/print/FoPrintServerEvents.java ofbiz/trunk/framework/widget/config/freemarkerTransforms.properties ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetFactory.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetWorker.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/artifact/ArtifactInfoGatherer.java ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/BirtFactory.java ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/email/BirtEmailServices.java ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/web.xml ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Mrv.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Search.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentAddPrep.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentPrep.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/CurrentValPrep.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/EditAddPrep.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/FormPrep.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/HtmlAreaPrep.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/NodeTrailPrep.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/OwnerContentPrep.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/PermPrep.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/PubInit.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/RespondPermAndPrep.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ResponsePrep.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ViewPrep.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/includes/MruAdd.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/example/src/org/ofbiz/example/ExamplePrintServices.java ofbiz/trunk/specialpurpose/googlecheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/WEB-INF/web.xml ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java ofbiz/trunk/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl ofbiz/trunk/themes/droppingcrumbs/includes/appbarClose.ftl ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl ofbiz/trunk/themes/tomahawk/includes/appbarOpen.ftl Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java Sun Jan 18 21:03:40 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/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java Sun Jan 18 21:03:40 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/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java Sun Jan 18 21:03:40 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/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java Sun Jan 18 21:03:40 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/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy (original) +++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy Sun Jan 18 21:03:40 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/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy Sun Jan 18 21:03:40 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/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy Sun Jan 18 21:03:40 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/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy Sun Jan 18 21:03:40 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/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy Sun Jan 18 21:03:40 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/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy Sun Jan 18 21:03:40 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/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy Sun Jan 18 21:03:40 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/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy Sun Jan 18 21:03:40 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/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ShowProductionRun.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ShowProductionRun.groovy?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ShowProductionRun.groovy (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ShowProductionRun.groovy Sun Jan 18 21:03:40 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/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderDeliveryScheduleInfo.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderDeliveryScheduleInfo.groovy?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderDeliveryScheduleInfo.groovy (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderDeliveryScheduleInfo.groovy Sun Jan 18 21:03:40 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/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy (original) +++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy Sun Jan 18 21:03:40 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 imageFilenameFormat = "configitems/${configItemId}"; Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.groovy?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.groovy (original) +++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.groovy Sun Jan 18 21:03:40 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/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigOptions.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigOptions.groovy?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigOptions.groovy (original) +++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigOptions.groovy Sun Jan 18 21:03:40 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/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy (original) +++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy Sun Jan 18 21:03:40 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/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy (original) +++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy Sun Jan 18 21:03:40 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/trunk/framework/common/src/org/ofbiz/common/email/EmailServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/email/EmailServices.java?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/email/EmailServices.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/email/EmailServices.java Sun Jan 18 21:03:40 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/trunk/framework/common/webcommon/WEB-INF/handlers-controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/handlers-controller.xml?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/WEB-INF/handlers-controller.xml (original) +++ ofbiz/trunk/framework/common/webcommon/WEB-INF/handlers-controller.xml Sun Jan 18 21:03:40 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/trunk/framework/common/widget/PortalPageScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageScreens.xml?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/PortalPageScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/PortalPageScreens.xml Sun Jan 18 21:03:40 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/trunk/framework/resources/templates/web.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/resources/templates/web.xml?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/framework/resources/templates/web.xml (original) +++ ofbiz/trunk/framework/resources/templates/web.xml Sun Jan 18 21:03:40 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/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java (original) +++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java Sun Jan 18 21:03:40 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.LocalDispatcher; @@ -57,10 +58,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/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java (original) +++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java Sun Jan 18 21:03:40 2015 @@ -33,7 +33,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.form.ModelForm; +import org.ofbiz.widget.model.ModelForm; import org.xml.sax.SAXException; /** Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java (original) +++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java Sun Jan 18 21:03:40 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/trunk/framework/webtools/src/org/ofbiz/webtools/print/FoPrintServerEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/print/FoPrintServerEvents.java?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/print/FoPrintServerEvents.java (original) +++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/print/FoPrintServerEvents.java Sun Jan 18 21:03:40 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/trunk/framework/widget/config/freemarkerTransforms.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/config/freemarkerTransforms.properties?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/config/freemarkerTransforms.properties (original) +++ ofbiz/trunk/framework/widget/config/freemarkerTransforms.properties Sun Jan 18 21:03:40 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/trunk/framework/widget/src/org/ofbiz/widget/WidgetFactory.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetFactory.java?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetFactory.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetFactory.java Sun Jan 18 21:03:40 2015 @@ -29,9 +29,9 @@ import java.util.concurrent.ConcurrentHa import org.ofbiz.base.util.Assert; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilGenerics; -import org.ofbiz.widget.screen.IterateSectionWidget; -import org.ofbiz.widget.screen.ModelScreen; -import org.ofbiz.widget.screen.ModelScreenWidget; +import org.ofbiz.widget.model.IterateSectionWidget; +import org.ofbiz.widget.model.ModelScreen; +import org.ofbiz.widget.model.ModelScreenWidget; import org.w3c.dom.Element; /** Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetWorker.java?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetWorker.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetWorker.java Sun Jan 18 21:03:40 2015 @@ -39,8 +39,8 @@ import org.ofbiz.webapp.control.ConfigXM import org.ofbiz.webapp.control.RequestHandler; import org.ofbiz.webapp.control.WebAppConfigurationException; import org.ofbiz.webapp.taglib.ContentUrlTag; -import org.ofbiz.widget.form.ModelForm; -import org.ofbiz.widget.form.ModelFormField; +import org.ofbiz.widget.model.ModelForm; +import org.ofbiz.widget.model.ModelFormField; public final class WidgetWorker { Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/artifact/ArtifactInfoGatherer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/artifact/ArtifactInfoGatherer.java?rev=1652852&r1=1652851&r2=1652852&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/artifact/ArtifactInfoGatherer.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/artifact/ArtifactInfoGatherer.java Sun Jan 18 21:03:40 2015 @@ -23,83 +23,83 @@ import java.util.Set; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.webapp.control.ConfigXMLReader; -import org.ofbiz.widget.AbstractModelAction.EntityAnd; -import org.ofbiz.widget.AbstractModelAction.EntityCondition; -import org.ofbiz.widget.AbstractModelAction.EntityOne; -import org.ofbiz.widget.AbstractModelAction.GetRelated; -import org.ofbiz.widget.AbstractModelAction.GetRelatedOne; -import org.ofbiz.widget.AbstractModelAction.PropertyMap; -import org.ofbiz.widget.AbstractModelAction.PropertyToField; -import org.ofbiz.widget.AbstractModelAction.Script; -import org.ofbiz.widget.AbstractModelAction.Service; -import org.ofbiz.widget.AbstractModelAction.SetField; -import org.ofbiz.widget.ModelAction; -import org.ofbiz.widget.ModelActionVisitor; -import org.ofbiz.widget.ModelFieldVisitor; -import org.ofbiz.widget.ModelWidgetVisitor; -import org.ofbiz.widget.form.FieldInfo; -import org.ofbiz.widget.form.ModelForm; -import org.ofbiz.widget.form.ModelForm.AltTarget; -import org.ofbiz.widget.form.ModelForm.AutoFieldsEntity; -import org.ofbiz.widget.form.ModelForm.AutoFieldsService; -import org.ofbiz.widget.form.ModelFormAction; -import org.ofbiz.widget.form.ModelFormAction.CallParentActions; -import org.ofbiz.widget.form.ModelFormField; -import org.ofbiz.widget.form.ModelFormField.CheckField; -import org.ofbiz.widget.form.ModelFormField.ContainerField; -import org.ofbiz.widget.form.ModelFormField.DateFindField; -import org.ofbiz.widget.form.ModelFormField.DateTimeField; -import org.ofbiz.widget.form.ModelFormField.DisplayEntityField; -import org.ofbiz.widget.form.ModelFormField.DisplayField; -import org.ofbiz.widget.form.ModelFormField.DropDownField; -import org.ofbiz.widget.form.ModelFormField.FieldInfoWithOptions; -import org.ofbiz.widget.form.ModelFormField.FileField; -import org.ofbiz.widget.form.ModelFormField.HiddenField; -import org.ofbiz.widget.form.ModelFormField.HyperlinkField; -import org.ofbiz.widget.form.ModelFormField.IgnoredField; -import org.ofbiz.widget.form.ModelFormField.ImageField; -import org.ofbiz.widget.form.ModelFormField.LookupField; -import org.ofbiz.widget.form.ModelFormField.PasswordField; -import org.ofbiz.widget.form.ModelFormField.RadioField; -import org.ofbiz.widget.form.ModelFormField.RangeFindField; -import org.ofbiz.widget.form.ModelFormField.ResetField; -import org.ofbiz.widget.form.ModelFormField.SubmitField; -import org.ofbiz.widget.form.ModelFormField.TextField; -import org.ofbiz.widget.form.ModelFormField.TextFindField; -import org.ofbiz.widget.form.ModelFormField.TextareaField; -import org.ofbiz.widget.menu.ModelMenu; -import org.ofbiz.widget.menu.ModelMenuAction; -import org.ofbiz.widget.menu.ModelMenuItem; -import org.ofbiz.widget.screen.HtmlWidget; -import org.ofbiz.widget.screen.HtmlWidget.HtmlTemplate; -import org.ofbiz.widget.screen.HtmlWidget.HtmlTemplateDecorator; -import org.ofbiz.widget.screen.HtmlWidget.HtmlTemplateDecoratorSection; -import org.ofbiz.widget.screen.IterateSectionWidget; -import org.ofbiz.widget.screen.ModelScreen; -import org.ofbiz.widget.screen.ModelScreenWidget; -import org.ofbiz.widget.screen.ModelScreenWidget.Column; -import org.ofbiz.widget.screen.ModelScreenWidget.ColumnContainer; -import org.ofbiz.widget.screen.ModelScreenWidget.Container; -import org.ofbiz.widget.screen.ModelScreenWidget.Content; -import org.ofbiz.widget.screen.ModelScreenWidget.DecoratorScreen; -import org.ofbiz.widget.screen.ModelScreenWidget.DecoratorSection; -import org.ofbiz.widget.screen.ModelScreenWidget.DecoratorSectionInclude; -import org.ofbiz.widget.screen.ModelScreenWidget.Form; -import org.ofbiz.widget.screen.ModelScreenWidget.HorizontalSeparator; -import org.ofbiz.widget.screen.ModelScreenWidget.ScreenImage; -import org.ofbiz.widget.screen.ModelScreenWidget.IncludeScreen; -import org.ofbiz.widget.screen.ModelScreenWidget.Label; -import org.ofbiz.widget.screen.ModelScreenWidget.ScreenLink; -import org.ofbiz.widget.screen.ModelScreenWidget.Menu; -import org.ofbiz.widget.screen.ModelScreenWidget.PlatformSpecific; -import org.ofbiz.widget.screen.ModelScreenWidget.PortalPage; -import org.ofbiz.widget.screen.ModelScreenWidget.Screenlet; -import org.ofbiz.widget.screen.ModelScreenWidget.Section; -import org.ofbiz.widget.screen.ModelScreenWidget.Tree; -import org.ofbiz.widget.tree.ModelTree; -import org.ofbiz.widget.tree.ModelTree.ModelNode; -import org.ofbiz.widget.tree.ModelTree.ModelNode.ModelSubNode; -import org.ofbiz.widget.tree.ModelTreeAction; +import org.ofbiz.widget.model.AbstractModelAction.EntityAnd; +import org.ofbiz.widget.model.AbstractModelAction.EntityCondition; +import org.ofbiz.widget.model.AbstractModelAction.EntityOne; +import org.ofbiz.widget.model.AbstractModelAction.GetRelated; +import org.ofbiz.widget.model.AbstractModelAction.GetRelatedOne; +import org.ofbiz.widget.model.AbstractModelAction.PropertyMap; +import org.ofbiz.widget.model.AbstractModelAction.PropertyToField; +import org.ofbiz.widget.model.AbstractModelAction.Script; +import org.ofbiz.widget.model.AbstractModelAction.Service; +import org.ofbiz.widget.model.AbstractModelAction.SetField; +import org.ofbiz.widget.model.FieldInfo; +import org.ofbiz.widget.model.HtmlWidget; +import org.ofbiz.widget.model.HtmlWidget.HtmlTemplate; +import org.ofbiz.widget.model.HtmlWidget.HtmlTemplateDecorator; +import org.ofbiz.widget.model.HtmlWidget.HtmlTemplateDecoratorSection; +import org.ofbiz.widget.model.IterateSectionWidget; +import org.ofbiz.widget.model.ModelAction; +import org.ofbiz.widget.model.ModelActionVisitor; +import org.ofbiz.widget.model.ModelFieldVisitor; +import org.ofbiz.widget.model.ModelForm; +import org.ofbiz.widget.model.ModelForm.AltTarget; +import org.ofbiz.widget.model.ModelForm.AutoFieldsEntity; +import org.ofbiz.widget.model.ModelForm.AutoFieldsService; +import org.ofbiz.widget.model.ModelFormAction; +import org.ofbiz.widget.model.ModelFormAction.CallParentActions; +import org.ofbiz.widget.model.ModelFormField; +import org.ofbiz.widget.model.ModelFormField.CheckField; +import org.ofbiz.widget.model.ModelFormField.ContainerField; +import org.ofbiz.widget.model.ModelFormField.DateFindField; +import org.ofbiz.widget.model.ModelFormField.DateTimeField; +import org.ofbiz.widget.model.ModelFormField.DisplayEntityField; +import org.ofbiz.widget.model.ModelFormField.DisplayField; +import org.ofbiz.widget.model.ModelFormField.DropDownField; +import org.ofbiz.widget.model.ModelFormField.FieldInfoWithOptions; +import org.ofbiz.widget.model.ModelFormField.FileField; +import org.ofbiz.widget.model.ModelFormField.HiddenField; +import org.ofbiz.widget.model.ModelFormField.HyperlinkField; +import org.ofbiz.widget.model.ModelFormField.IgnoredField; +import org.ofbiz.widget.model.ModelFormField.ImageField; +import org.ofbiz.widget.model.ModelFormField.LookupField; +import org.ofbiz.widget.model.ModelFormField.PasswordField; +import org.ofbiz.widget.model.ModelFormField.RadioField; +import org.ofbiz.widget.model.ModelFormField.RangeFindField; +import org.ofbiz.widget.model.ModelFormField.ResetField; +import org.ofbiz.widget.model.ModelFormField.SubmitField; +import org.ofbiz.widget.model.ModelFormField.TextField; +import org.ofbiz.widget.model.ModelFormField.TextFindField; +import org.ofbiz.widget.model.ModelFormField.TextareaField; +import org.ofbiz.widget.model.ModelMenu; +import org.ofbiz.widget.model.ModelMenuAction; +import org.ofbiz.widget.model.ModelMenuItem; +import org.ofbiz.widget.model.ModelScreen; +import org.ofbiz.widget.model.ModelScreenWidget; +import org.ofbiz.widget.model.ModelScreenWidget.Column; +import org.ofbiz.widget.model.ModelScreenWidget.ColumnContainer; +import org.ofbiz.widget.model.ModelScreenWidget.Container; +import org.ofbiz.widget.model.ModelScreenWidget.Content; +import org.ofbiz.widget.model.ModelScreenWidget.DecoratorScreen; +import org.ofbiz.widget.model.ModelScreenWidget.DecoratorSection; +import org.ofbiz.widget.model.ModelScreenWidget.DecoratorSectionInclude; +import org.ofbiz.widget.model.ModelScreenWidget.Form; +import org.ofbiz.widget.model.ModelScreenWidget.HorizontalSeparator; +import org.ofbiz.widget.model.ModelScreenWidget.IncludeScreen; +import org.ofbiz.widget.model.ModelScreenWidget.Label; +import org.ofbiz.widget.model.ModelScreenWidget.Menu; +import org.ofbiz.widget.model.ModelScreenWidget.PlatformSpecific; +import org.ofbiz.widget.model.ModelScreenWidget.PortalPage; +import org.ofbiz.widget.model.ModelScreenWidget.ScreenImage; +import org.ofbiz.widget.model.ModelScreenWidget.ScreenLink; +import org.ofbiz.widget.model.ModelScreenWidget.Screenlet; +import org.ofbiz.widget.model.ModelScreenWidget.Section; +import org.ofbiz.widget.model.ModelScreenWidget.Tree; +import org.ofbiz.widget.model.ModelTree; +import org.ofbiz.widget.model.ModelTree.ModelNode; +import org.ofbiz.widget.model.ModelTree.ModelNode.ModelSubNode; +import org.ofbiz.widget.model.ModelTreeAction; +import org.ofbiz.widget.model.ModelWidgetVisitor; /** * An object that gathers artifact information from screen widgets. Added: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/content/ContentWorkerInterface.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/content/ContentWorkerInterface.java?rev=1652852&view=auto ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/content/ContentWorkerInterface.java (added) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/content/ContentWorkerInterface.java Sun Jan 18 21:03:40 2015 @@ -0,0 +1,48 @@ +/******************************************************************************* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + *******************************************************************************/ +package org.ofbiz.widget.content; + +import java.io.IOException; +import java.util.List; +import java.util.Locale; +import java.util.Map; + +import org.ofbiz.base.util.GeneralException; +import org.ofbiz.entity.Delegator; +import org.ofbiz.entity.GenericEntityException; +import org.ofbiz.entity.GenericValue; +import org.ofbiz.service.LocalDispatcher; + +/** + * ContentWorkerInterface + */ +public interface ContentWorkerInterface { + + // helper methods + public GenericValue getCurrentContentExt(Delegator delegator, List<Map<String, ? extends Object>> trail, GenericValue userLogin, Map<String, Object> ctx, Boolean nullThruDatesOnly, String contentAssocPredicateId) throws GeneralException; + public GenericValue getWebSitePublishPointExt(Delegator delegator, String contentId, boolean ignoreCache) throws GenericEntityException; + public String getMimeTypeIdExt(Delegator delegator, GenericValue view, Map<String, Object> ctx); + + // new rendering methods + public void renderContentAsTextExt(LocalDispatcher dispatcher, Delegator delegator, String contentId, Appendable out, Map<String, Object> templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException; + public String renderContentAsTextExt(LocalDispatcher dispatcher, Delegator delegator, String contentId, Map<String, Object> templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException; + + public void renderSubContentAsTextExt(LocalDispatcher dispatcher, Delegator delegator, String contentId, Appendable out, String mapKey, Map<String, Object> templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException; + public String renderSubContentAsTextExt(LocalDispatcher dispatcher, Delegator delegator, String contentId, String mapKey, Map<String, Object> templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException; +} Added: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/content/DataResourceWorkerInterface.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/content/DataResourceWorkerInterface.java?rev=1652852&view=auto ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/content/DataResourceWorkerInterface.java (added) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/content/DataResourceWorkerInterface.java Sun Jan 18 21:03:40 2015 @@ -0,0 +1,37 @@ +/******************************************************************************* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + *******************************************************************************/ +package org.ofbiz.widget.content; + +import java.io.IOException; +import java.util.Locale; +import java.util.Map; + +import org.ofbiz.base.util.GeneralException; +import org.ofbiz.entity.Delegator; + +/** + * ContentWorkerInterface + */ +public interface DataResourceWorkerInterface { + public String renderDataResourceAsTextExt(Delegator delegator, String dataResourceId, Map<String, Object> templateContext, + Locale locale, String targetMimeTypeId, boolean cache) throws GeneralException, IOException; + + public void renderDataResourceAsTextExt(Delegator delegator, String dataResourceId, Appendable out, Map<String, Object> templateContext, + Locale locale, String targetMimeTypeId, boolean cache) throws GeneralException, IOException; +} Added: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/content/WidgetContentWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/content/WidgetContentWorker.java?rev=1652852&view=auto ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/content/WidgetContentWorker.java (added) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/content/WidgetContentWorker.java Sun Jan 18 21:03:40 2015 @@ -0,0 +1,42 @@ +/******************************************************************************* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + *******************************************************************************/ +package org.ofbiz.widget.content; + +import org.ofbiz.base.util.Debug; + +/** + * WidgetContentWorker Class + */ +public class WidgetContentWorker { + public static final String module = WidgetContentWorker.class.getName(); + public static ContentWorkerInterface contentWorker = null; + static { + try { + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + // note: loadClass is necessary for these since this class doesn't know anything about them at compile time + contentWorker = (ContentWorkerInterface) loader.loadClass("org.ofbiz.content.content.ContentWorker").newInstance(); + } catch (ClassNotFoundException e) { + Debug.logError(e, "Could not pre-initialize dynamically loaded class: ", module); + } catch (IllegalAccessException e) { + Debug.logError(e, "Could not pre-initialize dynamically loaded class: ", module); + } catch (InstantiationException e) { + Debug.logError(e, "Could not pre-initialize dynamically loaded class: ", module); + } + } +} Added: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/content/WidgetDataResourceWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/content/WidgetDataResourceWorker.java?rev=1652852&view=auto ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/content/WidgetDataResourceWorker.java (added) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/content/WidgetDataResourceWorker.java Sun Jan 18 21:03:40 2015 @@ -0,0 +1,42 @@ +/******************************************************************************* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + *******************************************************************************/ +package org.ofbiz.widget.content; + +import org.ofbiz.base.util.Debug; + +/** + * WidgetContentWorker Class + */ +public class WidgetDataResourceWorker { + public static final String module = WidgetDataResourceWorker.class.getName(); + public static DataResourceWorkerInterface dataresourceWorker = null; + static { + try { + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + // note: loadClass is necessary for these since this class doesn't know anything about them at compile time + dataresourceWorker = (DataResourceWorkerInterface) loader.loadClass("org.ofbiz.content.data.DataResourceWorker").newInstance(); + } catch (ClassNotFoundException e) { + Debug.logError(e, "Could not pre-initialize dynamically loaded class: ", module); + } catch (IllegalAccessException e) { + Debug.logError(e, "Could not pre-initialize dynamically loaded class: ", module); + } catch (InstantiationException e) { + Debug.logError(e, "Could not pre-initialize dynamically loaded class: ", module); + } + } +} |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |