svn commit: r1369382 [17/19] - in /ofbiz/branches/20120329_portletWidget: ./ applications/accounting/script/org/ofbiz/accounting/payment/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/webapp/accounting/WEB-INF/ appli...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1369382 [17/19] - in /ofbiz/branches/20120329_portletWidget: ./ applications/accounting/script/org/ofbiz/accounting/payment/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/webapp/accounting/WEB-INF/ appli...

erwan
Modified: ofbiz/branches/20120329_portletWidget/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/macros.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/macros.xml (original)
+++ ofbiz/branches/20120329_portletWidget/macros.xml Sat Aug  4 18:11:00 2012
@@ -109,8 +109,6 @@ under the License.
         <exclude name="**/JREntityListIteratorDataSource.java"/>
         <exclude name="**/JRMapCollectionDataSource.java"/>
         <exclude name="**/openoffice/"/>
-        <exclude name="**/XaPoolConnectionFactory.java"/>
-        <exclude name="**/JasperReportsPdfViewHandler.java"/>
         <exclude name="**/JasperReportsXmlViewHandler.java"/>
         <exclude name="**/JasperReportsJXlsViewHandler.java"/>
         <exclude name="**/JasperReportsPoiXlsViewHandler.java"/>

Propchange: ofbiz/branches/20120329_portletWidget/specialpurpose/birt/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug  4 18:11:00 2012
@@ -0,0 +1 @@
+build

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/build.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/build.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/build.xml Sat Aug  4 18:11:00 2012
@@ -36,6 +36,7 @@
         crowd/build.xml,
         webpos/build.xml
         googlecheckout/build.xml,
+        birt/build.xml,
         example/build.xml
     "/>
     <!-- For the old OFBiz Workflow Engine add "workflow/build.xml" to the list above -->

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml Sat Aug  4 18:11:00 2012
@@ -35,11 +35,6 @@ under the License.
         <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
     </context-param>
     <context-param>
-        <param-name>serviceReaderUrls</param-name>
-        <param-value>/WEB-INF/services.xml</param-value>
-        <description>Configuration File(s) For The Service Dispatcher</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>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/component-load.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/component-load.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/component-load.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/component-load.xml Sat Aug  4 18:11:00 2012
@@ -37,6 +37,7 @@ under the License.
     <load-component component-location="crowd"/>
     <load-component component-location="ldap"/>
     <load-component component-location="webpos"/>
+    <load-component component-location="birt"/>
     <load-component component-location="example"/>
     <load-component component-location="exampleext"/>
     <!-- The component below are not maintained by the community, or at least not very actively

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/crowd/src/org/ofbiz/crowd/CrowdAuthenticator.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/crowd/src/org/ofbiz/crowd/CrowdAuthenticator.java?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/crowd/src/org/ofbiz/crowd/CrowdAuthenticator.java (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/crowd/src/org/ofbiz/crowd/CrowdAuthenticator.java Sat Aug  4 18:11:00 2012
@@ -58,7 +58,7 @@ public class CrowdAuthenticator extends
      * Method called when authenticator is first initialized (the delegator
      * object can be obtained from the LocalDispatcher)
      *
-     * @param dispatcher The ServiceDispatcher to use for this Authenticator
+     * @param dispatcher The LocalDispatcher to use for this Authenticator
      */
     public void initialize(LocalDispatcher dispatcher) {
         this.dispatcher = dispatcher;

Propchange: ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/lib/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk/specialpurpose/ebaystore/lib:r1307080-1307082,1340380-1340445,1340638-1340641,1347751-1347754,1351866,1356000-1369352

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/config/EcommerceUiLabels.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/config/EcommerceUiLabels.xml Sat Aug  4 18:11:00 2012
@@ -3186,6 +3186,11 @@
         <value xml:lang="zh">选择间隔</value>
         <value xml:lang="zh_TW">選擇間隔</value>
     </property>
+    <property key="EcommerceSelectOption">
+        <value xml:lang="de">Option wählen</value>
+        <value xml:lang="en">Select Option</value>
+        <value xml:lang="fr">Sélectionnez une option</value>
+    </property>
     <property key="EcommerceSelectedGiftWrap">
         <value xml:lang="da">Vælg gavepapir</value>
         <value xml:lang="de">Ausgewählte Geschenkverpackung</value>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/data/DemoOrderTestData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/data/DemoOrderTestData.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/data/DemoOrderTestData.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/data/DemoOrderTestData.xml Sat Aug  4 18:11:00 2012
@@ -80,7 +80,7 @@ under the License.
     <OrderStatus orderStatusId="9008" statusId="ITEM_CREATED" orderId="DEMO10091" orderItemSeqId="00001" statusDatetime="2008-06-10 13:27:07.024" statusUserLogin="admin" lastUpdatedStamp="2008-06-10 13:27:07.279" lastUpdatedTxStamp="2008-06-10 13:27:07.022" createdStamp="2008-06-10 13:27:07.279" createdTxStamp="2008-06-10 13:27:07.022"/>
     <OrderContactMech orderId="DEMO10091" contactMechPurposeTypeId="SHIPPING_LOCATION" contactMechId="9200" lastUpdatedStamp="2008-06-10 13:27:07.294" lastUpdatedTxStamp="2008-06-10 13:27:07.022" createdStamp="2008-06-10 13:27:07.294" createdTxStamp="2008-06-10 13:27:07.022"/>
 
-    <Shipment shipmentId="9999" shipmentTypeId="PURCHASE_SHIPMENT" statusId="PURCH_SHIP_CREATED" primaryOrderId="DEMO10091" primaryShipGroupSeqId="00001" lastUpdatedStamp="2008-06-10 12:59:26.852" lastUpdatedTxStamp="2008-06-10 12:59:26.8" createdStamp="2008-06-10 12:59:26.852" createdTxStamp="2008-06-10 12:59:26.8"/>
+    <Shipment shipmentId="9999" shipmentTypeId="PURCHASE_SHIPMENT" statusId="PURCH_SHIP_CREATED" primaryOrderId="DEMO10091" primaryShipGroupSeqId="00001" lastUpdatedStamp="2008-06-10 12:59:26.852" lastUpdatedTxStamp="2008-06-10 12:59:26.8" createdStamp="2008-06-10 12:59:26.852" createdTxStamp="2008-06-10 12:59:26.8" createdDate="2008-06-10 12:59:26.8"/>
     <ShipmentItem shipmentId="9999" shipmentItemSeqId="00001" productId="GZ-2644" quantity="5"/>
     <ItemIssuance itemIssuanceId="9003" orderId="DEMO10091" orderItemSeqId="00001" shipGroupSeqId="00001" shipmentId="9999" shipmentItemSeqId="00001" issuedDateTime="2009-08-13 17:46:29.603" quantity="5"/>
 

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/data/DemoProduct.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/data/DemoProduct.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/data/DemoProduct.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/data/DemoProduct.xml Sat Aug  4 18:11:00 2012
@@ -1688,4 +1688,8 @@ under the License.
     <ProductKeyword productId="WG-1111" keyword="chrome" keywordTypeId="KWT_TAG" statusId="KW_APPROVED"/>
     <ProductKeyword productId="GZ-1006" keyword="standard" keywordTypeId="KWT_TAG" statusId="KW_APPROVED"/>
     
+    <!-- Product review  demo -->
+    <ProductReview productId="GZ-1000" productRating="4.000000" productReview="Good" productReviewId="9000" productStoreId="9000" statusId="PRR_PENDING" userLoginId="DemoCustomer"/>
+    <ProductReview productId="GZ-2644" productRating="5.000000" productReview="It's useful." productReviewId="9000" productStoreId="9000" statusId="PRR_APPROVED" userLoginId="DemoCustomer"/>
+    
 </entity-engine-xml>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml Sat Aug  4 18:11:00 2012
@@ -35,11 +35,6 @@ under the License.
         <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
     </context-param>
     <context-param>
-        <param-name>serviceReaderUrls</param-name>
-        <param-value>/WEB-INF/services.xml</param-value>
-        <description>Configuration File(s) For The Service Dispatcher</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>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml Sat Aug  4 18:11:00 2012
@@ -35,11 +35,6 @@ under the License.
         <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
     </context-param>
     <context-param>
-        <param-name>serviceReaderUrls</param-name>
-        <param-value>/WEB-INF/services.xml</param-value>
-        <description>Configuration File(s) For The Service Dispatcher</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>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Sat Aug  4 18:11:00 2012
@@ -429,10 +429,9 @@ $(function(){
           <#if sizeProductFeatureAndAppls?has_content>
             <div>
               <#if (sizeProductFeatureAndAppls?size == 1)>
-                <#-- TODO : i18n -->
-                Size:
+                ${uiLabelMap.OrderSizeAvailableSingle}:
               <#else>
-                Sizes Available:
+                ${uiLabelMap.OrderSizeAvailableMultiple}:
               </#if>
               <#list sizeProductFeatureAndAppls as sizeProductFeatureAndAppl>
                 ${sizeProductFeatureAndAppl.description?default(sizeProductFeatureAndAppl.abbrev?default(sizeProductFeatureAndAppl.productFeatureId))}<#if sizeProductFeatureAndAppl_has_next>,</#if>
@@ -564,7 +563,7 @@ $(function(){
                     <#list featureList as feature>
                         <#if feature_index == 0>
                             <div>${feature.description}: <select id="FT${feature.productFeatureTypeId}" name="FT${feature.productFeatureTypeId}" onchange="javascript:checkRadioButton();">
-                            <option value="select" selected="selected"> select option </option>
+                            <option value="select" selected="selected">${uiLabelMap.EcommerceSelectOption}</option>
                         <#else>
                             <option value="${feature.productFeatureId}">${feature.description} <#if feature.price?exists>(+ <@ofbizCurrency amount=feature.price?string isoCode=feature.currencyUomId />)</#if></option>
                         </#if>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl Sat Aug  4 18:11:00 2012
@@ -28,6 +28,7 @@ under the License.
         <#else>
             <#assign cancel = "Y">
         </#if>
+        <input type="hidden" name="webSiteId" value="${context.webSiteId?if_exists}">
       <#if !cancel?exists>
         <table>
           <tr>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl Sat Aug  4 18:11:00 2012
@@ -23,29 +23,29 @@ under the License.
         <table>
             <tr>
                 <td width="10%">
-                    <div class="tabletext"><span style="white-space: nowrap;">${uiLabelMap.OrderRequest} ${uiLabelMap.CommonNbr}</span></div>
+                    <div><span style="white-space: nowrap;">${uiLabelMap.OrderRequest} ${uiLabelMap.CommonNbr}</span></div>
                 </td>
                 <td width="10">&nbsp;</td>
                 <td width="10%">
-                    <div class="tabletext"><span style="white-space: nowrap;">${uiLabelMap.CommonType}</span></div>
+                    <div><span style="white-space: nowrap;">${uiLabelMap.CommonType}</span></div>
                 </td>
                 <td width="10">&nbsp;</td>
                 <td width="20%">
-                    <div class="tabletext">${uiLabelMap.CommonName}</div>
+                    <div>${uiLabelMap.CommonName}</div>
                 </td>
                 <td width="10">&nbsp;</td>
                 <td width="40%">
-                    <div class="tabletext">${uiLabelMap.CommonDescription}</div>
+                    <div>${uiLabelMap.CommonDescription}</div>
                 </td>
                 <td width="10">&nbsp;</td>
                 <td width="10%">
-                    <div class="tabletext">${uiLabelMap.CommonStatus}</div>
+                    <div>${uiLabelMap.CommonStatus}</div>
                 </td>
                 <td width="10">&nbsp;</td>
                 <td width="20%">
-                    <div class="tabletext">${uiLabelMap.OrderRequestDate}</div>
-                    <div class="tabletext">${uiLabelMap.OrderRequestCreatedDate}</div>
-                    <div class="tabletext">${uiLabelMap.OrderRequestLastModifiedDate}</div>
+                    <div>${uiLabelMap.OrderRequestDate}</div>
+                    <div>${uiLabelMap.OrderRequestCreatedDate}</div>
+                    <div>${uiLabelMap.OrderRequestLastModifiedDate}</div>
                 </td>
                 <td width="10">&nbsp;</td>
                 <td width="10">&nbsp;</td>
@@ -56,29 +56,29 @@ under the License.
                 
                 <tr>
                     <td>
-                        <div class="tabletext">${custRequest.custRequestId}</div>
+                        <div>${custRequest.custRequestId}</div>
                     </td>
                     <td width="10">&nbsp;</td>
                     <td>
-                        <div class="tabletext">${type.get("description",locale)?if_exists}</div>
+                        <div>${type.get("description",locale)?if_exists}</div>
                     </td>
                     <td width="10">&nbsp;</td>
                     <td>
-                        <div class="tabletext">${custRequest.custRequestName?if_exists}</div>
+                        <div>${custRequest.custRequestName?if_exists}</div>
                     </td>
                     <td width="10">&nbsp;</td>
                     <td>
-                        <div class="tabletext">${custRequest.description?if_exists}</div>
+                        <div>${custRequest.description?if_exists}</div>
                     </td>
                     <td width="10">&nbsp;</td>
                     <td>
-                        <div class="tabletext">${status.get("description",locale)}</div>
+                        <div>${status.get("description",locale)}</div>
                     </td>
                     <td width="10">&nbsp;</td>
                     <td>
-                        <div class="tabletext"><span style="white-space: nowrap;">${custRequest.custRequestDate?if_exists}</span></div>
-                        <div class="tabletext"><span style="white-space: nowrap;">${custRequest.createdDate?if_exists}</span></div>
-                        <div class="tabletext"><span style="white-space: nowrap;">${custRequest.lastModifiedDate?if_exists}</span></div>
+                        <div><span style="white-space: nowrap;">${custRequest.custRequestDate?if_exists}</span></div>
+                        <div><span style="white-space: nowrap;">${custRequest.createdDate?if_exists}</span></div>
+                        <div><span style="white-space: nowrap;">${custRequest.lastModifiedDate?if_exists}</span></div>
                     </td>
                     <td width="10">&nbsp;</td>
                     <td align="right">

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/CommonScreens.xml Sat Aug  4 18:11:00 2012
@@ -391,39 +391,6 @@ under the License.
             </widgets>
         </section>
     </screen>
-    <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
-    <screen name="portletUiLabelDecorator">
-        <section><!-- Decorator use by portlet define in their preference label -->
-            <actions>
-                <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <decorator-section-include name="body"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="uiLabelDecorator"><!-- Main decorator -->
-        <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
-            <actions>
-                <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/>
-            </actions>
-            <widgets>
-                <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
-                <decorator-section-include name="body"/>
-            </widgets>
-        </section>
-    </screen>
-    <!--#Eam# uiLabelDecorator  -->
 
     <screen name="policies">
         <section>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/config/ExampleUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/config/ExampleUiLabels.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/config/ExampleUiLabels.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/config/ExampleUiLabels.xml Sat Aug  4 18:11:00 2012
@@ -19,118 +19,6 @@
     under the License.
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-      <!-- #Bam# Begin Addon modification portletExample -->
-    <property key="ExampleApplicationPortal">
-        <value xml:lang="en">Portal Example Application</value>
-        <value xml:lang="fr">Application exemple Portail</value>
-        <value xml:lang="it">Applicazione Esempi</value>
-        <value xml:lang="ro">Aplicatie Exemple</value>
-        <value xml:lang="ru">Приложение Пример</value>
-        <value xml:lang="th">ตัวอย่างโปรแกรมคอมพิวเตอร์</value>
-        <value xml:lang="zh">样例应用</value>
-    </property>
-    <property key="ExampleMessageCreateExampleIsSuccess">
-        <value xml:lang="en">One Example is created</value>
-        <value xml:lang="fr">Un exemple est créé</value>
-    </property>
-    <property key="ExampleMessageExampleTypeCannotBeEmpty">
-        <value xml:lang="en">Example Type is mandatory</value>
-        <value xml:lang="fr">Le type d'exemple ne peut pas être vide</value>
-    </property>
-    <property key="ExampleMessageExampleStatusIs">
-        <value xml:lang="en">it's status is {0}</value>
-        <value xml:lang="fr">son statut est {0}</value>
-    </property>
-    <property key="ExampleStatusHistory">
-        <value xml:lang="en">Status History</value>
-        <value xml:lang="fr">Historique statut</value>
-    </property>
-    <property key="FormFieldTitle_exampleId">
-        <value xml:lang="en">Example ID</value>
-        <value xml:lang="fr">Réf. exemple</value>
-        <value xml:lang="it">Codice esempio</value>
-        <value xml:lang="ro">Cod Exemplu</value>
-        <value xml:lang="ru">Код примера</value>
-        <value xml:lang="th">รหัสตัวอย่าง</value>
-        <value xml:lang="zh">样例标识</value>
-    </property>
-    <property key="FormFieldTitle_exampleItemSeqId">
-        <value xml:lang="en">Example Item ID</value>
-        <value xml:lang="fr">Réf. lg. exemple</value>
-    </property>
-    <property key="PageTitleCreateExample">
-        <value xml:lang="en">Create an example</value>
-        <value xml:lang="fr">Création d'un exemple</value>
-    </property>
-    <property key="PageTitleExampleItems">
-        <value xml:lang="en">List Example Items</value>
-        <value xml:lang="fr">Liste des lignes d'exemple</value>
-    </property>
-    <property key="PageTitleExampleDetailsMenu">
-        <value xml:lang="en">Summary &amp; Menu</value>
-        <value xml:lang="fr">Résumé &amp; menu</value>
-    </property>
-    <property key="PageTitleExampleFeatureAppls">
-        <value xml:lang="en">List Example Features Appl</value>
-        <value xml:lang="fr">Liste des caratéristiques associées d'exemple</value>
-    </property>
-    <property key="PageTitleExampleStatus">
-        <value xml:lang="en">List Example Statuses</value>
-        <value xml:lang="fr">Historique des statuts d'exemple</value>
-    </property>
-    <property key="PageTitleFindExampleMgmt">
-        <value xml:lang="en">Find Example</value>
-        <value xml:lang="fr">Rechercher des exemples</value>
-    </property>
-    <property key="PageTitleListExample">
-        <value xml:lang="en">List Examples</value>
-        <value xml:lang="fr">Liste des exemples</value>
-    </property>
-    <property key="PageTitleListExampleFeature">
-        <value xml:lang="en">List Example Feature</value>
-        <value xml:lang="fr">Liste des caractérisques exemples</value>
-    </property>
-    <property key="PageTitleLookupExample">
-        <value xml:lang="en">Lookup Example</value>
-        <value xml:lang="fr">Rechercher un exemple</value>
-    </property>
-    <property key="PageTitleSelectExample">
-        <value xml:lang="en">Select an Example</value>
-        <value xml:lang="fr">Sélectionner un exemple</value>
-    </property>
-    <property key="PageTitleShowExample">
-        <value xml:lang="en">Show Example</value>
-        <value xml:lang="fr">Afficher l'exemple</value>
-    </property>
-    <!-- #Eam# portletExample -->
-    <property key="ExampelsJackrabbitDownloadFile">
-        <value xml:lang="de">Datei herunterladen</value>
-        <value xml:lang="en">Download file</value>
-    </property>
-    <property key="ExampelsJackrabbitOpenData">
-        <value xml:lang="de">Content öffnen.</value>
-        <value xml:lang="en">Open content.</value>
-    </property>
-    <property key="ExampelsJackrabbitOpenFile">
-        <value xml:lang="de">Datei öffnen</value>
-        <value xml:lang="en">Open file</value>
-    </property>
-    <property key="ExampelsJackrabbitRemoveData">
-        <value xml:lang="de">Content löschen.</value>
-        <value xml:lang="en">Remove content.</value>
-    </property>
-    <property key="ExampelsJackrabbitRemoveFile">
-        <value xml:lang="de">Datei löschen</value>
-        <value xml:lang="en">Remove file</value>
-    </property>
-    <property key="ExampleAddNewContentEntry">
-        <value xml:lang="de">Einen neuen Content Eintrag hinzufügen</value>
-        <value xml:lang="en">Add a new content entry</value>
-    </property>
-    <property key="ExampleAddNewNodePath">
-        <value xml:lang="de">Füge einen neuen Node Pfad hinzu, z.B. /Foo/Baa speichert die Datei im Ordner "Baa"</value>
-        <value xml:lang="en">Add a (new) node path like /Foo/Baa will store the file under the folder "Baa"</value>
-    </property>
     <property key="ExampleAjaxExamples">
         <value xml:lang="en">Ajax Examples</value>
         <value xml:lang="fr">Exemples Ajax</value>
@@ -165,27 +53,6 @@
         <value xml:lang="de">Verion des Content Knoten</value>
         <value xml:lang="en">Version of the base content node</value>
     </property>
-    <property key="ExampleBirtExamples">
-        <value xml:lang="en">BIRT Examples</value>
-        <value xml:lang="th">ตัวอย่าง BIRT</value>
-    </property>
-    <property key="ExampleBirtChartReport">
-        <value xml:lang="en">HTML chart report</value>
-        <value xml:lang="fr">Graphiques HTML</value>
-    </property>
-    <property key="ExampleBirtChartViewHandler">
-        <value xml:lang="en">PDF chart report</value>
-        <value xml:lang="fr">Graphiques PDF</value>
-    </property>
-    <property key="ExampleBirtMail">
-        <value xml:lang="en">Send any format through Mail</value>
-    </property>
-    <property key="ExampleBirtReport">
-        <value xml:lang="en">HTML</value>
-    </property>
-    <property key="ExampleBirtViewHandler">
-        <value xml:lang="en">PDF</value>
-    </property>
     <property key="ExampleCalendarFromLayer">
         <value xml:lang="en">Calendar field (only test purp.)</value>
         <value xml:lang="fr">Calendrier (only test)</value>
@@ -561,6 +428,12 @@
         <value xml:lang="th">ลักษณะ</value>
         <value xml:lang="zh">特征</value>
     </property>
+    <property key="ExampleFeaturesAddToExample">
+        <value xml:lang="en">Add Feature To Example</value>
+    </property>      
+    <property key="ExampleFeaturesByExample">
+        <value xml:lang="en">Features by Example</value>
+    </property>    
     <property key="ExampleField">
         <value xml:lang="en">Field</value>
         <value xml:lang="it">Campo</value>
@@ -913,59 +786,4 @@
         <value xml:lang="de">Sie haben den Wert in der Select Box geändert.</value>
         <value xml:lang="en">You have changed the value in the select box</value>
     </property>
-
-    <!--#Bam# icons-purpose-->
-    <property key="BestPractice_IconAddItem">
-        <value xml:lang="en">BP: Used to add an object on an item of a list</value>
-        <value xml:lang="fr">BP: Utilisé pour ajouter un object à un item d'une liste</value>
-    </property>
-    <property key="BestPractice_IconAppNext">
-        <value xml:lang="en">BP: Next item in a naviguation menu or dependancy after. Add a iconTitle each time you use it</value>
-        <value xml:lang="fr">BP: Elément suivant lors de naviguation ou dépendance après. Ajouter un iconTitle à chaque usage</value>
-    </property>
-    <property key="BestPractice_IconAppPrev">
-        <value xml:lang="en">BP: Previous item in a naviguation menu or dependancy before. Add a iconTitle each time you use it</value>
-        <value xml:lang="fr">BP: Elément précédent lors de naviguation ou dépendance avant. Ajouter un iconTitle à chaque usage</value>
-    </property>
-    <property key="BestPractice_IconCategory">
-        <value xml:lang="en">BP: Categories (Product categories, Party classification, Task purposes, ...)</value>
-        <value xml:lang="fr">BP: Catégories (de produit, de classification d'acteur, d'usage de tâche, ...)</value>
-    </property>
-    <property key="BestPractice_IconContact">
-        <value xml:lang="en">BP: Person associated List (most of time with contact mech details)</value>
-        <value xml:lang="fr">BP: Liste des personnes associées (affiche des élements de coordonnées, la plupart du temps)</value>
-    </property>
-    <property key="BestPractice_IconHierarchy">
-        <value xml:lang="en">BP: Rollup (product, parties, party groups, project, ...</value>
-        <value xml:lang="fr">BP: Hiérarchie (de produits, d'acteurs, de groupe d'acteurs, projet, ...)</value>
-    </property>
-    <property key="BestPractice_IconParty">
-        <value xml:lang="en">BP: Parties associated List (most of time show PartyRole list), so Person or Group or Company</value>
-        <value xml:lang="fr">BP: Liste des acteurs associés (affiche une liste d'acteur- rôle, la plupart du temps), personne, groupe ou société</value>
-    </property>
-    <property key="BestPractice_IconPDF">
-        <value xml:lang="en">BP: For generate or show (download) a PDF file</value>
-        <value xml:lang="fr">BP: Pour générer ou afficher (télécharger) un document PDF</value>
-    </property>
-    <property key="BestPractice_IconPrint">
-        <value xml:lang="en">Print</value>
-        <value xml:lang="fr">Imprimer directement sur l'imprimante (paramètré selon votre utilisateur de connexion)</value>
-    </property>
-    <property key="BestPractice_IconRefresh">
-        <value xml:lang="en">Refresh</value>
-        <value xml:lang="fr">re-Afficher les données (selon les critères de sélection) sans prendre en compte la saisie en cours</value>
-    </property>
-    <property key="BestPractice_IconSynchronize">
-        <value xml:lang="en">BP: Used to apply modification from an object to another. Add a iconTitle each time you use it</value>
-        <value xml:lang="fr">BP: Utilisé pour appliquer une modification d'un object à un autre (synchronisation). Ajouter un iconTitle à chaque usage !</value>
-    </property>
-    <property key="BestPractice_Icons">
-        <value xml:lang="en">When Icon explanation start with BP (Best Practice), put the mouse on icon to read the end-user label </value>
-        <value xml:lang="fr">Quand l'explication de l'icône est précédée par BP (Bonne Pratique), positionner la souris sur l'icone pour visualiser ce que l'utilisateur verra</value>
-    </property>
-    <property key="PageTitleIconsList">
-        <value xml:lang="en">Icons list</value>
-        <value xml:lang="fr">Liste des icônes</value>
-    </property>
-    <!--#Eam# icons-purpose-->
 </resource>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/ExamplePortalSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/ExamplePortalSeedData.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/ExamplePortalSeedData.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/ExamplePortalSeedData.xml Sat Aug  4 18:11:00 2012
@@ -33,44 +33,4 @@ under the License.
     <PortalPage portalPageId="EXAMPLE2"  sequenceNum="200" parentPortalPageId="EXAMPLE" portalPageName="Example Portal Page 2" description="Portal page 2" ownerUserLoginId="_NA_"/>
     <PortalPageColumn portalPageId="EXAMPLE2" columnSeqId="00001"/>
     <PortalPagePortlet portalPageId="EXAMPLE2" portalPortletId="EXAMPLE_1" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/>
-    <!--#Bam# icons-purpose -->
-    <PortalPage portalPageId="IconsList" sequenceNum="400" parentPortalPageId="EXAMPLE" portalPageName="List all icons available" description="List all icons available" ownerUserLoginId="_NA_"/>
-    <PortalPageColumn portalPageId="IconsList" columnSeqId="00001"/>
-    <PortalPagePortlet portalPageId="IconsList" portalPortletId="IconsList" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/>
-    <!--#Eam# icons-purpose -->
-
-
-<!--#Bam# portletExample -->
-    <PortalPage portalPageId="ExampleMgmt" sequenceNum="200" parentPortalPageId="" portalPageName="Example management" description="Search, list, navigation menu, edit area" ownerUserLoginId="_NA_"/>
-    <PortalPageColumn portalPageId="ExampleMgmt" columnSeqId="00001" columnWidthPercentage="25"/>
-    <PortalPagePortlet portalPageId="ExampleMgmt" portalPortletId="FindExample" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/>
-    <PortalPagePortlet portalPageId="ExampleMgmt" portalPortletId="ExampleDetailsMenu" portletSeqId="00001" columnSeqId="00001" sequenceNum="10"/>
-    <PortalPageColumn portalPageId="ExampleMgmt" columnSeqId="00002"/>
-    <PortalPagePortlet portalPageId="ExampleMgmt" portalPortletId="ListExample" portletSeqId="00001" columnSeqId="00002" sequenceNum="20"/>
-    <PortalPagePortlet portalPageId="ExampleMgmt" portalPortletId="ExampleDetail" portletSeqId="00001" columnSeqId="00002" sequenceNum="30"/>
-
-    <PortalPage portalPageId="ExampleRecap" sequenceNum="250" parentPortalPageId="ExampleMgmt" portalPageName="Example summary" description="Select, summary, view on major relations" ownerUserLoginId="_NA_"/>
-    <PortalPageColumn portalPageId="ExampleRecap" columnSeqId="00001" columnWidthPercentage="25"/>
-    <PortalPagePortlet portalPageId="ExampleRecap" portalPortletId="SelectExample" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/>
-    <PortalPagePortlet portalPageId="ExampleRecap" portalPortletId="ExampleStatus" portletSeqId="00001" columnSeqId="00001" sequenceNum="5"/>
-    <PortalPageColumn portalPageId="ExampleRecap" columnSeqId="00002"/>
-    <PortalPagePortlet portalPageId="ExampleRecap" portalPortletId="ShowExample" portletSeqId="00001" columnSeqId="00002" sequenceNum="20"/>
-    <PortalPagePortlet portalPageId="ExampleRecap" portalPortletId="ExampleItems" portletSeqId="00001" columnSeqId="00002" sequenceNum="30"/>
-    <PortalPagePortlet portalPageId="ExampleRecap" portalPortletId="ExampleFeatureAppls" portletSeqId="00001" columnSeqId="00002" sequenceNum="35"/>
-
-    <PortalPage portalPageId="ExampleNew" sequenceNum="300" parentPortalPageId="ExampleMgmt" portalPageName="Create a new Example" description="Create an Example and for some détails" ownerUserLoginId="_NA_"/>
-    <PortalPageColumn portalPageId="ExampleNew" columnSeqId="00001" columnWidthPercentage="25"/>
-    <PortalPagePortlet portalPageId="ExampleNew" portalPortletId="FindExample" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/><!-- TODO: search has to return on ExampleMgmt page, need to find a fix -->
-       <PortletAttribute portalPageId="ExampleNew" portalPortletId="FindExample" attrName="initiallyCollapsed" attrValue="true" portletSeqId="00001"/>
-    <PortalPageColumn portalPageId="ExampleNew" columnSeqId="00002"/>
-    <PortalPagePortlet portalPageId="ExampleNew" portalPortletId="CreateExample" portletSeqId="00001" columnSeqId="00002" sequenceNum="20"/>
-    <PortalPagePortlet portalPageId="ExampleNew" portalPortletId="ExampleItems" portletSeqId="00001" columnSeqId="00002" sequenceNum="30"/>
-
-    <PortalPage portalPageId="ExampleFeatureNew" sequenceNum="305" parentPortalPageId="ExampleMgmt" portalPageName="Create a new ExampleFeature" description="Create an ExampleFeature and some details" ownerUserLoginId="_NA_"/>
-    <PortalPageColumn portalPageId="ExampleFeatureNew" columnSeqId="00001" columnWidthPercentage="25"/>
-    <PortalPagePortlet portalPageId="ExampleFeatureNew" portalPortletId="FindExampleFeature" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/>
-    <PortalPageColumn portalPageId="ExampleFeatureNew" columnSeqId="00002"/>
-      <PortalPagePortlet portalPageId="ExampleFeatureNew" portalPortletId="ListExampleFeature" portletSeqId="00001" columnSeqId="00002" sequenceNum="20"/>
-
-<!--#Eam# portletExample -->
 </entity-engine-xml>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/ExamplePortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/ExamplePortletData.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/ExamplePortletData.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/ExamplePortletData.xml Sat Aug  4 18:11:00 2012
@@ -36,100 +36,4 @@ under the License.
     <PortletPortletCategory portalPortletId="EXAMPLE_1" portletCategoryId="EXAMPLE"/>
     <PortletPortletCategory portalPortletId="EXAMPLE_2" portletCategoryId="EXAMPLE"/>
     <PortletPortletCategory portalPortletId="EXAMPLE_3" portletCategoryId="EXAMPLE"/>
-    <!--#Bam# icons-purpose -->
-    <PortalPortlet portalPortletId="IconsList" portletName="List all icons usable in portlet with iconsPurpose and IconsTooltips_"
-                   description="List all icons usable in portlet with iconsPurpose and IconsTooltips_"
-       portletTypeId="Screenlet" component="example" subComponent="Example" webapp="example"
-       uiLabelLocation="component://example/widget/CommonScreens.xml"/>
-    <PortletPortletCategory portalPortletId="IconsList" portletCategoryId="EXAMPLE"/>
-
-
-     <!-- Begin Addon modification portletExample -->
-    <PortletCategory portletCategoryId="EXAMPLE_PORTLET_TYPE" description="Example Portlet(s) using portletType"/>
-
-    <PortalPortlet portalPortletId="FindExample"
-       portletName="Find Example (with portletType and showPortlet)" description="portlet to define search criteria for Example list"
-       portletTypeId="Screenlet"  component="example" subComponent="Example" helpName="HELP_Screenlet"/>
-    <PortalPortlet portalPortletId="SelectExample"
-       portletName="Select one Example" description="portlet to select one Example for the current portal page"
-       portletTypeId="Screenlet"  component="example" subComponent="Example" helpName="HELP_Screenlet"/>
-
-    <!-- Use directly a form (no screen for default value, only form, see ShowPortalPortlet view) -->
-    <PortalPortlet portalPortletId="ListExample"
-       portletName="List Examples (with portletType and showPortlet)" description="portlet to list example depending on search criteria, this portlet is call by FindExample"
-       portletTypeId="ScreenletList" component="example" subComponent="Example" useScript="Y" helpName="HELP_ScreenletList" editFormName="GenericRecapPageParam" editFormLocation="component://common/widget/PortletEditForms.xml"/>
-
-    <!-- Use a screen (default value name, see ShowPortalPortlet view) -->
-    <PortalPortlet portalPortletId="ExampleDetailsMenu"
-       portletName="Example summary and details menu (with portletType and showPortlet)" description="Example summary and menu to see all details portlet in the ExampleDetail contener"
-       portletTypeId="Screenlet" component="example" subComponent="Example" useMenu="Y" useScreen="Y" useScript="Y"
-       titleLabel="CommonEmptyHeader" pkIdName="exampleId" scriptName="component://example/script/org/ofbiz/example/ExampleWactions.xml#EditExample" helpName="HELP_Screenlet"/>
-
-    <!-- Empty area for portlet injected by DetailMenu -->
-    <PortalPortlet portalPortletId="ExampleDetail"
-       portletName="Container to show Example portlet detail (with portletType and showPortlet)" description="Use this portlet to say where detail portlet call from a menu will be show"
-       portletTypeId="Empty" component="example" subComponent="Example" helpName="DETAIL_dtExampleId"/>
-
-    <!-- Use a screen (default value name, see ShowPortalPortlet view) -->
-    <PortalPortlet portalPortletId="ShowExample"
-       portletName="Display Example (all fields) (with portletType and showPortlet)" description="Same as Edit but with only display field, if necessary could show some informations coming from link entities"
-       portletTypeId="Screenlet" component="example" subComponent="Example"
-       useMenu="Y" helpName="HELP_Screenlet"/>
-
-    <!-- Use directly a form (no screen for default value, only form, see ShowPortalPortlet view) -->
-    <PortalPortlet portalPortletId="CreateExample"
-       portletName="Create Example Form (with portletType and showPortlet)" description="Used to add Example"
-       portletTypeId="Screenlet" component="example" subComponent="Example" helpName="HELP_Screenlet"/>
-
-    <!-- edit is not call by portlet but directly by uri
-    <PortalPortlet portalPortletId="EditExample" portletName="Edit Example Form"
-                   description="Used to modify or add Example"
-       screenName="EditExample"
-       screenLocation="component://example/widget/example/PortletScreens.xml"/> -->
-
-    <PortletPortletCategory portalPortletId="FindExample" portletCategoryId="EXAMPLE_PORTLET_TYPE"/>
-    <PortletPortletCategory portalPortletId="SelectExample" portletCategoryId="EXAMPLE_PORTLET_TYPE"/>
-    <PortletPortletCategory portalPortletId="ListExample" portletCategoryId="EXAMPLE_PORTLET_TYPE"/>
-    <PortletPortletCategory portalPortletId="ExampleDetailsMenu" portletCategoryId="EXAMPLE_PORTLET_TYPE"/>
-    <PortletPortletCategory portalPortletId="ExampleDetail" portletCategoryId="EXAMPLE_PORTLET_TYPE"/>
-    <PortletPortletCategory portalPortletId="ShowExample" portletCategoryId="EXAMPLE_PORTLET_TYPE"/>
-    <PortletPortletCategory portalPortletId="CreateExample" portletCategoryId="EXAMPLE_PORTLET_TYPE"/>
-
-    <PortalPortlet portalPortletId="ExampleItems"
-       portletName="List and manage exampleItems (with portletType and showPortlet)" description="List all exampleItems for one example, subportlet simple"
-       portletTypeId="ScreenletList" component="example" subComponent="Example"
-       editFormName="GenericEditEditOrShowParam" editFormLocation="component://common/widget/PortletEditForms.xml"
-       pkIdName="exampleId" useMenu="Y" helpName="HELP_ScreenletList"/>
-    <!-- Other portlets : don't appear on a portal page (can done), but used by other portlets for detail information (managed by a menu) -->
-    <PortalPortlet portalPortletId="ExampleStatus"
-       portletName="List ExampleStatus" description="List all ExampleStatus for one example (portlet which use portletType and showPortlet)"
-       portletTypeId="ScreenletList" component="example" subComponent="Example"  
-       editFormName="GenericEditEditOrShowParam" editFormLocation="component://common/widget/PortletEditForms.xml"
-       pkIdName="exampleId" helpName="HELP_ScreenletList"/>
-    <!-- Use a screen (need to add an external menu above the list, so use a screen instead of a form) -->
-    <PortalPortlet portalPortletId="ExampleFeatureAppls"
-       portletName="List and manage ExampleFeatureAppls (with portletType and showPortlet)" description="List all ExampleFeatureAppls for one example, subportlet simple"
-       portletTypeId="Screenlet" component="example" subComponent="ExampleFeature" useScreen="Y"
-       editFormName="GenericEditEditOrShowParam" editFormLocation="component://common/widget/PortletEditForms.xml"
-       pkIdName="exampleId" useMenu="Y" helpName="HELP_Screenlet"/>
-
-    <PortletPortletCategory portalPortletId="ExampleStatus" portletCategoryId="EXAMPLE_PORTLET_TYPE"/>
-    <PortletPortletCategory portalPortletId="ExampleItems" portletCategoryId="EXAMPLE_PORTLET_TYPE"/>
-    <PortletPortletCategory portalPortletId="ExampleFeatureAppls" portletCategoryId="EXAMPLE_PORTLET_TYPE"/>
-
-
-    <!-- Use directly a form (no screen for default value, only form, see ShowPortalPortlet view) -->
-    <PortalPortlet portalPortletId="FindExampleFeature"
-       portletName="Find ExampleFeature (with portletType and showPortlet)" description="portlet to define search criteria for ExampleFeature list"
-       portletTypeId="Screenlet"  component="example" subComponent="ExampleFeature" helpName="HELP_Screenlet"/>
-    <!-- Use directly a form (no screen for default value, only form, see ShowPortalPortlet view) -->
-    <PortalPortlet portalPortletId="ListExampleFeature"
-       portletName="List ExampleFeatures (with portletType and showPortlet)" description="portlet to list example features depending on search criteria"
-       portletTypeId="ScreenletList" component="example" subComponent="ExampleFeature"
-       useMenu="Y" helpName="HELP_ScreenletList"/>
-
-    <PortletPortletCategory portalPortletId="FindExampleFeature" portletCategoryId="EXAMPLE_PORTLET_TYPE"/>
-    <PortletPortletCategory portalPortletId="ListExampleFeature" portletCategoryId="EXAMPLE_PORTLET_TYPE"/>
-     <!-- End Addon modification portletExample -->
-
 </entity-engine-xml>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/helpdata/HELP_EXAMPLE.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/helpdata/HELP_EXAMPLE.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/helpdata/HELP_EXAMPLE.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/helpdata/HELP_EXAMPLE.xml Sat Aug  4 18:11:00 2012
@@ -15,7 +15,7 @@ License.
 -->
 <section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
-    xsi:schemaLocation="http://docbook.org/ns/docbook"
+    xsi:schemaLocation="http://docbook.org/ns/docbook ../../../../applications/content/dtd/docbook.xsd"
     xmlns="http://docbook.org/ns/docbook">
   <title>The Example Main Help page.</title>
   <para>
@@ -27,7 +27,7 @@ License.
 
   <section>
     <title>Help file organization</title>
-    <para>Help is managed by using content component functionality. For more detail, look at the example help sub tree.</para>
+    <para>Help is managed by using content component functionality.</para>
     <para>Help can be for :
       <itemizedlist>
         <listitem><para>one component or sub-component, access is possible by navigation in help index tree and select it, contentId is associated to
@@ -48,7 +48,6 @@ License.
       main shortcut :
       <itemizedlist>
         <listitem><para>How is organize <link xl:href="showHelp?helpTopic=DOCUMENTATION_SYSTEM">The Apache OFBiz documentation system</link></para></listitem>
-        <listitem><para><link xl:href="showHelp?helpTopic=EXAMPLE_devel">Best practices for development</link></para></listitem>
         <listitem><para><link xl:href="showHelp?helpTopic=EXAMPLE_docbook">What it's possible to do in help file</link></para></listitem>
       </itemizedlist>
     </para>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/helpdata/HELP_EXAMPLE_FR.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/helpdata/HELP_EXAMPLE_FR.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/helpdata/HELP_EXAMPLE_FR.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/helpdata/HELP_EXAMPLE_FR.xml Sat Aug  4 18:11:00 2012
@@ -15,30 +15,28 @@ License.
 -->
 <section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
-    xsi:schemaLocation="http://docbook.org/ns/docbook"
+    xsi:schemaLocation="http://docbook.org/ns/docbook ../../../../applications/content/dtd/docbook.xsd"
     xmlns="http://docbook.org/ns/docbook">
     <title>Page principale de l'aide du composant Exemple</title>
     <para>
       L'application exemple vous permet de découvrir les possibilités pour créer une application contenant, entre autres, des
       boîtes de recherche, des listes et beaucoup d'autres choses.
     </para>
-    <para>Cette application peut être utilisée pour avoir un aperçu des bonnes pratiques de developpement d'interface utilisateur pour OFBiz.</para>
-    <para>Lisez l'aide de chaque écran, celle-ci vous expliquera quelle partie du développement est utilisé dans ce cas. </para>
-    <para>Par exemple, si vous voulez voir comment vous devez faire pour ajouter un peu d'aide, vous pouvez regarder les fichiers d'aide dans le répertoire data/helpdata
-     du composant example et dans le fichier data/ExempleHelpData.xml dans le composant contenu. </para>
-
-    <section>
-      <title>Organisation des fichiers d'aide</title>
-      <para>L'aide est géré dans le composant contenu, pour plus de détail voir les sous points de l'index de l'aide au niveau de exemple.</para>
-    </section>
+    <para>
+      Cette application peut être utilisée pour avoir un aperçu des bonnes pratiques d'interface utilisateur pour OFBiz.</para>
+    <para>
+      Par exemple, si vous voulez voir comment vous pouvez ajouter des textes d'aide, vous pouvez regarder les fichiers contenus dans le
+      répertoire data/heldata dans le composant Example et dans le fichier contenu dans data/ExempleHelpData.xml au niveau de l'application
+      content
+    </para>
 
     <section>
-      <title>Sous-menus de l'aide</title>
+      <title>Sous-menus dans l'aide</title>
       <para>
-        Pour avoir la liste complète, cliquez sur le bouton "Index" et regardez l'arborescence de l'aide. Voici aussi une liste de raccourcis :
+        Pour avoir la liste complète, cliquez sur le bouton "Index" et regardez l'arborescence de l'aide. Voici aussi une liste
+        de raccourcis :
         <itemizedlist>
           <listitem><para>Comment fonctionne <link xl:href="showHelp?helpTopic=DOCUMENTATION_SYSTEM">le système de documentation d'Apache OFBiz</link></para></listitem>
-          <listitem><para><link xl:href="showHelp?helpTopic=EXAMPLE_devel">Les bonnes pratiques de développement avec les portlets</link></para></listitem>
           <listitem><para><link xl:href="showHelp?helpTopic=EXAMPLE_docbook">Ce qu'il est possible de faire dans les fichiers d'aide</link></para></listitem>
         </itemizedlist>
       </para>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/helpdata/HELP_EXAMPLE_docbook.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/helpdata/HELP_EXAMPLE_docbook.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/helpdata/HELP_EXAMPLE_docbook.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/helpdata/HELP_EXAMPLE_docbook.xml Sat Aug  4 18:11:00 2012
@@ -24,70 +24,31 @@ under the License.
     xmlns="http://docbook.org/ns/docbook">
 
     <title>Help on writing docBook documents</title>
-    <para>This file aims to contain an example of what is possible to put in a docBook file that is used as an ofbiz helping page.</para>
-    <para>It has to be opened as an xml file. To display the helping page, only a few docBook tags are interpreted. This file contains all the ones that are interpreted.</para>
-    <para>The interpretation of these tags is made by the ftl file HelpTemplate.ftl</para>
-    <para>It is advisable to only take a 2-character indentation, in order to limit the width of the file.</para>
-    <para>&amp;nbsp;</para>
-    <para>The tag "para" enables to manage the paragraphs and, for the moment, it enables to manage the chosen carriage returns. The number of spaces or carriage returns in the docBook text is ignored. For instance, an empty line between two paragraphs in a docBook file does not generate any space between the paragraphs.</para>
-    <para>When forcing this action is necessary, in exceptional situations, it is possible to include html code,
-     to generate spaces or carriage returns for instance. But attention! During the creation of pdf files or according to the type of transformation in html,</para>
-    <para> &lt;br \>these elements will appear and won't be interpreted.
-        <programlisting>
-      &amp;lt;para>Short paragraph&amp;lt;/para>
-      to insert an empty line between two paragraphs &amp;lt;para>&amp;amp;nbsp;&amp;lt;/para>
-      &amp;lt;para>Short paragraphe with a carriage&amp;amp;lt;br \>in the middle&amp;lt;/para>
-        </programlisting>
-      </para>
-    <section>
-      <title><anchor xml:id="WhatIsSection"/>What is a section? (H2)</title>
-      <para>When the user asks for the display of the helping page (clicks on the icon), the system looks for the associated file(s) and displays it (for more details about the organization of the helping page, read <link xl:href="showHelp?helpTopic=DOCUMENTATION_SYSTEM">Principles and organization of the Apache OfBoz Documentation</link>).</para>
-      <para>The tag "Title" of the file will be the title of the page (H1 in html), and it will be possible to have as many subsections (H2) as we want, and with as many levels (H3, H4, H5, ...) as we want. This is the aim of the tag. In the tag Title, it is possible to put a tag Anchor in order to link it (with an internal or external link) straight to this section.</para>
-      <section>
-        <title>Subsection (H3)</title>
-        <para>and we could go on...</para>
-      </section>
-    </section>
     <section>
         <title>Example of an ordered list</title>
-        <para>There will be a number in front of each item.</para>
+        <para>The orderedlist will put numbers in front of each item.</para>
         <orderedlist>
             <listitem><para>First item of my list</para></listitem>
             <listitem><para>Second item</para></listitem>
             <listitem><para>Third...</para></listitem>
-            <listitem><para>Forth...</para></listitem>
-            <listitem><para>and so on...</para></listitem>
+            <listitem><para>4th...</para></listitem>
+            <listitem><para>and this can go longer...</para></listitem>
         </orderedlist>
     </section>
     <section>
         <title>Example of an itemized list</title>
-        <para>There will only be a symbol (a point) at the beginning of each line.</para>
+        <para>The itemizedlist will put a bullet in front of each item.</para>
         <itemizedlist>
             <listitem><para>First item of my list</para></listitem>
             <listitem><para>Second item</para></listitem>
             <listitem><para>Third...</para></listitem>
-            <listitem><para>Forth...</para></listitem>
-            <listitem><para>and so on...</para></listitem>
+            <listitem><para>4th...</para></listitem>
+            <listitem><para>and this can go longer...</para></listitem>
         </itemizedlist>
     </section>
 
     <section>
         <title>Examples of text formatting</title>
-        <para>In formatting, there are 2 notions:
-          <itemizedlist>
-            <listitem><para>formatting the text <emphasis role="caution">in progress</emphasis></para></listitem>
-            <listitem><para>a paragraph with a specific formatting. In this case, you can put a title at that paragraph, but it is not compulsory. Currently, in any case, this title will be on level H3.</para></listitem>
-          </itemizedlist>
-        </para>
-        <para>Each formatting corresponds to a style. Currently, 4 have been created.
-          <itemizedlist>
-            <listitem><para>caution: caution (but softer than warning)</para></listitem>
-            <listitem><para>important: as its name implies</para></listitem>
-            <listitem><para>note: as its name implies</para></listitem>
-            <listitem><para>tip: trick</para></listitem>
-            <listitem><para>warning: warning (stronger than caution)</para></listitem>
-          </itemizedlist>
-        </para>
         <caution>
             <title>Caution title</title>
             <para>Here is a caution text</para>
@@ -108,35 +69,4 @@ under the License.
             <para>Here is a warning</para>
         </warning>
     </section>
-
-    <section>
-      <title>Possible inclusion</title>
-      <para>During the display of the helping page, according to the links between elements of contents, it is possible to display several elements of contents
-        <itemizedlist>
-          <listitem><para>another helping file</para></listitem>
-          <listitem><para>a picture</para></listitem>
-          <listitem><para>a form (or a screen) so as to be able to see the helping page of each field</para></listitem>
-        </itemizedlist>
-      </para>
-      <para>During the display of the helping page on the <link xl:href="showHelp?helpTopic=EXAMPLE_main">home page</link> of the component Example, 2 helping files are displayed.</para>
-      <para>Example of a display of a picture, <emphasis role="caution">only the field fileref is compulsory, but for a good page setting, the fields width and depth are recommended.</emphasis></para>
-      <para>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="/example/images/MgmtPage.png" width="638" depth="478"/>
-          </imageobject>
-          <textobject><phrase>A typical portal page</phrase></textobject>
-          <caption>Diagram of a typical portal page, about a search management and a main entity management</caption>
-        </mediaobject>
-      </para>
-      <para>&amp;nbsp;</para>
-      <para>So as to enable the user to display the helping page of each field (which appears when the mouse is situated on the field's label), it is sometimes interesting to display a form in a helping page text. To do this, you have to create an associated element of contents (dataresource) which is associated to a screen.xml, with a dataTemplateTypeId="SCREEN_COMBINED". It is advisable to do a dedicated screen that does not include the general decorator.&lt;br \>
-        Then, you have to associate the element of contents with the same parent as for the helping page with which the screen has to appear. Here are the data for the display of the following screen.
-        <programlisting>
-      &amp;lt;DataResource dataResourceId="EXAMPLE_EditForm"  objectInfo="component://example/widget/example/ExampleScreens.xml#ExampleEditForm" dataResourceTypeId="URL_RESOURCE" dataTemplateTypeId="SCREEN_COMBINED"/>
-      &amp;lt;Content contentId="EXAMPLE_EditForm" contentTypeId="DOCUMENT" contentName="Example Fields" dataResourceId="EXAMPLE_EditForm"/>
-      &amp;lt;ContentAssoc contentId="HELP_EXAMPLE_docbook" contentIdTo="EXAMPLE_EditForm" mapKey="EXAMPLE_docbook" fromDate="2006-01-12 01:01:01" sequenceNum="005" contentAssocTypeId="INSTANCE"/>
-        </programlisting>
-      </para>
-    </section>
 </section>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/helpdata/HELP_EXAMPLE_main.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/helpdata/HELP_EXAMPLE_main.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/helpdata/HELP_EXAMPLE_main.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/helpdata/HELP_EXAMPLE_main.xml Sat Aug  4 18:11:00 2012
@@ -15,11 +15,11 @@ License.
 -->
 <section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
-    xsi:schemaLocation="http://docbook.org/ns/docbook"
+    xsi:schemaLocation="http://docbook.org/ns/docbook ../../../../applications/content/dtd/docbook.xsd"
     xmlns="http://docbook.org/ns/docbook">
     <title>The Example Main page.</title>
-    <para>What is the component example? how to use it? what it's goal?... for all these questions refer to the help index in the Sample
+    <para><link xl:href="showHelp?helpTopic=EXAMPLE">About the Example application</link></para>
+    <para>
         In this page, you can create or search an example
     </para>
-    <para><link xl:href="showHelp?helpTopic=HELP_EXAMPLE">About the Example application</link></para>
 </section>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/ofbiz-component.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/ofbiz-component.xml Sat Aug  4 18:11:00 2012
@@ -60,12 +60,5 @@ under the License.
         location="webapp/example"
         base-permission="OFBTOOLS,EXAMPLE"
         mount-point="/example"/>
-    <webapp name="birt"
-        title="BIRT"
-        server="default-server"
-        location="webapp/birt"
-        base-permission="OFBTOOLS,WEBTOOLS"
-        mount-point="/birt"
-        app-bar-display="false"/>
-        
+
 </ofbiz-component>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/script/org/ofbiz/example/example/ExampleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/script/org/ofbiz/example/example/ExampleServices.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/script/org/ofbiz/example/example/ExampleServices.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/script/org/ofbiz/example/example/ExampleServices.xml Sat Aug  4 18:11:00 2012
@@ -20,74 +20,6 @@ under the License.
 
 <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd">
-    <!--#Bam# portletExample -->
-    <!--#Bam# Example methods to test all return Message-->
-    <simple-method method-name="createExample" short-description="create a Example and return message">
-
-        <!-- Example of Message management -->
-        <if-compare operator="equals" value="EXST_COMPLETE" field="parameters.statusId">
-          <!-- prepare a message for success or error message List -->
-          <entity-one value-field="statusItem" entity-name="StatusItem" use-cache="true">
-            <field-map field-name="statusId" from-field="parameters.statusId"/>
-          </entity-one>
-          <set field="argListName[]" from-field="statusItem.description"/>
-          <property-to-field resource="ExampleUiLabels" property="ExampleMessageExampleStatusIs" field="messageList" arg-list-name="argListName" />
-        </if-compare>
-
-        <!-- Now test if Error message -->
-        <if-empty field="parameters.exampleTypeId">
-          <!-- Error message -->
-          <property-to-field resource="ExampleUiLabels" property="ExampleMessageExampleTypeCannotBeEmpty" field="errorMessage"/>
-          <if-empty field="messageList">
-              <field-to-result field="errorMessage"/>
-            <else>
-              <!-- <set field="errorMessageList[]" from-field="errorMessage"/> it's not necessary to put it because errorMessage will be print too  -->
-              <set field="errorMessageList[]" from-field="messageList"/>
-              <field-to-result field="errorMessageList"/>
-            </else>
-          </if-empty>
-
-          <if-empty field="parameters.description">
-              <!-- if there is a success message or messageList put fail, not success. It's should be used if you want to store some entity (so no rollback)
-                  but you want to give a fail(or Warning) message to user -->
-              <!-- Currently not specifics look for fail, only error or success  -->
-              <set field="responseMessage" value="fail"/>
-              <field-to-result field="responseMessage"/>
-              <log level="info" message="fail message"/>
-              <set field="parameters.exampleTypeId" value="INSPIRED"/>
-            <else>
-              <return response-code="error"/>
-            </else>
-          </if-empty>
-        </if-empty>
-
-        <!-- Start of Success Message example -->
-        <if-compare operator="equals" value="EXST_APPROVED" field="parameters.statusId">
-          <!-- return a success message -->
-            <property-to-field resource="ExampleUiLabels" property="ExampleMessageCreateExampleIsSuccess" field="successMessage"/>
-            <field-to-result field="successMessage"/>
-          <else>
-            <if-not-empty field="messageList">
-              <property-to-field resource="ExampleUiLabels" property="ExampleMessageCreateExampleIsSuccess" field="successMessageList[]"/>
-              <set field="successMessageList[]" from-field="messageList"/>
-              <field-to-result field="successMessageList"/>
-            </if-not-empty>
-          </else>
-        </if-compare>
-
-        <!-- Now create value -->
-        <make-value entity-name="Example" value-field="newEntity"/>
-        <sequenced-id sequence-name="Example" field="exampleId"/>
-        <log level="info" message="newEntity=${newEntity}"/>
-        <set field="newEntity.exampleId" from-field="exampleId"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-
-
-        <field-to-result field="exampleId"/>
-    </simple-method>
-    <!--#Eam# portletExample -->
-
     <!-- ExampleStatus methods -->
     <simple-method method-name="createExampleStatus" short-description="create a ExampleItem">
         <now-timestamp field="nowTimestamp"/>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/servicedef/services.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/servicedef/services.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/servicedef/services.xml Sat Aug  4 18:11:00 2012
@@ -25,15 +25,13 @@ under the License.
     <version>1.0</version>
 
     <!-- Example & Related Services -->
-    <!--#Bam# portletExample change from engine entity-auto to simple to be able to generate some success or error message  -->
-    <service name="createExample" default-entity-name="Example" engine="simple" invoke="createExample" auth="true"
-        location="component://example/script/org/ofbiz/example/example/ExampleServices.xml">
+    <service name="createExample" default-entity-name="Example" engine="entity-auto" invoke="create" auth="true">
         <description>Create a Example</description>
         <permission-service service-name="exampleGenericPermission" main-action="CREATE"/>
         <auto-attributes include="pk" mode="OUT" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
-        <override name="exampleTypeId" optional="true"/><!--#Bam# portletExample it's mandatory but Test if present will be done in service -->
-        <override name="statusId" optional="true"/><!--#Bam# portletExample it's mandatory but Test will be done in service -->
+        <override name="exampleTypeId" optional="false"/>
+        <override name="statusId" optional="false"/>
         <override name="exampleName" optional="false"/>
     </service>
     <service name="updateExample" default-entity-name="Example" engine="entity-auto" invoke="update" auth="true">

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/webapp/example/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/webapp/example/WEB-INF/controller.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/webapp/example/WEB-INF/controller.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/webapp/example/WEB-INF/controller.xml Sat Aug  4 18:11:00 2012
@@ -25,8 +25,6 @@ under the License.
          elements found in the common-controller.xml file. -->
     <include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
     <include location="component://common/webcommon/WEB-INF/portal-controller.xml"/>
-    <include location="component://example/webapp/birt/WEB-INF/controller.xml"/>
-    <include location="component://example/webapp/example/WEB-INF/controller-portlet.xml"/><!--#Bam# portlet-example-->
 
     <description>Example Component Site Configuration File</description>
 
@@ -61,7 +59,7 @@ under the License.
     <request-map uri="createExample">
         <security https="true" auth="true"/>
         <event type="service" invoke="createExample"/>
-        <response name="success" type="request-redirect" value="FindExample">
+        <response name="success" type="request-redirect" value="EditExample">
             <redirect-parameter name="exampleId"/>
         </response>
         <response name="error" type="view" value="FindExample"/>
@@ -74,6 +72,12 @@ under the License.
         </response>
         <response name="error" type="view" value="EditExample"/>
     </request-map>
+    <request-map uri="createExampleAjax">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createExample"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
+    </request-map>
     <request-map uri="updateExampleAjax">
         <security https="true" auth="true"/>
         <event type="service" invoke="updateExample"/>
@@ -148,7 +152,7 @@ under the License.
         <security https="true" auth="true"/>
         <event type="service" invoke="updateExampleFeature"/>
         <response name="success" type="request-redirect" value="EditExampleFeature">
-            <redirect-parameter name="exampleId"/>
+            <redirect-parameter name="exampleFeatureId"/>
         </response>
         <response name="error" type="view" value="EditExampleFeature"/>
     </request-map>
@@ -187,9 +191,7 @@ under the License.
 
     <request-map uri="FormWidgetExamples"><security https="true" auth="true"/><response name="success" type="view" value="FormWidgetExamples"/></request-map>
 
-    <request-map uri="LookupExample"><security https="true" auth="true"/><response name="success" type="view" value="LookupExample"/></request-map>
     <request-map uri="LookupExampleFeature"><security https="true" auth="true"/><response name="success" type="view" value="LookupExampleFeature"/></request-map>
-    <request-map uri="LookupPartyName"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyName"/></request-map>
     <request-map uri="LookupPartyGroupByName"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyGroupByName"/></request-map>
 
     <request-map uri="ListExampleFormOnly"><security https="true" auth="false"/><response name="success" type="view" value="ListExampleFormOnly"/></request-map>
@@ -214,22 +216,6 @@ under the License.
     <request-map uri="ExampleOsmGeoLocationPointSet2"><security https="true" auth="true"/><response name="success" type="view" value="ExampleOsmGeoLocationPointSet2"/></request-map>
     <request-map uri="ExampleOsmGeoLocationPointSet3"><security https="true" auth="true"/><response name="success" type="view" value="ExampleOsmGeoLocationPointSet3"/></request-map>
     <request-map uri="ExampleOsmGeoLocationPointSet4"><security https="true" auth="true"/><response name="success" type="view" value="ExampleOsmGeoLocationPointSet4"/></request-map>
-
-    <!-- BIRT example Requests -->
-    <request-map uri="BirtMain">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="BirtMain"/>
-    </request-map>
-
-    <!--flot example requests-->
-    <request-map uri="ExampleBarChart">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="ExampleBarChart"/>
-    </request-map>
-    <request-map uri="ExamplePieChart">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="ExamplePieChart"/>
-    </request-map>
     <!-- end of request mappings -->
 
     <!-- View Mappings -->
@@ -249,9 +235,7 @@ under the License.
 
     <view-map name="FormWidgetExamples" type="screen" page="component://example/widget/example/FormWidgetExampleScreens.xml#FormWidgetExamples"/>
 
-    <view-map name="LookupExample" type="screen" page="component://example/widget/example/LookupScreens.xml#LookupExample"/>
     <view-map name="LookupExampleFeature" type="screen" page="component://example/widget/example/ExampleFeatureScreens.xml#LookupExampleFeature"/>
-    <view-map name="LookupPartyName" type="screen" page="component://example/widget/example/FormWidgetExampleLookupScreens.xml#LookupPartyName"/>
     <view-map name="LookupPartyGroupByName" type="screen" page="component://example/widget/example/FormWidgetExampleLookupScreens.xml#LookupPartyGroupByName"/>
 
     <!-- ajax view mappings -->
@@ -270,9 +254,6 @@ under the License.
     <view-map name="ExampleOsmGeoLocationPointSet3" type="screen" page="component://example/widget/example/ExampleScreens.xml#ExampleOsmGeoLocationPointSet3"/>
     <view-map name="ExampleOsmGeoLocationPointSet4" type="screen" page="component://example/widget/example/ExampleScreens.xml#ExampleOsmGeoLocationPointSet4"/>
 
-    <!-- BIRT example View Mappings -->
-    <view-map name="BirtMain" type="screen" page="component://example/widget/example/BirtScreens.xml#main"/>
-
     <!-- Flot view mapping -->
     <view-map name="ExampleBarChart" page="component://example/widget/example/ExampleScreens.xml#ExampleBarChart" type="screen"/>
     <view-map name="ExamplePieChart" page="component://example/widget/example/ExampleScreens.xml#ExamplePieChart" type="screen"/>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/CommonScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/CommonScreens.xml Sat Aug  4 18:11:00 2012
@@ -44,33 +44,12 @@ under the License.
                 <set field="applicationMenuLocation" value="component://example/widget/example/ExampleMenus.xml" global="true"/>
                 <!--set field="appheaderTemplate" value="component://example/webapp/appheader.ftl"/-->
                 <set field="applicationTitle" value="${uiLabelMap.ExampleApplication}" global="true"/>
-                <!--#Bam# exampleHelp  -->
-                <!-- Help link actions -->
-                <set field="helpTopic" value="${groovy: webSiteId + '_' + requestAttributes._CURRENT_VIEW_}"/>
-                <entity-and list="pageAvail" entity-name="ContentAssoc">
-                    <field-map field-name="mapKey" from-field="helpTopic"/>
-                </entity-and>
-                <!--#Eam# exampleHelp  -->
             </actions>
             <widgets>
                 <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
             </widgets>
         </section>
     </screen>
-    <!--#Bam# portletExample :  -->
-    <screen name="uiLabelDecorator">
-        <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
-            <actions>
-                <!-- base/top/specific map first, then more common map added for shared labels -->
-                <property-map resource="ExampleUiLabels" map-name="uiLabelMap" global="true"/>
-            </actions>
-            <widgets>
-                <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
-                <decorator-section-include name="body"/>
-            </widgets>
-        </section>
-    </screen>
-    <!--#Eam# portletExample  -->
 
     <screen name="CommonExampleDecorator">
         <!-- The CommonExampleDecorator screen decorates a small group of screens that all have
@@ -91,7 +70,7 @@ under the License.
                             <condition>
                                 <and>
                                     <if-has-permission permission="EXAMPLE" action="_VIEW"/>
-                                    <not><if-empty field="example"/></not>
+                                    <not><if-empty field="example"/></not><!-- This is a check useful when only seed data are loaded -->
                                 </and>
                             </condition>
                             <widgets>
@@ -108,7 +87,7 @@ under the License.
                             <widgets>
                                 <section>
                                     <condition>
-                                        <not><if-empty field="example"/></not>
+                                        <not><if-empty field="example"/></not><!-- This is a check useful when only seed data are loaded -->
                                     </condition>
                                     <widgets>
                                         <container style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor} ${example.exampleName} [${exampleId}]</label></container>
@@ -160,7 +139,7 @@ under the License.
                             <condition>
                                 <and>
                                     <if-has-permission permission="EXAMPLE" action="_VIEW"/>
-                                    <not><if-empty field="exampleFeature"/></not>
+                                    <not><if-empty field="exampleFeature"/></not><!-- This is a check useful when only seed data are loaded -->
                                 </and>
                             </condition>
                             <widgets>
@@ -177,7 +156,7 @@ under the License.
                             <widgets>
                                 <section>
                                     <condition>
-                                        <not><if-empty field="exampleFeature"/></not>
+                                        <not><if-empty field="exampleFeature"/></not><!-- This is a check useful when only seed data are loaded -->
                                     </condition>
                                     <widgets>
                                         <container style="h1">
@@ -253,44 +232,6 @@ under the License.
         </section>
     </screen>
 
-    <screen name="CommonBirtDecorator">
-        <section>
-            <actions>
-                <set field="headerItem" value="Birt"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="pre-body">
-                        <section>
-                            <!-- do check for WEBTOOLS, _VIEW permission -->
-                            <condition>
-                                <if-has-permission permission="ENTITY_MAINT"/>
-                            </condition>
-                            <widgets>
-                                <include-menu name="BirtTabBar" location="component://example/widget/example/ExampleMenus.xml"/>
-                            </widgets>
-                        </section>
-                    </decorator-section>
-                    <decorator-section name="body">
-                        <container style="clear" />
-                        <section>
-                            <!-- do check for WEBTOOLS, _VIEW permission -->
-                            <condition>
-                                <if-has-permission permission="ENTITY_MAINT"/>
-                            </condition>
-                            <widgets>
-                                <decorator-section-include name="body"/>
-                            </widgets>
-                            <fail-widgets>
-                                <label style="h3">${uiLabelMap.WebtoolsPermissionError}</label>
-                            </fail-widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
     <screen name="CommonExampleChartsDecorator">
         <section>
             <actions>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleFeatureForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleFeatureForms.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleFeatureForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleFeatureForms.xml Sat Aug  4 18:11:00 2012
@@ -75,7 +75,7 @@ under the License.
     <form name="ListExampleFeatureAppls" type="list"  list-name="exampleFeatureAppls"  target="feature_updateExampleFeatureAppl">
         <actions>
             <entity-condition entity-name="ExampleFeatureAppl">
-                <condition-expr field-name="exampleFeatureId" from-field="exampleFeatureId"/>
+                <order-by field-name="exampleId"/>
                 <order-by field-name="sequenceNum"/>
             </entity-condition>
         </actions>
@@ -106,6 +106,7 @@ under the License.
         </field>
     </form>
 
+
     <form name="AddExampleFeatureAppl" type="single" target="feature_createExampleFeatureAppl" title="">
         <auto-fields-service service-name="createExampleFeatureAppl"/>
         <field name="exampleId" title="${uiLabelMap.ExampleExample}">
@@ -115,7 +116,13 @@ under the License.
                 </entity-options>
             </drop-down>
         </field>
-        <field name="exampleFeatureId"><hidden/></field>
+        <field name="exampleFeatureId">
+            <drop-down allow-empty="false">
+                <entity-options entity-name="ExampleFeature" description="${description} [${exampleFeatureId}]">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>        
+        </field>
         <field name="exampleFeatureApplTypeId" title="${uiLabelMap.CommonType}">
             <drop-down allow-empty="true">
                 <entity-options entity-name="ExampleFeatureApplType" description="${description}">