svn commit: r1370126 [13/15] - in /ofbiz/branches/jackrabbit2012
Locked
svn commit: r1370126 [13/15] - in /ofbiz/branches/jackrabbit2012
 
|
Modified: ofbiz/branches/jackrabbit20120501/framework/webtools/widget/EntityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/webtools/widget/EntityScreens.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/webtools/widget/EntityScreens.xml (original) +++ ofbiz/branches/jackrabbit20120501/framework/webtools/widget/EntityScreens.xml Tue Aug 7 06:25:59 2012 @@ -437,23 +437,6 @@ under the License. </section> </screen> - <screen name="minervaobjects"> - <section> - <actions> - <set field="headerItem" value="main"/> - <set field="title" value="${uiLabelMap.WebtoolsMinervaConnectionObjects}"/> - </actions> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <screenlet title="${uiLabelMap.WebtoolsMinervaConnectionObjects}"> - <platform-specific><html><html-template location="component://webtools/webapp/webtools/entity/minervaObjects.ftl"/></html></platform-specific> - </screenlet> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> <screen name="ConnectionPoolStatus"> <section> <actions> Modified: ofbiz/branches/jackrabbit20120501/framework/webtools/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/webtools/widget/Menus.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/webtools/widget/Menus.xml (original) +++ ofbiz/branches/jackrabbit20120501/framework/webtools/widget/Menus.xml Tue Aug 7 06:25:59 2012 @@ -216,6 +216,16 @@ under the License. </menu-item> </menu> + <menu name="StatsTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" + selected-menuitem-context-field-name="tabButtonItem"> + <menu-item name="stats" title="${uiLabelMap.WebtoolsStatistics}"> + <link target="StatsSinceStart"/> + </menu-item> + <menu-item name="metrics" title="${uiLabelMap.WebtoolsMetrics}"> + <link target="ViewMetrics"/> + </menu-item> + </menu> + <menu name="StatsSinceStart" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="clearStats" title="${uiLabelMap.WebtoolsStatsClearSince}"> <link target="StatsSinceStart"> @@ -228,9 +238,6 @@ under the License. </menu> <menu name="StatsBinHistory" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> - <menu-item name="statsSinceStart" title="${uiLabelMap.WebtoolsStatsMainPageTitle}"> - <link target="StatsSinceStart"/> - </menu-item> <menu-item name="refresh" title="${uiLabelMap.CommonRefresh}" widget-style="buttontext refresh"> <link target="StatBinsHistory"> <parameter param-name="statsId" from-field="parameters.statsId"/> Modified: ofbiz/branches/jackrabbit20120501/framework/webtools/widget/ServiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/webtools/widget/ServiceForms.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/webtools/widget/ServiceForms.xml (original) +++ ofbiz/branches/jackrabbit20120501/framework/webtools/widget/ServiceForms.xml Tue Aug 7 06:25:59 2012 @@ -110,14 +110,24 @@ under the License. <field name="key"><display/></field> <field name="value"><display/></field> </form> + <form name="PoolState" type="single" default-map-name="poolState"> + <field name="pollerName"><display/></field> + <field name="pollerThreadName"><display/></field> + <field name="invokerThreadNameFormat"><display/></field> + <field name="keepAliveTimeInSeconds"><display/></field> + <field name="numberOfCoreInvokerThreads"><display/></field> + <field name="currentNumberOfInvokerThreads"><display/></field> + <field name="numberOfActiveInvokerThreads"><display/></field> + <field name="maxNumberOfInvokerThreads"><display/></field> + <field name="greatestNumberOfInvokerThreads"><display/></field> + <field name="numberOfCompletedTasks"><display/></field> + </form> <form name="ListJavaThread" type="list" list-name="threads" paginate-target="threadList" separate-columns="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <field name="threadId" title="${uiLabelMap.WebtoolsThread}"><display description="${threadId} ${threadName}"/></field> - <field name="status" title="${uiLabelMap.CommonStatus}"><display/></field> - <field name="jobName" title="${uiLabelMap.WebtoolsJob}"><display default-value="${uiLabelMap.CommonNone}"/></field> + <field name="id" title="${uiLabelMap.WebtoolsThread}"><display description="${threadId} ${threadName}"/></field> + <field name="name" title="${uiLabelMap.WebtoolsJob}"><display default-value="${uiLabelMap.CommonNone}"/></field> <field name="serviceName" title="${uiLabelMap.WebtoolsService}"><display default-value="${uiLabelMap.CommonNone}"/></field> - <field name="usage" title="${uiLabelMap.WebtoolsUsage}"><display/></field> - <field name="ttl" title="${uiLabelMap.WebtoolsTTL} (ms)"><display/></field> + <field name="time"><display/></field> <field name="runTime" title="${uiLabelMap.CommonTime} (ms)"><display/></field> </form> <form name="ListServices" type="list" list-name="services" paginate-target="ServiceLog" separate-columns="true" Modified: ofbiz/branches/jackrabbit20120501/framework/webtools/widget/ServiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/webtools/widget/ServiceScreens.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/webtools/widget/ServiceScreens.xml (original) +++ ofbiz/branches/jackrabbit20120501/framework/webtools/widget/ServiceScreens.xml Tue Aug 7 06:25:59 2012 @@ -103,6 +103,7 @@ under the License. <decorator-screen name="CommonServiceDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.WebtoolsServiceEngineThreads}"> + <include-form name="PoolState" location="component://webtools/widget/ServiceForms.xml"/> <include-form name="ListJavaThread" location="component://webtools/widget/ServiceForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.WebtoolsGeneralJavaThreads}"> Modified: ofbiz/branches/jackrabbit20120501/framework/webtools/widget/StatsForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/webtools/widget/StatsForms.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/webtools/widget/StatsForms.xml (original) +++ ofbiz/branches/jackrabbit20120501/framework/webtools/widget/StatsForms.xml Tue Aug 7 06:25:59 2012 @@ -31,7 +31,7 @@ under the License. <field name="avgTime" title="${uiLabelMap.WebtoolsStatsAvg}"><display/></field> <field name="maxTime" title="${uiLabelMap.WebtoolsStatsMax}"><display/></field> <field name="hitsPerMin" title="${uiLabelMap.WebtoolsStatsHitsPerMin}"><display/></field> - <field name="viewBins" widget-style="buttontext" title=" "> + <field name="viewBins" title=" " widget-area-style="button-col"> <hyperlink description="${uiLabelMap.WebtoolsStatsViewBins}" target="StatBinsHistory"> <parameter param-name="statsId" from-field="requestId"/> <parameter param-name="type" from-field="requestType"/> @@ -45,4 +45,20 @@ under the License. <form name="ListRequestBins" extends="ListStats" list-name="requestList"> <field name="viewBins"><hidden/></field> </form> + + <form name="ListMetrics" type="list" list-name="metricsList" paginate-target="ViewMetrics" + header-row-style="header-row-2" default-table-style="basic-table light-grid"> + <actions> + <service service-name="getAllMetrics" /> + </actions> + <field name="name" title="${uiLabelMap.CommonName}"><display/></field> + <field name="serviceRate" title="${uiLabelMap.WebtoolsMetricsRate}"><display/></field> + <field name="threshold" title="${uiLabelMap.WebtoolsMetricsThreshold}"><display/></field> + <field name="totalEvents" title="${uiLabelMap.WebtoolsMetricsTotalEvents}"><display/></field> + <field name="resetMetric" title=" " widget-area-style="button-col"> + <hyperlink description="${uiLabelMap.CommonReset}" target="ResetMetric"> + <parameter param-name="name"/> + </hyperlink> + </field> + </form> </forms> Modified: ofbiz/branches/jackrabbit20120501/framework/webtools/widget/StatsScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/webtools/widget/StatsScreens.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/webtools/widget/StatsScreens.xml (original) +++ ofbiz/branches/jackrabbit20120501/framework/webtools/widget/StatsScreens.xml Tue Aug 7 06:25:59 2012 @@ -21,12 +21,10 @@ under the License. <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> - <screen name="StatsSinceStart"> + <screen name="StatsDecorator"> <section> <actions> - <set field="titleProperty" value="WebtoolsStatsMainPageTitle"/> <set field="headerItem" value="stats"/> - <script location="component://webtools/webapp/webtools/WEB-INF/actions/stats/StatsSinceStart.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -36,22 +34,11 @@ under the License. <if-has-permission permission="SERVER_STATS" action="_VIEW"/> </condition> <widgets> - <screenlet title="${uiLabelMap.WebtoolsStatsMainPageTitle}"> - <include-menu name="StatsSinceStart" location="component://webtools/widget/Menus.xml"/> - <label>${uiLabelMap.WebtoolsStatsCurrentTime} ${nowTimestamp}</label> - <screenlet title="${uiLabelMap.WebtoolsStatsRequestStats}"> - <include-form name="ListRequestStats" location="component://webtools/widget/StatsForms.xml"/> - </screenlet> - <screenlet title="${uiLabelMap.WebtoolsStatsEventStats}"> - <include-form name="ListEventStats" location="component://webtools/widget/StatsForms.xml"/> - </screenlet> - <screenlet title="${uiLabelMap.WebtoolsStatsViewStats}"> - <include-form name="ListViewStats" location="component://webtools/widget/StatsForms.xml"/> - </screenlet> - </screenlet> + <include-menu name="StatsTabBar" location="component://webtools/widget/Menus.xml"/> + <decorator-section-include name="body"/> </widgets> <fail-widgets> - <label style="h3">${uiLabelMap.WebtoolsStatsPermissionMsg}</label> + <label style="h3">${uiLabelMap.WebtoolsPermissionError}</label> </fail-widgets> </section> </decorator-section> @@ -60,28 +47,81 @@ under the License. </section> </screen> + <screen name="StatsSinceStart"> + <section> + <actions> + <set field="titleProperty" value="WebtoolsStatsMainPageTitle"/> + <set field="tabButtonItem" value="stats"/> + <script location="component://webtools/webapp/webtools/WEB-INF/actions/stats/StatsSinceStart.groovy"/> + </actions> + <widgets> + <decorator-screen name="StatsDecorator" location="${parameters.statsDecoratorLocation}"> + <decorator-section name="body"> + <section> + <widgets> + <container style="page-title"> + <label text="${uiLabelMap[titleProperty]}"/> + </container> + <include-menu name="StatsSinceStart" location="component://webtools/widget/Menus.xml"/> + <label>${uiLabelMap.WebtoolsStatsCurrentTime} ${nowTimestamp}</label> + <screenlet title="${uiLabelMap.WebtoolsStatsRequestStats}" padded="false"> + <include-form name="ListRequestStats" location="component://webtools/widget/StatsForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.WebtoolsStatsEventStats}" padded="false"> + <include-form name="ListEventStats" location="component://webtools/widget/StatsForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.WebtoolsStatsViewStats}" padded="false"> + <include-form name="ListViewStats" location="component://webtools/widget/StatsForms.xml"/> + </screenlet> + </widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="StatBinsHistory"> <section> <actions> <set field="titleProperty" value="WebtoolsStatsBinsPageTitle"/> - <set field="headerItem" value="stats"/> + <set field="tabButtonItem" value="stats"/> <script location="component://webtools/webapp/webtools/WEB-INF/actions/stats/StatBinsHistory.groovy"/> </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="StatsDecorator" location="${parameters.statsDecoratorLocation}"> <decorator-section name="body"> <section> - <condition> - <if-has-permission permission="SERVER_STATS" action="_VIEW"/> - </condition> <widgets> - <screenlet title="${uiLabelMap.WebtoolsStatsBinsPageTitle}"> - <include-menu name="StatsBinHistory" location="component://webtools/widget/Menus.xml"/> - <label>${uiLabelMap.WebtoolsStatsCurrentTime} ${nowTimestamp}</label> - <screenlet title="${uiLabelMap.WebtoolsStatsRequestStats}"> - <include-form name="ListRequestBins" location="component://webtools/widget/StatsForms.xml"/> - </screenlet> - </screenlet> + <container style="page-title"> + <label text="${uiLabelMap[titleProperty]}"/> + </container> + <include-menu name="StatsBinHistory" location="component://webtools/widget/Menus.xml"/> + <label>${uiLabelMap.WebtoolsStatsCurrentTime} ${nowTimestamp}</label> + <include-form name="ListRequestBins" location="component://webtools/widget/StatsForms.xml"/> + </widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + + <screen name="ViewMetrics"> + <section> + <actions> + <set field="titleProperty" value="WebtoolsViewMetrics" /> + <set field="tabButtonItem" value="metrics"/> + </actions> + <widgets> + <decorator-screen name="StatsDecorator" location="${parameters.statsDecoratorLocation}"> + <decorator-section name="body"> + <section> + <widgets> + <container style="page-title"> + <label text="${uiLabelMap[titleProperty]}"/> + </container> + <include-form name="ListMetrics" location="component://webtools/widget/StatsForms.xml" /> </widgets> </section> </decorator-section> Modified: ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java (original) +++ ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java Tue Aug 7 06:25:59 2012 @@ -76,9 +76,8 @@ public abstract class ModelWidgetAction public abstract void runAction(Map<String, Object> context) throws GeneralException; public static List<ModelWidgetAction> readSubActions(ModelWidget modelWidget, Element parentElement) { - List<ModelWidgetAction> actions = FastList.newInstance(); - List<? extends Element> actionElementList = UtilXml.childElementList(parentElement); + List<ModelWidgetAction> actions = new ArrayList<ModelWidgetAction>(actionElementList.size()); for (Element actionElement: actionElementList) { if ("set".equals(actionElement.getNodeName())) { actions.add(new SetField(modelWidget, actionElement)); @@ -104,7 +103,6 @@ public abstract class ModelWidgetAction throw new IllegalArgumentException("Action element not supported with name: " + actionElement.getNodeName()); } } - return actions; } Modified: ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/PortalPageWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/PortalPageWorker.java?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/PortalPageWorker.java (original) +++ ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/PortalPageWorker.java Tue Aug 7 06:25:59 2012 @@ -31,7 +31,7 @@ import org.ofbiz.entity.GenericEntityExc import org.ofbiz.entity.condition.EntityCondition; import org.ofbiz.entity.condition.EntityOperator; import org.ofbiz.entity.util.EntityUtil; -import org.ofbiz.security.authz.Authorization; +import org.ofbiz.security.Security; /** * PortalPageWorker Class @@ -151,9 +151,9 @@ public class PortalPageWorker { GenericValue userLogin = (GenericValue) context.get("userLogin"); if (UtilValidate.isNotEmpty(userLogin)) { String userLoginId = (String) userLogin.get("userLoginId"); - Authorization authz = (Authorization) context.get("authz"); + Security security = (Security) context.get("security"); - Boolean hasPortalAdminPermission = authz.hasPermission(userLoginId, "PORTALPAGE_ADMIN", context); + Boolean hasPortalAdminPermission = security.hasPermission("PORTALPAGE_ADMIN", userLogin); try { Delegator delegator = WidgetWorker.getDelegator(context); GenericValue portalPage = delegator.findOne("PortalPage", UtilMisc.toMap("portalPageId", portalPageId),false); Modified: ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/cache/WidgetContextCacheKey.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/cache/WidgetContextCacheKey.java?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/cache/WidgetContextCacheKey.java (original) +++ ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/cache/WidgetContextCacheKey.java Tue Aug 7 06:25:59 2012 @@ -39,7 +39,6 @@ public class WidgetContextCacheKey { fieldNamesToSkip.add("globalContext"); fieldNamesToSkip.add("delegator"); fieldNamesToSkip.add("dispatcher"); - fieldNamesToSkip.add("authz"); fieldNamesToSkip.add("security"); fieldNamesToSkip.add("webSiteId"); fieldNamesToSkip.add("userLogin"); Modified: ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/form/ModelForm.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/form/ModelForm.java?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/form/ModelForm.java (original) +++ ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/form/ModelForm.java Tue Aug 7 06:25:59 2012 @@ -1509,6 +1509,9 @@ public class ModelForm extends ModelWidg if (itemIndex < lowIndex) { continue; } + + // reset/remove the BshInterpreter now as well as later because chances are there is an interpreter at this level of the stack too + this.resetBshInterpreter(context); Map<String, Object> itemMap = UtilGenerics.checkMap(item); MapStack<String> localContext = MapStack.create(context); Modified: ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java (original) +++ ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java Tue Aug 7 06:25:59 2012 @@ -39,7 +39,6 @@ import org.ofbiz.entity.GenericValue; import org.ofbiz.entityext.permission.EntityPermissionChecker; import org.ofbiz.minilang.operation.BaseCompare; import org.ofbiz.security.Security; -import org.ofbiz.security.authz.Authorization; import org.ofbiz.service.DispatchContext; import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.LocalDispatcher; @@ -310,18 +309,15 @@ public class ModelMenuCondition { if (userLogin != null) { String permission = permissionExdr.expandString(context); String action = actionExdr.expandString(context); - - Authorization authz = (Authorization) context.get("authz"); Security security = (Security) context.get("security"); if (UtilValidate.isNotEmpty(action)) { - //Debug.logWarning("Deprecated method hasEntityPermission() was called; the action field should no longer be used", module); // run hasEntityPermission if (security.hasEntityPermission(permission, action, userLogin)) { return true; } } else { // run hasPermission - if (authz.hasPermission(userLogin.getString("userLoginId"), permission, context)) { + if (security.hasPermission(permission, userLogin)) { return true; } } Modified: ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java (original) +++ ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java Tue Aug 7 06:25:59 2012 @@ -339,7 +339,7 @@ public class ModelScreen extends ModelWi * - autoUserLogin (if a user is automatically logged in, ie no password has been entered) * - formStringRenderer * - request, response, session, application (special case, only in HTML contexts, etc) - * - delegator, dispatcher, authz, security + * - delegator, dispatcher, security * - null (represents a null field value for entity operations) * - sections (used for decorators to reference the sections to be decorated and render them) * @param screenStringRenderer An implementation of the ScreenStringRenderer Modified: ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java (original) +++ ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java Tue Aug 7 06:25:59 2012 @@ -41,7 +41,6 @@ import org.ofbiz.entity.GenericValue; import org.ofbiz.entityext.permission.EntityPermissionChecker; import org.ofbiz.minilang.operation.BaseCompare; import org.ofbiz.security.Security; -import org.ofbiz.security.authz.Authorization; import org.ofbiz.service.DispatchContext; import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.LocalDispatcher; @@ -308,18 +307,15 @@ public class ModelScreenCondition implem if (userLogin != null) { String permission = permissionExdr.expandString(context); String action = actionExdr.expandString(context); - - Authorization authz = (Authorization) context.get("authz"); Security security = (Security) context.get("security"); if (UtilValidate.isNotEmpty(action)) { - //Debug.logWarning("Deprecated method hasEntityPermission() was called; the action field should no longer be used", module); // run hasEntityPermission if (security.hasEntityPermission(permission, action, userLogin)) { return true; } } else { // run hasPermission - if (authz.hasPermission(userLogin.getString("userLoginId"), permission, context)) { + if (security.hasPermission(permission, userLogin)) { return true; } } Modified: ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java (original) +++ ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java Tue Aug 7 06:25:59 2012 @@ -49,7 +49,6 @@ import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntity; import org.ofbiz.entity.GenericValue; import org.ofbiz.security.Security; -import org.ofbiz.security.authz.Authorization; import org.ofbiz.service.DispatchContext; import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.LocalDispatcher; @@ -145,11 +144,11 @@ public class ScreenRenderer { return this.screenStringRenderer; } - public void populateBasicContext(Map<String, Object> parameters, Delegator delegator, LocalDispatcher dispatcher, Authorization authz, Security security, Locale locale, GenericValue userLogin) { - populateBasicContext(context, this, parameters, delegator, dispatcher, authz, security, locale, userLogin); + public void populateBasicContext(Map<String, Object> parameters, Delegator delegator, LocalDispatcher dispatcher, Security security, Locale locale, GenericValue userLogin) { + populateBasicContext(context, this, parameters, delegator, dispatcher, security, locale, userLogin); } - public static void populateBasicContext(MapStack<String> context, ScreenRenderer screens, Map<String, Object> parameters, Delegator delegator, LocalDispatcher dispatcher, Authorization authz, Security security, Locale locale, GenericValue userLogin) { + public static void populateBasicContext(MapStack<String> context, ScreenRenderer screens, Map<String, Object> parameters, Delegator delegator, LocalDispatcher dispatcher, Security security, Locale locale, GenericValue userLogin) { // ========== setup values that should always be in a screen context // include an object to more easily render screens context.put("screens", screens); @@ -163,7 +162,6 @@ public class ScreenRenderer { context.put("parameters", parameters); context.put("delegator", delegator); context.put("dispatcher", dispatcher); - context.put("authz", authz); context.put("security", security); context.put("locale", locale); context.put("userLogin", userLogin); @@ -192,14 +190,14 @@ public class ScreenRenderer { HttpSession session = request.getSession(); // attribute names to skip for session and application attributes; these are all handled as special cases, duplicating results and causing undesired messages - Set<String> attrNamesToSkip = UtilMisc.toSet("delegator", "dispatcher", "authz", "security", "webSiteId", + Set<String> attrNamesToSkip = UtilMisc.toSet("delegator", "dispatcher", "security", "webSiteId", "org.apache.catalina.jsp_classpath"); Map<String, Object> parameterMap = UtilHttp.getCombinedMap(request, attrNamesToSkip); GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); populateBasicContext(context, screens, parameterMap, (Delegator) request.getAttribute("delegator"), - (LocalDispatcher) request.getAttribute("dispatcher"), (Authorization) request.getAttribute("authz"), + (LocalDispatcher) request.getAttribute("dispatcher"), (Security) request.getAttribute("security"), UtilHttp.getLocale(request), userLogin); context.put("autoUserLogin", session.getAttribute("autoUserLogin")); @@ -313,7 +311,7 @@ public class ScreenRenderer { } public void populateContextForService(DispatchContext dctx, Map<String, Object> serviceContext) { - this.populateBasicContext(serviceContext, dctx.getDelegator(), dctx.getDispatcher(), dctx.getAuthorization(), + this.populateBasicContext(serviceContext, dctx.getDelegator(), dctx.getDispatcher(), dctx.getSecurity(), (Locale) serviceContext.get("locale"), (GenericValue) serviceContext.get("userLogin")); } } Modified: ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java (original) +++ ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java Tue Aug 7 06:25:59 2012 @@ -39,7 +39,6 @@ import org.ofbiz.entity.GenericValue; import org.ofbiz.entityext.permission.EntityPermissionChecker; import org.ofbiz.minilang.operation.BaseCompare; import org.ofbiz.security.Security; -import org.ofbiz.security.authz.Authorization; import org.w3c.dom.Element; /** @@ -211,18 +210,15 @@ public class ModelTreeCondition { if (userLogin != null) { String permission = permissionExdr.expandString(context); String action = actionExdr.expandString(context); - - Authorization authz = (Authorization) context.get("authz"); Security security = (Security) context.get("security"); if (UtilValidate.isNotEmpty(action)) { - //Debug.logWarning("Deprecated method hasEntityPermission() was called; the action field should no longer be used", module); // run hasEntityPermission if (security.hasEntityPermission(permission, action, userLogin)) { return true; } } else { // run hasPermission - if (authz.hasPermission(userLogin.getString("userLoginId"), permission, context)) { + if (security.hasPermission(permission, userLogin)) { return true; } } Modified: ofbiz/branches/jackrabbit20120501/framework/widget/templates/htmlFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/widget/templates/htmlFormMacroLibrary.ftl (original) +++ ofbiz/branches/jackrabbit20120501/framework/widget/templates/htmlFormMacroLibrary.ftl Tue Aug 7 06:25:59 2012 @@ -592,8 +592,8 @@ Parameter: width, String or Integer, opt Parameter: height, String or Integer, optional - The height of the lookup field. Parameter: position, String, optional - The position style of the lookup field. Parameter: fadeBackground, ? -Parameter: clearText, String, optional - If the readonly parameter is true, clearText contains the text to be displayed in the field. -Parameter: showDescription, String, optional - ? (contains "true" or "false"). +Parameter: clearText, String, optional - If the readonly parameter is true, clearText contains the text to be displayed in the field, default is CommonClear label. +Parameter: showDescription, String, optional - If the showDescription parameter is true, a special span with css class "tooltip" will be created at right of the lookup button and a description will fill in (see setLookDescription in selectall.js). For now not when the lookup is read only. Parameter: initiallyCollapsed, Not used. Parameter: lastViewName, String, optional - If the ajaxEnabled parameter is true, the contents of lastViewName will be appended to the Ajax URL. --> @@ -653,45 +653,56 @@ Parameter: lastViewName, String, optiona </#if> </#if> </#if> - <script type="text/javascript"> + <script type="text/javascript"> jQuery(document).ready(function(){ - var options = { - requestUrl : "${fieldFormName}", - inputFieldId : "${id}", - dialogTarget : document.${formName?html}.${name?html}, - dialogOptionalTarget : <#if descriptionFieldName?has_content>document.${formName?html}.${descriptionFieldName}<#else>null</#if>, - formName : "${formName?html}", - width : "${width}", - height : "${height}", - position : "${position}", - modal : "${fadeBackground}", - ajaxUrl : <#if ajaxEnabled?has_content && ajaxEnabled>"${ajaxUrl}"<#else>""</#if>, - showDescription : <#if ajaxEnabled?has_content && ajaxEnabled>"${showDescription}"<#else>false</#if>, - presentation : "${presentation!}", - defaultMinLength : "${defaultMinLength!2}", - defaultDelay : "${defaultDelay!300}", - args : <#rt/> - <#if targetParameterIter?has_content> - <#assign isFirst = true> - <#lt/>, [<#rt/> - <#list targetParameterIter as item> - <#if isFirst> - <#lt/>document.${formName}.${item}<#rt/> - <#assign isFirst = false> - <#else> - <#lt/> ,document.${formName}.${item}<#rt/> - </#if> - </#list> - <#lt/>]<#rt/> - <#else>[] - </#if> - <#lt/> - }; - new Lookup(options).init(); + var options = { + requestUrl : "${fieldFormName}", + inputFieldId : "${id}", + dialogTarget : document.${formName?html}.${name?html}, + dialogOptionalTarget : <#if descriptionFieldName?has_content>document.${formName?html}.${descriptionFieldName}<#else>null</#if>, + formName : "${formName?html}", + width : "${width}", + height : "${height}", + position : "${position}", + modal : "${fadeBackground}", + ajaxUrl : <#if ajaxEnabled?has_content && ajaxEnabled>"${ajaxUrl}"<#else>""</#if>, + showDescription : <#if ajaxEnabled?has_content && ajaxEnabled>"${showDescription}"<#else>false</#if>, + presentation : "${presentation!}", + defaultMinLength : "${defaultMinLength!2}", + defaultDelay : "${defaultDelay!300}", + args : + <#rt/> + <#if targetParameterIter?has_content> + <#assign isFirst = true> + <#lt/>[<#rt/> + <#list targetParameterIter as item> + <#if isFirst> + <#lt/>document.${formName}.${item}<#rt/> + <#assign isFirst = false> + <#else> + <#lt/> ,document.${formName}.${item}<#rt/> + </#if> + </#list> + <#lt/>]<#rt/> + <#else>[] + </#if> + <#lt/> + }; + new Lookup(options).init(); }); </script> </#if> -<#if readonly?has_content && readonly><a id="${id}_clear" style="background:none;margin-left:5px;margin-right:15px;" class="clearField" href="javascript:void();" onclick="javascript:document.${formName}.${name}.value='';<#if descriptionFieldName?has_content>document.${formName}.${descriptionFieldName}.value='';</#if>">${clearText}</a></#if> +<#if readonly?has_content && readonly> + <a id="${id}_clear" + style="background:none;margin-left:5px;margin-right:15px;" + class="clearField" + href="javascript:void(0);" + onclick="javascript:document.${formName}.${name}.value=''; + jQuery('#' + jQuery('#${id}_clear').next().attr('id').replace('_button','') + '_${id}_lookupDescription').html(''); + <#if descriptionFieldName?has_content>document.${formName}.${descriptionFieldName}.value='';</#if>"> + <#if clearText?has_content>${clearText}<#else>${uiLabelMap.CommonClear}</#if> + </a> +</#if> </span> <#if ajaxEnabled?has_content && ajaxEnabled && (presentation?has_content && presentation == "window")> <#if ajaxUrl?index_of("_LAST_VIEW_NAME_") < 0> Modified: ofbiz/branches/jackrabbit20120501/macros.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/macros.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/macros.xml (original) +++ ofbiz/branches/jackrabbit20120501/macros.xml Tue Aug 7 06:25:59 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/jackrabbit20120501/specialpurpose/birt/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Aug 7 06:25:59 2012 @@ -0,0 +1 @@ +build Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/build.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/specialpurpose/build.xml (original) +++ ofbiz/branches/jackrabbit20120501/specialpurpose/build.xml Tue Aug 7 06:25:59 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/jackrabbit20120501/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml (original) +++ ofbiz/branches/jackrabbit20120501/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml Tue Aug 7 06:25:59 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/jackrabbit20120501/specialpurpose/component-load.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/component-load.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/specialpurpose/component-load.xml (original) +++ ofbiz/branches/jackrabbit20120501/specialpurpose/component-load.xml Tue Aug 7 06:25:59 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/jackrabbit20120501/specialpurpose/crowd/src/org/ofbiz/crowd/CrowdAuthenticator.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/crowd/src/org/ofbiz/crowd/CrowdAuthenticator.java?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/specialpurpose/crowd/src/org/ofbiz/crowd/CrowdAuthenticator.java (original) +++ ofbiz/branches/jackrabbit20120501/specialpurpose/crowd/src/org/ofbiz/crowd/CrowdAuthenticator.java Tue Aug 7 06:25:59 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; Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/config/EcommerceUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/config/EcommerceUiLabels.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/config/EcommerceUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/config/EcommerceUiLabels.xml Tue Aug 7 06:25:59 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/jackrabbit20120501/specialpurpose/ecommerce/data/DemoOrderTestData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/data/DemoOrderTestData.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/data/DemoOrderTestData.xml (original) +++ ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/data/DemoOrderTestData.xml Tue Aug 7 06:25:59 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/jackrabbit20120501/specialpurpose/ecommerce/data/DemoProduct.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/data/DemoProduct.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/data/DemoProduct.xml (original) +++ ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/data/DemoProduct.xml Tue Aug 7 06:25:59 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/jackrabbit20120501/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml (original) +++ ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml Tue Aug 7 06:25:59 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/jackrabbit20120501/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml (original) +++ ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml Tue Aug 7 06:25:59 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/jackrabbit20120501/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (original) +++ ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Tue Aug 7 06:25:59 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/jackrabbit20120501/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl (original) +++ ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl Tue Aug 7 06:25:59 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/jackrabbit20120501/specialpurpose/example/config/ExampleUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/example/config/ExampleUiLabels.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/specialpurpose/example/config/ExampleUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20120501/specialpurpose/example/config/ExampleUiLabels.xml Tue Aug 7 06:25:59 2012 @@ -53,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> @@ -239,13 +218,11 @@ </property> <property key="ExampleDefinitionFileTooltip"> <value xml:lang="en">framework/example/widget/example/FormWidgetExampleForms.xml</value> - <value xml:lang="fr">framework/example/widget/example/FormWidgetExampleForms.xml</value> - <value xml:lang="it">framework/example/widget/example/FormWidgetExampleForms.xml</value> </property> <property key="ExampleDefinitionName"> - <value xml:lang="en"> - see the form definition with name</value> - <value xml:lang="fr"> - voir la défintion avec la form de nom </value> - <value xml:lang="it"> - vedi la definizione della form con il nome</value> + <value xml:lang="en">See the form definition with name</value> + <value xml:lang="fr">Voir la défintion avec la form de nom </value> + <value xml:lang="it">Vedi la definizione della form con il nome</value> <value xml:lang="zh"> - åè§è¡¨åå®ä¹ï¼å称为</value> </property> <property key="ExampleDependentDropDownTooltip"> @@ -449,6 +426,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> @@ -490,9 +473,21 @@ <value xml:lang="it">Descrizione lunga</value> <value xml:lang="zh">详ç»æè¿°</value> </property> - <property key="ExampleLookupFields"> - <value xml:lang="en">Lookup Fields: First of type popup, second layered and showing use of set_values underneath, ie returning not only Id but also another value. Both using also autocomplete</value> - <value xml:lang="fr">Champs de recherche: le premier de type popup, le second de type layer avec usage sous-jacent de set_values qui permet de traiter non seulement une référence mais aussi une autre valeur. Les 2 utilisent aussi l'autocompletion</value> + <property key="ExampleLookupFields1"> + <value xml:lang="en">Popup lookup field (old way, maybe be useful in some cases, notably if javascript is not enabled)</value> + <value xml:lang="fr">Champ de recherche type popup (ancienne manière, encore utile, notamment si javascript n'est pas disponible)</value> + </property> + <property key="ExampleLookupFields2"> + <value xml:lang="en">Layered lookup field with autocompletion and description at right</value> + <value xml:lang="fr">Champs de recherche de type layer avec autocompletion et description à droite</value> + </property> + <property key="ExampleLookupFields3"> + <value xml:lang="en">Read only layered lookup field, only the button is available</value> + <value xml:lang="fr">Champs de recherche de type layer en mode lecture seule, seul le bouton est utilisable</value> + </property> + <property key="ExampleLookupFields4"> + <value xml:lang="en">Lookup Field of type layered and showing use of set_values underneath, ie returning not only Id but also another value. Both using also autocomplete</value> + <value xml:lang="fr">Champ de recherche de type layer avec usage sous-jacent de set_values qui permet de traiter non seulement une référence mais aussi une autre valeur. Les 2 utilisent aussi l'autocompletion</value> </property> <property key="ExampleLookupFieldsTitle"> <value xml:lang="en">Lookup Fields</value> Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/example/data/ExampleHelpData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/example/data/ExampleHelpData.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/specialpurpose/example/data/ExampleHelpData.xml (original) +++ ofbiz/branches/jackrabbit20120501/specialpurpose/example/data/ExampleHelpData.xml Tue Aug 7 06:25:59 2012 @@ -1,26 +1,47 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<entity-engine-xml> - -<!-- - The Example help data is located in the applications/content/data/ExampleHelpData.xml file ---> - -</entity-engine-xml> +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<entity-engine-xml> + + <DataResource dataResourceId="HELP_EXAMPLE" localeString="en" dataResourceTypeId="OFBIZ_FILE" + objectInfo="specialpurpose/example/data/helpdata/HELP_EXAMPLE.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + dataResourceName="Framework Example" mimeTypeId="text/xml" isPublic="Y" /> + <Content contentId="HELP_EXAMPLE" contentTypeId="DOCUMENT" contentName="Framework Example" templateDataResourceId="HELP_TEMPL" + dataResourceId="HELP_EXAMPLE" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> + <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_EXAMPLE" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/> + + <DataResource dataResourceId="HELP_EXAMPLE_FR" localeString="fr" dataResourceTypeId="OFBIZ_FILE" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/xml" isPublic="Y" + objectInfo="specialpurpose/example/data/helpdata/HELP_EXAMPLE_FR.xml" + dataResourceName="Exemple pour le développement" /> + <Content contentId="HELP_EXAMPLE_FR" dataResourceId="HELP_EXAMPLE_FR" contentName="Exemple pour le développement" localeString="fr" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> + <ContentAssoc contentId="HELP_EXAMPLE" contentIdTo="HELP_EXAMPLE_FR" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-01-12 01:01:01"/> + + <DataResource dataResourceId="EXAMPLE_main" localeString="en" dataResourceTypeId="OFBIZ_FILE" + objectInfo="specialpurpose/example/data/helpdata/HELP_EXAMPLE_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Example help main page" mimeTypeId="text/xml" isPublic="Y" /> + <Content contentId="EXAMPLE_main" contentTypeId="DOCUMENT" contentName="Example main menu." templateDataResourceId="HELP_TEMPL" dataResourceId="EXAMPLE_main" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> + <ContentAssoc contentId="HELP_EXAMPLE" contentIdTo="EXAMPLE_main" mapKey="EXAMPLE_main" fromDate="2006-01-12 01:01:01" contentAssocTypeId="TREE_CHILD" sequenceNum="000"/> + <ContentAssoc contentId="HELP_EXAMPLE" contentIdTo="EXAMPLE_main" mapKey="EXAMPLE_FindExample" fromDate="2006-01-12 01:01:02" sequenceNum="000" contentAssocTypeId="INSTANCE"/> + + <DataResource dataResourceId="EXAMPLE_docbook" localeString="en" dataResourceTypeId="OFBIZ_FILE" + objectInfo="specialpurpose/example/data/helpdata/HELP_EXAMPLE_docbook.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Example docBook usage" mimeTypeId="text/xml" isPublic="Y" /> + <Content contentId="EXAMPLE_docbook" contentTypeId="DOCUMENT" contentName="Example Docbook usage" templateDataResourceId="HELP_TEMPL" dataResourceId="EXAMPLE_docbook" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> + <ContentAssoc contentId="HELP_EXAMPLE" contentIdTo="EXAMPLE_docbook" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EXAMPLE_docbook"/> + + +</entity-engine-xml> Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/example/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/example/ofbiz-component.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/specialpurpose/example/ofbiz-component.xml (original) +++ ofbiz/branches/jackrabbit20120501/specialpurpose/example/ofbiz-component.xml Tue Aug 7 06:25:59 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/jackrabbit20120501/specialpurpose/example/webapp/example/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/example/webapp/example/WEB-INF/controller.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/specialpurpose/example/webapp/example/WEB-INF/controller.xml (original) +++ ofbiz/branches/jackrabbit20120501/specialpurpose/example/webapp/example/WEB-INF/controller.xml Tue Aug 7 06:25:59 2012 @@ -25,7 +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"/> <description>Example Component Site Configuration File</description> @@ -60,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"/> @@ -153,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> @@ -193,7 +192,6 @@ under the License. <request-map uri="FormWidgetExamples"><security https="true" auth="true"/><response name="success" type="view" value="FormWidgetExamples"/></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> @@ -218,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 --> @@ -254,7 +236,6 @@ under the License. <view-map name="FormWidgetExamples" type="screen" page="component://example/widget/example/FormWidgetExampleScreens.xml#FormWidgetExamples"/> <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 --> @@ -273,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/jackrabbit20120501/specialpurpose/example/widget/example/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/example/widget/example/CommonScreens.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/specialpurpose/example/widget/example/CommonScreens.xml (original) +++ ofbiz/branches/jackrabbit20120501/specialpurpose/example/widget/example/CommonScreens.xml Tue Aug 7 06:25:59 2012 @@ -70,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> @@ -87,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> @@ -139,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> @@ -156,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"> @@ -232,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/jackrabbit20120501/specialpurpose/example/widget/example/ExampleFeatureForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/example/widget/example/ExampleFeatureForms.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/specialpurpose/example/widget/example/ExampleFeatureForms.xml (original) +++ ofbiz/branches/jackrabbit20120501/specialpurpose/example/widget/example/ExampleFeatureForms.xml Tue Aug 7 06:25:59 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}"> Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/example/widget/example/ExampleFeatureScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/example/widget/example/ExampleFeatureScreens.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/specialpurpose/example/widget/example/ExampleFeatureScreens.xml (original) +++ ofbiz/branches/jackrabbit20120501/specialpurpose/example/widget/example/ExampleFeatureScreens.xml Tue Aug 7 06:25:59 2012 @@ -70,7 +70,9 @@ under the License. <widgets> <decorator-screen name="CommonExampleFeatureDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="EditExampleFeature" location="component://example/widget/example/ExampleFeatureForms.xml"/> + <screenlet title="${uiLabelMap.ExampleFeature}"> + <include-form name="EditExampleFeature" location="component://example/widget/example/ExampleFeatureForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -87,8 +89,12 @@ under the License. <widgets> <decorator-screen name="CommonExampleFeatureDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="ListExampleFeatureAppls" location="component://example/widget/example/ExampleFeatureForms.xml"/> - <include-form name="AddExampleFeatureAppl" location="component://example/widget/example/ExampleFeatureForms.xml"/> + <screenlet title="${uiLabelMap.ExampleFeaturesByExample}"> + <include-form name="ListExampleFeatureAppls" location="component://example/widget/example/ExampleFeatureForms.xml"/> + </screenlet> + <screenlet title="Add Feature To Example"> + <include-form name="AddExampleFeatureAppl" location="component://example/widget/example/ExampleFeatureForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/example/widget/example/ExampleMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/example/widget/example/ExampleMenus.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/specialpurpose/example/widget/example/ExampleMenus.xml (original) +++ ofbiz/branches/jackrabbit20120501/specialpurpose/example/widget/example/ExampleMenus.xml Tue Aug 7 06:25:59 2012 @@ -42,17 +42,13 @@ under the License. <menu-item name="ExampleGeoLocation" title="${uiLabelMap.CommonGeoLocation}"> <link target="ExampleGeoLocationPointSet1"/> </menu-item> - <menu-item name="Birt" title="${uiLabelMap.ExampleBirtExamples}"> - <link target="BirtMain"/> - </menu-item> - <menu-item name="ExampleCharts" title="Chart examples"> - <link target="ExampleBarChart"/> - </menu-item> </menu> <menu name="EditExample" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="EditExample" title="${uiLabelMap.ExampleExample}"> - <link target="EditExample"/> + <link target="EditExample"> + <parameter param-name="exampleId"/> + </link> </menu-item> <menu-item name="EditExampleItems" title="${uiLabelMap.CommonItems}"> <link target="EditExampleItems"> @@ -88,15 +84,6 @@ under the License. <menu-item name="ExampleOsmGeoLocationPointSet4" title="${uiLabelMap.OsmPointSet4}"><link target="ExampleOsmGeoLocationPointSet4"/></menu-item> </menu> - <menu name="BirtTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> - <menu-item name="Report" title="${uiLabelMap.ExampleBirtReport}"><link target="Report"/></menu-item> - <menu-item name="Export" title="${uiLabelMap.ExampleBirtViewHandler}"><link target="ViewHandler"/></menu-item> - <menu-item name="Mail" title="${uiLabelMap.ExampleBirtMail}"><link target="Mail"/></menu-item> - <!-- Reports using charts--> - <menu-item name="chartReport" title="${uiLabelMap.ExampleBirtChartReport}"><link target="chartReport"/></menu-item> - <menu-item name="chartExport" title="${uiLabelMap.ExampleBirtChartViewHandler}"><link target="chartViewHandler"/></menu-item> - </menu> - <menu name="ExampleCharts" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="ExampleBarChart" title="Bar chart"><link target="ExampleBarChart"/></menu-item> <menu-item name="ExamplePieChart" title="Pie chart"><link target="ExamplePieChart"/></menu-item> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |