svn commit: r525960 - in /ofbiz/trunk/framework: example/webapp/example/WEB-INF/controller.xml example/webapp/example/WEB-INF/web.xml example/widget/example/ExampleFeatureForms.xml example/widget/example/ExampleForms.xml security/data/SecurityData.xml

[jonesde]

Author: jonesde
Date: Thu Apr  5 14:16:55 2007
New Revision: 525960

URL: http://svn.apache.org/viewvc?view=rev&rev=525960
Log:
A few cleanups, nothing major and no real functionality changes

Modified:
    ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml
    ofbiz/trunk/framework/example/webapp/example/WEB-INF/web.xml
    ofbiz/trunk/framework/example/widget/example/ExampleFeatureForms.xml
    ofbiz/trunk/framework/example/widget/example/ExampleForms.xml
    ofbiz/trunk/framework/security/data/SecurityData.xml

Modified: ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml?view=diff&rev=525960&r1=525959&r2=525960
==============================================================================
--- ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml Thu Apr  5 14:16:55 2007
@@ -214,10 +214,7 @@
         <response name="error" type="view" value="EditExampleFeatureExampleAppls"/>
     </request-map>
     
-    <request-map uri="LookupExampleFeature">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="LookupExampleFeature"/>
-    </request-map>
+    <request-map uri="LookupExampleFeature"><security https="true" auth="true"/><response name="success" type="view" value="LookupExampleFeature"/></request-map>
     <!-- end of request mappings -->
 
     <!-- View Mappings -->

Modified: ofbiz/trunk/framework/example/webapp/example/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/webapp/example/WEB-INF/web.xml?view=diff&rev=525960&r1=525959&r2=525960
==============================================================================
--- ofbiz/trunk/framework/example/webapp/example/WEB-INF/web.xml (original)
+++ ofbiz/trunk/framework/example/webapp/example/WEB-INF/web.xml Thu Apr  5 14:16:55 2007
@@ -24,41 +24,27 @@
     <description>Example Component of the Open For Business Project</description>
     
     <context-param>
-        <param-name>entityDelegatorName</param-name>
-        <param-value>default</param-value>
-        <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
-    </context-param>
-    <context-param>
-        <param-name>localDispatcherName</param-name>
-        <param-value>example</param-value>
+        <param-name>localDispatcherName</param-name><param-value>example</param-value>
         <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
     </context-param>    
+    <context-param>
+        <param-name>entityDelegatorName</param-name><param-value>default</param-value>
+        <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
+    </context-param>
 
     <filter>
         <filter-name>ContextFilter</filter-name>
         <display-name>ContextFilter</display-name>
         <filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class>
-        <init-param>
-            <param-name>disableContextSecurity</param-name>
-            <param-value>N</param-value>
-        </init-param>
+        <init-param><param-name>disableContextSecurity</param-name><param-value>N</param-value></init-param>
         <init-param>
             <param-name>allowedPaths</param-name>
             <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
         </init-param>
-        <init-param>
-            <param-name>errorCode</param-name>
-            <param-value>403</param-value>
-        </init-param>
-        <init-param>
-            <param-name>redirectPath</param-name>
-            <param-value>/control/main</param-value>
-        </init-param>        
+        <init-param><param-name>errorCode</param-name><param-value>403</param-value></init-param>
+        <init-param><param-name>redirectPath</param-name><param-value>/control/main</param-value></init-param>        
     </filter>
-    <filter-mapping>
-        <filter-name>ContextFilter</filter-name>
-            <url-pattern>/*</url-pattern>
-    </filter-mapping>
+    <filter-mapping><filter-name>ContextFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping>
 
     <listener><listener-class>org.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
     <listener><listener-class>org.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -72,14 +58,9 @@
         <servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
-    <servlet-mapping>
-        <servlet-name>ControlServlet</servlet-name>
-        <url-pattern>/control/*</url-pattern>
-    </servlet-mapping>
+    <servlet-mapping><servlet-name>ControlServlet</servlet-name><url-pattern>/control/*</url-pattern></servlet-mapping>
 
-    <session-config>
-        <session-timeout>60</session-timeout> <!-- in minutes -->
-    </session-config>
+    <session-config><session-timeout>60</session-timeout><!-- in minutes --></session-config>
 
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>

Modified: ofbiz/trunk/framework/example/widget/example/ExampleFeatureForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/ExampleFeatureForms.xml?view=diff&rev=525960&r1=525959&r2=525960
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/ExampleFeatureForms.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/ExampleFeatureForms.xml Thu Apr  5 14:16:55 2007
@@ -57,7 +57,8 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" use-when="exampleFeature==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" use-when="exampleFeature!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
 
     <!-- ExampleFeatureAppl -->
@@ -127,6 +128,7 @@
             </drop-down>
         </field>
         <field name="description" title="${uiLabelMap.CommonDescription}"/>
+        <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
         <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="LookupListExampleFeature" list-name="listIt" title="" type="list"

Modified: ofbiz/trunk/framework/example/widget/example/ExampleForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/ExampleForms.xml?view=diff&rev=525960&r1=525959&r2=525960
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/ExampleForms.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/ExampleForms.xml Thu Apr  5 14:16:55 2007
@@ -24,9 +24,7 @@
          default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext"
          paginate-target="FindExample">
         <actions>
-            <entity-condition entity-name="Example">
-                <order-by field-name="description"/>
-            </entity-condition>
+            <entity-condition entity-name="Example"><order-by field-name="description"/></entity-condition>
         </actions>
         
         <field name="exampleId" title="${uiLabelMap.ExampleExampleId}" widget-style="buttontext">
@@ -58,7 +56,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field use-when="example==null" name="statusId" title="${uiLabelMap.CommonStatus}" widget-style="selectBox">
+        <field name="statusId" use-when="example==null" title="${uiLabelMap.CommonStatus}" widget-style="selectBox">
             <drop-down allow-empty="false">
                 <entity-options entity-name="StatusItem" description="${description}">
                     <entity-constraint name="statusTypeId" value="EXAMPLE_STATUS"/>
@@ -66,17 +64,18 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field use-when="example!=null" name="statusId" title="${uiLabelMap.CommonStatus}" widget-style="selectBox">
+        <field name="statusId" use-when="example!=null" title="${uiLabelMap.CommonStatus}" widget-style="selectBox">
             <drop-down allow-empty="false" current-description="${currentStatus.description}">
                 <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
-                    <entity-constraint name="statusId" value="${example.statusId}"/>
+                    <entity-constraint name="statusId" env-name="example.statusId"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
             </drop-down>
         </field>
 
         <field name="description" title="${uiLabelMap.CommonDescription}"/>
-        <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" use-when="example==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" use-when="example!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
 
     <!-- ExampleItem -->

Modified: ofbiz/trunk/framework/security/data/SecurityData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/data/SecurityData.xml?view=diff&rev=525960&r1=525959&r2=525960
==============================================================================
--- ofbiz/trunk/framework/security/data/SecurityData.xml (original)
+++ ofbiz/trunk/framework/security/data/SecurityData.xml Thu Apr  5 14:16:55 2007
@@ -27,7 +27,7 @@
     <SecurityGroup groupId="BIZADMIN" description="Full Business Applications permission group, has all business app admin permissions, not technical permissions."/>
     
     <!-- general admin tools permission -->
-    <SecurityPermission description="Permission to access the WebTools Menu." permissionId="OFBTOOLS_VIEW"/>
+    <SecurityPermission description="Permission to access the Stock OFBiz Manager Applications." permissionId="OFBTOOLS_VIEW"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="OFBTOOLS_VIEW"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="OFBTOOLS_VIEW"/>
     <SecurityGroupPermission groupId="VIEWADMIN" permissionId="OFBTOOLS_VIEW"/>