[OFBiz] SVN: r7247 - in trunk/applications/accounting: webapp/accounting webapp/accounting/WEB-INF widget

[jonesde@svn.ofbiz.org]

Author: jonesde
Date: 2006-04-08 12:17:13 -0500 (Sat, 08 Apr 2006)
New Revision: 7247

Removed:
   trunk/applications/accounting/webapp/accounting/WEB-INF/jpublish.xml
   trunk/applications/accounting/webapp/accounting/WEB-INF/pagedefs/
   trunk/applications/accounting/webapp/accounting/templates/
Modified:
   trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
   trunk/applications/accounting/widget/AccountingScreens.xml
Log:
Finished clearing out JPublish stuff from the accounting component; bye bye

Modified: trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
===================================================================
--- trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml	2006-04-08 16:44:01 UTC (rev 7246)
+++ trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml	2006-04-08 17:17:13 UTC (rev 7247)
@@ -1065,8 +1065,9 @@
     <view-map name="AssignGlAccount" type="screen" page="component://accounting/widget/AccountingScreens.xml#AssignGlAccount"/>
  
     <view-map name="EditGlobalGlAccount" type="screen" page="component://accounting/widget/AccountingScreens.xml#AddGlAccount"/>
-    <view-map name="EditGlobalGlAccountOrganizations" type="jpublish" page="/chartofaccounts/EditGlobalGlAccountOrganizations.ftl"/>
-    <view-map name="EditGlobalGlAccountRoles" type="jpublish" page="/chartofaccounts/EditGlobalGlAccountRoles.ftl"/>
+    <!-- NOTE/TODO: these 2 appear to never have been implemented all the way, just request and view defs so far... -->
+    <view-map name="EditGlobalGlAccountOrganizations" type="screen" page="component://accounting/widget/AccountingScreens.xml#EditGlobalGlAccountOrganizations"/>
+    <view-map name="EditGlobalGlAccountRoles" type="screen" page="component://accounting/widget/AccountingScreens.xml#EditGlobalGlAccountRoles"/>
 
     <view-map name="AccountActivitiesDetail" type="screen" page="component://accounting/widget/AccountingScreens.xml#AccountActivitiesDetail"/>
     <view-map name="ListGlAccountEntries" type="screen" page="component://accounting/widget/AccountingScreens.xml#ListGlAccountEntries"/>

Deleted: trunk/applications/accounting/webapp/accounting/WEB-INF/jpublish.xml
===================================================================
--- trunk/applications/accounting/webapp/accounting/WEB-INF/jpublish.xml	2006-04-08 16:44:01 UTC (rev 7246)
+++ trunk/applications/accounting/webapp/accounting/WEB-INF/jpublish.xml	2006-04-08 17:17:13 UTC (rev 7247)
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-
-<jpublish>
-    <name>OFBiz Accounts Manager</name>		
-    
-    <!-- Define the root paths for pages/actions/templates -->
-    <page-root>WEB-INF/pagedefs</page-root>
-    <template-root>templates</template-root>
-    <action-root>WEB-INF/actions</action-root>
-	    
-    <!-- Define the view renderer as the OFBiz GenericViewRenderer -->
-    <view-renderer classname="org.ofbiz.webapp.ftl.FreeMarkerViewRenderer"/>
-    	
-    <!-- Define the default filesystem repository as the Extended repo -->			
-    <repository name="pages" classname="org.jpublish.repository.filesystem.ExtendedFileSystemRepository">        
-        <config-dir>WEB-INF/pagedefs</config-dir>
-        <root>.</root>
-    </repository>
-    <repository name="common" classname="org.jpublish.repository.filesystem.ExtendedFileSystemRepository">
-        <config-dir>WEB-INF/pagedefs</config-dir>
-        <root>../../../../framework/common/webcommon</root>
-    </repository>
-
-    <!-- Define the global ENV setup action -->
-    <global-action name="/includes/envsetup.bsh"/>
-    
-    <!-- Define the character encoding map -->
-    <character-encoding-map path="*">
-        <page-encoding>UTF-8</page-encoding>
-        <template-encoding>UTF-8</template-encoding>
-        <request-encoding>UTF-8</request-encoding>
-        <response-encoding>UTF-8</response-encoding>
-    </character-encoding-map>
-    
-    <!-- Define mime types -->
-    <mime-mapping ext="txt" mimetype="text/plain"/>
-    <mime-mapping ext="ftl" mimetype="text/html"/>
-    <mime-mapping ext="htm" mimetype="text/html"/>
-    <mime-mapping ext="html" mimetype="text/html"/>
-    <mime-mapping ext="gif" mimetype="image/gif"/>
-    <mime-mapping ext="jpg" mimetype="image/jpeg"/>
-    <mime-mapping ext="jpeg" mimetype="image/jpeg"/>    
-	
-    <!-- enable JPublish debugging -->
-    <!-- <debug>true</debug> -->
-
-</jpublish>

Modified: trunk/applications/accounting/widget/AccountingScreens.xml
===================================================================
--- trunk/applications/accounting/widget/AccountingScreens.xml	2006-04-08 16:44:01 UTC (rev 7246)
+++ trunk/applications/accounting/widget/AccountingScreens.xml	2006-04-08 17:17:13 UTC (rev 7247)
@@ -290,12 +290,11 @@
             </widgets>
         </section>
     </screen>
-
     <screen name="GlAccountDetail">
         <section>
             <actions>
                 <entity-one entity-name="GlAccount" value-name="currentValue" use-cache="true">
-                    <field-map env-name="glAccountId" />
+                    <field-map field-name="glAccountId"/>
                 </entity-one>
             </actions>
             <widgets>