You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2008/05/04 13:34:33 UTC
svn commit: r653201 - in /ofbiz/trunk: applications/accounting/servicedef/
applications/accounting/src/org/ofbiz/accounting/payment/
applications/content/script/org/ofbiz/content/data/
applications/content/script/org/ofbiz/content/survey/ applications/...
Author: lektran
Date: Sun May 4 04:34:32 2008
New Revision: 653201
URL: http://svn.apache.org/viewvc?rev=653201&view=rev
Log:
Fixed a bunch of bugs (mostly typos) that show up while generating the artifact information
Modified:
ofbiz/trunk/applications/accounting/servicedef/services_invoice.xml
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml
ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
ofbiz/trunk/applications/party/servicedef/services.xml
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
ofbiz/trunk/applications/workeffort/servicedef/services.xml
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java
Modified: ofbiz/trunk/applications/accounting/servicedef/services_invoice.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_invoice.xml?rev=653201&r1=653200&r2=653201&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_invoice.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_invoice.xml Sun May 4 04:34:32 2008
@@ -171,7 +171,7 @@
<attribute name="invoicesCreated" type="List" mode="OUT" optional="true"/>
</service>
<service name="sampleInvoiceAffiliateCommission" engine="simple"
- location="org/ofbiz/accounting/invoice/SampleCommissionServices.xml.xml" invoke="sampleCalculateAffiliateCommission" auth="true">
+ location="org/ofbiz/accounting/invoice/SampleCommissionServices.xml" invoke="sampleCalculateAffiliateCommission" auth="true">
<description>
A sample/example service to calculate an affiliate commission (direct relationship to customer) and create
and invoice for it on behalf of the affiliate, ie an invoice from the affiliate to the company that can
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=653201&r1=653200&r2=653201&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java Sun May 4 04:34:32 2008
@@ -2509,7 +2509,7 @@
if (!processList.contains(orderId)) { // just try each order once
try {
// each re-try is independent of each other; if one fails it should not effect the others
- dispatcher.runAsync("retryFailedOrderAuthNsf", UtilMisc.<String, Object>toMap("orderId", orderId, "userLogin", userLogin));
+ dispatcher.runAsync("retryFailedOrderAuth", UtilMisc.<String, Object>toMap("orderId", orderId, "userLogin", userLogin));
processList.add(orderId);
} catch (GenericServiceException e) {
Debug.logError(e, module);
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml?rev=653201&r1=653200&r2=653201&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml Sun May 4 04:34:32 2008
@@ -260,6 +260,13 @@
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
</simple-method>
+ <simple-method method-name="updateDataResourceTypeAttr" short-description="Update Data Resource Type Attribute">
+ <make-value entity-name="DataResourceTypeAttr" value-name="lookupKeyValue"/>
+ <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
+ <find-by-primary-key entity-name="DataResourceTypeAttr" map-name="lookupKeyValue" value-name="lookedUpValue"/>
+ <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+ <store-value value-name="lookedUpValue"/>
+ </simple-method>
<simple-method method-name="removeDataResourceTypeAttr" short-description="Remove Data Resource Type Attribute">
<make-value entity-name="DataResourceTypeAttr" value-name="lookupKeyValue"/>
<set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml?rev=653201&r1=653200&r2=653201&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml Sun May 4 04:34:32 2008
@@ -291,7 +291,7 @@
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
- <simple-method method-name="deleteSurveyQuestion" short-description="Delete Survey Question Option">
+ <simple-method method-name="deleteSurveyQuestionOption" short-description="Delete Survey Question Option">
<check-permission action="_DELETE" permission="CONTENTMGR">
<fail-message message="Security Error: to run deleteSurveyQuestionOption you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/>
</check-permission>
Modified: ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml?rev=653201&r1=653200&r2=653201&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml Sun May 4 04:34:32 2008
@@ -175,7 +175,7 @@
<set field="tabButtonItem" value="editDataResource"/>
<set field="dataResourceId" from-field="parameters.dataResourceId"/>
<entity-one entity-name="DataResource" value-name="currentValue"/>
- <entity-and entity-name="DataCategory" list-name="dataCategoryList"/>
+ <entity-condition entity-name="DataCategory" list-name="dataCategoryList"/>
</actions>
<widgets>
<decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
Modified: ofbiz/trunk/applications/party/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/servicedef/services.xml?rev=653201&r1=653200&r2=653201&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/party/servicedef/services.xml Sun May 4 04:34:32 2008
@@ -532,11 +532,11 @@
<!-- ContactMechList services -->
<service name="createContactMechLink" default-entity-name="ContactMechLink" engine="simple"
- location="org/party/contact/ContactMechServices.xml" invoke="createContactMechLink" auth="true">
+ location="org/ofbiz/party/contact/ContactMechServices.xml" invoke="createContactMechLink" auth="true">
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
<service name="deleteContactMechLink" default-entity-name="ContactMechLink" engine="simple"
- location="org/party/contact/ContactMechServices.xml" invoke="deleteContactMechLink" auth="true">
+ location="org/ofbiz/party/contact/ContactMechServices.xml" invoke="deleteContactMechLink" auth="true">
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=653201&r1=653200&r2=653201&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Sun May 4 04:34:32 2008
@@ -997,8 +997,6 @@
<view-map name="ViewCommunicationEvent" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#ViewCommunicationEvent"/>
<view-map name="UpdateCommPurposes" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#UpdateCommPurposes"/>
<view-map name="UpdateCommRoles" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#UpdateCommRoles"/>
- <view-map name="EditCommWorkEffort" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#EditCommWorkEffort"/>
- <view-map name="EditCommCustRequest" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#EditCommCustRequest"/>
<view-map name="ListCommCustRequests" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#ListCommCustRequests"/>
<view-map name="ListCommWorkEfforts" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#ListCommWorkEfforts"/>
<view-map name="AddCommEventWorkEffort" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#AddCommEventWorkEffort"/>
Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=653201&r1=653200&r2=653201&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Sun May 4 04:34:32 2008
@@ -49,7 +49,7 @@
<include-menu location="component://party/webapp/partymgr/communication/CommMenus.xml" name="CommFindTabBar"/>
<container><label style="h1" text="${uiLabelMap.PartyPendingCommunicationEvents}"/></container>
<container><link style="smallSubmit" target="viewCommunicationEvent?partyId=${partyId}" text="${uiLabelMap.PartyNewCommunication}"/></container>
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="listPendingCommEvents"/>
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListPendingCommEvents"/>
</widgets>
<fail-widgets>
<label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label>
@@ -269,7 +269,7 @@
<label style="h1" text="${uiLabelMap.PartyNewCommunication}"/>
</fail-widgets>
</section>
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="viewCommunication"/>
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ViewCommEvent"/>
</widgets>
</section>
</decorator-section>
Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=653201&r1=653200&r2=653201&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Sun May 4 04:34:32 2008
@@ -991,12 +991,6 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="EditProductInventoryItems"/>
</request-map>
- <request-map uri="DeleteProductInventoryItem">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="deleteInventoryItem"/>
- <response name="success" type="view" value="EditProductInventoryItems"/>
- <response name="error" type="view" value="EditProductInventoryItems"/>
- </request-map>
<!-- ================ Product GlAccounts Requests ================= -->
<request-map uri="EditProductGlAccounts">
Modified: ofbiz/trunk/applications/workeffort/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/servicedef/services.xml?rev=653201&r1=653200&r2=653201&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/workeffort/servicedef/services.xml Sun May 4 04:34:32 2008
@@ -591,7 +591,7 @@
<!-- Permission Services -->
<service name="workEffortManagerPermission" engine="simple"
- location="org/ofbiz/workeffort/WorkEffortPermissionServices.xml" invoke="workEffortManagerPermission">
+ location="org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml" invoke="workEffortManagerPermission">
<implements service="permissionInterface"/>
</service>
<service name="workEffortGenericPermission" engine="simple"
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=653201&r1=653200&r2=653201&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Sun May 4 04:34:32 2008
@@ -121,11 +121,6 @@
<response name="success" type="view" value="main"/>
</request-map>
- <request-map uri="sitemap">
- <security https="false" auth="false"/>
- <response name="success" type="view" value="sitemap"/>
- </request-map>
-
<!-- Entity Information Requests -->
<request-map uri="entitymaint">
<security https="true" auth="true"/>
Modified: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml?rev=653201&r1=653200&r2=653201&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/controller.xml Sun May 4 04:34:32 2008
@@ -75,6 +75,5 @@
<view-map name="keywordsearch" type="screen" page="component://ebay/widget/EbayScreens.xml#keywordsearch"/>
<view-map name="ProductsExportToEbay" type="screen" page="component://ebay/widget/EbayScreens.xml#ProductsExportToEbay"/>
<view-map name="ManageOrdersFromEbay" type="screen" page="component://ebay/widget/EbayScreens.xml#ManageOrdersFromEbay"/>
- <view-map name="ListOrdersFromEbay" type="screen" page="component://ebay/widget/EbayScreens.xml#ListOrdersFromEbay"/>
<!-- end of view mappings -->
</site-conf>
Modified: ofbiz/trunk/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java?rev=653201&r1=653200&r2=653201&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java Sun May 4 04:34:32 2008
@@ -150,7 +150,7 @@
Map contextInput = UtilMisc.toMap("productId",productId, "facilityId", facilityId, "locationSeqId", locationSeqId);
Map invAvailability = null;
try {
- invAvailability = dispatcher.runSync("getInventoryAvailableByLocationSeq",contextInput);
+ invAvailability = dispatcher.runSync("getInventoryAvailableByLocation",contextInput);
} catch (GenericServiceException e) {
Debug.logError(e, "updateProductStocktake failed getting inventory counts", module);
return ServiceUtil.returnError("updateProductStocktake failed getting inventory counts");