svn commit: r1128865 [18/27] - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1128865 [18/27] - in /ofbiz/branches/jackrabbit2010
 
|
Modified: ofbiz/branches/jackrabbit20100709/framework/webtools/widget/EntityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/webtools/widget/EntityScreens.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/webtools/widget/EntityScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/webtools/widget/EntityScreens.xml Sun May 29 11:02:09 2011 @@ -56,7 +56,7 @@ under the License. <widgets> <decorator-screen name="CommonImportExportDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> - <screenlet title="${uiLabelMap.PageTitleEntityExportAll}"> + <screenlet> <platform-specific> <html><html-template location="component://webtools/webapp/webtools/entity/EntityExportAll.ftl"/></html> </platform-specific> @@ -78,7 +78,7 @@ under the License. <widgets> <decorator-screen name="CommonImportExportDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> - <screenlet title="${uiLabelMap.PageTitleEntityImportDir}"> + <screenlet> <platform-specific> <html><html-template location="component://webtools/webapp/webtools/entity/EntityImportDir.ftl"/></html> </platform-specific> @@ -100,7 +100,7 @@ under the License. <widgets> <decorator-screen name="CommonImportExportDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> - <screenlet title="${uiLabelMap.PageTitleEntityImport}"> + <screenlet> <platform-specific> <html><html-template location="component://webtools/webapp/webtools/entity/EntityImport.ftl"/></html> </platform-specific> @@ -122,7 +122,7 @@ under the License. <widgets> <decorator-screen name="CommonImportExportDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> - <screenlet title="${uiLabelMap.PageTitleEntityImportReaders}"> + <screenlet> <platform-specific> <html><html-template location="component://webtools/webapp/webtools/entity/EntityImportReaders.ftl"/></html> </platform-specific> @@ -163,9 +163,10 @@ under the License. <property-map resource="WebtoolsUiLabels" map-name="uiLabelMap"/> <set field="title" value="${uiLabelMap.WebtoolsFindValues} ${uiLabelMap.WebtoolsForEntity}: ${entityName}"/> <set field="commonDisplaying" value="${uiLabelMap.CommonDisplaying}"/> + <set field="tabButtonItem" value="entitymaint"/> </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonEntityDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="menu-bar"> @@ -208,9 +209,10 @@ under the License. <script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.groovy"/> <property-map resource="WebtoolsUiLabels" map-name="uiLabelMap"/> <set field="title" value="${uiLabelMap.WebtoolsViewValue}: ${entityName}"/> + <set field="tabButtonItem" value="entitymaint"/> </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonEntityDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> <platform-specific> <html><html-template location="component://webtools/webapp/webtools/entity/ViewGeneric.ftl"/></html> @@ -232,9 +234,10 @@ under the License. <script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/ViewRelations.groovy"/> <property-map resource="WebtoolsUiLabels" map-name="uiLabelMap"/> <set field="title" value="${uiLabelMap.WebtoolsRelations}: ${entityName}"/> + <set field="tabButtonItem" value="entitymaint"/> </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonEntityDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> <platform-specific> <html><html-template location="component://webtools/webapp/webtools/entity/ViewRelations.ftl"/></html> @@ -358,7 +361,9 @@ under the License. <widgets> <decorator-screen name="CommonImportExportDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> - <include-form name="EntityEoModelBundle" location="component://webtools/widget/EntityForms.xml"/> + <screenlet> + <include-form name="EntityEoModelBundle" location="component://webtools/widget/EntityForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -376,7 +381,7 @@ under the License. <widgets> <decorator-screen name="CommonEntityDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> - <screenlet title="${uiLabelMap.WebtoolsCheckUpdateDatabase}"> + <screenlet> <platform-specific><html><html-template location="component://webtools/webapp/webtools/entity/CheckDb.ftl"/></html></platform-specific> </screenlet> </decorator-section> @@ -392,12 +397,13 @@ under the License. <actions> <set field="headerItem" value="main"/> <set field="titleProperty" value="WebtoolsPerformanceTests"/> + <set field="tabButtonItem" value="entityPerformanceTest"/> <script location="component://webtools/webapp/webtools/WEB-INF/actions/entity/EntityPerformanceTest.groovy"/> </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonEntityDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> - <screenlet title="${uiLabelMap.WebtoolsEntityEnginePerformanceTests}"> + <screenlet> <label>${uiLabelMap.WebtoolsNotePerformanceResultsMayVary}</label> <include-form name="ListPerformanceResults" location="component://webtools/widget/EntityForms.xml"/> </screenlet> @@ -422,7 +428,7 @@ under the License. <widgets> <decorator-screen name="CommonImportExportDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> - <screenlet title="${uiLabelMap.WebtoolsCheckUpdateDatabase}"> + <screenlet> <platform-specific><html><html-template location="component://webtools/webapp/webtools/entity/xmldsdump.ftl"/></html></platform-specific> </screenlet> </decorator-section> Modified: ofbiz/branches/jackrabbit20100709/framework/webtools/widget/EntitySyncScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/webtools/widget/EntitySyncScreens.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/webtools/widget/EntitySyncScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/webtools/widget/EntitySyncScreens.xml Sun May 29 11:02:09 2011 @@ -58,9 +58,9 @@ under the License. <decorator-screen name="CommonEntityDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> <container style="button-bar"> - <link target="EntitySyncStatus" style="smallSubmit" text="${uiLabelMap.CommonRefresh}"/> + <link target="EntitySyncStatus" style="buttontext refresh" text="${uiLabelMap.CommonRefresh}"/> </container> - <screenlet title="${uiLabelMap.PageTitleEntitySyncStatus}"> + <screenlet> <include-form name="EntitySyncStatus" location="component://webtools/widget/EntitySyncForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.WebtoolsLoadOfflineData}"> Modified: ofbiz/branches/jackrabbit20100709/framework/webtools/widget/LogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/webtools/widget/LogScreens.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/webtools/widget/LogScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/webtools/widget/LogScreens.xml Sun May 29 11:02:09 2011 @@ -65,7 +65,7 @@ under the License. <widgets> <decorator-screen name="log-decorator"> <decorator-section name="body"> - <screenlet title="${uiLabelMap.PageTitleServiceList}"> + <screenlet> <include-form name="ListServices" location="component://webtools/widget/ServiceForms.xml"/> </screenlet> </decorator-section> @@ -112,7 +112,7 @@ under the License. <widgets> <decorator-screen name="log-decorator"> <decorator-section name="body"> - <screenlet title="${uiLabelMap.WebtoolsViewLog}"> + <screenlet> <container style="button-bar"> <link target="LogView" text="${uiLabelMap.CommonRefresh}" style="buttontext refresh"/> </container> Modified: ofbiz/branches/jackrabbit20100709/framework/webtools/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/webtools/widget/Menus.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/webtools/widget/Menus.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/webtools/widget/Menus.xml Sun May 29 11:02:09 2011 @@ -24,7 +24,7 @@ under the License. <menu-item name="logging" title="${uiLabelMap.WebtoolsLogging}"> <link target="LogView"/> </menu-item> - <menu-item name="cache" title="${uiLabelMap.WebtoolsCacheDebugTools}"> + <menu-item name="cache" title="${uiLabelMap.WebtoolsCacheMaintenance}"> <link target="FindUtilCache"/> </menu-item> <menu-item name="artifact" title="${uiLabelMap.WebtoolsArtifactInfo}"> Modified: ofbiz/branches/jackrabbit20100709/framework/webtools/widget/MiscScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/webtools/widget/MiscScreens.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/webtools/widget/MiscScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/webtools/widget/MiscScreens.xml Sun May 29 11:02:09 2011 @@ -42,12 +42,15 @@ under the License. <actions> <set field="headerItem" value="main"/> <set field="titleProperty" value="WebtoolsDataFileMainTitle"/> + <set field="tabButtonItem" value="data"/> <script location="component://webtools/webapp/webtools/WEB-INF/actions/datafile/viewdatafile.groovy"/> </actions> <widgets> <decorator-screen name="CommonImportExportDecorator" location="component://webtools/widget/CommonScreens.xml"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://webtools/webapp/webtools/datafile/viewdatafile.ftl"/></html></platform-specific> + <screenlet> + <platform-specific><html><html-template location="component://webtools/webapp/webtools/datafile/viewdatafile.ftl"/></html></platform-specific> + </screenlet> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/branches/jackrabbit20100709/framework/webtools/widget/ServiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/webtools/widget/ServiceScreens.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/webtools/widget/ServiceScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/webtools/widget/ServiceScreens.xml Sun May 29 11:02:09 2011 @@ -31,15 +31,11 @@ under the License. <widgets> <decorator-screen name="CommonServiceDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <section> - <widgets> - <platform-specific> - <html> - <html-template location="component://webtools/webapp/webtools/service/availableservices.ftl"/> - </html> - </platform-specific> - </widgets> - </section> + <platform-specific> + <html> + <html-template location="component://webtools/webapp/webtools/service/availableservices.ftl"/> + </html> + </platform-specific> </decorator-section> </decorator-screen> </widgets> @@ -52,6 +48,7 @@ under the License. <set field="titleProperty" value="PageTitleJobList"/> <set field="tabButtonItem" value="findJob"/> <set field="jobCtx" from-field="parameters"/> + <set field="dummy" value="${groovy: if ('SERVICE_PENDING'.equals(jobCtx.statusId)) jobCtx.jobId = ''}"/> <!-- To more easily see current pending jobs and possibly cancel some others --> </actions> <widgets> <decorator-screen name="CommonServiceDecorator" location="${parameters.mainDecoratorLocation}"> @@ -127,7 +124,7 @@ under the License. <widgets> <decorator-screen name="CommonServiceDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <screenlet title="${uiLabelMap.PageTitleRunService}"> + <screenlet> <include-form name="runService" location="component://webtools/widget/ServiceForms.xml"/> </screenlet> </decorator-section> Modified: ofbiz/branches/jackrabbit20100709/framework/widget/config/widget.properties URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/widget/config/widget.properties?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/widget/config/widget.properties (original) +++ ofbiz/branches/jackrabbit20100709/framework/widget/config/widget.properties Sun May 29 11:02:09 2011 @@ -33,6 +33,9 @@ widget.autocompleter.defaultViewSize=10 # Default minimum number of characters an user has to type before the ajax autocompleter activates (jQuery default is 1) widget.autocompleter.defaultMinLength=2 +# Default delay in milliseconds the Autocomplete waits after a keystroke to activate itself. A zero-delay makes sense for local data (more responsive), but can produce a lot of load for remote data, while being less responsive. +#widget.autocompleter.delay=300 + # Show/hide the ID field that is returned from ajax autocompleter widget.autocompleter.displayReturnField=Y Modified: ofbiz/branches/jackrabbit20100709/framework/widget/dtd/widget-form.xsd URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/widget/dtd/widget-form.xsd?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/widget/dtd/widget-form.xsd (original) +++ ofbiz/branches/jackrabbit20100709/framework/widget/dtd/widget-form.xsd Sun May 29 11:02:09 2011 @@ -968,7 +968,7 @@ under the License. </xs:restriction> </xs:simpleType> </xs:attribute> - <xs:attribute name="disabled" default="false"> + <xs:attribute name="read-only" default="false"> <xs:simpleType> <xs:restriction base="xs:token"> <xs:enumeration value="true"/> Modified: ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Sun May 29 11:02:09 2011 @@ -2086,7 +2086,7 @@ public class MacroFormRenderer implement String event = modelFormField.getEvent(); String action = modelFormField.getAction(context); - boolean disabled = lookupField.disabled; + boolean readonly = lookupField.readonly; // add lookup pop-up button String descriptionFieldName = lookupField.getDescriptionFieldName(); @@ -2173,8 +2173,8 @@ public class MacroFormRenderer implement if (action != null) { sr.append(action); } - sr.append("\" disabled="); - sr.append(Boolean.toString(disabled)); + sr.append("\" readonly="); + sr.append(Boolean.toString(readonly)); sr.append(" autocomplete=\""); sr.append(autocomplete); @@ -2910,17 +2910,16 @@ public class MacroFormRenderer implement Map<String, String> parameters = updateArea.getParameterMap(ctx); String targetUrl = updateArea.getAreaTarget(context); String ajaxParams = getAjaxParamsFromTarget(targetUrl); - if (UtilValidate.isNotEmpty(extraParams)) { - if (ajaxParams.length() > 0 && !extraParams.startsWith("&")) { - ajaxParams += "&"; - } - ajaxParams += extraParams; - } + //add first parameters from updateArea parameters if(UtilValidate.isNotEmpty(parameters)){ if(UtilValidate.isEmpty(ajaxParams)){ ajaxParams = ""; } for (String key : parameters.keySet()) { + //test if ajax parameters are not already into extraParams, if so do not add it + if(UtilValidate.isNotEmpty(extraParams) && extraParams.contains(parameters.get(key))){ + continue; + } if (ajaxParams.length() > 0 && ajaxParams.indexOf(key) < 0) { ajaxParams += "&"; } @@ -2929,6 +2928,13 @@ public class MacroFormRenderer implement } } } + //then add parameters from request. Those parameters could end with an anchor so we must set ajax parameters first + if (UtilValidate.isNotEmpty(extraParams)) { + if (ajaxParams.length() > 0 && !extraParams.startsWith("&")) { + ajaxParams += "&"; + } + ajaxParams += extraParams; + } ajaxUrl += updateArea.getAreaId() + ","; ajaxUrl += this.rh.makeLink(this.request, this.response, UtilHttp.removeQueryStringFromTarget(targetUrl)); ajaxUrl += "," + ajaxParams; Modified: ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/ModelForm.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/ModelForm.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/ModelForm.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/ModelForm.java Sun May 29 11:02:09 2011 @@ -2212,7 +2212,7 @@ public class ModelForm extends ModelWidg } /** - * @param string Form's location + * @param formLocation string Form's location */ public void setFormLocation(String formLocation) { this.formLocation = formLocation; Modified: ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Sun May 29 11:02:09 2011 @@ -635,7 +635,7 @@ public class ModelFormField { * with this field. This can be used to get additional information about the field. * Use the getServiceName() method to get the Entity name that the field is in. * - * @return + * @return returns the name of the Service Attribute */ public String getAttributeName() { if (UtilValidate.isNotEmpty(this.attributeName)) { @@ -667,9 +667,8 @@ public class ModelFormField { * is true) then the value will be retreived from the parameters Map in * the context. * - * @param context - * @param encoder - * @return + * @param context the context + * @return returns the entry from the context that corresponds to this field */ public String getEntry(Map<String, ? extends Object> context) { return this.getEntry(context, ""); @@ -802,7 +801,7 @@ public class ModelFormField { * with this field. This can be used to get additional information about the field. * Use the getEntityName() method to get the Entity name that the field is in. * - * @return + * @return return the name of the Entity Field that corresponds with this field */ public String getFieldName() { if (UtilValidate.isNotEmpty(this.fieldName)) { @@ -818,7 +817,7 @@ public class ModelFormField { * error condition the parameter name is used to get the value from the * parameters Map. * - * @return + * @return returns the name of the Map in the form context that contains the entry */ public String getMapName() { if (this.mapAcsr != null && !this.mapAcsr.isEmpty()) { @@ -836,7 +835,7 @@ public class ModelFormField { * Get the name to use for the parameter for this field in the form interpreter. * For HTML forms this is the request parameter name. * - * @return + * @return returns the name to use for the parameter for this field in the form interpreter */ public String getParameterName(Map<String, ? extends Object> context) { String baseName; @@ -879,14 +878,14 @@ public class ModelFormField { } } -/** + /** * the widget/interaction part will be red if the date value is * before-now (for ex. thruDate), after-now (for ex. fromDate), or by-name (if the * field's name or entry-name or fromDate or thruDate the corresponding * action will be done); only applicable when the field is a timestamp * - * @param context - * @return + * @param context the context + * @return true if the field should be read otherwise false */ public boolean shouldBeRed(Map<String, Object> context) { // red-when (never | before-now | after-now | by-name) "by-name" @@ -1386,7 +1385,7 @@ public class ModelFormField { } /** - * @param boolean + * @param required the field is required */ public void setRequiredField(boolean required) { this.requiredField = required; @@ -1397,14 +1396,14 @@ public class ModelFormField { } /** - * @param boolean + * @param sort set as sort field */ public void setSortField(boolean sort) { this.sortField = Boolean.valueOf(sort); } /** - * @param ModelForm + * @param modelForm the model form */ public void setModelForm(ModelForm modelForm) { this.modelForm = modelForm; @@ -2228,34 +2227,34 @@ public class ModelFormField { } /** - * @param b + * @param b the field is also hidden true/false */ public void setAlsoHidden(boolean b) { alsoHidden = b; } /** - * @param Image-location + * @param value the value of the image location */ public void setImageLocation(String value) { this.imageLocation = FlexibleStringExpander.getInstance(value); } /** - * @param Description + * @param string the description of the field */ public void setDescription(String string) { description = FlexibleStringExpander.getInstance(string); } /** - * @param string + * @param string the currency of the field */ public void setCurrency(String string) { currency = FlexibleStringExpander.getInstance(string); } /** - * @param date + * @param string the date of the field */ public void setDate(String string) { date = FlexibleStringExpander.getInstance(string); @@ -2266,7 +2265,7 @@ public class ModelFormField { } /** - * @param str + * @param str the default value */ public void setDefaultValue(String str) { this.defaultValue = FlexibleStringExpander.getInstance(str); @@ -2850,6 +2849,7 @@ public class ModelFormField { protected FlexibleStringExpander defaultValue; protected SubHyperlink subHyperlink; protected boolean disabled; + protected boolean readonly; protected boolean clientAutocompleteField; protected String mask; @@ -2890,6 +2890,7 @@ public class ModelFormField { } this.disabled = "true".equals(element.getAttribute("disabled")); + this.readonly = "true".equals(element.getAttribute("read-only")); this.clientAutocompleteField = !"false".equals(element.getAttribute("client-autocomplete-field")); @@ -2920,6 +2921,14 @@ public class ModelFormField { this.disabled = b; } + public boolean getReadonly() { + return this.readonly; + } + + public void setReadonly(boolean b) { + this.readonly = b; + } + public boolean getClientAutocompleteField() { return this.clientAutocompleteField; } @@ -3071,21 +3080,21 @@ public class ModelFormField { } /** - * @param str + * @param str the default value of the field */ public void setDefaultValue(String str) { this.defaultValue = FlexibleStringExpander.getInstance(str); } /** - * @param i + * @param visualEditorEnable is visualEditor enabled */ public void setVisualEditorEnable(boolean visualEditorEnable) { this.visualEditorEnable = visualEditorEnable; } /** - * @param i + * @param eb set the visualEditor Buttons */ public void setVisualEditorButtons(String eb) { this.visualEditorButtons = FlexibleStringExpander.getInstance(eb); @@ -3337,8 +3346,8 @@ public class ModelFormField { /** * Get the name to use for the parameter for this field in the form interpreter. * For HTML forms this is the request parameter name. - * - * @return + * @param context the context + * @return returns the name to use for the parameter for this field in the form interpreter. */ public String getParameterNameOther(Map<String, Object> context) { String baseName; @@ -3488,7 +3497,7 @@ public class ModelFormField { } /** - * @param string + * @param val the value of the image location */ public void setImageLocation(String val) { imageLocation = FlexibleStringExpander.getInstance(val); Modified: ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java Sun May 29 11:02:09 2011 @@ -499,7 +499,7 @@ public class ModelMenu extends ModelWidg } /** - * @param string + * @param menuLocation the menu location to set */ public void setMenuLocation(String menuLocation) { this.menuLocation = menuLocation; Modified: ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/screen/ScreenFopViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/screen/ScreenFopViewHandler.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/screen/ScreenFopViewHandler.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/screen/ScreenFopViewHandler.java Sun May 29 11:02:09 2011 @@ -60,7 +60,7 @@ public class ScreenFopViewHandler extend } /** - * @see org.ofbiz.content.webapp.view.ViewHandler#render(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) + * @see org.ofbiz.webapp.view.ViewHandler#render(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) */ public void render(String name, String page, String info, String contentType, String encoding, HttpServletRequest request, HttpServletResponse response) throws ViewHandlerException { Modified: ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java Sun May 29 11:02:09 2011 @@ -216,7 +216,7 @@ public class ModelTree extends ModelWidg * Renders this tree to a String, i.e. in a text format, as defined with the * TreeStringRenderer implementation. * - * @param writer The Writer that the tree text will be written to + * @param buf the StringBuffer Object * @param context Map containing the tree context; the following are * reserved words in this context: parameters (Map), isError (Boolean), * itemIndex (Integer, for lists only, otherwise null), bshInterpreter, Modified: ofbiz/branches/jackrabbit20100709/framework/widget/templates/htmlFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/widget/templates/htmlFormMacroLibrary.ftl (original) +++ ofbiz/branches/jackrabbit20100709/framework/widget/templates/htmlFormMacroLibrary.ftl Sun May 29 11:02:09 2011 @@ -66,7 +66,8 @@ under the License. /><#t/> <#if ajaxEnabled?has_content && ajaxEnabled> <#assign defaultMinLength = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties", "widget.autocompleter.defaultMinLength")> - <script language="JavaScript" type="text/javascript">ajaxAutoCompleter('${ajaxUrl}', false, ${defaultMinLength!2});</script><#lt/> + <#assign defaultDelay = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties", "widget.autocompleter.defaultDelay")> + <script language="JavaScript" type="text/javascript">ajaxAutoCompleter('${ajaxUrl}', false, ${defaultMinLength!2}, ${defaultDelay!300});</script><#lt/> </#if> </#macro> @@ -542,7 +543,7 @@ ${item.description}</span> </#if> </#macro> -<#macro renderLookupField className alert name value size maxlength id event action disabled autocomplete descriptionFieldName formName fieldFormName targetParameterIter imgSrc ajaxUrl ajaxEnabled presentation width height position fadeBackground clearText showDescription initiallyCollapsed> +<#macro renderLookupField className alert name value size maxlength id event action readonly autocomplete descriptionFieldName formName fieldFormName targetParameterIter imgSrc ajaxUrl ajaxEnabled presentation width height position fadeBackground clearText showDescription initiallyCollapsed> <#if ajaxEnabled?has_content && ajaxEnabled> <script type="text/javascript"> jQuery(document).ready(function(){ @@ -553,7 +554,7 @@ ${item.description}</span> </script> </#if> <span class="field-lookup"> -<#if size?has_content && size=="0"><input type="hidden" <#if name?has_content> name="${name}"/></#if><#else><input type="text" <@renderClass className alert /><#if name?has_content> name="${name}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if id?has_content> id="${id}"</#if><#rt/><#if disabled?has_content && disabled> disabled="disabled"</#if><#rt/><#if event?has_content && action?has_content> ${event}="${action}"</#if><#rt/><#if autocomplete?has_content> autocomplete="off"</#if>/><#rt/></#if> +<#if size?has_content && size=="0"><input type="hidden" <#if name?has_content> name="${name}"/></#if><#else><input type="text" <@renderClass className alert /><#if name?has_content> name="${name}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if id?has_content> id="${id}"</#if><#rt/><#if readonly?has_content && readonly> readonly="readonly"</#if><#rt/><#if event?has_content && action?has_content> ${event}="${action}"</#if><#rt/><#if autocomplete?has_content> autocomplete="off"</#if>/><#rt/></#if> <#if presentation?has_content && descriptionFieldName?has_content && presentation == "window"> <a href="javascript:call_fieldlookup3(document.${formName?html}.${name?html},document.${formName?html}.${descriptionFieldName},'${fieldFormName}', '${presentation}'<#rt/> <#if targetParameterIter?has_content> @@ -573,6 +574,7 @@ ${item.description}</span> <#else> <#if ajaxEnabled?has_content && ajaxEnabled> <#assign defaultMinLength = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties", "widget.autocompleter.defaultMinLength")> + <#assign defaultDelay = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties", "widget.autocompleter.defaultDelay")> <#if parameters?has_content && parameters._LAST_VIEW_NAME_?has_content> <#local ajaxUrl = ajaxUrl + "&_LAST_VIEW_NAME_=" + parameters._LAST_VIEW_NAME_ /> <#else> @@ -588,7 +590,7 @@ ${item.description}</span> </#if> <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>"", ""</#if>, "${presentation!}", "${defaultMinLength!2}"<#rt/> + 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>"", ""</#if>, "${presentation!}", "${defaultMinLength!2}", "${defaultDelay!300}"<#rt/> <#if targetParameterIter?has_content> <#assign isFirst = true> <#lt/>, [<#rt/> @@ -606,7 +608,7 @@ ${item.description}</span> }); </script> </#if> -<#if disabled?has_content && disabled><a id="${id}_clear" style="background:none;margin-left:5px;margin-right:15px;" class="clearField" href="javascript:void();" onclick="javascript:document.${formName}.${name}.value='';<#if descriptionFieldName?has_content>document.${formName}.${descriptionFieldName}.value='';</#if>">${clearText}</a></#if> +<#if readonly?has_content && readonly><a id="${id}_clear" style="background:none;margin-left:5px;margin-right:15px;" class="clearField" href="javascript:void();" onclick="javascript:document.${formName}.${name}.value='';<#if descriptionFieldName?has_content>document.${formName}.${descriptionFieldName}.value='';</#if>">${clearText}</a></#if> </span> <#if ajaxEnabled?has_content && ajaxEnabled> <#if parameters?has_content && parameters._LAST_VIEW_NAME_?has_content && ajaxUrl?index_of("_LAST_VIEW_NAME_") < 0> @@ -614,7 +616,7 @@ ${item.description}</span> <#elseif ajaxUrl?index_of("_LAST_VIEW_NAME_") < 0> <#local ajaxUrl = ajaxUrl + "&_LAST_VIEW_NAME_=main"/> </#if> - <script language="JavaScript" type="text/javascript">ajaxAutoCompleter('${ajaxUrl}', ${showDescription}, ${defaultMinLength!2});</script><#t/> + <script language="JavaScript" type="text/javascript">ajaxAutoCompleter('${ajaxUrl}', ${showDescription}, ${defaultMinLength!2}, ${defaultDelay!300});</script><#t/> </#if> </#macro> Modified: ofbiz/branches/jackrabbit20100709/hot-deploy/README.txt URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/hot-deploy/README.txt?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/hot-deploy/README.txt (original) +++ ofbiz/branches/jackrabbit20100709/hot-deploy/README.txt Sun May 29 11:02:09 2011 @@ -8,8 +8,8 @@ specialpurpose The hot-deploy Auto-Loading feature loads all components in the order they are found (i.e. alphabetic or creation date). -If you need a specific loading order of these components than you should disable the Auto-Loading feature by creating a component-load.xml file in the -hot-deploy directory and use the load-component tag to load your component in the order you want (just use the component-load.xml file in the application -folder as a template). +If you need a specific loading order of these components then you need to disable the Auto-Loading feature +by creating a component-load.xml file in the hot-deploy directory and use the load-component tag to load +your components in the order you want (just use the component-load.xml file in the application folder as a template). Modified: ofbiz/branches/jackrabbit20100709/macros.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/macros.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/macros.xml (original) +++ ofbiz/branches/jackrabbit20100709/macros.xml Sun May 29 11:02:09 2011 @@ -63,7 +63,6 @@ under the License. <pathelement location="${ofbiz.home.dir}/framework/base/lib/ant/ant-apache-bsf-1.7.1.jar"/> </path> <path id="local.class.path"/> - <presetdef name="default-javac"> <javac debug="on" deprecation="on" destdir="${build.dir}/classes" srcdir="${src.dir}" classpathref="local.class.path"> <patternset refid="src.inc.set"/> @@ -78,11 +77,42 @@ under the License. </presetdef> <presetdef name="default-javadoc"> - <javadoc classpathref="local.class.path" - destdir="${build.dir}/javadocs" - Windowtitle="Open for Business - ${desc}"> - <link href="http://java.sun.com/javase/6/docs/api/" offline="true" packagelistLoc="${ofbiz.home.dir}/tools/api-java16"/> - </javadoc> + <javadoc classpathref="local.class.path" + destdir="${build.dir}/javadocs" + windowtitle="Open for Business - ${desc}" + useexternalfile="yes" + maxmemory="256M" + encoding="UTF-8" + packagenames="org.ofbiz.*"> + <fileset dir="${basedir}" defaultexcludes="yes"> + <include name="**/*.java"/> + <exclude name="**/ControlApplet.java"/> + <exclude name="**/ShipmentScaleApplet.java"/> + <exclude name="**/test/"/> + <exclude name="**/cybersource/"/> + <exclude name="**/PayPalServices.java"/> + <exclude name="**/ideal/"/> + <exclude name="**/orbital/"/> + <exclude name="**/securepay/"/> + <exclude name="**/verisign/"/> + <exclude name="**/JREntityListIteratorDataSource.java"/> + <exclude name="**/JRMapCollectionDataSource.java"/> + <exclude name="**/openoffice/"/> + <exclude name="**/XaPoolConnectionFactory.java"/> + <exclude name="**/JasperReportsPdfViewHandler.java"/> + <exclude name="**/JasperReportsXmlViewHandler.java"/> + <exclude name="**/JasperReportsJXlsViewHandler.java"/> + <exclude name="**/JasperReportsPoiXlsViewHandler.java"/> + <exclude name="**/GenericViewRenderer.java"/> + <exclude name="**/JPublishViewHandler.java"/> + <exclude name="**/JPublishWrapper.java"/> + <exclude name="**/FopPdfViewHandler.java"/> + <exclude name="**/FreeMarkerViewRenderer.java"/> + <exclude name="**/JpCacheIncludeTransform.java"/> + <exclude name="**/shark/"/> + </fileset> + <link href="http://java.sun.com/javase/6/docs/api/" offline="true" packagelistLoc="${ofbiz.home.dir}/tools/api-java16"/> + </javadoc> </presetdef> <macrodef name="main-jar"> @@ -153,12 +183,17 @@ under the License. </groovyc> </presetdef> - <scriptdef name="if" language="javascript" classpathref="rhino.class.path" loaderref="rhino.class.path.loader" src="${ofbiz.home.dir}/tools/If-ant.py"> + <!-- replaced by ant contrib version --> + <!--scriptdef name="if" language="javascript" classpathref="rhino.class.path" loaderref="rhino.class.path.loader" src="${ofbiz.home.dir}/tools/If-ant.py"> <element name="condition" classname="org.apache.tools.ant.taskdefs.condition.And"/> <element name="commands" classname="org.apache.tools.ant.taskdefs.Sequential"/> <element name="else" classname="org.apache.tools.ant.taskdefs.Sequential"/> - </scriptdef> - + </scriptdef--> + <taskdef resource="net/sf/antcontrib/antlib.xml"> + <classpath> + <pathelement location="${ofbiz.home.dir}/framework/base/lib/ant/ant-contrib-1.0b3.jar"/> + </classpath> + </taskdef> <taskdef name="javacc" classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC" classpath="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/> <taskdef name="jjtree" classname="org.apache.tools.ant.taskdefs.optional.javacc.JJTree" classpath="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/> <macrodef name="ofbiz-javacc"> @@ -167,25 +202,23 @@ under the License. <attribute name="prefix" default=""/> <sequential> <if> - <condition> <not> <uptodate srcfile="@{prefix}src/@{dir}/@{file}.jj" targetfile="@{prefix}build/gen-src/javacc/@{dir}/@{file}.java"/> </not> - </condition> - <commands> - <delete dir="@{prefix}build/gen-src/javacc/@{dir}"/> - <mkdir dir="@{prefix}build/gen-src/javacc/@{dir}"/> - <javacc target="@{prefix}src/@{dir}/@{file}.jj" - javacchome="${ofbiz.home.dir}/lib/build/javacc" - outputdirectory="@{prefix}build/gen-src/javacc/@{dir}"/> - <replace token="public class" - value='@SuppressWarnings("all") public class' - dir="@{prefix}build/gen-src/javacc/@{dir}" - includes="*.java" /> - <delete dir="@{prefix}build/classes/@{dir}"/> - </commands> + <then> + <delete dir="@{prefix}build/gen-src/javacc/@{dir}"/> + <mkdir dir="@{prefix}build/gen-src/javacc/@{dir}"/> + <javacc target="@{prefix}src/@{dir}/@{file}.jj" + javacchome="${ofbiz.home.dir}/lib/build/javacc" + outputdirectory="@{prefix}build/gen-src/javacc/@{dir}"/> + <replace token="public class" + value='@SuppressWarnings("all") public class' + dir="@{prefix}build/gen-src/javacc/@{dir}" + includes="*.java" /> + <delete dir="@{prefix}build/classes/@{dir}"/> + </then> </if> </sequential> </macrodef> @@ -196,37 +229,29 @@ under the License. <attribute name="prefix" default=""/> <sequential> <if> - <condition> <not> <uptodate srcfile="@{prefix}src/@{dir}/@{file}.jjt" targetfile="@{prefix}build/gen-src/jjtree/@{dir}/@{file}.jj"/> </not> - </condition> - <commands> <delete dir="@{prefix}build/gen-src/jjtree/@{dir}"/> <mkdir dir="@{prefix}build/gen-src/jjtree/@{dir}"/> <jjtree target="@{prefix}src/@{dir}/@{file}.jjt" javacchome="${ofbiz.home.dir}/lib/build/javacc" outputdirectory="@{prefix}build/gen-src/jjtree/@{dir}"/> - </commands> </if> <if> - <condition> <not> <uptodate srcfile="@{prefix}build/gen-src/jjtree/@{dir}/@{file}.jj" targetfile="@{prefix}build/gen-src/javacc/@{dir}/@{file}.java"/> </not> - </condition> - <commands> <delete dir="@{prefix}build/gen-src/javacc/@{dir}"/> <mkdir dir="@{prefix}build/gen-src/javacc/@{dir}"/> <javacc target="@{prefix}build/gen-src/jjtree/@{dir}/@{file}.jj" javacchome="${ofbiz.home.dir}/lib/build/javacc" outputdirectory="@{prefix}build/gen-src/javacc/@{dir}"/> <delete dir="@{prefix}build/classes/@{dir}"/> - </commands> </if> </sequential> </macrodef> Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/lib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun May 29 11:02:09 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/specialpurpose/ebaystore/lib:951708-952957 /ofbiz/branches/jquery/specialpurpose/ebaystore/lib:952958-1044489 /ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264 -/ofbiz/trunk/specialpurpose/ebaystore/lib:962442-1096699 +/ofbiz/trunk/specialpurpose/ebaystore/lib:962442-1128853 Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOptions.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOptions.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOptions.java (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOptions.java Sun May 29 11:02:09 2011 @@ -281,7 +281,7 @@ public class EbayStoreOptions { public static String retrieveEbayStoreCategoryByParent(HttpServletRequest request, HttpServletResponse response) { List<StoreCustomCategoryType> results = FastList.newInstance(); try { - Map paramMap = UtilHttp.getCombinedMap(request); + Map<String, Object> paramMap = UtilHttp.getCombinedMap(request); if (paramMap.get("productStoreId") != null) { String ebayStoreCategory = (String)paramMap.get("ebayCategoryId"); // when change category should be remove old category from session @@ -299,8 +299,6 @@ public class EbayStoreOptions { } request.setAttribute("productStoreId", paramMap.get("productStoreId")); request.setAttribute("categoryId", ebayStoreCategory); - ApiContext apiContext = EbayEvents.getApiContext(request); - EbayStoreSiteFacade sf = EbayEvents.getSiteFacade(apiContext,request); results = EbayEvents.getStoreChildCategories(request); if (UtilValidate.isNotEmpty(results)) { List<Map<String,Object>> categories = FastList.newInstance(); Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoConfigurator.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoConfigurator.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoConfigurator.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoConfigurator.xml Sun May 29 11:02:09 2011 @@ -224,4 +224,185 @@ under the License. <ProductCategoryMember productCategoryId="CATALOG1_SEARCH" productId="PIZZA" fromDate="2004-09-24 15:09:47.338"/> <ProductCategoryMember productCategoryId="PROMOTIONS" productId="PIZZA" fromDate="2004-09-24 15:09:47.338"/> + <!-- alternative URL --> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="PC-100-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRPC-100-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="FOOD-001-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRFOOD-001-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="PC001-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRPC001-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="RAM1GB_BRAND-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRRAM1GB_BRAND-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="HD250GB_BRAND-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRHD250GB_BRAND-ALT" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="HD500GB_BRAND-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRHD500GB_BRAND-ALT" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="ETH_BRAND-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRETH_BRAND-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="MOD_BRAND-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRMOD_BRAND-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="MOTHER_BOARD_ASS-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DMOTHER_BOARD_ASS" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="MOTHER_BOARD-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRMOTHER_BOARD-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="CPU-586-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRCPU-586-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="ENCHILADAS-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRENCHILADAS-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="FAJITA_BEEF-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRFAJITA_BEEF-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="JALAPENOS-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRJALAPENOS-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="PIZZA-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRPIZZA-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DOUGH-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRDOUGH-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="SAUCE-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRSAUCE-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="SAUCE-TM-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRSAUCE-TM-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="SAUCE-CM-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRSAUCE-CM-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="SAUCE-TP-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRSAUCE-TP-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="SAUCE-CP-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRSAUCE-CP-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="PEPPERS-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRPEPPERS-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="PEPPERS-H-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRPEPPERS-H-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="PEPPERS-G-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRPEPPERS-G-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="PEPPERS-R-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRPEPPERS-R-ALTEN" localeString="en_US"/> + + <ElectronicText dataResourceId="DRPC-100-ALTEN" textData="configurable-pcs"/> + <ElectronicText dataResourceId="DRFOOD-001-ALTEN" textData="configurable-foods"/> + <ElectronicText dataResourceId="DRPC001-ALTEN" textData="configurable-pc"/> + <ElectronicText dataResourceId="DRRAM1GB_BRAND-ALTEN" textData="ram-1-gb-ddr2"/> + <ElectronicText dataResourceId="DRHD250GB_BRAND-ALT" textData="hd-250-gb"/> + <ElectronicText dataResourceId="DRHD500GB_BRAND-ALT" textData="hd-450-gb"/> + <ElectronicText dataResourceId="DRETH_BRAND-ALTEN" textData="ethernet-card-10-100"/> + <ElectronicText dataResourceId="DRMOD_BRAND-ALTEN" textData="modem-card-56k"/> + <ElectronicText dataResourceId="DMOTHER_BOARD_ASS" textData="motherboard-assembly"/> + <ElectronicText dataResourceId="DRMOTHER_BOARD-ALTEN" textData="motherboard"/> + <ElectronicText dataResourceId="DRCPU-586-ALTEN" textData="cpu-intel-586"/> + <ElectronicText dataResourceId="DRENCHILADAS-ALTEN" textData="enchiladas"/> + <ElectronicText dataResourceId="DRFAJITA_BEEF-ALTEN" textData="fajita-beef"/> + <ElectronicText dataResourceId="DRJALAPENOS-ALTEN" textData="jalapenos"/> + <ElectronicText dataResourceId="DRPIZZA-ALTEN" textData="pizza"/> + <ElectronicText dataResourceId="DRDOUGH-ALTEN" textData="dough"/> + <ElectronicText dataResourceId="DRSAUCE-ALTEN" textData="sauce"/> + <ElectronicText dataResourceId="DRSAUCE-TM-ALTEN" textData="tomato-sauce-with-mozzarella"/> + <ElectronicText dataResourceId="DRSAUCE-CM-ALTEN" textData="chili-sauce-with-mozzarella"/> + <ElectronicText dataResourceId="DRSAUCE-TP-ALTEN" textData="tomato-sauce-with-parmesan"/> + <ElectronicText dataResourceId="DRSAUCE-CP-ALTEN" textData="chili-sauce-with-parmesan"/> + <ElectronicText dataResourceId="DRPEPPERS-ALTEN" textData="pepper"/> + <ElectronicText dataResourceId="DRPEPPERS-G-ALTEN" textData="green-peppers"/> + <ElectronicText dataResourceId="DRPEPPERS-H-ALTEN" textData="hot-peppers"/> + <ElectronicText dataResourceId="DRPEPPERS-R-ALTEN" textData="roasted-peppers"/> + + <Content contentId="PC-100-ALT" contentTypeId="DOCUMENT" dataResourceId="PC-100-ALT" localeString="en"/> + <Content contentId="CPC-100-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRPC-100-ALTEN" localeString="en_US"/> + <Content contentId="FOOD-001-ALT" contentTypeId="DOCUMENT" dataResourceId="FOOD-001-ALT" localeString="en"/> + <Content contentId="CFOOD-001-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRFOOD-001-ALTEN" localeString="en_US"/> + <Content contentId="PC001-ALT" contentTypeId="DOCUMENT" dataResourceId="PC001-ALT" localeString="en"/> + <Content contentId="CPC001-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRPC001-ALTEN" localeString="en_US"/> + <Content contentId="RAM1GB_BRAND-ALT" contentTypeId="DOCUMENT" dataResourceId="RAM1GB_BRAND-ALT" localeString="en"/> + <Content contentId="CRAM1GB_BRAND-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRRAM1GB_BRAND-ALTEN" localeString="en_US"/> + <Content contentId="HD250GB_BRAND-ALT" contentTypeId="DOCUMENT" dataResourceId="HD250GB_BRAND-ALT" localeString="en"/> + <Content contentId="CHD250GB_BRAND-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRHD250GB_BRAND-ALT" localeString="en_US"/> + <Content contentId="HD500GB_BRAND-ALT" contentTypeId="DOCUMENT" dataResourceId="HD500GB_BRAND-ALT" localeString="en"/> + <Content contentId="CHD500GB_BRAND-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRHD500GB_BRAND-ALT" localeString="en_US"/> + <Content contentId="ETH_BRAND-ALT" contentTypeId="DOCUMENT" dataResourceId="ETH_BRAND-ALT" localeString="en"/> + <Content contentId="CETH_BRAND-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRETH_BRAND-ALTEN" localeString="en_US"/> + <Content contentId="MOD_BRAND-ALT" contentTypeId="DOCUMENT" dataResourceId="MOD_BRAND-ALT" localeString="en"/> + <Content contentId="CMOD_BRAND-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRMOD_BRAND-ALTEN" localeString="en_US"/> + <Content contentId="MOTHER_BOARD_ASS-ALT" contentTypeId="DOCUMENT" dataResourceId="MOTHER_BOARD_ASS-ALT" localeString="en"/> + <Content contentId="CMOTHER_BOARD_ASS" contentTypeId="DOCUMENT" dataResourceId="DMOTHER_BOARD_ASS" localeString="en_US"/> + <Content contentId="MOTHER_BOARD-ALT" contentTypeId="DOCUMENT" dataResourceId="MOTHER_BOARD-ALT" localeString="en"/> + <Content contentId="CMOTHER_BOARD-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRMOTHER_BOARD-ALTEN" localeString="en_US"/> + <Content contentId="CPU-586-ALT" contentTypeId="DOCUMENT" dataResourceId="CPU-586-ALT" localeString="en"/> + <Content contentId="CCPU-586-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRCPU-586-ALTEN" localeString="en_US"/> + <Content contentId="ENCHILADAS-ALT" contentTypeId="DOCUMENT" dataResourceId="ENCHILADAS-ALT" localeString="en"/> + <Content contentId="CENCHILADAS-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRENCHILADAS-ALTEN" localeString="en_US"/> + <Content contentId="FAJITA_BEEF-ALT" contentTypeId="DOCUMENT" dataResourceId="FAJITA_BEEF-ALT" localeString="en"/> + <Content contentId="CFAJITA_BEEF-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRFAJITA_BEEF-ALTEN" localeString="en_US"/> + <Content contentId="JALAPENOS-ALT" contentTypeId="DOCUMENT" dataResourceId="JALAPENOS-ALT" localeString="en"/> + <Content contentId="CJALAPENOS-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRJALAPENOS-ALTEN" localeString="en_US"/> + <Content contentId="PIZZA-ALT" contentTypeId="DOCUMENT" dataResourceId="PIZZA-ALT" localeString="en"/> + <Content contentId="CPIZZA-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRPIZZA-ALTEN" localeString="en_US"/> + <Content contentId="DOUGH-ALT" contentTypeId="DOCUMENT" dataResourceId="DOUGH-ALT" localeString="en"/> + <Content contentId="CDOUGH-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRDOUGH-ALTEN" localeString="en_US"/> + <Content contentId="SAUCE-ALT" contentTypeId="DOCUMENT" dataResourceId="SAUCE-ALT" localeString="en"/> + <Content contentId="CSAUCE-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRSAUCE-ALTEN" localeString="en_US"/> + <Content contentId="SAUCE-TM-ALT" contentTypeId="DOCUMENT" dataResourceId="SAUCE-TM-ALT" localeString="en"/> + <Content contentId="CSAUCE-TM-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRSAUCE-TM-ALTEN" localeString="en_US"/> + <Content contentId="SAUCE-CM-ALT" contentTypeId="DOCUMENT" dataResourceId="SAUCE-CM-ALT" localeString="en"/> + <Content contentId="CSAUCE-CM-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRSAUCE-CM-ALTEN" localeString="en_US"/> + <Content contentId="SAUCE-TP-ALT" contentTypeId="DOCUMENT" dataResourceId="SAUCE-TP-ALT" localeString="en"/> + <Content contentId="CSAUCE-TP-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRSAUCE-TP-ALTEN" localeString="en_US"/> + <Content contentId="SAUCE-CP-ALT" contentTypeId="DOCUMENT" dataResourceId="SAUCE-CP-ALT" localeString="en"/> + <Content contentId="CSAUCE-CP-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRSAUCE-CP-ALTEN" localeString="en_US"/> + <Content contentId="PEPPERS-ALT" contentTypeId="DOCUMENT" dataResourceId="PEPPERS-ALT" localeString="en"/> + <Content contentId="CPEPPERS-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRPEPPERS-ALTEN" localeString="en_US"/> + <Content contentId="PEPPERS-G-ALT" contentTypeId="DOCUMENT" dataResourceId="PEPPERS-G-ALT" localeString="en"/> + <Content contentId="CPEPPERS-G-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRPEPPERS-G-ALTEN" localeString="en_US"/> + <Content contentId="PEPPERS-H-ALT" contentTypeId="DOCUMENT" dataResourceId="PEPPERS-H-ALT" localeString="en"/> + <Content contentId="CPEPPERS-H-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRPEPPERS-H-ALTEN" localeString="en_US"/> + <Content contentId="PEPPERS-R-ALT" contentTypeId="DOCUMENT" dataResourceId="PEPPERS-R-ALT" localeString="en"/> + <Content contentId="CPEPPERS-R-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRPEPPERS-R-ALTEN" localeString="en_US"/> + + <ContentAssoc contentId="PC-100-ALT" contentIdTo="CPC-100-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="FOOD-001-ALT" contentIdTo="CFOOD-001-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="PC001-ALT" contentIdTo="CPC001-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="RAM1GB_BRAND-ALT" contentIdTo="CRAM1GB_BRAND-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="HD250GB_BRAND-ALT" contentIdTo="CHD250GB_BRAND-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="HD500GB_BRAND-ALT" contentIdTo="CHD500GB_BRAND-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="ETH_BRAND-ALT" contentIdTo="CETH_BRAND-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="MOD_BRAND-ALT" contentIdTo="CMOD_BRAND-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="MOTHER_BOARD_ASS-ALT" contentIdTo="CMOTHER_BOARD_ASS" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="MOTHER_BOARD-ALT" contentIdTo="CMOTHER_BOARD-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="CPU-586-ALT" contentIdTo="CCPU-586-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="ENCHILADAS-ALT" contentIdTo="CENCHILADAS-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="FAJITA_BEEF-ALT" contentIdTo="CFAJITA_BEEF-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="JALAPENOS-ALT" contentIdTo="CJALAPENOS-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="PIZZA-ALT" contentIdTo="CPIZZA-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="DOUGH-ALT" contentIdTo="CDOUGH-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="SAUCE-ALT" contentIdTo="CSAUCE-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="SAUCE-TM-ALT" contentIdTo="CSAUCE-TM-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="SAUCE-CM-ALT" contentIdTo="CSAUCE-CM-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="SAUCE-TP-ALT" contentIdTo="CSAUCE-TP-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="SAUCE-CP-ALT" contentIdTo="CSAUCE-CP-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="PEPPERS-ALT" contentIdTo="CPEPPERS-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="PEPPERS-G-ALT" contentIdTo="CPEPPERS-G-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="PEPPERS-H-ALT" contentIdTo="CPEPPERS-H-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="PEPPERS-R-ALT" contentIdTo="CPEPPERS-R-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + + <ProductCategoryContent prodCatContentTypeId="ALTERNATIVE_URL" productCategoryId="PC-100" contentId="PC-100-ALT" fromDate="2001-05-13 12:00:00.0"/> + <ProductCategoryContent prodCatContentTypeId="ALTERNATIVE_URL" productCategoryId="FOOD-001" contentId="FOOD-001-ALT" fromDate="2001-05-13 12:00:00.0"/> + + <ProductContent productId="PC001" contentId="PC001-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="RAM1GB_BRAND" contentId="RAM1GB_BRAND-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="HD250GB_BRAND" contentId="HD250GB_BRAND-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="HD500GB_BRAND" contentId="HD500GB_BRAND-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="ETH_BRAND" contentId="ETH_BRAND-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="MOD_BRAND" contentId="MOD_BRAND-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="MOTHER_BOARD_ASS" contentId="MOTHER_BOARD_ASS-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="MOTHER_BOARD" contentId="MOTHER_BOARD-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="CPU-586" contentId="CPU-586-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="ENCHILADAS" contentId="ENCHILADAS-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="FAJITA_BEEF" contentId="FAJITA_BEEF-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="JALAPENOS" contentId="JALAPENOS-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="PIZZA" contentId="PIZZA-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="DOUGH" contentId="DOUGH-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="SAUCE" contentId="SAUCE-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="SAUCE-TM" contentId="SAUCE-TM-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="SAUCE-CM" contentId="SAUCE-CM-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="SAUCE-TP" contentId="SAUCE-TP-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="SAUCE-CP" contentId="SAUCE-CP-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="PEPPERS" contentId="PEPPERS-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="PEPPERS-G" contentId="PEPPERS-G-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="PEPPERS-H" contentId="PEPPERS-H-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="PEPPERS-R" contentId="PEPPERS-R-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> </entity-engine-xml> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoFinAccount.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoFinAccount.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoFinAccount.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoFinAccount.xml Sun May 29 11:02:09 2011 @@ -87,4 +87,41 @@ <!-- associate the fulfillment service with the products --> <ProductContent productId="FA-001" contentId="FA_ACTIVATION" productContentTypeId="FULFILLMENT_EXTASYNC" fromDate="2000-01-01 00:00:00"/> + + <!-- alternative URL --> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="FA-100-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRFA-100-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="FA-001-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRFA-001-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="FA-001-30-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRFA-001-30-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="FA-001-50-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRFA-001-50-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="FA-001-O-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRFA-001-O-ALTEN" localeString="en_US"/> + <ElectronicText dataResourceId="DRFA-100-ALTEN" textData="account-activation"/> + <ElectronicText dataResourceId="DRFA-001-ALTEN" textData="financial-account-activation"/> + <ElectronicText dataResourceId="DRFA-001-30-ALTEN" textData="financial-account-activation-30"/> + <ElectronicText dataResourceId="DRFA-001-50-ALTEN" textData="financial-account-activation-50"/> + <ElectronicText dataResourceId="DRFA-001-O-ALTEN" textData="financial-account-activation-o"/> + <Content contentId="FA-100-ALT" contentTypeId="DOCUMENT" dataResourceId="FA-100-ALT" localeString="en"/> + <Content contentId="CFA-100-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRFA-100-ALTEN" localeString="en_US"/> + <Content contentId="FA-001-ALT" contentTypeId="DOCUMENT" dataResourceId="FA-001-ALT" localeString="en"/> + <Content contentId="CFA-001-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRFA-001-ALTEN" localeString="en_US"/> + <Content contentId="FA-001-30-ALT" contentTypeId="DOCUMENT" dataResourceId="FA-001-30-ALT" localeString="en"/> + <Content contentId="CFA-001-30-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRFA-001-30-ALTEN" localeString="en_US"/> + <Content contentId="FA-001-50-ALT" contentTypeId="DOCUMENT" dataResourceId="FA-001-50-ALT" localeString="en"/> + <Content contentId="CFA-001-50-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRFA-001-50-ALTEN" localeString="en_US"/> + <Content contentId="FA-001-O-ALT" contentTypeId="DOCUMENT" dataResourceId="FA-001-O-ALT" localeString="en"/> + <Content contentId="CFA-001-O-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRFA-001-O-ALTEN" localeString="en_US"/> + <ContentAssoc contentId="FA-100-ALT" contentIdTo="CFA-100-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="FA-001-ALT" contentIdTo="CFA-001-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="FA-001-30-ALT" contentIdTo="CFA-001-30-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="FA-001-50-ALT" contentIdTo="CFA-001-50-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="FA-001-O-ALT" contentIdTo="CFA-001-O-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ProductCategoryContent prodCatContentTypeId="ALTERNATIVE_URL" productCategoryId="FA-100" contentId="FA-100-ALT" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="FA-001" contentId="FA-001-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="FA-001-30" contentId="FA-001-30-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="FA-001-50" contentId="FA-001-50-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> + <ProductContent productId="FA-001-O" contentId="FA-001-O-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/> </entity-engine-xml> \ No newline at end of file Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoPopularCategoriesData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoPopularCategoriesData.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoPopularCategoriesData.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoPopularCategoriesData.xml Sun May 29 11:02:09 2011 @@ -39,5 +39,18 @@ under the License. <ProductCategoryMember productCategoryId="BEST-SELL-2" productId="WG-9944" quantity="5" fromDate="2010-01-01 12:00:00.0"/> <ProductCategoryMember productCategoryId="BEST-SELL-2" productId="WG-1111" quantity="7" fromDate="2010-01-01 12:00:00.0"/> <ProductCategoryMember productCategoryId="BEST-SELL-2" productId="WG-5569" quantity="1" fromDate="2010-01-01 12:00:00.0"/> - + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="BEST-SELL-1-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRBEST-SELL-1-ALTEN" localeString="en_US"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="BEST-SELL-2-ALT" localeString="en"/> + <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRBEST-SELL-2-ALTEN" localeString="en_US"/> + <ElectronicText dataResourceId="DRBEST-SELL-1-ALTEN" textData="best-sell-1"/> + <ElectronicText dataResourceId="DRBEST-SELL-2-ALTEN" textData="best-sell-2"/> + <Content contentTypeId="DOCUMENT" localeString="en" contentId="BEST-SELL-1-ALT" dataResourceId="BEST-SELL-1-ALT"/> + <Content contentTypeId="DOCUMENT" localeString="en_US" contentId="CBEST-SELL-1-ALTEN" dataResourceId="DRBEST-SELL-2-ALTEN"/> + <Content contentTypeId="DOCUMENT" localeString="en" contentId="BEST-SELL-2-ALT" dataResourceId="BEST-SELL-2-ALT"/> + <Content contentTypeId="DOCUMENT" localeString="en_US" contentId="CBEST-SELL-2-ALTEN" dataResourceId="DRBEST-SELL-2-ALTEN"/> + <ContentAssoc contentId="BEST-SELL-1-ALT" contentIdTo="CBEST-SELL-1-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ContentAssoc contentId="BEST-SELL-2-ALT" contentIdTo="CBEST-SELL-2-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/> + <ProductCategoryContent prodCatContentTypeId="ALTERNATIVE_URL" productCategoryId="BEST-SELL-1" contentId="BEST-SELL-1-ALT" fromDate="2001-05-13 12:00:00.0"/> + <ProductCategoryContent prodCatContentTypeId="ALTERNATIVE_URL" productCategoryId="BEST-SELL-2" contentId="BEST-SELL-2-ALT" fromDate="2001-05-13 12:00:00.0"/> </entity-engine-xml> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |