You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by sa...@apache.org on 2012/06/23 09:04:30 UTC
svn commit: r1353081 [4/4] - in /ofbiz/branches/jackrabbit20120501: ./
applications/accounting/ applications/accounting/data/
applications/accounting/src/org/ofbiz/accounting/payment/
applications/accounting/webapp/accounting/payment/ applications/acco...
Modified: ofbiz/branches/jackrabbit20120501/framework/webtools/config/WebtoolsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/webtools/config/WebtoolsUiLabels.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20120501/framework/webtools/config/WebtoolsUiLabels.xml Sat Jun 23 07:04:16 2012
@@ -525,6 +525,9 @@
<value xml:lang="zh">ä»»å¡å表</value>
<value xml:lang="zh_TW">ä»»åå表</value>
</property>
+ <property key="PageTitleJobDetails">
+ <value xml:lang="en">Job Details</value>
+ </property>
<property key="PageTitleLogConfiguration">
<value xml:lang="de">Log Konfiguration</value>
<value xml:lang="en">Log Configuration</value>
@@ -823,6 +826,9 @@
<value xml:lang="zh">ç¼åç»´æ¤</value>
<value xml:lang="zh_TW">ç·©åç¶è·</value>
</property>
+ <property key="WebtoolsCacheMemory">
+ <value xml:lang="en">Cache Memory</value>
+ </property>
<property key="WebtoolsCacheName">
<value xml:lang="de">Cache Name</value>
<value xml:lang="en">Cache Name</value>
@@ -3996,6 +4002,9 @@
<value xml:lang="zh">è¿è¡æ¶é´</value>
<value xml:lang="zh_TW">éè¡æé</value>
</property>
+ <property key="WebtoolsRunTimeDataInfo">
+ <value xml:lang="en">Run Time Data Info</value>
+ </property>
<property key="WebtoolsSchedule">
<value xml:lang="de">Einplanen</value>
<value xml:lang="en">Schedule</value>
Modified: ofbiz/branches/jackrabbit20120501/framework/webtools/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/webtools/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/framework/webtools/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20120501/framework/webtools/ofbiz-component.xml Sat Jun 23 07:04:16 2012
@@ -24,7 +24,8 @@ under the License.
<resource-loader name="main" type="component"/>
<classpath type="jar" location="build/lib/*"/>
<classpath type="dir" location="config"/>
- <entity-resource type="data" reader-name="security" loader="main" location="data/WebtoolsSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/WebtoolsSecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/WebtoolsSecurityGroupDemoData.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
<webapp name="webtools"
title="WebTools"
Modified: ofbiz/branches/jackrabbit20120501/framework/webtools/webapp/webtools/WEB-INF/actions/cache/FindUtilCache.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/webtools/webapp/webtools/WEB-INF/actions/cache/FindUtilCache.groovy?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/framework/webtools/webapp/webtools/WEB-INF/actions/cache/FindUtilCache.groovy (original)
+++ ofbiz/branches/jackrabbit20120501/framework/webtools/webapp/webtools/WEB-INF/actions/cache/FindUtilCache.groovy Sat Jun 23 07:04:16 2012
@@ -23,13 +23,8 @@ import org.ofbiz.security.Security;
context.hasUtilCacheEdit = security.hasEntityPermission("UTIL_CACHE", "_EDIT", session);
-rt = Runtime.getRuntime();
-context.memory = UtilFormatOut.formatQuantity(rt.totalMemory());
-context.freeMemory = UtilFormatOut.formatQuantity(rt.freeMemory());
-context.usedMemory = UtilFormatOut.formatQuantity((rt.totalMemory() - rt.freeMemory()));
-context.maxMemory = UtilFormatOut.formatQuantity(rt.maxMemory());
-
cacheList = [];
+totalCacheMemory = 0.0;
names = new TreeSet(UtilCache.getUtilCacheTableKeySet());
names.each { cacheName ->
utilCache = UtilCache.findCache(cacheName);
@@ -48,7 +43,9 @@ names.each { cacheName ->
cache.expireTime = UtilFormatOut.formatQuantity(utilCache.getExpireTime());
cache.useSoftReference = utilCache.getUseSoftReference().toString();
cache.useFileSystemStore = utilCache.getUseFileSystemStore().toString();
-
+ cache.useFileSystemStore = utilCache.getUseFileSystemStore().toString();
+ cache.cacheMemory = utilCache.getSizeInBytes();
+ totalCacheMemory += cache.cacheMemory;
cacheList.add(cache);
}
sortField = parameters.sortField;
@@ -57,3 +54,13 @@ if (sortField) {
} else {
context.cacheList = cacheList;
}
+context.totalCacheMemory = totalCacheMemory;
+
+rt = Runtime.getRuntime();
+memoryInfo = [:];
+memoryInfo.memory = UtilFormatOut.formatQuantity(rt.totalMemory());
+memoryInfo.freeMemory = UtilFormatOut.formatQuantity(rt.freeMemory());
+memoryInfo.usedMemory = UtilFormatOut.formatQuantity((rt.totalMemory() - rt.freeMemory()));
+memoryInfo.maxMemory = UtilFormatOut.formatQuantity(rt.maxMemory());
+memoryInfo.totalCacheMemory = totalCacheMemory;
+context.memoryInfo = memoryInfo;
Modified: ofbiz/branches/jackrabbit20120501/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ ofbiz/branches/jackrabbit20120501/framework/webtools/webapp/webtools/WEB-INF/controller.xml Sat Jun 23 07:04:16 2012
@@ -277,6 +277,10 @@ under the License.
<security https="true" auth="true"/>
<response name="success" type="view" value="FindJob"/>
</request-map>
+ <request-map uri="JobDetails">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="JobDetails"/>
+ </request-map>
<request-map uri="cancelJob">
<security https="true" auth="true"/>
<event type="service" invoke="cancelScheduledJob"/>
@@ -648,6 +652,7 @@ under the License.
<view-map name="ServiceLog" type="screen" page="component://webtools/widget/LogScreens.xml#ServiceLog"/>
<view-map name="ServiceList" type="screen" page="component://webtools/widget/ServiceScreens.xml#ServiceList"/>
<view-map name="FindJob" type="screen" page="component://webtools/widget/ServiceScreens.xml#FindJob"/>
+ <view-map name="JobDetails" type="screen" page="component://webtools/widget/ServiceScreens.xml#JobDetails"/>
<view-map name="serviceResult" type="screen" page="component://webtools/widget/ServiceScreens.xml#ServiceResult"/>
<view-map name="threadList" type="screen" page="component://webtools/widget/ServiceScreens.xml#ThreadList"/>
<view-map name="scheduleJob" type="screen" page="component://webtools/widget/ServiceScreens.xml#ScheduleJob"/>
Modified: ofbiz/branches/jackrabbit20120501/framework/webtools/widget/CacheForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/webtools/widget/CacheForms.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/framework/webtools/widget/CacheForms.xml (original)
+++ ofbiz/branches/jackrabbit20120501/framework/webtools/widget/CacheForms.xml Sat Jun 23 07:04:16 2012
@@ -21,6 +21,13 @@ under the License.
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+ <form name="MemoryInfo" type="single" default-map-name="memoryInfo">
+ <field name="memory" title="${uiLabelMap.WebtoolsTotalMemory}"><display/></field>
+ <field name="maxMemory" title="${uiLabelMap.WebtoolsMaxMemory}"><display/></field>
+ <field name="freeMemory" title="${uiLabelMap.WebtoolsFreeMemory}"><display/></field>
+ <field name="usedMemory" title="${uiLabelMap.WebtoolsUsedMemory}"><display/></field>
+ <field name="totalCacheMemory" title="${uiLabelMap.WebtoolsCacheMemory}"><display/></field>
+ </form>
<form name="ListCache" type="list" list-name="cacheList" paginate-target="FindUtilCache" separate-columns="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2">
<field name="cacheName" title="${uiLabelMap.WebtoolsCacheName}" sort-field="true"><display/></field>
<field name="cacheSize" title="${uiLabelMap.WebtoolsSize}" sort-field="true"><display/></field>
@@ -31,6 +38,7 @@ under the License.
<field name="expireTime" title="${uiLabelMap.WebtoolsExpireTime}" sort-field="true"><display/></field>
<field name="useSoftReference" title="${uiLabelMap.WebtoolsUseSoftRef}" sort-field="true"><display/></field>
<field name="useFileSystemStore" title="${uiLabelMap.WebtoolsUseFileStore}" sort-field="true"><display/></field>
+ <field name="cacheMemory" title="${uiLabelMap.WebtoolsCacheMemory}" sort-field="true"><display/></field>
<field name="administration" title=" " widget-style="buttontext" use-when="hasUtilCacheEdit">
<hyperlink description="${uiLabelMap.WebtoolsElements}" target="FindUtilCacheElements">
<parameter param-name="UTIL_CACHE_NAME" from-field="cacheName"/>
Modified: ofbiz/branches/jackrabbit20120501/framework/webtools/widget/CacheScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/webtools/widget/CacheScreens.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/framework/webtools/widget/CacheScreens.xml (original)
+++ ofbiz/branches/jackrabbit20120501/framework/webtools/widget/CacheScreens.xml Sat Jun 23 07:04:16 2012
@@ -36,9 +36,10 @@ under the License.
<if-has-permission permission="UTIL_CACHE" action="_VIEW"/>
</condition>
<widgets>
+ <screenlet title="${uiLabelMap.WebtoolsMemory}">
+ <include-form name="MemoryInfo" location="component://webtools/widget/CacheForms.xml"/>
+ </screenlet>
<screenlet>
- <label>${uiLabelMap.WebtoolsMemory} ${uiLabelMap.WebtoolsTotalMemory} ${memory} ${uiLabelMap.WebtoolsFreeMemory} ${freeMemory} ${uiLabelMap.WebtoolsUsedMemory} ${usedMemory}
- ${uiLabelMap.WebtoolsMaxMemory} ${maxMemory}</label>
<include-menu name="FindCache" location="component://webtools/widget/Menus.xml"/>
<include-form name="ListCache" location="component://webtools/widget/CacheForms.xml"/>
<include-menu name="FindCache" location="component://webtools/widget/Menus.xml"/>
Modified: ofbiz/branches/jackrabbit20120501/framework/webtools/widget/ServiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/webtools/widget/ServiceForms.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/framework/webtools/widget/ServiceForms.xml (original)
+++ ofbiz/branches/jackrabbit20120501/framework/webtools/widget/ServiceForms.xml Sat Jun 23 07:04:16 2012
@@ -82,7 +82,11 @@ under the License.
</service>
</actions>
<field name="jobName" title="${uiLabelMap.WebtoolsJob}" sort-field="true"><display/></field>
- <field name="jobId" title="${uiLabelMap.CommonId}" sort-field="true"><display/></field>
+ <field name="jobId" title="${uiLabelMap.CommonId}" sort-field="true">
+ <hyperlink also-hidden="false" description="${jobId}" target="JobDetails">
+ <parameter param-name="jobId" from-field="jobId"/>
+ </hyperlink>
+ </field>
<field name="poolId" title="${uiLabelMap.WebtoolsPool}" sort-field="true"><display/></field>
<field name="runTime" title="${uiLabelMap.WebtoolsRunTime}" sort-field="true"><display/></field>
<field name="startDateTime" title="${uiLabelMap.CommonStartDateTime}" sort-field="true"><display/></field>
@@ -99,6 +103,13 @@ under the License.
</hyperlink>
</field>
</form>
+ <form name="JobDetails" type="single">
+ <auto-fields-entity entity-name="JobSandbox" map-name="job" default-field-type="display"/>
+ </form>
+ <form name="JobRuntimeDataInfo" type="list" list-name="runtimeInfoList" default-table-style="basic-table hover-bar" paginate="false">
+ <field name="key"><display/></field>
+ <field name="value"><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>
Modified: ofbiz/branches/jackrabbit20120501/framework/webtools/widget/ServiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/webtools/widget/ServiceScreens.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/framework/webtools/widget/ServiceScreens.xml (original)
+++ ofbiz/branches/jackrabbit20120501/framework/webtools/widget/ServiceScreens.xml Sat Jun 23 07:04:16 2012
@@ -70,6 +70,27 @@ under the License.
</widgets>
</section>
</screen>
+ <screen name="JobDetails">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleJobDetails"/>
+ <set field="tabButtonItem" value="findJob"/>
+ <script location="component://webtools/webapp/webtools/WEB-INF/actions/service/JobDetails.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonServiceDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet title="${uiLabelMap.PageTitleJobDetails}">
+ <include-form name="JobDetails" location="component://webtools/widget/ServiceForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.WebtoolsRunTimeDataInfo}">
+ <include-form name="JobRuntimeDataInfo" location="component://webtools/widget/ServiceForms.xml"/>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="ThreadList">
<section>
Modified: ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/form/FormFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/form/FormFactory.java?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/form/FormFactory.java (original)
+++ ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/form/FormFactory.java Sat Jun 23 07:04:16 2012
@@ -47,8 +47,8 @@ import org.xml.sax.SAXException;
public class FormFactory {
public static final String module = FormFactory.class.getName();
- public static final UtilCache<String, ModelForm> formLocationCache = UtilCache.createUtilCache("widget.form.locationResource", 0, 0, false);
- public static final UtilCache<String, ModelForm> formWebappCache = UtilCache.createUtilCache("widget.form.webappResource", 0, 0, false);
+ private static final UtilCache<String, ModelForm> formLocationCache = UtilCache.createUtilCache("widget.form.locationResource", 0, 0, false);
+ private static final UtilCache<String, ModelForm> formWebappCache = UtilCache.createUtilCache("widget.form.webappResource", 0, 0, false);
public static Map<String, ModelForm> getFormsFromLocation(String resourceName, ModelReader entityModelReader, DispatchContext dispatchContext)
throws IOException, SAXException, ParserConfigurationException {
@@ -68,24 +68,19 @@ public class FormFactory {
String cacheKey = resourceName + "#" + formName;
ModelForm modelForm = formLocationCache.get(cacheKey);
if (modelForm == null) {
- synchronized (formLocationCache) {
- modelForm = formLocationCache.get(cacheKey);
- if (modelForm == null) {
- /*
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- if (loader == null) {
- loader = FormFactory.class.getClassLoader();
- }
- */
- URL formFileUrl = FlexibleLocation.resolveLocation(resourceName); //, loader);
- Document formFileDoc = UtilXml.readXmlDocument(formFileUrl, true, true);
- if (formFileDoc == null) {
- throw new IllegalArgumentException("Could not find resource [" + resourceName + "]");
- }
- modelForm = createModelForm(formFileDoc, entityModelReader, dispatchContext, resourceName, formName);
- formLocationCache.put(cacheKey, modelForm);
- }
+ /*
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ if (loader == null) {
+ loader = FormFactory.class.getClassLoader();
+ }
+ */
+ URL formFileUrl = FlexibleLocation.resolveLocation(resourceName); //, loader);
+ Document formFileDoc = UtilXml.readXmlDocument(formFileUrl, true, true);
+ if (formFileDoc == null) {
+ throw new IllegalArgumentException("Could not find resource [" + resourceName + "]");
}
+ modelForm = createModelForm(formFileDoc, entityModelReader, dispatchContext, resourceName, formName);
+ modelForm = formLocationCache.putIfAbsentAndGet(cacheKey, modelForm);
}
if (modelForm == null) {
throw new IllegalArgumentException("Could not find form with name [" + formName + "] in class resource [" + resourceName + "]");
@@ -99,20 +94,15 @@ public class FormFactory {
String cacheKey = webappName + "::" + resourceName + "::" + formName;
ModelForm modelForm = formWebappCache.get(cacheKey);
if (modelForm == null) {
- synchronized (formWebappCache) {
- modelForm = formWebappCache.get(cacheKey);
- if (modelForm == null) {
- ServletContext servletContext = (ServletContext) request.getAttribute("servletContext");
- Delegator delegator = (Delegator) request.getAttribute("delegator");
- LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
- URL formFileUrl = servletContext.getResource(resourceName);
- Document formFileDoc = UtilXml.readXmlDocument(formFileUrl, true, true);
- Element formElement = UtilXml.firstChildElement(formFileDoc.getDocumentElement(), "form", "name", formName);
- modelForm = new ModelForm(formElement, delegator.getModelReader(), dispatcher.getDispatchContext());
- modelForm.setFormLocation(resourceName);
- formWebappCache.put(cacheKey, modelForm);
- }
- }
+ ServletContext servletContext = (ServletContext) request.getAttribute("servletContext");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
+ LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
+ URL formFileUrl = servletContext.getResource(resourceName);
+ Document formFileDoc = UtilXml.readXmlDocument(formFileUrl, true, true);
+ Element formElement = UtilXml.firstChildElement(formFileDoc.getDocumentElement(), "form", "name", formName);
+ modelForm = new ModelForm(formElement, delegator.getModelReader(), dispatcher.getDispatchContext());
+ modelForm.setFormLocation(resourceName);
+ modelForm = formWebappCache.putIfAbsentAndGet(cacheKey, modelForm);
}
if (modelForm == null) {
throw new IllegalArgumentException("Could not find form with name [" + formName + "] in webapp resource [" + resourceName + "] in the webapp [" + webappName + "]");
@@ -131,13 +121,8 @@ public class FormFactory {
String cacheKey = formLocation + "#" + formName;
ModelForm modelForm = formLocationCache.get(cacheKey);
if (modelForm == null) {
- synchronized (formLocationCache) {
- modelForm = formLocationCache.get(cacheKey);
- if (modelForm == null) {
- modelForm = createModelForm(formElement, entityModelReader, dispatchContext, formLocation, formName);
- formLocationCache.put(cacheKey, modelForm);
- }
- }
+ modelForm = createModelForm(formElement, entityModelReader, dispatchContext, formLocation, formName);
+ modelForm = formLocationCache.putIfAbsentAndGet(cacheKey, modelForm);
}
modelFormMap.put(formName, modelForm);
}
Modified: ofbiz/branches/jackrabbit20120501/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/branches/jackrabbit20120501/framework/widget/templates/htmlFormMacroLibrary.ftl Sat Jun 23 07:04:16 2012
@@ -652,23 +652,41 @@ Parameter: lastViewName, String, optiona
</#if>
</#if>
</#if>
- <script type="text/javascript">
+ <script type="text/javascript">
jQuery(document).ready(function(){
- new ConstructLookup("${fieldFormName}", "${id}", document.${formName?html}.${name?html}, <#if descriptionFieldName?has_content>document.${formName?html}.${descriptionFieldName}<#else>null</#if>, "${formName?html}", "${width}", "${height}", "${position}", "${fadeBackground}", <#if ajaxEnabled?has_content && ajaxEnabled>"${ajaxUrl}", ${showDescription}<#else>"", false</#if>, "${presentation!}", "${defaultMinLength!2}", "${defaultDelay!300}"<#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/>
- </#if>
- <#lt/>);
+ 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>
Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/assetmaint/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/assetmaint/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/specialpurpose/assetmaint/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20120501/specialpurpose/assetmaint/ofbiz-component.xml Sat Jun 23 07:04:16 2012
@@ -32,7 +32,8 @@
<!-- entity resources: model(s), eca(s), group, and data definitions -->
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
- <entity-resource type="data" reader-name="security" loader="main" location="data/AssetMaintSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/AssetMaintSecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/AssetMaintSecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/AssetMaintSeedData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoAssetMaintData.xml"/>
Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/ebay/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/ebay/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/specialpurpose/ebay/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20120501/specialpurpose/ebay/ofbiz-component.xml Sat Jun 23 07:04:16 2012
@@ -26,7 +26,8 @@ under the License.
<classpath type="jar" location="build/lib/*"/>
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
- <entity-resource type="data" reader-name="security" loader="main" location="data/EbaySecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/EbaySecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/EbaySecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/EbayTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/EbayHelpData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoEbayData.xml"/>
Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/ebaystore/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/ebaystore/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/specialpurpose/ebaystore/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20120501/specialpurpose/ebaystore/ofbiz-component.xml Sat Jun 23 07:04:16 2012
@@ -28,7 +28,8 @@ under the License.
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
- <entity-resource type="data" reader-name="security" loader="main" location="data/EbayStoreSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/EbayStoreSecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/EbayStoreSecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/EbayStoreTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/EbayStoreHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/EbayStorePortletData.xml"/>
Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/ofbiz-component.xml Sat Jun 23 07:04:16 2012
@@ -25,7 +25,7 @@ under the License.
<classpath type="jar" location="build/lib/*"/>
<classpath type="dir" location="config"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/EcommerceTypeData.xml"/>
- <entity-resource type="data" reader-name="security" loader="main" location="data/EcommerceSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/EcommerceSecurityData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoProduct.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoSurvey.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoRentalShipping.xml"/>
Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/widget/CommonScreens.xml Sat Jun 23 07:04:16 2012
@@ -43,11 +43,11 @@ under the License.
<set field="initialLocaleComplete" type="String" value="${groovy:parameters?.userLogin?.lastLocale}" default-value="${groovy:locale.toString()}"/>
<set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.dateTime.getFilePath(initialLocaleComplete)}" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.7.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-1.0.0.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.16.custom.min.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.7.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.7.2.min.js" global="true"/>
<script location="component://ecommerce/widget/EcommerceSetup.groovy"/>
@@ -262,7 +262,7 @@ under the License.
<set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.7.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.7.2.min.js" global="true"/>
<script location="component://ecommerce/widget/EcommerceSetup.groovy"/>
Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/example/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/example/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/specialpurpose/example/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20120501/specialpurpose/example/ofbiz-component.xml Sat Jun 23 07:04:16 2012
@@ -36,7 +36,8 @@ under the License.
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_view.xml"/>
<!-- <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/> -->
<entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleTypeData.xml"/>
- <entity-resource type="data" reader-name="security" loader="main" location="data/ExampleSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleSecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/ExampleSecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ExamplePortletData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ExamplePortalSeedData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleHelpData.xml"/>
Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/example/webapp/example/flot/flotPie.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/example/webapp/example/flot/flotPie.ftl?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/specialpurpose/example/webapp/example/flot/flotPie.ftl (original)
+++ ofbiz/branches/jackrabbit20120501/specialpurpose/example/webapp/example/flot/flotPie.ftl Sat Jun 23 07:04:16 2012
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
-<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
+<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/googlebase/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/googlebase/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/specialpurpose/googlebase/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20120501/specialpurpose/googlebase/ofbiz-component.xml Sat Jun 23 07:04:16 2012
@@ -27,7 +27,8 @@ under the License.
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/GoogleBaseTypeData.xml"/>
- <entity-resource type="data" reader-name="security" loader="main" location="data/GoogleBaseSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/GoogleBaseSecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/GoogleBaseSecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoGoogleBaseData.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/googlecheckout/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/googlecheckout/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/specialpurpose/googlecheckout/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20120501/specialpurpose/googlecheckout/ofbiz-component.xml Sat Jun 23 07:04:16 2012
@@ -28,7 +28,8 @@
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/GoogleCheckoutTypeData.xml"/>
- <entity-resource type="data" reader-name="security" loader="main" location="data/GoogleCheckoutSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/GoogleCheckoutSecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/GoogleCheckoutSecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoGoogleCheckoutData.xml"/>
<service-resource type="model" loader="main" location="servicedef/services_request.xml"/>
Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/hhfacility/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/hhfacility/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/specialpurpose/hhfacility/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20120501/specialpurpose/hhfacility/ofbiz-component.xml Sat Jun 23 07:04:16 2012
@@ -24,7 +24,8 @@ under the License.
<resource-loader name="main" type="component"/>
<classpath type="jar" location="build/lib/*"/>
- <entity-resource type="data" reader-name="security" loader="main" location="data/HhFacilitySecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/HhFacilitySecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/HhFacilitySecurityGroupDemoData.xml"/>
<service-resource type="model" loader="main" location="servicedef/services_hhfacility.xml"/>
Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl (original)
+++ ofbiz/branches/jackrabbit20120501/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl Sat Jun 23 07:04:16 2012
@@ -24,7 +24,7 @@ under the License.
<meta charset="utf-8" />
<title>${applicationTitle?if_exists}</title>
<link rel="stylesheet" href="/images/jquery/jquery.mobile-1.1.0-rc.1/jquery.mobile-1.1.0-rc.1.css" />
- <script src="/images/jquery/jquery-1.7.min.js" type="text/javascript"></script>
+ <script src="/images/jquery/jquery-1.7.2.min.js" type="text/javascript"></script>
<script src="/images/jquery/jquery.mobile-1.1.0-rc.1/jquery.mobile-1.1.0-rc.1.js" type="text/javascript"></script>
<meta name="viewport" content="width=device-width, initial-scale=1">
</head>
Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/myportal/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/myportal/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/specialpurpose/myportal/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20120501/specialpurpose/myportal/ofbiz-component.xml Sat Jun 23 07:04:16 2012
@@ -24,7 +24,8 @@
<resource-loader name="main" type="component"/>
<classpath type="dir" location="config"/>
- <entity-resource type="data" reader-name="security" loader="main" location="data/MyPortalSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/MyPortalSecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/MyPortalSecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/MyPortalPageDemoData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/MyPortalDemoData.xml"/>
Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/oagis/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/oagis/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/specialpurpose/oagis/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20120501/specialpurpose/oagis/ofbiz-component.xml Sat Jun 23 07:04:16 2012
@@ -28,7 +28,8 @@ under the License.
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/OagisTypeData.xml"/>
- <entity-resource type="data" reader-name="security" loader="main" location="data/OagisSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/OagisSecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/OagisSecurityGroupDemoData.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
<!-- Uncomment To activate automatic messaging to the partner
Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/ofbizwebsite/template/HtmlHead.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/ofbizwebsite/template/HtmlHead.ftl?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/specialpurpose/ofbizwebsite/template/HtmlHead.ftl (original)
+++ ofbiz/branches/jackrabbit20120501/specialpurpose/ofbizwebsite/template/HtmlHead.ftl Sat Jun 23 07:04:16 2012
@@ -28,7 +28,7 @@ under the License.
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
<title>${(uiLabelMap.OfbizTitle)!"OFBiz, The Apache Open For Business Project"}</title>
<link rel="shortcut icon" href="/ofbiz/images/favicon.ico">
- <script language="javascript" src="/images/jquery/jquery-1.7.min.js" type="text/javascript"></script>
+ <script language="javascript" src="/images/jquery/jquery-1.7.2.min.js" type="text/javascript"></script>
<script language="javascript" src="/images/fieldlookup.js" type="text/javascript"></script>
<script language="javascript" src="/images/selectall.js" type="text/javascript"></script>
<script language="javascript" src="/ofbiz/script/search.js" type="text/javascript"></script>
Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/pos/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/pos/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/specialpurpose/pos/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20120501/specialpurpose/pos/ofbiz-component.xml Sat Jun 23 07:04:16 2012
@@ -29,7 +29,7 @@ under the License.
<classpath type="jar" location="build/lib/*"/>
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
- <entity-resource type="data" reader-name="security" loader="main" location="data/PosSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/PosSecurityData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/PosTypeData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoRetail.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/PosSyncSettings.xml"/>
Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/projectmgr/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/projectmgr/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/specialpurpose/projectmgr/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20120501/specialpurpose/projectmgr/ofbiz-component.xml Sat Jun 23 07:04:16 2012
@@ -29,7 +29,8 @@ under the License.
<entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrHelpData.xml"/>
- <entity-resource type="data" reader-name="security" loader="main" location="data/ProjectMgrSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrSecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/ProjectMgrSecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrPortletData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/ProjectMgrDemoData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/ProjectMgrDemoPasswordData.xml"/>
Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/scrum/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/scrum/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/specialpurpose/scrum/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20120501/specialpurpose/scrum/ofbiz-component.xml Sat Jun 23 07:04:16 2012
@@ -35,7 +35,8 @@ under the License.
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
<!-- <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/> -->
<entity-resource type="data" reader-name="seed" loader="main" location="data/scrumTypeData.xml"/>
- <entity-resource type="data" reader-name="security" loader="main" location="data/scrumSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/scrumSecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/scrumSecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/scrumHelpData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/scrumDemoData.xml"/>
Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/webpos/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/webpos/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/specialpurpose/webpos/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20120501/specialpurpose/webpos/ofbiz-component.xml Sat Jun 23 07:04:16 2012
@@ -26,7 +26,8 @@ under the License.
<classpath type="jar" location="build/lib/*"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoPosData.xml"/>
- <entity-resource type="data" reader-name="security" loader="main" location="data/WebPosSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/WebPosSecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/WebPosSecurityGroupDemoData.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
<service-resource type="model" loader="main" location="servicedef/services_cart.xml"/>
Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/workflow/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/workflow/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/specialpurpose/workflow/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20120501/specialpurpose/workflow/ofbiz-component.xml Sat Jun 23 07:04:16 2012
@@ -28,7 +28,8 @@ under the License.
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
- <entity-resource type="data" reader-name="security" loader="main" location="data/WorkFlowSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkFlowSecurityPermissionSeedData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/WorkFlowSecurityGroupDemoData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/WorkFlowTypeData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/OrderProcessWorkflow.xml"/>
Modified: ofbiz/branches/jackrabbit20120501/themes/bizznesstime/webapp/bizznesstime/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/themes/bizznesstime/webapp/bizznesstime/css/style.css?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/themes/bizznesstime/webapp/bizznesstime/css/style.css (original)
+++ ofbiz/branches/jackrabbit20120501/themes/bizznesstime/webapp/bizznesstime/css/style.css Sat Jun 23 07:04:16 2012
@@ -2160,14 +2160,12 @@ height:22px;
}
/* css for timepicker */
-.ui-timepicker-div .ui-widget-header{ margin-bottom: 8px; }
-.ui-timepicker-div dl{ text-align: left; }
-.ui-timepicker-div dl dt{ height: 25px; }
-.ui-timepicker-div dl dd{ margin: -25px 0 10px 65px; }
-.ui-timepicker-div .ui_tpicker_hour div { padding-right: 2px; }
-.ui-timepicker-div .ui_tpicker_minute div { padding-right: 6px; }
-.ui-timepicker-div .ui_tpicker_second div { padding-right: 6px; }
+.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+.ui-timepicker-div dl { text-align: left; }
+.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
+.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
.ui-timepicker-div td { font-size: 90%; }
+.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
/* From http://jqueryui.com/demos/autocomplete/maxheight.html */
/* When displaying a long list of options, you can simply set the max-height for the autocomplete menu to prevent the menu from growing too large */
Modified: ofbiz/branches/jackrabbit20120501/themes/bluelight/webapp/bluelight/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/themes/bluelight/webapp/bluelight/style.css?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/themes/bluelight/webapp/bluelight/style.css (original)
+++ ofbiz/branches/jackrabbit20120501/themes/bluelight/webapp/bluelight/style.css Sat Jun 23 07:04:16 2012
@@ -2664,14 +2664,12 @@ height:22px;
}
/* css for timepicker */
-.ui-timepicker-div .ui-widget-header{ margin-bottom: 8px; }
-.ui-timepicker-div dl{ text-align: left; }
-.ui-timepicker-div dl dt{ height: 25px; }
-.ui-timepicker-div dl dd{ margin: -25px 0 10px 65px; }
-.ui-timepicker-div .ui_tpicker_hour div { padding-right: 2px; }
-.ui-timepicker-div .ui_tpicker_minute div { padding-right: 6px; }
-.ui-timepicker-div .ui_tpicker_second div { padding-right: 6px; }
+.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+.ui-timepicker-div dl { text-align: left; }
+.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
+.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
.ui-timepicker-div td { font-size: 90%; }
+.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
/*=================== For the quickadd page =================================*/
.quickaddall{
Modified: ofbiz/branches/jackrabbit20120501/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css (original)
+++ ofbiz/branches/jackrabbit20120501/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css Sat Jun 23 07:04:16 2012
@@ -2663,14 +2663,12 @@ height:22px;
}
/* css for timepicker */
-.ui-timepicker-div .ui-widget-header{ margin-bottom: 8px; }
-.ui-timepicker-div dl{ text-align: left; }
-.ui-timepicker-div dl dt{ height: 25px; }
-.ui-timepicker-div dl dd{ margin: -25px 0 10px 65px; }
-.ui-timepicker-div .ui_tpicker_hour div { padding-right: 2px; }
-.ui-timepicker-div .ui_tpicker_minute div { padding-right: 6px; }
-.ui-timepicker-div .ui_tpicker_second div { padding-right: 6px; }
+.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+.ui-timepicker-div dl { text-align: left; }
+.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
+.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
.ui-timepicker-div td { font-size: 90%; }
+.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
/*=================== For the quickadd page =================================*/
.quickaddall{
Modified: ofbiz/branches/jackrabbit20120501/themes/flatgrey/webapp/flatgrey/javascript.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/themes/flatgrey/webapp/flatgrey/javascript.css?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/themes/flatgrey/webapp/flatgrey/javascript.css (original)
+++ ofbiz/branches/jackrabbit20120501/themes/flatgrey/webapp/flatgrey/javascript.css Sat Jun 23 07:04:16 2012
@@ -685,11 +685,9 @@ width: 18px;
}
/* css for timepicker */
-.ui-timepicker-div .ui-widget-header{ margin-bottom: 8px; }
-.ui-timepicker-div dl{ text-align: left; }
-.ui-timepicker-div dl dt{ height: 25px; }
-.ui-timepicker-div dl dd{ margin: -25px 0 10px 65px; }
-.ui-timepicker-div .ui_tpicker_hour div { padding-right: 2px; }
-.ui-timepicker-div .ui_tpicker_minute div { padding-right: 6px; }
-.ui-timepicker-div .ui_tpicker_second div { padding-right: 6px; }
+.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+.ui-timepicker-div dl { text-align: left; }
+.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
+.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
.ui-timepicker-div td { font-size: 90%; }
+.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
Modified: ofbiz/branches/jackrabbit20120501/themes/multiflex/webapp/multiflex/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/themes/multiflex/webapp/multiflex/style.css?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/themes/multiflex/webapp/multiflex/style.css (original)
+++ ofbiz/branches/jackrabbit20120501/themes/multiflex/webapp/multiflex/style.css Sat Jun 23 07:04:16 2012
@@ -2742,14 +2742,12 @@ height:22px;
}
/* css for timepicker */
-.ui-timepicker-div .ui-widget-header{ margin-bottom: 8px; }
-.ui-timepicker-div dl{ text-align: left; }
-.ui-timepicker-div dl dt{ height: 25px; }
-.ui-timepicker-div dl dd{ margin: -25px 0 10px 65px; }
-.ui-timepicker-div .ui_tpicker_hour div { padding-right: 2px; }
-.ui-timepicker-div .ui_tpicker_minute div { padding-right: 6px; }
-.ui-timepicker-div .ui_tpicker_second div { padding-right: 6px; }
+.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+.ui-timepicker-div dl { text-align: left; }
+.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
+.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
.ui-timepicker-div td { font-size: 90%; }
+.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
/* RTL support */
.ui-datepicker-rtl { direction: rtl; }
Modified: ofbiz/branches/jackrabbit20120501/themes/tomahawk/webapp/tomahawk/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1353081&r1=1353080&r2=1353081&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/themes/tomahawk/webapp/tomahawk/css/style.css (original)
+++ ofbiz/branches/jackrabbit20120501/themes/tomahawk/webapp/tomahawk/css/style.css Sat Jun 23 07:04:16 2012
@@ -3051,14 +3051,12 @@ height:22px;
}
/* css for timepicker */
-.ui-timepicker-div .ui-widget-header{ margin-bottom: 8px; }
-.ui-timepicker-div dl{ text-align: left; }
-.ui-timepicker-div dl dt{ height: 25px; }
-.ui-timepicker-div dl dd{ margin: -25px 0 10px 65px; }
-.ui-timepicker-div .ui_tpicker_hour div { padding-right: 2px; }
-.ui-timepicker-div .ui_tpicker_minute div { padding-right: 6px; }
-.ui-timepicker-div .ui_tpicker_second div { padding-right: 6px; }
+.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+.ui-timepicker-div dl { text-align: left; }
+.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
+.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
.ui-timepicker-div td { font-size: 90%; }
+.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
/*=================== For the quickadd page =================================*/
.quickaddall{