You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jo...@apache.org on 2008/06/10 06:53:53 UTC
svn commit: r665981 - in /ofbiz/trunk: applications/order/
applications/order/src/org/ofbiz/order/order/
applications/order/src/org/ofbiz/order/test/
applications/order/webapp/ordermgr/WEB-INF/
applications/order/webapp/ordermgr/includes/ applications/...
Author: jonesde
Date: Mon Jun 9 21:53:52 2008
New Revision: 665981
URL: http://svn.apache.org/viewvc?rev=665981&view=rev
Log:
Finally deprecating the old workflow engine which hasnt been used in years; moving it to the specialpurpose directory and have pulled out the order task list stuff in the order manager that used to use it and though that stuff still exists the controller entries and such are in comments in the screen def file; also moved shark to the specialpurpose directory as it is also rarely used and is not used in any OFBiz applications as it requires LGPL libraries, among other issues that leave it short of complete
Added:
ofbiz/trunk/specialpurpose/shark/
- copied from r664546, ofbiz/trunk/framework/shark/
ofbiz/trunk/specialpurpose/shark/build.xml
- copied unchanged from r665979, ofbiz/trunk/framework/shark/build.xml
ofbiz/trunk/specialpurpose/shark/config/
- copied from r665979, ofbiz/trunk/framework/shark/config/
ofbiz/trunk/specialpurpose/shark/dtd/
- copied from r665979, ofbiz/trunk/framework/shark/dtd/
ofbiz/trunk/specialpurpose/shark/entitydef/
- copied from r665979, ofbiz/trunk/framework/shark/entitydef/
ofbiz/trunk/specialpurpose/shark/example/
- copied from r665979, ofbiz/trunk/framework/shark/example/
ofbiz/trunk/specialpurpose/shark/lib/
- copied from r665979, ofbiz/trunk/framework/shark/lib/
ofbiz/trunk/specialpurpose/shark/ofbiz-component.xml
- copied unchanged from r665979, ofbiz/trunk/framework/shark/ofbiz-component.xml
ofbiz/trunk/specialpurpose/shark/servicedef/
- copied from r665979, ofbiz/trunk/framework/shark/servicedef/
ofbiz/trunk/specialpurpose/shark/src/
- copied from r665979, ofbiz/trunk/framework/shark/src/
ofbiz/trunk/specialpurpose/shark/webapp/
- copied from r665979, ofbiz/trunk/framework/shark/webapp/
ofbiz/trunk/specialpurpose/shark/widget/
- copied from r665979, ofbiz/trunk/framework/shark/widget/
ofbiz/trunk/specialpurpose/workflow/
- copied from r664546, ofbiz/trunk/framework/workflow/
ofbiz/trunk/specialpurpose/workflow/build.xml
- copied, changed from r665979, ofbiz/trunk/framework/workflow/build.xml
ofbiz/trunk/specialpurpose/workflow/data/
- copied from r665979, ofbiz/trunk/framework/workflow/data/
ofbiz/trunk/specialpurpose/workflow/dtd/
- copied from r665979, ofbiz/trunk/framework/workflow/dtd/
ofbiz/trunk/specialpurpose/workflow/entitydef/
- copied from r665979, ofbiz/trunk/framework/workflow/entitydef/
ofbiz/trunk/specialpurpose/workflow/ofbiz-component.xml
- copied unchanged from r665979, ofbiz/trunk/framework/workflow/ofbiz-component.xml
ofbiz/trunk/specialpurpose/workflow/servicedef/
- copied from r665979, ofbiz/trunk/framework/workflow/servicedef/
ofbiz/trunk/specialpurpose/workflow/src/
- copied from r665979, ofbiz/trunk/framework/workflow/src/
Removed:
ofbiz/trunk/framework/shark/
ofbiz/trunk/framework/workflow/
Modified:
ofbiz/trunk/applications/order/build.xml
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderChangeHelper.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/test/OrderTestServices.java
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/trunk/applications/order/webapp/ordermgr/includes/appheader.ftl
ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml
ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml
ofbiz/trunk/framework/build.xml
ofbiz/trunk/framework/component-load.xml
ofbiz/trunk/specialpurpose/assetmaint/build.xml
ofbiz/trunk/specialpurpose/build.xml
ofbiz/trunk/specialpurpose/component-load.xml
ofbiz/trunk/specialpurpose/ebay/build.xml
ofbiz/trunk/specialpurpose/googlebase/build.xml
ofbiz/trunk/specialpurpose/workflow/entitydef/entitymodel.xml
Modified: ofbiz/trunk/applications/order/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/build.xml?rev=665981&r1=665980&r2=665981&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/build.xml (original)
+++ ofbiz/trunk/applications/order/build.xml Mon Jun 9 21:53:52 2008
@@ -52,7 +52,6 @@
<fileset dir="../../framework/webapp/lib" includes="*.jar"/>
<fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
<fileset dir="../../framework/common/build/lib" includes="*.jar"/>
- <fileset dir="../../framework/workflow/build/lib" includes="*.jar"/>
<fileset dir="../content/build/lib" includes="*.jar"/>
<fileset dir="../party/build/lib" includes="*.jar"/>
<fileset dir="../product/build/lib" includes="*.jar"/>
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderChangeHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderChangeHelper.java?rev=665981&r1=665980&r2=665981&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderChangeHelper.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderChangeHelper.java Mon Jun 9 21:53:52 2008
@@ -33,8 +33,6 @@
import org.ofbiz.service.LocalDispatcher;
import org.ofbiz.service.ModelService;
import org.ofbiz.service.ServiceUtil;
-import org.ofbiz.workflow.WfException;
-import org.ofbiz.workflow.client.WorkflowClient;
/**
* Order Helper - Helper Methods For Non-Read Actions
@@ -306,6 +304,7 @@
public static boolean releaseInitialOrderHold(LocalDispatcher dispatcher, String orderId) {
+ /* NOTE DEJ20080609 commenting out this code because the old OFBiz Workflow Engine is being deprecated and this was only for that
// get the delegator from the dispatcher
GenericDelegator delegator = dispatcher.getDelegator();
@@ -342,9 +341,12 @@
Debug.logWarning("No WF found for order ID : " + orderId, module);
}
return false;
+ */
+ return true;
}
public static boolean abortOrderProcessing(LocalDispatcher dispatcher, String orderId) {
+ /* NOTE DEJ20080609 commenting out this code because the old OFBiz Workflow Engine is being deprecated and this was only for that
Debug.logInfo("Aborting workflow for order " + orderId, module);
GenericDelegator delegator = dispatcher.getDelegator();
@@ -376,5 +378,7 @@
}
}
return false;
+ */
+ return true;
}
}
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=665981&r1=665980&r2=665981&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java Mon Jun 9 21:53:52 2008
@@ -59,7 +59,6 @@
import org.ofbiz.service.LocalDispatcher;
import org.ofbiz.service.ModelService;
import org.ofbiz.service.ServiceUtil;
-import org.ofbiz.workflow.WfUtil;
import javax.transaction.Transaction;
@@ -2436,14 +2435,19 @@
} catch (GenericEntityException e) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderProblemWithEntityLookup", locale));
}
- if (party != null)
+ if (party != null) {
assignedToEmails = ContactHelper.getContactMechByPurpose(party, "PRIMARY_EMAIL", false);
+ }
Map templateData = new HashMap(context);
- String omgStatusId = WfUtil.getOMGStatus(workEffort.getString("currentStatusId"));
templateData.putAll(orderHeader);
templateData.putAll(workEffort);
+
+ /* NOTE DEJ20080609 commenting out this code because the old OFBiz Workflow Engine is being deprecated and this was only for that
+ String omgStatusId = WfUtil.getOMGStatus(workEffort.getString("currentStatusId"));
templateData.put("omgStatusId", omgStatusId);
+ */
+ templateData.put("omgStatusId", workEffort.getString("currentStatusId"));
// get the assignments
List assignments = null;
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/test/OrderTestServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/test/OrderTestServices.java?rev=665981&r1=665980&r2=665981&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/test/OrderTestServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/test/OrderTestServices.java Mon Jun 9 21:53:52 2008
@@ -18,50 +18,27 @@
*******************************************************************************/
package org.ofbiz.order.test;
-import java.math.BigDecimal;
-import java.sql.Timestamp;
-import java.text.NumberFormat;
-import java.text.ParseException;
-import java.util.*;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Random;
import javolution.util.FastList;
-import javolution.util.FastMap;
-import org.ofbiz.base.util.*;
-import org.ofbiz.base.util.collections.ResourceBundleMapWrapper;
-import org.ofbiz.common.DataModelConstants;
+import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.entity.GenericDelegator;
-import org.ofbiz.entity.GenericEntity;
-import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
-import org.ofbiz.entity.transaction.TransactionUtil;
-import org.ofbiz.entity.transaction.GenericTransactionException;
-import org.ofbiz.entity.condition.EntityCondition;
-import org.ofbiz.entity.condition.EntityConditionList;
-import org.ofbiz.entity.condition.EntityExpr;
-import org.ofbiz.entity.condition.EntityOperator;
-import org.ofbiz.entity.util.EntityListIterator;
-import org.ofbiz.entity.util.EntityUtil;
import org.ofbiz.order.order.OrderChangeHelper;
-import org.ofbiz.order.shoppingcart.CartItemModifyException;
import org.ofbiz.order.shoppingcart.CheckOutHelper;
-import org.ofbiz.order.shoppingcart.ItemNotFoundException;
import org.ofbiz.order.shoppingcart.ShoppingCart;
-import org.ofbiz.order.shoppingcart.ShoppingCartItem;
-import org.ofbiz.order.shoppingcart.shipping.ShippingEvents;
-import org.ofbiz.party.contact.ContactHelper;
-import org.ofbiz.party.party.PartyWorker;
-import org.ofbiz.product.product.ProductWorker;
-import org.ofbiz.product.store.ProductStoreWorker;
-import org.ofbiz.security.Security;
import org.ofbiz.service.DispatchContext;
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.LocalDispatcher;
import org.ofbiz.service.ModelService;
import org.ofbiz.service.ServiceUtil;
-import org.ofbiz.workflow.WfUtil;
-
-import javax.transaction.Transaction;
/**
* Order Processing Services
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=665981&r1=665980&r2=665981&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Mon Jun 9 21:53:52 2008
@@ -78,10 +78,6 @@
<response name="success" type="view" value="findorders"/>
<response name="error" type="view" value="findorders"/>
</request-map>
- <request-map uri="tasklist">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="ordertasklist"/>
- </request-map>
<request-map uri="orderlist">
<security https="true" auth="true"/>
<response name="success" type="view" value="orderlist"/>
@@ -148,42 +144,6 @@
<response name="error" type="request-redirect" value="findorders"/>
</request-map>
- <!-- Order Manager Task List Requests -->
- <request-map uri="acceptassignment">
- <security https="true" auth="true"/>
- <event type="java" path="org.ofbiz.order.task.TaskEvents" invoke="acceptRoleAssignment"/>
- <response name="success" type="view" value="orderview"/>
- <response name="error" type="view" value="ordertasklist"/>
- </request-map>
-
- <request-map uri="delegateassignment">
- <security https="true" auth="true"/>
- <event type="java" path="org.ofbiz.order.task.TaskEvents" invoke="delegateAndAcceptAssignment"/>
- <response name="success" type="view" value="orderview"/>
- <response name="error" type="view" value="ordertasklist"/>
- </request-map>
-
- <request-map uri="completeassignment">
- <security https="true" auth="true"/>
- <event type="java" path="org.ofbiz.order.task.TaskEvents" invoke="completeAssignment"/>
- <response name="success" type="view" value="ordertasklist"/>
- <response name="error" type="view" value="ordertasklist"/>
- </request-map>
-
- <request-map uri="holdorder">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="wfSuspendActivity"/>
- <response name="success" type="view" value="ordertasklist"/>
- <response name="error" type="view" value="ordertasklist"/>
- </request-map>
-
- <request-map uri="releasehold">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="wfResumeActivity"/>
- <response name="success" type="view" value="ordertasklist"/>
- <response name="error" type="view" value="ordertasklist"/>
- </request-map>
-
<!-- Delivery Info Requests, intended for sales orders but can be used for purchase orders as well -->
<request-map uri="OrderDeliveryScheduleInfo">
<security https="true" auth="true"/>
@@ -1543,7 +1503,6 @@
<view-map name="editorderitems" type="screen" page="component://order/widget/ordermgr/OrderViewScreens.xml#OrderItemEdit"/>
<view-map name="createnewnote" type="screen" page="component://order/widget/ordermgr/OrderViewScreens.xml#OrderNewNote"/>
<view-map name="receivepayment" type="screen" page="component://order/widget/ordermgr/OrderViewScreens.xml#OrderReceivePayment"/>
- <view-map name="ordertasklist" type="screen" page="component://order/widget/ordermgr/OrderTaskScreens.xml#OrderTaskList"/>
<view-map name="viewimage" type="screen" page="component://order/widget/ordermgr/OrderViewScreens.xml#ViewImage"/>
<view-map name="ListOrderTerms" type="screen" page="component://order/widget/ordermgr/OrderViewScreens.xml#ListOrderTerms"/>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/includes/appheader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/includes/appheader.ftl?rev=665981&r1=665980&r2=665981&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/includes/appheader.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/includes/appheader.ftl Mon Jun 9 21:53:52 2008
@@ -40,7 +40,6 @@
</#if>
<#if security.hasRolePermission("ORDERMGR", "_VIEW", "", "", session) || security.hasRolePermission("ORDERMGR_ROLE", "_VIEW", "", "", session)>
<li<#if selected = "requirement"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.OrderRequirements}</a></li>
- <li<#if selected = "tasklist"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.OrderOrderTasks}</a></li>
</#if>
<li<#if selected = "reports"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonReports}</a></li>
<li<#if selected = "stats"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonStats}</a></li>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml?rev=665981&r1=665980&r2=665981&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml Mon Jun 9 21:53:52 2008
@@ -17,6 +17,54 @@
specific language governing permissions and limitations
under the License.
-->
+
+<!--
+To use these screens add these entries to the controller.xml file:
+
+<request-map uri="tasklist"><security https="true" auth="true"/><response name="success" type="view" value="ordertasklist"/></request-map>
+
+<!- - Order Manager Task List Requests - ->
+<request-map uri="acceptassignment">
+ <security https="true" auth="true"/>
+ <event type="java" path="org.ofbiz.order.task.TaskEvents" invoke="acceptRoleAssignment"/>
+ <response name="success" type="view" value="orderview"/>
+ <response name="error" type="view" value="ordertasklist"/>
+</request-map>
+<request-map uri="delegateassignment">
+ <security https="true" auth="true"/>
+ <event type="java" path="org.ofbiz.order.task.TaskEvents" invoke="delegateAndAcceptAssignment"/>
+ <response name="success" type="view" value="orderview"/>
+ <response name="error" type="view" value="ordertasklist"/>
+</request-map>
+<request-map uri="completeassignment">
+ <security https="true" auth="true"/>
+ <event type="java" path="org.ofbiz.order.task.TaskEvents" invoke="completeAssignment"/>
+ <response name="success" type="view" value="ordertasklist"/>
+ <response name="error" type="view" value="ordertasklist"/>
+</request-map>
+<request-map uri="holdorder">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="wfSuspendActivity"/>
+ <response name="success" type="view" value="ordertasklist"/>
+ <response name="error" type="view" value="ordertasklist"/>
+</request-map>
+<request-map uri="releasehold">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="wfResumeActivity"/>
+ <response name="success" type="view" value="ordertasklist"/>
+ <response name="error" type="view" value="ordertasklist"/>
+</request-map>
+
+
+<view-map name="ordertasklist" type="screen" page="component://order/widget/ordermgr/OrderTaskScreens.xml#OrderTaskList"/>
+
+==================
+Also add this back to appheader.ftl:
+
+<li<#if selected = "tasklist"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.OrderOrderTasks}</a></li>
+
+-->
+
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
<screen name="CommonOrderTaskDecorator">
<section>
@@ -51,4 +99,4 @@
</widgets>
</section>
</screen>
-</screens>
\ No newline at end of file
+</screens>
Modified: ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml?rev=665981&r1=665980&r2=665981&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml Mon Jun 9 21:53:52 2008
@@ -238,11 +238,6 @@
<field name="lastStatusUpdate" type="date-time"></field>
<field name="workEffortPurposeTypeId" type="id"></field>
<field name="workEffortParentId" type="id"></field>
- <field name="workflowPackageId" type="id-long"></field>
- <field name="workflowPackageVersion" type="short-varchar"></field>
- <field name="workflowProcessId" type="id-long"></field>
- <field name="workflowProcessVersion" type="short-varchar"></field>
- <field name="workflowActivityId" type="id-long"></field>
<field name="scopeEnumId" type="id"></field>
<field name="priority" type="numeric"></field>
<field name="percentComplete" type="numeric"></field>
@@ -324,23 +319,6 @@
<relation type="one" fk-name="WK_EFFRT_NOTE" rel-entity-name="NoteData">
<key-map field-name="noteId"/>
</relation>
- <relation type="one" fk-name="WK_EFFRT_WFLW_PKG" rel-entity-name="WorkflowPackage">
- <key-map field-name="workflowPackageId" rel-field-name="packageId"/>
- <key-map field-name="workflowPackageVersion" rel-field-name="packageVersion"/>
- </relation>
- <relation type="one" fk-name="WK_EFFRT_WFLW_PRC" rel-entity-name="WorkflowProcess">
- <key-map field-name="workflowPackageId" rel-field-name="packageId"/>
- <key-map field-name="workflowPackageVersion" rel-field-name="packageVersion"/>
- <key-map field-name="workflowProcessId" rel-field-name="processId"/>
- <key-map field-name="workflowProcessVersion" rel-field-name="processVersion"/>
- </relation>
- <relation type="one" fk-name="WK_EFFRT_WFLW_ACT" rel-entity-name="WorkflowActivity">
- <key-map field-name="workflowPackageId" rel-field-name="packageId"/>
- <key-map field-name="workflowPackageVersion" rel-field-name="packageVersion"/>
- <key-map field-name="workflowProcessId" rel-field-name="processId"/>
- <key-map field-name="workflowProcessVersion" rel-field-name="processVersion"/>
- <key-map field-name="workflowActivityId" rel-field-name="activityId"/>
- </relation>
<relation type="one" fk-name="WK_EFFRT_CUS_MET" rel-entity-name="CustomMethod">
<key-map field-name="estimateCalcMethod" rel-field-name="customMethodId"/>
</relation>
Modified: ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml?rev=665981&r1=665980&r2=665981&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml (original)
+++ ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml Mon Jun 9 21:53:52 2008
@@ -110,23 +110,6 @@
<relation type="many" rel-entity-name="WorkEffortStatus">
<key-map field-name="workEffortId"/>
</relation>
- <relation type="one-nofk" rel-entity-name="WorkflowPackage">
- <key-map field-name="workflowPackageId" rel-field-name="packageId"/>
- <key-map field-name="workflowPackageVersion" rel-field-name="packageVersion"/>
- </relation>
- <relation type="one-nofk" rel-entity-name="WorkflowProcess">
- <key-map field-name="workflowPackageId" rel-field-name="packageId"/>
- <key-map field-name="workflowPackageVersion" rel-field-name="packageVersion"/>
- <key-map field-name="workflowProcessId" rel-field-name="processId"/>
- <key-map field-name="workflowProcessVersion" rel-field-name="processVersion"/>
- </relation>
- <relation type="one-nofk" rel-entity-name="WorkflowActivity">
- <key-map field-name="workflowPackageId" rel-field-name="packageId"/>
- <key-map field-name="workflowPackageVersion" rel-field-name="packageVersion"/>
- <key-map field-name="workflowProcessId" rel-field-name="processId"/>
- <key-map field-name="workflowProcessVersion" rel-field-name="processVersion"/>
- <key-map field-name="workflowActivityId" rel-field-name="activityId"/>
- </relation>
<relation type="many" rel-entity-name="QuoteItem">
<key-map field-name="workEffortId"/>
</relation>
Modified: ofbiz/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/build.xml?rev=665981&r1=665980&r2=665981&view=diff
==============================================================================
--- ofbiz/trunk/framework/build.xml (original)
+++ ofbiz/trunk/framework/build.xml Mon Jun 9 21:53:52 2008
@@ -26,11 +26,10 @@
catalina/build.xml,jetty/build.xml,
security/build.xml,service/build.xml,entityext/build.xml,
datafile/build.xml,minilang/build.xml,
- common/build.xml,workflow/build.xml,
+ common/build.xml,
webapp/build.xml,guiapp/build.xml,widget/build.xml,
testtools/build.xml,
appserver/build.xml,webtools/build.xml,example/build.xml"/>
- <!-- For Shark add "shark/build.xml" to the list above, in the framework-builds list (after workflow, before webapp works fine) -->
<filelist id="test-builds" dir="." files="base/build.xml,entity/build.xml"/>
Modified: ofbiz/trunk/framework/component-load.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/component-load.xml?rev=665981&r1=665980&r2=665981&view=diff
==============================================================================
--- ofbiz/trunk/framework/component-load.xml (original)
+++ ofbiz/trunk/framework/component-load.xml Mon Jun 9 21:53:52 2008
@@ -34,8 +34,6 @@
<load-component component-location="guiapp"/>
<load-component component-location="widget"/>
<load-component component-location="appserver"/>
- <load-component component-location="workflow"/>
- <!-- load-component component-location="shark"/-->
<load-component component-location="testtools"/>
<load-component component-location="webtools"/>
<load-component component-location="images"/>
Modified: ofbiz/trunk/specialpurpose/assetmaint/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/build.xml?rev=665981&r1=665980&r2=665981&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/build.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/build.xml Mon Jun 9 21:53:52 2008
@@ -49,7 +49,6 @@
<fileset dir="../../framework/webapp/lib" includes="*.jar"/>
<fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
<fileset dir="../../framework/common/build/lib" includes="*.jar"/>
- <fileset dir="../../framework/workflow/build/lib" includes="*.jar"/>
<fileset dir="../../applications/product/build/lib" includes="*.jar"/>
</path>
</target>
Modified: ofbiz/trunk/specialpurpose/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/build.xml?rev=665981&r1=665980&r2=665981&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/build.xml (original)
+++ ofbiz/trunk/specialpurpose/build.xml Mon Jun 9 21:53:52 2008
@@ -19,9 +19,19 @@
-->
<project name="OFBiz Special Purpose Applications Build" default="build" basedir=".">
- <filelist id="application-builds" dir="."
- files="pos/build.xml, hhfacility/build.xml, assetmaint/build.xml, oagis/build.xml, bi/build.xml, googlebase/build.xml, ebay/build.xml, projectmgr/build.xml"/>
-
+ <filelist id="specialpurpose-builds" dir="."
+ files="
+ pos/build.xml,
+ hhfacility/build.xml,
+ assetmaint/build.xml,
+ oagis/build.xml,
+ bi/build.xml,
+ googlebase/build.xml,
+ ebay/build.xml,
+ projectmgr/build.xml"/>
+ <!-- For the old OFBiz Workflow Engine add "workflow/build.xml" to the list above -->
+ <!-- For Shark add "shark/build.xml" to the list above, in the specialpurpose-builds list (after workflow) -->
+
<!-- ================================================================== -->
<!-- Removes all created files and directories -->
<!-- ================================================================== -->
@@ -47,7 +57,7 @@
<target name="clean">
<subant target="clean">
- <filelist refid="application-builds"/>
+ <filelist refid="specialpurpose-builds"/>
</subant>
<delete file="ofbiz.jar"/>
<echo message="[clean] ========== Done Cleaning Special purpose =========="/>
@@ -61,7 +71,7 @@
<echo message="[build] ========== Start Building Special Purpose (Compile) =========="/>
<subant inheritall="false">
- <filelist refid="application-builds"/>
+ <filelist refid="specialpurpose-builds"/>
</subant>
<echo message="[build] ========== Done Building Special Purpose (Compile) =========="/>
@@ -75,7 +85,7 @@
<echo message="[docs] ========== Start Building Special Purpose (JavaDoc) =========="/>
<subant target="docs">
- <filelist refid="application-builds"/>
+ <filelist refid="specialpurpose-builds"/>
</subant>
<echo message="[docs] ========== Done Building Special Purpose (JavaDocs) =========="/>
Modified: ofbiz/trunk/specialpurpose/component-load.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/component-load.xml?rev=665981&r1=665980&r2=665981&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/component-load.xml (original)
+++ ofbiz/trunk/specialpurpose/component-load.xml Mon Jun 9 21:53:52 2008
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
+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.
-->
<component-loader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -29,4 +29,6 @@
<load-component component-location="bi"/>
<load-component component-location="googlebase"/>
<load-component component-location="ebay"/>
+ <!-- <load-component component-location="workflow"/> -->
+ <!-- <load-component component-location="shark"/> -->
</component-loader>
Modified: ofbiz/trunk/specialpurpose/ebay/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/build.xml?rev=665981&r1=665980&r2=665981&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/build.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/build.xml Mon Jun 9 21:53:52 2008
@@ -49,7 +49,6 @@
<fileset dir="../../framework/webapp/lib" includes="*.jar"/>
<fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
<fileset dir="../../framework/common/build/lib" includes="*.jar"/>
- <fileset dir="../../framework/workflow/build/lib" includes="*.jar"/>
<fileset dir="../../applications/product/build/lib" includes="*.jar"/>
<fileset dir="../../applications/party/build/lib" includes="*.jar"/>
<fileset dir="../../applications/order/build/lib" includes="*.jar"/>
Modified: ofbiz/trunk/specialpurpose/googlebase/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/build.xml?rev=665981&r1=665980&r2=665981&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/build.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/build.xml Mon Jun 9 21:53:52 2008
@@ -49,7 +49,6 @@
<fileset dir="../../framework/webapp/lib" includes="*.jar"/>
<fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
<fileset dir="../../framework/common/build/lib" includes="*.jar"/>
- <fileset dir="../../framework/workflow/build/lib" includes="*.jar"/>
<fileset dir="../../applications/product/build/lib" includes="*.jar"/>
</path>
</target>
Copied: ofbiz/trunk/specialpurpose/workflow/build.xml (from r665979, ofbiz/trunk/framework/workflow/build.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/build.xml?p2=ofbiz/trunk/specialpurpose/workflow/build.xml&p1=ofbiz/trunk/framework/workflow/build.xml&r1=665979&r2=665981&rev=665981&view=diff
==============================================================================
--- ofbiz/trunk/framework/workflow/build.xml (original)
+++ ofbiz/trunk/specialpurpose/workflow/build.xml Mon Jun 9 21:53:52 2008
@@ -38,14 +38,14 @@
<target name="classpath">
<path id="local.class.path">
<!--<fileset dir="${lib.dir}" includes="*.jar"/>-->
- <fileset dir="../base/lib" includes="*.jar"/>
- <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
- <fileset dir="../base/lib/scripting" includes="*.jar"/>
- <fileset dir="../base/build/lib" includes="*.jar"/>
- <fileset dir="../entity/lib" includes="*.jar"/>
- <fileset dir="../entity/build/lib" includes="*.jar"/>
- <fileset dir="../security/build/lib" includes="*.jar"/>
- <fileset dir="../service/build/lib" includes="*.jar"/>
+ <fileset dir="../../framework/base/lib" includes="*.jar"/>
+ <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
+ <fileset dir="../../framework/base/lib/scripting" includes="*.jar"/>
+ <fileset dir="../../framework/base/build/lib" includes="*.jar"/>
+ <fileset dir="../../framework/entity/lib" includes="*.jar"/>
+ <fileset dir="../../framework/entity/build/lib" includes="*.jar"/>
+ <fileset dir="../../framework/security/build/lib" includes="*.jar"/>
+ <fileset dir="../../framework/service/build/lib" includes="*.jar"/>
</path>
</target>
Modified: ofbiz/trunk/specialpurpose/workflow/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/entitydef/entitymodel.xml?rev=665981&r1=665979&r2=665981&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/specialpurpose/workflow/entitydef/entitymodel.xml Mon Jun 9 21:53:52 2008
@@ -40,6 +40,30 @@
<!-- org.ofbiz.workflow.definition -->
<!-- ========================================================= -->
+ <extend-entity entity-name="WorkEffort">
+ <field name="workflowPackageId" type="id-long"></field>
+ <field name="workflowPackageVersion" type="short-varchar"></field>
+ <field name="workflowProcessId" type="id-long"></field>
+ <field name="workflowProcessVersion" type="short-varchar"></field>
+ <field name="workflowActivityId" type="id-long"></field>
+ <relation type="one" fk-name="WK_EFFRT_WFLW_PKG" rel-entity-name="WorkflowPackage">
+ <key-map field-name="workflowPackageId" rel-field-name="packageId"/>
+ <key-map field-name="workflowPackageVersion" rel-field-name="packageVersion"/>
+ </relation>
+ <relation type="one" fk-name="WK_EFFRT_WFLW_PRC" rel-entity-name="WorkflowProcess">
+ <key-map field-name="workflowPackageId" rel-field-name="packageId"/>
+ <key-map field-name="workflowPackageVersion" rel-field-name="packageVersion"/>
+ <key-map field-name="workflowProcessId" rel-field-name="processId"/>
+ <key-map field-name="workflowProcessVersion" rel-field-name="processVersion"/>
+ </relation>
+ <relation type="one" fk-name="WK_EFFRT_WFLW_ACT" rel-entity-name="WorkflowActivity">
+ <key-map field-name="workflowPackageId" rel-field-name="packageId"/>
+ <key-map field-name="workflowPackageVersion" rel-field-name="packageVersion"/>
+ <key-map field-name="workflowProcessId" rel-field-name="processId"/>
+ <key-map field-name="workflowProcessVersion" rel-field-name="processVersion"/>
+ <key-map field-name="workflowActivityId" rel-field-name="activityId"/>
+ </relation>
+ </extend-entity>
<entity entity-name="WorkflowActivity"
package-name="org.ofbiz.workflow.definition"
title="Workflow Activity Entity">