svn commit: r1353081 [2/4] - in /ofbiz/branches/jackrabbit2012
Locked
svn commit: r1353081 [2/4] - in /ofbiz/branches/jackrabbit2012
 
|
Modified: ofbiz/branches/jackrabbit20120501/applications/party/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/party/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/party/ofbiz-component.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/party/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="model" reader-name="main" loader="main" location="entitydef/entitymodel_old.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyTypeData.xml"/> - <entity-resource type="data" reader-name="security" loader="main" location="data/PartySecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/PartySecurityPermissionSeedData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/PartySecurityGroupDemoData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyGeoPointData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyPortletData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/PartyDemoData.xml"/> Modified: ofbiz/branches/jackrabbit20120501/applications/product/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/ofbiz-component.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/ofbiz-component.xml Sat Jun 23 07:04:16 2012 @@ -37,8 +37,10 @@ under the License. <entity-resource type="data" reader-name="seed" loader="main" location="data/ProductTypeData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ProductHelpData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ShipmentTypeData.xml"/> - <entity-resource type="data" reader-name="security" loader="main" location="data/ProductSecurityData.xml"/> - <entity-resource type="data" reader-name="security" loader="main" location="data/FacilitySecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/ProductSecurityPermissionSeedData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/ProductSecurityGroupDemoData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/FacilitySecurityPermissionSeedData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/FacilitySecurityGroupDemoData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/ProductDemoData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ApiSchemaDhl.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/DimensionTypeData.xml"/> Modified: ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1353081&r1=1353080&r2=1353081&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/WEB-INF/controller.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/WEB-INF/controller.xml Sat Jun 23 07:04:16 2012 @@ -2945,6 +2945,7 @@ under the License. <request-map uri="LookupDataResource"><security auth="true" https="true"/><response name="success" type="view" value="LookupDataResource"/></request-map> <request-map uri="LookupPerson"><security auth="true" https="true"/><response name="success" type="view" value="LookupPerson"/></request-map> <request-map uri="LookupPreferredContactMech"><security https="true" auth="true"/><response name="success" type="view" value="LookupPreferredContactMech"/></request-map> + <request-map uri="LookupContactList"><security https="true" auth="true"/><response name="success" type="view" value="LookupContactList"/></request-map> <!-- ================ Vendor Product Requests ================= --> <request-map uri="EditVendorProduct"> @@ -3223,6 +3224,7 @@ under the License. <view-map name="LookupDataResource" page="component://content/widget/content/DataResourceScreens.xml#LookupDataResource" type="screen"/> <view-map name="LookupPerson" page="component://party/widget/partymgr/LookupScreens.xml#LookupPerson" type="screen"/> <view-map name="LookupPreferredContactMech" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupPreferredContactMech"/> + <view-map name="LookupContactList" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupContactList"/> <!-- Image Management request mappings --> <view-map name="Imagemanagement" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#Imagemanagement"/> Modified: ofbiz/branches/jackrabbit20120501/applications/workeffort/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/workeffort/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/workeffort/ofbiz-component.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/workeffort/ofbiz-component.xml Sat Jun 23 07:04:16 2012 @@ -29,9 +29,10 @@ 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/WorkEffortTypeData.xml"/> - <entity-resource type="data" reader-name="demo" loader="main" location="data/WorkEffortDemoData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkEffortPortletData.xml"/> - <entity-resource type="data" reader-name="security" loader="main" location="data/WorkEffortSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkEffortSecurityPermissionSeedData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/WorkEffortSecurityGroupDemoData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/WorkEffortDemoData.xml"/> <service-resource type="model" loader="main" location="servicedef/services.xml"/> <service-resource type="model" loader="main" location="servicedef/services_timesheet.xml"/> <service-resource type="model" loader="main" location="servicedef/services_upgrade.xml"/> Modified: ofbiz/branches/jackrabbit20120501/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/build.xml?rev=1353081&r1=1353080&r2=1353081&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/build.xml (original) +++ ofbiz/branches/jackrabbit20120501/build.xml Sat Jun 23 07:04:16 2012 @@ -474,7 +474,6 @@ under the License. <arg value="install"/> <arg value="readers=seed"/> </java> - <echo message="Please note that security data is not loaded with this action, so all components are not accessible, either load security data for a specific component or for all components with: ./ant load-readers -Ddata-readers=security"/> </target> <target name="load-extseed" depends="build" description="Load seed, seed-initial and ext data; meant for manual/generic testing, development, or going into production with a derived system based on stock OFBiz where the ext data basically replaces the demo data"> @@ -485,7 +484,6 @@ under the License. <arg value="install"/> <arg value="readers=seed,seed-initial,ext"/> </java> - <echo message="Please note that security data is not loaded with this action, so all components are not accessible, either load security data for a specific component or for all components with: ./ant load-readers -Ddata-readers=security"/> </target> <target name="load-exttest" depends="build" description="Load seed, seed-initial, ext and ext-test data; meant for automated testing with a derived system based on stock OFBiz"> Modified: ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/util/ScriptUtil.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/util/ScriptUtil.java?rev=1353081&r1=1353080&r2=1353081&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/util/ScriptUtil.java (original) +++ ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/util/ScriptUtil.java Sat Jun 23 07:04:16 2012 @@ -184,7 +184,7 @@ public final class ScriptUtil { Debug.logVerbose("Script engine " + engine.getClass().getName() + " does not implement Compilable", module); } } - if (script != null) { + if (compiledScript != null) { parsedScripts.putIfAbsent(cacheKey, compiledScript); } } Modified: ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java?rev=1353081&r1=1353080&r2=1353081&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java (original) +++ ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java Sat Jun 23 07:04:16 2012 @@ -497,9 +497,18 @@ public class UtilCache<K, V> implements private long findSizeInBytes(Object o) { try { - return UtilObject.getByteCount(o); + if (o == null) { + if (Debug.infoOn()) Debug.logInfo("Found null object in cache: " + getName(), module); + return 0; + } + if (o instanceof Serializable) { + return UtilObject.getByteCount(o); + } else { + if (Debug.infoOn()) Debug.logInfo("Unable to compute memory size for non serializable object; returning 0 byte size for object of " + o.getClass(), module); + return 0; + } } catch (Exception e) { - e.printStackTrace(); + Debug.logWarning(e, "Unable to compute memory size for object of " + o.getClass(), module); return 0; } } Modified: ofbiz/branches/jackrabbit20120501/framework/bi/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/bi/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/bi/ofbiz-component.xml (original) +++ ofbiz/branches/jackrabbit20120501/framework/bi/ofbiz-component.xml Sat Jun 23 07:04:16 2012 @@ -25,7 +25,8 @@ under the License. <classpath type="dir" location="config"/> <classpath type="jar" location="build/lib/*"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/BiTypeData.xml"/> - <entity-resource type="data" reader-name="security" loader="main" location="data/BiSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/BiSecurityPermissionSeedData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/BiSecurityGroupDemoData.xml"/> <service-resource type="model" loader="main" location="servicedef/services.xml"/> Modified: ofbiz/branches/jackrabbit20120501/framework/common/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/common/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/common/ofbiz-component.xml (original) +++ ofbiz/branches/jackrabbit20120501/framework/common/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="model" reader-name="main" loader="main" location="entitydef/entitymodel_olap.xml"/> <entity-resource type="group" reader-name="main" loader="main" location="entitydef/entitygroup_olap.xml"/> - <entity-resource type="data" reader-name="security" loader="main" location="data/CommonSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonSecurityPermissionSeedData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/CommonSecurityGroupDemoData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonSystemPropertyData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonTypeData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/CountryCodeData.xml"/> Modified: ofbiz/branches/jackrabbit20120501/framework/common/webcommon/WEB-INF/actions/includes/GetLocaleList.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/common/webcommon/WEB-INF/actions/includes/GetLocaleList.groovy?rev=1353081&r1=1353080&r2=1353081&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/common/webcommon/WEB-INF/actions/includes/GetLocaleList.groovy (original) +++ ofbiz/branches/jackrabbit20120501/framework/common/webcommon/WEB-INF/actions/includes/GetLocaleList.groovy Sat Jun 23 07:04:16 2012 @@ -25,12 +25,26 @@ import org.ofbiz.base.util.UtilMisc; locales = [] as LinkedList; availableLocales = UtilMisc.availableLocales() +// Debug.logInfo(parameters.localeString + "==" + parameters.localeName); + if (availableLocales) { availableLocales.each { availableLocale -> locale = [:]; locale.localeName = availableLocale.getDisplayName(availableLocale); locale.localeString = availableLocale.toString(); - locales.add(locale); + if (UtilValidate.isNotEmpty(parameters.localeString)) { + if (locale.localeString.toUpperCase().contains(parameters.localeString.toUpperCase())) { + locales.add(locale); + } + } + if (UtilValidate.isNotEmpty(parameters.localeName)) { + if (locale.localeName.toUpperCase().contains(parameters.localeName.toUpperCase())) { + locales.add(locale); + } + } + if (UtilValidate.isEmpty(parameters.localeString) && UtilValidate.isEmpty(parameters.localeName)) { + locales.add(locale); + } } } Modified: ofbiz/branches/jackrabbit20120501/framework/common/webcommon/includes/flotCharts/Bars.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/common/webcommon/includes/flotCharts/Bars.ftl?rev=1353081&r1=1353080&r2=1353081&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/common/webcommon/includes/flotCharts/Bars.ftl (original) +++ ofbiz/branches/jackrabbit20120501/framework/common/webcommon/includes/flotCharts/Bars.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="<@ofbizContentUrl>/images/jquery/plugins/flot/excanvas.min.js</@ofbizContentUrl>"></script> -<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.7.min.js</@ofbizContentUrl>"></script> +<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.7.2.min.js</@ofbizContentUrl>"></script> <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/jquery.flot.js</@ofbizContentUrl>"></script> <div id="${chartId}Div" style="width:600px;height:300px;"></div> Modified: ofbiz/branches/jackrabbit20120501/framework/common/webcommon/includes/flotCharts/Pie.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/common/webcommon/includes/flotCharts/Pie.ftl?rev=1353081&r1=1353080&r2=1353081&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/common/webcommon/includes/flotCharts/Pie.ftl (original) +++ ofbiz/branches/jackrabbit20120501/framework/common/webcommon/includes/flotCharts/Pie.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="<@ofbizContentUrl>/images/jquery/plugins/flot/excanvas.min.js</@ofbizContentUrl>"></script> -<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.7.min.js</@ofbizContentUrl>"></script> +<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.7.2.min.js</@ofbizContentUrl>"></script> <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/jquery.flot.js</@ofbizContentUrl>"></script> <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/jquery.flot.pie.js</@ofbizContentUrl>"></script> Modified: ofbiz/branches/jackrabbit20120501/framework/common/webcommon/includes/lookup.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/common/webcommon/includes/lookup.ftl?rev=1353081&r1=1353080&r2=1353081&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/common/webcommon/includes/lookup.ftl (original) +++ ofbiz/branches/jackrabbit20120501/framework/common/webcommon/includes/lookup.ftl Sat Jun 23 07:04:16 2012 @@ -34,12 +34,12 @@ under the License. if (typeof(jQuery) == 'undefined') { if (!jQueryLibLoaded) { jQueryLibLoaded = true; - document.write("<scr" + "ipt type=\"text/javascript\" src=\"<@ofbizContentUrl>/images/jquery/jquery-1.7.min.js</@ofbizContentUrl>\"></scr" + "ipt>"); + document.write("<scr" + "ipt type=\"text/javascript\" src=\"<@ofbizContentUrl>/images/jquery/jquery-1.7.2.min.js</@ofbizContentUrl>\"></scr" + "ipt>"); } setTimeout("initJQuery()", 50); } } - initJQuery(); + initJQuery(); //]]></script> <script language="javascript" src="<@ofbizContentUrl>/images/selectall.js</@ofbizContentUrl>" type="text/javascript"></script> <#if layoutSettings.javaScripts?has_content> Modified: ofbiz/branches/jackrabbit20120501/framework/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/common/widget/CommonScreens.xml?rev=1353081&r1=1353080&r2=1353081&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/branches/jackrabbit20120501/framework/common/widget/CommonScreens.xml Sat Jun 23 07:04:16 2012 @@ -143,17 +143,16 @@ under the License. <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.validation.getFilePath(initialLocaleComplete)}" global="true" /> <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/asmselect/jquery.asmselect-1.0.4a-beta.js" 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/plugins/jquery.maskedinput-1.2.2.min.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/plugins/jeditable/jquery.jeditable.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/plugins/fjTimer/jquerytimer-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/jquery-1.7.min.js" global="true" /> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.7.2.min.js" global="true" /> <!-- jQuery CSSs --> <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" global="true" /> - <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.css" global="true" /> <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true" /> <set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true" /> <set field="layoutSettings.javaScripts[]" value="/images/GooglemapMarkers.js" global="true" /> @@ -185,7 +184,7 @@ under the License. <set field="appbarOpenTemplateLocation" from-field="layoutSettings.VT_NAV_OPEN_TMPLT[0]" /> <set field="appbarCloseTemplateLocation" from-field="layoutSettings.VT_NAV_CLOSE_TMPLT[0]" /> <set field="messagesTemplateLocation" from-field="layoutSettings.VT_MSG_TMPLT_LOC[0]" /> - <set field="layoutSettings.suppressTab" value="ofbizsetup"/><!-- diseable ofbiz setup by default --> + <set field="layoutSettings.suppressTab" value="ofbizsetup"/><!-- diseable ofbiz setup by default --> </actions> <widgets /> </section> @@ -472,16 +471,15 @@ under the License. <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.validation.getFilePath(initialLocaleComplete)}" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.js" 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/plugins/jeditable/jquery.jeditable.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/fjTimer/jquerytimer-min.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/ui/development-bundle/ui/jquery.ui.datepicker.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"/> <!-- jQuery CSSs --> <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" global="true"/> - <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.css" global="true"/> Modified: ofbiz/branches/jackrabbit20120501/framework/common/widget/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/common/widget/LookupForms.xml?rev=1353081&r1=1353080&r2=1353081&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/common/widget/LookupForms.xml (original) +++ ofbiz/branches/jackrabbit20120501/framework/common/widget/LookupForms.xml Sat Jun 23 07:04:16 2012 @@ -116,9 +116,8 @@ under the License. </form> <form name="LookupLocale" type="single" target="LookupLocale"> - <field name="localeString"><text-find/></field> - <field name="localeName" title="${uiLabelMap.CommonLanguageTitle}"><text-find/></field> - <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> + <field name="localeString"><text-find hide-options="true"/></field> + <field name="localeName" title="${uiLabelMap.CommonLanguageTitle}"><text-find hide-options="true"/></field> <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> Modified: ofbiz/branches/jackrabbit20120501/framework/entity/config/entityengine.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/entity/config/entityengine.xml?rev=1353081&r1=1353080&r2=1353081&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/entity/config/entityengine.xml (original) +++ ofbiz/branches/jackrabbit20120501/framework/entity/config/entityengine.xml Sat Jun 23 07:04:16 2012 @@ -98,7 +98,6 @@ access. For a detailed description see t <!-- need to at least define a name for each component to use --> <!-- defining: - security = OFBiz security group and security permissions. are required to show a component. tenant = OFBiz and External Tenant Data seed = OFBiz and External Seed Data - to be maintained along with source and updated whenever a system deployment is updated seed-initial = OFBiz and External Seed Data - to be maintained along with source like other seed data, but only loaded initially and not updated when a system is updated except manually reviewing each line @@ -107,7 +106,6 @@ access. For a detailed description see t ext-test = External Test Data (custom) ext-demo = External Demo Data (custom) --> - <entity-data-reader name="security"/> <entity-data-reader name="tenant"/> <entity-data-reader name="seed"/> <entity-data-reader name="seed-initial"/> @@ -155,7 +153,6 @@ access. For a detailed description see t use-fk-initially-deferred="false" join-style="ansi-no-parenthesis" alias-view-columns="true"> - <read-data reader-name="security"/> <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> @@ -185,7 +182,6 @@ access. For a detailed description see t use-indices-unique="false" alias-view-columns="false" use-order-by-nulls="true"> - <read-data reader-name="security"/> <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> @@ -236,7 +232,6 @@ access. For a detailed description see t alias-view-columns="false" use-order-by-nulls="true"> <!-- beware use-indices-unique="false" is needed because of Derby bug with null values in a unique index --> - <read-data reader-name="security"/> <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> @@ -263,7 +258,6 @@ access. For a detailed description see t use-indices-unique="false" alias-view-columns="false" use-order-by-nulls="true"> - <read-data reader-name="security"/> <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> @@ -287,7 +281,6 @@ access. For a detailed description see t field-type-name="daffodil" check-on-start="true" add-missing-on-start="true"> - <read-data reader-name="security"/> <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> @@ -313,7 +306,6 @@ access. For a detailed description see t check-on-start="true" add-missing-on-start="true" use-pk-constraint-names="false"> - <read-data reader-name="security"/> <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> @@ -343,7 +335,6 @@ access. For a detailed description see t table-type="InnoDB" character-set="latin1" collate="latin1_general_cs"> - <read-data reader-name="security"/> <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> @@ -375,7 +366,6 @@ access. For a detailed description see t table-type="InnoDB" character-set="latin1" collate="latin1_general_cs"> - <read-data reader-name="security"/> <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> @@ -407,7 +397,6 @@ access. For a detailed description see t table-type="InnoDB" character-set="latin1" collate="latin1_general_cs"> - <read-data reader-name="security"/> <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> @@ -439,7 +428,6 @@ access. For a detailed description see t table-type="InnoDB" character-set="latin1" collate="latin1_general_cs"> - <read-data reader-name="security"/> <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <inline-jdbc @@ -468,7 +456,6 @@ access. For a detailed description see t <!-- use this attribute to make the EntityListIterator more effective for pgjdbc 7.5devel and later: result-fetch-size="50" --> - <read-data reader-name="security"/> <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> @@ -507,7 +494,6 @@ access. For a detailed description see t result-fetch-size="50" use-binary-type-for-blob="true" use-order-by-nulls="true"> - <read-data reader-name="security"/> <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> @@ -542,7 +528,6 @@ access. For a detailed description see t result-fetch-size="50" use-binary-type-for-blob="true" use-order-by-nulls="true"> - <read-data reader-name="security"/> <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> @@ -577,7 +562,6 @@ access. For a detailed description see t result-fetch-size="50" use-binary-type-for-blob="true" use-order-by-nulls="true"> - <read-data reader-name="security"/> <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> @@ -610,7 +594,6 @@ access. For a detailed description see t alias-view-columns="false" join-style="ansi" use-order-by-nulls="true"> - <read-data reader-name="security"/> <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> @@ -652,7 +635,6 @@ access. For a detailed description see t add-missing-on-start="true" use-fk-initially-deferred="false" join-style="ansi"> - <read-data reader-name="security"/> <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> @@ -677,7 +659,6 @@ access. For a detailed description see t fk-style="name_fk" use-fk-initially-deferred="false" join-style="ansi-no-parenthesis"> - <read-data reader-name="security"/> <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> @@ -706,7 +687,6 @@ access. For a detailed description see t add-missing-on-start="true" alias-view-columns="false" join-style="ansi"> - <read-data reader-name="security"/> <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> @@ -750,7 +730,6 @@ access. For a detailed description see t join-style="ansi" alias-view-columns="false" use-fk-initially-deferred="false"> - <read-data reader-name="security"/> <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> @@ -775,7 +754,6 @@ access. For a detailed description see t check-on-start="true" add-missing-on-start="true" join-style="ansi"> - <read-data reader-name="security"/> <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> @@ -804,7 +782,6 @@ access. For a detailed description see t join-style="ansi-no-parenthesis" alias-view-columns="false" always-use-constraint-keyword="true"> - <read-data reader-name="security"/> <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> Modified: ofbiz/branches/jackrabbit20120501/framework/entityext/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/entityext/ofbiz-component.xml?rev=1353081&r1=1353080&r2=1353081&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/entityext/ofbiz-component.xml (original) +++ ofbiz/branches/jackrabbit20120501/framework/entityext/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/EntityExtTypeData.xml"/> <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/EntityScheduledServices.xml"/> - <entity-resource type="data" reader-name="security" loader="main" location="data/EntityExtSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/EntityExtSecurityPermissionSeedData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/EntityExtSecurityGroupDemoData.xml"/> <service-resource type="model" loader="main" location="servicedef/services.xml"/> <service-resource type="group" loader="main" location="servicedef/groups.xml"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |