svn commit: r757689 [1/3] - in /ofbiz/trunk: applications/accounting/webapp/accounting/period/ framework/common/config/ framework/webtools/config/ framework/webtools/webapp/webtools/ framework/webtools/webapp/webtools/WEB-INF/ framework/webtools/webapp...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r757689 [1/3] - in /ofbiz/trunk: applications/accounting/webapp/accounting/period/ framework/common/config/ framework/webtools/config/ framework/webtools/webapp/webtools/ framework/webtools/webapp/webtools/WEB-INF/ framework/webtools/webapp...

jonesde
Author: jonesde
Date: Tue Mar 24 08:52:49 2009
New Revision: 757689

URL: http://svn.apache.org/viewvc?rev=757689&view=rev
Log:
Removed old webtools workflow engine pages from webtools to a skeleton (non-functional) webapp in the specialpurpose/workflow component

Added:
    ofbiz/trunk/specialpurpose/workflow/config/
    ofbiz/trunk/specialpurpose/workflow/config/WorkflowUiLabels.xml
      - copied, changed from r757683, ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
    ofbiz/trunk/specialpurpose/workflow/webapp/
    ofbiz/trunk/specialpurpose/workflow/webapp/workflow/
    ofbiz/trunk/specialpurpose/workflow/webapp/workflow/WEB-INF/
    ofbiz/trunk/specialpurpose/workflow/webapp/workflow/WEB-INF/controller.xml
      - copied, changed from r757683, ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/workflow/webapp/workflow/main.ftl
      - copied, changed from r757683, ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl
    ofbiz/trunk/specialpurpose/workflow/webapp/workflow/workflow/
      - copied from r757683, ofbiz/trunk/framework/webtools/webapp/webtools/workflow/
    ofbiz/trunk/specialpurpose/workflow/widget/
    ofbiz/trunk/specialpurpose/workflow/widget/MiscScreens.xml
      - copied, changed from r757683, ofbiz/trunk/framework/webtools/widget/MiscScreens.xml
Removed:
    ofbiz/trunk/framework/webtools/webapp/webtools/workflow/
Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
    ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
    ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl
    ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl
    ofbiz/trunk/framework/webtools/widget/MiscScreens.xml
    ofbiz/trunk/specialpurpose/workflow/webapp/workflow/workflow/readxpdl.ftl
    ofbiz/trunk/specialpurpose/workflow/webapp/workflow/workflow/workflowMonitor.ftl

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl?rev=757689&r1=757688&r2=757689&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl Tue Mar 24 08:52:49 2009
@@ -40,7 +40,7 @@
       <#if currentCustomTimePeriod?has_content>
         <ul>
           <li class="h3">${uiLabelMap.AccountingCurrentCustomTimePeriod}</li>
-          <li><a href="<@ofbizUrl>EditCustomTimePeriod?findOrganizationPartyId=${findOrganizationPartyId?if_exists}</@ofbizUrl>">${uiLabelMap.WebtoolsClearCurrent}</a></li>
+          <li><a href="<@ofbizUrl>EditCustomTimePeriod?findOrganizationPartyId=${findOrganizationPartyId?if_exists}</@ofbizUrl>">${uiLabelMap.CommonClearCurrent}</a></li>
         </ul>
       <#else>
         <h3>${uiLabelMap.AccountingCurrentCustomTimePeriod}</h3>
@@ -85,7 +85,7 @@
               </select>
               <#if (currentCustomTimePeriod.parentPeriodId)?exists>
                 <a href='<@ofbizUrl>EditCustomTimePeriod?currentCustomTimePeriodId=${currentCustomTimePeriod.parentPeriodId}&findOrganizationPartyId=${findOrganizationPartyId?if_exists}</@ofbizUrl>'>
-                ${uiLabelMap.WebtoolsSetAsCurrent}</a>
+                ${uiLabelMap.CommonSetAsCurrent}</a>
               </#if>
             </td>
             <td><input type="text" size='12' name="currentCustomTimePeriod" value="${currentCustomTimePeriod.organizationPartyId?if_exists}"></td>
@@ -142,7 +142,7 @@
       <table class="basic-table" cellspacing="0">
         <tr class="header-row">
           <td>${uiLabelMap.CommonId}</td>
-          <td>${uiLabelMap.WebtoolsParent}</td>
+          <td>${uiLabelMap.CommonParent}</td>
           <td>${uiLabelMap.AccountingOrgPartyId}</td>
           <td>${uiLabelMap.AccountingPeriodType}</td>
           <td>#</td>
@@ -218,7 +218,7 @@
               <a href='<@ofbizUrl>deleteCustomTimePeriod?customTimePeriodId=${customTimePeriod.customTimePeriodId?if_exists}&currentCustomTimePeriodId=${currentCustomTimePeriodId?if_exists}&findOrganizationPartyId=${findOrganizationPartyId?if_exists}</@ofbizUrl>'>
               ${uiLabelMap.CommonDelete}</a>
               <a href='<@ofbizUrl>EditCustomTimePeriod?currentCustomTimePeriodId=${customTimePeriod.customTimePeriodId?if_exists}&findOrganizationPartyId=${findOrganizationPartyId?if_exists}</@ofbizUrl>'>
-              ${uiLabelMap.WebtoolsSetAsCurrent}</a>
+              ${uiLabelMap.CommonSetAsCurrent}</a>
             </td>
             </form>
           </tr>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=757689&r1=757688&r2=757689&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Tue Mar 24 08:52:49 2009
@@ -1122,6 +1122,12 @@
         <value xml:lang="ru">Отчистить все</value>
         <value xml:lang="th">เคลียร์ทั้งหมด</value>
     </property>
+    <property key="CommonClearCurrent">
+        <value xml:lang="en">Clear Current</value>
+        <value xml:lang="fr">Vider l'en cours</value>
+        <value xml:lang="it">Pulisci Attuale</value>
+        <value xml:lang="th">ยกเลิกที่เป็นปัจจุบัน</value>
+    </property>
     <property key="CommonClickHere">
         <value xml:lang="ar">انقر هنا</value>
         <value xml:lang="cs">Klikněte zde</value>
@@ -5584,6 +5590,9 @@
         <value xml:lang="zh">安全</value>
         <value xml:lang="zh_CN">安全</value>
     </property>
+    <property key="CommonSecurityGroups">
+        <value xml:lang="en">Security Groups</value>
+    </property>
     <property key="CommonSegmentGroupGeoAbbr">
         <value xml:lang="en">Abbreviation</value>
         <value xml:lang="es">Abreviación</value>
@@ -5881,6 +5890,12 @@
         <value xml:lang="zh">设置</value>
         <value xml:lang="zh_CN">赋值</value>
     </property>
+    <property key="CommonSetAsCurrent">
+        <value xml:lang="en">Set As Current</value>
+        <value xml:lang="fr">Définir en tant qu'actuel</value>
+        <value xml:lang="it">Imposta Come Attuale</value>
+        <value xml:lang="th">ตั้งเป็นปัจจุบัน</value>
+    </property>
     <property key="CommonSetColumnWidth">
         <value xml:lang="en">Set Column Width...</value>
         <value xml:lang="fr">Définir la largeur de colonne ...</value>

Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=757689&r1=757688&r2=757689&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml Tue Mar 24 08:52:49 2009
@@ -367,12 +367,6 @@
         <value xml:lang="th">ขั้นตอน</value>
         <value xml:lang="zh">操作</value>
     </property>
-    <property key="WebtoolsActiveWorkflowMonitor">
-        <value xml:lang="en">Active Workflow Monitor</value>
-        <value xml:lang="fr">Moniteur actif du Workflow</value>
-        <value xml:lang="it">Monitor Flussi di Lavoro Attivi</value>
-        <value xml:lang="th">ตรวจสอบขั้นตอนการทำงาน</value>
-    </property>
     <property key="WebtoolsAddLoggerFormDescription">
         <value xml:lang="en">This form allows you to enable a logger for a specific package or class.</value>
         <value xml:lang="fr">Cette page vous permet d'activer un enregistreur (logger) pour un paquet ou une classe spécifique.</value>
@@ -563,12 +557,6 @@
         <value xml:lang="th">ลบค่า Caches ทั้งหมด</value>
         <value xml:lang="zh">清除全部缓存</value>
     </property>
-    <property key="WebtoolsClearCurrent">
-        <value xml:lang="en">Clear Current</value>
-        <value xml:lang="fr">Vider l'en cours</value>
-        <value xml:lang="it">Pulisci Attuale</value>
-        <value xml:lang="th">ยกเลิกที่เป็นปัจจุบัน</value>
-    </property>
     <property key="WebtoolsClearExpiredFromAll">
         <value xml:lang="en">Clear Expired From All</value>
         <value xml:lang="fr">Vider tout ce qui est périmé</value>
@@ -1325,18 +1313,6 @@
         <value xml:lang="th">นำเข้า XML ไปยังแหล่งข้อมูล</value>
         <value xml:lang="zh">把XML导入到数据源</value>
     </property>
-    <property key="WebtoolsImportUpdateToDB">
-        <value xml:lang="en">Import/Update to DB?</value>
-        <value xml:lang="fr">Import/ Mise à jour vers DB ?</value>
-        <value xml:lang="it">Importa/Aggiorna sul DB?</value>
-        <value xml:lang="th">นำเข้า/เปลี่ยนแปลง ฐานข้อมูล?</value>
-    </property>
-    <property key="WebtoolsImportXPDLPageDescription">
-        <value xml:lang="en">This page is used to read and import XPDL files into the workflow process repository.</value>
-        <value xml:lang="fr">Cette page est utilisée pour lire et importer des fichiers XPDL dans le dépôt de processus du workflow.</value>
-        <value xml:lang="it">Questa pagina è usata per leggere e importare files XPDL nel repository processi flussi di lavoro.</value>
-        <value xml:lang="th">หน้านี้ใช้อ่านและนำเข้าไฟล์ XPDL เข้าสู่ที่เก็บขั้นตอนการทำงาน</value>
-    </property>
     <property key="WebtoolsImportantLogLevel">
         <value xml:lang="en">Important</value>
         <value xml:lang="fr">Important</value>
@@ -1894,12 +1870,6 @@
         <value xml:lang="th">ไม่พบ services</value>
         <value xml:lang="zh">找不到服务</value>
     </property>
-    <property key="WebtoolsNoStepsFoundForRunningWorkflow">
-        <value xml:lang="en">No steps found for running workflow process: ${workflow}</value>
-        <value xml:lang="fr">Aucune étape trouvée pour exécuter une opération de workflow: ${workflow}</value>
-        <value xml:lang="it">Nessun passo trovato per l'esecuzione del processo flusso di lavoro: ${workflow}</value>
-        <value xml:lang="th">ไม่พบขั้นตอนการดำเนินงาน: ${workflow}</value>
-    </property>
     <property key="WebtoolsNoUtilCacheElementsFound">
         <value xml:lang="en">No UtilCache elements found</value>
         <value xml:lang="fr">Aucun élément de UtilCache trouvé</value>
@@ -2132,12 +2102,6 @@
         <value xml:lang="th">ประเภทของการอนุญาต</value>
         <value xml:lang="zh">权限类型</value>
     </property>
-    <property key="WebtoolsPermissionWorkflow">
-        <value xml:lang="en">You do not have permission to use this page (WORKFLOW_MAINT needed)</value>
-        <value xml:lang="fr">Vous n'avez pas l'autorisation d'utiliser cette page (WORKFLOW_MAINT est nécessaire)</value>
-        <value xml:lang="it">Tu non hai il permesso di usare questa pagina (necessario WORKFLOW_MAINT)</value>
-        <value xml:lang="th">คุณไม่ได้รับอนุญาตให้ใช้งานในหน้านี้ (WORKFLOW_MAINT ที่ต้องการ)</value>
-    </property>
     <property key="WebtoolsPk">
         <value xml:lang="en">Primary Key</value>
         <value xml:lang="fr">Clé primaire</value>
@@ -2233,14 +2197,6 @@
         <value xml:lang="it">Lette e stampate ${toBeStored.size()} entità.</value>
         <value xml:lang="th">อ่านและพิมพ์ ${toBeStored.size()} entities.</value>
     </property>
-    <property key="WebtoolsReadXPDLFile">
-        <value xml:lang="en">Read XPDL File</value>
-        <value xml:lang="fr">Lire le fichier XPDL</value>
-        <value xml:lang="it">Leggi File XPDL</value>
-        <value xml:lang="ro">Citeste File XPDL</value>
-        <value xml:lang="th">อ่านไฟล์ XPDL</value>
-        <value xml:lang="zh">读取XPDL文件</value>
-    </property>
     <property key="WebtoolsRecordsUpdatedBefore">
         <value xml:lang="en">Records Updated Before</value>
         <value xml:lang="fr">Enregistrements mis à jour avant</value>
@@ -2568,12 +2524,6 @@
         <value xml:lang="th">รายการ Services สำหรับ</value>
         <value xml:lang="zh">服务列表:</value>
     </property>
-    <property key="WebtoolsSetAsCurrent">
-        <value xml:lang="en">Set As Current</value>
-        <value xml:lang="fr">Définir en tant qu'actuel</value>
-        <value xml:lang="it">Imposta Come Attuale</value>
-        <value xml:lang="th">ตั้งเป็นปัจจุบัน</value>
-    </property>
     <property key="WebtoolsShowShowWSDL">
         <value xml:lang="en">Show wsdl</value>
         <value xml:lang="fr">Montrer WSDL</value>
@@ -3132,82 +3082,6 @@
         <value xml:lang="th">ทำงานกับข้อมูลไฟล์</value>
         <value xml:lang="zh">Work With Data Files</value>
     </property>
-    <property key="WebtoolsWorkflowActivityId">
-        <value xml:lang="en">Activity ID</value>
-        <value xml:lang="fr">Réf. d'activité</value>
-        <value xml:lang="it">Attività</value>
-        <value xml:lang="th">รหัสการทำงาน</value>
-    </property>
-    <property key="WebtoolsWorkflowActivityListFor">
-        <value xml:lang="en">Activity list for</value>
-        <value xml:lang="fr">Liste d'activité pour</value>
-        <value xml:lang="it">Lista Actività per</value>
-        <value xml:lang="th">รายการทำงานสำหรับ</value>
-    </property>
-    <property key="WebtoolsWorkflowActualCompleteDate">
-        <value xml:lang="en">Actual Complete Date</value>
-        <value xml:lang="fr">Date réelle de fin</value>
-        <value xml:lang="it">Data Fine Attuale</value>
-        <value xml:lang="th">วันที่เสร็จจริง</value>
-    </property>
-    <property key="WebtoolsWorkflowAssignments">
-        <value xml:lang="en">Assignation(s)</value>
-        <value xml:lang="fr">Tâche (s)</value>
-        <value xml:lang="it">Assegnato(i)</value>
-        <value xml:lang="th">งานที่ได้รับมอบหมาย</value>
-    </property>
-    <property key="WebtoolsWorkflowCurrentStatus">
-        <value xml:lang="en">Current Status</value>
-        <value xml:lang="fr">Statut "Current"</value>
-        <value xml:lang="it">Stato attuale</value>
-        <value xml:lang="th">สถานะทั่ว ๆ ไป</value>
-    </property>
-    <property key="WebtoolsWorkflowEngineTools">
-        <value xml:lang="en">Workflow Engine Tools</value>
-        <value xml:lang="fr">Outils du moteur de Workflow</value>
-        <value xml:lang="it">Strumenti per Engine Flussi di Lavoro</value>
-        <value xml:lang="ro">Instrumente pentru Engine Fluxuri de Lucru</value>
-        <value xml:lang="th">เครื่องมือ Workflow Engine</value>
-        <value xml:lang="zh">工作流引擎工具</value>
-    </property>
-    <property key="WebtoolsWorkflowMonitor">
-        <value xml:lang="en">Workflow Monitor</value>
-        <value xml:lang="fr">Moniteur de Workflow</value>
-        <value xml:lang="it">Monitor dei Flussi di Lavoro</value>
-        <value xml:lang="ro">Monitorul Fluxurilor de Lucru</value>
-        <value xml:lang="th">Workflow Monitor</value>
-        <value xml:lang="zh">工作流监控程序</value>
-    </property>
-    <property key="WebtoolsWorkflowPackageVersion">
-        <value xml:lang="en">Package/Version</value>
-        <value xml:lang="fr">Package/Version</value>
-        <value xml:lang="it">Pacchetto/Versione</value>
-        <value xml:lang="th">แพ็คเกจ/เวอร์ชั่น</value>
-    </property>
-    <property key="WebtoolsWorkflowPageDescription">
-        <value xml:lang="en">This page is used to view the status of running workflows.</value>
-        <value xml:lang="fr">Cette page est utilisée pour voir le statut du déroulement des opérations du workflow</value>
-        <value xml:lang="it">Questa pagina è usata per mostrare lo stato del flussi di lavoro in esecuzione.</value>
-        <value xml:lang="th">หน้านี้ใช้ตรวจสอบค่าสถานะของการดำเนินงานโครงสร้าง</value>
-    </property>
-    <property key="WebtoolsWorkflowProcessVersion">
-        <value xml:lang="en">Process/Version</value>
-        <value xml:lang="fr">Processus/Version</value>
-        <value xml:lang="it">Processo/Versione</value>
-        <value xml:lang="th">โปรเซส/เวอร์ชั่น</value>
-    </property>
-    <property key="WebtoolsWorkflowSourceReferenceId">
-        <value xml:lang="en">Source Reference ID</value>
-        <value xml:lang="fr">Réf. de référence de source</value>
-        <value xml:lang="it">Riferimento Origine</value>
-        <value xml:lang="th">รหัสอ้างอิงที่มา</value>
-    </property>
-    <property key="WebtoolsWorkflows">
-        <value xml:lang="en">Workflows</value>
-        <value xml:lang="fr">Workflows</value>
-        <value xml:lang="it">Flussi di Lavoro</value>
-        <value xml:lang="th">ขั้นตอนการทำงาน</value>
-    </property>
     <property key="WebtoolsWroteNRecordsToXMLFile">
         <value xml:lang="en">Wrote ${numberWritten} records to XML file ${parameters.filename}.</value>
         <value xml:lang="fr">Ecrire ${numberWritten} les enregistrements dans le fichier XML ${parameters.filename}.</value>
@@ -3236,12 +3110,6 @@
         <value xml:lang="th">หน้านี้ใช้การนำเข้าข้อมูลที่มีการส่งออกเอนติตี้เอนจินเอกสาร XML โดยใช้คำสั่ง "&lt;entity-engine-xml&gt;".</value>
         <value xml:lang="zh">本页面用于导入导出的实体引擎XML文档。这些文档都有一个根标签 "&lt;entity-engine-xml&gt;".</value>
     </property>
-    <property key="WebtoolsXpdlFilenameOrUrl">
-        <value xml:lang="en">XPDL Filename or URL</value>
-        <value xml:lang="fr">Nom de fichier XPDL ou URL</value>
-        <value xml:lang="it">Nome file XPDL o URL</value>
-        <value xml:lang="th">ชื่อไฟล์ XPDL หรือ URL</value>
-    </property>
     <property key="WebtoolsYouMayCreateAnEntity">
         <value xml:lang="en">You may create an Entity ${entityName} by entering the values you want, and clicking Create.</value>
         <value xml:lang="fr">Vous pouvez créer une entité  ${entityName} En entrant les valeurs que vous voulez, et en cliquant sur Créez.</value>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=757689&r1=757688&r2=757689&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Tue Mar 24 08:52:49 2009
@@ -232,16 +232,6 @@
         <response name="success" type="view" value="viewdatafile"/>
     </request-map>
 
-    <!-- Old Workflow Engine Requests -->
-    <request-map uri="readxpdl">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="readxpdl"/>
-    </request-map>
-    <request-map uri="workflowMonitor">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="workflowMonitor"/>
-    </request-map>    
-
     <!-- ControlServlet and other stats requests -->
     <request-map uri="StatsSinceStart">
         <security https="true" auth="true"/>
@@ -585,9 +575,6 @@
 
     <view-map name="viewdatafile" type="screen" page="component://webtools/widget/MiscScreens.xml#viewdatafile"/>
 
-    <view-map name="readxpdl" type="screen" page="component://webtools/widget/MiscScreens.xml#readxpdl"/>
-    <view-map name="workflowMonitor" type="screen" page="component://webtools/widget/MiscScreens.xml#workflowMonitor"/>
-
     <view-map name="LogConfiguration" type="screen" page="component://webtools/widget/LogScreens.xml#LogConfiguration"/>
     <view-map name="LogView" type="screen" page="component://webtools/widget/LogScreens.xml#LogView"/>
 

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl?rev=757689&r1=757688&r2=757689&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl Tue Mar 24 08:52:49 2009
@@ -112,11 +112,6 @@
           <li><a href="<@ofbizUrl>threadList</@ofbizUrl>">${uiLabelMap.PageTitleThreadList}</a></li>
           <li><a href="<@ofbizUrl>ServiceLog</@ofbizUrl>">${uiLabelMap.WebtoolsServiceLog}</a></li>
         </#if>
-        <#if security.hasPermission("WORKFLOW_MAINT", session)>
-          <li><h3>${uiLabelMap.WebtoolsWorkflowEngineTools}</h3></li>
-          <li><a href="<@ofbizUrl>workflowMonitor</@ofbizUrl>">${uiLabelMap.WebtoolsWorkflowMonitor}</a></li>
-          <li><a href="<@ofbizUrl>readxpdl</@ofbizUrl>">${uiLabelMap.WebtoolsReadXPDLFile}</a></li>
-        </#if>
         <#if security.hasPermission("DATAFILE_MAINT", session)>
           <li><h3>${uiLabelMap.WebtoolsDataFileTools}</h3></li>
           <li><a href="<@ofbizUrl>viewdatafile</@ofbizUrl>">${uiLabelMap.WebtoolsWorkWithDataFiles}</a></li>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl?rev=757689&r1=757688&r2=757689&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl Tue Mar 24 08:52:49 2009
@@ -93,7 +93,7 @@
 
     <div class="screenlet">
       <div class="screenlet-title-bar">
-        <h3>${uiLabelMap.PartySecurityGroups}</h3>
+        <h3>${uiLabelMap.CommonSecurityGroups}</h3>
       </div>
       <#if selectedServiceMap.permissionGroups != 'NA'>
         <table class="basic-table" cellspacing='0'>

Modified: ofbiz/trunk/framework/webtools/widget/MiscScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/MiscScreens.xml?rev=757689&r1=757688&r2=757689&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/MiscScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/MiscScreens.xml Tue Mar 24 08:52:49 2009
@@ -1,20 +1,20 @@
 <!--
-    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.
+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.
 -->
 
 <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -52,73 +52,4 @@
             </widgets>
         </section>
     </screen>
-    
-    <screen name="readxpdl">
-        <section>
-            <actions>
-                <set field="headerItem" value="main"/>
-                <set field="titleProperty" value="WebtoolsReadXPDLFile"/>
-                <script location="component://webtools/webapp/webtools/WEB-INF/actions/workflow/ReadXpdl.groovy"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.WebtoolsReadXPDLFile}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <platform-specific>
-                                            <html>
-                                                <html-template location="component://webtools/webapp/webtools/workflow/readxpdl.ftl"/>
-                                            </html>
-                                        </platform-specific>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    
-    <screen name="workflowMonitor">
-        <section>
-            <actions>
-                <set field="headerItem" value="main"/>
-                <set field="titleProperty" value="WebtoolsActiveWorkflowMonitor"/>
-                <script location="component://webtools/webapp/webtools/WEB-INF/actions/workflow/WorkflowMonitor.groovy"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.WebtoolsActiveWorkflowMonitor}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <platform-specific>
-                                            <html>
-                                                <html-template location="component://webtools/webapp/webtools/workflow/workflowMonitor.ftl"/>
-                                            </html>
-                                        </platform-specific>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    
 </screens>