You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/04/07 10:27:24 UTC
svn commit: r762648 [8/11] - in /ofbiz/trunk: applications/accounting/data/
applications/accounting/entitydef/
applications/accounting/script/org/ofbiz/accounting/admin/
applications/accounting/script/org/ofbiz/accounting/finaccount/
applications/accou...
Modified: ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml Tue Apr 7 08:27:15 2009
@@ -22,7 +22,7 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
<form name="lookupProduct" target="LookupProduct" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
- <!-- <auto-fields-entity entity-name="Product" default-field-type="hidden" /> -->
+ <!-- <auto-fields-entity entity-name="Product" default-field-type="hidden"/> -->
<field name="productId" title="${uiLabelMap.ProductProductId}"><text-find/></field>
<field name="brandName" title="${uiLabelMap.ProductBrandName}"><text-find/></field>
<field name="internalName" title="${uiLabelMap.ProductInternalName}"><text-find default-option="contains"/></field>
@@ -119,7 +119,7 @@
<form name="lookupProductAndPrice" target="LookupProductAndPrice" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
- <!-- <auto-fields-entity entity-name="Product" default-field-type="hidden" /> -->
+ <!-- <auto-fields-entity entity-name="Product" default-field-type="hidden"/> -->
<field name="productId" title="${uiLabelMap.ProductProductId}"><text-find/></field>
<field name="internalName" title="${uiLabelMap.ProductInternalName}"><text-find/></field>
<field name="productTypeId" title="${uiLabelMap.ProductProductType}">
@@ -196,7 +196,7 @@
<form name="lookupProductCategory" target="LookupProductCategory" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
- <auto-fields-entity entity-name="ProductCategory" default-field-type="find" />
+ <auto-fields-entity entity-name="ProductCategory" default-field-type="find"/>
<field name="productCategoryTypeId">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="ProductCategoryType">
@@ -253,7 +253,7 @@
<form name="lookupProductFeature" target="LookupProductFeature" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
- <auto-fields-entity entity-name="ProductFeature" default-field-type="find" />
+ <auto-fields-entity entity-name="ProductFeature" default-field-type="find"/>
<field name="productFeatureTypeId">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="ProductFeatureType">
Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Tue Apr 7 08:27:15 2009
@@ -895,7 +895,7 @@
<field name="productId"><hidden value="${productId}"/></field>
<field name="configTypeId">
<drop-down allow-empty="false">
- <option key="STANDARD" description="${uiLabelMap.ProductStandard}" />
+ <option key="STANDARD" description="${uiLabelMap.ProductStandard}"/>
<option key="QUESTION" description="${uiLabelMap.ProductQuestion}"/>
</drop-down>
</field>
@@ -923,7 +923,7 @@
</field>
<field name="configTypeId">
<drop-down allow-empty="false">
- <option key="STANDARD" description="${uiLabelMap.ProductStandard}" />
+ <option key="STANDARD" description="${uiLabelMap.ProductStandard}"/>
<option key="QUESTION" description="${uiLabelMap.ProductQuestion}"/>
</drop-down>
</field>
@@ -1216,7 +1216,7 @@
<!-- create ProductMaint-->
<form name="AddProductMaint" type="single" target="createProductMaint" title=""
header-row-style="header-row" default-table-style="basic-table">
- <auto-fields-service service-name="createProductMaint" />
+ <auto-fields-service service-name="createProductMaint"/>
<field name="productId"><hidden/></field>
<field name="productMaintSeqId"><ignored/></field>
<field name="productMaintTypeId">
@@ -1260,7 +1260,7 @@
</entity-options>
</drop-down>
</field>
- <field name="maintName"><text size="20" /></field>
+ <field name="maintName"><text size="20"/></field>
<field name="maintTemplateWorkEffortId"><lookup target-form-name="LookupWorkEffort"/></field>
<field name="intervalUomId">
<drop-down allow-empty="false">
@@ -1288,7 +1288,7 @@
<!-- create and update a ProductMeter -->
<form name="AddProductMeter" type="single" target="createProductMeter" title=""
header-row-style="header-row" default-table-style="basic-table">
- <auto-fields-service service-name="createProductMeter" />
+ <auto-fields-service service-name="createProductMeter"/>
<field name="productId"><hidden/></field>
<field name="productMeterTypeId">
<drop-down allow-empty="false">
@@ -1304,7 +1304,7 @@
</entity-options>
</drop-down>
</field>
- <field name="meterName"><text size="20" /></field>
+ <field name="meterName"><text size="20"/></field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListProductMeters" type="list" list-name="productMeters" target="updateProductMeter"
@@ -1326,7 +1326,7 @@
</entity-options>
</drop-down>
</field>
- <field name="meterName"><text size="20" /></field>
+ <field name="meterName"><text size="20"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink target="deleteProductMeter" description="${uiLabelMap.CommonDelete}" also-hidden="false">
<parameter param-name="productId"/><parameter param-name="productMeterTypeId"/>
@@ -1338,7 +1338,7 @@
<!-- create and update a ProductGeo -->
<form name="AddProductGeo" type="single" target="createProductGeo" title=""
header-row-style="header-row" default-table-style="basic-table">
- <auto-fields-service service-name="createProductGeo" />
+ <auto-fields-service service-name="createProductGeo"/>
<field name="productId"><hidden/></field>
<field name="geoId">
<drop-down allow-empty="false">
@@ -1356,7 +1356,7 @@
</entity-options>
</drop-down>
</field>
- <field name="description"><text size="20" /></field>
+ <field name="description"><text size="20"/></field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
</form>
<form name="ListProductGeos" type="list" list-name="productGeos" target="updateProductGeo"
@@ -1377,7 +1377,7 @@
</entity-options>
</drop-down>
</field>
- <field name="description"><text size="20" /></field>
+ <field name="description"><text size="20"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink target="deleteProductGeo" description="${uiLabelMap.CommonDelete}" also-hidden="false">
<parameter param-name="productId"/><parameter param-name="geoId"/>
@@ -1442,7 +1442,7 @@
</form>
<form name="AddProductFeatureApplAttr" type="single" target="createProductFeatureApplAttr" title=""
header-row-style="header-row" default-table-style="basic-table">
- <auto-fields-service service-name="createProductFeatureApplAttr" />
+ <auto-fields-service service-name="createProductFeatureApplAttr"/>
<field name="productId"><hidden/></field>
<field name="productFeatureId">
<drop-down allow-empty="false">
@@ -1649,10 +1649,10 @@
odd-row-style="alternate-row" default-table-style="basic-table">
<actions>
<entity-and entity-name="WorkEffortGoodStandard" use-cache="true" list="productWorkEfforts">
- <field-map from-field="productId" field-name="productId" />
+ <field-map from-field="productId" field-name="productId"/>
</entity-and>
</actions>
- <auto-fields-service service-name="updateWorkEffortGoodStandard" default-field-type="edit" />
+ <auto-fields-service service-name="updateWorkEffortGoodStandard" default-field-type="edit"/>
<field name="workEffortId">
<display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}" also-hidden="true">
<sub-hyperlink target="/workeffort/control/EditWorkEffort" description="${workEffortId}" link-style="buttontext" target-type="inter-app">
@@ -1820,12 +1820,12 @@
<actions>
<entity-condition entity-name="ProductGlAccount" list="productGlAccounts">
<condition-expr field-name="productId" from-field="productId"/>
- <order-by field-name="productId" />
+ <order-by field-name="productId"/>
</entity-condition>
</actions>
<field name="productId"><hidden/></field>
<field name="glAccountTypeId" title="${uiLabelMap.ProductAccountType}">
- <display-entity entity-name="GlAccountType" key-field-name="glAccountTypeId" description="${description}" />
+ <display-entity entity-name="GlAccountType" key-field-name="glAccountTypeId" description="${description}"/>
</field>
<field name="organizationPartyId" title="${uiLabelMap.ProductOrganization}">
<display description="${bsh: org.ofbiz.party.party.PartyHelper.getPartyName(delegator, organizationPartyId, true);} [${organizationPartyId}]"/>
@@ -1858,7 +1858,7 @@
<field name="organizationPartyId" title="${uiLabelMap.ProductOrganization}">
<drop-down allow-empty="false">
<entity-options entity-name="PartyRoleAndPartyDetail" key-field-name="partyId" description="${groupName} [${partyId}]">
- <entity-constraint name="roleTypeId" operator="equals" value="INTERNAL_ORGANIZATIO" />
+ <entity-constraint name="roleTypeId" operator="equals" value="INTERNAL_ORGANIZATIO"/>
<entity-order-by field-name="partyId"/>
</entity-options>
</drop-down>
Modified: ofbiz/trunk/applications/product/webapp/facility/labels/InventoryItemLabelForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/labels/InventoryItemLabelForms.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/labels/InventoryItemLabelForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/labels/InventoryItemLabelForms.xml Tue Apr 7 08:27:15 2009
@@ -73,7 +73,7 @@
<form name="EditInventoryItemLabel" type="single" target="createInventoryItemLabel" title="" default-map-name="inventoryItemLabel"
header-row-style="header-row" default-table-style="basic-table">
<alt-target target="updateInventoryItemLabel" use-when="inventoryItemLabel!=null"/>
- <auto-fields-service service-name="createInventoryItemLabel" />
+ <auto-fields-service service-name="createInventoryItemLabel"/>
<field name="inventoryItemLabelId" use-when="inventoryItemLabel!=null"><display/></field>
<field name="inventoryItemLabelTypeId" use-when="inventoryItemLabel==null">
<drop-down allow-empty="false">
Modified: ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml Tue Apr 7 08:27:15 2009
@@ -55,10 +55,10 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupVirtualProduct" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml" />
+ <include-form name="lookupVirtualProduct" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupVirtualProduct" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml" />
+ <include-form name="listLookupVirtualProduct" location="component://product/webapp/catalog/lookup/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Tue Apr 7 08:27:15 2009
@@ -553,7 +553,7 @@
<set field="productCostComponentId" from-field="parameters.productCostComponentId"/>
<!-- default currency in framework/common/config/general.properties -->
- <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" />
+ <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/>
<entity-one entity-name="Product" value-field="product"/>
<entity-one entity-name="CostComponent" value-field="costComponent" auto-field-map="false">
@@ -1162,7 +1162,7 @@
<set field="labelTitleProperty" value="ProductSuppliers"/>
<!-- default currency in framework/common/config/general.properties -->
- <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" />
+ <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/>
<set field="productId" from-field="parameters.productId"/>
<set field="minimumOrderQuantity" from-field="parameters.minimumOrderQuantity" type="BigDecimal"/>
Modified: ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml Tue Apr 7 08:27:15 2009
@@ -276,11 +276,11 @@
<screen name="EditSubscriptionCommEvent">
<section>
<actions>
- <set field="titleProperty" value="PageTitleEditSubscriptionCommEvent" />
- <set field="tabButtonItem" value="EditSubscriptionCommEvent" />
- <set field="subscriptionId" from-field="parameters.subscriptionId" />
+ <set field="titleProperty" value="PageTitleEditSubscriptionCommEvent"/>
+ <set field="tabButtonItem" value="EditSubscriptionCommEvent"/>
+ <set field="subscriptionId" from-field="parameters.subscriptionId"/>
<entity-and entity-name="SubscriptionAndCommEvent" use-cache="false" list="subscriptionCommEvent">
- <field-map field-name="subscriptionId" />
+ <field-map field-name="subscriptionId"/>
</entity-and>
</actions>
<widgets>
@@ -289,7 +289,7 @@
<screenlet id="addSubscriptionCommEvent" title="${uiLabelMap.PageTitleAddSubscriptionCommEvent}" collapsible="true">
<include-form name="createSubscriptionCommEvent" location="component://product/widget/catalog/SubscriptionForms.xml"/>
</screenlet>
- <include-form name="listSubscriptionCommEvent" location="component://product/widget/catalog/SubscriptionForms.xml" />
+ <include-form name="listSubscriptionCommEvent" location="component://product/widget/catalog/SubscriptionForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Tue Apr 7 08:27:15 2009
@@ -983,8 +983,8 @@
<set field="tabButtonItem" value="EditFacilityInventoryItems"/>
<set field="subTabButtonItem" value="ViewInventoryItemDetail"/>
- <set field="inventoryItemId" from-field="parameters.inventoryItemId" />
- <set field="facilityId" from-field="parameters.facilityId" />
+ <set field="inventoryItemId" from-field="parameters.inventoryItemId"/>
+ <set field="facilityId" from-field="parameters.facilityId"/>
<entity-condition entity-name="InventoryItemDetail" list="inventoryItemDetails">
<condition-list combine="and">
@@ -1038,8 +1038,8 @@
<set field="tabButtonItem" value="EditFacilityInventoryItems"/>
<set field="subTabButtonItem" value="EditInventoryItemLabels"/>
- <set field="inventoryItemId" from-field="parameters.inventoryItemId" />
- <set field="facilityId" from-field="parameters.facilityId" />
+ <set field="inventoryItemId" from-field="parameters.inventoryItemId"/>
+ <set field="facilityId" from-field="parameters.facilityId"/>
<entity-condition entity-name="InventoryItemLabelAppl" list="inventoryItemLabelAppls">
<condition-list combine="and">
Modified: ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml Tue Apr 7 08:27:15 2009
@@ -35,10 +35,10 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupFacility" location="component://product/webapp/facility/lookup/FieldLookupForms.xml" />
+ <include-form name="lookupFacility" location="component://product/webapp/facility/lookup/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupFacility" location="component://product/webapp/facility/lookup/FieldLookupForms.xml" />
+ <include-form name="listLookupFacility" location="component://product/webapp/facility/lookup/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -59,10 +59,10 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupFacilityLocation" location="component://product/webapp/facility/lookup/FieldLookupForms.xml" />
+ <include-form name="lookupFacilityLocation" location="component://product/webapp/facility/lookup/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupFacilityLocation" location="component://product/webapp/facility/lookup/FieldLookupForms.xml" />
+ <include-form name="listLookupFacilityLocation" location="component://product/webapp/facility/lookup/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -82,10 +82,10 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="lookupShipment" location="component://product/webapp/facility/lookup/FieldLookupForms.xml" />
+ <include-form name="lookupShipment" location="component://product/webapp/facility/lookup/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listShipment" location="component://product/webapp/facility/lookup/FieldLookupForms.xml" />
+ <include-form name="listShipment" location="component://product/webapp/facility/lookup/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml (original)
+++ ofbiz/trunk/applications/workeffort/data/WorkEffortPortletData.xml Tue Apr 7 08:27:15 2009
@@ -24,7 +24,7 @@
portletName="My Company Comms"
screenName="MyCompanyComms"
screenLocation="component://workeffort/widget/WorkEffortScreens.xml"
- description="My Company Comms From My Page" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" />
+ description="My Company Comms From My Page" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW"/>
<PortletPortletCategory portalPortletId="mycompanycomms" portletCategoryId="EVENTSTASKS"/>
</entity-engine-xml>
Modified: ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml (original)
+++ ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml Tue Apr 7 08:27:15 2009
@@ -224,6 +224,6 @@
<StatusValidChange condition="" statusId="WERV_PENDING" statusIdTo="WERV_DELETED" transitionName="Review Deleted"/>
<StatusValidChange condition="" statusId="WERV_APPROVED" statusIdTo="WERV_DELETED" transitionName="Review Deleted"/>
- <WebSite webSiteId="WORKEFFORT" siteName="Work Effort Manager" visualThemeSetId="BACKOFFICE" />
+ <WebSite webSiteId="WORKEFFORT" siteName="Work Effort Manager" visualThemeSetId="BACKOFFICE"/>
</entity-engine-xml>
Modified: ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml (original)
+++ ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml Tue Apr 7 08:27:15 2009
@@ -444,8 +444,8 @@
<member-entity entity-alias="WECO" entity-name="WorkEffortContent"/>
<member-entity entity-alias="CO" entity-name="Content"/>
<member-entity entity-alias="DR" entity-name="DataResource"/>
- <alias-all entity-alias="WECO" />
- <alias-all entity-alias="CO" />
+ <alias-all entity-alias="WECO"/>
+ <alias-all entity-alias="CO"/>
<alias-all entity-alias="DR" prefix="dr"/>
<view-link entity-alias="WECO" rel-entity-alias="CO" rel-optional="false">
<key-map field-name="contentId"/>
@@ -454,22 +454,22 @@
<key-map field-name="dataResourceId"/>
</view-link>
<relation type="one-nofk" rel-entity-name="ElectronicText">
- <key-map field-name="dataResourceId" />
+ <key-map field-name="dataResourceId"/>
</relation>
<relation type="one-nofk" rel-entity-name="WorkEffort">
- <key-map field-name="workEffortId" />
+ <key-map field-name="workEffortId"/>
</relation>
<relation type="one-nofk" rel-entity-name="ImageDataResource">
- <key-map field-name="dataResourceId" />
+ <key-map field-name="dataResourceId"/>
</relation>
<relation type="one-nofk" rel-entity-name="OtherDataResource">
- <key-map field-name="dataResourceId" />
+ <key-map field-name="dataResourceId"/>
</relation>
<relation type="many" rel-entity-name="ContentAssocDataResourceViewFrom">
- <key-map field-name="contentId" rel-field-name="contentIdStart" />
+ <key-map field-name="contentId" rel-field-name="contentIdStart"/>
</relation>
<relation type="many" rel-entity-name="ContentAssocDataResourceViewTo">
- <key-map field-name="contentId" rel-field-name="contentIdStart" />
+ <key-map field-name="contentId" rel-field-name="contentIdStart"/>
</relation>
<relation type="many" title="From" rel-entity-name="ContentAssoc">
<key-map field-name="contentId"/>
@@ -806,8 +806,8 @@
<member-entity entity-alias="WC" entity-name="WorkEffortContent"/>
<member-entity entity-alias="CO" entity-name="Content"/>
<member-entity entity-alias="DR" entity-name="DataResource"/>
- <alias-all entity-alias="WC" />
- <alias-all entity-alias="CO" />
+ <alias-all entity-alias="WC"/>
+ <alias-all entity-alias="CO"/>
<alias-all entity-alias="DR" prefix="dr"/>
<view-link entity-alias="WC" rel-entity-alias="CO">
<key-map field-name="contentId"/>
@@ -819,16 +819,16 @@
<key-map field-name="dataResourceId"/>
</relation>
<relation type="one-nofk" rel-entity-name="ImageDataResource">
- <key-map field-name="dataResourceId" />
+ <key-map field-name="dataResourceId"/>
</relation>
<relation type="one-nofk" rel-entity-name="OtherDataResource">
- <key-map field-name="dataResourceId" />
+ <key-map field-name="dataResourceId"/>
</relation>
<relation type="many" rel-entity-name="ContentAssocDataResourceViewFrom">
- <key-map field-name="contentId" rel-field-name="contentIdStart" />
+ <key-map field-name="contentId" rel-field-name="contentIdStart"/>
</relation>
<relation type="many" rel-entity-name="ContentAssocDataResourceViewTo">
- <key-map field-name="contentId" rel-field-name="contentIdStart" />
+ <key-map field-name="contentId" rel-field-name="contentIdStart"/>
</relation>
</view-entity>
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Tue Apr 7 08:27:15 2009
@@ -86,7 +86,7 @@
</if-compare-field>
<!-- create customer request / work effort relation -->
<make-value value-field="custRequestWorkEffort" entity-name="CustRequestWorkEffort"/>
- <set field="custRequestWorkEffort.workEffortId" from-field="newEntity.workEffortId" />
+ <set field="custRequestWorkEffort.workEffortId" from-field="newEntity.workEffortId"/>
<set field="custRequestWorkEffort.custRequestId" from-field="parameters.custRequestId"/>
<create-value value-field="custRequestWorkEffort"/>
<!-- update status of customer request -->
@@ -437,7 +437,7 @@
processor-name="postalAddress" in-map-name="parameters" out-map-name="context"/>
<call-service in-map-name="context" service-name="updatePostalAddress">
<default-message>Postal Address successfully updated</default-message>
- <result-to-field result-name="contactMechId" field="newValue.contactMechId" />
+ <result-to-field result-name="contactMechId" field="newValue.contactMechId"/>
</call-service>
<call-map-processor xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowMapProcessors.xml"
processor-name="workEffortContactMech" in-map-name="parameters" out-map-name="context2"/>
@@ -488,7 +488,7 @@
processor-name="telecomNumber" in-map-name="parameters" out-map-name="context"/>
<call-service in-map-name="context" service-name="updateTelecomNumber">
<default-message>Telecom Number successfully updated</default-message>
- <result-to-field result-name="contactMechId" field="newValue.contactMechId" />
+ <result-to-field result-name="contactMechId" field="newValue.contactMechId"/>
</call-service>
<call-map-processor xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowMapProcessors.xml"
@@ -744,9 +744,9 @@
<if-not-empty field="custRequestItem">
<set field="custRequestItemExists" value="true"/>
<field-to-result field="custRequestItemExists"/>
- <log level="always" message="custRequestItemExists: ${custRequestItemExists}" />
+ <log level="always" message="custRequestItemExists: ${custRequestItemExists}"/>
<else>
- <log level="always" message="custRequestItemExists: empty" />
+ <log level="always" message="custRequestItemExists: empty"/>
</else>
</if-not-empty>
</simple-method>
@@ -864,17 +864,17 @@
<fail-property resource="WorkEffortUiLabels" property="WorkEffortCreatePermissionError"/>
</check-permission>
<check-errors />
- <entity-one entity-name="WorkEffortFixedAssetStd" value-field="lookedUpValue" />
+ <entity-one entity-name="WorkEffortFixedAssetStd" value-field="lookedUpValue"/>
<if-not-empty field="lookedUpValue">
<add-error>
<fail-property resource="WorkEffortUiLabels" property="WorkEffortFixedAssetAlreadyExist"/>
</add-error>
<check-errors />
<else>
- <make-value entity-name="WorkEffortFixedAssetStd" value-field="newWEFixedAssetStd" />
- <set-pk-fields map="parameters" value-field="newWEFixedAssetStd" />
- <set-nonpk-fields map="parameters" value-field="newWEFixedAssetStd" />
- <create-value value-field="newWEFixedAssetStd" />
+ <make-value entity-name="WorkEffortFixedAssetStd" value-field="newWEFixedAssetStd"/>
+ <set-pk-fields map="parameters" value-field="newWEFixedAssetStd"/>
+ <set-nonpk-fields map="parameters" value-field="newWEFixedAssetStd"/>
+ <create-value value-field="newWEFixedAssetStd"/>
</else>
</if-not-empty>
</simple-method>
@@ -884,9 +884,9 @@
<fail-property resource="WorkEffortUiLabels" property="WorkEffortUpdatePermissionError"/>
</check-permission>
<check-errors />
- <entity-one entity-name="WorkEffortFixedAssetStd" value-field="lookedUpValue" />
- <set-nonpk-fields map="parameters" value-field="lookedUpValue" />
- <store-value value-field="lookedUpValue" />
+ <entity-one entity-name="WorkEffortFixedAssetStd" value-field="lookedUpValue"/>
+ <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeWorkEffortFixedAssetStd"
short-description="Delete a WorkEffort FixedAsset Standard">
@@ -894,8 +894,8 @@
<fail-property resource="WorkEffortUiLabels" property="WorkEffortDeletePermissionError"/>
</check-permission>
<check-errors />
- <entity-one entity-name="WorkEffortFixedAssetStd" value-field="lookedUpValue" />
- <remove-value value-field="lookedUpValue" />
+ <entity-one entity-name="WorkEffortFixedAssetStd" value-field="lookedUpValue"/>
+ <remove-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="createWorkEffortFixedAssetAssign"
short-description="Create a WorkEffort FixedAsset Assign">
@@ -903,28 +903,28 @@
<fail-property resource="WorkEffortUiLabels" property="WorkEffortCreatePermissionError"/>
</check-permission>
<check-errors />
- <entity-one entity-name="WorkEffortFixedAssetAssign" value-field="lookedUpValue" />
+ <entity-one entity-name="WorkEffortFixedAssetAssign" value-field="lookedUpValue"/>
<if-not-empty field="lookedUpValue">
<add-error>
<fail-property resource="WorkEffortUiLabels" property="WorkEffortFixedAssetAlreadyExist"/>
</add-error>
<else>
- <make-value entity-name="WorkEffortFixedAssetAssign" value-field="newWEFixedAssetAssign" />
- <set-pk-fields map="parameters" value-field="newWEFixedAssetAssign" />
- <set-nonpk-fields map="parameters" value-field="newWEFixedAssetAssign" />
+ <make-value entity-name="WorkEffortFixedAssetAssign" value-field="newWEFixedAssetAssign"/>
+ <set-pk-fields map="parameters" value-field="newWEFixedAssetAssign"/>
+ <set-nonpk-fields map="parameters" value-field="newWEFixedAssetAssign"/>
<!-- if the user hasn't specified a fromDate, set it from the actual start date of the task
if there is no actual start date, default to now (to the current date and time) -->
<if-empty field="parameters.fromDate">
- <entity-one entity-name="WorkEffort" value-field="prodRunTask" />
+ <entity-one entity-name="WorkEffort" value-field="prodRunTask"/>
<now-timestamp field="newWEFixedAssetAssign.fromDate"/>
<if-not-empty field="prodRunTask.estimatedStartDate">
- <set field="newWEFixedAssetAssign.fromDate" from-field="prodRunTask.estimatedStartDate" />
+ <set field="newWEFixedAssetAssign.fromDate" from-field="prodRunTask.estimatedStartDate"/>
</if-not-empty>
<if-not-empty field="prodRunTask.actualStartDate">
- <set field="newWEFixedAssetAssign.fromDate" from-field="prodRunTask.actualStartDate" />
+ <set field="newWEFixedAssetAssign.fromDate" from-field="prodRunTask.actualStartDate"/>
</if-not-empty>
</if-empty>
- <create-value value-field="newWEFixedAssetAssign" />
+ <create-value value-field="newWEFixedAssetAssign"/>
</else>
</if-not-empty>
</simple-method>
@@ -934,9 +934,9 @@
<fail-property resource="WorkEffortUiLabels" property="WorkEffortUpdatePermissionError"/>
</check-permission>
<check-errors />
- <entity-one entity-name="WorkEffortFixedAssetAssign" value-field="lookedUpValue" />
- <set-nonpk-fields map="parameters" value-field="lookedUpValue" />
- <store-value value-field="lookedUpValue" />
+ <entity-one entity-name="WorkEffortFixedAssetAssign" value-field="lookedUpValue"/>
+ <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeWorkEffortFixedAssetAssign"
short-description="Remove a WorkEffort FixedAsset Assign">
@@ -944,8 +944,8 @@
<fail-property resource="WorkEffortUiLabels" property="WorkEffortDeletePermissionError"/>
</check-permission>
<check-errors />
- <entity-one entity-name="WorkEffortFixedAssetAssign" value-field="lookedUpValue" />
- <remove-value value-field="lookedUpValue" />
+ <entity-one entity-name="WorkEffortFixedAssetAssign" value-field="lookedUpValue"/>
+ <remove-value value-field="lookedUpValue"/>
</simple-method>
<!-- Create/Update/Delete Work Effort Content-->
@@ -986,8 +986,8 @@
</check-permission>
<check-errors />
-->
- <entity-one entity-name="WorkEffortContent" value-field="lookedUpValue" />
- <remove-value value-field="lookedUpValue" />
+ <entity-one entity-name="WorkEffortContent" value-field="lookedUpValue"/>
+ <remove-value value-field="lookedUpValue"/>
</simple-method>
<!-- Create/Update/Delete Work Effort Review-->
@@ -1028,8 +1028,8 @@
<fail-property resource="WorkEffortUiLabels" property="WorkEffortDeletePermissionError"/>
</check-permission>
<check-errors />
- <entity-one entity-name="WorkEffortReview" value-field="lookedUpValue" />
- <remove-value value-field="lookedUpValue" />
+ <entity-one entity-name="WorkEffortReview" value-field="lookedUpValue"/>
+ <remove-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="indexWorkEffortKeywords" short-description="Index the Keywords for a WorkEffort" login-required="false">
@@ -1079,8 +1079,8 @@
<fail-property resource="WorkEffortUiLabels" property="WorkEffortDeletePermissionError"/>
</check-permission>
<check-errors />
- <entity-one entity-name="WorkEffortKeyword" value-field="lookedUpValue" />
- <remove-value value-field="lookedUpValue" />
+ <entity-one entity-name="WorkEffortKeyword" value-field="lookedUpValue"/>
+ <remove-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="createWorkEffortKeywords" short-description="Create all Work Effort Keyword">
Modified: ofbiz/trunk/applications/workeffort/servicedef/secas.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/servicedef/secas.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/servicedef/secas.xml (original)
+++ ofbiz/trunk/applications/workeffort/servicedef/secas.xml Tue Apr 7 08:27:15 2009
@@ -35,30 +35,30 @@
</eca>
<eca service="createCommunicationEventWorkEff" event="invoke">
<condition field-name="communicationEventId" operator="is-empty"/>
- <action service="createCommunicationEvent" mode="sync" />
+ <action service="createCommunicationEvent" mode="sync"/>
</eca>
<eca service="createWorkEffortRequest" event="invoke">
<condition field-name="custRequestId" operator="is-empty"/>
- <action service="createCustRequest" mode="sync" />
+ <action service="createCustRequest" mode="sync"/>
</eca>
<eca service="createWorkEffortRequestItem" event="invoke">
<condition field-name="custRequestItemExists" operator="is-empty"/>
- <action service="createCustRequestItem" mode="sync" />
+ <action service="createCustRequestItem" mode="sync"/>
</eca>
<eca service="createWorkEffortQuote" event="invoke">
<condition field-name="quoteId" operator="is-empty"/>
- <action service="createQuote" mode="sync" />
+ <action service="createQuote" mode="sync"/>
</eca>
<eca service="createWorkRequirementFulfillment" event="invoke">
<condition field-name="requirementId" operator="is-empty"/>
- <action service="createRequirement" mode="sync" />
+ <action service="createRequirement" mode="sync"/>
</eca>
<eca service="createShoppingListWorkEffort" event="invoke">
<condition field-name="shoppingListId" operator="is-empty"/>
- <action service="createShoppingList" mode="sync" />
+ <action service="createShoppingList" mode="sync"/>
</eca>
<eca service="createOrderHeaderWorkEffort" event="invoke">
<condition field-name="orderId" operator="is-empty"/>
- <action service="createOrderHeader" mode="sync" />
+ <action service="createOrderHeader" mode="sync"/>
</eca>
</service-eca>
Modified: ofbiz/trunk/applications/workeffort/servicedef/service_groups.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/servicedef/service_groups.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/servicedef/service_groups.xml (original)
+++ ofbiz/trunk/applications/workeffort/servicedef/service_groups.xml Tue Apr 7 08:27:15 2009
@@ -22,7 +22,7 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-group.xsd">
<group name="updateWorkEffortAndAssoc" send-mode="all" >
- <invoke name="updateWorkEffort" mode="sync" />
+ <invoke name="updateWorkEffort" mode="sync"/>
<invoke name="updateWorkEffortAssoc" mode="sync"/>
</group>
<group name="createWorkEffortRequestItemAndRequestItem" send-mode="all" >
Modified: ofbiz/trunk/applications/workeffort/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/servicedef/services.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/workeffort/servicedef/services.xml Tue Apr 7 08:27:15 2009
@@ -463,7 +463,7 @@
invoke="removeWorkEffortFixedAssetStd">
<description>Removes a WorkEffortFixedAssetStd, thus removing the association between a routing task
and a fixed asset (type)</description>
- <auto-attributes include="pk" mode="IN" optional="false" />
+ <auto-attributes include="pk" mode="IN" optional="false"/>
</service>
<service name="createWorkEffortFixedAssetAssign" engine="simple" auth="true"
default-entity-name="WorkEffortFixedAssetAssign"
@@ -471,8 +471,8 @@
invoke="createWorkEffortFixedAssetAssign">
<description>Create a WorkEffortFixedAssetAssign entry to associate a fixed asset
with a work effort (e.g. a production run task)</description>
- <auto-attributes include="pk" mode="IN" optional="false" />
- <auto-attributes include="nonpk" mode="IN" optional="true" />
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
<override name="fromDate" optional="true" mode="IN"/>
</service>
<service name="updateWorkEffortFixedAssetAssign" engine="simple" auth="true"
@@ -480,8 +480,8 @@
location="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"
invoke="updateWorkEffortFixedAssetAssign">
<description>Update an existing WorkEffortFixedAssetAssign entry</description>
- <auto-attributes include="pk" mode="IN" optional="false" />
- <auto-attributes include="nonpk" mode="IN" optional="true" />
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
<service name="removeWorkEffortFixedAssetAssign" engine="simple" auth="true"
default-entity-name="WorkEffortFixedAssetAssign"
@@ -489,7 +489,7 @@
invoke="removeWorkEffortFixedAssetAssign">
<description>Remove a WorkEffortFixedAssign entry, which removes the association between a fixed asset
and a work effort (e.g. a production run task)</description>
- <auto-attributes include="pk" mode="IN" optional="false" />
+ <auto-attributes include="pk" mode="IN" optional="false"/>
</service>
<!-- work effort content services -->
@@ -499,9 +499,9 @@
default-entity-name="WorkEffortContent" auth="true">
<description>Create a Work Effort Content</description>
<permission-service service-name="workEffortGenericPermission" main-action="UPDATE"/>
- <auto-attributes include="pk" mode="IN" optional="false" />
- <auto-attributes include="nonpk" mode="IN" optional="true" />
- <override name="fromDate" optional="true" />
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <override name="fromDate" optional="true"/>
</service>
<service name="updateWorkEffortContent" engine="simple"
location="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Tue Apr 7 08:27:15 2009
@@ -932,7 +932,7 @@
<auto-fields-service service-name="createWorkEffortNote"/>
<field name="noteId" use-when="noteId != null"><hidden/></field>
<field name="workEffortId"><hidden/></field>
- <field name="noteInfo" title="${uiLabelMap.CommonNote}"><textarea cols="70" rows="5" /></field>
+ <field name="noteInfo" title="${uiLabelMap.CommonNote}"><textarea cols="70" rows="5"/></field>
<field name="internalNote" title="${uiLabelMap.WorkEffortInternalNote}">
<drop-down no-current-selected-key="">
<option key="Y" description="${uiLabelMap.CommonYes}"/>
@@ -966,10 +966,10 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="WorkEffortContent" use-cache="true" list="workEffortContents">
- <field-map from-field="workEffortId" field-name="workEffortId" />
+ <field-map from-field="workEffortId" field-name="workEffortId"/>
</entity-and>
</actions>
- <auto-fields-service service-name="updateWorkEffortContent" default-field-type="edit" />
+ <auto-fields-service service-name="updateWorkEffortContent" default-field-type="edit"/>
<field name="workEffortId"><hidden/></field>
<field name="contentId">
<display-entity entity-name="Content" key-field-name="contentId" description="${contentName}" also-hidden="true">
@@ -1020,10 +1020,10 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="WorkEffortGoodStandard" use-cache="true" list="workEffortGoodStandards">
- <field-map from-field="workEffortId" field-name="workEffortId" />
+ <field-map from-field="workEffortId" field-name="workEffortId"/>
</entity-and>
</actions>
- <auto-fields-service service-name="updateWorkEffortGoodStandard" default-field-type="edit" />
+ <auto-fields-service service-name="updateWorkEffortGoodStandard" default-field-type="edit"/>
<field name="workEffortId"><hidden/></field>
<field name="workEffortGoodStdTypeId"><display-entity entity-name="WorkEffortGoodStandardType" description="${description}"/></field>
<field name="productId">
@@ -1077,10 +1077,10 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="WorkEffortReview" use-cache="true" list="workEffortReviews">
- <field-map from-field="workEffortId" field-name="workEffortId" />
+ <field-map from-field="workEffortId" field-name="workEffortId"/>
</entity-and>
</actions>
- <auto-fields-service service-name="updateWorkEffortReview" default-field-type="edit" />
+ <auto-fields-service service-name="updateWorkEffortReview" default-field-type="edit"/>
<field name="workEffortId" widget-style="buttontext"><hidden/></field>
<field name="userLoginId" widget-style="buttontext">
<display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}" also-hidden="true">
@@ -1120,7 +1120,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="WorkEffortKeyword" use-cache="true" list="workEffortkeywords">
- <field-map from-field="workEffortId" field-name="workEffortId" />
+ <field-map from-field="workEffortId" field-name="workEffortId"/>
</entity-and>
</actions>
<field name="workEffortId" widget-style="buttontext"><hidden/></field>
@@ -1146,7 +1146,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="WorkEffortContactMech" list="workEffortContactMechs">
- <field-map from-field="workEffortId" field-name="workEffortId" />
+ <field-map from-field="workEffortId" field-name="workEffortId"/>
</entity-and>
</actions>
<row-actions>
@@ -1183,7 +1183,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="AgreementWorkEffortAppl" use-cache="true" list="agreementWorkEffortAppls">
- <field-map from-field="workEffortId" field-name="workEffortId" />
+ <field-map from-field="workEffortId" field-name="workEffortId"/>
</entity-and>
</actions>
<field name="agreementId">
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Tue Apr 7 08:27:15 2009
@@ -398,7 +398,7 @@
<set field="labelTitleProperty" value="PageTitleEditWorkEffortAssoc"/>
<set field="workEffortIdFrom" from-field="parameters.workEffortIdFrom"/>
<entity-one entity-name="WorkEffortAssoc" value-field="workEffortAssoc"/>
- <set field="donePage" value="ChildWorkEfforts?workEffortId=${workEffortIdFrom}&trail=${workEffortIdFrom}" />
+ <set field="donePage" value="ChildWorkEfforts?workEffortId=${workEffortIdFrom}&trail=${workEffortIdFrom}"/>
</actions>
<widgets>
<decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
@@ -433,7 +433,7 @@
<set field="workEffortAssocTypeId" from-field="parameters.workEffortAssocTypeId"/>
<set field="fromDate" from-field="parameters.fromDate"/>
<entity-one entity-name="WorkEffortAssoc" value-field="workEffortAssoc"/>
- <set field="donePage" value="ChildWorkEfforts?workEffortId=${workEffortIdFrom}&trail=${workEffortIdFrom}" />
+ <set field="donePage" value="ChildWorkEfforts?workEffortId=${workEffortIdFrom}&trail=${workEffortIdFrom}"/>
</actions>
<widgets>
<decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
@@ -741,7 +741,7 @@
<actions>
<set field="titleProperty" value="PageTitleEditWorkEffortContent"/>
<set field="tabButtonItem" value="WorkEffortContents"/>
- <set field="workEffortId" from-field="parameters.workEffortId" />
+ <set field="workEffortId" from-field="parameters.workEffortId"/>
</actions>
<widgets>
<decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
@@ -761,7 +761,7 @@
<actions>
<set field="titleProperty" value="PageTitleEditWorkEffortGoodStandards"/>
<set field="tabButtonItem" value="WorkEffortGoodStandards"/>
- <set field="workEffortId" from-field="parameters.workEffortId" />
+ <set field="workEffortId" from-field="parameters.workEffortId"/>
</actions>
<widgets>
<decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
@@ -879,7 +879,7 @@
<actions>
<set field="titleProperty" value="PageTitleEditAgreementWorkEffortAppls"/>
<set field="tabButtonItem" value="WorkEffortAgreementAppls"/>
- <set field="workEffortId" from-field="parameters.workEffortId" />
+ <set field="workEffortId" from-field="parameters.workEffortId"/>
</actions>
<widgets>
<decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
@@ -950,7 +950,7 @@
<decorator-section name="body">
<screenlet>
<include-form name="newEvent"
- location="component://workeffort/widget/WorkEffortForms.xml" />
+ location="component://workeffort/widget/WorkEffortForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortShopListForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortShopListForms.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortShopListForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortShopListForms.xml Tue Apr 7 08:27:15 2009
@@ -23,7 +23,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="WorkEffortShoppingListView">
- <field-map field-name="workEffortId" />
+ <field-map field-name="workEffortId"/>
<order-by field-name="shoppingListId"/>
</entity-and>
</actions>
Modified: ofbiz/trunk/framework/appserver/templates/jboss422/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/appserver/templates/jboss422/build.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/framework/appserver/templates/jboss422/build.xml (original)
+++ ofbiz/trunk/framework/appserver/templates/jboss422/build.xml Tue Apr 7 08:27:15 2009
@@ -58,7 +58,7 @@
- - - - - - - - - - - - - - - - - -->
<target name="installDerby" depends="clean">
<!-- install derby -->
- <copy file="${r"${ofbizHome}"}/framework/entity/lib/jdbc/derby-${r"${DERBY_VERSION}"}.jar" todir="../../lib/" />
+ <copy file="${r"${ofbizHome}"}/framework/entity/lib/jdbc/derby-${r"${DERBY_VERSION}"}.jar" todir="../../lib/"/>
<!-- install derby plugin -->
<copy file="../../../../docs/examples/varia/derby-plugin.jar" todir="../../lib/"/>
@@ -71,10 +71,10 @@
</copy>
<!-- move entityengine.xml, log4j.xml and jndi.properties -->
- <move file="${r"${ofbizHome}"}/framework/entity/config/entityengine.xml" tofile="${r"${ofbizHome}"}/framework/entity/config/entityengine.xml.jbak" />
+ <move file="${r"${ofbizHome}"}/framework/entity/config/entityengine.xml" tofile="${r"${ofbizHome}"}/framework/entity/config/entityengine.xml.jbak"/>
<move file="${r"${ofbizHome}"}/framework/entity/config/entityengine-jboss422.xml" tofile="${r"${ofbizHome}"}/framework/entity/config/entityengine.xml"/>
<move file="${r"${ofbizHome}"}/framework/base/config/log4j.xml" tofile="${r"${ofbizHome}"}/framework/base/config/_log4j.xml.bak"/>
- <move file="${r"${ofbizHome}"}/framework/base/config/jndi.properties" tofile="${r"${ofbizHome}"}/framework/base/config/_jndi.properties.bak" />
+ <move file="${r"${ofbizHome}"}/framework/base/config/jndi.properties" tofile="${r"${ofbizHome}"}/framework/base/config/_jndi.properties.bak"/>
<!-- copy all lib files -->
<mkdir dir="lib"/>
@@ -128,17 +128,17 @@
<mkdir dir="META-INF"/>
<copy file="${targetDirectory}/application.xml" todir="./META-INF"></copy>
- <copy file="${r"${ofbizHome}"}/framework/base/lib/scripting/bsh-2.0b4.jar" tofile="../../lib/bsh.jar" />
+ <copy file="${r"${ofbizHome}"}/framework/base/lib/scripting/bsh-2.0b4.jar" tofile="../../lib/bsh.jar"/>
<!-- revert entityengine.xml log4j.xml and jndi.properties -->
- <move file="${r"${ofbizHome}"}/framework/entity/config/entityengine.xml" tofile="${r"${ofbizHome}"}/framework/entity/config/entityengine-jboss422.xml" />
- <move file="${r"${ofbizHome}"}/framework/entity/config/entityengine.xml.jbak" tofile="${r"${ofbizHome}"}/framework/entity/config/entityengine.xml" />
+ <move file="${r"${ofbizHome}"}/framework/entity/config/entityengine.xml" tofile="${r"${ofbizHome}"}/framework/entity/config/entityengine-jboss422.xml"/>
+ <move file="${r"${ofbizHome}"}/framework/entity/config/entityengine.xml.jbak" tofile="${r"${ofbizHome}"}/framework/entity/config/entityengine.xml"/>
- <move file="${r"${ofbizHome}"}/framework/base/config/_log4j.xml.bak" tofile="${r"${ofbizHome}"}/framework/base/config/log4j.xml" />
- <move file="${r"${ofbizHome}"}/framework/base/config/_jndi.properties.bak" tofile="${r"${ofbizHome}"}/framework/base/config/jndi.properties" />
+ <move file="${r"${ofbizHome}"}/framework/base/config/_log4j.xml.bak" tofile="${r"${ofbizHome}"}/framework/base/config/log4j.xml"/>
+ <move file="${r"${ofbizHome}"}/framework/base/config/_jndi.properties.bak" tofile="${r"${ofbizHome}"}/framework/base/config/jndi.properties"/>
<!-- setup the OFBIZ_HOME by updating run.conf -->
<move file="../../../../bin/run.conf" tofile="../../../../bin/run.conf.obak"/>
- <copy file="${r"${ofbizHome}"}/setup/jboss422/run.conf" tofile="../../../../bin/run.conf" />
+ <copy file="${r"${ofbizHome}"}/setup/jboss422/run.conf" tofile="../../../../bin/run.conf"/>
</target>
</project>
Modified: ofbiz/trunk/framework/appserver/templates/orion202/ofbiz-application.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/appserver/templates/orion202/ofbiz-application.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/framework/appserver/templates/orion202/ofbiz-application.xml (original)
+++ ofbiz/trunk/framework/appserver/templates/orion202/ofbiz-application.xml Tue Apr 7 08:27:15 2009
@@ -25,7 +25,7 @@
<web-module id="ofbizDefault" path="${env.get("ofbiz.home")}/website"/>
<#list webApps as webapp>
- <web-module id="${webapp.getName()}" path="${webapp.getLocation()}" />
+ <web-module id="${webapp.getName()}" path="${webapp.getLocation()}"/>
</#list>
<persistence path="../persistence"/>
Modified: ofbiz/trunk/framework/appserver/templates/orion202/server.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/appserver/templates/orion202/server.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/framework/appserver/templates/orion202/server.xml (original)
+++ ofbiz/trunk/framework/appserver/templates/orion202/server.xml Tue Apr 7 08:27:15 2009
@@ -25,7 +25,7 @@
>
<rmi-config path="./rmi.xml"/>
<!-- JMS-server config link, uncomment to activate the JMS service -->
- <!-- <jms-config path="./jms.xml" /> -->
+ <!-- <jms-config path="./jms.xml"/> -->
<log>
<file path="../log/server.log"/>
</log>
@@ -39,5 +39,5 @@
<!-- Compiler, activate this to specify an alternative compiler such
as jikes for EJB/JSP compiling. -->
- <!-- <compiler executable="jikes" classpath="/myjdkdir/jre/lib/rt.jar" /> -->
+ <!-- <compiler executable="jikes" classpath="/myjdkdir/jre/lib/rt.jar"/> -->
</application-server>
Modified: ofbiz/trunk/framework/appserver/templates/tomcat55/server.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/appserver/templates/tomcat55/server.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/framework/appserver/templates/tomcat55/server.xml (original)
+++ ofbiz/trunk/framework/appserver/templates/tomcat55/server.xml Tue Apr 7 08:27:15 2009
@@ -31,9 +31,9 @@
<!-- Comment these entries out to disable JMX MBeans support used for the
administration web application -->
- <Listener className="org.apache.catalina.core.AprLifecycleListener" />
- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
- <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+ <Listener className="org.apache.catalina.core.AprLifecycleListener"/>
+ <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"/>
+ <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/>
<Listener className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener"/>
<!-- Global JNDI resources -->
@@ -48,7 +48,7 @@
type="org.apache.catalina.UserDatabase"
description="User database that can be updated and saved"
factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
- pathname="conf/tomcat-users.xml" />
+ pathname="conf/tomcat-users.xml"/>
</GlobalNamingResources>
@@ -94,7 +94,7 @@
<Connector port="8080" maxHttpHeaderSize="8192"
maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
enableLookups="false" redirectPort="8443" acceptCount="100"
- connectionTimeout="20000" disableUploadTimeout="true" />
+ connectionTimeout="20000" disableUploadTimeout="true"/>
<!-- Note : To disable connection timeouts, set connectionTimeout value
to 0 -->
@@ -117,7 +117,7 @@
<!-- Define an AJP 1.3 Connector on port 8009 -->
<Connector port="8009"
- enableLookups="false" redirectPort="8443" protocol="AJP/1.3" />
+ enableLookups="false" redirectPort="8443" protocol="AJP/1.3"/>
<!-- Define a Proxied HTTP/1.1 Connector on port 8082 -->
<!-- See proxy documentation for more information about using this. -->
@@ -125,7 +125,7 @@
<Connector port="8082"
maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
enableLookups="false" acceptCount="100" connectionTimeout="20000"
- proxyPort="80" disableUploadTimeout="true" />
+ proxyPort="80" disableUploadTimeout="true"/>
-->
<!-- An Engine represents the entry point (within Catalina) that processes
@@ -178,7 +178,7 @@
<!-- Comment out the old realm but leave here for now in case we
need to go back quickly -->
<!--
- <Realm className="org.apache.catalina.realm.MemoryRealm" />
+ <Realm className="org.apache.catalina.realm.MemoryRealm"/>
-->
<!-- Replace the above Realm with one of the following to get a Realm
@@ -190,7 +190,7 @@
connectionURL="jdbc:mysql://localhost/authority"
connectionName="test" connectionPassword="test"
userTable="users" userNameCol="user_name" userCredCol="user_pass"
- userRoleTable="user_roles" roleNameCol="role_name" />
+ userRoleTable="user_roles" roleNameCol="role_name"/>
-->
<!--
@@ -199,7 +199,7 @@
connectionURL="jdbc:oracle:thin:@ntserver:1521:ORCL"
connectionName="scott" connectionPassword="tiger"
userTable="users" userNameCol="user_name" userCredCol="user_pass"
- userRoleTable="user_roles" roleNameCol="role_name" />
+ userRoleTable="user_roles" roleNameCol="role_name"/>
-->
<!--
@@ -207,7 +207,7 @@
driverName="sun.jdbc.odbc.JdbcOdbcDriver"
connectionURL="jdbc:odbc:CATALINA"
userTable="users" userNameCol="user_name" userCredCol="user_pass"
- userRoleTable="user_roles" roleNameCol="role_name" />
+ userRoleTable="user_roles" roleNameCol="role_name"/>
-->
<!-- Define the default virtual host
@@ -353,7 +353,7 @@
user identity maintained across *all* web applications contained
in this virtual host. -->
<!--
- <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+ <Valve className="org.apache.catalina.authenticator.SingleSignOn"/>
-->
<!-- Access log processes all requests for this virtual host. By
Modified: ofbiz/trunk/framework/appserver/templates/tomcat6/server.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/appserver/templates/tomcat6/server.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/framework/appserver/templates/tomcat6/server.xml (original)
+++ ofbiz/trunk/framework/appserver/templates/tomcat6/server.xml Tue Apr 7 08:27:15 2009
@@ -22,12 +22,12 @@
<Server port="8005" shutdown="SHUTDOWN">
<!--APR library loader. Documentation at /docs/apr.html -->
- <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+ <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on"/>
<!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
- <Listener className="org.apache.catalina.core.JasperListener" />
+ <Listener className="org.apache.catalina.core.JasperListener"/>
<!-- JMX Support for the Tomcat server. Documentation at /docs/non-existent.html -->
- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
- <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+ <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"/>
+ <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/>
<!-- Global JNDI resources
Documentation at /docs/jndi-resources-howto.html
@@ -40,7 +40,7 @@
type="org.apache.catalina.UserDatabase"
description="User database that can be updated and saved"
factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
- pathname="conf/tomcat-users.xml" />
+ pathname="conf/tomcat-users.xml"/>
</GlobalNamingResources>
<!-- A "Service" is a collection of one or more "Connectors" that share
@@ -66,13 +66,13 @@
-->
<Connector port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
- redirectPort="8443" />
+ redirectPort="8443"/>
<!-- A "Connector" using the shared thread pool-->
<!--
<Connector executor="tomcatThreadPool"
port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
- redirectPort="8443" />
+ redirectPort="8443"/>
-->
<!-- Define a SSL HTTP/1.1 Connector on port 8443
This connector uses the JSSE configuration, when using APR, the
@@ -85,7 +85,7 @@
keystorePass="changeit"/>
<!-- Define an AJP 1.3 Connector on port 8009 -->
- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
+ <Connector port="8009" protocol="AJP/1.3" redirectPort="8443"/>
<!-- An Engine represents the entry point (within Catalina) that processes
@@ -130,7 +130,7 @@
<!-- SingleSignOn valve, share authentication between web applications
Documentation at: /docs/config/valve.html -->
<!--
- <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+ <Valve className="org.apache.catalina.authenticator.SingleSignOn"/>
-->
<!-- Access log processes all example.
Modified: ofbiz/trunk/framework/base/config/antisamy-esapi.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/antisamy-esapi.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/antisamy-esapi.xml (original)
+++ ofbiz/trunk/framework/base/config/antisamy-esapi.xml Tue Apr 7 08:27:15 2009
@@ -438,18 +438,18 @@
<entity name="hearts" cdata="&#9829;"/> <!--black heart suit = valentine, U+2665 ISOpub -->
<entity name="diams" cdata="&#9830;"/> <!--black diamond suit, U+2666 ISOpub -->
- <entity name="quot" cdata="&#34;" /> <!--quotation mark = APL quote, U+0022 ISOnum -->
+ <entity name="quot" cdata="&#34;"/> <!--quotation mark = APL quote, U+0022 ISOnum -->
<!-- Latin Extended-A -->
- <entity name="OElig" cdata="&#338;" /> <!--latin capital ligature OE, U+0152 ISOlat2 -->
- <entity name="oelig" cdata="&#339;" /> <!--latin small ligature oe, U+0153 ISOlat2 -->
+ <entity name="OElig" cdata="&#338;"/> <!--latin capital ligature OE, U+0152 ISOlat2 -->
+ <entity name="oelig" cdata="&#339;"/> <!--latin small ligature oe, U+0153 ISOlat2 -->
<!-- ligature is a misnomer, this is a separate character in some languages -->
- <entity name="Scaron" cdata="&#352;" /> <!--latin capital letter S with caron, U+0160 ISOlat2 -->
- <entity name="scaron" cdata="&#353;" /> <!--latin small letter s with caron, U+0161 ISOlat2 -->
- <entity name="Yuml" cdata="&#376;" /> <!--latin capital letter Y with diaeresis, U+0178 ISOlat2 -->
+ <entity name="Scaron" cdata="&#352;"/> <!--latin capital letter S with caron, U+0160 ISOlat2 -->
+ <entity name="scaron" cdata="&#353;"/> <!--latin small letter s with caron, U+0161 ISOlat2 -->
+ <entity name="Yuml" cdata="&#376;"/> <!--latin capital letter Y with diaeresis, U+0178 ISOlat2 -->
<!-- Spacing Modifier Letters -->
- <entity name="circ" cdata="&#710;" /> <!--modifier letter circumflex accent, U+02C6 ISOpub -->
- <entity name="tilde" cdata="&#732;" /> <!--small tilde, U+02DC ISOdia -->
+ <entity name="circ" cdata="&#710;"/> <!--modifier letter circumflex accent, U+02C6 ISOpub -->
+ <entity name="tilde" cdata="&#732;"/> <!--small tilde, U+02DC ISOdia -->
<!-- General Punctuation -->
<entity name="ensp" cdata="&#8194;"/> <!--en space, U+2002 ISOpub -->
@@ -474,6 +474,6 @@
<!-- lsaquo is proposed but not yet ISO standardized -->
<entity name="rsaquo" cdata="&#8250;"/> <!--single right-pointing angle quotation mark, U+203A ISO proposed -->
<!-- rsaquo is proposed but not yet ISO standardized -->
- <entity name="euro" cdata="&#8364;" /> <!--euro sign, U+20AC NEW -->
+ <entity name="euro" cdata="&#8364;"/> <!--euro sign, U+20AC NEW -->
</html-entities>
</anti-samy-rules>
Modified: ofbiz/trunk/framework/base/config/log4j.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/log4j.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/log4j.xml (original)
+++ ofbiz/trunk/framework/base/config/log4j.xml Tue Apr 7 08:27:15 2009
@@ -45,9 +45,9 @@
<!-- ofbiz file appender -->
<appender name="ofbiz-file" class="org.apache.log4j.RollingFileAppender">
- <param name="maxFileSize" value="1000KB" />
- <param name="maxBackupIndex" value="10" />
- <param name="File" value="runtime/logs/ofbiz.log" />
+ <param name="maxFileSize" value="1000KB"/>
+ <param name="maxBackupIndex" value="10"/>
+ <param name="File" value="runtime/logs/ofbiz.log"/>
<param name="threshold" value="info"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d (%t) [%24F:%-3L:%-5p]%x %m%n"/>
@@ -56,9 +56,9 @@
<!-- ofbiz web file appender -->
<appender name="ofbiz-html" class="org.apache.log4j.RollingFileAppender">
- <param name="maxFileSize" value="500KB" />
- <param name="maxBackupIndex" value="1" />
- <param name="File" value="runtime/logs/ofbiz.html" />
+ <param name="maxFileSize" value="500KB"/>
+ <param name="maxBackupIndex" value="1"/>
+ <param name="File" value="runtime/logs/ofbiz.html"/>
<param name="threshold" value="info"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="<div class=%p>%d (%t) [%24F:%-3L:%-5p]%x %m </div>%n"/>
@@ -67,9 +67,9 @@
<!-- debug log -->
<appender name="debug" class="org.apache.log4j.RollingFileAppender">
- <param name="maxFileSize" value="10000KB" />
- <param name="maxBackupIndex" value="10" />
- <param name="File" value="runtime/logs/debug.log" />
+ <param name="maxFileSize" value="10000KB"/>
+ <param name="maxBackupIndex" value="10"/>
+ <param name="File" value="runtime/logs/debug.log"/>
<param name="Append" value="false"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d (%t) [%24F:%-3L:%-5p]%x %m%n"/>
@@ -83,9 +83,9 @@
<!-- error log -->
<appender name="error" class="org.apache.log4j.RollingFileAppender">
- <param name="maxFileSize" value="10000KB" />
- <param name="maxBackupIndex" value="10" />
- <param name="File" value="runtime/logs/error.log" />
+ <param name="maxFileSize" value="10000KB"/>
+ <param name="maxBackupIndex" value="10"/>
+ <param name="File" value="runtime/logs/error.log"/>
<param name="Append" value="false"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d (%t) [%24F:%-3L:%-5p]%x %m%n"/>
@@ -99,9 +99,9 @@
<!-- special minerva log -->
<appender name="minerva-log" class="org.apache.log4j.RollingFileAppender">
- <param name="maxFileSize" value="5000KB" />
- <param name="maxBackupIndex" value="10" />
- <param name="File" value="runtime/logs/minerva.log" />
+ <param name="maxFileSize" value="5000KB"/>
+ <param name="maxBackupIndex" value="10"/>
+ <param name="File" value="runtime/logs/minerva.log"/>
<param name="Append" value="false"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d (%t) [%24F:%-3L:%-5p]%x %m%n"/>
@@ -116,11 +116,11 @@
<!-- fatal error SMTP notification -->
<appender name="email" class="org.apache.log4j.net.SMTPAppender">
<param name="threshold" value="fatal"/>
- <param name="BufferSize" value="512" />
- <param name="SMTPHost" value="localhost" />
- <param name="From" value="ofbiz-error@localhost" />
- <param name="To" value="neo@foobar.com" /> <!-- at least change this field! -->
- <param name="Subject" value="[OFBiz-Notify] Application message" />
+ <param name="BufferSize" value="512"/>
+ <param name="SMTPHost" value="localhost"/>
+ <param name="From" value="ofbiz-error@localhost"/>
+ <param name="To" value="neo@foobar.com"/> <!-- at least change this field! -->
+ <param name="Subject" value="[OFBiz-Notify] Application message"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d (%t) [%24F:%-3L:%-5p]%x %m%n"/>
</layout>
@@ -128,9 +128,9 @@
<!-- special fop log -->
<appender name="fop-log" class="org.apache.log4j.RollingFileAppender">
- <param name="maxFileSize" value="5000KB" />
- <param name="maxBackupIndex" value="10" />
- <param name="File" value="runtime/logs/fop.log" />
+ <param name="maxFileSize" value="5000KB"/>
+ <param name="maxBackupIndex" value="10"/>
+ <param name="File" value="runtime/logs/fop.log"/>
<param name="Append" value="false"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d (%t) [%24F:%-3L:%-5p]%x %m%n"/>
Modified: ofbiz/trunk/framework/common/data/CommonTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/CommonTypeData.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/data/CommonTypeData.xml (original)
+++ ofbiz/trunk/framework/common/data/CommonTypeData.xml Tue Apr 7 08:27:15 2009
@@ -132,7 +132,7 @@
<VisualThemeResource visualThemeId="DEFAULT" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/webcommon/includes/messages.ftl" sequenceId="01"/>
<VisualThemeResource visualThemeId="DEFAULT" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/images/default-screenshot.gif" sequenceId="01"/>
- <WebSite webSiteId="WEBTOOLS" siteName="Web Tools" visualThemeSetId="BACKOFFICE" />
+ <WebSite webSiteId="WEBTOOLS" siteName="Web Tools" visualThemeSetId="BACKOFFICE"/>
<!-- Uom Conversion Purposes -->
<EnumerationType enumTypeId="CONVERSION_PURPOSE" description="Conversion Purpose"/>
Modified: ofbiz/trunk/framework/common/data/GeoData_BR.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/GeoData_BR.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/data/GeoData_BR.xml (original)
+++ ofbiz/trunk/framework/common/data/GeoData_BR.xml Tue Apr 7 08:27:15 2009
@@ -47,30 +47,30 @@
<Geo abbreviation="SP" geoCode="SP" geoId="BR-SP" geoName="São Paulo" geoTypeId="STATE"/>
<Geo abbreviation="TO" geoCode="TO" geoId="BR-TO" geoName="Tocantins" geoTypeId="STATE"/>
- <GeoAssoc geoId="BRA" geoIdTo="BR-AL" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="BRA" geoIdTo="BR-AM" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="BRA" geoIdTo="BR-AP" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="BRA" geoIdTo="BR-BA" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="BRA" geoIdTo="BR-CE" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="BRA" geoIdTo="BR-DF" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="BRA" geoIdTo="BR-ES" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="BRA" geoIdTo="BR-GO" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="BRA" geoIdTo="BR-MA" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="BRA" geoIdTo="BR-MG" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="BRA" geoIdTo="BR-MS" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="BRA" geoIdTo="BR-MT" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="BRA" geoIdTo="BR-PA" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="BRA" geoIdTo="BR-PB" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="BRA" geoIdTo="BR-PE" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="BRA" geoIdTo="BR-PI" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="BRA" geoIdTo="BR-PR" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="BRA" geoIdTo="BR-RJ" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="BRA" geoIdTo="BR-RN" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="BRA" geoIdTo="BR-RO" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="BRA" geoIdTo="BR-RR" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="BRA" geoIdTo="BR-RS" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="BRA" geoIdTo="BR-SC" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="BRA" geoIdTo="BR-SE" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="BRA" geoIdTo="BR-SP" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="BRA" geoIdTo="BR-TO" geoAssocTypeId="REGIONS" />
+ <GeoAssoc geoId="BRA" geoIdTo="BR-AL" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="BRA" geoIdTo="BR-AM" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="BRA" geoIdTo="BR-AP" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="BRA" geoIdTo="BR-BA" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="BRA" geoIdTo="BR-CE" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="BRA" geoIdTo="BR-DF" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="BRA" geoIdTo="BR-ES" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="BRA" geoIdTo="BR-GO" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="BRA" geoIdTo="BR-MA" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="BRA" geoIdTo="BR-MG" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="BRA" geoIdTo="BR-MS" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="BRA" geoIdTo="BR-MT" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="BRA" geoIdTo="BR-PA" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="BRA" geoIdTo="BR-PB" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="BRA" geoIdTo="BR-PE" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="BRA" geoIdTo="BR-PI" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="BRA" geoIdTo="BR-PR" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="BRA" geoIdTo="BR-RJ" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="BRA" geoIdTo="BR-RN" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="BRA" geoIdTo="BR-RO" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="BRA" geoIdTo="BR-RR" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="BRA" geoIdTo="BR-RS" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="BRA" geoIdTo="BR-SC" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="BRA" geoIdTo="BR-SE" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="BRA" geoIdTo="BR-SP" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="BRA" geoIdTo="BR-TO" geoAssocTypeId="REGIONS"/>
</entity-engine-xml>
Modified: ofbiz/trunk/framework/common/data/GeoData_NL.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/GeoData_NL.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/data/GeoData_NL.xml (original)
+++ ofbiz/trunk/framework/common/data/GeoData_NL.xml Tue Apr 7 08:27:15 2009
@@ -35,18 +35,18 @@
<Geo abbreviation="ZL" geoCode="ZL" geoId="NL-ZL" geoName="Zeeland" geoTypeId="PROVINCE"/>
- <GeoAssoc geoId="NLD" geoIdTo="NL-DR" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="NLD" geoIdTo="NL-FL" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="NLD" geoIdTo="NL-FR" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="NLD" geoIdTo="NL-GL" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="NLD" geoIdTo="NL-GR" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="NLD" geoIdTo="NL-LB" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="NLD" geoIdTo="NL-NB" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="NLD" geoIdTo="NL-NH" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="NLD" geoIdTo="NL-OV" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="NLD" geoIdTo="NL-UT" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="NLD" geoIdTo="NL-ZE" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="NLD" geoIdTo="NL-ZH" geoAssocTypeId="REGIONS" />
- <GeoAssoc geoId="NLD" geoIdTo="NL-ZL" geoAssocTypeId="REGIONS" />
+ <GeoAssoc geoId="NLD" geoIdTo="NL-DR" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="NLD" geoIdTo="NL-FL" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="NLD" geoIdTo="NL-FR" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="NLD" geoIdTo="NL-GL" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="NLD" geoIdTo="NL-GR" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="NLD" geoIdTo="NL-LB" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="NLD" geoIdTo="NL-NB" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="NLD" geoIdTo="NL-NH" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="NLD" geoIdTo="NL-OV" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="NLD" geoIdTo="NL-UT" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="NLD" geoIdTo="NL-ZE" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="NLD" geoIdTo="NL-ZH" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="NLD" geoIdTo="NL-ZL" geoAssocTypeId="REGIONS"/>
</entity-engine-xml>
Modified: ofbiz/trunk/framework/common/entitydef/entitygroup_olap.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/entitydef/entitygroup_olap.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/entitydef/entitygroup_olap.xml (original)
+++ ofbiz/trunk/framework/common/entitydef/entitygroup_olap.xml Tue Apr 7 08:27:15 2009
@@ -24,6 +24,6 @@
<!-- ========================================================= -->
<!-- Dimensions -->
<!-- ========================================================= -->
- <entity-group group="org.ofbiz.olap" entity="CurrencyDimension" />
- <entity-group group="org.ofbiz.olap" entity="DateDimension" />
+ <entity-group group="org.ofbiz.olap" entity="CurrencyDimension"/>
+ <entity-group group="org.ofbiz.olap" entity="DateDimension"/>
</entitygroup>