OFBiz › OFBiz - Commits

svn commit: r1579281 - in /ofbiz/branches/release12.04: ./ applications/accounting/servicedef/ applications/order/entitydef/ applications/order/servicedef/ applications/order/src/org/ofbiz/order/order/ applications/party/servicedef/ applications/produc...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jleroux@apache.org

svn commit: r1579281 - in /ofbiz/branches/release12.04: ./ applications/accounting/servicedef/ applications/order/entitydef/ applications/order/servicedef/ applications/order/src/org/ofbiz/order/order/ applications/party/servicedef/ applications/produc...

Author: jleroux
Date: Wed Mar 19 16:17:05 2014
New Revision: 1579281

URL: http://svn.apache.org/r1579281
Log:
"Applied fix from trunk for revision: 1579277 "
------------------------------------------------------------------------
r1579277 | jleroux | 2014-03-19 17:15:22 +0100 (mer. 19 mars 2014) | 4 lignes

A patch from Antoine Vittecoq for "Form widget/ FTL pagination, Last does not take to last page" https://issues.apache.org/jira/browse/OFBIZ-5575

This issue in pagination can be tested in https://localhost:8443/partymgr/control/findparty (FTL) & https://localhost:8443/webtools/control/FindUtilCache?VIEW_SIZE_1=2&VIEW_INDEX_1=0 (XML Form).

------------------------------------------------------------------------

Modified:
ofbiz/branches/release12.04/ (props changed)
ofbiz/branches/release12.04/applications/accounting/servicedef/services_billing.xml
ofbiz/branches/release12.04/applications/accounting/servicedef/services_invoice.xml
ofbiz/branches/release12.04/applications/order/entitydef/eecas.xml
ofbiz/branches/release12.04/applications/order/servicedef/services.xml
ofbiz/branches/release12.04/applications/order/servicedef/services_cart.xml
ofbiz/branches/release12.04/applications/order/servicedef/services_quote.xml
ofbiz/branches/release12.04/applications/order/servicedef/services_request.xml
ofbiz/branches/release12.04/applications/order/servicedef/services_shoppinglist.xml
ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/order/OrderServices.java
ofbiz/branches/release12.04/applications/party/servicedef/services.xml
ofbiz/branches/release12.04/applications/product/servicedef/services.xml
ofbiz/branches/release12.04/applications/product/servicedef/services_shipment.xml
ofbiz/branches/release12.04/applications/product/servicedef/services_view.xml
ofbiz/branches/release12.04/framework/base/config/ofbiz-containers.xml
ofbiz/branches/release12.04/framework/base/src/org/ofbiz/base/util/UtilMisc.java
ofbiz/branches/release12.04/framework/common/servicedef/services.xml
ofbiz/branches/release12.04/framework/entity/config/entityengine.xml

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1579277

Modified: ofbiz/branches/release12.04/applications/accounting/servicedef/services_billing.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/accounting/servicedef/services_billing.xml?rev=1579281&r1=1579280&r2=1579281&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/accounting/servicedef/services_billing.xml (original)
+++ ofbiz/branches/release12.04/applications/accounting/servicedef/services_billing.xml Wed Mar 19 16:17:05 2014
@@ -25,7 +25,7 @@ under the License.
<version>1.0</version>


- <service name="createBillingAccount" engine="simple"
+ <service name="createBillingAccount" engine="simple" export="true"
location="component://accounting/script/org/ofbiz/accounting/payment/BillingServices.xml" invoke="createBillingAccount">
<description>Create a Billing Account</description>
<permission-service service-name="acctgBillingAcctCheck" main-action="CREATE"/>

Modified: ofbiz/branches/release12.04/applications/accounting/servicedef/services_invoice.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/accounting/servicedef/services_invoice.xml?rev=1579281&r1=1579280&r2=1579281&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/accounting/servicedef/services_invoice.xml (original)
+++ ofbiz/branches/release12.04/applications/accounting/servicedef/services_invoice.xml Wed Mar 19 16:17:05 2014
@@ -155,7 +155,7 @@ under the License.
<auto-attributes mode="OUT" include="pk" optional="false"/>
<auto-attributes mode="IN" include="nonpk" optional="true"/>
</service>
- <service name="createInvoiceForOrderAllItems" engine="java"
+ <service name="createInvoiceForOrderAllItems" engine="java" export="true"
location="org.ofbiz.accounting.invoice.InvoiceServices" invoke="createInvoiceForOrderAllItems">
<description>
Create an invoice from existing order using all order items
@@ -164,7 +164,7 @@ under the License.
<attribute name="orderId" type="String" mode="IN" optional="false"/>
<attribute name="invoiceId" type="String" mode="OUT" optional="true"/>
</service>
- <service name="createInvoiceForOrder" engine="java"
+ <service name="createInvoiceForOrder" engine="java" export="true"
location="org.ofbiz.accounting.invoice.InvoiceServices" invoke="createInvoiceForOrder">
<description>
Create an invoice from existing order
@@ -269,7 +269,7 @@ under the License.
<attribute name="shipmentId" type="String" mode="IN" optional="false"/>
<attribute name="invoicesCreated" type="List" mode="OUT" optional="true"/>
</service>
- <service name="sendInvoicePerEmail" engine="simple"
+ <service name="sendInvoicePerEmail" engine="simple" export="true"
location="component://accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml" invoke="sendInvoicePerEmail">
<description>Send an invoice per email</description>
<attribute name="invoiceId" type="String" mode="IN" optional="false"/>

Modified: ofbiz/branches/release12.04/applications/order/entitydef/eecas.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/entitydef/eecas.xml?rev=1579281&r1=1579280&r2=1579281&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/order/entitydef/eecas.xml (original)
+++ ofbiz/branches/release12.04/applications/order/entitydef/eecas.xml Wed Mar 19 16:17:05 2014
@@ -27,6 +27,12 @@ under the License.
<action service="issueImmediatelyFulfilledOrder" mode="sync"/>
</eca>

+ <eca entity="OrderHeader" operation="create-store" event="return">
+ <condition field-name="statusId" operator="equals" value="ORDER_APPROVED"/>
+ <condition field-name="orderTypeId" operator="equals" value="SALES_ORDER"/>
+ <action service="sendSOCreation" mode="sync"/>
+ </eca>
+
<eca entity="OrderItem" operation="create-store" event="return">
<condition field-name="quoteId" operator="is-not-empty"/>
<action service="checkUpdateQuoteStatus" mode="sync"/>

Modified: ofbiz/branches/release12.04/applications/order/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/servicedef/services.xml?rev=1579281&r1=1579280&r2=1579281&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/order/servicedef/services.xml (original)
+++ ofbiz/branches/release12.04/applications/order/servicedef/services.xml Wed Mar 19 16:17:05 2014
@@ -89,7 +89,7 @@ under the License.
<attribute name="comments" type="String" mode="IN" optional="true"/>
</service>

- <service name="storeOrder" engine="java" validate="true" auth="true"
+ <service name="storeOrder" engine="java" validate="true" auth="true" export="true"
location="org.ofbiz.order.order.OrderServices" invoke="createOrder">
<description>Creates order entities</description>
<attribute name="partyId" type="String" mode="IN" optional="false"/>
@@ -154,7 +154,7 @@ under the License.
<attribute name="shoppingCart" type="org.ofbiz.order.shoppingcart.ShoppingCart" mode="IN" optional="false"/>
<attribute name="manualHold" type="Boolean" mode="IN" optional="true"/>
</service>
- <service name="createOrderFromShoppingCart" engine="java"
+ <service name="createOrderFromShoppingCart" engine="java" export="true"
location="org.ofbiz.order.order.OrderServices" invoke="createOrderFromShoppingCart" auth="false">
<attribute name="shoppingCart" type="org.ofbiz.order.shoppingcart.ShoppingCart" mode="INOUT" optional="false"/>
<attribute name="orderId" type="String" mode="OUT" optional="false"/>
@@ -342,7 +342,7 @@ under the License.

<attribute name="changeMap" type="Map" mode="IN" optional="false"/>
</service>
- <service name="appendOrderItem" engine="java" auth="true"
+ <service name="appendOrderItem" engine="java" auth="true" export="true"
location="org.ofbiz.order.order.OrderServices" invoke="addItemToApprovedOrder">
<description>Append an item to an existing order</description>
<attribute name="orderId" type="String" mode="INOUT" optional="false"/>
@@ -440,7 +440,7 @@ under the License.
<attribute name="roleTypeId" type="String" mode="IN"/>
</service>

- <service name="createOrderPaymentPreference" engine="java"
+ <service name="createOrderPaymentPreference" engine="java" export="true"
location="org.ofbiz.order.order.OrderServices" invoke="createPaymentPreference">
<description>Creates an order payment preference</description>
<attribute name="orderId" type="String" mode="IN"/>
@@ -658,13 +658,13 @@ under the License.
</service>


- <service name="createOrderHeader" default-entity-name="OrderHeader" engine="simple"
+ <service name="createOrderHeader" default-entity-name="OrderHeader" engine="simple" export="true"
location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="createOrderHeader" auth="true">
<description>Create OrderHeader</description>
<auto-attributes include="pk" mode="INOUT" optional="true"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="updateOrderHeader" default-entity-name="OrderHeader" engine="simple"
+ <service name="updateOrderHeader" default-entity-name="OrderHeader" engine="simple" export="true"
location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="updateOrderHeader" auth="true">
<description>Update OrderHeader</description>
<auto-attributes include="pk" mode="IN" optional="false"/>
@@ -684,7 +684,7 @@ under the License.
</service>


- <service name="createOrderItemShipGroup" default-entity-name="OrderItemShipGroup" engine="simple"
+ <service name="createOrderItemShipGroup" default-entity-name="OrderItemShipGroup" engine="simple" export="true"
location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="createOrderItemShipGroup" auth="true">
<description>Creates a new OrderItemShipGroup.</description>
<auto-attributes mode="IN" include="nonpk" optional="true"/>
@@ -792,7 +792,7 @@ under the License.
</service>


- <service name="findOrders" engine="java" transaction-timeout="300" auth="true"
+ <service name="findOrders" engine="java" transaction-timeout="300" auth="true" export="true"
location="org.ofbiz.order.order.OrderLookupServices" invoke="findOrders">
<description>Uses dynamic view entity to find orders; returns a list of Order (OrderHeader) objects</description>

@@ -929,7 +929,7 @@ under the License.
This is done by looking for all subscriptions which are active and where the automaticExtend flag is set to "Y"</description>
</service>

- <service name="createUpdateShippingAddress" engine="simple"
+ <service name="createUpdateShippingAddress" engine="simple" export="true"
location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="createUpdateShippingAddress" auth="true">
<description>Creates new shipping address and update existing address</description>
<attribute name="productStoreId" mode="IN" type="String" optional="true"/>
@@ -950,7 +950,7 @@ under the License.
<attribute name="billToContactMechId" mode="IN" type="String" optional="true"/>
</service>

- <service name="createUpdateBillingAddress" engine="simple"
+ <service name="createUpdateBillingAddress" engine="simple" export="true"
location="component://order/script/org/ofbiz/order/order/OrderServices.xml" invoke="createUpdateBillingAddress" auth="true">
<description>Creates new billing address and update existing address</description>
<attribute name="productStoreId" mode="IN" type="String" optional="true"/>
@@ -1141,5 +1141,12 @@ under the License.
<description>Delete Order Item Attribute</description>
<auto-attributes mode="IN" entity-name="OrderItemAttribute" include="pk" optional="false"/>
</service>
+
+ <service name="sendSOCreation" engine="java" auth="true"
+ location="org.ofbiz.order.order.OrderServices" invoke="sendSOCreation">
+ <description>send SO creation</description>
+ <attribute mode="IN" name="orderId" type="String" optional="false"/>
+ </service>
+

</services>

Modified: ofbiz/branches/release12.04/applications/order/servicedef/services_cart.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/servicedef/services_cart.xml?rev=1579281&r1=1579280&r2=1579281&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/order/servicedef/services_cart.xml (original)
+++ ofbiz/branches/release12.04/applications/order/servicedef/services_cart.xml Wed Mar 19 16:17:05 2014
@@ -108,7 +108,7 @@ under the License.
<attribute name="correspondingPoId" type="String" mode="IN" optional="true"/>
</service>

- <service name="loadCartFromOrder" engine="java" auth="true"
+ <service name="loadCartFromOrder" engine="java" auth="true" export="true"
location="org.ofbiz.order.shoppingcart.ShoppingCartServices" invoke="loadCartFromOrder">
<description>Create a ShoppingCart Object based on an existing order</description>
<attribute name="orderId" type="String" mode="IN" optional="false"/>
@@ -118,14 +118,14 @@ under the License.
<attribute name="shoppingCart" type="org.ofbiz.order.shoppingcart.ShoppingCart" mode="OUT" optional="false"/>
</service>

- <service name="loadCartFromQuote" engine="java" auth="true"
+ <service name="loadCartFromQuote" engine="java" auth="true" export="true"
location="org.ofbiz.order.shoppingcart.ShoppingCartServices" invoke="loadCartFromQuote">
<description>Create a ShoppingCart Object based on an existing quote. If applyQuoteAdjustments is set to false then standard cart adjustments are generated.</description>
<attribute name="quoteId" type="String" mode="IN" optional="false"/>
<attribute name="applyQuoteAdjustments" type="String" mode="IN" optional="true"/>
<attribute name="shoppingCart" type="org.ofbiz.order.shoppingcart.ShoppingCart" mode="OUT" optional="false"/>
</service>
- <service name="loadCartFromShoppingList" engine="java" auth="true"
+ <service name="loadCartFromShoppingList" engine="java" auth="true" export="true"
location="org.ofbiz.order.shoppingcart.ShoppingCartServices" invoke="loadCartFromShoppingList">
<description>Create a ShoppingCart Object based on an existing shopping list.</description>
<attribute name="shoppingListId" type="String" mode="IN" optional="false"/>

Modified: ofbiz/branches/release12.04/applications/order/servicedef/services_quote.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/servicedef/services_quote.xml?rev=1579281&r1=1579280&r2=1579281&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/order/servicedef/services_quote.xml (original)
+++ ofbiz/branches/release12.04/applications/order/servicedef/services_quote.xml Wed Mar 19 16:17:05 2014
@@ -210,7 +210,7 @@ under the License.
<attribute name="applyStorePromotions" type="String" mode="IN" optional="true"/>
<attribute name="quoteId" type="String" mode="OUT" optional="false"/>
</service>
- <service name="createQuoteFromShoppingList" engine="simple" auth="true"
+ <service name="createQuoteFromShoppingList" engine="simple" auth="true" export="true"
location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="createQuoteFromShoppingList">
<description>Creates a new quote from a shopping list</description>
<attribute name="shoppingListId" type="String" mode="IN" optional="false"/>

Modified: ofbiz/branches/release12.04/applications/order/servicedef/services_request.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/servicedef/services_request.xml?rev=1579281&r1=1579280&r2=1579281&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/order/servicedef/services_request.xml (original)
+++ ofbiz/branches/release12.04/applications/order/servicedef/services_request.xml Wed Mar 19 16:17:05 2014
@@ -159,7 +159,7 @@ under the License.
<attribute name="custRequestName" type="String" mode="IN" optional="true"/>
<attribute name="custRequestId" type="String" mode="OUT" optional="false"/>
</service>
- <service name="createCustRequestFromShoppingList" engine="simple" auth="true"
+ <service name="createCustRequestFromShoppingList" engine="simple" auth="true" export="true"
location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="createCustRequestFromShoppingList">
<description>Creates a new quote from a shopping list</description>
<attribute name="shoppingListId" type="String" mode="IN" optional="false"/>

Modified: ofbiz/branches/release12.04/applications/order/servicedef/services_shoppinglist.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/servicedef/services_shoppinglist.xml?rev=1579281&r1=1579280&r2=1579281&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/order/servicedef/services_shoppinglist.xml (original)
+++ ofbiz/branches/release12.04/applications/order/servicedef/services_shoppinglist.xml Wed Mar 19 16:17:05 2014
@@ -30,7 +30,7 @@ under the License.
<auto-attributes mode="IN" entity-name="ShoppingList" include="nonpk" optional="true"/>
<attribute name="shippingMethodString" type="String" mode="IN" optional="true"/>
</service>
- <service name="createShoppingList" engine="simple" auth="false"
+ <service name="createShoppingList" engine="simple" auth="false" export="true"
location="component://order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml" invoke="createShoppingList">
<description>Create a shopping list entity</description>
<implements service="createShoppingListRecurrence"/>
@@ -86,7 +86,7 @@ under the License.
<attribute name="shipmentMethodTypeId" type="String" mode="OUT" optional="true"/>
<attribute name="carrierPartyId" type="String" mode="OUT" optional="true"/>
</service>
- <service name="makeShoppingListFromOrder" engine="java" auth="true"
+ <service name="makeShoppingListFromOrder" engine="java" auth="true" export="true"
location="org.ofbiz.order.shoppinglist.ShoppingListServices" invoke="makeListFromOrder">
<description>Create/Update a shopping list from an order</description>
<implements service="createShoppingListRecurrence"/>
@@ -134,7 +134,7 @@ under the License.
<description>Add suggestions to a shopping list</description>
<attribute name="orderId" type="String" mode="IN" optional="false"/>
</service>
- <service name="addDistinctShoppingListItem" engine="simple" auth="true"
+ <service name="addDistinctShoppingListItem" engine="simple" auth="true" export="true"
location="component://order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml" invoke="addDistinctShoppingListItem">
<description>Adds a shopping list item if one with the same productId does not exist</description>
<implements service="shoppingListItemInterface"/>

Modified: ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1579281&r1=1579280&r2=1579281&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/order/OrderServices.java Wed Mar 19 16:17:05 2014
@@ -86,6 +86,13 @@ import org.ofbiz.service.ServiceUtil;

import com.ibm.icu.util.Calendar;

+/* Remote RMI calls from OfBiz */
+import java.rmi.Naming;
+import java.rmi.NotBoundException;
+import java.rmi.RemoteException;
+import java.net.MalformedURLException;
+import org.ofbiz.service.rmi.RemoteDispatcher;
+
/**
* Order Processing Services
*/
@@ -5741,4 +5748,78 @@ public class OrderServices {

return ServiceUtil.returnSuccess();
}
+
+ /** Service to send data for SO creation on second OfBiz instance */
+ public static Map<String, Object> sendSOCreation(DispatchContext ctx, Map<String, ? extends Object> context) {
+
+ /*
+ Boolean connectError;
+
+ try {
+ connectError = false;
+ RemoteDispatcher remoteDispatcher = (RemoteDispatcher) Naming.lookup(UtilProperties.getPropertyValue("remoteRmi.properties","remoteURL"));
+ } catch (NotBoundException e) {
+ connectError = true;
+ e.printStackTrace();
+ } catch (MalformedURLException e) {
+ connectError = true;
+ e.printStackTrace();
+ } catch (RemoteException e) {
+ connectError = true;
+ e.printStackTrace();
+ }
+ if (connectError){
+ return ServiceUtil.returnError("remote RMI generic error.");
+ }
+ */
+
+ Delegator delegator = ctx.getDelegator();
+ LocalDispatcher dispatcher = ctx.getDispatcher();
+ //Security security = ctx.getSecurity();
+
+ Locale locale = (Locale) context.get("locale");
+ Map<String, Object> successResult = ServiceUtil.returnSuccess();
+
+ GenericValue userLogin = (GenericValue) context.get("userLogin");
+ // get the order type
+ String orderId = (String) context.get("orderId");
+
+
+ GenericValue orderHeader = null;
+
+ try {
+ orderHeader = delegator.findOne("OrderHeader",UtilMisc.toMap("orderId",orderId),false);
+ List<GenericValue> orderItems = orderHeader.getRelated("OrderItem");
+
+ } catch (GenericEntityException e) {
+ Debug.logError(e, module);
+ }
+
+ //hmpars.put("currencyUom","USD");
+ //hmpars.put("orderAdjustments",orderAdjustments);
+ //hmpars.put("orderItems",orderItems);
+ //hmpars.put("orderTypeId","PURCHASE_ORDER");
+
+ /*
+ GenericValue = remoteDispatcher.runSync("storeOrder",
+ UtilMisc.toMap(
+ "currencyUom","USD",
+ "orderNotes",orderNotes
+ )
+ );
+ */
+
+ orderHeader.set("orderTypeId","PURCHASE_ORDER");
+
+ try {
+ orderHeader.store();
+ } catch (GenericEntityException e) {
+ Debug.logError(e, module);
+ }
+
+
+ return successResult;
+ }
+
+
}

Modified: ofbiz/branches/release12.04/applications/party/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/party/servicedef/services.xml?rev=1579281&r1=1579280&r2=1579281&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/party/servicedef/services.xml (original)
+++ ofbiz/branches/release12.04/applications/party/servicedef/services.xml Wed Mar 19 16:17:05 2014
@@ -109,7 +109,7 @@ under the License.
<override name="firstName" optional="false"/>
<override name="lastName" optional="false"/>
</service>
- <service name="createPartyGroup" engine="java" default-entity-name="PartyGroup"
+ <service name="createPartyGroup" engine="java" default-entity-name="PartyGroup" export="true"
location="org.ofbiz.party.party.PartyServices" invoke="createPartyGroup" auth="false">
<description>Create a PartyGroup</description>
<auto-attributes mode="INOUT" include="pk" optional="true"/>
@@ -262,7 +262,7 @@ under the License.
</service>


- <service name="createPartyRole" engine="simple"
+ <service name="createPartyRole" engine="simple" export="true"
location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="createPartyRole" auth="true">
<description>Create a Party Role (add a Role to a Party). The logged in user must have PARTYMGR_CREATE or have
permission to change the role of this partyId</description>
@@ -383,14 +383,14 @@ under the License.
</service>


- <service name="createContactMech" engine="simple"
+ <service name="createContactMech" engine="simple" export="true"
location="component://party/script/org/ofbiz/party/contact/ContactMechServices.xml" invoke="createContactMech" auth="true">
<description>Create a ContactMech</description>
<auto-attributes entity-name="ContactMech" include="nonpk" mode="IN" optional="false"/>
<auto-attributes entity-name="ContactMech" include="pk" mode="INOUT" optional="true"/>
<override name="infoString" optional="true"/>
</service>
- <service name="createPartyContactMech" engine="simple"
+ <service name="createPartyContactMech" engine="simple" export="true"
location="component://party/script/org/ofbiz/party/contact/PartyContactMechServices.xml" invoke="createPartyContactMech" auth="true">
<description>Create a PartyContactMech</description>
<permission-service service-name="partyContactMechPermissionCheck" main-action="CREATE"/>
@@ -460,7 +460,7 @@ under the License.
<attribute name="partyId" type="String" mode="OUT" optional="true"/>
<attribute name="contactMechId" type="String" mode="OUT" optional="true"/>
</service>
- <service name="createPartyPostalAddress" engine="simple"
+ <service name="createPartyPostalAddress" engine="simple" export="true"
location="component://party/script/org/ofbiz/party/contact/PartyContactMechServices.xml" invoke="createPartyPostalAddress" auth="true">
<description>Create a Postal Address</description>
<permission-service service-name="partyContactMechPermissionCheck" main-action="CREATE"/>
@@ -1294,7 +1294,7 @@ under the License.
<attribute name="contactMechId" type="String" mode="IN" optional="true"/>
<attribute name="contactMechId" type="String" mode="OUT" optional="false"/>
</service>
- <service name="createUpdatePartyPostalAddress" engine="simple"
+ <service name="createUpdatePartyPostalAddress" engine="simple" export="true"
location="component://party/script/org/ofbiz/party/contact/PartyContactMechServices.xml" invoke="createUpdatePartyPostalAddress" auth="false">
<description>Create or Update a postal address</description>
<attribute name="partyId" type="String" mode="IN" optional="false"/>

Modified: ofbiz/branches/release12.04/applications/product/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/product/servicedef/services.xml?rev=1579281&r1=1579280&r2=1579281&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/product/servicedef/services.xml (original)
+++ ofbiz/branches/release12.04/applications/product/servicedef/services.xml Wed Mar 19 16:17:05 2014
@@ -37,7 +37,7 @@ under the License.
<override name="description" allow-html="safe"/>
<override name="longDescription" allow-html="safe"/>
</service>
- <service name="createProduct" default-entity-name="Product" engine="simple"
+ <service name="createProduct" default-entity-name="Product" engine="simple" export="true"
location="component://product/script/org/ofbiz/product/product/ProductServices.xml" invoke="createProduct" auth="true">
<description>Create a Product</description>
<implements service="interfaceProduct"/>
@@ -237,7 +237,7 @@ under the License.
</service>


- <service name="createProductPrice" default-entity-name="ProductPrice" engine="simple"
+ <service name="createProductPrice" default-entity-name="ProductPrice" engine="simple" export="true"
location="component://product/script/org/ofbiz/product/price/PriceServices.xml" invoke="createProductPrice" auth="true">
<description>
Create an ProductPrice.
@@ -481,7 +481,7 @@ under the License.
</service>


- <service name="createSupplierProduct" default-entity-name="SupplierProduct" engine="simple"
+ <service name="createSupplierProduct" default-entity-name="SupplierProduct" engine="simple" export="true"
location="component://product/script/org/ofbiz/product/supplier/SupplierProductServices.xml" invoke="createSupplierProduct" auth="true">
<description>Create a new SupplierProduct record</description>
<required-permissions join-type="AND">
@@ -612,7 +612,7 @@ under the License.



- <service name="createProdCatalog" default-entity-name="ProdCatalog" engine="simple"
+ <service name="createProdCatalog" default-entity-name="ProdCatalog" engine="simple" export="true"
location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" invoke="createProdCatalog" auth="true">
<description>Create a ProdCatalog</description>
<permission-service service-name="catalogPermissionCheck" main-action="CREATE"/>
@@ -635,7 +635,7 @@ under the License.
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>

- <service name="addProductCategoryToProdCatalog" default-entity-name="ProdCatalogCategory" engine="simple"
+ <service name="addProductCategoryToProdCatalog" default-entity-name="ProdCatalogCategory" engine="simple" export="true"
location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" invoke="addProductCategoryToProdCatalog" auth="true">
<description>Add ProductCategory To ProdCatalog</description>
<permission-service service-name="catalogPermissionCheck" main-action="CREATE"/>
@@ -658,7 +658,7 @@ under the License.
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>

- <service name="addProdCatalogToParty" default-entity-name="ProdCatalogRole" engine="simple"
+ <service name="addProdCatalogToParty" default-entity-name="ProdCatalogRole" engine="simple" export="true"
location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" invoke="addProdCatalogToParty" auth="true">
<description>Add ProdCatalog To Party</description>
<permission-service service-name="prodCatalogToPartyPermissionCheck" main-action="CREATE"/>
@@ -683,7 +683,7 @@ under the License.



- <service name="createProductCategory" default-entity-name="ProductCategory" engine="simple"
+ <service name="createProductCategory" default-entity-name="ProductCategory" engine="simple" export="true"
location="component://product/script/org/ofbiz/product/category/CategoryServices.xml" invoke="createProductCategory" auth="true">
<description>Create an ProductCategory</description>
<auto-attributes include="pk" mode="INOUT" optional="true"/>
@@ -713,7 +713,7 @@ under the License.
<attribute name="duplicateRoles" type="String" mode="IN" optional="true"/>
</service>

- <service name="safeAddProductToCategory" default-entity-name="ProductCategoryMember" engine="simple"
+ <service name="safeAddProductToCategory" default-entity-name="ProductCategoryMember" engine="simple" export="true"
location="component://product/script/org/ofbiz/product/category/CategoryServices.xml" invoke="addProductToCategory" auth="true">
<description>Add Product To Category</description>
<permission-service service-name="checkCategoryPermissionWithViewPurchaseAllow" main-action="CREATE"/>
@@ -732,7 +732,7 @@ under the License.
<attribute name="categories" type="Object" mode="IN" optional="false"/>
<override name="fromDate" optional="true"/>
</service>
- <service name="addProductToCategory" default-entity-name="ProductCategoryMember" engine="simple"
+ <service name="addProductToCategory" default-entity-name="ProductCategoryMember" engine="simple" export="true"
location="component://product/script/org/ofbiz/product/category/CategoryServices.xml" invoke="addProductToCategory" auth="true">
<description>Add Product To Category</description>
<permission-service service-name="checkCategoryPermissionWithViewPurchaseAllow" main-action="CREATE"/>
@@ -767,7 +767,7 @@ under the License.
<attribute name="currencyUomId" type="String" mode="IN" optional="true"/>
</service>

- <service name="addPartyToCategory" engine="simple"
+ <service name="addPartyToCategory" engine="simple" export="true"
location="component://product/script/org/ofbiz/product/category/CategoryServices.xml" invoke="addPartyToCategory" auth="true">
<description>Add Party To Category</description>
<attribute name="productCategoryId" type="String" mode="IN" optional="false"/>
@@ -796,7 +796,7 @@ under the License.
<attribute name="fromDate" type="Timestamp" mode="IN" optional="false"/>
</service>

- <service name="addPartyToProduct" engine="simple"
+ <service name="addPartyToProduct" engine="simple" export="true"
location="component://product/script/org/ofbiz/product/product/ProductServices.xml" invoke="addPartyToProduct" auth="true">
<description>Add Party To Product</description>
<attribute name="productId" type="String" mode="IN" optional="false"/>

Modified: ofbiz/branches/release12.04/applications/product/servicedef/services_shipment.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/product/servicedef/services_shipment.xml?rev=1579281&r1=1579280&r2=1579281&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/product/servicedef/services_shipment.xml (original)
+++ ofbiz/branches/release12.04/applications/product/servicedef/services_shipment.xml Wed Mar 19 16:17:05 2014
@@ -25,7 +25,7 @@ under the License.
<version>1.0</version>


- <service name="createCarrierShipmentMethod" engine="simple"
+ <service name="createCarrierShipmentMethod" engine="simple" export="true"
location="component://product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml" invoke="createCarrierShipmentMethod" auth="true">
<description>Creates A CarrierShipmentMethod</description>
<auto-attributes entity-name="CarrierShipmentMethod" include="pk" mode="IN" optional="false"/>

Modified: ofbiz/branches/release12.04/applications/product/servicedef/services_view.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/product/servicedef/services_view.xml?rev=1579281&r1=1579280&r2=1579281&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/product/servicedef/services_view.xml (original)
+++ ofbiz/branches/release12.04/applications/product/servicedef/services_view.xml Wed Mar 19 16:17:05 2014
@@ -25,7 +25,7 @@ under the License.
<version>1.0</version>


- <service name="getProduct" engine="java"
+ <service name="getProduct" engine="java" export="true"
location="org.ofbiz.product.product.ProductServices" invoke="prodFindProduct">
<description>Gets a product value object.</description>
<attribute name="productId" type="String" mode="IN"/>

Modified: ofbiz/branches/release12.04/framework/base/config/ofbiz-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/base/config/ofbiz-containers.xml?rev=1579281&r1=1579280&r2=1579281&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/base/config/ofbiz-containers.xml (original)
+++ ofbiz/branches/release12.04/framework/base/config/ofbiz-containers.xml Wed Mar 19 16:17:05 2014
@@ -41,9 +41,11 @@ under the License.

<container name="rmi-dispatcher" class="org.ofbiz.service.rmi.RmiServiceContainer">
<property name="bound-name" value="RMIDispatcher"/>
- <property name="bound-host" value="127.0.0.1"/>
+ <property name="bound-host" value="10.0.1.12"/>
<property name="bound-port" value="1099"/>
<property name="delegator-name" value="default"/>
+
+
+
</container>



Modified: ofbiz/branches/release12.04/framework/base/src/org/ofbiz/base/util/UtilMisc.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/base/src/org/ofbiz/base/util/UtilMisc.java?rev=1579281&r1=1579280&r2=1579281&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/base/src/org/ofbiz/base/util/UtilMisc.java (original)
+++ ofbiz/branches/release12.04/framework/base/src/org/ofbiz/base/util/UtilMisc.java Wed Mar 19 16:17:05 2014
@@ -1062,7 +1062,7 @@ public class UtilMisc {
}

public static int getViewLastIndex(int listSize, int viewSize) {
- return (int)Math.ceil(listSize / viewSize) - 1;
+ return (int)Math.ceil(listSize / (float) viewSize) - 1;
}

}

Modified: ofbiz/branches/release12.04/framework/common/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/common/servicedef/services.xml?rev=1579281&r1=1579280&r2=1579281&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/common/servicedef/services.xml (original)
+++ ofbiz/branches/release12.04/framework/common/servicedef/services.xml Wed Mar 19 16:17:05 2014
@@ -58,7 +58,7 @@ under the License.
</required-permissions>
</service>

- <service name="createNote" engine="java"
+ <service name="createNote" engine="java" export="true"
location="org.ofbiz.common.CommonServices" invoke="createNote">
<description>Create a new note record</description>
<attribute name="partyId" type="String" mode="INOUT" optional="true"/>
@@ -366,11 +366,11 @@ under the License.
</service>


- <service name="userLogin" engine="java" location="org.ofbiz.common.login.LoginServices" invoke="userLogin">
+ <service name="userLogin" engine="java" location="org.ofbiz.common.login.LoginServices" invoke="userLogin" export="true">
<description>Used to Automatically Authenticate a username/password; create a UserLogin object</description>
<implements service="authenticationInterface"/>
</service>
- <service name="createUserLogin" engine="java" auth="false"
+ <service name="createUserLogin" engine="java" auth="false" export="true"
location="org.ofbiz.common.login.LoginServices" invoke="createUserLogin">
<description>Create a UserLogin</description>
<attribute name="userLoginId" type="String" mode="IN" optional="false"/>

Modified: ofbiz/branches/release12.04/framework/entity/config/entityengine.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/entity/config/entityengine.xml?rev=1579281&r1=1579280&r2=1579281&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/entity/config/entityengine.xml (original)
+++ ofbiz/branches/release12.04/framework/entity/config/entityengine.xml Wed Mar 19 16:17:05 2014
@@ -52,23 +52,23 @@ access. For a detailed description see t
<debug-xa-resources value="false" /> 

<delegator name="default" entity-model-reader="main" entity-group-reader="main" entity-eca-reader="main" distributed-cache-clear-enabled="false">
- <group-map group-name="org.ofbiz" datasource-name="localderby"/>
+ 
+ <group-map group-name="org.ofbiz" datasource-name="localmysql"/>
<group-map group-name="org.ofbiz.olap" datasource-name="localmysqlolap"/>
- <group-map group-name="org.ofbiz.tenant" datasource-name="localmysqltenant"/> -->
+ <group-map group-name="org.ofbiz.tenant" datasource-name="localmysqltenant"/>

</delegator>
<delegator name="default-no-eca" entity-model-reader="main" entity-group-reader="main" entity-eca-reader="main" entity-eca-enabled="false" distributed-cache-clear-enabled="false">
- <group-map group-name="org.ofbiz" datasource-name="localderby"/>
+ 
+ <group-map group-name="org.ofbiz" datasource-name="localmysql"/>
<group-map group-name="org.ofbiz.olap" datasource-name="localmysqlolap"/>
- <group-map group-name="org.ofbiz.tenant" datasource-name="localmysqltenant"/> -->
+ <group-map group-name="org.ofbiz.tenant" datasource-name="localmysqltenant"/>

@@ -76,12 +76,12 @@ access. For a detailed description see t


<delegator name="test" entity-model-reader="main" entity-group-reader="main" entity-eca-reader="main">
- <group-map group-name="org.ofbiz" datasource-name="localderby"/>
+ 
+ <group-map group-name="org.ofbiz" datasource-name="localmysql"/>
<group-map group-name="org.ofbiz.olap" datasource-name="localmysqlolap"/>
- <group-map group-name="org.ofbiz.tenant" datasource-name="localmysqltenant"/> -->
+ <group-map group-name="org.ofbiz.tenant" datasource-name="localmysqltenant"/>

@@ -342,9 +342,9 @@ access. For a detailed description see t
<read-data reader-name="ext"/>
<inline-jdbc
jdbc-driver="com.mysql.jdbc.Driver"
- jdbc-uri="jdbc:mysql://127.0.0.1/ofbiz?autoReconnect=true"
- jdbc-username="ofbiz"
- jdbc-password="ofbiz"
+ jdbc-uri="jdbc:mysql://10.0.1.136:3306/ofbiz?autoReconnect=true"
+ jdbc-username="inbizofbiz"
+ jdbc-password="inbiz%vre%to"
isolation-level="ReadCommitted"
pool-minsize="2"
pool-maxsize="250"
@@ -373,9 +373,9 @@ access. For a detailed description see t
<read-data reader-name="ext"/>
<inline-jdbc
jdbc-driver="com.mysql.jdbc.Driver"
- jdbc-uri="jdbc:mysql://127.0.0.1/ofbizolap?autoReconnect=true"
- jdbc-username="ofbiz"
- jdbc-password="ofbiz"
+ jdbc-uri="jdbc:mysql://10.0.1.136:3306/ofbizolap?autoReconnect=true"
+ jdbc-username="inbizofbiz"
+ jdbc-password="inbiz%vre%to"
isolation-level="ReadCommitted"
pool-minsize="2"
pool-maxsize="250"
@@ -404,9 +404,9 @@ access. For a detailed description see t
<read-data reader-name="ext"/>
<inline-jdbc
jdbc-driver="com.mysql.jdbc.Driver"
- jdbc-uri="jdbc:mysql://127.0.0.1/ofbiztenant?autoReconnect=true"
- jdbc-username="ofbiz"
- jdbc-password="ofbiz"
+ jdbc-uri="jdbc:mysql://10.0.1.136:3306/ofbiztenant?autoReconnect=true"
+ jdbc-username="inbizofbiz"
+ jdbc-password="inbiz%vre%to"
isolation-level="ReadCommitted"
pool-minsize="2"
pool-maxsize="250"
@@ -432,9 +432,9 @@ access. For a detailed description see t
<read-data reader-name="seed"/>
<inline-jdbc
jdbc-driver="com.mysql.jdbc.Driver"
- jdbc-uri="jdbc:mysql://127.0.0.1/ofbiz_odbc?autoReconnect=true"
- jdbc-username="ofbiz"
- jdbc-password="ofbiz"
+ jdbc-uri="jdbc:mysql://10.0.1.136/ofbiz_odbc?autoReconnect=true"
+ jdbc-username="inbizofbiz"
+ jdbc-password="inbiz%vre%to"
isolation-level="ReadCommitted"
pool-minsize="2"
pool-maxsize="250"