svn commit: r1173274 [8/13] - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1173274 [8/13] - in /ofbiz/branches/jackrabbit2010
 
|
Modified: ofbiz/branches/jackrabbit20100709/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/build.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/build.xml (original) +++ ofbiz/branches/jackrabbit20100709/build.xml Tue Sep 20 17:46:13 2011 @@ -453,7 +453,155 @@ under the License. <arg value="file=${data-file}"/> </java> </target> - + <!-- ================================= + target: run-install-tenant + ================================= --> + <target name="run-install-tenant" depends="build,run-install-tenant-all,run-install-tenant-reader,run-install-tenant-component-all,run-install-tenant-component-reader" + description="This loads data using tenantId, syntax eg: ant run-install-tenant -DtenantId=DEMO1 (needs multitenant=Y in general.properties)"> + </target> + <target name="check-tenant-id"> + <java jar="ofbiz.jar" fork="true"> + <jvmarg value="${memory.initial.param}"/> + <jvmarg value="${memory.max.param}"/> + <jvmarg value="${memory.maxpermsize.param}"/> + <arg value="install"/> + <arg value="readers=tenant"/> + </java> + <condition property="hasTenant"> + <and> + <length string="${tenantId}" trim="true" when="greater" length="0"/> + <not><contains string="${tenantId}" substring="tenantId"/></not> + <or> + <length string="${component}" trim="true" when="equal" length="0"/> + <contains string="${component}" substring="component"/> + </or> + </and> + </condition> + <condition property="hasTenantComponent"> + <and> + <length string="${tenantId}" trim="true" when="greater" length="0"/> + <not><contains string="${tenantId}" substring="tenantId"/></not> + <length string="${component}" trim="true" when="greater" length="0"/> + <not><contains string="${component}" substring="component"/></not> + </and> + </condition> + </target> + <target name="check-tenant-reader" depends="check-tenant-id" if="hasTenant"> + <condition property="hasReader"> + <and> + <length string="${data-readers}" trim="true" when="greater" length="0"/> + <not><contains string="${data-readers}" substring="data-readers"/></not> + </and> + </condition> + <condition property="noReader"> + <or> + <length string="${data-readers}" trim="true" when="equal" length="0"/> + <contains string="${data-readers}" substring="data-readers"/> + </or> + </condition> + </target> + <target name="run-install-tenant-all" depends="check-tenant-reader" if="noReader"> + <java jar="ofbiz.jar" fork="true"> + <jvmarg value="${memory.initial.param}"/> + <jvmarg value="${memory.max.param}"/> + <jvmarg value="${memory.maxpermsize.param}"/> + <arg value="install"/> + <arg value="delegator=default#${tenantId}"/> + </java> + </target> + <target name="run-install-tenant-reader" depends="check-tenant-reader" if="hasReader"> + <java jar="ofbiz.jar" fork="true"> + <jvmarg value="${memory.initial.param}"/> + <jvmarg value="${memory.max.param}"/> + <jvmarg value="${memory.maxpermsize.param}"/> + <arg value="install"/> + <arg value="delegator=default#${tenantId}"/> + <arg value="readers=${data-readers}"/> + </java> + </target> + <!-- run-install-tenant-component --> + <target name="run-install-tenant-component" if="hasTenantComponent" depends="check-tenant-id"> + <condition property="hasComponentReader"> + <and> + <length string="${data-readers}" trim="true" when="greater" length="0"/> + <not><contains string="${data-readers}" substring="data-readers"/></not> + </and> + </condition> + <condition property="noComponentReader"> + <or> + <length string="${data-readers}" trim="true" when="equal" length="0"/> + <contains string="${data-readers}" substring="data-readers"/> + </or> + </condition> + </target> + <target name="run-install-tenant-component-all" depends="run-install-tenant-component" if="noComponentReader"> + <java jar="ofbiz.jar" fork="true"> + <jvmarg value="${memory.initial.param}"/> + <jvmarg value="${memory.max.param}"/> + <jvmarg value="${memory.maxpermsize.param}"/> + <arg value="install"/> + <arg value="delegator=default#${tenantId}"/> + <arg value="component=${component}"/> + </java> + </target> + <target name="run-install-tenant-component-reader" depends="run-install-tenant-component" if="hasComponentReader"> + <java jar="ofbiz.jar" fork="true"> + <jvmarg value="${memory.initial.param}"/> + <jvmarg value="${memory.max.param}"/> + <jvmarg value="${memory.maxpermsize.param}"/> + <arg value="install"/> + <arg value="delegator=default#${tenantId}"/> + <arg value="readers=${data-readers}"/> + <arg value="component=${component}"/> + </java> + </target> + <!-- ================================= + target: run-install-all-tenants + ================================= --> + <target name="run-install-all-tenants" depends="build,run-install-tenants-all,run-install-tenants-reader" + description="This loads data all tenants, syntax eg: ant run-install-all-tenants (needs multitenant=Y in general.properties)"> + </target> + <target name="check-tenants-reader"> + <property name="delegator" value="all-tenants"/> + <java jar="ofbiz.jar" fork="true"> + <jvmarg value="${memory.initial.param}"/> + <jvmarg value="${memory.max.param}"/> + <jvmarg value="${memory.maxpermsize.param}"/> + <arg value="install"/> + <arg value="readers=tenant"/> + </java> + <condition property="hasReader"> + <and> + <length string="${data-readers}" trim="true" when="greater" length="0"/> + <not><contains string="${data-readers}" substring="data-readers"/></not> + </and> + </condition> + <condition property="noReader"> + <or> + <length string="${data-readers}" trim="true" when="equal" length="0"/> + <contains string="${data-readers}" substring="data-readers"/> + </or> + </condition> + </target> + <target name="run-install-tenants-all" depends="check-tenants-reader" if="noReader"> + <java jar="ofbiz.jar" fork="true"> + <jvmarg value="${memory.initial.param}"/> + <jvmarg value="${memory.max.param}"/> + <jvmarg value="${memory.maxpermsize.param}"/> + <arg value="install"/> + <arg value="delegator=${delegator}"/> + </java> + </target> + <target name="run-install-tenants-reader" depends="check-tenants-reader" if="hasReader"> + <java jar="ofbiz.jar" fork="true"> + <jvmarg value="${memory.initial.param}"/> + <jvmarg value="${memory.max.param}"/> + <jvmarg value="${memory.maxpermsize.param}"/> + <arg value="install"/> + <arg value="readers=${data-readers}"/> + <arg value="delegator=${delegator}"/> + </java> + </target> <!-- ================================= target: run-create-tenant ================================= --> Modified: ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java Tue Sep 20 17:46:13 2011 @@ -18,6 +18,7 @@ *******************************************************************************/ package org.ofbiz.base.conversion; +import java.sql.Timestamp; import java.text.DateFormat; import java.text.NumberFormat; import java.text.ParseException; @@ -33,6 +34,16 @@ import com.ibm.icu.util.Calendar; /** Date/time Converter classes. */ public class DateTimeConverters implements ConverterLoader { + public static class CalendarToDate extends AbstractConverter<Calendar, Date> { + public CalendarToDate() { + super(Calendar.class, Date.class); + } + + public Date convert(Calendar obj) throws ConversionException { + return obj.getTime(); + } + } + public static class CalendarToLong extends AbstractConverter<Calendar, Long> { public CalendarToLong() { super(Calendar.class, Long.class); @@ -56,6 +67,26 @@ public class DateTimeConverters implemen } } + public static class CalendarToTimestamp extends AbstractConverter<Calendar, Timestamp> { + public CalendarToTimestamp() { + super(Calendar.class, Timestamp.class); + } + + public Timestamp convert(Calendar obj) throws ConversionException { + return new Timestamp(obj.getTimeInMillis()); + } + } + + public static class DateToCalendar extends GenericLocalizedConverter<Date, Calendar> { + public DateToCalendar() { + super(Date.class, Calendar.class); + } + + public Calendar convert(Date obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException { + return UtilDateTime.toCalendar(obj, timeZone, locale); + } + } + public static class DateToLong extends AbstractConverter<java.util.Date, Long> { public DateToLong() { super(java.util.Date.class, Long.class); @@ -137,6 +168,12 @@ public class DateTimeConverters implemen } } + public static class DurationToList extends GenericSingletonToList<TimeDuration> { + public DurationToList() { + super(TimeDuration.class); + } + } + public static class DurationToLong extends AbstractConverter<TimeDuration, Long> { public DurationToLong() { super(TimeDuration.class, Long.class); @@ -147,12 +184,6 @@ public class DateTimeConverters implemen } } - public static class DurationToList extends GenericSingletonToList<TimeDuration> { - public DurationToList() { - super(TimeDuration.class); - } - } - public static class DurationToSet extends GenericSingletonToSet<TimeDuration> { public DurationToSet() { super(TimeDuration.class); @@ -304,22 +335,6 @@ public class DateTimeConverters implemen } } - public static class SqlTimeToSqlDate extends AbstractConverter<java.sql.Time, java.sql.Date> { - public SqlTimeToSqlDate() { - super(java.sql.Time.class, java.sql.Date.class); - } - - public java.sql.Date convert(java.sql.Time obj) throws ConversionException { - throw new ConversionException("Conversion from Time to Date not supported"); - } - } - - public static class SqlTimeToList extends GenericSingletonToList<java.sql.Time> { - public SqlTimeToList() { - super(java.sql.Time.class); - } - } - public static class SqlDateToTimestamp extends AbstractConverter<java.sql.Date, java.sql.Timestamp> { public SqlDateToTimestamp() { super(java.sql.Date.class, java.sql.Timestamp.class); @@ -330,12 +345,28 @@ public class DateTimeConverters implemen } } + public static class SqlTimeToList extends GenericSingletonToList<java.sql.Time> { + public SqlTimeToList() { + super(java.sql.Time.class); + } + } + public static class SqlTimeToSet extends GenericSingletonToSet<java.sql.Time> { public SqlTimeToSet() { super(java.sql.Time.class); } } + public static class SqlTimeToSqlDate extends AbstractConverter<java.sql.Time, java.sql.Date> { + public SqlTimeToSqlDate() { + super(java.sql.Time.class, java.sql.Date.class); + } + + public java.sql.Date convert(java.sql.Time obj) throws ConversionException { + throw new ConversionException("Conversion from Time to Date not supported"); + } + } + public static class SqlTimeToString extends GenericLocalizedConverter<java.sql.Time, String> { public SqlTimeToString() { super(java.sql.Time.class, String.class); @@ -353,6 +384,10 @@ public class DateTimeConverters implemen } public static class StringToCalendar extends AbstractLocalizedConverter<String, Calendar> { + public StringToCalendar() { + super(String.class, Calendar.class); + } + public Calendar convert(String obj) throws ConversionException { return convert(obj, Locale.getDefault(), TimeZone.getDefault(), null); } @@ -361,10 +396,6 @@ public class DateTimeConverters implemen return convert(obj, Locale.getDefault(), TimeZone.getDefault(), null); } - public StringToCalendar() { - super(String.class, Calendar.class); - } - public Calendar convert(String obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException { String trimStr = obj.trim(); if (trimStr.length() == 0) { @@ -414,8 +445,8 @@ public class DateTimeConverters implemen super(String.class, TimeDuration.class); } - public TimeDuration convert(String obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException { - return convert(obj, locale, timeZone); + public TimeDuration convert(String obj) throws ConversionException { + return TimeDuration.parseDuration(obj); } public TimeDuration convert(String obj, Locale locale, TimeZone timeZone) throws ConversionException { @@ -433,8 +464,8 @@ public class DateTimeConverters implemen return convert(obj); } - public TimeDuration convert(String obj) throws ConversionException { - return TimeDuration.parseDuration(obj); + public TimeDuration convert(String obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException { + return convert(obj, locale, timeZone); } } @@ -561,6 +592,18 @@ public class DateTimeConverters implemen } } + public static class TimestampToList extends GenericSingletonToList<java.sql.Timestamp> { + public TimestampToList() { + super(java.sql.Timestamp.class); + } + } + + public static class TimestampToSet extends GenericSingletonToSet<java.sql.Timestamp> { + public TimestampToSet() { + super(java.sql.Timestamp.class); + } + } + public static class TimestampToSqlDate extends AbstractConverter<java.sql.Timestamp, java.sql.Date> { public TimestampToSqlDate() { super(java.sql.Timestamp.class, java.sql.Date.class); @@ -581,18 +624,6 @@ public class DateTimeConverters implemen } } - public static class TimestampToList extends GenericSingletonToList<java.sql.Timestamp> { - public TimestampToList() { - super(java.sql.Timestamp.class); - } - } - - public static class TimestampToSet extends GenericSingletonToSet<java.sql.Timestamp> { - public TimestampToSet() { - super(java.sql.Timestamp.class); - } - } - public void loadConverters() { Converters.loadContainedConverters(DateTimeConverters.class); } Modified: ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/Base64.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/Base64.java?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/Base64.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/Base64.java Tue Sep 20 17:46:13 2011 @@ -150,13 +150,9 @@ public class Base64 { * @return the decoded str. */ public final static String base64Decode(String str) { - if (str == null) { - return null; - } - - byte data[] = new byte[str.length()]; - data = str.getBytes(); - return new String(base64Decode(data)); + if (str == null) return null; + + return new String(base64Decode(str.getBytes())); } /** Modified: ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilHttp.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilHttp.java?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilHttp.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilHttp.java Tue Sep 20 17:46:13 2011 @@ -274,8 +274,9 @@ public class UtilHttp { public static Map<String, Object> getJSONAttributeMap(HttpServletRequest request) { Map<String, Object> returnMap = FastMap.newInstance(); Map<String, Object> attrMap = getAttributeMap(request); - for (String key: attrMap.keySet()) { - Object val = attrMap.get(key); + for (Map.Entry<String, Object> entry : attrMap.entrySet()) { + String key = entry.getKey(); + Object val = entry.getValue(); if (val instanceof java.sql.Timestamp) { val = val.toString(); } @@ -1116,7 +1117,8 @@ public class UtilHttp { } // next put all parameters with matching N in the right map - for (String key: parameters.keySet()) { + for (Map.Entry<String, Object> entry : parameters.entrySet()) { + String key = entry.getKey(); // skip keys without DELIMITER and skip ROW_SUBMIT_PREFIX if (key == null) continue; int index = key.indexOf(MULTI_ROW_DELIMITER); @@ -1130,7 +1132,7 @@ public class UtilHttp { // get the key without the <DELIMITER>N suffix and store it and its value String newKey = key.substring(0, index); - map.put(newKey, parameters.get(key)); + map.put(newKey, entry.getValue()); } // return only the values, which is the list of maps return rows.values(); @@ -1142,12 +1144,13 @@ public class UtilHttp { */ public static <V> Map<String, V> removeMultiFormParameters(Map<String, V> parameters) { FastMap<String, V> filteredParameters = new FastMap<String, V>(); - for (String key: parameters.keySet()) { + for (Map.Entry<String, V> entry : parameters.entrySet()) { + String key = entry.getKey(); if (key != null && (key.indexOf(MULTI_ROW_DELIMITER) != -1 || key.indexOf("_useRowSubmit") != -1 || key.indexOf("_rowCount") != -1)) { continue; } - filteredParameters.put(key, parameters.get(key)); + filteredParameters.put(key, entry.getValue()); } return filteredParameters; } Modified: ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilValidate.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilValidate.java?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilValidate.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilValidate.java Tue Sep 20 17:46:13 2011 @@ -206,32 +206,32 @@ public class UtilValidate { /** Check whether string s is empty. */ public static boolean isEmpty(String s) { - return ((s == null) || (s.length() == 0)); + return (s == null) || s.length() == 0; } /** Check whether collection c is empty. */ public static <E> boolean isEmpty(Collection<E> c) { - return ((c == null) || (c.size() == 0)); + return (c == null) || c.isEmpty(); } /** Check whether map m is empty. */ public static <K,E> boolean isEmpty(Map<K,E> m) { - return ((m == null) || (m.size() == 0)); + return (m == null) || m.isEmpty(); } /** Check whether charsequence c is empty. */ public static <E> boolean isEmpty(CharSequence c) { - return ((c == null) || (c.length() == 0)); + return (c == null) || c.length() == 0; } /** Check whether string s is NOT empty. */ public static boolean isNotEmpty(String s) { - return ((s != null) && (s.length() > 0)); + return (s != null) && s.length() > 0; } /** Check whether collection c is NOT empty. */ public static <E> boolean isNotEmpty(Collection<E> c) { - return ((c != null) && (c.size() > 0)); + return (c != null) && !c.isEmpty(); } /** Check whether charsequence c is NOT empty. */ @@ -264,31 +264,31 @@ public class UtilValidate { /** Removes all characters which appear in string bag from string s. */ public static String stripCharsInBag(String s, String bag) { int i; - String returnString = ""; + StringBuilder stringBuilder = new StringBuilder(""); // Search through string's characters one by one. // If character is not in bag, append to returnString. for (i = 0; i < s.length(); i++) { char c = s.charAt(i); - if (bag.indexOf(c) == -1) returnString += c; + if (bag.indexOf(c) == -1) stringBuilder.append(c); } - return returnString; + return stringBuilder.toString(); } /** Removes all characters which do NOT appear in string bag from string s. */ public static String stripCharsNotInBag(String s, String bag) { int i; - String returnString = ""; + StringBuilder stringBuilder = new StringBuilder(""); // Search through string's characters one by one. // If character is in bag, append to returnString. for (i = 0; i < s.length(); i++) { char c = s.charAt(i); - if (bag.indexOf(c) != -1) returnString += c; + if (bag.indexOf(c) != -1) stringBuilder.append(c); } - return returnString; + return stringBuilder.toString(); } /** Removes all whitespace characters from s. Modified: ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java Tue Sep 20 17:46:13 2011 @@ -23,6 +23,7 @@ import java.util.Locale; import java.util.Map; import javax.el.PropertyNotFoundException; +import org.ofbiz.base.lang.IsEmpty; import org.ofbiz.base.lang.SourceMonitored; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilGenerics; @@ -39,7 +40,7 @@ import org.ofbiz.base.util.string.UelUti */ @SourceMonitored @SuppressWarnings("serial") -public class FlexibleMapAccessor<T> implements Serializable { +public class FlexibleMapAccessor<T> implements Serializable, IsEmpty { public static final String module = FlexibleMapAccessor.class.getName(); protected static final UtilCache<String, FlexibleMapAccessor<?>> fmaCache = UtilCache.createUtilCache("flexibleMapAccessor.ExpressionCache"); @SuppressWarnings("unchecked") Modified: ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java Tue Sep 20 17:46:13 2011 @@ -27,6 +27,7 @@ import java.util.TimeZone; import javax.el.PropertyNotFoundException; +import org.ofbiz.base.lang.IsEmpty; import org.ofbiz.base.lang.SourceMonitored; import org.ofbiz.base.util.BshUtil; import org.ofbiz.base.util.Debug; @@ -52,7 +53,7 @@ import bsh.EvalError; */ @SourceMonitored @SuppressWarnings("serial") -public abstract class FlexibleStringExpander implements Serializable { +public abstract class FlexibleStringExpander implements Serializable, IsEmpty { public static final String module = FlexibleStringExpander.class.getName(); public static final String openBracket = "${"; Modified: ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java Tue Sep 20 17:46:13 2011 @@ -108,7 +108,7 @@ public class FreeMarkerWorker { URL propertyURL = resources.nextElement(); Debug.logInfo("loading properties: " + propertyURL, module); Properties props = UtilProperties.getProperties(propertyURL); - if (props == null || props.isEmpty()) { + if (UtilValidate.isEmpty(props)) { Debug.logError("Unable to locate properties file " + propertyURL, module); } else { loadTransforms(loader, props, newConfig); Modified: ofbiz/branches/jackrabbit20100709/framework/bi/data/BiTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/bi/data/BiTypeData.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/bi/data/BiTypeData.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/bi/data/BiTypeData.xml Tue Sep 20 17:46:13 2011 @@ -19,5 +19,5 @@ under the License. --> <entity-engine-xml> - <WebSite webSiteId="BI" siteName="Business Intelligence Application" visualThemeSetId="BACKOFFICE"/> + </entity-engine-xml> Modified: ofbiz/branches/jackrabbit20100709/framework/bi/webapp/bi/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/bi/webapp/bi/WEB-INF/web.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/bi/webapp/bi/WEB-INF/web.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/bi/webapp/bi/WEB-INF/web.xml Tue Sep 20 17:46:13 2011 @@ -24,11 +24,6 @@ <description>Business Intelligence component of the Open For Business Project</description> <context-param> - <param-name>webSiteId</param-name> - <param-value>BI</param-value> - <description>A unique ID used to look up the WebSite entity</description> - </context-param> - <context-param> <param-name>entityDelegatorName</param-name> <param-value>default</param-value> <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description> Modified: ofbiz/branches/jackrabbit20100709/framework/birt/src/org/ofbiz/birt/report/service/OFBizBirtViewerReportService.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/birt/src/org/ofbiz/birt/report/service/OFBizBirtViewerReportService.java?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/birt/src/org/ofbiz/birt/report/service/OFBizBirtViewerReportService.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/birt/src/org/ofbiz/birt/report/service/OFBizBirtViewerReportService.java Tue Sep 20 17:46:13 2011 @@ -48,6 +48,7 @@ import org.eclipse.birt.report.utility.D import org.eclipse.birt.report.utility.ParameterAccessor; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilGenerics; +import org.ofbiz.base.util.UtilValidate; import org.ofbiz.birt.container.BirtContainer; @SuppressWarnings("deprecation") @@ -106,7 +107,7 @@ public class OFBizBirtViewerReportServic Debug.logError(e, module); } List<Exception> errors = this.runReport(request, runnable, outputDocName, locale, timeZone, parsedParams, displayTextMap, maxRows); - if (errors != null && !errors.isEmpty()) { + if (UtilValidate.isNotEmpty(errors)) { errorList.addAll(errors); } } catch ( RemoteException e ) { Modified: ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml Tue Sep 20 17:46:13 2011 @@ -1153,7 +1153,8 @@ <property key="CommonCancelled"> <value xml:lang="ar">Ù ÙغÙ</value> <value xml:lang="de">Abgebrochen</value> - <value xml:lang="en">Cancelled</value> + <value xml:lang="en">Canceled</value> + <value xml:lang="en_GB">Cancelled</value> <value xml:lang="es">Cancelado</value> <value xml:lang="fr">Annulé</value> <value xml:lang="hi_IN">रदà¥à¤¦</value> @@ -4430,7 +4431,8 @@ <value xml:lang="zh_TW">æ£å¨è¼å ¥...</value> </property> <property key="CommonLocalisation"> - <value xml:lang="en">Localisation</value> + <value xml:lang="en">Localization</value> + <value xml:lang="en_GB">Localisation</value> <value xml:lang="es">Opciones locales</value> <value xml:lang="fr">Options régionales et linguistiques</value> <value xml:lang="hi_IN">सà¥à¤¥à¤¾à¤¨à¥à¤¯à¤à¤°à¤£</value> @@ -6420,6 +6422,12 @@ <value xml:lang="zh">设置</value> <value xml:lang="zh_TW">è¨ç½®</value> </property> + <property key="CommonPreferenceGroup"> + <value xml:lang="en">Preference Group</value> + </property> + <property key="CommonPreferenceName"> + <value xml:lang="en">Preference Name</value> + </property> <property key="CommonPrepared"> <value xml:lang="ar">٠عدة</value> <value xml:lang="de">Vorbereitet</value> @@ -8422,7 +8430,7 @@ </property> <property key="CommonTheFollowingRequiredFieldsWhereFoundEmpty"> <value xml:lang="de">Die folgenden benötigten Felder sind leer</value> - <value xml:lang="en">The Following Required Fields Where Found Empty</value> + <value xml:lang="en">The following required fields were found empty</value> <value xml:lang="es">Estos campos obligatorios están vacÃos</value> <value xml:lang="fr">Les champs suivants sont vides</value> <value xml:lang="hi_IN">निमà¥à¤¨à¤²à¤¿à¤à¤¿à¤¤ à¤à¤µà¤¶à¥à¤¯à¤ à¤à¥à¤·à¥à¤¤à¥à¤° à¤à¤¾à¤²à¥ मिलà¥</value> @@ -9452,7 +9460,7 @@ <property key="CommonVolume"> <value xml:lang="ar">اÙجØÙ </value> <value xml:lang="de">Volumen</value> - <value xml:lang="en">Volum</value> + <value xml:lang="en">Volume</value> <value xml:lang="es">Volumen</value> <value xml:lang="fr">Volume</value> <value xml:lang="hi_IN">माप</value> Modified: ofbiz/branches/jackrabbit20100709/framework/common/config/general.properties URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/config/general.properties?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/config/general.properties (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/config/general.properties Tue Sep 20 17:46:13 2011 @@ -128,7 +128,7 @@ https.www.ofbiz.it=ABQIAAAAtt0d8djaYFkk8 https.localhost=ABQIAAAAtt0d8djaYFkk8N5LJVcDSBQN-clGH2vvMMwJjYtcwF78UzZgEBTN70S6uIgRoAtXRkADNoesbw5etg http.localhost=ABQIAAAAtt0d8djaYFkk8N5LJVcDSBT2yXp_ZAY8_ufC3CFXhHIE1NvwkxR3euHYk9bpwvdF2Qg1EYO1LQitHA -# -- Y if you want to display the multi-tenant textbox in the login page +# -- Y if you want to display the multi-tenant textbox in the login page and install specify components which related to each tenant multitenant=N # -- Y if you use a cluster. Most of the time this should not be needed. Setting distributed-cache-clear-enabled="true" is enough Modified: ofbiz/branches/jackrabbit20100709/framework/common/data/CommonTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/data/CommonTypeData.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/data/CommonTypeData.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/data/CommonTypeData.xml Tue Sep 20 17:46:13 2011 @@ -129,8 +129,6 @@ under the License. <VisualThemeSet visualThemeSetId="BACKOFFICE" description="Themes to be used for backoffice applications"/> <VisualThemeSet visualThemeSetId="ECOMMERCE" description="Themes to be used for ECommerce applications"/> - <WebSite webSiteId="WEBTOOLS" siteName="Web Tools" visualThemeSetId="BACKOFFICE"/> - <!-- Uom Conversion Purposes --> <EnumerationType enumTypeId="CONVERSION_PURPOSE" description="Conversion Purpose"/> <Enumeration enumId="INTERNAL_CONVERSION" enumTypeId="CONVERSION_PURPOSE" enumCode="INTERNAL" sequenceId="10" description="Internal Conversion"/> Modified: ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData.xml Tue Sep 20 17:46:13 2011 @@ -308,23 +308,23 @@ under the License. <GeoAssoc geoAssocTypeId="GROUP_MEMBER" geoIdTo="GBR" geoId="NIRL"/> <GeoAssoc geoAssocTypeId="GROUP_MEMBER" geoIdTo="GBR" geoId="WALS"/> - <CountryAddressFormat geoId="DEU" stateProvinceGeoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="GBR" stateProvinceGeoAssocTypeId="GROUP_MEMBER" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="ENGL" stateProvinceGeoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="NIRL" stateProvinceGeoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="WALS" stateProvinceGeoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="SCOT" stateProvinceGeoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="USA" stateProvinceGeoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="CAN" stateProvinceGeoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="AUS" stateProvinceGeoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="BGR" stateProvinceGeoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="BRA" stateProvinceGeoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="CHN" stateProvinceGeoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="COL" stateProvinceGeoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="MEX" stateProvinceGeoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="NLD" stateProvinceGeoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="POL" stateProvinceGeoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="IND" stateProvinceGeoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="ITA" stateProvinceGeoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> - <CountryAddressFormat geoId="FRA" stateProvinceGeoAssocTypeId="null" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> + <CountryAddressFormat geoId="DEU" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> + <CountryAddressFormat geoId="GBR" geoAssocTypeId="GROUP_MEMBER" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> + <CountryAddressFormat geoId="ENGL" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> + <CountryAddressFormat geoId="NIRL" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> + <CountryAddressFormat geoId="WALS" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> + <CountryAddressFormat geoId="SCOT" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> + <CountryAddressFormat geoId="USA" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> + <CountryAddressFormat geoId="CAN" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> + <CountryAddressFormat geoId="AUS" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> + <CountryAddressFormat geoId="BGR" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> + <CountryAddressFormat geoId="BRA" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> + <CountryAddressFormat geoId="CHN" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> + <CountryAddressFormat geoId="COL" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> + <CountryAddressFormat geoId="MEX" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> + <CountryAddressFormat geoId="NLD" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> + <CountryAddressFormat geoId="POL" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> + <CountryAddressFormat geoId="IND" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> + <CountryAddressFormat geoId="ITA" geoAssocTypeId="REGIONS" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> + <CountryAddressFormat geoId="FRA" geoAssocTypeId="" requireStateProvinceId="" requirePostalCode="" postalCodeRegex="" hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/> </entity-engine-xml> Modified: ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData_MX.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData_MX.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData_MX.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData_MX.xml Tue Sep 20 17:46:13 2011 @@ -84,4 +84,9 @@ under the License. <GeoAssoc geoId="MEX" geoIdTo="MX-VE" geoAssocTypeId="REGIONS"/> <GeoAssoc geoId="MEX" geoIdTo="MX-YU" geoAssocTypeId="REGIONS"/> <GeoAssoc geoId="MEX" geoIdTo="MX-ZA" geoAssocTypeId="REGIONS"/> + + <Geo abbreviation="MEXCAN" geoCode="MEXCAN" geoId="MEXCAN" geoName="Mexico/Canada" geoTypeId="GROUP"/> + <GeoAssoc geoId="MEX" geoIdTo="MEXCAN" geoAssocTypeId="GROUP_MEMBER"/> + <GeoAssoc geoId="CAN" geoIdTo="MEXCAN" geoAssocTypeId="GROUP_MEMBER"/> + </entity-engine-xml> Modified: ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData_US.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData_US.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData_US.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData_US.xml Tue Sep 20 17:46:13 2011 @@ -143,34 +143,6 @@ under the License. <GeoAssoc geoId="USA" geoIdTo="AE" geoAssocTypeId="REGIONS"/> <GeoAssoc geoId="USA" geoIdTo="AP" geoAssocTypeId="REGIONS"/> - <Geo abbreviation="AB" geoCode="AB" geoId="AB" geoName="Alberta" geoTypeId="PROVINCE"/> - <Geo abbreviation="BC" geoCode="BC" geoId="BC" geoName="British Columbia" geoTypeId="PROVINCE"/> - <Geo abbreviation="MB" geoCode="MB" geoId="MB" geoName="Manitoba" geoTypeId="PROVINCE"/> - <Geo abbreviation="NB" geoCode="NB" geoId="NB" geoName="New Brunswick" geoTypeId="PROVINCE"/> - <Geo abbreviation="NL" geoCode="NL" geoId="NL" geoName="Newfoundland and Labrador" geoTypeId="PROVINCE"/> - <Geo abbreviation="NS" geoCode="NS" geoId="NS" geoName="Nova Scotia" geoTypeId="PROVINCE"/> - <Geo abbreviation="NT" geoCode="NT" geoId="NT" geoName="Northwest Territories" geoTypeId="PROVINCE"/> - <Geo abbreviation="NU" geoCode="NU" geoId="NU" geoName="Nunavut" geoTypeId="PROVINCE"/> - <Geo abbreviation="ON" geoCode="ON" geoId="ON" geoName="Ontario" geoTypeId="PROVINCE"/> - <Geo abbreviation="PE" geoCode="PE" geoId="PE" geoName="Prince Edward Island" geoTypeId="PROVINCE"/> - <Geo abbreviation="QC" geoCode="QC" geoId="QC" geoName="Quebec" geoTypeId="PROVINCE"/> - <Geo abbreviation="SK" geoCode="SK" geoId="SK" geoName="Saskatchewan" geoTypeId="PROVINCE"/> - <Geo abbreviation="YT" geoCode="YT" geoId="YT" geoName="Yukon" geoTypeId="PROVINCE"/> - - <GeoAssoc geoId="CAN" geoIdTo="AB" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="CAN" geoIdTo="BC" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="CAN" geoIdTo="MB" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="CAN" geoIdTo="NB" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="CAN" geoIdTo="NL" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="CAN" geoIdTo="NS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="CAN" geoIdTo="NT" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="CAN" geoIdTo="NU" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="CAN" geoIdTo="ON" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="CAN" geoIdTo="PE" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="CAN" geoIdTo="QC" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="CAN" geoIdTo="SK" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="CAN" geoIdTo="YT" geoAssocTypeId="REGIONS"/> - <Geo abbreviation="USAF" geoCode="USAF" geoId="USAF" geoName="US Armed Forces" geoTypeId="GROUP"/> <GeoAssoc geoId="AA" geoIdTo="USAF" geoAssocTypeId="GROUP_MEMBER"/> <GeoAssoc geoId="AE" geoIdTo="USAF" geoAssocTypeId="GROUP_MEMBER"/> @@ -259,10 +231,6 @@ under the License. <GeoAssoc geoId="USA" geoIdTo="USCAN" geoAssocTypeId="GROUP_MEMBER"/> <GeoAssoc geoId="CAN" geoIdTo="USCAN" geoAssocTypeId="GROUP_MEMBER"/> - <Geo abbreviation="MEXCAN" geoCode="MEXCAN" geoId="MEXCAN" geoName="Mexico/Canada" geoTypeId="GROUP"/> - <GeoAssoc geoId="MEX" geoIdTo="MEXCAN" geoAssocTypeId="GROUP_MEMBER"/> - <GeoAssoc geoId="CAN" geoIdTo="MEXCAN" geoAssocTypeId="GROUP_MEMBER"/> - <Geo abbreviation="USMEXCAN" geoCode="USMEXCAN" geoId="USMEXCAN" geoName="US/Mexico/Canada" geoTypeId="GROUP"/> <GeoAssoc geoId="USA" geoIdTo="USMEXCAN" geoAssocTypeId="GROUP_MEMBER"/> <GeoAssoc geoId="MEX" geoIdTo="USMEXCAN" geoAssocTypeId="GROUP_MEMBER"/> Modified: ofbiz/branches/jackrabbit20100709/framework/common/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/entitydef/entitymodel.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/entitydef/entitymodel.xml Tue Sep 20 17:46:13 2011 @@ -118,6 +118,24 @@ under the License. </relation> </entity> + <view-entity entity-name="EnumTypeChildAndEnum" package-name="org.ofbiz.common.enum"> + <member-entity entity-alias="PARENT" entity-name="EnumerationType"/> + <member-entity entity-alias="CHILD" entity-name="EnumerationType"/> + <member-entity entity-alias="ENUM" entity-name="Enumeration"/> + <alias-all entity-alias="PARENT" prefix="parent"/> + <alias-all entity-alias="CHILD" prefix="child"> + <exclude field="parentTypeId"/> + </alias-all> + <alias-all entity-alias="ENUM"/> + <view-link entity-alias="PARENT" rel-entity-alias="CHILD"> + <key-map field-name="enumTypeId" rel-field-name="parentTypeId"/> + </view-link> + <view-link entity-alias="CHILD" rel-entity-alias="ENUM"> + <key-map field-name="enumTypeId"/> + </view-link> + </view-entity> + + <!-- ========================================================= --> <!-- org.ofbiz.common.geo --> <!-- ========================================================= --> @@ -167,7 +185,7 @@ under the License. <entity entity-name="CountryAddressFormat" package-name="org.ofbiz.common.geo" default-resource-name="CommonEntityLabels" title=""> <field name="geoId" type="id-ne"></field> - <field name="stateProvinceGeoAssocTypeId" type="id"></field> + <field name="geoAssocTypeId" type="id"></field> <field name="requireStateProvinceId" type="id"></field> <field name="requirePostalCode" type="indicator"></field> <field name="postalCodeRegex" type="long-varchar"></field> @@ -179,39 +197,44 @@ under the License. <key-map field-name="geoId"/> </relation> <relation type="one" fk-name="CNY_ADR_GEO_TYPE" rel-entity-name="GeoAssocType" > - <key-map field-name="geoAssocTypeId" rel-field-name="stateProvinceGeoAssocTypeId"/> + <key-map field-name="geoAssocTypeId"/> </relation> </entity> - <entity entity-name="Geo" package-name="org.ofbiz.common.geo" default-resource-name="CommonEntityLabels" - title="Geographic Boundary Entity"> - <field name="geoId" type="id-ne"></field> - <field name="geoTypeId" type="id"></field> - <field name="geoName" type="name"></field> - <field name="geoCode" type="short-varchar"></field> - <field name="geoSecCode" type="short-varchar"></field> - <field name="abbreviation" type="short-varchar"></field> - <field name="wellKnownText" type="very-long"></field> - <prim-key field="geoId"/> - <relation type="one" fk-name="GEO_TO_TYPE" rel-entity-name="GeoType"> - <key-map field-name="geoTypeId"/> - </relation> + <entity entity-name="Geo" package-name="org.ofbiz.common.geo" + default-resource-name="CommonEntityLabels" + title="Geographic Boundary Entity"> + <field name="geoId" type="id-ne"></field> + <field name="geoTypeId" type="id"></field> + <field name="geoName" type="name"></field> + <field name="geoCode" type="short-varchar"></field> + <field name="geoSecCode" type="short-varchar"></field> + <field name="abbreviation" type="short-varchar"></field> + <field name="wellKnownText" type="very-long"></field> + <prim-key field="geoId" /> + <relation type="one" fk-name="GEO_TO_TYPE" rel-entity-name="GeoType"> + <key-map field-name="geoTypeId" /> + </relation> </entity> <entity entity-name="GeoAssoc" package-name="org.ofbiz.common.geo" - title="Geographic Boundary Association Entity"> - <field name="geoId" type="id-ne"></field> - <field name="geoIdTo" type="id-ne"></field> - <field name="geoAssocTypeId" type="id"></field> - <prim-key field="geoId"/> - <prim-key field="geoIdTo"/> - <relation type="one" fk-name="GEO_ASSC_TO_MAIN" title="Main" rel-entity-name="Geo"> - <key-map field-name="geoId"/> - </relation> - <relation type="one" fk-name="GEO_ASSC_TO_ASSC" title="Assoc" rel-entity-name="Geo"> - <key-map field-name="geoIdTo" rel-field-name="geoId"/> - </relation> - <relation type="one" fk-name="GEO_ASSC_TO_TYPE" rel-entity-name="GeoAssocType"> - <key-map field-name="geoAssocTypeId"/> - </relation> + title="Geographic Boundary Association Entity"> + <field name="geoId" type="id-ne"> + <description>The enclosed geo</description> + </field> + <field name="geoIdTo" type="id-ne"> + <description>The enclosing geo</description> + </field> + <field name="geoAssocTypeId" type="id"></field> + <prim-key field="geoId" /> + <prim-key field="geoIdTo" /> + <relation type="one" fk-name="GEO_ASSC_TO_MAIN" title="Main" rel-entity-name="Geo"> + <key-map field-name="geoId" /> + </relation> + <relation type="one" fk-name="GEO_ASSC_TO_ASSC" title="Assoc" rel-entity-name="Geo"> + <key-map field-name="geoIdTo" rel-field-name="geoId" /> + </relation> + <relation type="one" fk-name="GEO_ASSC_TO_TYPE" rel-entity-name="GeoAssocType"> + <key-map field-name="geoAssocTypeId" /> + </relation> </entity> <view-entity entity-name="GeoAssocAndGeoFrom" package-name="org.ofbiz.common.geo"> <member-entity entity-alias="GA" entity-name="GeoAssoc"/> @@ -240,12 +263,12 @@ under the License. <alias-all entity-alias="GTO"/> <alias entity-alias="GA" name="geoIdFrom" field="geoId"/> <alias entity-alias="GA" name="geoAssocTypeId"/> - <view-link entity-alias="GA" rel-entity-alias="GTO"> - <key-map field-name="geoIdTo" rel-field-name="geoId"/> + <view-link entity-alias="GA" rel-entity-alias="GTO"> + <key-map field-name="geoIdTo" rel-field-name="geoId"/> </view-link> - <view-link entity-alias="GA" rel-entity-alias="GWS"> - <key-map field-name="geoId" rel-field-name="geoId"/> - <key-map field-name="geoAssocTypeId" rel-field-name="stateProvinceGeoAssocTypeId"/> + <view-link entity-alias="GA" rel-entity-alias="GWS"> + <key-map field-name="geoId" rel-field-name="geoId"/> + <key-map field-name="geoAssocTypeId"/> </view-link> </view-entity> <entity entity-name="GeoAssocType" package-name="org.ofbiz.common.geo" @@ -476,7 +499,7 @@ under the License. <order-by field-name="sequenceId"/> </entity-condition> </view-entity> - + <!-- ========================================================= --> <!-- org.ofbiz.common.uom --> <!-- ========================================================= --> @@ -498,11 +521,11 @@ under the License. package-name="org.ofbiz.common.uom" title="Unit Of Measure and Group/Type View Entity"> <member-entity entity-alias="UOMGP" entity-name="UomGroup"/> - <member-entity entity-alias="UOM" entity-name="Uom"/> + <member-entity entity-alias="UOM" entity-name="Uom"/> <member-entity entity-alias="UOMTP" entity-name="UomType"/> <alias-all entity-alias="UOMGP"/> - <alias-all entity-alias="UOM"/> - <alias-all entity-alias="UOMTP" prefix="type"/> + <alias-all entity-alias="UOM"/> + <alias-all entity-alias="UOMTP" prefix="type"/> <view-link entity-alias="UOMGP" rel-entity-alias="UOM"> <key-map field-name="uomId"/> </view-link> @@ -569,7 +592,7 @@ under the License. <relation type="one" fk-name="UOMD_PURPOSE_ENUM" title="Purpose" rel-entity-name="Enumeration"> <key-map field-name="purposeEnumId" rel-field-name="enumId"/> </relation> - </entity> + </entity> <entity entity-name="UomGroup" package-name="org.ofbiz.common.uom" default-resource-name="CommonEntityLabels" @@ -581,7 +604,7 @@ under the License. <relation type="one" fk-name="UOM_GROUP_UOM" rel-entity-name="Uom"> <key-map field-name="uomId"/> </relation> - </entity> + </entity> <entity entity-name="UomType" package-name="org.ofbiz.common.uom" default-resource-name="CommonEntityLabels" Modified: ofbiz/branches/jackrabbit20100709/framework/common/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/ofbiz-component.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/ofbiz-component.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/ofbiz-component.xml Tue Sep 20 17:46:13 2011 @@ -36,6 +36,7 @@ under the License. <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_AU.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_BG.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_BR.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_CA.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_CN.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_CO.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_DE.xml"/> Modified: ofbiz/branches/jackrabbit20100709/framework/common/script/org/ofbiz/common/CommonServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/script/org/ofbiz/common/CommonServices.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/script/org/ofbiz/common/CommonServices.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/script/org/ofbiz/common/CommonServices.xml Tue Sep 20 17:46:13 2011 @@ -130,7 +130,7 @@ under the License. <!-- Do custom conversion, if we have customMethodId --> <if-not-empty field="uomConversion.customMethodId"> <!-- custom conversion? --> <log level="verbose" message="using custom conversion customMethodId=${uomConversion.customMethodId}"/> - <set field="customParms" from-field="parameters"/> + <set-service-fields service-name="convertUomCustom" to-map="customParms" map="parameters"/> <set field="customParms.uomConversion" from-field="uomConversion"/> <call-service service-name="convertUomCustom" in-map-name="customParms"> <result-to-field result-name="convertedValue"/> Modified: ofbiz/branches/jackrabbit20100709/framework/common/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/servicedef/services.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/servicedef/services.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/servicedef/services.xml Tue Sep 20 17:46:13 2011 @@ -783,6 +783,7 @@ under the License. <service name="createJsLanguageFileMapping" engine="java" auth="false" use-transaction="false" location="org.ofbiz.common.JsLanguageFileMappingCreator" invoke="createJsLanguageFileMapping"> + <attribute name="encoding" mode="IN" type="String" optional="true" default-value="UTF-8"></attribute> </service> </services> Modified: ofbiz/branches/jackrabbit20100709/framework/common/servicedef/services_test.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/servicedef/services_test.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/servicedef/services_test.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/servicedef/services_test.xml Tue Sep 20 17:46:13 2011 @@ -37,7 +37,7 @@ under the License. <attribute name="testing" type="org.ofbiz.entity.GenericValue" mode="IN" optional="false"/> <attribute name="testingNodes" type="List" mode="OUT" optional="true"/> </service> - <service name="blockingTestScv" engine="java" export="true" validate="false" require-new-transaction="true" transaction-timeout="20" + <service name="blockingTestScv" engine="java" validate="false" require-new-transaction="true" transaction-timeout="20" location="org.ofbiz.common.CommonServices" invoke="blockingTestService"> <description>Blocking Test service</description> <attribute name="duration" mode="IN" type="Long" optional="true"/> Modified: ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/CommonEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/CommonEvents.java?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/CommonEvents.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/CommonEvents.java Tue Sep 20 17:46:13 2011 @@ -297,7 +297,6 @@ public class CommonEvents { JSONObject uiLabelObject = null; if (UtilValidate.isNotEmpty(requiredLabels)) { - uiLabelObject = new JSONObject(); // Transform JSON String to Object uiLabelObject = (JSONObject) JSONSerializer.toJSON(requiredLabels); } @@ -336,7 +335,6 @@ public class CommonEvents { JSONObject uiLabelObject = null; if (UtilValidate.isNotEmpty(requiredLabels)) { - uiLabelObject = new JSONObject(); // Transform JSON String to Object uiLabelObject = (JSONObject) JSONSerializer.toJSON(requiredLabels); } Modified: ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java Tue Sep 20 17:46:13 2011 @@ -1,10 +1,8 @@ package org.ofbiz.common; import java.io.File; -import java.io.IOException; import java.io.StringWriter; import java.io.Writer; -import java.net.MalformedURLException; import java.util.HashMap; import java.util.List; import java.util.Locale; @@ -20,19 +18,18 @@ import org.ofbiz.base.util.template.Free import org.ofbiz.service.DispatchContext; import org.ofbiz.service.ServiceUtil; -import freemarker.template.TemplateException; - public class JsLanguageFileMappingCreator { private static final String module = JsLanguageFileMappingCreator.class.getName(); public static Map<String, Object> createJsLanguageFileMapping(DispatchContext ctx, Map<String, ?> context) { Map<String, Object> result = ServiceUtil.returnSuccess(); + String encoding = (String) context.get("encoding"); // default value: UTF-8 + List<Locale> localeList = UtilMisc.availableLocales(); Map<String, Object> jQueryLocaleFile = FastMap.newInstance(); Map<String, String> dateJsLocaleFile = FastMap.newInstance(); Map<String, String> validationLocaleFile = FastMap.newInstance(); - //Map<String, String> validationMethodsLocaleFile = FastMap.newInstance(); // setup some variables to locate the js files String componentRoot = "component://images/webapp"; @@ -119,11 +116,11 @@ public class JsLanguageFileMappingCreato if (file.exists()) { fileUrl = jqueryUiLocaleRelPath + jqueryUiLocalePrefix + strippedLocale + jsFilePostFix; } else { - fileName = componentRoot + jqueryUiLocaleRelPath + jqueryUiLocalePrefix + locale + jsFilePostFix; + fileName = componentRoot + jqueryUiLocaleRelPath + jqueryUiLocalePrefix + modifiedDisplayCountry + jsFilePostFix; file = FileUtil.getFile(fileName); if (file.exists()) { - fileUrl = jqueryUiLocaleRelPath + jqueryUiLocalePrefix + locale + jsFilePostFix; + fileUrl = jqueryUiLocaleRelPath + jqueryUiLocalePrefix + modifiedDisplayCountry + jsFilePostFix; } } @@ -147,32 +144,13 @@ public class JsLanguageFileMappingCreato Writer writer = new StringWriter(); try { FreeMarkerWorker.renderTemplateAtLocation(template, mapWrapper, writer); + // write it as a Java file + File file = new File(output); + FileUtils.writeStringToFile(file, writer.toString(), encoding); } - catch (MalformedURLException e) { - Debug.logError(e, module); - return result = ServiceUtil.returnError("The Outputfile could not be created: " + e.getMessage()); - } - catch (TemplateException e) { - Debug.logError(e, module); - return result = ServiceUtil.returnError("The Outputfile could not be created: " + e.getMessage()); - } - catch (IOException e) { - Debug.logError(e, module); - return result = ServiceUtil.returnError("The Outputfile could not be created: " + e.getMessage()); - } - catch (IllegalArgumentException e) { - Debug.logError(e, module); - return result = ServiceUtil.returnError("The Outputfile could not be created: " + e.getMessage()); - } - - // write it as a Java file - File file = new File(output); - try { - FileUtils.writeStringToFile(file, writer.toString(), "UTF-8"); - } - catch (IOException e) { + catch (Exception e) { Debug.logError(e, module); - return result = ServiceUtil.returnError("The Outputfile could not be created: " + e.getMessage()); + return ServiceUtil.returnError("The Outputfile could not be created: " + e.getMessage()); } return result; Modified: ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java Tue Sep 20 17:46:13 2011 @@ -227,10 +227,10 @@ public final class JsLanguageFilesMappin localeFiles.put("ca", "/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-ca.js"); localeFiles.put("ca_ES", "/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-ca.js"); localeFiles.put("zh", "/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-en.js"); - localeFiles.put("zh_CN", "/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-en.js"); - localeFiles.put("zh_HK", "/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-en.js"); + localeFiles.put("zh_CN", "/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-zh-CN.js"); + localeFiles.put("zh_HK", "/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-zh-HK.js"); localeFiles.put("zh_SG", "/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-en.js"); - localeFiles.put("zh_TW", "/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-en.js"); + localeFiles.put("zh_TW", "/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-zh-TW.js"); localeFiles.put("hr", "/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-hr.js"); localeFiles.put("hr_HR", "/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-hr.js"); localeFiles.put("cs", "/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-cs.js"); Modified: ofbiz/branches/jackrabbit20100709/framework/common/webcommon/WEB-INF/common-controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/webcommon/WEB-INF/common-controller.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/webcommon/WEB-INF/common-controller.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/webcommon/WEB-INF/common-controller.xml Tue Sep 20 17:46:13 2011 @@ -197,6 +197,11 @@ under the License. <response name="success" type="view" value="showHelp"/> </request-map> + <request-map uri="showHelpPublic"> + <security https="false" auth="false"/> + <response name="success" type="view" value="showHelp"/> + </request-map> + <request-map uri="authview"> <security https="true" auth="true"/> <response name="success" type="view" value="main"/> Modified: ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Bars.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Bars.ftl?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Bars.ftl (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Bars.ftl Tue Sep 20 17:46:13 2011 @@ -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.6.1.min.js</@ofbizContentUrl>"></script> +<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.6.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/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Pie.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Pie.ftl?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Pie.ftl (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Pie.ftl Tue Sep 20 17:46:13 2011 @@ -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.6.1.min.js</@ofbizContentUrl>"></script> +<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.6.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/jackrabbit20100709/framework/common/webcommon/includes/lookup.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/lookup.ftl?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/lookup.ftl (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/lookup.ftl Tue Sep 20 17:46:13 2011 @@ -27,7 +27,7 @@ under the License. <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <title>${title?if_exists}</title> - <script language="javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.6.1.min.js</@ofbizContentUrl>" type="text/javascript"></script> + <script language="javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.6.2.min.js</@ofbizContentUrl>" type="text/javascript"></script> <script language="javascript" src="<@ofbizContentUrl>/images/selectall.js</@ofbizContentUrl>" type="text/javascript"></script> <#if layoutSettings.javaScripts?has_content> <#--layoutSettings.javaScripts is a list of java scripts. --> Modified: ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml Tue Sep 20 17:46:13 2011 @@ -126,7 +126,7 @@ under the License. <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.6.1.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.6.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"/> @@ -173,7 +173,7 @@ under the License. </section> </widgets> </section> - + <section> <condition> <if-empty field="parameters.ajaxUpdateEvent"/> @@ -208,7 +208,7 @@ under the License. </section> </widgets> </section> - + <!-- render the appbar closing part --> <section> <condition> @@ -383,7 +383,7 @@ under the License. <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.6.1.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.6.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"/> Propchange: ofbiz/branches/jackrabbit20100709/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 20 17:46:13 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/framework/common/widget/HelpScreens.xml:951708-952957 /ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml:952958-1044489 /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264 -/ofbiz/trunk/framework/common/widget/HelpScreens.xml:962442-1156267 +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:962442-1173263 Modified: ofbiz/branches/jackrabbit20100709/framework/entity/config/entityengine.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entity/config/entityengine.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/entity/config/entityengine.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/entity/config/entityengine.xml Tue Sep 20 17:46:13 2011 @@ -96,6 +96,7 @@ access. For a detailed description see t <!-- need to at least define a name for each component to use --> <!-- defining: + 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 demo = OFBiz Only Demo Data @@ -103,6 +104,7 @@ access. For a detailed description see t ext-test = External Test Data (custom) ext-demo = External Demo Data (custom) --> + <entity-data-reader name="tenant"/> <entity-data-reader name="seed"/> <entity-data-reader name="seed-initial"/> <entity-data-reader name="demo"/> @@ -149,6 +151,7 @@ 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="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> <read-data reader-name="demo"/> @@ -177,6 +180,7 @@ access. For a detailed description see t use-indices-unique="false" alias-view-columns="false" use-order-by-nulls="true"> + <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> <read-data reader-name="demo"/> @@ -226,6 +230,7 @@ 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="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> <read-data reader-name="demo"/> @@ -251,6 +256,7 @@ access. For a detailed description see t use-indices-unique="false" alias-view-columns="false" use-order-by-nulls="true"> + <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> <read-data reader-name="demo"/> @@ -273,6 +279,7 @@ access. For a detailed description see t field-type-name="daffodil" check-on-start="true" add-missing-on-start="true"> + <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> <read-data reader-name="demo"/> @@ -297,6 +304,7 @@ 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="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> <read-data reader-name="demo"/> @@ -325,6 +333,7 @@ access. For a detailed description see t table-type="InnoDB" character-set="latin1" collate="latin1_general_cs"> + <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> <read-data reader-name="demo"/> @@ -355,6 +364,7 @@ access. For a detailed description see t table-type="InnoDB" character-set="latin1" collate="latin1_general_cs"> + <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> <read-data reader-name="demo"/> @@ -385,6 +395,7 @@ access. For a detailed description see t table-type="InnoDB" character-set="latin1" collate="latin1_general_cs"> + <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> <read-data reader-name="demo"/> @@ -415,6 +426,7 @@ access. For a detailed description see t table-type="InnoDB" character-set="latin1" collate="latin1_general_cs"> + <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <inline-jdbc jdbc-driver="com.mysql.jdbc.Driver" @@ -442,6 +454,7 @@ 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="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> <read-data reader-name="demo"/> @@ -479,6 +492,7 @@ 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="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> <read-data reader-name="demo"/> @@ -512,6 +526,7 @@ 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="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> <read-data reader-name="demo"/> @@ -545,6 +560,7 @@ 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="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> <read-data reader-name="demo"/> @@ -576,6 +592,7 @@ access. For a detailed description see t alias-view-columns="false" join-style="ansi" use-order-by-nulls="true"> + <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> <read-data reader-name="demo"/> @@ -616,6 +633,7 @@ access. For a detailed description see t add-missing-on-start="true" use-fk-initially-deferred="false" join-style="ansi"> + <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> <read-data reader-name="demo"/> @@ -639,6 +657,7 @@ 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="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> <read-data reader-name="demo"/> @@ -666,6 +685,7 @@ access. For a detailed description see t add-missing-on-start="true" alias-view-columns="false" join-style="ansi"> + <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> <read-data reader-name="demo"/> @@ -708,6 +728,7 @@ access. For a detailed description see t join-style="ansi" alias-view-columns="false" use-fk-initially-deferred="false"> + <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> <read-data reader-name="demo"/> @@ -731,6 +752,7 @@ access. For a detailed description see t check-on-start="true" add-missing-on-start="true" join-style="ansi"> + <read-data reader-name="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> <read-data reader-name="demo"/> @@ -758,6 +780,7 @@ 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="tenant"/> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> <read-data reader-name="demo"/> Modified: ofbiz/branches/jackrabbit20100709/framework/entity/entitydef/entitygroup.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entity/entitydef/entitygroup.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/entity/entitydef/entitygroup.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/entity/entitydef/entitygroup.xml Tue Sep 20 17:46:13 2011 @@ -27,4 +27,6 @@ under the License. <entity-group group="org.ofbiz.tenant" entity="Tenant"/> <entity-group group="org.ofbiz.tenant" entity="TenantDataSource"/> <!-- <entity-group group="org.ofbiz.tenant" entity="TenantUserLogin"/> --> + <entity-group group="org.ofbiz.tenant" entity="Component"/> + <entity-group group="org.ofbiz.tenant" entity="TenantComponent"/> </entitygroup> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |