svn commit: r757644 - in /ofbiz/trunk: applications/accounting/script/org/ofbiz/accounting/period/ applications/accounting/servicedef/ applications/accounting/src/org/ofbiz/accounting/period/ applications/party/script/org/ofbiz/party/ applications/part...

[jonesde]

Author: jonesde
Date: Tue Mar 24 03:44:59 2009
New Revision: 757644

URL: http://svn.apache.org/viewvc?rev=757644&view=rev
Log:
Moved some party dependent services out of the framework

Added:
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/period/
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/period/PeriodServices.xml
      - copied unchanged from r757637, ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml
    ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/period/
    ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/period/PeriodServices.java
      - copied, changed from r757637, ofbiz/trunk/framework/common/src/org/ofbiz/common/period/PeriodServices.java
    ofbiz/trunk/applications/party/script/org/ofbiz/party/LookupServices.xml
      - copied unchanged from r757637, ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml
Removed:
    ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml
    ofbiz/trunk/framework/common/script/org/ofbiz/common/period/
    ofbiz/trunk/framework/common/src/org/ofbiz/common/period/PeriodServices.java
Modified:
    ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml
    ofbiz/trunk/applications/party/servicedef/services.xml
    ofbiz/trunk/framework/common/servicedef/services.xml
    ofbiz/trunk/framework/common/webcommon/includes/header.ftl

Modified: ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml?rev=757644&r1=757643&r2=757644&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml Tue Mar 24 03:44:59 2009
@@ -544,4 +544,28 @@
         <description>Delete an existing General Ledger Account of a Party</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>        
     </service>
-</services>
\ No newline at end of file
+
+    <!-- CustomTimePeriod Services -->
+    <service name="findCustomTimePeriods" engine="simple"
+        location="component://accounting/script/org/ofbiz/accounting/period/PeriodServices.xml" invoke="findCustomTimePeriods" auth="true">
+        <description>Find CustomTimePeriod records, returns both general ones and those for the organizationPartyId passed</description>
+        <attribute name="findDate" type="Timestamp" mode="IN" optional="false"/>
+        <attribute name="organizationPartyId" type="String" mode="IN" optional="true"/>
+        <attribute name="excludeNoOrganizationPeriods" type="String" mode="IN" optional="true"/>
+        <attribute name="onlyIncludePeriodTypeIdList" type="List" mode="IN" optional="true"/>
+        <attribute name="customTimePeriodList" type="List" mode="OUT" optional="true"/>
+    </service>
+    <service name="findLastClosedDate" engine="java"
+        location="org.ofbiz.accounting.period.PeriodServices" invoke="findLastClosedDate" auth="true">
+        <description>Find the last date before findDate whose TimePeriod is marked isClosed="Y" for organizationPartyId and periodTypeId combination.
+            If none are found, ie, no closed CustomTimePeriod exists, then return the earliest date available for any
+            CustomTimePeriod of the organizationPartyId and periodTypeId.
+            If no findDate is given, then use the current moment (nowTimestamp).
+        </description>
+        <attribute name="organizationPartyId" type="String" mode="IN" optional="true"/>
+        <attribute name="findDate" type="Timestamp" mode="IN" optional="true"/>
+        <attribute name="periodTypeId" type="String" mode="IN" optional="true"/>
+        <attribute name="lastClosedDate" type="Timestamp" mode="OUT" optional="true"/>
+        <attribute name="lastClosedTimePeriod" type="org.ofbiz.entity.GenericValue" mode="OUT" optional="true"/>
+    </service>
+</services>

Copied: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/period/PeriodServices.java (from r757637, ofbiz/trunk/framework/common/src/org/ofbiz/common/period/PeriodServices.java)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/period/PeriodServices.java?p2=ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/period/PeriodServices.java&p1=ofbiz/trunk/framework/common/src/org/ofbiz/common/period/PeriodServices.java&r1=757637&r2=757644&rev=757644&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/period/PeriodServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/period/PeriodServices.java Tue Mar 24 03:44:59 2009
@@ -17,7 +17,7 @@
  * under the License.
  *******************************************************************************/
 
-package org.ofbiz.common.period;
+package org.ofbiz.accounting.period;
 
 import java.sql.Timestamp;
 import java.util.List;

Modified: ofbiz/trunk/applications/party/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/servicedef/services.xml?rev=757644&r1=757643&r2=757644&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/party/servicedef/services.xml Tue Mar 24 03:44:59 2009
@@ -24,7 +24,7 @@
     <vendor>OFBiz</vendor>
     <version>1.0</version>
 
-    <!-- Party services -->
+    <!-- AddressMatchMap services -->
     <service name="createAddressMatchMap" engine="simple" default-entity-name="AddressMatchMap" auth="true"
             location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="createAddressMatchMap">
         <description>Create an AddressMatchMap record</description>
@@ -52,6 +52,7 @@
         <permission-service service-name="partyBasePermissionCheck" main-action="DELETE"/>
     </service>
 
+    <!-- Party services -->
     <service name="deleteParty" engine="java"
             location="org.ofbiz.party.party.PartyServices" invoke="deleteParty" auth="true">
         <description>Delete a Party</description>
@@ -234,6 +235,14 @@
         <attribute name="partyIdTo" type="String" mode="IN" optional="false"/>
     </service>
 
+    <service name="lookupParty" engine="simple"
+        location="component://party/script/org/ofbiz/party/LookupServices.xml" invoke="lookupParty" auth="true">
+        <description>Performs a lookup for parties</description>
+        <attribute name="firstName" type="String" form-display="true" form-label="First name" mode="IN" optional="true"/>
+        <attribute name="lastName" type="String" form-display="true" form-label="Last name" mode="IN" optional="true"/>
+        <attribute name="lookupResult" type="List" mode="OUT" optional="false"/>
+    </service>
+    
     <!-- Party Role services -->
     <service name="createPartyRole" engine="simple"
             location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="createPartyRole" auth="true">

Modified: ofbiz/trunk/framework/common/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/servicedef/services.xml?rev=757644&r1=757643&r2=757644&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/servicedef/services.xml (original)
+++ ofbiz/trunk/framework/common/servicedef/services.xml Tue Mar 24 03:44:59 2009
@@ -174,29 +174,6 @@
         <auto-attributes mode="IN" include="pk" optional="false"/>
     </service>
 
-    <service name="findCustomTimePeriods" engine="simple"
-            location="component://common/script/org/ofbiz/common/period/PeriodServices.xml" invoke="findCustomTimePeriods" auth="true">
-        <description>Find CustomTimePeriod records, returns both general ones and those for the organizationPartyId passed</description>
-        <attribute name="findDate" type="Timestamp" mode="IN" optional="false"/>
-        <attribute name="organizationPartyId" type="String" mode="IN" optional="true"/>
-        <attribute name="excludeNoOrganizationPeriods" type="String" mode="IN" optional="true"/>
-        <attribute name="onlyIncludePeriodTypeIdList" type="List" mode="IN" optional="true"/>
-        <attribute name="customTimePeriodList" type="List" mode="OUT" optional="true"/>
-    </service>
-    <service name="findLastClosedDate" engine="java"
-            location="org.ofbiz.common.period.PeriodServices" invoke="findLastClosedDate" auth="true">
-        <description>Find the last date before findDate whose TimePeriod is marked isClosed="Y" for organizationPartyId and periodTypeId combination.
-            If none are found, ie, no closed CustomTimePeriod exists, then return the earliest date available for any
-            CustomTimePeriod of the organizationPartyId and periodTypeId.
-            If no findDate is given, then use the current moment (nowTimestamp).
-        </description>
-        <attribute name="organizationPartyId" type="String" mode="IN" optional="true"/>
-        <attribute name="findDate" type="Timestamp" mode="IN" optional="true"/>
-        <attribute name="periodTypeId" type="String" mode="IN" optional="true"/>
-        <attribute name="lastClosedDate" type="Timestamp" mode="OUT" optional="true"/>
-        <attribute name="lastClosedTimePeriod" type="org.ofbiz.entity.GenericValue" mode="OUT" optional="true"/>
-    </service>
-
     <!-- Status services -->
     <service name="getStatusItems" engine="java"
             location="org.ofbiz.common.status.StatusServices" invoke="getStatusItems" auth="false">
@@ -212,14 +189,6 @@
     </service>
 
     <!-- Lookup services -->
-    <service name="lookupParty" engine="simple"
-            location="component://common/script/org/ofbiz/common/LookupServices.xml" invoke="lookupParty" auth="true">
-        <description>Performs a lookup for parties</description>
-        <attribute name="firstName" type="String" form-display="true" form-label="First name" mode="IN" optional="true"/>
-        <attribute name="lastName" type="String" form-display="true" form-label="Last name" mode="IN" optional="true"/>
-        <attribute name="lookupResult" type="List" mode="OUT" optional="false"/>
-    </service>
-
     <service name="prepareFind" auth="false" engine="java" invoke="prepareFind" location="org.ofbiz.common.FindServices">
         <description>Generic service to return a entity conditions</description>
         <attribute name="entityName" type="String" mode="IN" optional="false"/>

Modified: ofbiz/trunk/framework/common/webcommon/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/header.ftl?rev=757644&r1=757643&r2=757644&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/header.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/header.ftl Tue Mar 24 03:44:59 2009
@@ -18,9 +18,6 @@
 under the License.
 -->
 
-<#if (requestAttributes.person)?exists><#assign person = requestAttributes.person></#if>
-<#if (requestAttributes.partyGroup)?exists><#assign partyGroup = requestAttributes.partyGroup></#if>
-
 <#assign docLangAttr = locale.toString()?replace("_", "-")>
 <#assign langDir = "ltr">
 <#if "ar.iw"?contains(docLangAttr?substring(0, 2))>