You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/10/17 08:36:19 UTC
svn commit: r585396 - in /ofbiz/trunk/framework/webtools:
webapp/webtools/WEB-INF/ widget/
Author: jacopoc
Date: Tue Oct 16 23:36:18 2007
New Revision: 585396
URL: http://svn.apache.org/viewvc?rev=585396&view=rev
Log:
Now the Webtools application reuses the login screens defined in the common component.
Part of OFBIZ-1320
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
ofbiz/trunk/framework/webtools/widget/AvailableServicesScreens.xml
ofbiz/trunk/framework/webtools/widget/CacheScreens.xml
ofbiz/trunk/framework/webtools/widget/CommonScreens.xml
ofbiz/trunk/framework/webtools/widget/EntityScreens.xml
ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml
ofbiz/trunk/framework/webtools/widget/LogScreens.xml
ofbiz/trunk/framework/webtools/widget/MiscScreens.xml
ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml
ofbiz/trunk/framework/webtools/widget/StatsScreens.xml
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=585396&r1=585395&r2=585396&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Tue Oct 16 23:36:18 2007
@@ -43,16 +43,6 @@
</postprocessor>
-->
- <!-- Security Mappings -->
- <request-map uri="login">
- <security https="true" auth="false"/>
- <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/>
- <response name="success" type="view" value="main"/>
- <response name="requirePasswordChange" type="view" value="requirePasswordChange"/>
- <response name="error" type="view" value="login"/>
- </request-map>
- <!-- End of Security Mappings -->
-
<!-- Request Mappings -->
<!-- Begin Utility Requests -->
@@ -527,8 +517,6 @@
<!-- View Mappings -->
<view-map name="main" type="screen" page="component://webtools/widget/CommonScreens.xml#main"/>
- <view-map name="login" type="screen" page="component://webtools/widget/CommonScreens.xml#login"/>
- <view-map name="requirePasswordChange" type="screen" page="component://webtools/widget/CommonScreens.xml#requirePasswordChange"/>
<view-map name="ping" type="ftl" page="/ping.ftl"/>
<view-map name="showDateTime" type="ftl" page="/showDateTime.ftl"/>
Modified: ofbiz/trunk/framework/webtools/widget/AvailableServicesScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/AvailableServicesScreens.xml?rev=585396&r1=585395&r2=585396&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/AvailableServicesScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/AvailableServicesScreens.xml Tue Oct 16 23:36:18 2007
@@ -28,7 +28,7 @@
<script location="component://webtools/webapp/webtools/WEB-INF/actions/service/availableservices.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<widgets>
Modified: ofbiz/trunk/framework/webtools/widget/CacheScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/CacheScreens.xml?rev=585396&r1=585395&r2=585396&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/CacheScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/CacheScreens.xml Tue Oct 16 23:36:18 2007
@@ -28,7 +28,7 @@
<script location="component://webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCache.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for UTIL_CACHE, _VIEW permission -->
@@ -59,7 +59,7 @@
<script location="component://webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCacheElements.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for UTIL_CACHE, _VIEW permission -->
@@ -90,7 +90,7 @@
<script location="component://webtools/webapp/webtools/WEB-INF/actions/cache/editUtilCache.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for UTIL_CACHE, _EDIT permission -->
Modified: ofbiz/trunk/framework/webtools/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/CommonScreens.xml?rev=585396&r1=585395&r2=585396&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/CommonScreens.xml Tue Oct 16 23:36:18 2007
@@ -20,7 +20,7 @@
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
- <screen name="CommonWebtoolsDecorator">
+ <screen name="main-decorator">
<section>
<actions>
<!-- base/top/specific map first, then more common map added for shared labels -->
@@ -55,7 +55,7 @@
<set field="headerItem" value="main"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific><html><html-template location="component://webtools/webapp/webtools/main.ftl"/></html></platform-specific>
</decorator-section>
@@ -63,32 +63,6 @@
</widgets>
</section>
</screen>
- <screen name="login">
- <section>
- <widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <platform-specific>
- <html><html-template location="component://common/webcommon/login.ftl"/></html>
- </platform-specific>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="requirePasswordChange">
- <section>
- <widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <platform-specific>
- <html><html-template location="component://common/webcommon/changePassword.ftl"/></html>
- </platform-specific>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
<screen name="printStart">
<section>
<widgets>
@@ -110,7 +84,7 @@
<set field="titleProperty" value="WebtoolsCertsX509"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://webtools/webapp/webtools/cert/viewbrowsercerts.ftl"/></html>
Modified: ofbiz/trunk/framework/webtools/widget/EntityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/EntityScreens.xml?rev=585396&r1=585395&r2=585396&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/EntityScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/EntityScreens.xml Tue Oct 16 23:36:18 2007
@@ -37,7 +37,7 @@
<script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/EntitySQLProcessor.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://webtools/webapp/webtools/entity/EntitySQLProcessor.ftl"/></html>
@@ -62,7 +62,7 @@
<set field="results" from-field="parameters.results"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://webtools/webapp/webtools/entity/EntityExportAll.ftl"/></html>
@@ -88,7 +88,7 @@
<set field="messages" from-field="parameters.messages"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://webtools/webapp/webtools/entity/EntityImportDir.ftl"/></html>
@@ -114,7 +114,7 @@
<set field="messages" from-field="parameters.messages"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://webtools/webapp/webtools/entity/EntityImport.ftl"/></html>
@@ -140,7 +140,7 @@
<set field="messages" from-field="parameters.messages"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://webtools/webapp/webtools/entity/EntityImportReaders.ftl"/></html>
@@ -163,7 +163,7 @@
<script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/EntityMaint.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://webtools/webapp/webtools/entity/EntityMaint.ftl"/></html>
@@ -187,7 +187,7 @@
<set field="title" value="${uiLabelMap.WebtoolsFindValues}: ${entityName}"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://webtools/webapp/webtools/entity/FindGeneric.ftl"/></html>
@@ -211,7 +211,7 @@
<set field="title" value="${uiLabelMap.WebtoolsViewValue}: ${entityName}"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://webtools/webapp/webtools/entity/ViewGeneric.ftl"/></html>
@@ -235,7 +235,7 @@
<set field="title" value="${uiLabelMap.WebtoolsRelations}: ${entityName}"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://webtools/webapp/webtools/entity/ViewRelations.ftl"/></html>
@@ -337,7 +337,7 @@
<script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/CheckDb.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://webtools/webapp/webtools/entity/CheckDb.ftl"/></html>
@@ -358,7 +358,7 @@
<script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/EntityPerformanceTest.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://webtools/webapp/webtools/performance/EntityPerformanceTest.ftl"/></html>
@@ -377,7 +377,7 @@
<script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/xmldsdump.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific><html><html-template location="component://webtools/webapp/webtools/entity/xmldsdump.ftl"/></html></platform-specific>
</decorator-section>
@@ -393,7 +393,7 @@
<set field="title" value="Minerva Connection Objects"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html>
Modified: ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml?rev=585396&r1=585395&r2=585396&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml Tue Oct 16 23:36:18 2007
@@ -26,7 +26,7 @@
</actions>
<widgets>
<!-- main defines the regions of the HTML page -->
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<!-- body is the primary display for this page and is called recursively -->
<decorator-section name="body">
<section>
Modified: ofbiz/trunk/framework/webtools/widget/LogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/LogScreens.xml?rev=585396&r1=585395&r2=585396&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/LogScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/LogScreens.xml Tue Oct 16 23:36:18 2007
@@ -27,7 +27,7 @@
<script location="component://webtools/webapp/webtools/WEB-INF/actions/log/LogConfiguration.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container style="boxoutside">
<container style="boxtop">
@@ -70,7 +70,7 @@
<script location="component://webtools/webapp/webtools/WEB-INF/actions/log/LogView.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container>
<label style="head1">${uiLabelMap.WebtoolsViewLog}</label>
Modified: ofbiz/trunk/framework/webtools/widget/MiscScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/MiscScreens.xml?rev=585396&r1=585395&r2=585396&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/MiscScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/MiscScreens.xml Tue Oct 16 23:36:18 2007
@@ -27,7 +27,7 @@
<set field="titleProperty" value="WebtoolsViewComponents"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific><html><html-template location="component://webtools/webapp/webtools/component/viewComponents.ftl"/></html></platform-specific>
</decorator-section>
@@ -44,7 +44,7 @@
<script location="component://webtools/webapp/webtools/WEB-INF/actions/period/EditCustomTimePeriod.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific><html><html-template location="component://webtools/webapp/webtools/period/EditCustomTimePeriod.ftl"/></html></platform-specific>
</decorator-section>
@@ -61,7 +61,7 @@
<script location="component://webtools/webapp/webtools/WEB-INF/actions/datafile/viewdatafile.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific><html><html-template location="component://webtools/webapp/webtools/datafile/viewdatafile.ftl"/></html></platform-specific>
</decorator-section>
@@ -78,7 +78,7 @@
<script location="component://webtools/webapp/webtools/WEB-INF/actions/workflow/readxpdl.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific><html><html-template location="component://webtools/webapp/webtools/workflow/readxpdl.ftl"/></html></platform-specific>
</decorator-section>
@@ -95,7 +95,7 @@
<script location="component://webtools/webapp/webtools/WEB-INF/actions/workflow/workflowMonitor.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific><html><html-template location="component://webtools/webapp/webtools/workflow/workflowMonitor.ftl"/></html></platform-specific>
</decorator-section>
Modified: ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml?rev=585396&r1=585395&r2=585396&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml Tue Oct 16 23:36:18 2007
@@ -27,7 +27,7 @@
<set field="headerItem" value="jobs"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for WEBTOOLS, _VIEW permission -->
@@ -77,6 +77,7 @@
<set field="tabButtonItem" value="JobList"/>
<entity-condition entity-name="JobSandbox" list-name="jobs">
<order-by field-name="-runTime"/>
+ <!--<limit-range start="0" size="100"/>-->
</entity-condition>
</actions>
<widgets>
@@ -169,7 +170,7 @@
<script location="component://webtools/webapp/webtools/WEB-INF/actions/service/scheduleJob.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://webtools/webapp/webtools/service/setServiceParameter.ftl"/></html>
@@ -188,7 +189,7 @@
<script location="component://webtools/webapp/webtools/WEB-INF/actions/service/serviceResult.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://webtools/webapp/webtools/service/serviceResult.ftl"/></html>
Modified: ofbiz/trunk/framework/webtools/widget/StatsScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/StatsScreens.xml?rev=585396&r1=585395&r2=585396&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/StatsScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/StatsScreens.xml Tue Oct 16 23:36:18 2007
@@ -29,7 +29,7 @@
<script location="component://webtools/webapp/webtools/WEB-INF/actions/stats/StatsSinceStart.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<widgets>
@@ -54,7 +54,7 @@
<script location="component://webtools/webapp/webtools/WEB-INF/actions/stats/StatBinsHistory.bsh"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<widgets>