svn commit: r522793 [2/4] - in /ofbiz/trunk/framework/webtool
Locked
svn commit: r522793 [2/4] - in /ofbiz/trunk/framework/webtool
 
|
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl?view=diff&rev=522793&r1=522792&r2=522793 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl Tue Mar 27 00:04:31 2007 @@ -17,55 +17,57 @@ under the License. --> -<div class="head1">${uiLabelMap.PageTitleFindUtilCacheElements}</div> -<div> </div> -<div class="tabletext"><b>${uiLabelMap.WebtoolsCacheName}:</b> ${cacheName?if_exists} (${now})</div> -<div> </div> -<div width="100%"> - <a href="<@ofbizUrl>FindUtilCache</@ofbizUrl>" class="buttontext">${uiLabelMap.WebtoolsBackToCacheMaintenance}</a> -</div> -<div> </div> +<#macro displayButtonBar> + <div class="button-bar"> + <a href="<@ofbizUrl>FindUtilCache</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsBackToCacheMaintenance}</a> + </div> +</#macro> + +<h1>${uiLabelMap.PageTitleFindUtilCacheElements}</h1> +<br /> + +<p> + <b>${uiLabelMap.WebtoolsCacheName}:</b> ${cacheName?if_exists} (${now}) + <b>${uiLabelMap.WebtoolsSizeTotal}:</b> ${totalSize} ${uiLabelMap.WebtoolsBytes} +</p> +<br /> + +<@displayButtonBar/> + <#if cacheName?has_content> <#if cacheElementsList?has_content> - <#assign rowClass='viewManyTR1'> - <table cellpadding="2" cellspacing="0" border="1" width="50%" class="boxoutside"> - <tr> - <td><div class="tableheadtext">${uiLabelMap.WebtoolsCacheElementKey}</div></td> - <td><div class="tableheadtext">${uiLabelMap.WebtoolsExpireTime}</div></td> - <td><div class="tableheadtext">${uiLabelMap.WebtoolsBytes}</div></td> - <td><div class="tableheadtext"> </div></td> - </tr> - <#list cacheElementsList as cacheElement> - <tr class='${rowClass}'> - <td><div class="tabletext">${cacheElement.elementKey?if_exists}</div></td> - <td><div class="tabletext">${cacheElement.expireTime?if_exists}</div></td> - <td><div class="tabletext">${cacheElement.lineSize?if_exists}</div></td> - <td align="center" valign=middle> - <#if hasUtilCacheEdit> - <a href="<@ofbizUrl>FindUtilCacheElementsRemoveElement?UTIL_CACHE_NAME=${cacheName?if_exists}&UTIL_CACHE_ELEMENT_NUMBER=${cacheElement.keyNum?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a> - </#if> - </td> - </tr> - <#if rowClass=='viewManyTR1'> - <#assign rowClass='viewManyTR2'> - <#else> - <#assign rowClass='viewManyTR1'> - </#if> + <table class="basic-table light-grid hover-bar" cellspacing="0"> + <tr class="header-row"> + <td>${uiLabelMap.WebtoolsCacheElementKey}</td> + <td>${uiLabelMap.WebtoolsExpireTime}</td> + <td>${uiLabelMap.WebtoolsBytes}</td> + <td> </td> + </tr> + <#assign alternateRow = false> + <#list cacheElementsList as cacheElement> + <tr<#if alternateRow> class="alternate-row"</#if>> + <td>${cacheElement.elementKey?if_exists}</td> + <td nowrap="nowrap">${cacheElement.expireTime?if_exists}</td> + <td>${cacheElement.lineSize?if_exists}</td> + <td align="center"> + <#if hasUtilCacheEdit> + <a href="<@ofbizUrl>FindUtilCacheElementsRemoveElement?UTIL_CACHE_NAME=${cacheName?if_exists}&UTIL_CACHE_ELEMENT_NUMBER=${cacheElement.keyNum?if_exists}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonRemove}</a> + </#if> + </td> + </tr> + <#if alternateRow == false> + <#assign alternateRow = true> + <#else> + <#assign alternateRow = false> + </#if> </#list> </table> <#else> - <div width="100%"> - ${uiLabelMap.WebtoolsNoUtilCacheElementsFound} - </div> + ${uiLabelMap.WebtoolsNoUtilCacheElementsFound} </#if> <#else> - <div width="100%"> - ${uiLabelMap.WebtoolsNoUtilCacheSpecified} - </div> + ${uiLabelMap.WebtoolsNoUtilCacheSpecified} </#if> -<div> </div> -<div class="tabletext">${uiLabelMap.WebtoolsSizeTotal}: ${totalSize} ${uiLabelMap.WebtoolsBytes}</div> -<div> </div> -<div width="100%"> - <a href="<@ofbizUrl>FindUtilCache</@ofbizUrl>" class="buttontext">${uiLabelMap.WebtoolsBackToCacheMaintenance}</a> -</div> + +<@displayButtonBar/> + Modified: ofbiz/trunk/framework/webtools/webapp/webtools/component/viewComponents.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/component/viewComponents.ftl?view=diff&rev=522793&r1=522792&r2=522793 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/component/viewComponents.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/component/viewComponents.ftl Tue Mar 27 00:04:31 2007 @@ -18,38 +18,49 @@ --> <#assign components = Static["org.ofbiz.base.component.ComponentConfig"].getAllComponents()?if_exists/> -<div class="head3">Loaded Components:</div> -<#if (components?has_content)> - <table cellpadding="2" cellspacing="0" border="1" width="100%"> +<div id="stats-bins-history" class="screenlet"> + <div class="screenlet-title-bar"> + <h3>Loaded Components</h3> + </div> + <#if (components?has_content)> + <table class="basic-table" cellspacing="0"> + <tr class="header-row"> + <td>Name</td> + <td>Path</td> + <td>Enabled</td> + <td colspan="3">WebApps (Name, Mount, Path)</td> + </tr> + <#list components as component> + <#assign webinfos = component.getWebappInfos()?if_exists/> + <#assign firstRow = "true"> <tr> - <td><div class="tableheadtext">Name</div></td> - <td><div class="tableheadtext">Path</div></td> - <td><div class="tableheadtext">Enabled</div></td> - <td colspan="3"><div class="tableheadtext">WebApps (Name, Mount, Path)</div></td> - </tr> - <#list components as component> - <tr> - <td><div class="tabletext">${component.getComponentName()?if_exists}</div></td> - <td><div class="tabletext">${component.getRootLocation()?if_exists}</div></td> - <td><div class="tabletext">${component.enabled()?string?if_exists}</div></td> - <#assign webinfos = component.getWebappInfos()?if_exists/> - <#if (webinfos?has_content)> - <td> - <table cellpadding="2" cellspacing="0" border="0" width="100%"> - <#list webinfos as webinfo> - <tr> - <td><div class="tabletext">${webinfo.getName()?if_exists}</div></td> - <td><div class="tabletext">${webinfo.getContextRoot()?if_exists}</div></td> - <td><div class="tabletext">${webinfo.getLocation()?if_exists}</div></td> - </tr> - </#list> - </table> - </td> - <#else> - <td> </td> - </#if> - </#list> + <td>${component.getComponentName()?if_exists}</td> + <td>${component.getRootLocation()?if_exists}</td> + <td>${component.enabled()?string?if_exists}</td> + <#if (webinfos?has_content)> + <#list webinfos as webinfo> + <#if firstRow = "true"> + <#assign firstRow = "false"> + <#else> + <tr> + <td> </td> + <td> </td> + <td> </td> + </#if> + <td>${webinfo.getName()?if_exists}</td> + <td>${webinfo.getContextRoot()?if_exists}</td> + <td>${webinfo.getLocation()?if_exists}</td> + </tr> + </#list> + <#else> + <td> </td> + <td> </td> + <td> </td> + </tr> + </#if> + </#list> </table> -<#else> - <div class="tabletext">No components loaded.</div> -</#if> \ No newline at end of file + <#else> + <div class="screenlet-body">No components loaded.</div> + </#if> +</div> Added: ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl?view=auto&rev=522793 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl (added) +++ ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl Tue Mar 27 00:04:31 2007 @@ -0,0 +1,155 @@ +<#-- +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. +--> + +<h1>Work With Data Files</h1> +<br /> +<p>This page is used to view and export data from data files parsed by the configurable data file parser.</p> +<hr/> +<#if security.hasPermission("DATAFILE_MAINT", session)> + <form method="post" action="<@ofbizUrl>viewdatafile</@ofbizUrl>"> + <table class="basic-table form-widget-table"> + <tr> + <td class="label">Definition Filename or URL</td> + <td><input name="DEFINITION_LOCATION" type="text" size="60" value="${definitionLoc?if_exists}"></td> + <td><span class="label">Is URL?</span><input type="checkbox" name="DEFINITION_IS_URL"<#if parameters.DEFINITION_IS_URL?has_content> checked="checked"</#if>></td> + </tr> + <tr> + <td class="label">Data File Definition Name</td> + <td> + <#if definitionNames?has_content> + <select name="DEFINITION_NAME"> + <option value=""></option> + <#list definitionNames as oneDefinitionName> + boolean isSelected = definitionName != null && definitionName.equals(oneDefinitionName); + %><option value="<%=oneDefinitionName%>" <%=(isSelected? "selected": "")%>><%=oneDefinitionName%></option><% + </#list> + </select> + <#else> + <input name="DEFINITION_NAME" type="text" size="30" value="${definitionName?if_exists}"> + </#if> + </td> + <td> </td> + </tr> + <tr> + <td class="label">Data Filename or URL</td> + <td><input name="DATAFILE_LOCATION" type="text" size="60" value="${dataFileLoc?if_exists}"></td> + <td><span class="label">Is URL?</span><input type="checkbox" name="DATAFILE_IS_URL"<#if DATAFILE_IS_URL?has_content> checked="checked"</#if>></td> + </tr> + <tr> + <td class="label">Save to file</td> + <td><input name="DATAFILE_SAVE" type="text" size="60" value="${dataFileSave?if_exists}"/></td> + <td> </td> + </tr> + <tr> + <td class="label">Save to entity xml file</td> + <td><input name="ENTITYXML_FILE_SAVE" type="text" size="60" value="${entityXmlFileSave?if_exists}"></td> + <td> </td> + </tr> + <tr> + <td> </td> + <td><input type="submit" value="Run"></td> + <td> </td> + </tr> + </table> + </form> + + <#if messages?has_content> + <hr/> + <h1>The following occurred:</h1> + <div> + <#list messages as message> + <p>${message}</p> + </#list> + </div> + </#if> + +<#macro displayrecords records> + <#assign lastRecordName = null> + <#list records as record> + <#assign modelRecord = record.getModelRecord()> + <#-- if record is different than the last displayed, make a new table and header row --> + <#if !modelRecord.name.equals(lastRecordName)> + <#if lastRecordName != null> + </table><br /> + </#if> + <table class="dark-grid" cellspacing="0"> + <tr> + <td><b>Record: ${modelRecord.name}</b></td> + <#if (modelRecord.parentName)?has_content> + <td><b>Parent: ${modelRecord.parentName}</b></td> + </#if> + <td>${modelRecord.description}</td> + </tr> + </table> + <table class="dark-grid" cellspacing='0'> + <tr> + <#list modelRecord.fields as modelField> + <td><b>${modelField.name}</b></td> + </#list> + </tr> + <#assign lastRecordName = modelRecord.name> + </#if> + + <tr> + <#list modelRecord.fields as modelField> + <#assign value = record.get(modelField.name)> + <#if value?has_content> + <td>${value}</td> + <#else> + <td>${modelField.defaultValue}</td> + </#if> + </#list> + </tr> + <#if record.getChildRecords() != null && record.getChildRecords().size() > 0> + <@displayrecords records = record.getChildRecords()/> + </#if> + </#list> + </table> +</#macro> + + <#if dataFile?has_content && modelDataFile?has_content && (!parameters.ENTITYXML_FILE_SAVE?has_content || parameters.ENTITYXML_FILE_SAVE.length() == 0) && (parameters.DATAFILE_SAVE == null || parameters.DATAFILE_SAVE.length() == 0)> + <hr/> + <table class="basic-table" cellspacing="0"> + <tr class="header-row"> + <td>Name</td> + <td>Type-Code</td> + <td>Sender</td> + <td>Receiver</td> + <td>Record Length</td> + <td>Separator Style</td> + </tr> + <tr> + <td>${modelDataFile.name}</td> + <td>${modelDataFile.typeCode}</td> + <td>${modelDataFile.sender}</td> + <td>${modelDataFile.receiver}</td> + <td>${modelDataFile.recordLength}</td> + <td>${modelDataFile.separatorStyle}</td> + </tr> + <tr> + <td class="label">Description</td> + <td colspan="">${modelDataFile.description}</td> + </tr> + </table> + <br/> + <@displayrecords records = dataFile.getRecords()/> + </#if> +<#else> + <h3>You do not have permission to use this page (DATAFILE_MAINT needed)</h3> +</#if> Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.jsp URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.jsp?view=diff&rev=522793&r1=522792&r2=522793 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.jsp (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.jsp Tue Mar 27 00:04:31 2007 @@ -1,150 +0,0 @@ -<%-- -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. ---%> - -<%@ page import="java.util.*, java.net.*" %> -<%@ page import="org.ofbiz.security.*, org.ofbiz.base.util.*, org.ofbiz.webapp.pseudotag.*" %> -<%@ page import="org.ofbiz.datafile.*" %> - -<%@ taglib uri="ofbizTags" prefix="ofbiz" %> - -<jsp:useBean id="security" type="org.ofbiz.security.Security" scope="request" /> -<% - List messages = new LinkedList(); - - String dataFileSave = request.getParameter("DATAFILE_SAVE"); - - String entityXmlFileSave = request.getParameter("ENTITYXML_FILE_SAVE"); - - String dataFileLoc = request.getParameter("DATAFILE_LOCATION"); - String definitionLoc = request.getParameter("DEFINITION_LOCATION"); - String definitionName = request.getParameter("DEFINITION_NAME"); - boolean dataFileIsUrl = request.getParameter("DATAFILE_IS_URL")!=null?true:false; - boolean definitionIsUrl = request.getParameter("DEFINITION_IS_URL")!=null?true:false; - - URL dataFileUrl = null; - try { dataFileUrl = dataFileIsUrl?new URL(dataFileLoc):UtilURL.fromFilename(dataFileLoc); } - catch (java.net.MalformedURLException e) { messages.add(e.getMessage()); } - - URL definitionUrl = null; - try { definitionUrl = definitionIsUrl?new URL(definitionLoc):UtilURL.fromFilename(definitionLoc); } - catch (java.net.MalformedURLException e) { messages.add(e.getMessage()); } - - Iterator definitionNames = null; - if (definitionUrl != null) { - ModelDataFileReader reader = ModelDataFileReader.getModelDataFileReader(definitionUrl); - if (reader != null) { - definitionNames = ((Collection)reader.getDataFileNames()).iterator(); - } - } - - DataFile dataFile = null; - if (dataFileUrl != null && definitionUrl != null && definitionName != null && definitionName.length() > 0) { - try { dataFile = DataFile.readFile(dataFileUrl, definitionUrl, definitionName); } - catch (Exception e) { messages.add(e.toString()); Debug.log(e); } - } - - ModelDataFile modelDataFile = null; - if (dataFile != null) modelDataFile = dataFile.getModelDataFile(); - - if (dataFile != null && dataFileSave != null && dataFileSave.length() > 0) { - try { - dataFile.writeDataFile(dataFileSave); - messages.add("Data File saved to: " + dataFileSave); - } catch (Exception e) { messages.add(e.getMessage()); } - } - - if (dataFile != null && entityXmlFileSave != null && entityXmlFileSave.length() > 0) { - try { - //dataFile.writeDataFile(entityXmlFileSave); - DataFile2EntityXml.writeToEntityXml(entityXmlFileSave, dataFile); - messages.add("Entity File saved to: " + entityXmlFileSave); - } catch (Exception e) { messages.add(e.getMessage()); } - } - -%> -<div class="head1">Work With Data Files</div> -<div class="tabletext">This page is used to view and export data from data files parsed by the configurable data file parser.</div> -<hr/> -<%if(security.hasPermission("DATAFILE_MAINT", session)) {%> - <form method="post" action="<ofbiz:url>/viewdatafile</ofbiz:url>"> - <div class="tabletext">Definition Filename or URL: <input name="DEFINITION_LOCATION" class="inputBox" type="text" size="60" value="<%=UtilFormatOut.checkNull(definitionLoc)%>"> Is URL?:<INPUT type="checkbox" name="DEFINITION_IS_URL" <%=definitionIsUrl?"checked":""%>></div> - <div class="tabletext">Data File Definition Name: - <% if (definitionNames != null) { - %><select name="DEFINITION_NAME" class="selectBox"> - <option value=""></option> - <% - while (definitionNames.hasNext()) { - String oneDefinitionName = (String)definitionNames.next(); - boolean isSelected = definitionName != null && definitionName.equals(oneDefinitionName); - %><option value="<%=oneDefinitionName%>" <%=(isSelected? "selected": "")%>><%=oneDefinitionName%></option><% - } - %></select><% - } else {%> - <input name="DEFINITION_NAME" type="text" class="inputBox" size="30" value="<%=UtilFormatOut.checkNull(definitionName)%>"></div> - <% } %> - <div class="tabletext">Data Filename or URL: <input name="DATAFILE_LOCATION" type="text" class="inputBox" size="60" value="<%=UtilFormatOut.checkNull(dataFileLoc)%>"> Is URL?:<INPUT type="checkbox" name="DATAFILE_IS_URL" <%=dataFileIsUrl?"checked":""%>></div> - <div class="tabletext">Save to file: <input name="DATAFILE_SAVE" type="text" class="inputBox" size="60" value="<%=UtilFormatOut.checkNull(dataFileSave)%>"/></div> - <div class="tabletext">Save to entity xml file: <input name="ENTITYXML_FILE_SAVE" type="text" class="inputBox" size="60" value="<%=UtilFormatOut.checkNull(entityXmlFileSave)%>"></div> - <div><input type="submit" value="Run"></div> - </form> - - <hr/> - - <%if (messages.size() > 0) {%> - <div class="head1">The following occurred:</div> - <ul> - <%Iterator errMsgIter = messages.iterator();%> - <%while (errMsgIter.hasNext()) {%> - <li><%=errMsgIter.next()%> - <%}%> - </ul> - <%}%> - - <%if (dataFile != null && modelDataFile != null && (entityXmlFileSave == null || entityXmlFileSave.length() == 0) && (dataFileSave == null || dataFileSave.length() == 0)) {%> - - <table cellpadding="2" cellspacing="0" border="1"> - <tr> - <td><B>Name</B></td> - <td><B>Type-Code</B></td> - <td><B>Sender</B></td> - <td><B>Receiver</B></td> - <td><B>Record Length</B></td> - <td><B>Separator Style</B></td> - </tr> - <tr> - <td><%=modelDataFile.name%></td> - <td><%=modelDataFile.typeCode%></td> - <td><%=modelDataFile.sender%></td> - <td><%=modelDataFile.receiver%></td> - <td><%=modelDataFile.recordLength%></td> - <td><%=modelDataFile.separatorStyle%></td> - </tr> - <tr> - <td colspan="6">Description: <%=modelDataFile.description%></td> - </tr> - </table> - <BR> - <%request.setAttribute("CUR_RECORD_LIST", dataFile.getRecords());%> - <%pageContext.include("/datafile/showrecords.jsp");%> - <%}%> - -<%}else{%> - <hr/> - <div class="tabletext">You do not have permission to use this page (DATAFILE_MAINT needed)</div> -<%}%> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl?view=diff&rev=522793&r1=522792&r2=522793 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl Tue Mar 27 00:04:31 2007 @@ -17,80 +17,66 @@ under the License. --> -<div class="head1">${uiLabelMap.WebtoolsEntityDataMaintenance}</div> -<div> </div> -<#assign rowOneClass = 'viewOneTR1'> -<#assign rowClass = 'viewManyTR1'> -<table cellpadding='1' cellspacing='1' border='0'> - <tr> - <td valign="top"> - <table cellpadding="2" cellspacing="0" border="1" width="100%" class="boxoutside"> - <tr class='${rowOneClass}'> - <td colspan='5' class="tableheadtext" style='FONT-SIZE: xx-small;'>${uiLabelMap.WebtoolsEntityName}</td> - </tr> - <#list entitiesList as entity> - <tr class='${rowClass}'> - <td> - ${entity.entityName} - </td> - <#if entity.viewEntity == 'Y'> - <#if entity.entityPermissionView == 'Y'> - <td colspan='3' align="center"><div class='tabletext' style='FONT-SIZE: xx-small;'>${uiLabelMap.WebtoolsEntityView}</div></td> - <td><a href='<@ofbizUrl>FindGeneric?entityName=${entity.entityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>' class="buttontext" style='FONT-SIZE: xx-small;'>${uiLabelMap.WebtoolsAll}</a></td> - <#else> - <td colspan='3' align="center"><div class='tabletext' style='FONT-SIZE: xx-small;'>${uiLabelMap.WebtoolsEntityView}</div></td> - </#if> - <#else> - <#if entity.entityPermissionCreate == 'Y'> - <td><a href='<@ofbizUrl>ViewGeneric?entityName=${entity.entityName}</@ofbizUrl>' class="buttontext" style='FONT-SIZE: xx-small;'>${uiLabelMap.WebtoolsCreate}</a></td> - <#else> - <td><div class='tabletext' style='FONT-SIZE: xx-small;'>${uiLabelMap.WebtoolsNotPresent}</div></td> - </#if> - <#if entity.entityPermissionView == 'Y'> - <td><a href='<@ofbizUrl>ViewRelations?entityName=${entity.entityName}</@ofbizUrl>' class="buttontext" style='FONT-SIZE: xx-small;'>${uiLabelMap.WebtoolsReln}</a></td> - <td><a href='<@ofbizUrl>FindGeneric?entityName=${entity.entityName}</@ofbizUrl>' class="buttontext" style='FONT-SIZE: xx-small;'>${uiLabelMap.WebtoolsFind}</a></td> - <td><a href='<@ofbizUrl>FindGeneric?entityName=${entity.entityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>' class="buttontext" style='FONT-SIZE: xx-small;'>${uiLabelMap.WebtoolsAll}</a></td> - <#else> - <td><div class='tabletext' style='FONT-SIZE: xx-small;'>${uiLabelMap.WebtoolsNotPresent}</div></td> - <td><div class='tabletext' style='FONT-SIZE: xx-small;'>${uiLabelMap.WebtoolsNotPresent}</div></td> - </#if> - </#if> - </tr> - <#if rowClass == 'viewManyTR1'> - <#assign rowClass = 'viewManyTR2'> - <#else> - <#assign rowClass = 'viewManyTR1'> - </#if> - <#if entity.changeColumn == 'Y'> - </table> - </td> - <td valign="top"> - <table cellpadding="2" cellspacing="0" border="1" width="100%" class="boxoutside"> - <tr class='${rowOneClass}'> - <td colspan='5' class="tableheadtext" style='FONT-SIZE: xx-small;'>${uiLabelMap.WebtoolsEntityName}</td> - </tr> - <#assign rowClass = 'viewManyTR1'> - </#if> - </#list> - </table> - </td> - </tr> - <tr> - <td> </td> - </tr> - <tr> - <td class="tableheadtext">${uiLabelMap.CommonNote} : </td> - </tr> - <tr> - <td class="tabletext">${uiLabelMap.WebtoolsCreate} :- ${uiLabelMap.CommonCreateNew}</td> - </tr> - <tr> - <td class="tabletext">${uiLabelMap.WebtoolsReln} :- ${uiLabelMap.WebtoolsViewRelations}</td> - </tr> - <tr> - <td class="tabletext">${uiLabelMap.WebtoolsFind} :- ${uiLabelMap.WebtoolsFindRecord}</td> - </tr> - <tr> - <td class="tabletext">${uiLabelMap.WebtoolsAll} :- ${uiLabelMap.WebtoolsFindAllRecords}</td> - </tr> +<h1>${uiLabelMap.WebtoolsEntityDataMaintenance}</h1> +<br /> +<p><b>${uiLabelMap.CommonNote}:</b></p> +<p>${uiLabelMap.WebtoolsCreate} :- ${uiLabelMap.CommonCreateNew}</p> +<p>${uiLabelMap.WebtoolsReln} :- ${uiLabelMap.WebtoolsViewRelations}</p> +<p>${uiLabelMap.WebtoolsFind} :- ${uiLabelMap.WebtoolsFindRecord}</p> +<p>${uiLabelMap.WebtoolsAll} :- ${uiLabelMap.WebtoolsFindAllRecords}</p> +<br /> +<#assign firstChar = "*"> +<#assign alt_row = false> +<#assign right_col = false> +<table class="basic-table light-grid hover-bar" cellspacing='0'> + <tr class="header-row"> + <td>${uiLabelMap.WebtoolsEntityName}</td> + <td> </td> + <td>${uiLabelMap.WebtoolsEntityName}</td> + <td> </td> + </tr> + <tr> + <#list entitiesList as entity> + <#if entity.entityName?substring(0, 1) != firstChar> + <#if right_col> + <td> </td><td> </td></tr> + <#assign right_col = false> + </#if> + <#if firstChar != "*"> + <tr class="header-row"><td colspan="4"> </td></tr> + <tr<#if alt_row> class="alternate-row"</#if>> + </#if> + <#assign firstChar = entity.entityName?substring(0, 1)> + </#if> + <td>${entity.entityName}<#if entity.viewEntity == 'Y'> (${uiLabelMap.WebtoolsEntityView})</#if></td> + <td class="button-col"> + <#if entity.viewEntity == 'Y'> + <#if entity.entityPermissionView == 'Y'> + <a href='<@ofbizUrl>FindGeneric?entityName=${entity.entityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>'>${uiLabelMap.WebtoolsAll}</a> + </#if> + <#else> + <#if entity.entityPermissionCreate == 'Y'> + <a href='<@ofbizUrl>ViewGeneric?entityName=${entity.entityName}</@ofbizUrl>'>${uiLabelMap.WebtoolsCreate}</a> + </#if> + <#if entity.entityPermissionView == 'Y'> + <a href='<@ofbizUrl>ViewRelations?entityName=${entity.entityName}</@ofbizUrl>'>${uiLabelMap.WebtoolsReln}</a> + <a href='<@ofbizUrl>FindGeneric?entityName=${entity.entityName}</@ofbizUrl>'>${uiLabelMap.WebtoolsFind}</a> + <a href='<@ofbizUrl>FindGeneric?entityName=${entity.entityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>'>${uiLabelMap.WebtoolsAll}</a> + </#if> + </#if> + </td> + <#if right_col> + </tr> + <tr<#if alt_row> class="alternate-row"</#if>> + <#if alt_row> + <#assign alt_row = false> + <#else> + <#assign alt_row = true> + </#if> + <#assign right_col = false> + <#else> + <#assign right_col = true> + </#if> + </#list> + <#if !right_col></tr></#if> </table> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/FindGeneric.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/FindGeneric.ftl?view=diff&rev=522793&r1=522792&r2=522793 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/FindGeneric.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/FindGeneric.ftl Tue Mar 27 00:04:31 2007 @@ -16,69 +16,55 @@ specific language governing permissions and limitations under the License. --> -<div class="head1">${uiLabelMap.WebtoolsFindValues}</div> -<div class="head2">${uiLabelMap.WebtoolsForEntity}: ${entityName}</div> -<div> </div> -<div> - <a href="<@ofbizUrl>entitymaint</@ofbizUrl>" class="buttontext">${uiLabelMap.WebtoolsBackToEntityList}</a> + +<h1>${uiLabelMap.WebtoolsFindValues}</h1> +<br /> +<h2>${uiLabelMap.WebtoolsForEntity}: ${entityName}</h2> +<br /> +<div class="button-bar"> + <a href="<@ofbizUrl>entitymaint</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsBackToEntityList}</a> + <a href="<@ofbizUrl>ViewRelations?entityName=${entityName}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsViewRelations}</a> + <a href="<@ofbizUrl>FindGeneric?entityName=${entityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonFind} ${uiLabelMap.CommonAll}</a> + <#if hasCreatePermission == 'Y'> + <a href="<@ofbizUrl>ViewGeneric?entityName=${entityName}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCreateNew} ${entityName}</a> + </#if> </div> -<div> - <a href="<@ofbizUrl>ViewRelations?entityName=${entityName}</@ofbizUrl>" class="buttontext">${uiLabelMap.WebtoolsViewRelations}</a> - <a href="<@ofbizUrl>FindGeneric?entityName=${entityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonFind} ${uiLabelMap.CommonAll}</a> - <#if hasCreatePermission == 'Y'> - <a href="<@ofbizUrl>ViewGeneric?entityName=${entityName}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCreateNew} ${entityName}</a> - </#if> -</div> -<div> </div> -<div class="tabletext">${uiLabelMap.WebtoolsToFindAll} ${entityName}, ${uiLabelMap.WebtoolsLeaveAllEntriesBlank}.</div> +<br /> +<p>${uiLabelMap.WebtoolsToFindAll} ${entityName}, ${uiLabelMap.WebtoolsLeaveAllEntriesBlank}.</p> <form method="post" action="<@ofbizUrl>FindGeneric?entityName=${entityName}</@ofbizUrl>"> - <input type="hidden" name="find" value="true"> - <table border="1" cellpadding="2" cellspacing="0"> - <tr class="viewOneTR1"> - <td valign="top"> - <span class="tableheadtext">${uiLabelMap.WebtoolsFieldName}</span> - </td> - <td valign="top"> - <span class="tableheadtext">${uiLabelMap.WebtoolsPk}</span> - </td> - <td valign="top"> - <span class="tableheadtext">${uiLabelMap.WebtoolsFieldType}</span> - </td> - <td valign="top"> - <span class="tableheadtext"><input type="submit" value="${uiLabelMap.CommonFind}" class="smallSubmit"></span> - </td> + <input type="hidden" name="find" value="true"> + <table class="basic-table light-grid" cellspacing="0"> + <tr class="header-row"> + <td>${uiLabelMap.WebtoolsFieldName}</td> + <td>${uiLabelMap.WebtoolsPk}</td> + <td>${uiLabelMap.WebtoolsFieldType}</td> + <td><input type="submit" value="${uiLabelMap.CommonFind}"></td> + </tr> + <#assign alt_row = false> + <#list fieldList as field> + <tr<#if alt_row> class="alternate-row"</#if>> + <td>${field.name}</td> + <td><#if field.isPk == 'Y'>*</#if></td> + <td>${field.javaType}, ${field.sqlType}</td> + <td><input type="text" name="${field.name}" value="${field.param}" size="40"></td> </tr> - <#assign rowClass = 'viewManyTR1'> - <#list fieldList as field> - <tr class='${rowClass}'> - <td valign="top"> - <span class="tableheadtext">${field.name}</span> - </td> - <td valign="top"> - <span class="tabletext"><#if field.isPk == 'Y'>*</#if></span> - </td> - <td valign="top"> - <span class="tabletext">${field.javaType},${field.sqlType}</span> - </td> - <td valign="top"> - <input type="text" name="${field.name}" value="${field.param}" size="40" class="inputBox"> - </td> - </tr> - <#if rowClass == 'viewManyTR1'> - <#assign rowClass = 'viewManyTR2'> - <#else> - <#assign rowClass = 'viewManyTR1'> - </#if> - </#list> + <#if alt_row> + <#assign alt_row = false> + <#else> + <#assign alt_row = true> + </#if> + </#list> <tr> - <td valign="top" align="center" colspan="4"><input type="submit" value="${uiLabelMap.CommonFind}" class="smallSubmit"></td> + <td align="center" colspan="4"><input type="submit" value="${uiLabelMap.CommonFind}"></td> </tr> </table> </form> -<div> </div> +<br /> +<div class="button-bar"> <#if hasCreatePermission == 'Y'> <a href='<@ofbizUrl>ViewGeneric?entityName=${entityName}</@ofbizUrl>' class="buttontext">${uiLabelMap.CommonCreateNew} ${entityName}</a> </#if> +</div> <table border="0" width="100%" cellpadding="2"> <#if (arraySize > 0)> <tr> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl?view=diff&rev=522793&r1=522792&r2=522793 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl Tue Mar 27 00:04:31 2007 @@ -17,38 +17,39 @@ under the License. --> <#if hasViewPermission> - <div class="head1">${uiLabelMap.WebtoolsRelations}</div> - <div class="head2">${uiLabelMap.WebtoolsForEntity}: ${entityName}</div> - <div> </div> - <div> - <a href="<@ofbizUrl>FindGeneric?entityName=${entityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>" class="buttontext">${uiLabelMap.WebtoolsBackToFindScreen}</a> + <h1>${uiLabelMap.WebtoolsRelations}</h1> + <br /> + <h2>${uiLabelMap.WebtoolsForEntity}: ${entityName}</h2> + <br /> + <div class="button-bar"> + <a href="<@ofbizUrl>FindGeneric?entityName=${entityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>" class="smallSubmit">${uiLabelMap.WebtoolsBackToFindScreen}</a> </div> - <div> </div> - <table border="1" cellpadding="2" cellspacing="0" class="calendarTable"> - <tr> - <td class="viewOneTR2"><b>${uiLabelMap.WebtoolsTitle}</b></td> - <td class="viewOneTR2"><b>${uiLabelMap.WebtoolsRelatedEntity}</b></td> - <td class="viewOneTR2"><b>${uiLabelMap.WebtoolsRelationType}</b></td> - <td class="viewOneTR2"><b>${uiLabelMap.WebtoolsFKName}</b></td> - <td class="viewOneTR2"><b>${uiLabelMap.WebtoolsFieldsList}</b></td> - </tr> - <#assign rowClass = 'viewManyTR1'> + <br /> + <table class="basic-table light-grid hover-bar" cellspacing="0"> + <tr class="header-row"> + <td>${uiLabelMap.WebtoolsTitle}</td> + <td>${uiLabelMap.WebtoolsRelatedEntity}</td> + <td>${uiLabelMap.WebtoolsRelationType}</td> + <td>${uiLabelMap.WebtoolsFKName}</td> + <td>${uiLabelMap.WebtoolsFieldsList}</td> + </tr> + <#assign alt_row = false> <#list relations as relation> - <tr class="${rowClass}"> + <tr<#if alt_row> class="alternate-row"</#if>> <td>${relation.title}</td> - <td><a href='<@ofbizUrl>FindGeneric?entityName=${relation.relEntityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>' class="buttontext">${relation.relEntityName}</a></td> - <td>${relation.type}</td> - <td>${relation.fkName}</td> - <td> - <#list relation.relFields as field> - ${field.fieldName} -> ${field.relFieldName}<br/> - </#list> - </td> + <td class="button-col"><a href='<@ofbizUrl>FindGeneric?entityName=${relation.relEntityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>'>${relation.relEntityName}</a></td> + <td>${relation.type}</td> + <td>${relation.fkName}</td> + <td> + <#list relation.relFields as field> + ${field.fieldName} -> ${field.relFieldName}<br/> + </#list> + </td> </tr> - <#if rowClass == 'viewManyTR1'> - <#assign rowClass = 'viewManyTR2'> + <#if alt_row> + <#assign alt_row = false> <#else> - <#assign rowClass = 'viewManyTR1'> + <#assign alt_row = true> </#if> </#list> </table> Added: ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl?view=auto&rev=522793 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl (added) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl Tue Mar 27 00:04:31 2007 @@ -0,0 +1,114 @@ +<#-- +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. +--> + +<#macro displayButtonBar> + <div class="button-bar"> + <input type="submit" value="Export"/> + <a href="<@ofbizUrl>xmldsdump?checkAll=true</@ofbizUrl>" class="smallSubmit">Check All</a> + <a href="<@ofbizUrl>xmldsdump</@ofbizUrl>" class="smallSubmit">Un-Check All</a> + </div> +</#macro> + +<h1>XML Export from DataSource(s)</h1> +<br /> +<p>This page can be used to export data from the database. The exported documents will have a root tag of "<entity-engine-xml>".</p> + +<hr/> + +<#if security.hasPermission("ENTITY_MAINT", session)> + <h2>Results:</h2> + <#if Static["org.ofbiz.base.util.UtilValidate"].isNotEmpty(parameters.filename) && (numberOfEntities?number > 0)> + <p>Wrote XML for all data in ${numberOfEntities} entities.</p> + <p>Wrote ${numberWritten} records to XML file ${parameters.filename}</p> + <#elseif Static["org.ofbiz.base.util.UtilValidate"].isNotEmpty(parameters.outpath) && (numberOfEntities?number > 0)> + <#list results as result> + <p>${result}</p> + </#list> + <#else> + <p>No filename specified or no entity names specified, doing nothing.</p> + </#if> + + <hr/> + + <h2>Export:</h2> + <form method="post" action="<@ofbizUrl>xmldsdump</@ofbizUrl>" name="entityExport"> + <table class="basic-table"> + <tr> + <td class="label">Output Directory</td> + <td><input type="text" size="60" name="outpath" value="${parameters.outpath?if_exists}"/></td> + </tr> + <tr> + <td class="label">Max Records Per File</td> + <td><input type="text" size="10" name="maxrecords"/></td> + </tr> + <tr> + <td class="label">Single Filename</td> + <td><input type="text" size="60" name="filename" value="${parameters.filename?if_exists}"/></td> + </tr> + <tr> + <td class="label">Records Updated Since</td> + <td><input type="text" size="25" name="entityFrom" /> + <a href="javascript:call_cal(document.entityExport.entityFrom, null);" title="View Calendar"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="View Calendar"></a></td> + </tr> + <tr> + <td class="label">Records Updated Before </td> + <td><input type="text" size="25" name="entityThru" /> + <a href="javascript:call_cal(document.entityExport.entityThru, null);" title="View Calendar"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="View Calendar"></a></td> + </tr> + <tr> + <td class="label">OR Out to Browser</td> + <td><input type="checkbox" name="tobrowser"<#if tobrowser?has_content> checked="checked"</#if>></td> + </tr> + </table> + <br/> + <p>Entity Names:</p> + <@displayButtonBar/> + <div>Entity Sync Dump: + <input name="entitySyncId" size="30" value="${entitySyncId?if_exists}"/> + </div> + Pre-configured set: + <select name="preConfiguredSetName"> + <option value="">None</option> + <option value="CatalogExport">Catalog Export</option> + <option value="Product1">Product Part 1</option> + <option value="Product2">Product Part 2</option> + <option value="Product3">Product Part 3</option> + <option value="Product4">Product Part 4</option> + </select> + <br/> + + <table> + <tr> + <#assign entCount = 0> + <#assign check = parameters.checkAll?default("false")> + <#list entityNames as curEntityName> + <#if entCount % 3 == 0> + </tr><tr> + </#if> + <#assign entCount = entCount + 1> + <td><input type="checkbox" name="entityName" value="${curEntityName}"<#if check="true"> checked="checked"</#if>/>${curEntityName}</td> + </#list> + </tr> + </table> + + <@displayButtonBar/> + </form> +<#else> + <div>You do not have permission to use this page (ENTITY_MAINT needed)</div> +</#if> Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/framework/webtools/webapp/webtools/includes/appbar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/includes/appbar.ftl?view=diff&rev=522793&r1=522792&r2=522793 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/includes/appbar.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/includes/appbar.ftl Tue Mar 27 00:04:31 2007 @@ -1,84 +1,8 @@ -<#-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<#if (requestAttributes.security)?exists><#assign security = requestAttributes.security></#if> -<#if (requestAttributes.externalLoginKey)?exists><#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists></#if> -<#if (externalLoginKey)?exists><#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists></#if> -<#assign ofbizServerName = application.getAttribute("_serverId")?if_exists> -<#assign contextPath = request.getContextPath()> -<#assign displayApps = Static["org.ofbiz.base.component.ComponentConfig"].getAppBarWebInfos(ofbizServerName)> -<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if> - -<#if requestAttributes.userLogin?has_content><#assign userLogin = requestAttributes.userLogin></#if> - -<#if userLogin?has_content> -<#assign unselectedClass = {"col" : "tabdownblock", "left" : "tabdownleft", "center" : "tabdowncenter", "right" : "tabdownright", "link" : "tablink"}> -<#assign selectedClass = {"col" : "mainblock", "left" : "tabupleft", "center" : "tabupcenter", "right" : "tabupright", "link" : "tablinkselected"}> - -<table align="center" width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr bgcolor="#FFFFFF"> - <td><div class="appbarleft"></div></td> - <td height="15" width="100%"> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <#list displayApps as display> - <#assign thisApp = display.getContextRoot()> - <#assign permission = true> - <#assign permissions = display.getBasePermission()> - <#list permissions as perm> - <#if (perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session))> - <#assign permission = false> - </#if> - </#list> - <#if permission == true> - <#if thisApp == contextPath> - <#assign class = selectedClass> - <#else> - <#assign class = unselectedClass> - </#if> - <td height="15" class="${class.col}"> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td class="${class.left}"><a href="${response.encodeURL(thisApp + "/control/main" + externalKeyParam)}" title="" class="${class.link}"><img src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" alt="" width="10" height="15" border="0"></a></td> - <td nowrap="nowrap" class="${class.center}"><a href="${response.encodeURL(thisApp + "/control/main" + externalKeyParam)}" title="" class="${class.link}"><#if uiLabelMap?exists>${uiLabelMap[display.title]}<#else>${display.title}</#if></a></td> - <td class="${class.right}"><a href="${response.encodeURL(thisApp + "/control/main" + externalKeyParam)}" title="" class="${class.link}"><img src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" alt="" width="10" height="15" border="0"></a></td> - </tr> - <#if thisApp != contextPath> - <tr><td colspan="3" class="blackarea"><img src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" alt="" height="1"></td></tr> - <tr><td colspan="3" class="whitearea"><img src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" alt="" height="1"></td></tr> - </#if> - </table> - </td> - </#if> - </#list> - <td><div class="appbarright"></div></td> - <td width="100%" class="appbarresize"> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td class="whitearea"><img src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" alt="" height="1"></td> - </tr> - </table> - </td> - </tr> - </table> - </td> - </tr> -</table> -</#if> + + + + + + + Modified: ofbiz/trunk/framework/webtools/webapp/webtools/includes/appheader.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/includes/appheader.ftl?view=diff&rev=522793&r1=522792&r2=522793 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/includes/appheader.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/includes/appheader.ftl Tue Mar 27 00:04:31 2007 @@ -16,33 +16,24 @@ specific language governing permissions and limitations under the License. --> -<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if> -<#if (requestAttributes.security)?exists><#assign security = requestAttributes.security></#if> -<#if (requestAttributes.userLogin)?exists><#assign userLogin = requestAttributes.userLogin></#if> -<#if (requestAttributes.checkLoginUrl)?exists><#assign checkLoginUrl = requestAttributes.checkLoginUrl></#if> -<#assign unselectedLeftClassName = "headerButtonLeft"> -<#assign unselectedRightClassName = "headerButtonRight"> -<#assign selectedLeftClassMap = {(page.headerItem)?default("void") : "headerButtonLeftSelected"}> -<#assign selectedRightClassMap = {(page.headerItem)?default("void") : "headerButtonRightSelected"}> +<#if (requestAttributes.uiLabelMap)?exists> + <#assign uiLabelMap = requestAttributes.uiLabelMap> +</#if> +<#assign selected = headerItem?default("void")> -<div class="apptitle">${uiLabelMap.FrameworkWebTools}</div> -<div class="row"> - <div class="col"><a href="<@ofbizUrl>main</@ofbizUrl>" class="headerButtonLeft">${uiLabelMap.CommonMain}</a></div> - <#-- - <div class="col"><a href="<@ofbizUrl>entitymaint</@ofbizUrl>" class="headerButtonLeft">Entity</a></div> - <div class="col"><a href="<@ofbizUrl>workflowMonitor</@ofbizUrl>" class="headerButtonLeft">Workflow</a></div> - <div class="col"><a href="<@ofbizUrl>viewdatafile</@ofbizUrl>" class="headerButtonLeft">Data</a></div> - <div class="col"><a href="<@ofbizUrl>EditCustomTimePeriod</@ofbizUrl>" class="headerButtonLeft">Misc</a></div> - --> - <#if userLogin?has_content> - <div class="col-right"><a href="<@ofbizUrl>logout</@ofbizUrl>" class="headerButtonRight">${uiLabelMap.CommonLogout}</a></div> - <div class="col-right"><a href="<@ofbizUrl>FindUtilCache</@ofbizUrl>" class="headerButtonRight">Cache</a></div> - <div class="col-right"><a href="<@ofbizUrl>jobList</@ofbizUrl>" class="headerButtonRight">Jobs</a></div> - <div class="col-right"><a href="<@ofbizUrl>StatsSinceStart</@ofbizUrl>" class="headerButtonRight">Stats</a></div> - <#else> - <div class="col-right"><a href='<@ofbizUrl>${checkLoginUrl?if_exists}</@ofbizUrl>' class='headerButtonRight'>${uiLabelMap.CommonLogin}</a></div> - </#if> - - <div class="col-fill"> </div> +<div id="app-navigation"> + <h2>${uiLabelMap.FrameworkWebTools}</h2> + <ul> + <li<#if selected == "main"> class="selected"</#if>><a href="<@ofbizUrl>main</@ofbizUrl>">${uiLabelMap.CommonMain}</a></li> + <#if userLogin?has_content> + <li<#if selected == "stats"> class="selected"</#if>><a href="<@ofbizUrl>StatsSinceStart</@ofbizUrl>">Stats</a></li> + <li<#if selected == "jobs"> class="selected"</#if>><a href="<@ofbizUrl>jobList</@ofbizUrl>">Jobs</a></li> + <li<#if selected == "cache"> class="selected"</#if>><a href="<@ofbizUrl>FindUtilCache</@ofbizUrl>">Cache</a></li> + <li class="opposed"><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li> + <#else> + <li class="opposed"><a href="<@ofbizUrl>${checkLoginUrl?if_exists}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li> + </#if> + </ul> + <br class="clear" /> </div> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/log/LogForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/log/LogForms.xml?view=diff&rev=522793&r1=522792&r2=522793 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/log/LogForms.xml (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/log/LogForms.xml Tue Mar 27 00:04:31 2007 @@ -20,8 +20,7 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd"> - <form name="LevelSwitch" type="single" target="AdjustDebugLevels" default-map-name="activeDebugLevel" - default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"> + <form name="LevelSwitch" type="single" target="AdjustDebugLevels" default-map-name="activeDebugLevel"> <field name="fatal" title="${uiLabelMap.WebtoolsFatalLogLevel}" tooltip="${uiLabelMap.WebtoolsFatalLogLevelTooltip}"><check/></field> <field name="error" title="${uiLabelMap.WebtoolsErrorLogLevel}" tooltip="${uiLabelMap.WebtoolsErrorLogLevelTooltip}"><check/></field> <field name="warning" title="${uiLabelMap.WebtoolsWarningLogLevel}" tooltip="${uiLabelMap.WebtoolsWarningLogLevelTooltip}"><check/></field> @@ -29,11 +28,10 @@ <field name="info" title="${uiLabelMap.WebtoolsInfoLogLevel}" tooltip="${uiLabelMap.WebtoolsInfoLogLevelTooltip}"><check/></field> <field name="timing" title="${uiLabelMap.WebtoolsTimingLogLevel}" tooltip="${uiLabelMap.WebtoolsTimingLogLevelTooltip}"><check/></field> <field name="verbose" title="${uiLabelMap.WebtoolsVerboseLogLevel}" tooltip="${uiLabelMap.WebtoolsVerboseLogLevelTooltip}"><check/></field> - <field name="submit" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit/></field> + <field name="submit" title="${uiLabelMap.CommonUpdate}"><submit/></field> </form> - <form name="AddLogger" type="single" default-map-name="defaultLogger" target="AddLogger" - default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"> + <form name="AddLogger" type="single" default-map-name="defaultLogger" target="AddLogger"> <field name="name" title="${uiLabelMap.WebtoolsLoggerName}"><text size="50"/></field> <field name="level" title="${uiLabelMap.WebtoolsLoggerLevel}"> <drop-down> @@ -48,14 +46,13 @@ </drop-down> </field> <field name="additivity" title="${uiLabelMap.WebtoolsLoggerAdditivity}"><check/></field> - <field name="submit" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit/></field> + <field name="submit" title="${uiLabelMap.CommonAdd}"><submit/></field> </form> <form name="LoggerList" type="multi" target="UpdateLogger" list-name="loggerList" separate-columns="true" - default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext" paginate="false"> <field name="name" title="${uiLabelMap.WebtoolsLoggerName}"><display/></field> - <field name="level" title="${uiLabelMap.WebtoolsLoggerLevel}" widget-style="selectBox"> + <field name="level" title="${uiLabelMap.WebtoolsLoggerLevel}"> <drop-down> <option key="OFF"/> <option key="FATAL"/> @@ -70,6 +67,6 @@ <field name="additivity" title="${uiLabelMap.WebtoolsLoggerAdditivity}"> <check/> </field> - <field name="rowSubmit" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit/></field> + <field name="rowSubmit" title="${uiLabelMap.CommonUpdate}"><submit/></field> </form> </forms> Added: ofbiz/trunk/framework/webtools/webapp/webtools/performance/EntityPerformanceTest.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/performance/EntityPerformanceTest.ftl?view=auto&rev=522793 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/performance/EntityPerformanceTest.ftl (added) +++ ofbiz/trunk/framework/webtools/webapp/webtools/performance/EntityPerformanceTest.ftl Tue Mar 27 00:04:31 2007 @@ -0,0 +1,62 @@ +<#-- +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. +--> + +<h1>Entity Engine Performance Tests</h1> +<br /> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>Test Results</h3> + </div> + <div class="screenlet-body"> + <#if security.hasPermission("ENTITY_MAINT", session)> + <p>NOTE: These performance results may vary a great deal for different + databases, JDBC drivers, JTA implementations (transaction managers), connection pools, + local vs. remote deployment configurations, and hardware (app server hardware, database + server hardware, network connections).</p> + <br/> + <#if performanceList?has_content> + <table class="basic-table" cellspacing="0"> + <tr class="header-row"> + <td>Operation</td> + <td>Entity</td> + <td>Calls</td> + <td>Seconds</td> + <td>Seconds/Call</td> + <td>Calls/Second</td> + </tr> + <#assign rowNum = "2"> + <#list performanceList as perfRow> + <tr<#if rowNum == "1"> class="alternate-row"</#if>> + <td>${perfRow.operation}</td> + <td>${perfRow.entity}</td> + <td>${perfRow.calls}</td> + <td>${perfRow.seconds}</td> + <td>${perfRow.secsPerCall}</td> + <td>${perfRow.callsPerSecond}</td> + </tr> + </#list> + </table> + <#else> + No performance tests found. + </#if> + <#else> + ERROR: You do not have permission to use this page (ENTITY_MAINT needed) + </#if> + </div> +</div> Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/performance/EntityPerformanceTest.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/performance/EntityPerformanceTest.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/performance/EntityPerformanceTest.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/framework/webtools/webapp/webtools/performance/EntityPerformanceTest.jsp URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/performance/EntityPerformanceTest.jsp?view=diff&rev=522793&r1=522792&r2=522793 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/performance/EntityPerformanceTest.jsp (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/performance/EntityPerformanceTest.jsp Tue Mar 27 00:04:31 2007 @@ -1,240 +0,0 @@ -<%-- -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. ---%> - -<%@ page import="java.util.*, java.net.*, - org.ofbiz.base.util.cache.UtilCache" %> -<%@ page import="org.ofbiz.security.*, org.ofbiz.entity.*, org.ofbiz.base.util.*, org.ofbiz.webapp.pseudotag.*" %> - -<%@ 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" /> - -<div class="head1">Entity Engine Performance Tests</div> - -<div class="tabletext">NOTE: These performance results may vary a great deal for different -databases, JDBC drivers, JTA implementations (transaction managers), connection pools, -local vs. remote deployment configurations, and hardware (app server hardware, database -server hardware, network connections).</div> - -<br/> -<%if(security.hasPermission("ENTITY_MAINT", session)) {%> - -<%double startTime, totalTime, callsPerSecond;%> -<%int calls;%> -<table width="100%" border="1" cellspacing="0" cellpadding="2"> - <tr> - <td><div class="tabletext"><b>Operation</b></div></td> - <td><div class="tabletext"><b>Entity</b></div></td> - <td><div class="tabletext"><b>Calls</b></div></td> - <td><div class="tabletext"><b>Seconds</b></div></td> - <td><div class="tabletext"><b>Seconds/Call</b></div></td> - <td><div class="tabletext"><b>Calls/Second</b></div></td> - </tr> - <% - calls = 1000; startTime = (double) System.currentTimeMillis(); - for (int i=0; i < calls; i++) { GenericValue dummy = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", "GZ-1000")); } - totalTime = (double) System.currentTimeMillis() - startTime; - callsPerSecond = (double) calls / (totalTime/1000); - %> - <tr> - <td><div class="tabletext">findByPrimaryKey</div></td> - <td><div class="tabletext">Large:Product</div></td> - <td><div class="tabletext"><%=calls%></div></td> - <td><div class="tabletext"><%=totalTime/1000%></div></td> - <td><div class="tabletext"><%=1/callsPerSecond%></div></td> - <td><div class="tabletext"><%=callsPerSecond%></div></td> - </tr> - <% - calls = 10000; startTime = (double) System.currentTimeMillis(); - for (int i=0; i < calls; i++) { GenericValue dummy = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", "GZ-1000")); } - totalTime = (double) System.currentTimeMillis() - startTime; - callsPerSecond = (double) calls / (totalTime/1000); - %> - <tr> - <td><div class="tabletext">findByPrimaryKeyCache</div></td> - <td><div class="tabletext">Large:Product</div></td> - <td><div class="tabletext"><%=calls%></div></td> - <td><div class="tabletext"><%=totalTime/1000%></div></td> - <td><div class="tabletext"><%=1/callsPerSecond%></div></td> - <td><div class="tabletext"><%=callsPerSecond%></div></td> - </tr> - <% - calls = 1000; startTime = (double) System.currentTimeMillis(); - for (int i=0; i < calls; i++) { GenericValue dummy = delegator.findByPrimaryKey("Party", UtilMisc.toMap("partyId", "_NA_")); } - totalTime = (double) System.currentTimeMillis() - startTime; - callsPerSecond = (double) calls / (totalTime/1000); - %> - <tr> - <td><div class="tabletext">findByPrimaryKey</div></td> - <td><div class="tabletext">Small:Party</div></td> - <td><div class="tabletext"><%=calls%></div></td> - <td><div class="tabletext"><%=totalTime/1000%></div></td> - <td><div class="tabletext"><%=1/callsPerSecond%></div></td> - <td><div class="tabletext"><%=callsPerSecond%></div></td> - </tr> - <% - calls = 10000; startTime = (double) System.currentTimeMillis(); - for (int i=0; i < calls; i++) { GenericValue dummy = delegator.findByPrimaryKeyCache("Party", UtilMisc.toMap("partyId", "_NA_")); } - totalTime = (double) System.currentTimeMillis() - startTime; - callsPerSecond = (double) calls / (totalTime/1000); - %> - <tr> - <td><div class="tabletext">findByPrimaryKeyCache</div></td> - <td><div class="tabletext">Small:Party</div></td> - <td><div class="tabletext"><%=calls%></div></td> - <td><div class="tabletext"><%=totalTime/1000%></div></td> - <td><div class="tabletext"><%=1/callsPerSecond%></div></td> - <td><div class="tabletext"><%=callsPerSecond%></div></td> - </tr> - <% - List createTestList = new ArrayList(); - calls = 1000; startTime = (double) System.currentTimeMillis(); - for (int i=0; i < calls; i++) { - GenericValue dummy = delegator.makeValue("Product", UtilMisc.toMap("autoCreateKeywords", "N", "description", "Initial Description", "internalName", "Auto-Test Name", "productId", "_~WRITE_TEST~_" + i)); - createTestList.add(dummy); - delegator.create(dummy); - } - totalTime = (double) System.currentTimeMillis() - startTime; - callsPerSecond = (double) calls / (totalTime/1000); - %> - <tr> - <td><div class="tabletext">create</div></td> - <td><div class="tabletext">Large:Product</div></td> - <td><div class="tabletext"><%=calls%></div></td> - <td><div class="tabletext"><%=totalTime/1000%></div></td> - <td><div class="tabletext"><%=1/callsPerSecond%></div></td> - <td><div class="tabletext"><%=callsPerSecond%></div></td> - </tr> - <% - calls = 1000; startTime = (double) System.currentTimeMillis(); - for (int i=0; i < calls; i++) { - GenericValue dummy = (GenericValue) createTestList.get(i); - dummy.set("description", "This was a test from the performace JSP"); - dummy.store(); - } - totalTime = (double) System.currentTimeMillis() - startTime; - callsPerSecond = (double) calls / (totalTime/1000); - %> - <tr> - <td><div class="tabletext">update</div></td> - <td><div class="tabletext">Large:Product</div></td> - <td><div class="tabletext"><%=calls%></div></td> - <td><div class="tabletext"><%=totalTime/1000%></div></td> - <td><div class="tabletext"><%=1/callsPerSecond%></div></td> - <td><div class="tabletext"><%=callsPerSecond%></div></td> - </tr> - <% - calls = 1000; startTime = (double) System.currentTimeMillis(); - for (int i=0; i < calls; i++) { - GenericValue dummy = (GenericValue) createTestList.get(i); - dummy.remove(); - } - totalTime = (double) System.currentTimeMillis() - startTime; - callsPerSecond = (double) calls / (totalTime/1000); - %> - <tr> - <td><div class="tabletext">remove</div></td> - <td><div class="tabletext">Large:Product</div></td> - <td><div class="tabletext"><%=calls%></div></td> - <td><div class="tabletext"><%=totalTime/1000%></div></td> - <td><div class="tabletext"><%=1/callsPerSecond%></div></td> - <td><div class="tabletext"><%=callsPerSecond%></div></td> - </tr> - <% - calls = 100000; startTime = (double) System.currentTimeMillis(); - for (int i=0; i < calls; i++) { Map ptyMap = new HashMap(); ptyMap.put("partyId", "_NA_"); } - totalTime = (double) System.currentTimeMillis() - startTime; - callsPerSecond = (double) calls / (totalTime/1000); - %> - <tr> - <td><div class="tabletext">new HashMap</div></td> - <td><div class="tabletext">N/A</div></td> - <td><div class="tabletext"><%=calls%></div></td> - <td><div class="tabletext"><%=totalTime/1000%></div></td> - <td><div class="tabletext"><%=1/callsPerSecond%></div></td> - <td><div class="tabletext"><%=callsPerSecond%></div></td> - </tr> - <% - calls = 100000; startTime = (double) System.currentTimeMillis(); - for (int i=0; i < calls; i++) { Map ptyMap = UtilMisc.toMap("partyId", "_NA_"); } - totalTime = (double) System.currentTimeMillis() - startTime; - callsPerSecond = (double) calls / (totalTime/1000); - %> - <tr> - <td><div class="tabletext">UtilMisc.toMap</div></td> - <td><div class="tabletext">N/A</div></td> - <td><div class="tabletext"><%=calls%></div></td> - <td><div class="tabletext"><%=totalTime/1000%></div></td> - <td><div class="tabletext"><%=1/callsPerSecond%></div></td> - <td><div class="tabletext"><%=callsPerSecond%></div></td> - </tr> - <% - UtilCache utilCache = new UtilCache("test-cache", 0,0, false); - utilCache.put("testName", "testValue"); - calls = 1000000; startTime = (double) System.currentTimeMillis(); - for (int i=0; i < calls; i++) { utilCache.get("testName"); } - totalTime = (double) System.currentTimeMillis() - startTime; - callsPerSecond = (double) calls / (totalTime/1000); - %> - <tr> - <td><div class="tabletext">UtilCache.get(String) - basic settings</div></td> - <td><div class="tabletext">N/A</div></td> - <td><div class="tabletext"><%=calls%></div></td> - <td><div class="tabletext"><%=totalTime/1000%></div></td> - <td><div class="tabletext"><%=1/callsPerSecond%></div></td> - <td><div class="tabletext"><%=callsPerSecond%></div></td> - </tr> - <% - GenericPK testPk = delegator.makePK("Party", UtilMisc.toMap("partyId", "_NA_")); - utilCache.put(testPk, "testValue"); - calls = 1000000; startTime = (double) System.currentTimeMillis(); - for (int i=0; i < calls; i++) { utilCache.get(testPk); } - totalTime = (double) System.currentTimeMillis() - startTime; - callsPerSecond = (double) calls / (totalTime/1000); - %> - <tr> - <td><div class="tabletext">UtilCache.get(GenericPK) - basic settings</div></td> - <td><div class="tabletext">N/A</div></td> - <td><div class="tabletext"><%=calls%></div></td> - <td><div class="tabletext"><%=totalTime/1000%></div></td> - <td><div class="tabletext"><%=1/callsPerSecond%></div></td> - <td><div class="tabletext"><%=callsPerSecond%></div></td> - </tr> - <% - calls = 1000000; startTime = (double) System.currentTimeMillis(); - for (int i=0; i < calls; i++) { utilCache.put(testPk, "testValue"); } - totalTime = (double) System.currentTimeMillis() - startTime; - callsPerSecond = (double) calls / (totalTime/1000); - %> - <tr> - <td><div class="tabletext">UtilCache.put(GenericPK) - basic settings</div></td> - <td><div class="tabletext">N/A</div></td> - <td><div class="tabletext"><%=calls%></div></td> - <td><div class="tabletext"><%=totalTime/1000%></div></td> - <td><div class="tabletext"><%=1/callsPerSecond%></div></td> - <td><div class="tabletext"><%=callsPerSecond%></div></td> - </tr> -</table> - -<%}else{%> - -ERROR: You do not have permission to use this page (ENTITY_MAINT needed) - -<%}%> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |