You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2006/11/01 08:53:32 UTC
svn commit: r469809 - in /incubator/ofbiz/trunk/framework/webtools: config/
src/org/ofbiz/webtools/ webapp/webtools/ webapp/webtools/WEB-INF/
webapp/webtools/WEB-INF/actions/cache/ webapp/webtools/cache/
webapp/webtools/includes/ widget/
Author: jacopoc
Date: Tue Oct 31 23:53:31 2006
New Revision: 469809
URL: http://svn.apache.org/viewvc?view=rev&rev=469809
Log:
i18n changes and migration from jsp/region to widgets for the 'cache' pages; thanks to Marco Risaliti.
Part of OFBIZ-418.
Added:
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/editUtilCache.bsh (with props)
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCache.bsh (with props)
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCacheElements.bsh (with props)
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl (with props)
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl (with props)
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl (with props)
incubator/ofbiz/trunk/framework/webtools/widget/CacheScreens.xml (with props)
Removed:
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/EditUtilCache.jsp
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/FindUtilCache.jsp
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/FindUtilCacheElements.jsp
Modified:
incubator/ofbiz/trunk/framework/webtools/config/WebtoolsErrorUiLabels.properties
incubator/ofbiz/trunk/framework/webtools/config/WebtoolsErrorUiLabels_it.properties
incubator/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties
incubator/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels_it.properties
incubator/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/UtilCacheEvents.java
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/regions.xml
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/messages.ftl
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl
incubator/ofbiz/trunk/framework/webtools/widget/EntitySyncForms.xml
incubator/ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml
Modified: incubator/ofbiz/trunk/framework/webtools/config/WebtoolsErrorUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/config/WebtoolsErrorUiLabels.properties?view=diff&rev=469809&r1=469808&r2=469809
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/config/WebtoolsErrorUiLabels.properties (original)
+++ incubator/ofbiz/trunk/framework/webtools/config/WebtoolsErrorUiLabels.properties Tue Oct 31 23:53:31 2006
@@ -37,4 +37,17 @@
genericWebEvent.following_error_occurred=The following error(s) occurred
genericWebEvent.creation_param_failed=Creation of ${entityName} failed for entity
genericWebEvent.update_of_param_failed=Update of ${entityName} failed for value
-genericWebEvent.update_mode_invalid=Update Mode specified (${updateMode}) was not valid
+genericWebEvent.update_mode_invalid=Update Mode specified (${updateMode}) was not valid
+
+utilCacheEvents.permissionEdit=You do not have permission to perform this operation, UTIL_CACHE_EDIT required
+utilCacheEvents.noCacheNameSpecified=Could not remove cache line/element, no cache name specified
+utilCacheEvents.noElementNumberSpecified=Could not remove cache line/element, no element number specified
+utilCache.removeElementWithKey=Removed element from cache with key: ${key}
+utilCache.couldNotRemoveElementNumber=Could not remove cache element, element not found with cache name: ${name} , element number: ${numString}
+utilCache.couldNotRemoveElement=Could not remove cache element, cache not found with name: ${name}
+utilCache.couldNotClearCache=Could not clear cache, no name specified
+utilCache.clearCache=Cleared cache with name: ${name}
+utilCache.couldNotClearCacheNotFoundName=Could not clear cache, cache not found with name: ${name}
+utilCache.clearAllCaches=Cleared all caches
+utilCache.clearAllExpiredElements=Cleared all expired elements from all caches
+utilCache.couldNotUpdateCacheSetting=Could not update cache settings, no name specified
Modified: incubator/ofbiz/trunk/framework/webtools/config/WebtoolsErrorUiLabels_it.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/config/WebtoolsErrorUiLabels_it.properties?view=diff&rev=469809&r1=469808&r2=469809
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/config/WebtoolsErrorUiLabels_it.properties (original)
+++ incubator/ofbiz/trunk/framework/webtools/config/WebtoolsErrorUiLabels_it.properties Tue Oct 31 23:53:31 2006
@@ -29,3 +29,16 @@
genericWebEvent.creation_param_failed=Creazione dell'${entityName} fallita per entit\u00e0
genericWebEvent.update_of_param_failed=Aggiornamento dell'${entityName} fallita per il valore
genericWebEvent.update_mode_invalid=Modo Aggiornamento specificato (${updateMode}) non \u00e8 valido
+
+utilCacheEvents.permissionEdit=Tu non hai il permesso di eseguire questa operazione, permesso UTIL_CACHE_EDIT richiesto
+utilCacheEvents.noCacheNameSpecified=Non \u00e8 possibile rimuovere la riga/elemento, nessun nome di cache specificato
+utilCacheEvents.noElementNumberSpecified=Non \u00e8 possibile rimuovere la riga/elemento, nessun numero elemento specificato
+utilCache.removeElementWithKey=Rimosso elemento dalla cache con chiave: ${key}
+utilCache.couldNotRemoveElementNumber=Non \u00e8 possibile rimuovere l'elemento della cache, elemento non trovato con nome cache: ${name} , elemento numero: ${numString}
+utilCache.couldNotRemoveElement=Non \u00e8 possibile rimuovere l'elemento della cache, cache non trovata con nome: ${name}
+utilCache.couldNotClearCache=Non \u00e8 possibile pulire la cache, nessun nome specificato
+utilCache.clearCache=Pulita cache con nome: ${name}
+utilCache.couldNotClearCacheNotFoundName=Non \u00e8 possibile pulire la cache, cache non trovata con nome: ${name}
+utilCache.clearAllCaches=Tutte le cache sono state pulite
+utilCache.clearAllExpiredElements=Pulite tutti gli elementi scaduti da tutte le caches
+utilCache.couldNotUpdateCacheSetting=Non \u00e8 possibile aggiornare le impostazioni della cache, nessun nome specificato
Modified: incubator/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties?view=diff&rev=469809&r1=469808&r2=469809
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties (original)
+++ incubator/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties Tue Oct 31 23:53:31 2006
@@ -21,12 +21,15 @@
WebtoolsCompanySubtitle=Part of the Open For Business Family of Open Source Software
FrameworkWebTools=Framework Web Tools
+PageTitleEditUtilCache=Edit Util Cache
PageTitleEntityExport=XML Data Export
PageTitleEntityExportAll=XML Data Export All
PageTitleEntityImport=XML Data Import
PageTitleEntityImportDir=XML Data Import Dir
PageTitleEntitySyncStatus=Entity Sync Status
PageTitleEntitySQLProcessor=Entity SQL Processor
+PageTitleFindUtilCache=Cache Maintenance Page
+PageTitleFindUtilCacheElements=Cache Element Maintenance Page
PageTitleLogConfiguration=Debugging Levels
PageTitleLogView=Log View
PageTitleJobList=Job List
@@ -39,11 +42,19 @@
WebtoolsActions=Actions
WebtoolsAddLoggerFormDescription=This form allows you to enable a logger for a specific package or class.
WebtoolsAdjustDebuggingLevels=Adjust Debugging Levels
+WebtoolsAdministration=Administration
WebtoolsAsync=ASYNC
-WebtoolsCachDebugTools=Cache & Debug Tools
+WebtoolsBackToCacheMaintenance=Back to Cache Maintenance
+WebtoolsBytes=Bytes
+WebtoolsCacheDebugTools=Cache & Debug Tools
+WebtoolsCacheElementKey=Cache Element Key
WebtoolsCacheMaintenance=Cache Maintenance
WebtoolsCancelJob=Cancel Job
+WebtoolsCacheName=Cache Name
WebtoolsCheckUpdateDatabase=Check/Update Database
+WebtoolsClearAllCaches=Clear All Caches
+WebtoolsClearExpiredFromAll=Clear Expired From All
+WebtoolsClearThisCache=Clear this Cache
WebtoolsCompareType=Compare type
WebtoolsConditions=Conditions
WebtoolsConditionService=Condition service
@@ -55,6 +66,7 @@
WebtoolsDeleteFiles=Delete Files Afterwards?
WebtoolsDispatcherName=Dispatcher Name
WebtoolsEditCustomTimePeriods=Edit Custom Time Periods
+WebtoolsElements=Elements
WebtoolsEngineName=Engine Name
WebtoolsEntityDataMaintenance=Entity Data Maintenance
WebtoolsEntityEngine=Entity Engine
@@ -65,6 +77,7 @@
WebtoolsErrorLogLevel=Error
WebtoolsErrorLogLevelTooltip=The Error level designates error events that might still allow the application to continue running.
WebtoolsEventName=Event name
+WebtoolsExpireTime=Expire Time
WebtoolsExport=Export
WebtoolsExportable=Exportable
WebtoolsExportFromDataSource=XML Export from DataSource(s)
@@ -72,7 +85,9 @@
WebtoolsFatalLogLevelTooltip=The Fatal level designates very severe error events that will presumably lead the application to abort.
WebtoolsFieldName=Field Name
WebtoolsFormat=Format
+WebtoolsFreeMemory=FREE
WebtoolsFrequency=Frequency
+WebtoolsHits=Hits
WebtoolsImplementedServices=Implemented Services
WebtoolsImport=Import
WebtoolsImportantLogLevel=Important
@@ -95,6 +110,7 @@
WebtoolsLHSMapName=LHS map name
WebtoolsLHSValueName=LHS value name
WebtoolsLimitRowsTo=Limit Rows To
+WebtoolsLoadOfflineData=Load Offline Data
WebtoolsLocation=Location
WebtoolsLogFileName=Log File Name
WebtoolsLoggerAdditivity=Additivity
@@ -103,8 +119,11 @@
WebtoolsLoggerName=Name
WebtoolsMainPage=WebTools Main Page
WebtoolsMaintainTimestamps=Maintain Timestamps?
+WebtoolsMaxMemory=MAX
WebtoolsMaxRetry=Max Retry
WebtoolsMaxRetries=Max retries
+WebtoolsMaxSize=Max Size
+WebtoolsMemory=Memory
WebtoolsMessage1=This page can be used to export data from the database
WebtoolsMessage2=The exported documents will have a root tag of "<entity-engine-xml>"
WebtoolsMessage3=There will be one file for each Entity in the configured delegator for this webapp
@@ -120,12 +139,20 @@
WebtoolsMessage13=This application is primarily intended for developers and system administrators
WebtoolsMessage14=For something interesting make sure you are logged in, try username:admin, password:ofbiz
WebtoolsMiscSetupTools=Misc. Setup Tools
+WebtoolsMisses=Misses/NF/EXP/SR
+WebtoolsMissesTotal=Misses
+WebtoolsMissesNotFound=Not Found
+WebtoolsMissesExpire=Expire
+WebtoolsMissesSoftReference=Soft Reference
WebtoolsMode=Mode
WebtoolsMostlyInserts=Mostly Inserts?
WebtoolsNameOrRole=Name or Role
WebtoolsNoParametersDefined=No parameters defined
WebtoolsNoServicesFound=No services found
WebtoolsNote1=NOTE: If you have not already run the installation data loading script, from the ofbiz home directory run "ant run-install" or "java -jar ofbiz.jar install"
+WebtoolsNoUtilCacheFound=No UtilCache instances found
+WebtoolsNoUtilCacheElementsFound=No UtilCache elements found
+WebtoolsNoUtilCacheSpecified=No Cache Name Specified
WebtoolsOperator=Operator
WebtoolsOptional=Optional
WebtoolsOutParameters=Out parameters
@@ -133,11 +160,17 @@
WebtoolsParameterName=Parameter Name
WebtoolsPause=Pause (secs) between files
WebtoolsPerformanceTests=Performance Tests
+WebtoolsPermissionError=Webtools Permission Error
WebtoolsPermissionType=Permission Type
WebtoolsPool=Pool
+WebtoolsReloadCacheList=Reload Cache List
+WebtoolsRemoves=removes:H/M
+WebtoolsRemovesHit=removes:Hit
+WebtoolsRemovesMisses=removes:Misses
WebtoolsRequireNewTransaction=Require new transaction
WebtoolsRHSMapName=RHS map name
WebtoolsRHSValueName=RHS value name
+WebtoolsRunGC=Run GC
WebtoolsRunOnError=Run on error
WebtoolsRunOnFailure=Run on failure
WebtoolsRunTime=Run Time
@@ -155,11 +188,17 @@
WebtoolsServiceReference=Service Reference
WebtoolsServiceWSDL=WSDL Service definition
WebtoolsShowShowWSDL=Show wsdl
+WebtoolsSize=Size
+WebtoolsSizeTotal=Size Total
WebtoolsStatusInvalid=Invalid Status
WebtoolsStatusRunning=Running
WebtoolsStatusShuttingDown=Shutting down
WebtoolsStatusSleeping=Sleeping
WebtoolsSync=SYNC
+WebtoolsSyncAcceptOffline=Accept Offline Sync
+WebtoolsSyncRunOffline=Run Offline Sync
+WebtoolsSyncRejectOffline=Reject Offline Sync
+WebtoolsSyncResetRunStatus=Reset Run Status
WebtoolsSqlProcessor=SQL Processor
WebtoolsSqlCommand=SQL Command
WebtoolsStatsSinceServerStart=Stats Since Server Start
@@ -176,6 +215,10 @@
WebtoolsTitle4=of all entity definitions shared by the vertical applications that
WebtoolsTitle5=are built on top of these entity definitions and the tools surrounding them such as the entity, workflow, and rule engines,
WebtoolsTitle6=content and knowledge management, data analysis, and so forth
+WebtoolsTotalMemory=TOTAL
+WebtoolsUsedMemory=USED
+WebtoolsUseFileStore=Use File Store ?
+WebtoolsUseSoftRef=Use Soft Ref ?
WebtoolsUseTransaction=Use transaction
WebtoolsVerboseLogLevel=Verbose
WebtoolsVerboseLogLevelTooltip=The Verbose Level designates fine-grained informational events that are most useful to debug an application.
@@ -185,3 +228,19 @@
WebtoolsWorkflowEngineTools=Workflow Engine Tools
WebtoolsWorkflowMonitor=Workflow Monitor
WebtoolsWorkWithDataFiles=Work With Data Files
+
+FormFieldTitle_xmlFileName=Xml File Name
+FormFieldTitle_entitySyncId=Entity Sync Id
+FormFieldTitle_runStatusId=Run Status Id
+FormFieldTitle_lastSuccessfulSynchTime=Last Successful Synch Time
+FormFieldTitle_lastHistoryStartDate=Last History Start Date
+FormFieldTitle_preOfflineSynchTime=Pre Offline Synch Time
+FormFieldTitle_offlineSyncSplitMillis=Offline Sync Split Millis
+FormFieldTitle_syncSplitMillis=Sync Split Millis
+FormFieldTitle_syncEndBufferMillis=Sync End Buffer Millis
+FormFieldTitle_maxRunningNoUpdateMillis=Max Running No Update Millis
+FormFieldTitle_targetServiceName=Target Service Name
+FormFieldTitle_targetDelegatorName=Target Delegator Name
+FormFieldTitle_keepRemoveInfoHours=Keep Remove Info Hours
+FormFieldTitle_forPullOnly=For Pull Only
+FormFieldTitle_forPushOnly=For Push Only
Modified: incubator/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels_it.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels_it.properties?view=diff&rev=469809&r1=469808&r2=469809
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels_it.properties (original)
+++ incubator/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels_it.properties Tue Oct 31 23:53:31 2006
@@ -17,12 +17,15 @@
WebtoolsCompanySubtitle=Part of the Open For Business Family of Open Source Software
FrameworkWebTools=Applicazione Strumenti Web
+PageTitleEditUtilCache=Aggiorna Cache
PageTitleEntityExport=Esporta i Dati in XML
PageTitleEntityExportAll=Esporta Tutti i Dati in XML
PageTitleEntityImport=Importa i Dati da XML
PageTitleEntityImportDir=Importa i Dati da XML nella Directory
PageTitleEntitySyncStatus=Stato Sincronizzazione Entit\u00e0
PageTitleEntitySQLProcessor=Processore SQL Entit\u00e0
+PageTitleFindUtilCache=Pagina Manutenzione Cache
+PageTitleFindUtilCacheElements=Pagina Manutenzione Elementi Cache
PageTitleLogConfiguration=Livello di Debugging
PageTitleLogView=Mostra Log
PageTitleJobList=Lista Lavori
@@ -35,11 +38,19 @@
WebtoolsActions=Azioni
WebtoolsAddLoggerFormDescription=Questa form ti permette di abilitare un logger per uno specifico package o classe.
WebtoolsAdjustDebuggingLevels=Aggiustamento Livello di Debugging
+WebtoolsAdministration=Amministra
WebtoolsAsync=Asincrono
-WebtoolsCachDebugTools=Strumenti di Debug e Cache
+WebtoolsBackToCacheMaintenance=Torna Indietro alla Pagina Manutenzione Cache
+WebtoolsBytes=Bytes
+WebtoolsCacheDebugTools=Strumenti di Debug e Cache
+WebtoolsCacheElementKey=Chiave Elemento Cache
WebtoolsCacheMaintenance=Manutenzione Cache
WebtoolsCancelJob=Cancella Lavoro
+WebtoolsCacheName=Nome Cache
WebtoolsCheckUpdateDatabase=Controlla/Aggiorna Database
+WebtoolsClearAllCaches=Pulisci Tutte le Caches
+WebtoolsClearExpiredFromAll=Pulisci quelle Scadute da Tutte
+WebtoolsClearThisCache=Pulisci questa Cache
WebtoolsCompareType=Tipo Confronto
WebtoolsConditions=Condizioni
WebtoolsConditionService=Condizione servizio
@@ -51,6 +62,7 @@
WebtoolsDefaultEntityName=Nome Entit\u00e0 Default
WebtoolsDispatcherName=Nome Dispatcher
WebtoolsEditCustomTimePeriods=Aggiorna Periodi di Tempo Personalizzati
+WebtoolsElements=Elementi
WebtoolsEngineName=Nome Engine
WebtoolsEntityDataMaintenance=Manutenzione Dati Entit\u00e0
WebtoolsEntityEngine=Engine Entit\u00e0
@@ -61,6 +73,7 @@
WebtoolsErrorLogLevel=Errore
WebtoolsErrorLogLevelTooltip=Il livello Errore designa eventi di errori che potrebbero ancora permettere all'applicazione di continuare l'esecuzione.
WebtoolsEventName=Nome Evento
+WebtoolsExpireTime=Tempo Scaduto
WebtoolsExport=Esportazione
WebtoolsExportable=Esportabile
WebtoolsExportFromDataSource=Esporta con la Sorgente Dati da XML
@@ -68,7 +81,9 @@
WebtoolsFatalLogLevelTooltip=Il livello Fatale designa molti eventi di errori che presubibilmente l'applicazione terminer\u00e0.
WebtoolsFieldName=Nome Campo
WebtoolsFormat=Formato
+WebtoolsFreeMemory=LIBERA
WebtoolsFrequency=Frequenza
+WebtoolsHits=Colpi
WebtoolsImplementedServices=Servizi Implementati
WebtoolsImport=Importazione
WebtoolsImportantLogLevel=Importante
@@ -91,6 +106,7 @@
WebtoolsLHSMapName=Nome mappa LHS
WebtoolsLHSValueName=Nome valore LHS
WebtoolsLimitRowsTo=Limita Righe A
+WebtoolsLoadOfflineData=Carica Dati Offline
WebtoolsLocation=Dislocato in
WebtoolsLogFileName=Nome File di Log
WebtoolsLoggerAdditivity=Additivit\u00e0
@@ -99,8 +115,11 @@
WebtoolsLoggerName=Nome
WebtoolsMainPage=Pagina Principale
WebtoolsMaintainTimestamps=Mantieni Timestamps?
+WebtoolsMaxMemory=MASSIMA
WebtoolsMaxRetry=Tentativi Massimo
WebtoolsMaxRetries=Tentativi Massimi
+WebtoolsMaxSize=Ampiezza Massima
+WebtoolsMemory=Memoria
WebtoolsMessage1=Questa pagine può essere usata per esportare i dati dal database
WebtoolsMessage2=I documenti esportati avranno un root tag "<entity-engine-xml>"
WebtoolsMessage3=C'è un file per ogni Entit\u00e0 nel delegator configurato per questa applicazione web
@@ -116,24 +135,38 @@
WebtoolsMessage13=Questa applicazione \u00e8 progettat per gli sviluppatori e amministratori di sistema
WebtoolsMessage14=Se interessato, devi essere autenticato, provare con Nome utente:admin, Password:ofbiz
WebtoolsMiscSetupTools=Strumenti Vari di Configurazione
+WebtoolsMisses=Perse Non Trovate Scadute Pulizia Riferimenti
+WebtoolsMissesTotal=Perse
+WebtoolsMissesNotFound=Non Trovate
+WebtoolsMissesExpire=Scadute
+WebtoolsMissesSoftReference=Pulizia Riferimenti
WebtoolsMode=Modo
WebtoolsMostlyInserts=Maggiormente Inserts?
WebtoolsNameOrRole=Nome o Ruolo
WebtoolsNoParametersDefined=Nessun parametro definito
WebtoolsNoServicesFound=Nessun servizio trovato
WebtoolsNote1=NOTA: Se non hai ancora eseguito lo script di installazione di caricamento dei dati, esegui dalla home directory di ofbiz "ant run-install" o "java -jar ofbiz.jar install"
+WebtoolsNoUtilCacheFound=Nessuna istanza di Cache trovata
+WebtoolsNoUtilCacheElementsFound=Nessun elemento di Cache trovato
+WebtoolsNoUtilCacheSpecified=Nessun Nome di Cache Specificato
WebtoolsOperator=Operatore
WebtoolsOptional=Opzionale
WebtoolsOutParameters=Parametri in Uscita
WebtoolsOutputDirectory=Directory di Output
WebtoolsParameterName=Nome Parametro
WebtoolsPause=Pausa (secondi) fra i files
+WebtoolsPermissionError=Errore Permesso Strumenti Web
WebtoolsPerformanceTests=Test delle Prestazioni
WebtoolsPermissionType=Tipo Permesso
WebtoolsPool=Pool
+WebtoolsReloadCacheList=Ricarica Lista Cache
+WebtoolsRemoves=Rimossi: Colpi Persi
+WebtoolsRemovesHit=Rimossi: Colpi
+WebtoolsRemovesMisses=Rimossi: Persi
WebtoolsRequireNewTransaction=Richiesta nuova transazione
WebtoolsRHSMapName=Nome mappa RHS
WebtoolsRHSValueName=Nome valore RHS
+WebtoolsRunGC=Esegui GC
WebtoolsRunOnError=Esegui su errore
WebtoolsRunOnFailure=Esegui su fallimento
WebtoolsRunTime=Tempo di Esecuzione
@@ -151,11 +184,17 @@
WebtoolsServiceReference=Riferimenti Servizi
WebtoolsServiceWSDL=Definizione Servizio WSDL
WebtoolsShowShowWSDL=Mostra wsdl
+WebtoolsSize=Ampiezza
+WebtoolsSizeTotal=Ampiezza Totale
WebtoolsStatusInvalid=Stato Invalido
WebtoolsStatusRunning=In Esecuzione
WebtoolsStatusShuttingDown=In Chiusura
WebtoolsStatusSleeping=Attesa
WebtoolsSync=SINCRONO
+WebtoolsSyncAcceptOffline=Accetta Sincronizzazione Offline
+WebtoolsSyncRunOffline=Esegui Sincronizzazione Offline
+WebtoolsSyncRejectOffline=Rifiuta Sincronizzazione Offline
+WebtoolsSyncResetRunStatus=Esegui Azzeramento Stato
WebtoolsSqlProcessor=Esegui SQL
WebtoolsSqlCommand=Comando SQL
WebtoolsStatsSinceServerStart=Statistiche da quanto il Server \u00e8 Avviato
@@ -172,6 +211,10 @@
WebtoolsTitle4=di tutte le definizioni delle entit\u00e0 condivise da tuttle le applicazioni che
WebtoolsTitle5=sono costruite alla base di queste definizioni di entit\u00e0 e strumenti intorno a questi come entit\u00e0, flussi di lavoro, e engine delle regole,
WebtoolsTitle6=gestione contenuti, analisi dati, e cos\u00ec via
+WebtoolsTotalMemory=TOTALE
+WebtoolsUsedMemory=USATA
+WebtoolsUseFileStore=Usa File Memorizzato ?
+WebtoolsUseSoftRef=Usa Riferimento Soft ?
WebtoolsUseTransaction=Usa transazione
WebtoolsVerboseLogLevel=Dettaglio
WebtoolsVerboseLogLevelTooltip=Il livello Dettaglio designa eventi informativi che sono utili per il debug dell'applicazione.
@@ -181,3 +224,19 @@
WebtoolsWorkflowEngineTools=Strumenti per Engine Flussi di Lavoro
WebtoolsWorkflowMonitor=Monitor dei Flussi di Lavoro
WebtoolsWorkWithDataFiles=Lavora Con i Files di Dati
+
+FormFieldTitle_xmlFileName=Nome File Xml
+FormFieldTitle_entitySyncId=Codice Entit\u00e0 Sincr.
+FormFieldTitle_runStatusId=Stato Esecuzione
+FormFieldTitle_lastSuccessfulSynchTime=Ultimo Orario Sincr. con Successo
+FormFieldTitle_lastHistoryStartDate=Ultima Data Inizio Storia
+FormFieldTitle_preOfflineSynchTime=Pre Offline Tempo Sincr.
+FormFieldTitle_offlineSyncSplitMillis=Sincr. Offline Split Millis
+FormFieldTitle_syncSplitMillis=Sincr. Split Millis
+FormFieldTitle_syncEndBufferMillis=Fine Sincr. End Buffer Millis
+FormFieldTitle_maxRunningNoUpdateMillis=Massima Esecuzione con Nessun Aggiornamento Millis
+FormFieldTitle_targetServiceName=Nome Servizio Destinazione
+FormFieldTitle_targetDelegatorName=Nome Delegator Destinazione
+FormFieldTitle_keepRemoveInfoHours=Mantieni Orari Informazioni Rimosse
+FormFieldTitle_forPullOnly=Per Prelievo Solo
+FormFieldTitle_forPushOnly=Per Caricamento Solo
Modified: incubator/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/UtilCacheEvents.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/UtilCacheEvents.java?view=diff&rev=469809&r1=469808&r2=469809
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/UtilCacheEvents.java (original)
+++ incubator/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/UtilCacheEvents.java Tue Oct 31 23:53:31 2006
@@ -16,10 +16,14 @@
package org.ofbiz.webtools;
import java.util.Iterator;
+import java.util.Locale;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.ofbiz.base.util.UtilHttp;
+import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.cache.UtilCache;
import org.ofbiz.security.Security;
@@ -28,27 +32,35 @@
*/
public class UtilCacheEvents {
+ public static final String err_resource = "WebtoolsErrorUiLabels";
+
/** An HTTP WebEvent handler the specified element from the specified cache
* @param request The HTTP request object for the current JSP or Servlet request.
* @param response The HTTP response object for the current JSP or Servlet request.
* @return
*/
public static String removeElementEvent(HttpServletRequest request, HttpServletResponse response) {
+ String errMsg = "";
+ Locale locale = UtilHttp.getLocale(request);
+
Security security = (Security) request.getAttribute("security");
if (!security.hasPermission("UTIL_CACHE_EDIT", request.getSession())) {
- request.setAttribute("_ERROR_MESSAGE_", "You do not have permission to perform this operation, UTIL_CACHE_EDIT required.");
+ errMsg = UtilProperties.getMessage(UtilCacheEvents.err_resource, "utilCacheEvents.permissionEdit", locale) + ".";
+ request.setAttribute("_ERROR_MESSAGE_", errMsg);
return "error";
}
String name = request.getParameter("UTIL_CACHE_NAME");
if (name == null) {
- request.setAttribute("_ERROR_MESSAGE_", "Could not remove cache line/element, no cache name specified.");
+ errMsg = UtilProperties.getMessage(UtilCacheEvents.err_resource, "utilCacheEvents.noCacheNameSpecified", locale) + ".";
+ request.setAttribute("_ERROR_MESSAGE_", errMsg);
return "error";
}
String numString = request.getParameter("UTIL_CACHE_ELEMENT_NUMBER");
if (numString == null) {
- request.setAttribute("_ERROR_MESSAGE_", "Could not remove cache line/element, no element number specified.");
+ errMsg = UtilProperties.getMessage(UtilCacheEvents.err_resource, "utilCacheEvents.noElementNumberSpecified", locale) + ".";
+ request.setAttribute("_ERROR_MESSAGE_", "");
return "error";
}
int number;
@@ -86,13 +98,16 @@
if (key != null) {
utilCache.remove(key);
- request.setAttribute("_EVENT_MESSAGE_", "Removed element from cache with key: " + key.toString());
+ errMsg = UtilProperties.getMessage(UtilCacheEvents.err_resource, "utilCache.removeElementWithKey", UtilMisc.toMap("key", key.toString()), locale) + ".";
+ request.setAttribute("_EVENT_MESSAGE_", errMsg);
} else {
- request.setAttribute("_ERROR_MESSAGE_", "Could not remove cache element, element not found with cache name: " + name + ", element number: " + numString);
+ errMsg = UtilProperties.getMessage(UtilCacheEvents.err_resource, "utilCache.couldNotRemoveElementNumber", UtilMisc.toMap("name", name, "numString", numString), locale) + ".";
+ request.setAttribute("_ERROR_MESSAGE_", errMsg);
return "error";
}
} else {
- request.setAttribute("_ERROR_MESSAGE_", "Could not remove cache element, cache not found with name: " + name);
+ errMsg = UtilProperties.getMessage(UtilCacheEvents.err_resource, "utilCache.couldNotRemoveElement", UtilMisc.toMap("name", name), locale) + ".";
+ request.setAttribute("_ERROR_MESSAGE_", errMsg);
return "error";
}
return "success";
@@ -104,25 +119,32 @@
* @return
*/
public static String clearEvent(HttpServletRequest request, HttpServletResponse response) {
+ String errMsg = "";
+ Locale locale = UtilHttp.getLocale(request);
+
Security security = (Security) request.getAttribute("security");
if (!security.hasPermission("UTIL_CACHE_EDIT", request.getSession())) {
- request.setAttribute("_ERROR_MESSAGE_", "You do not have permission to perform this operation, UTIL_CACHE_EDIT required.");
+ errMsg = UtilProperties.getMessage(UtilCacheEvents.err_resource, "utilCacheEvents.permissionEdit", locale) + ".";
+ request.setAttribute("_ERROR_MESSAGE_", errMsg);
return "error";
}
String name = request.getParameter("UTIL_CACHE_NAME");
if (name == null) {
- request.setAttribute("_ERROR_MESSAGE_", "Could not clear cache, no name specified.");
+ errMsg = UtilProperties.getMessage(UtilCacheEvents.err_resource, "utilCache.couldNotClearCache", locale) + ".";
+ request.setAttribute("_ERROR_MESSAGE_", errMsg);
return "error";
}
UtilCache utilCache = (UtilCache) UtilCache.utilCacheTable.get(name);
if (utilCache != null) {
utilCache.clear();
- request.setAttribute("_EVENT_MESSAGE_", "Cleared cache with name: " + name);
+ errMsg = UtilProperties.getMessage(UtilCacheEvents.err_resource, "utilCache.clearCache", UtilMisc.toMap("name", name), locale) + ".";
+ request.setAttribute("_EVENT_MESSAGE_", errMsg);
} else {
- request.setAttribute("_ERROR_MESSAGE_", "Could not clear cache, cache not found with name: " + name);
+ errMsg = UtilProperties.getMessage(UtilCacheEvents.err_resource, "utilCache.couldNotClearCacheNotFoundName", UtilMisc.toMap("name", name), locale) + ".";
+ request.setAttribute("_ERROR_MESSAGE_", errMsg);
return "error";
}
return "success";
@@ -134,14 +156,19 @@
* @return
*/
public static String clearAllEvent(HttpServletRequest request, HttpServletResponse response) {
+ String errMsg = "";
+ Locale locale = UtilHttp.getLocale(request);
+
Security security = (Security) request.getAttribute("security");
if (!security.hasPermission("UTIL_CACHE_EDIT", request.getSession())) {
- request.setAttribute("_ERROR_MESSAGE_", "You do not have permission to perform this operation, UTIL_CACHE_EDIT required.");
+ errMsg = UtilProperties.getMessage(UtilCacheEvents.err_resource, "utilCacheEvents.permissionEdit", locale) + ".";
+ request.setAttribute("_ERROR_MESSAGE_", errMsg);
return "error";
}
UtilCache.clearAllCaches();
- request.setAttribute("_EVENT_MESSAGE_", "Cleared all caches.");
+ errMsg = UtilProperties.getMessage(UtilCacheEvents.err_resource, "utilCache.clearAllCaches", locale) + ".";
+ request.setAttribute("_EVENT_MESSAGE_", errMsg);
return "success";
}
@@ -151,14 +178,19 @@
* @return
*/
public static String clearAllExpiredEvent(HttpServletRequest request, HttpServletResponse response) {
+ String errMsg = "";
+ Locale locale = UtilHttp.getLocale(request);
+
Security security = (Security) request.getAttribute("security");
if (!security.hasPermission("UTIL_CACHE_EDIT", request.getSession())) {
- request.setAttribute("_ERROR_MESSAGE_", "You do not have permission to perform this operation, UTIL_CACHE_EDIT required.");
+ errMsg = UtilProperties.getMessage(UtilCacheEvents.err_resource, "utilCacheEvents.permissionEdit", locale) + ".";
+ request.setAttribute("_ERROR_MESSAGE_", errMsg);
return "error";
}
UtilCache.clearExpiredFromAllCaches();
- request.setAttribute("_EVENT_MESSAGE_", "Cleared all expried elements from all caches.");
+ errMsg = UtilProperties.getMessage(UtilCacheEvents.err_resource, "utilCache.clearAllExpiredElements", locale) + ".";
+ request.setAttribute("_EVENT_MESSAGE_", errMsg);
return "success";
}
@@ -168,16 +200,21 @@
* @return
*/
public static String updateEvent(HttpServletRequest request, HttpServletResponse response) {
+ String errMsg = "";
+ Locale locale = UtilHttp.getLocale(request);
+
Security security = (Security) request.getAttribute("security");
if (!security.hasPermission("UTIL_CACHE_EDIT", request.getSession())) {
- request.setAttribute("_ERROR_MESSAGE_", "You do not have permission to perform this operation, UTIL_CACHE_EDIT required.");
+ errMsg = UtilProperties.getMessage(UtilCacheEvents.err_resource, "utilCacheEvents.permissionEdit", locale) + ".";
+ request.setAttribute("_EVENT_MESSAGE_", errMsg);
return "error";
}
String name = request.getParameter("UTIL_CACHE_NAME");
if (name == null) {
- request.setAttribute("_ERROR_MESSAGE_", "Could not update cache settings, no name specified");
+ errMsg = UtilProperties.getMessage(UtilCacheEvents.err_resource, "utilCache.couldNotUpdateCacheSetting", locale) + ".";
+ request.setAttribute("_ERROR_MESSAGE_", errMsg);
return "error";
}
String maxSizeStr = request.getParameter("UTIL_CACHE_MAX_SIZE");
Added: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/editUtilCache.bsh
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/editUtilCache.bsh?view=auto&rev=469809
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/editUtilCache.bsh (added)
+++ incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/editUtilCache.bsh Tue Oct 31 23:53:31 2006
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2001-2006 The Apache Software Foundation
+ *
+ * Licensed 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.
+ */
+import org.ofbiz.base.util.cache.UtilCache;
+import org.ofbiz.base.util.cache.CacheLine;
+import org.ofbiz.base.util.UtilFormatOut;
+import org.ofbiz.security.Security;
+
+String cacheName = request.getParameter("UTIL_CACHE_NAME");
+context.put("cacheName", cacheName);
+
+if (cacheName != null) {
+ UtilCache utilCache = (UtilCache)UtilCache.utilCacheTable.get(cacheName);
+ if (utilCache != null) {
+ Map cache = new HashMap();
+
+ cache.put("cacheName", utilCache.getName());
+ cache.put("cacheSize", UtilFormatOut.formatQuantity(utilCache.size()));
+ cache.put("hitCount", UtilFormatOut.formatQuantity(utilCache.getHitCount()));
+ cache.put("missCountTot", UtilFormatOut.formatQuantity(utilCache.getMissCountTotal()));
+ cache.put("missCountNotFound", UtilFormatOut.formatQuantity(utilCache.getMissCountNotFound()));
+ cache.put("missCountExpired", UtilFormatOut.formatQuantity(utilCache.getMissCountExpired()));
+ cache.put("missCountSoftRef", UtilFormatOut.formatQuantity(utilCache.getMissCountSoftRef()));
+ cache.put("removeHitCount", UtilFormatOut.formatQuantity(utilCache.getRemoveHitCount()));
+ cache.put("removeMissCount", UtilFormatOut.formatQuantity(utilCache.getRemoveMissCount()));
+ cache.put("maxSize", UtilFormatOut.formatQuantity(utilCache.getMaxSize()));
+ cache.put("expireTime", UtilFormatOut.formatQuantity(utilCache.getExpireTime()));
+ cache.put("useSoftReference", (new Boolean(utilCache.getUseSoftReference())).toString());
+ cache.put("useFileSystemStore", (new Boolean(utilCache.getUseFileSystemStore())).toString());
+
+ long exp = utilCache.getExpireTime();
+ long hrs = exp/(60*60*1000);
+ exp = exp%(60*60*1000);
+ long mins = exp/(60*1000);
+ exp = exp%(60*1000);
+ double secs = (double)exp/(1000.0);
+ cache.put("hrs", UtilFormatOut.formatQuantity(hrs));
+ cache.put("mins", UtilFormatOut.formatQuantity(mins));
+ cache.put("secs", UtilFormatOut.formatPrice(secs));
+
+ context.put("cache", cache);
+ }
+}
\ No newline at end of file
Propchange: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/editUtilCache.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/editUtilCache.bsh
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/editUtilCache.bsh
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCache.bsh
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCache.bsh?view=auto&rev=469809
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCache.bsh (added)
+++ incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCache.bsh Tue Oct 31 23:53:31 2006
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2001-2006 The Apache Software Foundation
+ *
+ * Licensed 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.
+ */
+import org.ofbiz.base.util.cache.UtilCache;
+import org.ofbiz.base.util.UtilFormatOut;
+import org.ofbiz.security.Security;
+
+security = request.getAttribute("security");
+
+if(security.hasEntityPermission("UTIL_CACHE", "_EDIT", session)) {
+ context.put("hasUtilCacheEdit", Boolean.TRUE);
+}
+else {
+ context.put("hasUtilCacheEdit", Boolean.FALSE);
+}
+
+Runtime rt = Runtime.getRuntime();
+context.put("memory", UtilFormatOut.formatQuantity(rt.totalMemory()));
+context.put("freeMemory", UtilFormatOut.formatQuantity(rt.freeMemory()));
+context.put("usedMemory", UtilFormatOut.formatQuantity((rt.totalMemory() - rt.freeMemory())));
+context.put("maxMemory", UtilFormatOut.formatQuantity(rt.maxMemory()));
+
+List cacheList = new ArrayList();
+TreeSet names = new TreeSet(UtilCache.utilCacheTable.keySet());
+Iterator nameIter = names.iterator();
+if(nameIter != null && nameIter.hasNext()) {
+ while(nameIter.hasNext()) {
+ String cacheName = (String)nameIter.next();
+ UtilCache utilCache = (UtilCache)UtilCache.utilCacheTable.get(cacheName);
+ Map cache = new HashMap();
+
+ cache.put("cacheName", utilCache.getName());
+ cache.put("cacheSize", UtilFormatOut.formatQuantity(utilCache.size()));
+ cache.put("hitCount", UtilFormatOut.formatQuantity(utilCache.getHitCount()));
+ cache.put("missCountTot", UtilFormatOut.formatQuantity(utilCache.getMissCountTotal()));
+ cache.put("missCountNotFound", UtilFormatOut.formatQuantity(utilCache.getMissCountNotFound()));
+ cache.put("missCountExpired", UtilFormatOut.formatQuantity(utilCache.getMissCountExpired()));
+ cache.put("missCountSoftRef", UtilFormatOut.formatQuantity(utilCache.getMissCountSoftRef()));
+ cache.put("removeHitCount", UtilFormatOut.formatQuantity(utilCache.getRemoveHitCount()));
+ cache.put("removeMissCount", UtilFormatOut.formatQuantity(utilCache.getRemoveMissCount()));
+ cache.put("maxSize", UtilFormatOut.formatQuantity(utilCache.getMaxSize()));
+ cache.put("expireTime", UtilFormatOut.formatQuantity(utilCache.getExpireTime()));
+ cache.put("useSoftReference", (new Boolean(utilCache.getUseSoftReference())).toString());
+ cache.put("useFileSystemStore", (new Boolean(utilCache.getUseFileSystemStore())).toString());
+
+ cacheList.add(cache);
+ }
+}
+context.put("cacheList", cacheList);
\ No newline at end of file
Propchange: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCache.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCache.bsh
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCache.bsh
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCacheElements.bsh
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCacheElements.bsh?view=auto&rev=469809
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCacheElements.bsh (added)
+++ incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCacheElements.bsh Tue Oct 31 23:53:31 2006
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2001-2006 The Apache Software Foundation
+ *
+ * Licensed 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.
+ */
+import org.ofbiz.base.util.cache.UtilCache;
+import org.ofbiz.base.util.cache.CacheLine;
+import org.ofbiz.base.util.UtilFormatOut;
+import org.ofbiz.security.Security;
+
+security = request.getAttribute("security");
+
+if(security.hasEntityPermission("UTIL_CACHE", "_EDIT", session)) {
+ context.put("hasUtilCacheEdit", Boolean.TRUE);
+}
+else {
+ context.put("hasUtilCacheEdit", Boolean.FALSE);
+}
+
+String cacheName = request.getParameter("UTIL_CACHE_NAME");
+context.put("cacheName", cacheName);
+context.put("now", (new Date()).toString());
+
+long totalSize = 0;
+
+List cacheElementsList = new ArrayList();
+if (cacheName != null) {
+ UtilCache utilCache = (UtilCache)UtilCache.utilCacheTable.get(cacheName);
+ if (utilCache != null) {
+ Iterator iter = utilCache.cacheLineTable.keySet().iterator();
+ if(iter != null && iter.hasNext()) {
+ int keyNum = 0;
+ while(iter.hasNext()) {
+ Map cacheElement = new HashMap();
+ Object key = iter.next();
+ CacheLine line = (CacheLine) utilCache.cacheLineTable.get(key);
+ String expireTime = "";
+ if(line != null && line.loadTime > 0) {
+ expireTime = (new Date(line.loadTime + utilCache.getExpireTime())).toString();
+ }
+ long lineSize = line.getSizeInBytes();
+ totalSize += lineSize;
+
+ cacheElement.put("elementKey", key);
+ cacheElement.put("expireTime", expireTime);
+ cacheElement.put("lineSize", UtilFormatOut.formatQuantity(lineSize));
+ cacheElement.put("keyNum", keyNum);
+
+ cacheElementsList.add(cacheElement);
+
+ keyNum++;
+ }
+ }
+ }
+}
+context.put("totalSize", UtilFormatOut.formatQuantity(totalSize));
+context.put("cacheElementsList", cacheElementsList);
\ No newline at end of file
Propchange: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCacheElements.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCacheElements.bsh
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCacheElements.bsh
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?view=diff&rev=469809&r1=469808&r2=469809
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Tue Oct 31 23:53:31 2006
@@ -140,11 +140,6 @@
<response name="success" type="view" value="sitemap"/>
</request-map>
- <request-map uri="install">
- <security https="false" auth="false"/>
- <response name="success" type="view" value="install"/>
- </request-map>
-
<request-map uri="entitymaint">
<security https="true" auth="true"/>
<response name="success" type="view" value="entitymaint"/>
@@ -496,8 +491,6 @@
<view-map name="login" type="screen" page="component://webtools/widget/CommonScreens.xml#login"/>
<view-map name="ping" type="ftl" page="/ping.ftl"/>
- <view-map name="install" type="region"/>
-
<view-map name="entityref" page="/entity/entityref.jsp"/>
<view-map name="entityref_list" page="/entity/entityref_list.jsp"/>
<view-map name="entityref_main" page="/entity/entityref_main.jsp"/>
@@ -521,9 +514,9 @@
<view-map name="xmldsdump" type="region"/>
<view-map name="xmldsrawdump" page="/entity/xmldsrawdump.jsp"/>
- <view-map name="EditUtilCache" type="region"/>
- <view-map name="FindUtilCache" type="region"/>
- <view-map name="FindUtilCacheElements" type="region"/>
+ <view-map name="FindUtilCache" type="screen" page="component://webtools/widget/CacheScreens.xml#FindUtilCache"/>
+ <view-map name="FindUtilCacheElements" type="screen" page="component://webtools/widget/CacheScreens.xml#FindUtilCacheElements"/>
+ <view-map name="EditUtilCache" type="screen" page="component://webtools/widget/CacheScreens.xml#EditUtilCache"/>
<view-map name="viewdatafile" type="region"/>
<view-map name="readxpdl" type="region"/>
Modified: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/regions.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/regions.xml?view=diff&rev=469809&r1=469808&r2=469809
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/regions.xml (original)
+++ incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/regions.xml Tue Oct 31 23:53:31 2006
@@ -29,11 +29,6 @@
<!-- ====== Start View Specific Regions ====== -->
- <define id="install" region="MAIN_REGION">
- <put section="title">Install Page</put>
- <put section="content" content="/install.jsp"/>
- </define>
-
<define id="entitymaint" region="MAIN_REGION">
<put section="title">Entity Data Maintenance</put>
<put section="content" content="/entity/entitymaint.jsp"/>
@@ -62,19 +57,6 @@
<define id="xmldsdump" region="MAIN_REGION">
<put section="title">XML Entity Data Export</put>
<put section="content" content="/entity/xmldsdump.jsp"/>
- </define>
-
- <define id="EditUtilCache" region="MAIN_REGION">
- <put section="title">Edit Cache Parameters</put>
- <put section="content" content="/cache/EditUtilCache.jsp"/>
- </define>
- <define id="FindUtilCache" region="MAIN_REGION">
- <put section="title">Cache List</put>
- <put section="content" content="/cache/FindUtilCache.jsp"/>
- </define>
- <define id="FindUtilCacheElements" region="MAIN_REGION">
- <put section="title">Cache Element List</put>
- <put section="content" content="/cache/FindUtilCacheElements.jsp"/>
</define>
<define id="viewdatafile" region="MAIN_REGION">
Added: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl?view=auto&rev=469809
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl (added)
+++ incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl Tue Oct 31 23:53:31 2006
@@ -0,0 +1,119 @@
+<#--
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed 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.
+-->
+
+<div class="head1">${uiLabelMap.PageTitleEditUtilCache}</div>
+<div> </div>
+<div class="tabletext"><b>${uiLabelMap.WebtoolsCacheName}:</b> ${cacheName?if_exists}</div>
+<div> </div>
+<div width="100%">
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.WebtoolsClearThisCache}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.WebtoolsBackToCacheMaintenance}</a>
+</div>
+<div> </div>
+<#if cache?has_content>
+ <form method="POST" action='<@o...@ofbizUrl>'>
+ <table cellpadding="2" cellspacing="0" border="1" width="50%" class="boxoutside">
+ <tr class='viewManyTR1'>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsCacheName}</div></td>
+ <td colspan="2"><div class="tableheadtext">${cache.cacheName?if_exists}</div></td>
+ </tr>
+ <tr class='viewManyTR2'>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsSize}</div></td>
+ <td colspan="2"><div class="tableheadtext">${cache.cacheSize?if_exists}</div></td>
+ </tr>
+ <tr class='viewManyTR1'>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsHits}</div></td>
+ <td colspan="2"><div class="tableheadtext">${cache.hitCount?if_exists}</div></td>
+ </tr>
+ <tr class='viewManyTR2'>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsMissesTotal}</div></td>
+ <td colspan="2"><div class="tableheadtext">${cache.missCountTot?if_exists}</div></td>
+ </tr>
+ <tr class='viewManyTR1'>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsMissesNotFound}</div></td>
+ <td colspan="2"><div class="tableheadtext">${cache.missCountNotFound?if_exists}</div></td>
+ </tr>
+ <tr class='viewManyTR2'>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsMissesExpire}</div></td>
+ <td colspan="2"><div class="tableheadtext">${cache.missCountExpired?if_exists}</div></td>
+ </tr>
+ <tr class='viewManyTR1'>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsMissesSoftReference}</div></td>
+ <td colspan="2"><div class="tableheadtext">${cache.missCountSoftRef?if_exists}</div></td>
+ </tr>
+ <tr class='viewManyTR2'>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsRemovesHit}</div></td>
+ <td colspan="2"><div class="tableheadtext">${cache.removeHitCount?if_exists}</div></td>
+ </tr>
+ <tr class='viewManyTR1'>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsRemovesMisses}</div></td>
+ <td colspan="2"><div class="tableheadtext">${cache.removeMissCount?if_exists}</div></td>
+ </tr>
+ <tr class='viewManyTR2'>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsMaxSize}</div></td>
+ <td><div class="tableheadtext">${cache.maxSize?if_exists}</div></td>
+ <td><input type="text" class='inputBox' size="15" maxlength="15" name="UTIL_CACHE_MAX_SIZE" value="${cache.maxSize?if_exists}"></td>
+ </tr>
+ <tr class='viewManyTR1'>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsExpireTime}</div></td>
+ <td><div class="tableheadtext">${cache.expireTime?if_exists} (${cache.hrs?if_exists}:${cache.mins?if_exists}:${cache.secs?if_exists})</div></td>
+ <td><input type="text" class='inputBox' size="15" maxlength="15" name="UTIL_CACHE_EXPIRE_TIME" value="${cache.expireTime?if_exists}"></td>
+ </tr>
+ <tr class='viewManyTR2'>
+ <#if cache.useSoftReference?exists && cache.useSoftReference == "true">
+ <#assign selectedTrue = "selected">
+ <#assign selectedFalse = "">
+ <#assign valueSoftRef = "${uiLabelMap.CommonTrue}">
+ <#else>
+ <#assign selectedTrue = "">
+ <#assign selectedFalse = "selected">
+ <#assign valueSoftRef = "${uiLabelMap.CommonFalse}">
+ </#if>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsUseSoftRef}</div></td>
+ <td><div class="tableheadtext">${valueSoftRef}</div></td>
+ <td>
+ <select name="UTIL_CACHE_USE_SOFT_REFERENCE" class="selectBox">
+ <option value="true" ${selectedTrue}>${uiLabelMap.CommonTrue}</option>
+ <option value="false" ${selectedFalse}>${uiLabelMap.CommonFalse}</option>
+ </select>
+ </td>
+ </tr>
+ <tr class='viewManyTR1'>
+ <#if cache.useFileSystemStore?exists && cache.useFileSystemStore == "true">
+ <#assign valueFileSys = "${uiLabelMap.CommonTrue}">
+ <#else>
+ <#assign valueFileSys = "${uiLabelMap.CommonFalse}">
+ </#if>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsUseFileStore}</div></td>
+ <td colspan="2"><div class="tableheadtext">${valueFileSys}</div></td>
+ </tr>
+ <tr>
+ <td colspan="3" align="center">
+ <input type="submit" value="${uiLabelMap.CommonUpdate}">
+ </td>
+ </tr>
+ </table>
+ </form>
+<#else>
+ <div width="100%">
+ ${uiLabelMap.WebtoolsNoUtilCacheSpecified}
+ </div>
+</#if>
+<div> </div>
+<div width="100%">
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.WebtoolsClearThisCache}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.WebtoolsBackToCacheMaintenance}</a>
+</div>
\ No newline at end of file
Propchange: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl?view=auto&rev=469809
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl (added)
+++ incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl Tue Oct 31 23:53:31 2006
@@ -0,0 +1,83 @@
+<#--
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed 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.
+-->
+
+<div class="head1">${uiLabelMap.PageTitleFindUtilCache}</div>
+<div width="100%">
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.WebtoolsReloadCacheList}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.WebtoolsClearAllCaches}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.WebtoolsClearExpiredFromAll}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.WebtoolsRunGC}</a>
+</div>
+<div class="tabletext"><u><b>${uiLabelMap.WebtoolsMemory}:</b></u> [<b>${uiLabelMap.WebtoolsTotalMemory}:</b> ${memory}] [<b>${uiLabelMap.WebtoolsFreeMemory}:</b> ${freeMemory}] [<b>${uiLabelMap.WebtoolsUsedMemory}:</b> ${usedMemory}] [<b>${uiLabelMap.WebtoolsMaxMemory}:</b> ${maxMemory}]</span></div>
+<div> </div>
+<#if cacheList?has_content>
+ <#assign rowClass='viewManyTR1'>
+ <table cellpadding="2" cellspacing="0" border="1" width="100%" class="boxoutside">
+ <tr>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsCacheName}</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsSize}</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsHits}</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsMisses}</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsRemoves}</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsMaxSize}</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsExpireTime}</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsUseSoftRef}</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsUseFileStore}</div></td>
+ <td colspan="3"><div class="tableheadtext">${uiLabelMap.WebtoolsAdministration}</div></td>
+ </tr>
+ <#list cacheList as cache>
+ <tr class='${rowClass}'>
+ <td><div class="tabletext">${cache.cacheName?if_exists}</div></td>
+ <td><div class="tabletext">${cache.cacheSize?if_exists}</div></td>
+ <td><div class="tabletext">${cache.hitCount?if_exists}</div></td>
+ <td><div class="tabletext">${cache.missCountTot?if_exists}/${cache.missCountNotFound?if_exists}/${cache.missCountExpired?if_exists}/${cache.missCountSoftRef?if_exists}</div></td>
+ <td><div class="tabletext">${cache.removeHitCount?if_exists}/${cache.removeMissCount?if_exists}</div></td>
+ <td><div class="tabletext">${cache.maxSize?if_exists}</div></td>
+ <td><div class="tabletext">${cache.expireTime?if_exists}</div></td>
+ <td><div class="tabletext">${cache.useSoftReference?if_exists}</div></td>
+ <td><div class="tabletext">${cache.useFileSystemStore?if_exists}</div></td>
+ <td align="center" valign=middle>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.WebtoolsElements}</a>
+ </td>
+ <td align="center" valign=middle>
+ <#if hasUtilCacheEdit>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a>
+ </#if>
+ </td>
+ <td align="center" valign=middle>
+ <#if hasUtilCacheEdit>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClear}</a>
+ </#if>
+ </td>
+ </tr>
+ <#if rowClass=='viewManyTR1'>
+ <#assign rowClass='viewManyTR2'>
+ <#else>
+ <#assign rowClass='viewManyTR1'>
+ </#if>
+ </#list>
+ </table>
+<#else>
+ <div width="100%">
+ ${uiLabelMap.WebtoolsNoUtilCacheFound}
+ </div>
+</#if>
+<div width="100%">
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.WebtoolsReloadCacheList}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.WebtoolsClearAllCaches}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.WebtoolsClearExpiredFromAll}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.WebtoolsRunGC}</a>
+</div>
Propchange: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl?view=auto&rev=469809
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl (added)
+++ incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl Tue Oct 31 23:53:31 2006
@@ -0,0 +1,68 @@
+<#--
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed 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.
+-->
+
+<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="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.WebtoolsBackToCacheMaintenance}</a>
+</div>
+<div> </div>
+<#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="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a>
+ </#if>
+ </td>
+ </tr>
+ <#if rowClass=='viewManyTR1'>
+ <#assign rowClass='viewManyTR2'>
+ <#else>
+ <#assign rowClass='viewManyTR1'>
+ </#if>
+ </#list>
+ </table>
+ <#else>
+ <div width="100%">
+ ${uiLabelMap.WebtoolsNoUtilCacheElementsFound}
+ </div>
+ </#if>
+<#else>
+ <div width="100%">
+ ${uiLabelMap.WebtoolsNoUtilCacheSpecified}
+ </div>
+</#if>
+<div> </div>
+<div class="tabletext">${uiLabelMap.WebtoolsSizeTotal}: ${totalSize} ${uiLabelMap.WebtoolsBytes}</div>
+<div> </div>
+<div width="100%">
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.WebtoolsBackToCacheMaintenance}</a>
+</div>
Propchange: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/messages.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/messages.ftl?view=diff&rev=469809&r1=469808&r2=469809
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/messages.ftl (original)
+++ incubator/ofbiz/trunk/framework/webtools/webapp/webtools/includes/messages.ftl Tue Oct 31 23:53:31 2006
@@ -16,6 +16,7 @@
<#if requestAttributes.errorMessageList?has_content><#assign errorMessageList=requestAttributes.errorMessageList></#if>
<#if requestAttributes.eventMessageList?has_content><#assign eventMessageList=requestAttributes.eventMessageList></#if>
<#if requestAttributes.serviceValidationException?exists><#assign serviceValidationException = requestAttributes.serviceValidationException></#if>
+<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
<#-- special error message override -->
<#if serviceValidationException?exists>
@@ -26,7 +27,7 @@
<#-- need if statement for EACH service (see the controller.xml file for service names) -->
<#if serviceName?has_content && serviceName == "createPartyContactMechPurpose">
<#-- create the inital message prefix -->
- <#assign message = "The following required fields where found empty:">
+ <#assign message = "${uiLabelMap.CommonErrorMessage1}:">
<#-- loop through all the missing fields -->
<#list missingList as missing>
@@ -38,13 +39,13 @@
-->
<#if missing == "partyId">
- <#assign message = message + "<li>Party ID</li>">
+ <#assign message = message + "<li>${uiLabelMap.CommonPartyID}</li>">
</#if>
<#if missing == "contactMechId">
- <#assign message = message + "<li>ContactMech ID</li>">
+ <#assign message = message + "<li>${uiLabelMap.CommonContactMechID}</li>">
</#if>
<#if missing == "contactMechPurposeTypeId">
- <#assign message = message + "<li>Contact Purpose</li>">
+ <#assign message = message + "<li>${uiLabelMap.CommonContactPurpose}</li>">
</#if>
</#list>
@@ -55,7 +56,7 @@
<#-- display the error messages -->
<#if errorMessageList?has_content>
-<div class="errorMessage">The following errors occurred:</div><br/>
+<div class="errorMessage">${uiLabelMap.CommonErrorMessage2}:</div><br/>
<ul>
<#list errorMessageList as errorMsg>
<li class="errorMessage">${errorMsg}</li>
@@ -64,7 +65,7 @@
<br/>
</#if>
<#if eventMessageList?has_content>
-<div class="eventMessage">The following occurred:</div><br/>
+<div class="eventMessage">${uiLabelMap.CommonErrorMessage3}:</div><br/>
<ul>
<#list eventMessageList as eventMsg>
<li class="eventMessage">${eventMsg}</li>
Modified: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl?view=diff&rev=469809&r1=469808&r2=469809
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl (original)
+++ incubator/ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl Tue Oct 31 23:53:31 2006
@@ -41,7 +41,7 @@
<div class="tabletext">${uiLabelMap.WebtoolsMessage13}.</div>
<#if userLogin?has_content>
<ul>
- <li><div class="tabletext">${uiLabelMap.WebtoolsCachDebugTools}</div>
+ <li><div class="tabletext">${uiLabelMap.WebtoolsCacheDebugTools}</div>
<ul>
<li><a href="<@o...@ofbizUrl>" class="linktext">${uiLabelMap.WebtoolsCacheMaintenance}</a>
<li><a href="<@o...@ofbizUrl>" class="linktext">${uiLabelMap.WebtoolsAdjustDebuggingLevels}</a>
Added: incubator/ofbiz/trunk/framework/webtools/widget/CacheScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/widget/CacheScreens.xml?view=auto&rev=469809
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/widget/CacheScreens.xml (added)
+++ incubator/ofbiz/trunk/framework/webtools/widget/CacheScreens.xml Tue Oct 31 23:53:31 2006
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+
+Copyright 2004-2006 The Apache Software Foundation
+
+Licensed 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.
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
+ <screen name="FindUtilCache">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleFindUtilCache"/>
+ <script location="component://webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCache.bsh"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <!-- do check for UTIL_CACHE, _VIEW permission -->
+ <condition>
+ <if-has-permission permission="UTIL_CACHE" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://webtools/webapp/webtools/cache/findUtilCache.ftl"/></html>
+ </platform-specific>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label style="head3">${uiLabelMap.WebtoolsPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="FindUtilCacheElements">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleFindUtilCacheElements"/>
+ <script location="component://webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCacheElements.bsh"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <!-- do check for UTIL_CACHE, _VIEW permission -->
+ <condition>
+ <if-has-permission permission="UTIL_CACHE" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://webtools/webapp/webtools/cache/findUtilCacheElements.ftl"/></html>
+ </platform-specific>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label style="head3">${uiLabelMap.WebtoolsPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="EditUtilCache">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleEditUtilCache"/>
+ <script location="component://webtools/webapp/webtools/WEB-INF/actions/cache/editUtilCache.bsh"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <!-- do check for UTIL_CACHE, _EDIT permission -->
+ <condition>
+ <if-has-permission permission="UTIL_CACHE" action="_EDIT"/>
+ </condition>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://webtools/webapp/webtools/cache/editUtilCache.ftl"/></html>
+ </platform-specific>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label style="head3">${uiLabelMap.WebtoolsPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+</screens>
Propchange: incubator/ofbiz/trunk/framework/webtools/widget/CacheScreens.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/ofbiz/trunk/framework/webtools/widget/CacheScreens.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: incubator/ofbiz/trunk/framework/webtools/widget/CacheScreens.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/ofbiz/trunk/framework/webtools/widget/EntitySyncForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/widget/EntitySyncForms.xml?view=diff&rev=469809&r1=469808&r2=469809
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/widget/EntitySyncForms.xml (original)
+++ incubator/ofbiz/trunk/framework/webtools/widget/EntitySyncForms.xml Tue Oct 31 23:53:31 2006
@@ -28,21 +28,21 @@
</actions>
<auto-fields-entity entity-name="EntitySync" default-field-type="display"/>
- <field name="runStatusId" title="Run Status">
+ <field name="runStatusId">
<display-entity entity-name="StatusItem" key-field-name="statusId"/>
</field>
<field use-when=""ESR_RUNNING".equals(runStatusId)" name="resetStatus" title="" widget-style="buttontext">
- <hyperlink also-hidden="false" description="Reset Run Status" target="resetEntitySyncStatusToNotStarted?entitySyncId=${entitySyncId}"/>
+ <hyperlink also-hidden="false" description="${uiLabelMap.WebtoolsSyncResetRunStatus}" target="resetEntitySyncStatusToNotStarted?entitySyncId=${entitySyncId}"/>
</field>
<field use-when=""ESR_NOT_STARTED".equals(runStatusId) || "ESR_COMPLETE".equals(runStatusId)" name="runOfflineSync" title="" widget-style="buttontext">
- <hyperlink also-hidden="false" description="Run Offline Sync" target="runOfflineEntitySync?entitySyncId=${entitySyncId}"/>
+ <hyperlink also-hidden="false" description="${uiLabelMap.WebtoolsSyncRunOffline}" target="runOfflineEntitySync?entitySyncId=${entitySyncId}"/>
</field>
<field use-when=""ESR_PENDING".equals(runStatusId)" name="acceptOffline" title="" widget-style="buttontext">
- <hyperlink also-hidden="false" description="Accept Offline Sync" target="updateOfflineEntitySync?entitySyncId=${entitySyncId}&updateType=ACCEPT"/>
+ <hyperlink also-hidden="false" description="${uiLabelMap.WebtoolsSyncAcceptOffline}" target="updateOfflineEntitySync?entitySyncId=${entitySyncId}&updateType=ACCEPT"/>
</field>
<field use-when=""ESR_PENDING".equals(runStatusId)" name="rejectOffline" title="" widget-style="buttontext">
- <hyperlink also-hidden="false" description="Reject Offline Sync" target="updateOfflineEntitySync?entitySyncId=${entitySyncId}&updateType=REJECT"/>
+ <hyperlink also-hidden="false" description="${uiLabelMap.WebtoolsSyncRejectOffline}" target="updateOfflineEntitySync?entitySyncId=${entitySyncId}&updateType=REJECT"/>
</field>
</form>
Modified: incubator/ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml?view=diff&rev=469809&r1=469808&r2=469809
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml (original)
+++ incubator/ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml Tue Oct 31 23:53:31 2006
@@ -32,7 +32,7 @@
<label style="head1">${uiLabelMap.${labelTitleProperty}}</label>
</container>
<container>
- <link target="EntitySyncStatus" style="buttontext" text="Refresh"/>
+ <link target="EntitySyncStatus" style="buttontext" text="${uiLabelMap.CommonRefresh}"/>
</container>
<!-- Now call the SimpleScreen form -->
@@ -59,7 +59,7 @@
<decorator-screen name="GenericDecorator">
<decorator-section name="body">
<include-form name="EntitySyncStatus" location="component://webtools/widget/EntitySyncForms.xml"/>
- <label style="head1">Load Offline Data</label>
+ <label style="head1">${uiLabelMap.WebtoolsLoadOfflineData}</label>
<include-form name="EntitySyncLoadOffline" location="component://webtools/widget/EntitySyncForms.xml"/>
</decorator-section>
</decorator-screen>