svn commit: r688450 [3/3] - in /ofbiz/trunk/framework: bi/webapp/bi/WEB-INF/actions/r
Locked
svn commit: r688450 [3/3] - in /ofbiz/trunk/framework: bi/webapp/bi/WEB-INF/actions/r
 
|
Copied: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/stats/StatsSinceStart.groovy (from r688419, ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/stats/StatsSinceStart.bsh)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/stats/StatsSinceStart.groovy?p2=ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/stats/StatsSinceStart.groovy&p1=ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/stats/StatsSinceStart.bsh&r1=688419&r2=688450&rev=688450&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/stats/StatsSinceStart.bsh (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/stats/StatsSinceStart.groovy Sat Aug 23 22:36:54 2008 @@ -25,84 +25,79 @@ import javolution.util.FastList; import javolution.util.FastMap; -String clearBins = request.getParameter("clear"); -if (UtilValidate.isNotEmpty(clearBins) && "true".equals(clearBins)) { +clearBins = parameters.clear; +if ("true".equals(clearBins)) { ServerHitBin.requestSinceStarted.clear(); ServerHitBin.eventSinceStarted.clear(); ServerHitBin.viewSinceStarted.clear(); } // Requests -Iterator iterator = UtilMisc.toIterator(new TreeSet(ServerHitBin.requestSinceStarted.keySet())); -if(iterator != null && iterator.hasNext()){ - List requestList = FastList.newInstance(); - while(iterator.hasNext()){ - Map requestIdMap = FastMap.newInstance(); - String statsId = (String)iterator.next(); - ServerHitBin bin = (ServerHitBin) ServerHitBin.requestSinceStarted.get(statsId); - if (bin != null) { - requestIdMap.put("requestId", bin.getId()); - requestIdMap.put("requestType", bin.getType()); - requestIdMap.put("startTime", bin.getStartTimeString()); - requestIdMap.put("endTime", bin.getEndTimeString()); - requestIdMap.put("lengthMins", UtilFormatOut.formatQuantity(bin.getBinLengthMinutes())); - requestIdMap.put("numberHits", UtilFormatOut.formatQuantity(bin.getNumberHits())); - requestIdMap.put("minTime", UtilFormatOut.formatQuantity(bin.getMinTimeSeconds())); - requestIdMap.put("avgTime", UtilFormatOut.formatQuantity(bin.getAvgTimeSeconds())); - requestIdMap.put("maxTime", UtilFormatOut.formatQuantity(bin.getMaxTimeSeconds())); - requestIdMap.put("hitsPerMin", UtilFormatOut.formatQuantity(bin.getHitsPerMinute())); - requestList.add(requestIdMap); - } +iterator = UtilMisc.toIterator(new TreeSet(ServerHitBin.requestSinceStarted.keySet())); +requestList = FastList.newInstance(); +while (iterator.hasNext()) { + requestIdMap = FastMap.newInstance(); + statsId = iterator.next(); + bin = ServerHitBin.requestSinceStarted.get(statsId); + if (bin) { + requestIdMap.requestId = bin.getId(); + requestIdMap.requestType = bin.getType(); + requestIdMap.startTime = bin.getStartTimeString(); + requestIdMap.endTime = bin.getEndTimeString(); + requestIdMap.lengthMins = UtilFormatOut.formatQuantity(bin.getBinLengthMinutes()); + requestIdMap.numberHits = UtilFormatOut.formatQuantity(bin.getNumberHits()); + requestIdMap.minTime = UtilFormatOut.formatQuantity(bin.getMinTimeSeconds()); + requestIdMap.avgTime = UtilFormatOut.formatQuantity(bin.getAvgTimeSeconds()); + requestIdMap.maxTime = UtilFormatOut.formatQuantity(bin.getMaxTimeSeconds()); + requestIdMap.hitsPerMin = UtilFormatOut.formatQuantity(bin.getHitsPerMinute()); + requestList.add(requestIdMap); } - context.put("requestList", requestList); } +context.requestList = requestList; // Events iterator = UtilMisc.toIterator(new TreeSet(ServerHitBin.eventSinceStarted.keySet())); -if(iterator != null && iterator.hasNext()){ - List eventList = FastList.newInstance(); - while(iterator.hasNext()){ - Map requestIdMap = FastMap.newInstance(); - String statsId = (String)iterator.next(); - ServerHitBin bin = (ServerHitBin) ServerHitBin.requestSinceStarted.get(statsId); - if (bin != null) { - requestIdMap.put("requestId", bin.getId()); - requestIdMap.put("requestType", bin.getType()); - requestIdMap.put("startTime", bin.getStartTimeString()); - requestIdMap.put("endTime", bin.getEndTimeString()); - requestIdMap.put("lengthMins", UtilFormatOut.formatQuantity(bin.getBinLengthMinutes())); - requestIdMap.put("numberHits", UtilFormatOut.formatQuantity(bin.getNumberHits())); - requestIdMap.put("minTime", UtilFormatOut.formatQuantity(bin.getMinTimeSeconds())); - requestIdMap.put("avgTime", UtilFormatOut.formatQuantity(bin.getAvgTimeSeconds())); - requestIdMap.put("maxTime", UtilFormatOut.formatQuantity(bin.getMaxTimeSeconds())); - requestIdMap.put("hitsPerMin", UtilFormatOut.formatQuantity(bin.getHitsPerMinute())); - eventList.add(requestIdMap); - } +eventList = FastList.newInstance(); +while (iterator.hasNext()) { + requestIdMap = FastMap.newInstance(); + statsId = iterator.next(); + bin = ServerHitBin.requestSinceStarted.get(statsId); + if (bin) { + requestIdMap.requestId = bin.getId(); + requestIdMap.requestType = bin.getType(); + requestIdMap.startTime = bin.getStartTimeString(); + requestIdMap.endTime = bin.getEndTimeString(); + requestIdMap.lengthMins = UtilFormatOut.formatQuantity(bin.getBinLengthMinutes()); + requestIdMap.numberHits = UtilFormatOut.formatQuantity(bin.getNumberHits()); + requestIdMap.minTime = UtilFormatOut.formatQuantity(bin.getMinTimeSeconds()); + requestIdMap.avgTime = UtilFormatOut.formatQuantity(bin.getAvgTimeSeconds()); + requestIdMap.maxTime = UtilFormatOut.formatQuantity(bin.getMaxTimeSeconds()); + requestIdMap.hitsPerMin = UtilFormatOut.formatQuantity(bin.getHitsPerMinute()); + eventList.add(requestIdMap); } - context.put("eventList", eventList); } +context.eventList = eventList; + // Views iterator = UtilMisc.toIterator(new TreeSet(ServerHitBin.viewSinceStarted.keySet())); -if(iterator != null && iterator.hasNext()){ - List viewList = FastList.newInstance(); - while(iterator.hasNext()){ - Map requestIdMap = FastMap.newInstance(); - String statsId = (String)iterator.next(); - ServerHitBin bin = (ServerHitBin) ServerHitBin.requestSinceStarted.get(statsId); - if (bin != null) { - requestIdMap.put("requestId", bin.getId()); - requestIdMap.put("requestType", bin.getType()); - requestIdMap.put("startTime", bin.getStartTimeString()); - requestIdMap.put("endTime", bin.getEndTimeString()); - requestIdMap.put("lengthMins", UtilFormatOut.formatQuantity(bin.getBinLengthMinutes())); - requestIdMap.put("numberHits", UtilFormatOut.formatQuantity(bin.getNumberHits())); - requestIdMap.put("minTime", UtilFormatOut.formatQuantity(bin.getMinTimeSeconds())); - requestIdMap.put("avgTime", UtilFormatOut.formatQuantity(bin.getAvgTimeSeconds())); - requestIdMap.put("maxTime", UtilFormatOut.formatQuantity(bin.getMaxTimeSeconds())); - requestIdMap.put("hitsPerMin", UtilFormatOut.formatQuantity(bin.getHitsPerMinute())); - viewList.add(requestIdMap); - } +viewList = FastList.newInstance(); +while (iterator.hasNext()) { + requestIdMap = FastMap.newInstance(); + statsId = iterator.next(); + bin = ServerHitBin.requestSinceStarted.get(statsId); + if (bin) { + requestIdMap.requestId = bin.getId(); + requestIdMap.requestType = bin.getType(); + requestIdMap.startTime = bin.getStartTimeString(); + requestIdMap.endTime = bin.getEndTimeString(); + requestIdMap.lengthMins = UtilFormatOut.formatQuantity(bin.getBinLengthMinutes()); + requestIdMap.numberHits = UtilFormatOut.formatQuantity(bin.getNumberHits()); + requestIdMap.minTime = UtilFormatOut.formatQuantity(bin.getMinTimeSeconds()); + requestIdMap.avgTime = UtilFormatOut.formatQuantity(bin.getAvgTimeSeconds()); + requestIdMap.maxTime = UtilFormatOut.formatQuantity(bin.getMaxTimeSeconds()); + requestIdMap.hitsPerMin = UtilFormatOut.formatQuantity(bin.getHitsPerMinute()); + viewList.add(requestIdMap); } - context.put("viewList", viewList); } +context.viewList = viewList; Copied: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/workflow/ReadXpdl.groovy (from r688419, ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/workflow/readxpdl.bsh) URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/workflow/ReadXpdl.groovy?p2=ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/workflow/ReadXpdl.groovy&p1=ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/workflow/readxpdl.bsh&r1=688419&r2=688450&rev=688450&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/workflow/readxpdl.bsh (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/workflow/ReadXpdl.groovy Sat Aug 23 22:36:54 2008 @@ -28,47 +28,44 @@ import org.ofbiz.entity.condition.*; import org.ofbiz.entity.transaction.*; -List messages = new LinkedList(); - -String xpdlLoc = request.getParameter("XPDL_LOCATION"); -boolean xpdlIsUrl = request.getParameter("XPDL_IS_URL")!=null?true:false; -boolean xpdlImport = request.getParameter("XPDL_IMPORT")!=null?true:false; +messages = []; +xpdlLoc = parameters.XPDL_LOCATION; +xpdlIsUrl = parameters.XPDL_IS_URL != null; +xpdlImport = parameters.XPDL_IMPORT != null; + URL xpdlUrl = null; try { - xpdlUrl = xpdlIsUrl?new URL(xpdlLoc):UtilURL.fromFilename(xpdlLoc); -} -catch (java.net.MalformedURLException e) { + xpdlUrl = xpdlIsUrl ? new URL(xpdlLoc) : UtilURL.fromFilename(xpdlLoc); +} catch (java.net.MalformedURLException e) { messages.add(e.getMessage()); messages.add(e.toString()); Debug.log(e); } -if (xpdlUrl == null) { +if (!xpdlUrl) { messages.add("Could not find file/URL: " + xpdlLoc); } - -List toBeStored = null; + +toBeStored = null; try { - if (xpdlUrl != null) { + if (xpdlUrl) { toBeStored = XpdlReader.readXpdl(xpdlUrl, delegator); - context.put("toBeStored", toBeStored); + context.toBeStored = toBeStored; } -} -catch (Exception e) { +} catch (Exception e) { messages.add(e.getMessage()); messages.add(e.toString()); Debug.log(e); } - -if (toBeStored != null && xpdlImport) { - boolean beganTransaction = false; + +if (toBeStored && xpdlImport) { + beganTransaction = false; try { beganTransaction = TransactionUtil.begin(); delegator.storeAll(toBeStored); TransactionUtil.commit(beganTransaction); messages.add("Wrote/Updated " + toBeStored.size() + " toBeStored objects to the data source."); - } - catch (GenericEntityException e) { + } catch (GenericEntityException e) { TransactionUtil.rollback(beganTransaction, "Error storing data from XPDL file", e); messages.add(e.getMessage()); messages.add(e.toString()); @@ -76,4 +73,4 @@ } } -context.put("messages", messages); +context.messages = messages; Copied: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/workflow/WorkflowMonitor.groovy (from r688419, ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/workflow/workflowMonitor.bsh) URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/workflow/WorkflowMonitor.groovy?p2=ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/workflow/WorkflowMonitor.groovy&p1=ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/workflow/workflowMonitor.bsh&r1=688419&r2=688450&rev=688450&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/workflow/workflowMonitor.bsh (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/workflow/WorkflowMonitor.groovy Sat Aug 23 22:36:54 2008 @@ -27,19 +27,20 @@ import org.ofbiz.workflow.definition.*; import org.ofbiz.workflow.*; -String workflow = request.getParameter("workflow"); -GenericValue workflowDef = null; -if (workflow == null) { - List runningProcesses = delegator.findByAnd("WorkEffort", UtilMisc.toMap("workEffortTypeId", "WORK_FLOW", "currentStatusId", "WF_RUNNING")); - if (runningProcesses != null) - context.put("runningProcesses", runningProcesses); +workflow = parameters.workflow; +workflowDef = null; +if (!workflow) { + runningProcesses = delegator.findByAnd("WorkEffort", [workEffortTypeId : "WORK_FLOW", currentStatusId : "WF_RUNNING"]); + if (runningProcesses) { + context.runningProcesses = runningProcesses; + } } else { - workflowDef = delegator.findByPrimaryKey("WorkEffort", UtilMisc.toMap("workEffortId", workflow)); - if (workflowDef != null) { - context.put("workflow", workflowDef); - List activities = delegator.findByAnd("WorkEffort", UtilMisc.toMap("workEffortParentId", workflow)); - if (activities != null) { - context.put("activities", activities); - } - } + workflowDef = delegator.findByPrimaryKey("WorkEffort", [workEffortId : workflow]); + if (workflowDef) { + context.workflow = workflowDef; + activities = delegator.findByAnd("WorkEffort", [workEffortParentId : workflow]); + if (activities) { + context.activities = activities; + } + } } Modified: ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl?rev=688450&r1=688449&r2=688450&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl Sat Aug 23 22:36:54 2008 @@ -51,7 +51,7 @@ <form name="ArtifactInfoByNameAndType" method="post" action="<@ofbizUrl>ArtifactInfo</@ofbizUrl>" class="basic-form"> <div>Name: <input type="text" name="name" value="${parameters.name?if_exists}" size="40"/></div> <div>Location: <input type="text" name="location" value="${parameters.location?if_exists}" size="60"/></div> - <div> + <div>Type: <select name="type"> <option>entity</option> <option>service</option> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsrawdump.jsp URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsrawdump.jsp?rev=688450&r1=688449&r2=688450&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsrawdump.jsp (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsrawdump.jsp Sat Aug 23 22:36:54 2008 @@ -17,11 +17,11 @@ under the License. --%><%@ page import="java.io.*, java.util.*, java.net.*, org.w3c.dom.*, org.ofbiz.security.*, org.ofbiz.entity.*, org.ofbiz.entity.condition.*, org.ofbiz.entity.util.*, org.ofbiz.base.util.*, org.ofbiz.entity.model.*, org.ofbiz.entity.transaction.*" %><%@ taglib uri="ofbizTags" prefix="ofbiz" %><jsp:useBean id="security" type="org.ofbiz.security.Security" scope="request" /><jsp:useBean id="delegator" type="org.ofbiz.entity.GenericDelegator" scope="request" /><% if(security.hasPermission("ENTITY_MAINT", session)) { - String[] entityName = (String[]) session.getAttribute("xmlrawdump_entitylist"); + TreeSet passedEntityNames = (TreeSet) session.getAttribute("xmlrawdump_entitylist"); session.removeAttribute("xmlrawdump_entitylist"); EntityExpr entityDateCond = (EntityExpr) session.getAttribute("entityDateCond"); session.removeAttribute("entityDateCond"); - if (entityName != null) { + if (passedEntityNames != null) { ModelReader reader = delegator.getModelReader(); Collection ec = reader.getEntityNames(); @@ -33,12 +33,7 @@ response.setContentType("text/xml; charset=UTF-8"); //UtilXml.writeXmlDocument(, document); - if(entityName != null && entityName.length > 0) { - TreeSet passedEntityNames = new TreeSet(); - for(int inc=0; inc<entityName.length; inc++) { - passedEntityNames.add(entityName[inc]); - } - + if(passedEntityNames.size() > 0) { numberOfEntities = passedEntityNames.size(); PrintWriter writer = null; Modified: ofbiz/trunk/framework/webtools/widget/ArtifactInfoScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ArtifactInfoScreens.xml?rev=688450&r1=688449&r2=688450&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/ArtifactInfoScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/ArtifactInfoScreens.xml Sat Aug 23 22:36:54 2008 @@ -28,7 +28,7 @@ <actions> <set field="titleProperty" value="WebtoolsArtifactInfo"/> <set field="headerItem" value="ArtifactInfo"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ArtifactInfo.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ArtifactInfo.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/framework/webtools/widget/AvailableServicesScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/AvailableServicesScreens.xml?rev=688450&r1=688449&r2=688450&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/AvailableServicesScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/AvailableServicesScreens.xml Sat Aug 23 22:36:54 2008 @@ -26,7 +26,7 @@ <set field="titleProperty" value="WebtoolsServiceReference"/> <set field="appButtonItem" value="service"/> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/service/availableservices.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/framework/webtools/widget/CacheScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/CacheScreens.xml?rev=688450&r1=688449&r2=688450&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/CacheScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/CacheScreens.xml Sat Aug 23 22:36:54 2008 @@ -25,7 +25,7 @@ <actions> <set field="headerItem" value="cache"/> <set field="titleProperty" value="PageTitleFindUtilCache"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCache.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/cache/FindUtilCache.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -56,7 +56,7 @@ <actions> <set field="headerItem" value="cache"/> <set field="titleProperty" value="PageTitleFindUtilCacheElements"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCacheElements.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/cache/FindUtilCacheElements.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -87,7 +87,7 @@ <actions> <set field="headerItem" value="cache"/> <set field="titleProperty" value="PageTitleEditUtilCache"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/cache/editUtilCache.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/cache/EditUtilCache.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/framework/webtools/widget/EntityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/EntityScreens.xml?rev=688450&r1=688449&r2=688450&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/EntityScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/EntityScreens.xml Sat Aug 23 22:36:54 2008 @@ -33,7 +33,7 @@ <set field="rowLimit" from-field="parameters.rowLimit" type="Integer"/> <set field="parameters.TRANSACTION_TIMEOUT" value="7200"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/EntitySQLProcessor.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/EntitySQLProcessor.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -207,7 +207,7 @@ </condition> <actions> <set field="titleProperty" value="WebtoolsEntityDataMaintenance"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/EntityMaint.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/EntityMaint.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -277,7 +277,7 @@ <if-has-permission permission="ENTITY_MAINT"/> </condition> <actions> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/ViewRelations.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/ViewRelations.groovy"/> <property-map resource="WebtoolsUiLabels" map-name="uiLabelMap"/> <set field="title" value="${uiLabelMap.WebtoolsRelations}: ${entityName}"/> </actions> @@ -303,7 +303,7 @@ <actions> <property-map resource="WebtoolsUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="WebtoolsEntityReferenceChart"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/EntityRef.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/EntityRef.groovy"/> </actions> <widgets> <section> @@ -357,7 +357,7 @@ <actions> <property-map resource="WebtoolsUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="WebtoolsEntityReference"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/EntityRefList.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/EntityRefList.groovy"/> </actions> <widgets> <section> @@ -419,7 +419,7 @@ <actions> <property-map resource="WebtoolsUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="WebtoolsCheckUpdateDatabase"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/CheckDb.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/CheckDb.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -453,7 +453,7 @@ <actions> <set field="headerItem" value="main"/> <set field="titleProperty" value="WebtoolsPerformanceTests"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/EntityPerformanceTest.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/EntityPerformanceTest.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -472,7 +472,7 @@ <property-map resource="WebtoolsUiLabels" map-name="uiLabelMap" global="true"/> <set field="headerItem" value="main"/> <set field="titleProperty" value="PageTitleEntityExport"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/xmldsdump.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/XmlDsDump.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/framework/webtools/widget/LogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/LogScreens.xml?rev=688450&r1=688449&r2=688450&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/LogScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/LogScreens.xml Sat Aug 23 22:36:54 2008 @@ -51,7 +51,7 @@ <actions> <set field="titleProperty" value="PageTitleLogConfiguration"/> <set field="logMenuItem" value="logConfiguration"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/log/LogConfiguration.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/log/LogConfiguration.groovy"/> </actions> <widgets> <decorator-screen name="log-decorator"> @@ -112,7 +112,7 @@ <!-- TODO: the following command is not really working (and the default value is always used); my guess is that the base/config/debug.properties file is not found in the classpath --> <property-to-field resource="debug" property="log4j.appender.css.File" field="logFileName" default="runtime/logs/ofbiz.html" no-locale="true"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/log/LogView.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/log/LogView.groovy"/> </actions> <widgets> <decorator-screen name="log-decorator"> Modified: ofbiz/trunk/framework/webtools/widget/MiscScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/MiscScreens.xml?rev=688450&r1=688449&r2=688450&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/MiscScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/MiscScreens.xml Sat Aug 23 22:36:54 2008 @@ -41,7 +41,7 @@ <actions> <set field="headerItem" value="main"/> <set field="titleProperty" value="WebtoolsEditCustomTimePeriods"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/period/EditCustomTimePeriod.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/period/EditCustomTimePeriod.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -75,7 +75,7 @@ <actions> <set field="headerItem" value="main"/> <set field="titleProperty" value="WebtoolsReadXPDLFile"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/workflow/readxpdl.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/workflow/ReadXpdl.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -109,7 +109,7 @@ <actions> <set field="headerItem" value="main"/> <set field="titleProperty" value="WebtoolsActiveWorkflowMonitor"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/workflow/workflowMonitor.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/workflow/WorkflowMonitor.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml?rev=688450&r1=688449&r2=688450&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml Sat Aug 23 22:36:54 2008 @@ -57,7 +57,7 @@ <actions> <set field="titleProperty" value="PageTitleServiceList"/> <set field="tabButtonItem" value="ServiceList"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/service/services.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/service/Services.groovy"/> </actions> <widgets> <decorator-screen name="CommonServiceDecorator"> @@ -112,7 +112,7 @@ <actions> <set field="titleProperty" value="PageTitleThreadList"/> <set field="tabButtonItem" value="ThreadList"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/service/threads.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/service/Threads.groovy"/> </actions> <widgets> <decorator-screen name="CommonServiceDecorator"> @@ -130,7 +130,7 @@ <actions> <set field="titleProperty" value="PageTitleScheduleJob"/> <set field="tabButtonItem" value="ScheduleJob"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/service/scheduleJob.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/service/ScheduleJob.groovy"/> </actions> <widgets> <decorator-screen name="CommonServiceDecorator"> @@ -160,7 +160,7 @@ <actions> <set field="titleProperty" value="PageTitleRunService"/> <set field="tabButtonItem" value="RunService"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/service/scheduleJob.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/service/ScheduleJob.groovy"/> </actions> <widgets> <decorator-screen name="CommonServiceDecorator"> @@ -183,7 +183,7 @@ <actions> <set field="titleProperty" value="PageTitleScheduleJob"/> <set field="tabButtonItem" value="ScheduleJob"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/service/scheduleJob.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/service/ScheduleJob.groovy"/> </actions> <widgets> <decorator-screen name="CommonServiceDecorator"> @@ -209,7 +209,7 @@ <set field="titleProperty" value="PageTitleScheduleJob"/> <set field="headerItem" value="services"/> <set field="tabButtonItem" value="ScheduleJob"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/service/scheduleJob.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/service/ScheduleJob.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -235,7 +235,7 @@ <set field="titleProperty" value="PageTitleScheduleJob"/> <set field="headerItem" value="services"/> <set field="tabButtonItem" value="ScheduleJob"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/service/serviceResult.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/service/ServiceResult.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/framework/webtools/widget/StatsScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/StatsScreens.xml?rev=688450&r1=688449&r2=688450&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/StatsScreens.xml (original) +++ ofbiz/trunk/framework/webtools/widget/StatsScreens.xml Sat Aug 23 22:36:54 2008 @@ -26,7 +26,7 @@ <actions> <set field="titleProperty" value="WebtoolsStatsMainPageTitle"/> <set field="headerItem" value="stats"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/stats/StatsSinceStart.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/stats/StatsSinceStart.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -51,7 +51,7 @@ <actions> <set field="titleProperty" value="WebtoolsStatsMainPageTitle"/> <set field="headerItem" value="stats"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/stats/StatBinsHistory.bsh"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/stats/StatBinsHistory.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |