You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2012/07/02 22:12:38 UTC
svn commit: r1356450 [3/10] - in /ofbiz/branches/20120329_portletWidget: ./
applications/accounting/ applications/accounting/config/
applications/accounting/script/org/ofbiz/accounting/rate/
applications/accounting/webapp/accounting/WEB-INF/ applicatio...
Modified: ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/controller.xml Mon Jul 2 20:11:49 2012
@@ -850,19 +850,19 @@ under the License.
</request-map>
<request-map uri="createCustomTimePeriod">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createCustomTimePeriod"/>
+ <event type="service" invoke="createCustomTimePeriod"/>
<response name="success" type="view" value="EditCustomTimePeriod"/>
<response name="error" type="view" value="EditCustomTimePeriod"/>
</request-map>
<request-map uri="updateCustomTimePeriod">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="updateCustomTimePeriod"/>
+ <event type="service" invoke="updateCustomTimePeriod"/>
<response name="success" type="view" value="EditCustomTimePeriod"/>
<response name="error" type="view" value="EditCustomTimePeriod"/>
</request-map>
<request-map uri="deleteCustomTimePeriod">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="deleteCustomTimePeriod"/>
+ <event type="service" invoke="deleteCustomTimePeriod"/>
<response name="success" type="view" value="EditCustomTimePeriod"/>
<response name="error" type="view" value="EditCustomTimePeriod"/>
</request-map>
@@ -873,13 +873,13 @@ under the License.
<request-map uri="EditFixedAsset"><security https="true" auth="true"/><response name="success" type="view" value="EditFixedAsset"/></request-map>
<request-map uri="createFixedAsset">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createFixedAsset"/>
+ <event type="service" invoke="createFixedAsset"/>
<response name="success" type="view" value="EditFixedAsset"/>
<response name="error" type="view" value="EditFixedAsset"/>
</request-map>
<request-map uri="updateFixedAsset">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="updateFixedAsset"/>
+ <event type="service" invoke="updateFixedAsset"/>
<response name="success" type="view" value="EditFixedAsset"/>
<response name="error" type="view" value="EditFixedAsset"/>
</request-map>
@@ -888,19 +888,19 @@ under the License.
<request-map uri="ListFixedAssetProducts"><security https="true" auth="true"/><response name="success" type="view" value="ListFixedAssetProducts"/></request-map>
<request-map uri="addFixedAssetProduct">
<security https="true" auth="true"/>
- <event type="service" path="org.ofbiz.accounting.fixedasset.FixedAssetServices.xml" invoke="addFixedAssetProduct"/>
+ <event type="service" invoke="addFixedAssetProduct"/>
<response name="success" type="view" value="ListFixedAssetProducts"/>
<response name="error" type="view" value="ListFixedAssetProducts"/>
</request-map>
<request-map uri="updateFixedAssetProduct">
<security https="true" auth="true"/>
- <event type="service" path="org.ofbiz.accounting.fixedasset.FixedAssetServices.xml" invoke="updateFixedAssetProduct"/>
+ <event type="service" invoke="updateFixedAssetProduct"/>
<response name="success" type="view" value="ListFixedAssetProducts"/>
<response name="error" type="view" value="ListFixedAssetProducts"/>
</request-map>
<request-map uri="removeFixedAssetProduct">
<security https="true" auth="true"/>
- <event type="service" path="org.ofbiz.accounting.fixedasset.FixedAssetServices.xml" invoke="removeFixedAssetProduct"/>
+ <event type="service" invoke="removeFixedAssetProduct"/>
<response name="success" type="view" value="ListFixedAssetProducts"/>
<response name="error" type="view" value="ListFixedAssetProducts"/>
</request-map>
@@ -975,17 +975,17 @@ under the License.
</request-map>
<request-map uri="createFixedAssetStdCost">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createFixedAssetStdCost"/>
+ <event type="service" invoke="createFixedAssetStdCost"/>
<response name="success" type="view" value="EditFixedAssetStdCosts"/>
</request-map>
<request-map uri="updateFixedAssetStdCost">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="updateFixedAssetStdCost"/>
+ <event type="service" invoke="updateFixedAssetStdCost"/>
<response name="success" type="view" value="EditFixedAssetStdCosts"/>
</request-map>
<request-map uri="cancelFixedAssetStdCost">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="cancelFixedAssetStdCost"/>
+ <event type="service" invoke="cancelFixedAssetStdCost"/>
<response name="success" type="view" value="EditFixedAssetStdCosts"/>
</request-map>
<!-- FixedAssetIdent -->
@@ -995,19 +995,19 @@ under the License.
</request-map>
<request-map uri="createFixedAssetIdent">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createFixedAssetIdent"/>
+ <event type="service" invoke="createFixedAssetIdent"/>
<response name="success" type="view" value="EditFixedAssetIdents"/>
<response name="error" type="view" value="EditFixedAssetIdents"/>
</request-map>
<request-map uri="updateFixedAssetIdent">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="updateFixedAssetIdent"/>
+ <event type="service" invoke="updateFixedAssetIdent"/>
<response name="success" type="view" value="EditFixedAssetIdents"/>
<response name="error" type="view" value="EditFixedAssetIdents"/>
</request-map>
<request-map uri="removeFixedAssetIdent">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="removeFixedAssetIdent"/>
+ <event type="service" invoke="removeFixedAssetIdent"/>
<response name="success" type="view" value="EditFixedAssetIdents"/>
<response name="error" type="view" value="EditFixedAssetIdents"/>
</request-map>
@@ -1019,19 +1019,19 @@ under the License.
</request-map>
<request-map uri="createFixedAssetRegistration">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createFixedAssetRegistration"/>
+ <event type="service" invoke="createFixedAssetRegistration"/>
<response name="success" type="view" value="EditFixedAssetRegistrations"/>
<response name="error" type="view" value="EditFixedAssetRegistrations"/>
</request-map>
<request-map uri="updateFixedAssetRegistration">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="updateFixedAssetRegistration"/>
+ <event type="service" invoke="updateFixedAssetRegistration"/>
<response name="success" type="view" value="EditFixedAssetRegistrations"/>
<response name="error" type="view" value="EditFixedAssetRegistrations"/>
</request-map>
<request-map uri="deleteFixedAssetRegistration">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="deleteFixedAssetRegistration"/>
+ <event type="service" invoke="deleteFixedAssetRegistration"/>
<response name="success" type="view" value="EditFixedAssetRegistrations"/>
<response name="error" type="view" value="EditFixedAssetRegistrations"/>
</request-map>
@@ -1042,19 +1042,19 @@ under the License.
</request-map>
<request-map uri="createFixedAssetMeter">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createFixedAssetMeter"/>
+ <event type="service" invoke="createFixedAssetMeter"/>
<response name="success" type="view" value="EditFixedAssetMeters"/>
<response name="error" type="view" value="EditFixedAssetMeters"/>
</request-map>
<request-map uri="updateFixedAssetMeter">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="updateFixedAssetMeter"/>
+ <event type="service" invoke="updateFixedAssetMeter"/>
<response name="success" type="view" value="EditFixedAssetMeters"/>
<response name="error" type="view" value="EditFixedAssetMeters"/>
</request-map>
<request-map uri="deleteFixedAssetMeter">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="deleteFixedAssetMeter"/>
+ <event type="service" invoke="deleteFixedAssetMeter"/>
<response name="success" type="view" value="EditFixedAssetMeters"/>
<response name="error" type="view" value="EditFixedAssetMeters"/>
</request-map>
@@ -1070,19 +1070,19 @@ under the License.
</request-map>
<request-map uri="createFixedAssetMaint">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createFixedAssetMaint"/>
+ <event type="service" invoke="createFixedAssetMaint"/>
<response name="success" type="view" value="EditFixedAssetMaint"/>
<response name="error" type="view" value="EditFixedAssetMaint"/>
</request-map>
<request-map uri="updateFixedAssetMaint">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="updateFixedAssetMaint"/>
+ <event type="service" invoke="updateFixedAssetMaint"/>
<response name="success" type="view" value="EditFixedAssetMaint"/>
<response name="error" type="view" value="EditFixedAssetMaint"/>
</request-map>
<request-map uri="deleteFixedAssetMaint">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="deleteFixedAssetMaint"/>
+ <event type="service" invoke="deleteFixedAssetMaint"/>
<response name="success" type="view" value="EditFixedAssetMaint"/>
<response name="error" type="view" value="EditFixedAssetMaint"/>
</request-map>
@@ -1114,13 +1114,13 @@ under the License.
</request-map>
<request-map uri="createFixedAssetMaintOrder">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createFixedAssetMaintOrder"/>
+ <event type="service" invoke="createFixedAssetMaintOrder"/>
<response name="success" type="view" value="EditFixedAssetMaintOrders"/>
<response name="error" type="view" value="EditFixedAssetMaintOrders"/>
</request-map>
<request-map uri="deleteFixedAssetMaintOrder">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="deleteFixedAssetMaintOrder"/>
+ <event type="service" invoke="deleteFixedAssetMaintOrder"/>
<response name="success" type="view" value="EditFixedAssetMaintOrders"/>
<response name="error" type="view" value="EditFixedAssetMaintOrders"/>
</request-map>
@@ -1129,7 +1129,7 @@ under the License.
<request-map uri="FindAgreement"><security https="true" auth="true"/><response name="success" type="view" value="FindAgreement"/></request-map>
<request-map uri="cancelAgreement">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="cancelAgreement"/>
+ <event type="service" invoke="cancelAgreement"/>
<response name="success" type="view" value="FindAgreement"/>
<response name="error" type="view" value="FindAgreement"/>
</request-map>
@@ -1137,19 +1137,19 @@ under the License.
<request-map uri="EditAgreement"><security https="true" auth="true"/><response name="success" type="view" value="EditAgreement"/></request-map>
<request-map uri="createAgreement">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createAgreement"/>
+ <event type="service" invoke="createAgreement"/>
<response name="success" type="view" value="EditAgreement"/>
<response name="error" type="view" value="EditAgreement"/>
</request-map>
<request-map uri="updateAgreement">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="updateAgreement"/>
+ <event type="service" invoke="updateAgreement"/>
<response name="success" type="view" value="EditAgreement"/>
<response name="error" type="view" value="EditAgreement"/>
</request-map>
<request-map uri="copyAgreement">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="copyAgreement"/>
+ <event type="service" invoke="copyAgreement"/>
<response name="success" type="view" value="EditAgreement"/>
<response name="error" type="view" value="EditAgreement"/>
</request-map>
@@ -1157,7 +1157,7 @@ under the License.
<request-map uri="ListAgreementItems"><security https="true" auth="true"/><response name="success" type="view" value="ListAgreementItems"/></request-map>
<request-map uri="removeAgreementItem">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="removeAgreementItem"/>
+ <event type="service" invoke="removeAgreementItem"/>
<response name="success" type="view" value="ListAgreementItems"/>
<response name="error" type="view" value="ListAgreementItems"/>
</request-map>
@@ -1165,13 +1165,13 @@ under the License.
<request-map uri="EditAgreementItem"><security https="true" auth="true"/><response name="success" type="view" value="EditAgreementItem"/></request-map>
<request-map uri="createAgreementItem">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createAgreementItem"/>
+ <event type="service" invoke="createAgreementItem"/>
<response name="success" type="view" value="EditAgreementItem"/>
<response name="error" type="view" value="EditAgreementItem"/>
</request-map>
<request-map uri="updateAgreementItem">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="updateAgreementItem"/>
+ <event type="service" invoke="updateAgreementItem"/>
<response name="success" type="view" value="EditAgreementItem"/>
<response name="error" type="view" value="EditAgreementItem"/>
</request-map>
@@ -1179,19 +1179,19 @@ under the License.
<request-map uri="EditAgreementTerms"><security https="true" auth="true"/><response name="success" type="view" value="EditAgreementTerms"/></request-map>
<request-map uri="createAgreementTerm">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createAgreementTerm"/>
+ <event type="service" invoke="createAgreementTerm"/>
<response name="success" type="view" value="EditAgreementTerms"/>
<response name="error" type="view" value="EditAgreementTerms"/>
</request-map>
<request-map uri="updateAgreementTerm">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="updateAgreementTerm"/>
+ <event type="service" invoke="updateAgreementTerm"/>
<response name="success" type="view" value="EditAgreementTerms"/>
<response name="error" type="view" value="EditAgreementTerms"/>
</request-map>
<request-map uri="deleteAgreementTerm">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="deleteAgreementTerm"/>
+ <event type="service" invoke="deleteAgreementTerm"/>
<response name="success" type="view" value="EditAgreementTerms"/>
<response name="error" type="view" value="EditAgreementTerms"/>
</request-map>
@@ -1200,7 +1200,7 @@ under the License.
<request-map uri="ListAgreementPromoAppls"><security https="true" auth="true"/><response name="success" type="view" value="ListAgreementPromoAppls"/></request-map>
<request-map uri="removeAgreementPromoAppl">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="removeAgreementPromoAppl"/>
+ <event type="service" invoke="removeAgreementPromoAppl"/>
<response name="success" type="view" value="ListAgreementPromoAppls"/>
<response name="error" type="view" value="ListAgreementPromoAppls"/>
</request-map>
@@ -1208,13 +1208,13 @@ under the License.
<request-map uri="EditAgreementPromoAppl"><security https="true" auth="true"/><response name="success" type="view" value="EditAgreementPromoAppl"/></request-map>
<request-map uri="createAgreementPromoAppl">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createAgreementPromoAppl"/>
+ <event type="service" invoke="createAgreementPromoAppl"/>
<response name="success" type="view" value="EditAgreementPromoAppl"/>
<response name="error" type="view" value="EditAgreementPromoAppl"/>
</request-map>
<request-map uri="updateAgreementPromoAppl">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="updateAgreementPromoAppl"/>
+ <event type="service" invoke="updateAgreementPromoAppl"/>
<response name="success" type="view" value="EditAgreementPromoAppl"/>
<response name="error" type="view" value="EditAgreementPromoAppl"/>
</request-map>
@@ -1222,7 +1222,7 @@ under the License.
<request-map uri="ListAgreementItemTerms"><security https="true" auth="true"/><response name="success" type="view" value="ListAgreementItemTerms"/></request-map>
<request-map uri="removeAgreementItemTerm">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="deleteAgreementTerm"/>
+ <event type="service" invoke="deleteAgreementTerm"/>
<response name="success" type="view" value="ListAgreementItemTerms"/>
<response name="error" type="view" value="ListAgreementItemTerms"/>
</request-map>
@@ -1230,13 +1230,13 @@ under the License.
<request-map uri="EditAgreementItemTerm"><security https="true" auth="true"/><response name="success" type="view" value="EditAgreementItemTerm"/></request-map>
<request-map uri="createAgreementItemTerm">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createAgreementTerm"/>
+ <event type="service" invoke="createAgreementTerm"/>
<response name="success" type="view" value="EditAgreementItemTerm"/>
<response name="error" type="view" value="EditAgreementItemTerm"/>
</request-map>
<request-map uri="updateAgreementItemTerm">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="updateAgreementTerm"/>
+ <event type="service" invoke="updateAgreementTerm"/>
<response name="success" type="view" value="EditAgreementItemTerm"/>
<response name="error" type="view" value="EditAgreementItemTerm"/>
</request-map>
@@ -1245,7 +1245,7 @@ under the License.
<request-map uri="ListAgreementItemProductsReport"><security https="true" auth="true"/><response name="success" type="view" value="ListAgreementItemProductsReport"/></request-map>
<request-map uri="removeAgreementItemProduct">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="removeAgreementProductAppl"/>
+ <event type="service" invoke="removeAgreementProductAppl"/>
<response name="success" type="view" value="ListAgreementItemProducts"/>
<response name="error" type="view" value="ListAgreementItemProducts"/>
</request-map>
@@ -1253,13 +1253,13 @@ under the License.
<request-map uri="EditAgreementItemProduct"><security https="true" auth="true"/><response name="success" type="view" value="EditAgreementItemProduct"/></request-map>
<request-map uri="createAgreementItemProduct">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createAgreementProductAppl"/>
+ <event type="service" invoke="createAgreementProductAppl"/>
<response name="success" type="view" value="ListAgreementItemProducts"/>
<response name="error" type="view" value="EditAgreementItemProduct"/>
</request-map>
<request-map uri="updateAgreementItemProduct">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="updateAgreementProductAppl"/>
+ <event type="service" invoke="updateAgreementProductAppl"/>
<response name="success" type="view" value="ListAgreementItemProducts"/>
<response name="error" type="view" value="EditAgreementItemProduct"/>
</request-map>
@@ -1268,7 +1268,7 @@ under the License.
<request-map uri="ListAgreementItemSupplierProductsReport"><security https="true" auth="true"/><response name="success" type="view" value="ListAgreementItemSupplierProductsReport"/></request-map>
<request-map uri="removeAgreementItemSupplierProduct">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="removeSupplierProduct"/>
+ <event type="service" invoke="removeSupplierProduct"/>
<response name="success" type="view" value="ListAgreementItemSupplierProducts"/>
<response name="error" type="view" value="ListAgreementItemSupplierProducts"/>
</request-map>
@@ -1276,13 +1276,13 @@ under the License.
<request-map uri="EditAgreementItemSupplierProduct"><security https="true" auth="true"/><response name="success" type="view" value="EditAgreementItemSupplierProduct"/></request-map>
<request-map uri="createAgreementItemSupplierProduct">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createSupplierProduct"/>
+ <event type="service" invoke="createSupplierProduct"/>
<response name="success" type="view" value="ListAgreementItemSupplierProducts"/>
<response name="error" type="view" value="EditAgreementItemSupplierProduct"/>
</request-map>
<request-map uri="updateAgreementItemSupplierProduct">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="updateSupplierProduct"/>
+ <event type="service" invoke="updateSupplierProduct"/>
<response name="success" type="view" value="ListAgreementItemSupplierProducts"/>
<response name="error" type="view" value="EditAgreementItemSupplierProduct"/>
</request-map>
@@ -1290,20 +1290,20 @@ under the License.
<request-map uri="ListAgreementItemParties"><security https="true" auth="true"/><response name="success" type="view" value="ListAgreementItemParties"/></request-map>
<request-map uri="removeAgreementItemParty">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="removeAgreementPartyApplic"/>
+ <event type="service" invoke="removeAgreementPartyApplic"/>
<response name="success" type="view" value="ListAgreementItemParties"/>
<response name="error" type="view" value="ListAgreementItemParties"/>
</request-map>
<request-map uri="EditAgreementItemParty"><security https="true" auth="true"/><response name="success" type="view" value="EditAgreementItemParty"/></request-map>
<request-map uri="createAgreementItemParty">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createAgreementPartyApplic"/>
+ <event type="service" invoke="createAgreementPartyApplic"/>
<response name="success" type="view" value="EditAgreementItemParty"/>
<response name="error" type="view" value="EditAgreementItemParty"/>
</request-map>
<request-map uri="updateAgreementItemParty">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="updateAgreementPartyApplic"/>
+ <event type="service" invoke="updateAgreementPartyApplic"/>
<response name="success" type="view" value="EditAgreementItemParty"/>
<response name="error" type="view" value="EditAgreementItemParty"/>
</request-map>
@@ -1311,7 +1311,7 @@ under the License.
<request-map uri="ListAgreementGeographicalApplic"><security https="true" auth="true"/><response name="success" type="view" value="ListAgreementGeographicalApplic"/></request-map>
<request-map uri="removeAgreementGeographicalApplic">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="removeAgreementGeographicalApplic"/>
+ <event type="service" invoke="removeAgreementGeographicalApplic"/>
<response name="success" type="view" value="ListAgreementGeographicalApplic"/>
<response name="error" type="view" value="ListAgreementGeographicalApplic"/>
</request-map>
@@ -1319,7 +1319,7 @@ under the License.
<request-map uri="EditAgreementGeographicalApplic"><security https="true" auth="true"/><response name="success" type="view" value="EditAgreementGeographicalApplic"/></request-map>
<request-map uri="createAgreementGeographicalApplic">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createAgreementGeographicalApplic"/>
+ <event type="service" invoke="createAgreementGeographicalApplic"/>
<response name="success" type="view" value="ListAgreementGeographicalApplic"/>
<response name="error" type="view" value="EditAgreementGeographicalApplic"/>
</request-map>
@@ -1347,13 +1347,13 @@ under the License.
<request-map uri="EditTaxAuthority"><security https="true" auth="true"/><response name="success" type="view" value="EditTaxAuthority"/></request-map>
<request-map uri="createTaxAuthority">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createTaxAuthority"/>
+ <event type="service" invoke="createTaxAuthority"/>
<response name="success" type="view" value="EditTaxAuthority"/>
<response name="error" type="view" value="EditTaxAuthority"/>
</request-map>
<request-map uri="updateTaxAuthority">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="updateTaxAuthority"/>
+ <event type="service" invoke="updateTaxAuthority"/>
<response name="success" type="view" value="EditTaxAuthority"/>
<response name="error" type="view" value="EditTaxAuthority"/>
</request-map>
@@ -1361,19 +1361,19 @@ under the License.
<request-map uri="EditTaxAuthorityCategories"><security https="true" auth="true"/><response name="success" type="view" value="EditTaxAuthorityCategories"/></request-map>
<request-map uri="createTaxAuthorityCategory">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createTaxAuthorityCategory"/>
+ <event type="service" invoke="createTaxAuthorityCategory"/>
<response name="success" type="view" value="EditTaxAuthorityCategories"/>
<response name="error" type="view" value="EditTaxAuthorityCategories"/>
</request-map>
<request-map uri="updateTaxAuthorityCategory">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="updateTaxAuthorityCategory"/>
+ <event type="service" invoke="updateTaxAuthorityCategory"/>
<response name="success" type="view" value="EditTaxAuthorityCategories"/>
<response name="error" type="view" value="EditTaxAuthorityCategories"/>
</request-map>
<request-map uri="deleteTaxAuthorityCategory">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="deleteTaxAuthorityCategory"/>
+ <event type="service" invoke="deleteTaxAuthorityCategory"/>
<response name="success" type="view" value="EditTaxAuthorityCategories"/>
<response name="error" type="view" value="EditTaxAuthorityCategories"/>
</request-map>
@@ -1381,19 +1381,19 @@ under the License.
<request-map uri="EditTaxAuthorityAssocs"><security https="true" auth="true"/><response name="success" type="view" value="EditTaxAuthorityAssocs"/></request-map>
<request-map uri="createTaxAuthorityAssoc">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createTaxAuthorityAssoc"/>
+ <event type="service" invoke="createTaxAuthorityAssoc"/>
<response name="success" type="view" value="EditTaxAuthorityAssocs"/>
<response name="error" type="view" value="EditTaxAuthorityAssocs"/>
</request-map>
<request-map uri="updateTaxAuthorityAssoc">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="updateTaxAuthorityAssoc"/>
+ <event type="service" invoke="updateTaxAuthorityAssoc"/>
<response name="success" type="view" value="EditTaxAuthorityAssocs"/>
<response name="error" type="view" value="EditTaxAuthorityAssocs"/>
</request-map>
<request-map uri="deleteTaxAuthorityAssoc">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="deleteTaxAuthorityAssoc"/>
+ <event type="service" invoke="deleteTaxAuthorityAssoc"/>
<response name="success" type="view" value="EditTaxAuthorityAssocs"/>
<response name="error" type="view" value="EditTaxAuthorityAssocs"/>
</request-map>
@@ -1401,13 +1401,13 @@ under the License.
<request-map uri="EditTaxAuthorityGlAccounts"><security https="true" auth="true"/><response name="success" type="view" value="EditTaxAuthorityGlAccounts"/></request-map>
<request-map uri="createTaxAuthorityGlAccount">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createTaxAuthorityGlAccount"/>
+ <event type="service" invoke="createTaxAuthorityGlAccount"/>
<response name="success" type="view" value="EditTaxAuthorityGlAccounts"/>
<response name="error" type="view" value="EditTaxAuthorityGlAccounts"/>
</request-map>
<request-map uri="deleteTaxAuthorityGlAccount">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="deleteTaxAuthorityGlAccount"/>
+ <event type="service" invoke="deleteTaxAuthorityGlAccount"/>
<response name="success" type="view" value="EditTaxAuthorityGlAccounts"/>
<response name="error" type="view" value="EditTaxAuthorityGlAccounts"/>
</request-map>
@@ -1415,19 +1415,19 @@ under the License.
<request-map uri="EditTaxAuthorityRateProducts"><security https="true" auth="true"/><response name="success" type="view" value="EditTaxAuthorityRateProducts"/></request-map>
<request-map uri="createTaxAuthorityRateProduct">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createTaxAuthorityRateProduct"/>
+ <event type="service" invoke="createTaxAuthorityRateProduct"/>
<response name="success" type="view" value="EditTaxAuthorityRateProducts"/>
<response name="error" type="view" value="EditTaxAuthorityRateProducts"/>
</request-map>
<request-map uri="updateTaxAuthorityRateProduct">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="updateTaxAuthorityRateProduct"/>
+ <event type="service" invoke="updateTaxAuthorityRateProduct"/>
<response name="success" type="view" value="EditTaxAuthorityRateProducts"/>
<response name="error" type="view" value="EditTaxAuthorityRateProducts"/>
</request-map>
<request-map uri="deleteTaxAuthorityRateProduct">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="deleteTaxAuthorityRateProduct"/>
+ <event type="service" invoke="deleteTaxAuthorityRateProduct"/>
<response name="success" type="view" value="EditTaxAuthorityRateProducts"/>
<response name="error" type="view" value="EditTaxAuthorityRateProducts"/>
</request-map>
@@ -1435,20 +1435,20 @@ under the License.
<request-map uri="ListTaxAuthorityParties"><security https="true" auth="true"/><response name="success" type="view" value="ListTaxAuthorityParties"/></request-map>
<request-map uri="deleteTaxAuthorityPartyInfo">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="deletePartyTaxAuthInfo"/>
+ <event type="service" invoke="deletePartyTaxAuthInfo"/>
<response name="success" type="view" value="ListTaxAuthorityParties"/>
<response name="error" type="view" value="ListTaxAuthorityParties"/>
</request-map>
<request-map uri="EditTaxAuthorityPartyInfo"><security https="true" auth="true"/><response name="success" type="view" value="EditTaxAuthorityPartyInfo"/></request-map>
<request-map uri="createTaxAuthorityPartyInfo">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createPartyTaxAuthInfo"/>
+ <event type="service" invoke="createPartyTaxAuthInfo"/>
<response name="success" type="view" value="EditTaxAuthorityPartyInfo"/>
<response name="error" type="view" value="EditTaxAuthorityPartyInfo"/>
</request-map>
<request-map uri="updateTaxAuthorityPartyInfo">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="updatePartyTaxAuthInfo"/>
+ <event type="service" invoke="updatePartyTaxAuthInfo"/>
<response name="success" type="view" value="EditTaxAuthorityPartyInfo"/>
<response name="error" type="view" value="EditTaxAuthorityPartyInfo"/>
</request-map>
@@ -1839,19 +1839,19 @@ under the License.
</request-map>
<request-map uri="createFinAccount">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createFinAccount"/>
+ <event type="service" invoke="createFinAccount"/>
<response name="success" type="view" value="EditFinAccount"/>
<response name="error" type="view" value="EditFinAccount"/>
</request-map>
<request-map uri="updateFinAccount">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="updateFinAccount"/>
+ <event type="service" invoke="updateFinAccount"/>
<response name="success" type="view" value="EditFinAccount"/>
<response name="error" type="view" value="EditFinAccount"/>
</request-map>
<request-map uri="deleteFinAccount">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="deleteFinAccount"/>
+ <event type="service" invoke="deleteFinAccount"/>
<response name="success" type="view" value="FindFinAccount"/>
<response name="error" type="view" value="FindFinAccount"/>
</request-map>
@@ -1924,19 +1924,19 @@ under the License.
</request-map>
<request-map uri="createFinAccountRole">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createFinAccountRole"/>
+ <event type="service" invoke="createFinAccountRole"/>
<response name="success" type="view" value="EditFinAccountRoles"/>
<response name="error" type="view" value="EditFinAccountRoles"/>
</request-map>
<request-map uri="updateFinAccountRole">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="updateFinAccountRole"/>
+ <event type="service" invoke="updateFinAccountRole"/>
<response name="success" type="view" value="EditFinAccountRoles"/>
<response name="error" type="view" value="EditFinAccountRoles"/>
</request-map>
<request-map uri="deleteFinAccountRole">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="deleteFinAccountRole"/>
+ <event type="service" invoke="deleteFinAccountRole"/>
<response name="success" type="view" value="EditFinAccountRoles"/>
<response name="error" type="view" value="EditFinAccountRoles"/>
</request-map>
@@ -1948,7 +1948,7 @@ under the License.
</request-map>
<request-map uri="createFinAccountTrans">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createFinAccountTrans"/>
+ <event type="service" invoke="createFinAccountTrans"/>
<response name="success" type="view" value="FindFinAccountTrans"/>
<response name="error" type="view" value="EditFinAccountTrans"/>
</request-map>
@@ -1958,7 +1958,7 @@ under the License.
</request-map>
<request-map uri="setFinAccountTransStatus">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="setFinAccountTransStatus"/>
+ <event type="service" invoke="setFinAccountTransStatus"/>
<response name="success" type="view" value="FindFinAccountTrans"/>
<response name="error" type="view" value="FindFinAccountTrans"/>
</request-map>
@@ -2039,13 +2039,13 @@ under the License.
</request-map>
<request-map uri="createFinAccountAuth">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="createFinAccountAuth"/>
+ <event type="service" invoke="createFinAccountAuth"/>
<response name="success" type="view" value="EditFinAccountAuths"/>
<response name="error" type="view" value="EditFinAccountAuths"/>
</request-map>
<request-map uri="expireFinAccountAuth">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="expireFinAccountAuth"/>
+ <event type="service" invoke="expireFinAccountAuth"/>
<response name="success" type="view" value="EditFinAccountAuths"/>
<response name="error" type="view" value="EditFinAccountAuths"/>
</request-map>
Modified: ofbiz/branches/20120329_portletWidget/applications/commonext/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/commonext/ofbiz-component.xml?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/commonext/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/commonext/ofbiz-component.xml Mon Jul 2 20:11:49 2012
@@ -26,13 +26,11 @@ under the License.
<entity-resource type="data" reader-name="seed" loader="main" location="data/EntityDiagramGroupData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtSeedData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtSecurityPermissionSeedData.xml"/>
- <entity-resource type="data" reader-name="demo" loader="main" location="data/CommonExtSecurityGroupDemoData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtSecurityData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/SystemInfoPortletData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/SetupData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/OfbizSetupSecurityPermissionSeedData.xml"/>
- <entity-resource type="data" reader-name="demo" loader="main" location="data/OfbizSetupSecurityGroupDemoData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/OfbizSetupSecurityData.xml"/>
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
Modified: ofbiz/branches/20120329_portletWidget/applications/content/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/ofbiz-component.xml?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/content/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/content/ofbiz-component.xml Mon Jul 2 20:11:49 2012
@@ -36,8 +36,7 @@ under the License.
<entity-resource type="data" reader-name="seed" loader="main" location="data/DataCategoryData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/BlogSeedData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/TemplateData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentSecurityPermissionSeedData.xml"/>
- <entity-resource type="data" reader-name="demo" loader="main" location="data/ContentSecurityGroupDemoData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentSecurityData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/MiscData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ContentHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ContentHttpErrorData.xml"/>
@@ -45,6 +44,7 @@ under the License.
<!-- these files cannot be loaded in their original component because they are earlier than the content component -->
<entity-resource type="data" reader-name="seed" loader="main" location="data/PartyHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/WebtoolsHelpData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/BirtHelpData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/UsersDemoData.xml"/>
Modified: ofbiz/branches/20120329_portletWidget/applications/content/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/servicedef/services.xml?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/content/servicedef/services.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/content/servicedef/services.xml Mon Jul 2 20:11:49 2012
@@ -405,17 +405,6 @@
<attribute mode="OUT" name="view" optional="true" type="org.ofbiz.entity.GenericValue"/>
<attribute mode="OUT" name="content" optional="true" type="org.ofbiz.entity.GenericValue"/>
</service>
- <!--
- <service name="addMostRecent"
- engine="java"
- location="org.ofbiz.content.ContentManagementServices"
- invoke="addMostRecent" auth="false">
- <description>Get subContent of passed contentId/mapKey or subContentId</description>
- <attribute mode="IN" name="suffix" optional="true" type="String"/>
- <attribute mode="IN" name="pk" optional="true" type="org.ofbiz.entity.GenericValue"/>
- <attribute mode="IN" name="session" optional="true" type="javax.servlet.http.HttpSession"/>
- </service>
- -->
<service name="persistContentAndAssoc" engine="java" transaction-timeout="7200"
location="org.ofbiz.content.ContentManagementServices" invoke="persistContentAndAssoc" auth="true">
Modified: ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/ContentManagementServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/ContentManagementServices.java?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/ContentManagementServices.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/ContentManagementServices.java Mon Jul 2 20:11:49 2012
@@ -21,14 +21,11 @@ package org.ofbiz.content;
import java.math.BigDecimal;
import java.nio.ByteBuffer;
import java.sql.Timestamp;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
-import javax.servlet.http.HttpSession;
-
import javolution.util.FastList;
import javolution.util.FastMap;
import javolution.util.FastSet;
@@ -45,7 +42,6 @@ import org.ofbiz.content.content.Content
import org.ofbiz.content.content.ContentWorker;
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
-import org.ofbiz.entity.GenericPK;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityCondition;
import org.ofbiz.entity.condition.EntityConditionList;
@@ -133,27 +129,6 @@ public class ContentManagementServices {
}
/**
- * addMostRecent
- * A service for adding the most recently used of an entity class to the cache.
- * Entities make it to the most recently used list primarily by being selected for editing,
- * either by being created or being selected from a list.
- */
- public static Map<String, Object> addMostRecent(DispatchContext dctx, Map<String, ? extends Object> context) {
- //Security security = dctx.getSecurity();
- //Delegator delegator = dctx.getDelegator();
- //LocalDispatcher dispatcher = dctx.getDispatcher();
- //HttpServletRequest request = (HttpServletRequest)context.get("request");
- //String suffix = (String) context.get("suffix");
- GenericValue val = (GenericValue)context.get("pk");
- GenericPK pk = val.getPrimaryKey();
- HttpSession session = (HttpSession)context.get("session");
-
- ContentManagementWorker.mruAdd(session, pk);
- return ServiceUtil.returnSuccess();
- }
-
-
- /**
* persistContentAndAssoc
* A combination method that will create or update all or one of the following:
* a Content entity, a ContentAssoc related to the Content, and
Modified: ofbiz/branches/20120329_portletWidget/applications/content/widget/content/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/widget/content/ContentForms.xml?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/content/widget/content/ContentForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/content/widget/content/ContentForms.xml Mon Jul 2 20:11:49 2012
@@ -58,15 +58,12 @@ under the License.
</field>
<field name="createdByUserLogin" position="2"><lookup target-form-name="LookupUserLoginAndPartyDetails"/></field>
<field name="localeString">
- <lookup target-form-name="LookupLocale"></lookup>
- </field>
- <!--<field name="localeString">
<drop-down allow-empty="true">
<entity-options entity-name="CountryCode" description="${countryName} [${countryCode}]" key-field-name="countryCode">
<entity-order-by field-name="countryName"/>
</entity-options>
</drop-down>
- </field>-->
+ </field>
<field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
@@ -190,7 +187,11 @@ under the License.
</lookup>
</field>
<field name="localeString">
- <lookup target-form-name="LookupLocale"></lookup>
+ <drop-down allow-empty="true">
+ <entity-options entity-name="CountryCode" description="${countryName} [${countryCode}]" key-field-name="countryCode">
+ <entity-order-by field-name="countryName"/>
+ </entity-options>
+ </drop-down>
</field>
<field name="mimeTypeId" encode-output="false">
<drop-down allow-empty="true">
Modified: ofbiz/branches/20120329_portletWidget/applications/content/widget/content/DataResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/widget/content/DataResourceForms.xml?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/content/widget/content/DataResourceForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/content/widget/content/DataResourceForms.xml Mon Jul 2 20:11:49 2012
@@ -49,15 +49,12 @@ under the License.
</drop-down>
</field>
<field name="localeString" position="2">
- <lookup target-form-name="LookupLocale"></lookup>
- </field>
- <!--<field name="localeString" position="2">
<drop-down allow-empty="true">
<entity-options entity-name="CountryCode" description="${countryName} [${countryCode}]" key-field-name="countryCode">
<entity-order-by field-name="countryName"/>
</entity-options>
</drop-down>
- </field>-->
+ </field>
<field name="createdByUserLogin" position="1"><lookup target-form-name="LookupPerson"/></field>
<field name="dataCategoryId" position="2">
<drop-down allow-empty="true">
@@ -193,8 +190,12 @@ under the License.
<list-options list-name="dataCategoryList" key-name="dataCategoryId" description="${categoryName}"/>
</drop-down>
</field>
- <field name="localeString">
- <lookup target-form-name="LookupLocale"></lookup>
+ <field name="localeString" position="2">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="CountryCode" description="${countryName} [${countryCode}]" key-field-name="countryCode">
+ <entity-order-by field-name="countryName"/>
+ </entity-options>
+ </drop-down>
</field>
<field name="mimeTypeId" encode-output="false">
<drop-down allow-empty="true">
@@ -262,8 +263,12 @@ under the License.
<list-options list-name="dataCategoryList" key-name="dataCategoryId" description="${categoryName}"/>
</drop-down>
</field>
- <field name="localeString">
- <lookup target-form-name="LookupLocale"></lookup>
+ <field name="localeString" position="2">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="CountryCode" description="${countryName} [${countryCode}]" key-field-name="countryCode">
+ <entity-order-by field-name="countryName"/>
+ </entity-options>
+ </drop-down>
</field>
<field name="mimeTypeId" encode-output="false">
<drop-down allow-empty="true">
Modified: ofbiz/branches/20120329_portletWidget/applications/humanres/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/humanres/ofbiz-component.xml?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/humanres/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/humanres/ofbiz-component.xml Mon Jul 2 20:11:49 2012
@@ -28,8 +28,7 @@ under the License.
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_old.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResHelpData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResSecurityPermissionSeedData.xml"/>
- <entity-resource type="data" reader-name="demo" loader="main" location="data/HumanResSecurityGroupDemoData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResSecurityData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResPortletData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/HumanResDemoData.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/ofbiz-component.xml?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/ofbiz-component.xml Mon Jul 2 20:11:49 2012
@@ -34,8 +34,7 @@ under the License.
<!-- entity resources: model(s), eca(s) and group definitions -->
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingSecurityPermissionSeedData.xml"/>
- <entity-resource type="data" reader-name="demo" loader="main" location="data/ManufacturingSecurityGroupDemoData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingSecurityData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingHelpData_EN.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingHelpData_NL.xml"/>
<!--<entity-resource type="data" reader-name="seed-initial" loader="main" location="data/ManufacturingScheduledServices.xml"/>-->
Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java Mon Jul 2 20:11:49 2012
@@ -309,7 +309,7 @@ public class ProductionRun {
if (exist()) {
if (currentStatus == null) {
try {
- currentStatus = productionRun.getRelatedOne("StatusItem", true);
+ currentStatus = productionRun.getRelatedOne("CurrentStatusItem", true);
} catch (GenericEntityException e) {
Debug.logWarning(e.getMessage(), module);
}
Modified: ofbiz/branches/20120329_portletWidget/applications/marketing/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/marketing/ofbiz-component.xml?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/marketing/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/marketing/ofbiz-component.xml Mon Jul 2 20:11:49 2012
@@ -27,11 +27,11 @@ under the License.
<classpath type="dir" location="config"/>
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingTypeData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingSecurityPermissionSeedData.xml"/>
- <entity-resource type="data" reader-name="demo" loader="main" location="data/MarketingSecurityGroupDemoData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingSecurityData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/SfaPortletData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/sfaDemoData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/MarketingDemoData.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
<service-resource type="model" loader="main" location="servicedef/services_opportunity.xml"/>
<service-resource type="eca" loader="main" location="servicedef/secas.xml"/>
Modified: ofbiz/branches/20120329_portletWidget/applications/order/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/ofbiz-component.xml?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/ofbiz-component.xml Mon Jul 2 20:11:49 2012
@@ -34,8 +34,7 @@ under the License.
<entity-resource type="data" reader-name="seed" loader="main" location="data/OrderTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/OrderPortletData.xml"/>
<entity-resource type="data" reader-name="seed-initial" loader="main" location="data/OrderScheduledServices.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderSecurityPermissionSeedData.xml"/>
- <entity-resource type="data" reader-name="demo" loader="main" location="data/OrderSecurityGroupDemoData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderSecurityData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/OrderHelpData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/OrderDemoUser.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/OrderDemoData.xml"/>
Propchange: ofbiz/branches/20120329_portletWidget/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
------------------------------------------------------------------------------
Merged /ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:r1347755-1351865
Modified: ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/order/src/org/ofbiz/order/order/OrderServices.java Mon Jul 2 20:11:49 2012
@@ -3501,6 +3501,9 @@ public class OrderServices {
return ServiceUtil.returnError(UtilProperties.getMessage(resource,
"OrderShipGroupSeqIdInvalid", UtilMisc.toMap("shipGroupSeqId", shipGroupSeqId), locale));
}
+ if (quantity.compareTo(BigDecimal.ONE) < 0) {
+ return ServiceUtil.returnError(UtilProperties.getMessage(resource, "OrderItemQtyMustBePositive", locale));
+ }
// obtain a shopping cart object for updating
ShoppingCart cart = null;
@@ -3632,7 +3635,7 @@ public class OrderServices {
return ServiceUtil.returnError(e.getMessage());
}
- if (groupQty.compareTo(BigDecimal.ZERO) == 0) {
+ if (groupQty.compareTo(BigDecimal.ONE) < 0) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource,
"OrderItemQtyMustBePositive", locale));
}
Modified: ofbiz/branches/20120329_portletWidget/applications/party/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/ofbiz-component.xml?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/party/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/party/ofbiz-component.xml Mon Jul 2 20:11:49 2012
@@ -28,8 +28,7 @@ under the License.
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_old.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/PartyTypeData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/PartySecurityPermissionSeedData.xml"/>
- <entity-resource type="data" reader-name="demo" loader="main" location="data/PartySecurityGroupDemoData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/PartySecurityData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/PartyGeoPointData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/PartyPortletData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/PartyDemoData.xml"/>
Propchange: ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
------------------------------------------------------------------------------
Merged /ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:r1347755-1351865
Modified: ofbiz/branches/20120329_portletWidget/applications/product/config/ProductEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/config/ProductEntityLabels.xml?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/config/ProductEntityLabels.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/config/ProductEntityLabels.xml Mon Jul 2 20:11:49 2012
@@ -2112,6 +2112,7 @@
<value xml:lang="zh_TW">é·å®</value>
</property>
<property key="ProductMaintType.description.CHASSIS_LUBE">
+ <value xml:lang="de">Fahrwerk Schmierung</value>
<value xml:lang="en">Chassis Lubrication</value>
<value xml:lang="it">Lubrificazione telaio</value>
<value xml:lang="vi">Bôi trơn khung gầm</value>
@@ -2127,6 +2128,7 @@
<value xml:lang="zh_TW">檢æ¥é»æ± </value>
</property>
<property key="ProductMaintType.description.HVAC_CHECK_REFR">
+ <value xml:lang="de">Kühlflüssigkeit prüfen/nachfüllen</value>
<value xml:lang="en">Check/Recharge Refrigerant</value>
<value xml:lang="it">Controllo/Ricarica refrigerante</value>
<value xml:lang="vi">Kiá»m tra/Nạp thêm gas là m lạnh</value>
@@ -2189,6 +2191,7 @@
<value xml:lang="zh_TW">æ´æé»æ± </value>
</property>
<property key="ProductMaintType.description.ROTATE_TIRES">
+ <value xml:lang="de">Reifen drehen</value>
<value xml:lang="en">Rotate Tires</value>
<value xml:lang="it">Invertire le gomme</value>
<value xml:lang="vi">Rotate Tires</value>
@@ -2196,7 +2199,7 @@
<value xml:lang="zh_TW">輪è輪æ</value>
</property>
<property key="ProductMaintType.description.SERP_BELT">
- <value xml:lang="de">Keilriemen Ersatz</value>
+ <value xml:lang="de">Keilriemen ersetzen</value>
<value xml:lang="en">Serpentine Belt Replacement</value>
<value xml:lang="es">Cambio de correa</value>
<value xml:lang="fr">Remplacement de courroie serpentine</value>
@@ -2209,6 +2212,7 @@
<value xml:lang="zh_TW">æ´æ平帶</value>
</property>
<property key="ProductMaintType.description.TUNE_UP">
+ <value xml:lang="de">Einstellen</value>
<value xml:lang="en">Tune Up</value>
<value xml:lang="it">Mettere a punto</value>
<value xml:lang="vi">Lên dây</value>
@@ -2216,7 +2220,7 @@
<value xml:lang="zh_TW">調é³</value>
</property>
<property key="ProductMaintType.description.VEHICLE_MAINT">
- <value xml:lang="de">Fahrzeug Instandhaltung</value>
+ <value xml:lang="de">Fahrzeugwartung</value>
<value xml:lang="en">Vehicle Maintenance</value>
<value xml:lang="es">Mantenimiento de vehÃculo</value>
<value xml:lang="fr">Révision du véhicule</value>
@@ -2329,6 +2333,7 @@
<value xml:lang="zh_TW">使ç¨è¨æ¸è¡¨</value>
</property>
<property key="ProductMeterType.description.TRIP_METER">
+ <value xml:lang="en">Tageskilometerzähler</value>
<value xml:lang="en">Use Trip Meter</value>
<value xml:lang="fr">Utiliser le compteur de distance par trajet</value>
<value xml:lang="vi">Sá» dụng Äá»ng há» Äo quãng ÄÆ°á»ng chuyến Äi</value>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/config/ProductUiLabels.xml?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/config/ProductUiLabels.xml Mon Jul 2 20:11:49 2012
@@ -21769,6 +21769,7 @@
<property key="ProductPromoCodeLength">
<value xml:lang="de">Aktionscodelänge</value>
<value xml:lang="en">product promo code length</value>
+ <value xml:lang="fr">Longueur du code promo</value>
<value xml:lang="vi">Äá» dà i mã khuyến mại</value>
</property>
<property key="ProductPromoCodeParties">
@@ -21804,6 +21805,10 @@
<value xml:lang="zh">ä¿é/ä¼æ å¸ä»£ç </value>
<value xml:lang="zh_TW">ä¿é·/åªæ å¸ä»£ç¢¼</value>
</property>
+ <property key="ProductPromoCodesCreated">
+ <value xml:lang="en">Following PromoCodes have been created: </value>
+ <value xml:lang="fr">Les codes promo suivants ont été créés : </value>
+ </property>
<property key="ProductPromoCodesEntered">
<value xml:lang="de">Eingegebene Codes:</value>
<value xml:lang="en">Entered Codes:</value>
@@ -21875,22 +21880,27 @@
<property key="ProductPromoLayoutSmart">
<value xml:lang="de">clever</value>
<value xml:lang="en">smart</value>
+ <value xml:lang="fr">intelligent</value>
</property>
<property key="ProductPromoLayoutNormal">
<value xml:lang="de">normal</value>
<value xml:lang="en">normal</value>
+ <value xml:lang="fr">normal</value>
</property>
<property key="ProductPromoLayoutSeqNum">
<value xml:lang="de">Sequenz</value>
<value xml:lang="en">sequence</value>
+ <value xml:lang="fr">séquence</value>
</property>
<property key="ProductPromoCodeLayout">
<value xml:lang="de">Aussehen vom Aktionscode</value>
<value xml:lang="en">Promo code layout</value>
+ <value xml:lang="fr">Format de code promo</value>
</property>
<property key="ProductPromoCodeLayoutTooltip">
<value xml:lang="de">"clever": Vermeidet ähnliche Zeichen (0 und O, ...) | "normal": Alphanummerisch | "sequenz": Laufnummer</value>
<value xml:lang="en">"smart": Avoids equal Chars (0 and O, ...) | "normal": alphanumeric | "sequence": Sequence Number</value>
+ <value xml:lang="fr">"intelligent": Ãviter les charactères identiques (0 et O, ...) | "normal": alphanumérique | "séquence": séquence numérique</value>
</property>
<property key="ProductPromos">
<value xml:lang="de">Aktionen</value>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/ofbiz-component.xml?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/ofbiz-component.xml Mon Jul 2 20:11:49 2012
@@ -37,10 +37,7 @@ under the License.
<entity-resource type="data" reader-name="seed" loader="main" location="data/ProductTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ProductHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ShipmentTypeData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/ProductSecurityPermissionSeedData.xml"/>
- <entity-resource type="data" reader-name="demo" loader="main" location="data/ProductSecurityGroupDemoData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/FacilitySecurityPermissionSeedData.xml"/>
- <entity-resource type="data" reader-name="demo" loader="main" location="data/FacilitySecurityGroupDemoData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/ProductSecurityData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/ProductDemoData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ApiSchemaDhl.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/DimensionTypeData.xml"/>
Propchange: ofbiz/branches/20120329_portletWidget/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
------------------------------------------------------------------------------
Merged /ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:r1347755-1351865
Modified: ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/promo/PromoServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/promo/PromoServices.java?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/promo/PromoServices.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/promo/PromoServices.java Mon Jul 2 20:11:49 2012
@@ -60,6 +60,7 @@ public class PromoServices {
'Z', '2', '3', '4', '5', '6', '7', '8', '9' };
public static Map<String, Object> createProductPromoCodeSet(DispatchContext dctx, Map<String, ? extends Object> context) {
+ Locale locale = (Locale) context.get("locale");
Delegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
Long quantity = (Long) context.get("quantity");
@@ -77,7 +78,7 @@ public class PromoServices {
String newPromoCodeId = "";
StringBuilder bankOfNumbers = new StringBuilder();
- bankOfNumbers.append("Following PromoCodes have been created: ");
+ bankOfNumbers.append(UtilProperties.getMessage(resource, "ProductPromoCodesCreated", locale));
for (long i = 0; i < quantity; i++) {
Map<String, Object> createProductPromoCodeMap = null;
boolean foundUniqueNewCode = false;
@@ -110,11 +111,11 @@ public class PromoServices {
newContext.put("productPromoCodeId", newPromoCodeId);
createProductPromoCodeMap = dispatcher.runSync("createProductPromoCode", newContext);
} catch (GenericServiceException err) {
- return ServiceUtil.returnError("Could not create a bank of promo codes", null, null, createProductPromoCodeMap);
+ return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ProductPromoCodeCannotBeCreated", locale), null, null, createProductPromoCodeMap);
}
if (ServiceUtil.isError(createProductPromoCodeMap)) {
// what to do here? try again?
- return ServiceUtil.returnError("Could not create a bank of promo codes", null, null, createProductPromoCodeMap);
+ return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ProductPromoCodeCannotBeCreated", locale), null, null, createProductPromoCodeMap);
}
bankOfNumbers.append((String) createProductPromoCodeMap.get("productPromoCodeId"));
bankOfNumbers.append(",");
Modified: ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/controller.xml Mon Jul 2 20:11:49 2012
@@ -2938,6 +2938,7 @@ under the License.
<request-map uri="LookupDataResource"><security auth="true" https="true"/><response name="success" type="view" value="LookupDataResource"/></request-map>
<request-map uri="LookupPerson"><security auth="true" https="true"/><response name="success" type="view" value="LookupPerson"/></request-map>
<request-map uri="LookupPreferredContactMech"><security https="true" auth="true"/><response name="success" type="view" value="LookupPreferredContactMech"/></request-map>
+ <request-map uri="LookupContactList"><security https="true" auth="true"/><response name="success" type="view" value="LookupContactList"/></request-map>
<!-- ================ Vendor Product Requests ================= -->
<request-map uri="EditVendorProduct">
@@ -3216,6 +3217,7 @@ under the License.
<view-map name="LookupDataResource" page="component://content/widget/content/DataResourceScreens.xml#LookupDataResource" type="screen"/>
<view-map name="LookupPerson" page="component://party/widget/partymgr/LookupScreens.xml#LookupPerson" type="screen"/>
<view-map name="LookupPreferredContactMech" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupPreferredContactMech"/>
+ <view-map name="LookupContactList" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupContactList"/>
<!-- Image Management request mappings -->
<view-map name="Imagemanagement" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#Imagemanagement"/>
Modified: ofbiz/branches/20120329_portletWidget/applications/workeffort/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/workeffort/ofbiz-component.xml?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/workeffort/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/workeffort/ofbiz-component.xml Mon Jul 2 20:11:49 2012
@@ -29,10 +29,9 @@ under the License.
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_view.xml"/>
<entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/WorkEffortTypeData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkEffortPortletData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkEffortSecurityPermissionSeedData.xml"/>
- <entity-resource type="data" reader-name="demo" loader="main" location="data/WorkEffortSecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/WorkEffortDemoData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkEffortPortletData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkEffortSecurityData.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
<service-resource type="model" loader="main" location="servicedef/services_timesheet.xml"/>
<service-resource type="model" loader="main" location="servicedef/services_upgrade.xml"/>