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 2007/10/30 19:51:27 UTC
svn commit: r590266 - in /ofbiz/trunk:
applications/order/webapp/ordermgr/WEB-INF/actions/order/
applications/order/webapp/ordermgr/order/ framework/base/config/
framework/service/src/org/ofbiz/service/
Author: jaz
Date: Tue Oct 30 11:51:27 2007
New Revision: 590266
URL: http://svn.apache.org/viewvc?rev=590266&view=rev
Log:
reverted last change
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderview.bsh
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
ofbiz/trunk/framework/base/config/ofbiz-containers.xml
ofbiz/trunk/framework/service/src/org/ofbiz/service/LocalDispatcher.java
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderview.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderview.bsh?rev=590266&r1=590265&r2=590266&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderview.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderview.bsh Tue Oct 30 11:51:27 2007
@@ -253,16 +253,6 @@
context.put("mktgPkgATPMap", inventorySummary.get("mktgPkgATPMap"));
context.put("mktgPkgQOHMap", inventorySummary.get("mktgPkgQOHMap"));
- // get inventory summary with respect to facility
- productStore = orderHeader.getRelatedOne("ProductStore");
- if (productStore != null) {
- facility = productStore.getRelatedOne("Facility");
- inventorySummaryByFacility = dispatcher.runSync("getProductInventorySummaryForItems", UtilMisc.toMap("orderItems", orderItems, "facilityId", facility.getString("facilityId")));
- context.put("availableToPromiseByFacilityMap", inventorySummaryByFacility.get("availableToPromiseMap"));
- context.put("quantityOnHandByFacilityMap", inventorySummaryByFacility.get("quantityOnHandMap"));
- context.put("facility", facility);
- }
-
// Get a list of facilities for purchase orders to receive against.
// These facilities must be owned by the bill-to party of the purchase order.
// For a given ship group, the allowed facilities are the ones associated
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=590266&r1=590265&r2=590266&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Tue Oct 30 11:51:27 2007
@@ -111,13 +111,7 @@
</td><td> </td></tr>
<tr><td align="left">${uiLabelMap.OrderRequiredForSO}</td>
<td style="padding-left: 15px; text-align: left;">${requiredQuantity}</td></tr>
- <#if availableToPromiseByFacilityMap?exists && quantityOnHandByFacilityMap?exists && quantityOnHandByFacilityMap.get(productId)?exists && availableToPromiseByFacilityMap.get(productId)?exists>
- <#assign atpQuantityByFacility = availableToPromiseByFacilityMap.get(productId)?default(0)>
- <#assign qohQuantityByFacility = quantityOnHandByFacilityMap.get(productId)?default(0)>
- <tr><td align="left">${uiLabelMap.ProductInInventory} [${facility.facilityName?if_exists}] ${uiLabelMap.ProductQoh}</td>
- <td style="padding-left: 15px; text-align: left;">${qohQuantityByFacility} (${uiLabelMap.ProductAtp}: ${atpQuantityByFacility})</td></tr>
- </#if>
- <tr><td align="left">${uiLabelMap.ProductInInventory} [${uiLabelMap.CommonAll} ${uiLabelMap.ProductFacilities}] ${uiLabelMap.ProductQoh}</td>
+ <tr><td align="left">${uiLabelMap.ProductInInventory} ${uiLabelMap.ProductQoh}</td>
<td style="padding-left: 15px; text-align: left;">${qohQuantity} (${uiLabelMap.ProductAtp}: ${atpQuantity})</td></tr>
<#if (product != null) && (product.productTypeId != null) && (product.productTypeId == "MARKETING_PKG_AUTO" || product.productTypeId == "MARKETING_PKG_PICK")>
<tr><td align="left">${uiLabelMap.ProductMarketingPackageQOH}</td>
Modified: ofbiz/trunk/framework/base/config/ofbiz-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/ofbiz-containers.xml?rev=590266&r1=590265&r2=590266&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/ofbiz-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/ofbiz-containers.xml Tue Oct 30 11:51:27 2007
@@ -234,7 +234,7 @@
<!-- SSL connector attributes -->
<property name="sSLImplementation" value="org.ofbiz.catalina.container.SSLImpl"/>
<property name="algorithm" value="SunX509"/>
- <property name="clientAuth" value="false"/>
+ <property name="clientAuth" value="want"/>
<property name="keystoreFile" value="framework/base/config/ofbizssl.jks"/>
<property name="keystorePass" value="changeit"/>
<property name="keystoreType" value="JKS"/>
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/LocalDispatcher.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/LocalDispatcher.java?rev=590266&r1=590265&r2=590266&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/LocalDispatcher.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/LocalDispatcher.java Tue Oct 30 11:51:27 2007
@@ -39,7 +39,7 @@
* @throws ServiceValidationException
* @throws GenericServiceException
*/
- public Map<String, Object> runSync(String serviceName, Map<String, ?> context) throws GenericServiceException;
+ public Map<String, Object> runSync(String serviceName, Map<String, ? extends Object> context) throws GenericServiceException;
/**
* Run the service synchronously with a specified timeout and return the result.
@@ -52,8 +52,8 @@
* @throws ServiceValidationException
* @throws GenericServiceException
*/
- public Map<String, Object> runSync(String serviceName, Map<String, ?> context, int transactionTimeout, boolean requireNewTransaction) throws GenericServiceException;
- public Map<String, Object> runSync(String serviceName, int transactionTimeout, boolean requireNewTransaction, Object... context) throws GenericServiceException;
+ public Map<String, Object> runSync(String serviceName, Map<String, ? extends Object> context, int transactionTimeout, boolean requireNewTransaction) throws ServiceAuthException, ServiceValidationException, GenericServiceException;
+ public Map<String, Object> runSync(String serviceName, int transactionTimeout, boolean requireNewTransaction, Object... context) throws ServiceAuthException, ServiceValidationException, GenericServiceException;
/**
* Run the service synchronously and IGNORE the result.
@@ -63,7 +63,7 @@
* @throws ServiceValidationException
* @throws GenericServiceException
*/
- public void runSyncIgnore(String serviceName, Map<String, ?> context) throws GenericServiceException;
+ public void runSyncIgnore(String serviceName, Map<String, ? extends Object> context) throws GenericServiceException;
/**
* Run the service synchronously with a specified timeout and IGNORE the result.
@@ -75,8 +75,8 @@
* @throws ServiceValidationException
* @throws GenericServiceException
*/
- public void runSyncIgnore(String serviceName, Map<String, ?> context, int transactionTimeout, boolean requireNewTransaction) throws GenericServiceException;
- public void runSyncIgnore(String serviceName, int transactionTimeout, boolean requireNewTransaction, Object... context) throws GenericServiceException;
+ public void runSyncIgnore(String serviceName, Map<String, ? extends Object> context, int transactionTimeout, boolean requireNewTransaction) throws ServiceAuthException, ServiceValidationException, GenericServiceException;
+ public void runSyncIgnore(String serviceName, int transactionTimeout, boolean requireNewTransaction, Object... context) throws ServiceAuthException, ServiceValidationException, GenericServiceException;
/**
* Run the service asynchronously, passing an instance of GenericRequester that will receive the result.
@@ -90,8 +90,8 @@
* @throws ServiceValidationException
* @throws GenericServiceException
*/
- public void runAsync(String serviceName, Map<String, ?> context, GenericRequester requester, boolean persist, int transactionTimeout, boolean requireNewTransaction) throws GenericServiceException;
- public void runAsync(String serviceName, GenericRequester requester, boolean persist, int transactionTimeout, boolean requireNewTransaction, Object... context) throws GenericServiceException;
+ public void runAsync(String serviceName, Map<String, ? extends Object> context, GenericRequester requester, boolean persist, int transactionTimeout, boolean requireNewTransaction) throws ServiceAuthException, ServiceValidationException, GenericServiceException;
+ public void runAsync(String serviceName, GenericRequester requester, boolean persist, int transactionTimeout, boolean requireNewTransaction, Object... context) throws ServiceAuthException, ServiceValidationException, GenericServiceException;
/**
* Run the service asynchronously, passing an instance of GenericRequester that will receive the result.
@@ -103,8 +103,8 @@
* @throws ServiceValidationException
* @throws GenericServiceException
*/
- public void runAsync(String serviceName, Map<String, ?> context, GenericRequester requester, boolean persist) throws GenericServiceException;
- public void runAsync(String serviceName, GenericRequester requester, boolean persist, Object... context) throws GenericServiceException;
+ public void runAsync(String serviceName, Map<String, ? extends Object> context, GenericRequester requester, boolean persist) throws ServiceAuthException, ServiceValidationException, GenericServiceException;
+ public void runAsync(String serviceName, GenericRequester requester, boolean persist, Object... context) throws ServiceAuthException, ServiceValidationException, GenericServiceException;
/**
* Run the service asynchronously, passing an instance of GenericRequester that will receive the result.
@@ -116,8 +116,8 @@
* @throws ServiceValidationException
* @throws GenericServiceException
*/
- public void runAsync(String serviceName, Map<String, ?> context, GenericRequester requester) throws GenericServiceException;
- public void runAsync(String serviceName, GenericRequester requester, Object... context) throws GenericServiceException;
+ public void runAsync(String serviceName, Map<String, ? extends Object> context, GenericRequester requester) throws ServiceAuthException, ServiceValidationException, GenericServiceException;
+ public void runAsync(String serviceName, GenericRequester requester, Object... context) throws ServiceAuthException, ServiceValidationException, GenericServiceException;
/**
* Run the service asynchronously and IGNORE the result.
@@ -128,8 +128,8 @@
* @throws ServiceValidationException
* @throws GenericServiceException
*/
- public void runAsync(String serviceName, Map<String, ?> context, boolean persist) throws GenericServiceException;
- public void runAsync(String serviceName, boolean persist, Object... context) throws GenericServiceException;
+ public void runAsync(String serviceName, Map<String, ? extends Object> context, boolean persist) throws ServiceAuthException, ServiceValidationException, GenericServiceException;
+ public void runAsync(String serviceName, boolean persist, Object... context) throws ServiceAuthException, ServiceValidationException, GenericServiceException;
/**
* Run the service asynchronously and IGNORE the result. This method WILL persist the job.
@@ -139,7 +139,7 @@
* @throws ServiceValidationException
* @throws GenericServiceException
*/
- public void runAsync(String serviceName, Map<String, ?> context) throws GenericServiceException;
+ public void runAsync(String serviceName, Map<String, ? extends Object> context) throws ServiceAuthException, ServiceValidationException, GenericServiceException;
/**
* Run the service asynchronously.
@@ -151,8 +151,8 @@
* @throws ServiceValidationException
* @throws GenericServiceException
*/
- public GenericResultWaiter runAsyncWait(String serviceName, Map<String, ?> context, boolean persist) throws GenericServiceException;
- public GenericResultWaiter runAsyncWait(String serviceName, boolean persist, Object... context) throws GenericServiceException;
+ public GenericResultWaiter runAsyncWait(String serviceName, Map<String, ? extends Object> context, boolean persist) throws ServiceAuthException, ServiceValidationException, GenericServiceException;
+ public GenericResultWaiter runAsyncWait(String serviceName, boolean persist, Object... context) throws ServiceAuthException, ServiceValidationException, GenericServiceException;
/**
* Run the service asynchronously. This method WILL persist the job.
@@ -163,7 +163,7 @@
* @throws ServiceValidationException
* @throws GenericServiceException
*/
- public GenericResultWaiter runAsyncWait(String serviceName, Map<String, ?> context) throws GenericServiceException;
+ public GenericResultWaiter runAsyncWait(String serviceName, Map<String, ? extends Object> context) throws ServiceAuthException, ServiceValidationException, GenericServiceException;
/**
* Register a callback listener on a specific service.
@@ -187,7 +187,7 @@
* @throws ServiceValidationException
* @throws GenericServiceException
*/
- public void schedule(String poolName, String serviceName, Map<String, ?> context, long startTime, int frequency, int interval, int count, long endTime, int maxRetry) throws GenericServiceException;
+ public void schedule(String poolName, String serviceName, Map<String, ? extends Object> context, long startTime, int frequency, int interval, int count, long endTime, int maxRetry) throws GenericServiceException;
public void schedule(String poolName, String serviceName, long startTime, int frequency, int interval, int count, long endTime, int maxRetry, Object... context) throws GenericServiceException;
/**
@@ -206,7 +206,7 @@
* @throws ServiceValidationException
* @throws GenericServiceException
*/
- public void schedule(String jobName, String poolName, String serviceName, Map<String, ?> context, long startTime, int frequency, int interval, int count, long endTime, int maxRetry) throws GenericServiceException;
+ public void schedule(String jobName, String poolName, String serviceName, Map<String, ? extends Object> context, long startTime, int frequency, int interval, int count, long endTime, int maxRetry) throws GenericServiceException;
public void schedule(String jobName, String poolName, String serviceName, long startTime, int frequency, int interval, int count, long endTime, int maxRetry, Object... context) throws GenericServiceException;
@@ -221,7 +221,7 @@
* @param endTime The time in milliseconds the service should expire
* @throws GenericServiceException
*/
- public void schedule(String serviceName, Map<String, ?> context, long startTime, int frequency, int interval, int count, long endTime) throws GenericServiceException;
+ public void schedule(String serviceName, Map<String, ? extends Object> context, long startTime, int frequency, int interval, int count, long endTime) throws GenericServiceException;
public void schedule(String serviceName, long startTime, int frequency, int interval, int count, long endTime, Object... context) throws GenericServiceException;
/**
@@ -234,7 +234,7 @@
* @param count The number of times to repeat.
* @throws GenericServiceException
*/
- public void schedule(String serviceName, Map<String, ?> context, long startTime, int frequency, int interval, int count) throws GenericServiceException;
+ public void schedule(String serviceName, Map<String, ? extends Object> context, long startTime, int frequency, int interval, int count) throws GenericServiceException;
public void schedule(String serviceName, long startTime, int frequency, int interval, int count, Object... context) throws GenericServiceException;
/**
@@ -247,7 +247,7 @@
* @param endTime The time in milliseconds the service should expire
* @throws GenericServiceException
*/
- public void schedule(String serviceName, Map<String, ?> context, long startTime, int frequency, int interval, long endTime) throws GenericServiceException;
+ public void schedule(String serviceName, Map<String, ? extends Object> context, long startTime, int frequency, int interval, long endTime) throws GenericServiceException;
public void schedule(String serviceName, long startTime, int frequency, int interval, long endTime, Object... context) throws GenericServiceException;
/**
@@ -257,7 +257,7 @@
* @param startTime The time to run this service.
* @throws GenericServiceException
*/
- public void schedule(String serviceName, Map<String, ?> context, long startTime) throws GenericServiceException;
+ public void schedule(String serviceName, Map<String, ? extends Object> context, long startTime) throws GenericServiceException;
public void schedule(String serviceName, long startTime, Object... context) throws GenericServiceException;
@@ -268,7 +268,7 @@
* @param persist
* @throws GenericServiceException
*/
- public void addRollbackService(String serviceName, Map<String, ?> context, boolean persist) throws GenericServiceException;
+ public void addRollbackService(String serviceName, Map<String, ? extends Object> context, boolean persist) throws GenericServiceException;
public void addRollbackService(String serviceName, boolean persist, Object... context) throws GenericServiceException;
/**
@@ -278,7 +278,7 @@
* @param persist
* @throws GenericServiceException
*/
- public void addCommitService(String serviceName, Map<String, ?> context, boolean persist) throws GenericServiceException;
+ public void addCommitService(String serviceName, Map<String, ? extends Object> context, boolean persist) throws GenericServiceException;
public void addCommitService(String serviceName, boolean persist, Object... context) throws GenericServiceException;
/**