You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2008/10/06 23:26:26 UTC
svn commit: r702273 - in /ofbiz/trunk/specialpurpose:
cmssite/webapp/cmssite/WEB-INF/ oagis/webapp/oagis/WEB-INF/
projectmgr/servicedef/ projectmgr/webapp/projectmgr/WEB-INF/
projectmgr/widget/
Author: mrisaliti
Date: Mon Oct 6 14:26:25 2008
New Revision: 702273
URL: http://svn.apache.org/viewvc?rev=702273&view=rev
Log:
Various cleanup on special purpose components (Part of issue OFBIZ-1982)
Modified:
ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
Modified: ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/controller.xml?rev=702273&r1=702272&r2=702273&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/controller.xml Mon Oct 6 14:26:25 2008
@@ -54,5 +54,6 @@
<!-- End of Request Mappings -->
<!-- View Mappings -->
+ <view-map name="main" type="default"/>
<!-- End of View Mappings -->
</site-conf>
Modified: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml?rev=702273&r1=702272&r2=702273&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml Mon Oct 6 14:26:25 2008
@@ -95,6 +95,8 @@
<response name="error" type="view" value="EditMessageErrorInfo"/>
</request-map>
+ <!-- TO DO
+
<request-map uri="UploadOagisMessage">
<security https="true" auth="true" />
<response name="success" type="view" value="UploadOagisMessage" />
@@ -148,7 +150,8 @@
<response name="success" type="view" value="UploadOagisMessage" />
<response name="error" type="view" value="UploadOagisMessage"/>
</request-map>
-
+ -->
+
<request-map uri="oagisReceiveShowShipment">
<security https="true" auth="false"/>
<event type="stream" invoke="oagisReceiveShowShipment"/>
@@ -202,6 +205,5 @@
<view-map name="EditMessageInfo" type="screen" page="component://oagis/widget/MessageInfoScreens.xml#EditMessageInfo"/>
<view-map name="FindMessageErrorInfo" type="screen" page="component://oagis/widget/MessageInfoScreens.xml#FindMessageErrorInfo"/>
<view-map name="EditMessageErrorInfo" type="screen" page="component://oagis/widget/MessageInfoScreens.xml#EditMessageErrorInfo"/>
-
<!-- end of view mappings -->
</site-conf>
Modified: ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml?rev=702273&r1=702272&r2=702273&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml Mon Oct 6 14:26:25 2008
@@ -57,12 +57,14 @@
<attribute name="timeEntryId" type="String" mode="IN" optional="true"/>
</service>
+ <!-- TO BE REMOVED
<service name="updateTaskStatus" engine="simple"
location="org/ofbiz/project/ProjectServices.xml" invoke="updateTaskStatus">
<description>Update task status if required</description>
<permission-service service-name="projectMgrPermission" main-action="UPDATE"/>
<attribute name="workEffortId" type="String" mode="IN"/>
</service>
+ -->
<service name="updateTimeEntryByWorkeffort" engine="simple"
location="org/ofbiz/project/ProjectServices.xml" invoke="updateTimeEntryByWorkeffort">
Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml?rev=702273&r1=702272&r2=702273&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Mon Oct 6 14:26:25 2008
@@ -258,10 +258,14 @@
<response name="success" type="view" value="EditProjectTasks"/>
<response name="error" type="view" value="EditProjectTasks"/>
</request-map>
+
+ <!-- TO BE REMOVED
<request-map uri="EditTaskAndAssoc">
<security https="true" auth="true"/>
<response name="success" type="view" value="EditTaskAndAssoc"/>
</request-map>
+ -->
+
<request-map uri="createTaskAndAssoc">
<security https="true" auth="true"/>
<event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortAndAssoc"/>
@@ -282,6 +286,8 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="MyTasks"/>
</request-map>
+
+ <!-- TO BE REMOVED
<request-map uri="EditTaskList">
<security https="true" auth="true"/>
<response name="success" type="view" value="EditTaskList"/>
@@ -299,6 +305,8 @@
<response name="success" type="view" value="Dependencies"/>
<response name="error" type="view" value="Dependencies"/>
</request-map>
+ -->
+
<request-map uri="EditTaskListAndAssoc">
<security https="true" auth="true"/>
<response name="success" type="view" value="EditTaskListAndAssoc"/>
@@ -315,10 +323,14 @@
<response name="success" type="view" value="Dependencies"/>
<response name="error" type="view" value="Dependencies"/>
</request-map>
+
+ <!-- TO DO
<request-map uri="ChildTaskWorkEfforts">
<security https="true" auth="true"/>
<response name="success" type="view" value="ChildTaskWorkEfforts"/>
</request-map>
+ -->
+
<request-map uri="FindPhase">
<security https="true" auth="true"/>
<response name="success" type="view" value="FindPhase"/>
@@ -810,14 +822,27 @@
<view-map name="MyTasks" type="screen" page="component://projectmgr/widget/TaskScreens.xml#MyTasks"/>
<view-map name="FindTask" type="screen" page="component://projectmgr/widget/TaskScreens.xml#FindTask"/>
<view-map name="EditTask" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTask"/>
+
<view-map name="AddProjectTask" type="screen" page="component://projectmgr/widget/TaskScreens.xml#AddProjectTask"/>
+
+ <!-- TO DO
<view-map name="AddTaskAndAssoc" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#AddTaskAndAssoc"/>
<view-map name="EditTaskAndAssoc" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTaskAndAssoc"/>
+ -->
+
<view-map name="Dependencies" type="screen" page="component://projectmgr/widget/TaskScreens.xml#Dependencies"/>
+
+ <!-- TO DO
<view-map name="EditTaskList" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTaskList"/>
+ -->
+
<view-map name="EditTaskPartyAssigns" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTaskPartyAssigns"/>
<view-map name="EditTaskListAndAssoc" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTaskListAndAssoc"/>
+
+ <!-- TO DO
<view-map name="ChildTaskWorkEfforts" type="screen" page="component://projectmgr/widget/TaskScreens.xml#ChildTaskWorkEfforts"/>
+ -->
+
<view-map name="ListWorkEffortPartyAssigns" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProjectParties"/>
<view-map name="FindPhase" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#FindPhase"/>
<view-map name="EditProjectSkills" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProjectSkills"/>
@@ -832,7 +857,6 @@
<view-map name="EditTimesheetRoles" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#EditTimesheetRoles"/>
<view-map name="MyTimesheet" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#MyTimesheet"/>
<view-map name="EditSkillTypes" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#EditSkillTypes"/>
- <view-map name="EditPartySkills" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditPartySkills"/>
<view-map name="EditWorkEffortNotes" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProjectNotes"/>
<view-map name="EditTaskNotes" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTaskNotes"/>
<view-map name="taskView" type="screen" page="component://projectmgr/widget/TaskScreens.xml#TaskView"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=702273&r1=702272&r2=702273&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Mon Oct 6 14:26:25 2008
@@ -434,8 +434,8 @@
<container style="screenlet-header">
<label style="boxhead">${uiLabelMap.HumanResEditPartySkill}</label>
</container>
- <include-form name="ListPartySkills" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
- <include-form name="EditPartySkill" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ <include-form name="ListPartySkills" location="component://humanres/widget/forms/PartySkillForms.xml"/>
+ <include-form name="AddPartySkills" location="component://humanres/widget/forms/PartySkillForms.xml"/>
</container>
</decorator-section>
</decorator-screen>