svn commit: r737003 [9/11] - in /ofbiz/trunk: ./ applications/accounting/entity
Locked
svn commit: r737003 [9/11] - in /ofbiz/trunk: ./ applications/accounting/entity
 
|
Modified: ofbiz/trunk/framework/appserver/templates/tomcat55/server.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/appserver/templates/tomcat55/server.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/appserver/templates/tomcat55/server.xml (original) +++ ofbiz/trunk/framework/appserver/templates/tomcat55/server.xml Fri Jan 23 03:08:47 2009 @@ -97,14 +97,14 @@ connectionTimeout="20000" disableUploadTimeout="true" /> <!-- Note : To disable connection timeouts, set connectionTimeout value to 0 --> - - <!-- Note : To use gzip compression you could set the following properties : - - compression="on" - compressionMinSize="2048" - noCompressionUserAgents="gozilla, traviata" - compressableMimeType="text/html,text/xml" - --> + + <!-- Note : To use gzip compression you could set the following properties : + + compression="on" + compressionMinSize="2048" + noCompressionUserAgents="gozilla, traviata" + compressableMimeType="text/html,text/xml" + --> <!-- Define a SSL HTTP/1.1 Connector on port 8443 --> <Connector port="8443" maxHttpHeaderSize="8192" @@ -382,7 +382,7 @@ pattern="common" resolveHosts="false"/> --> - <!-- BEGIN OFBiz settings --> + <!-- BEGIN OFBiz settings --> <#list webApps as webapp> <#-- Remove last directory segment from path --> <#if webapp.getLocation().lastIndexOf("/") != -1> @@ -395,7 +395,7 @@ privileged="false" antiResourceLocking="true" antiJARLocking="true"> </Context> </#list> - <!-- END OFBiz settings --> + <!-- END OFBiz settings --> </Host> Modified: ofbiz/trunk/framework/appserver/templates/tomcat6/server.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/appserver/templates/tomcat6/server.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/appserver/templates/tomcat6/server.xml (original) +++ ofbiz/trunk/framework/appserver/templates/tomcat6/server.xml Fri Jan 23 03:08:47 2009 @@ -140,7 +140,7 @@ prefix="localhost_access_log." suffix=".txt" pattern="common" resolveHosts="false"/> --> - <!-- BEGIN OFBiz settings --> + <!-- BEGIN OFBiz settings --> <#list webApps as webapp> <#-- Remove last directory segment from path --> <#if webapp.getLocation().lastIndexOf("/") != -1> @@ -153,7 +153,7 @@ privileged="false" antiResourceLocking="true" antiJARLocking="true"> </Context> </#list> - <!-- END OFBiz settings --> + <!-- END OFBiz settings --> </Host> </Engine> Modified: ofbiz/trunk/framework/appserver/templates/weblogic81/config.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/appserver/templates/weblogic81/config.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/appserver/templates/weblogic81/config.xml (original) +++ ofbiz/trunk/framework/appserver/templates/weblogic81/config.xml Fri Jan 23 03:08:47 2009 @@ -163,7 +163,7 @@ <EJBComponent Name="jms_messageformat" Targets="examplesServer" URI="jms_messageformat.jar"/> </Application> - <!-- BEGIN OFBiz settings --> + <!-- BEGIN OFBiz settings --> <#list webApps as webapp> <#-- Remove last directory segment from path, Weblogic is expecting the parent directory --> <#if webapp.getLocation().lastIndexOf("/") != -1> Modified: ofbiz/trunk/framework/base/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/build.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/base/build.xml (original) +++ ofbiz/trunk/framework/base/build.xml Fri Jan 23 03:08:47 2009 @@ -49,7 +49,7 @@ </condition> <!-- compile base --> - <javac15 destdir="${build.dir}/classes" srcdir="${src.dir}"> + <javac15 destdir="${build.dir}/classes" srcdir="${src.dir}"> <exclude name="${exclude.crypto}"/> <exclude name="org/ofbiz/base/util/OfbizJsBsfEngine.java"/> </javac15> Modified: ofbiz/trunk/framework/base/config/jndiservers.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/jndiservers.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/base/config/jndiservers.xml (original) +++ ofbiz/trunk/framework/base/config/jndiservers.xml Fri Jan 23 03:08:47 2009 @@ -36,14 +36,14 @@ context-provider-url="rmi://127.0.0.1:1099" initial-context-factory="org.exolab.jms.jndi.InitialContextFactory"/> - <!-- Note that in most cases this is not necessary or desired for Orion, the default above is easier/better --> + <!-- Note that in most cases this is not necessary or desired for Orion, the default above is easier/better --> <jndi-server name="localorion" context-provider-url="ormi://localhost/default" initial-context-factory="com.evermind.server.ApplicationClientInitialContextFactory" security-principal="admin" security-credentials="admin"/> - <!-- Note that in most cases this is not necessary or desired for Weblogic, the default above is easier/better --> + <!-- Note that in most cases this is not necessary or desired for Weblogic, the default above is easier/better --> <jndi-server name="localweblogic" context-provider-url="t3://127.0.0.1:7001" initial-context-factory="weblogic.jndi.WLInitialContextFactory" Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentConfig.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentConfig.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentConfig.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/component/ComponentConfig.java Fri Jan 23 03:08:47 2009 @@ -571,7 +571,7 @@ public ComponentResourceHandler createResourceHandler() { return new ComponentResourceHandler(componentConfig.getGlobalName(), loader, location); - } + } public String getLocation() { return location; @@ -682,7 +682,7 @@ public boolean sessionCookieAccepted; public WebappInfo(ComponentConfig componentConfig, Element element) { - this.virtualHosts = FastList.newInstance(); + this.virtualHosts = FastList.newInstance(); this.initParameters = FastMap.newInstance(); this.componentConfig = componentConfig; this.name = element.getAttribute("name"); @@ -790,7 +790,7 @@ } public List<String> getVirtualHosts() { - return virtualHosts; + return virtualHosts; } public Map<String, String> getInitParameters() { Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/HttpClient.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/HttpClient.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/HttpClient.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/HttpClient.java Fri Jan 23 03:08:47 2009 @@ -223,8 +223,8 @@ } public void setBasicAuthInfo(String basicAuthUsername, String basicAuthPassword) { - this.basicAuthUsername = basicAuthUsername; - this.basicAuthPassword = basicAuthPassword; + this.basicAuthUsername = basicAuthUsername; + this.basicAuthPassword = basicAuthPassword; } /** Invoke HTTP request GET. */ @@ -448,7 +448,7 @@ // if there is basicAuth info set the request property for it if (basicAuthUsername != null) { - String basicAuthString = "Basic " + Base64.base64Encode(basicAuthUsername + ":" + (basicAuthPassword == null ? "" : basicAuthPassword)); + String basicAuthString = "Basic " + Base64.base64Encode(basicAuthUsername + ":" + (basicAuthPassword == null ? "" : basicAuthPassword)); con.setRequestProperty("Authorization", basicAuthString); if (Debug.verboseOn() || debug) Debug.log("Header - Authorization: " + basicAuthString, module); } Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java Fri Jan 23 03:08:47 2009 @@ -603,7 +603,7 @@ df = UtilDateTime.toDateTimeFormat(UtilDateTime.DATE_TIME_FORMAT, timeZone, locale); // if time is missing add zeros if (str.length() > 0 && !str.contains(":")) { - str = str + " 00:00:00.00"; + str = str + " 00:00:00.00"; } // hack to mimic Timestamp.valueOf() method if (str.length() > 0 && !str.contains(".")) { Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/OfbizBshBsfEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/OfbizBshBsfEngine.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/OfbizBshBsfEngine.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/OfbizBshBsfEngine.java Fri Jan 23 03:08:47 2009 @@ -212,7 +212,7 @@ public void compileExpr (String source, int lineNo, int columnNo, Object expr, CodeBuffer cb) throws BSFException; - public void compileScript (String source, int lineNo, int columnNo, + public void compileScript (String source, int lineNo, int columnNo, Object script, CodeBuffer cb) throws BSFException; */ Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java Fri Jan 23 03:08:47 2009 @@ -628,7 +628,7 @@ /** URL Encodes a Map of arguements */ public static String urlEncodeArgs(Map<String, ? extends Object> args) { - return urlEncodeArgs(args, true); + return urlEncodeArgs(args, true); } /** URL Encodes a Map of arguements */ @@ -648,11 +648,11 @@ if (valueStr != null && valueStr.length() > 0) { if (buf.length() > 0) { - if (useExpandedEntites) { - buf.append("&"); - } else { - buf.append("&"); - } + if (useExpandedEntites) { + buf.append("&"); + } else { + buf.append("&"); + } } try { buf.append(URLEncoder.encode(name, "UTF-8")); Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilURL.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilURL.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilURL.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilURL.java Fri Jan 23 03:08:47 2009 @@ -134,7 +134,7 @@ } public static String readUrlText(URL url) throws IOException { - InputStream stream = url.openStream(); + InputStream stream = url.openStream(); StringBuilder buf = new StringBuilder(); BufferedReader in = null; Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilValidate.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilValidate.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilValidate.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilValidate.java Fri Jan 23 03:08:47 2009 @@ -36,8 +36,8 @@ * <br/> - U.S. Postal Codes(2 letter abbreviations for names of states) * <br/> - U.S. Social Security Numbers(abbreviated as SSNs) * <br/> - email addresses - * <br/> - dates(entry of year, month, and day and validity of combined date) - * <br/> - credit card numbers + * <br/> - dates(entry of year, month, and day and validity of combined date) + * <br/> - credit card numbers * <br/> * <br/> Supporting utility functions validate that: * <br/> - characters are Letter, Digit, or LetterOrDigit @@ -48,7 +48,7 @@ * <br/> * <br/> Other utility functions are provided to: * <br/> - remove from a string characters which are/are not in a "bag" of selected characters - * <br/> - strip whitespace/leading whitespace from a string + * <br/> - strip whitespace/leading whitespace from a string * <br/> * <br/> ============================================================================== * <br/> NOTE: This code was adapted from the Netscape JavaScript form validation code, Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/XslTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/XslTransform.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/XslTransform.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/XslTransform.java Fri Jan 23 03:08:47 2009 @@ -71,8 +71,8 @@ if (translet == null ) { String templateUrl = (String)context.get("templateUrl"); - String templateString = (String)context.get("templateString"); - Document templateDocument = (Document)context.get("templateDocument"); + String templateString = (String)context.get("templateString"); + Document templateDocument = (Document)context.get("templateDocument"); Source templateSource = getSource(templateDocument, templateUrl, templateString); translet = tFactory.newTemplates(templateSource); if (UtilValidate.isNotEmpty(templateName)) { @@ -81,9 +81,9 @@ } if (translet != null ) { Transformer transformer = translet.newTransformer(); - if (params != null) { + if (params != null) { for (Map.Entry<String, Object> entry: params.entrySet()) { - String key = (String)entry.getKey(); + String key = (String)entry.getKey(); Object val = entry.getValue(); transformer.setParameter(key, val); } @@ -92,8 +92,8 @@ DOMResult outputResult = new DOMResult(UtilXml.makeEmptyXmlDocument()); String inputUrl = (String)context.get("inputUrl"); - String inputString = (String)context.get("inputString"); - Document inputDocument = (Document)context.get("inputDocument"); + String inputString = (String)context.get("inputString"); + Document inputDocument = (Document)context.get("inputDocument"); Source inputSource = getSource(inputDocument, inputUrl, inputString); transformer.transform(inputSource, outputResult); Modified: ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java (original) +++ ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java Fri Jan 23 03:08:47 2009 @@ -53,14 +53,14 @@ String[] domainArray = serverName.split("\\."); // check that the domain isn't an IP address if (domainArray.length == 4) { - boolean isIpAddress = true; - for (String domainSection : domainArray) { - if (!UtilValidate.isIntegerInRange(domainSection, 0, 255)) { - isIpAddress = false; - break; - } - } - if (isIpAddress) return; + boolean isIpAddress = true; + for (String domainSection : domainArray) { + if (!UtilValidate.isIntegerInRange(domainSection, 0, 255)) { + isIpAddress = false; + break; + } + } + if (isIpAddress) return; } if (domainArray.length > 2) { cookieDomain = "." + domainArray[domainArray.length - 2] + "." + domainArray[domainArray.length - 1]; Modified: ofbiz/trunk/framework/common/data/GeoData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/GeoData.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/common/data/GeoData.xml (original) +++ ofbiz/trunk/framework/common/data/GeoData.xml Fri Jan 23 03:08:47 2009 @@ -302,7 +302,7 @@ <GeoAssoc geoAssocTypeId="GROUP_MEMBER" geoIdTo="EU" geoId="SVN"/> <GeoAssoc geoAssocTypeId="GROUP_MEMBER" geoIdTo="EU" geoId="SWE"/> - <!-- Countries of the UK --> + <!-- Countries of the UK --> <GeoAssoc geoAssocTypeId="GROUP_MEMBER" geoIdTo="GBR" geoId="SCOT"/> <GeoAssoc geoAssocTypeId="GROUP_MEMBER" geoIdTo="GBR" geoId="ENGL"/> <GeoAssoc geoAssocTypeId="GROUP_MEMBER" geoIdTo="GBR" geoId="NIRL"/> Modified: ofbiz/trunk/framework/common/data/GeoData_IRL.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/GeoData_IRL.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/common/data/GeoData_IRL.xml (original) +++ ofbiz/trunk/framework/common/data/GeoData_IRL.xml Fri Jan 23 03:08:47 2009 @@ -19,73 +19,73 @@ --> <entity-engine-xml> - <!-- Counties of EIRE --> - <Geo abbreviation="CRLW" geoCode="CRLW" geoId="IRL-CRLW" geoName="Carlow" geoTypeId="COUNTY"/> - <Geo abbreviation="CAVN" geoCode="CAVN" geoId="IRL-CAVN" geoName="Cavan" geoTypeId="COUNTY"/> - <Geo abbreviation="CLARE" geoCode="CLARE" geoId="IRL-CLARE" geoName="Clare" geoTypeId="COUNTY"/> - <Geo abbreviation="CORK" geoCode="CORK" geoId="IRL-CORK" geoName="Cork" geoTypeId="COUNTY"/> - <Geo abbreviation="DNGL" geoCode="DNGL" geoId="IRL-DNGL" geoName="Donegal" geoTypeId="COUNTY"/> - <Geo abbreviation="DBLN" geoCode="DBLN" geoId="IRL-DBLN" geoName="Dublin" geoTypeId="COUNTY"/> - <Geo abbreviation="GALW" geoCode="GALW" geoId="IRL-GALW" geoName="Galway" geoTypeId="COUNTY"/> - <Geo abbreviation="KERRY" geoCode="KERRY" geoId="IRL-KERRY" geoName="Kerry" geoTypeId="COUNTY"/> - <Geo abbreviation="KLDR" geoCode="KLDR" geoId="IRL-KLDR" geoName="Kildare" geoTypeId="COUNTY"/> - <Geo abbreviation="KLKNY" geoCode="KLKNY" geoId="IRL-KLKNY" geoName="Kilkenny" geoTypeId="COUNTY"/> - <Geo abbreviation="LAOIS" geoCode="LAOIS" geoId="IRL-LAOIS" geoName="Laois" geoTypeId="COUNTY"/> - <Geo abbreviation="LTRM" geoCode="LTRM" geoId="IRL-LTRM" geoName="Leitrim" geoTypeId="COUNTY"/> - <Geo abbreviation="LMRK" geoCode="LMRK" geoId="IRL-LMRK" geoName="Limerick" geoTypeId="COUNTY"/> - <Geo abbreviation="LGFD" geoCode="LGFD" geoId="IRL-LGFD" geoName="Longford" geoTypeId="COUNTY"/> - <Geo abbreviation="LOUTH" geoCode="LOUTH" geoId="IRL-LOUTH" geoName="Louth" geoTypeId="COUNTY"/> - <Geo abbreviation="MAYO" geoCode="MAYO" geoId="IRL-MAYO" geoName="Mayo" geoTypeId="COUNTY"/> - <Geo abbreviation="MEATH" geoCode="MEATH" geoId="IRL-MEATH" geoName="Meath" geoTypeId="COUNTY"/> - <Geo abbreviation="MNGHN" geoCode="MNGHN" geoId="IRL-MNGHN" geoName="Monaghan" geoTypeId="COUNTY"/> - <Geo abbreviation="OFLY" geoCode="OFLY" geoId="IRL-OFLY" geoName="Offaly" geoTypeId="COUNTY"/> - <Geo abbreviation="RSCMN" geoCode="RSCMN" geoId="IRL-RSCMN" geoName="Roscommon" geoTypeId="COUNTY"/> - <Geo abbreviation="SLIGO" geoCode="SLIGO" geoId="IRL-SLIGO" geoName="Sligo" geoTypeId="COUNTY"/> - <Geo abbreviation="TPRY" geoCode="TPRY" geoId="IRL-TPRY" geoName="Tipperary" geoTypeId="COUNTY"/> - <Geo abbreviation="WTFD" geoCode="WTFD" geoId="IRL-WTFD" geoName="Waterford" geoTypeId="COUNTY"/> - <Geo abbreviation="WMETH" geoCode="WMETH" geoId="IRL-WMETH" geoName="West Meath" geoTypeId="COUNTY"/> - <Geo abbreviation="WXFD" geoCode="WXFD" geoId="IRL-WXFD" geoName="Wexford" geoTypeId="COUNTY"/> - <Geo abbreviation="WKLW" geoCode="WKLW" geoId="IRL-WKLW" geoName="Wicklow" geoTypeId="COUNTY"/> - <GeoAssoc geoId="IRL" geoIdTo="IRL-CRLW" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="IRL" geoIdTo="IRL-CAVN" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="IRL" geoIdTo="IRL-CLARE" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="IRL" geoIdTo="IRL-CORK" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="IRL" geoIdTo="IRL-DNGL" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="IRL" geoIdTo="IRL-DBLN" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="IRL" geoIdTo="IRL-GALW" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="IRL" geoIdTo="IRL-KERRY" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="IRL" geoIdTo="IRL-KLDR" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="IRL" geoIdTo="IRL-KLKNY" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="IRL" geoIdTo="IRL-LAOIS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="IRL" geoIdTo="IRL-LTRM" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="IRL" geoIdTo="IRL-LMRK" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="IRL" geoIdTo="IRL-LGFD" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="IRL" geoIdTo="IRL-LOUTH" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="IRL" geoIdTo="IRL-MAYO" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="IRL" geoIdTo="IRL-MEATH" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="IRL" geoIdTo="IRL-MNGHN" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="IRL" geoIdTo="IRL-OFLY" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="IRL" geoIdTo="IRL-RSCMN" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="IRL" geoIdTo="IRL-SLIGO" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="IRL" geoIdTo="IRL-TPRY" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="IRL" geoIdTo="IRL-WTFD" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="IRL" geoIdTo="IRL-WMETH" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="IRL" geoIdTo="IRL-WXFD" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="IRL" geoIdTo="IRL-WKLW" geoAssocTypeId="REGIONS"/> - <!-- End of EIRE --> + <!-- Counties of EIRE --> + <Geo abbreviation="CRLW" geoCode="CRLW" geoId="IRL-CRLW" geoName="Carlow" geoTypeId="COUNTY"/> + <Geo abbreviation="CAVN" geoCode="CAVN" geoId="IRL-CAVN" geoName="Cavan" geoTypeId="COUNTY"/> + <Geo abbreviation="CLARE" geoCode="CLARE" geoId="IRL-CLARE" geoName="Clare" geoTypeId="COUNTY"/> + <Geo abbreviation="CORK" geoCode="CORK" geoId="IRL-CORK" geoName="Cork" geoTypeId="COUNTY"/> + <Geo abbreviation="DNGL" geoCode="DNGL" geoId="IRL-DNGL" geoName="Donegal" geoTypeId="COUNTY"/> + <Geo abbreviation="DBLN" geoCode="DBLN" geoId="IRL-DBLN" geoName="Dublin" geoTypeId="COUNTY"/> + <Geo abbreviation="GALW" geoCode="GALW" geoId="IRL-GALW" geoName="Galway" geoTypeId="COUNTY"/> + <Geo abbreviation="KERRY" geoCode="KERRY" geoId="IRL-KERRY" geoName="Kerry" geoTypeId="COUNTY"/> + <Geo abbreviation="KLDR" geoCode="KLDR" geoId="IRL-KLDR" geoName="Kildare" geoTypeId="COUNTY"/> + <Geo abbreviation="KLKNY" geoCode="KLKNY" geoId="IRL-KLKNY" geoName="Kilkenny" geoTypeId="COUNTY"/> + <Geo abbreviation="LAOIS" geoCode="LAOIS" geoId="IRL-LAOIS" geoName="Laois" geoTypeId="COUNTY"/> + <Geo abbreviation="LTRM" geoCode="LTRM" geoId="IRL-LTRM" geoName="Leitrim" geoTypeId="COUNTY"/> + <Geo abbreviation="LMRK" geoCode="LMRK" geoId="IRL-LMRK" geoName="Limerick" geoTypeId="COUNTY"/> + <Geo abbreviation="LGFD" geoCode="LGFD" geoId="IRL-LGFD" geoName="Longford" geoTypeId="COUNTY"/> + <Geo abbreviation="LOUTH" geoCode="LOUTH" geoId="IRL-LOUTH" geoName="Louth" geoTypeId="COUNTY"/> + <Geo abbreviation="MAYO" geoCode="MAYO" geoId="IRL-MAYO" geoName="Mayo" geoTypeId="COUNTY"/> + <Geo abbreviation="MEATH" geoCode="MEATH" geoId="IRL-MEATH" geoName="Meath" geoTypeId="COUNTY"/> + <Geo abbreviation="MNGHN" geoCode="MNGHN" geoId="IRL-MNGHN" geoName="Monaghan" geoTypeId="COUNTY"/> + <Geo abbreviation="OFLY" geoCode="OFLY" geoId="IRL-OFLY" geoName="Offaly" geoTypeId="COUNTY"/> + <Geo abbreviation="RSCMN" geoCode="RSCMN" geoId="IRL-RSCMN" geoName="Roscommon" geoTypeId="COUNTY"/> + <Geo abbreviation="SLIGO" geoCode="SLIGO" geoId="IRL-SLIGO" geoName="Sligo" geoTypeId="COUNTY"/> + <Geo abbreviation="TPRY" geoCode="TPRY" geoId="IRL-TPRY" geoName="Tipperary" geoTypeId="COUNTY"/> + <Geo abbreviation="WTFD" geoCode="WTFD" geoId="IRL-WTFD" geoName="Waterford" geoTypeId="COUNTY"/> + <Geo abbreviation="WMETH" geoCode="WMETH" geoId="IRL-WMETH" geoName="West Meath" geoTypeId="COUNTY"/> + <Geo abbreviation="WXFD" geoCode="WXFD" geoId="IRL-WXFD" geoName="Wexford" geoTypeId="COUNTY"/> + <Geo abbreviation="WKLW" geoCode="WKLW" geoId="IRL-WKLW" geoName="Wicklow" geoTypeId="COUNTY"/> + <GeoAssoc geoId="IRL" geoIdTo="IRL-CRLW" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="IRL" geoIdTo="IRL-CAVN" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="IRL" geoIdTo="IRL-CLARE" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="IRL" geoIdTo="IRL-CORK" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="IRL" geoIdTo="IRL-DNGL" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="IRL" geoIdTo="IRL-DBLN" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="IRL" geoIdTo="IRL-GALW" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="IRL" geoIdTo="IRL-KERRY" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="IRL" geoIdTo="IRL-KLDR" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="IRL" geoIdTo="IRL-KLKNY" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="IRL" geoIdTo="IRL-LAOIS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="IRL" geoIdTo="IRL-LTRM" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="IRL" geoIdTo="IRL-LMRK" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="IRL" geoIdTo="IRL-LGFD" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="IRL" geoIdTo="IRL-LOUTH" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="IRL" geoIdTo="IRL-MAYO" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="IRL" geoIdTo="IRL-MEATH" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="IRL" geoIdTo="IRL-MNGHN" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="IRL" geoIdTo="IRL-OFLY" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="IRL" geoIdTo="IRL-RSCMN" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="IRL" geoIdTo="IRL-SLIGO" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="IRL" geoIdTo="IRL-TPRY" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="IRL" geoIdTo="IRL-WTFD" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="IRL" geoIdTo="IRL-WMETH" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="IRL" geoIdTo="IRL-WXFD" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="IRL" geoIdTo="IRL-WKLW" geoAssocTypeId="REGIONS"/> + <!-- End of EIRE --> - <!-- Counties of N.Ireland --> - <Geo abbreviation="ATRM" geoCode="ATRM" geoId="NIRL-ATRM" geoName="Antrim" geoTypeId="COUNTY"/> - <Geo abbreviation="ARMG" geoCode="ARMG" geoId="NIRL-ARMG" geoName="Armagh" geoTypeId="COUNTY"/> - <Geo abbreviation="DOWN" geoCode="DOWN" geoId="NIRL-DOWN" geoName="Down" geoTypeId="COUNTY"/> - <Geo abbreviation="FMNH" geoCode="FMNH" geoId="NIRL-FMNH" geoName="Fermanagh" geoTypeId="COUNTY"/> - <Geo abbreviation="LDRY" geoCode="LDRY" geoId="NIRL-LDRY" geoName="Londonderry" geoTypeId="COUNTY"/> - <Geo abbreviation="TYR" geoCode="TYR" geoId="NIRL-TYR" geoName="Tyrone" geoTypeId="COUNTY"/> - <GeoAssoc geoId="NIRL" geoIdTo="NIRL-ATRM" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="NIRL" geoIdTo="NIRL-ARMG" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="NIRL" geoIdTo="NIRL-DOWN" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="NIRL" geoIdTo="NIRL-FMNH" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="NIRL" geoIdTo="NIRL-LDRY" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="NIRL" geoIdTo="NIRL-TYR" geoAssocTypeId="REGIONS"/> - <!-- End of N.Ireland --> + <!-- Counties of N.Ireland --> + <Geo abbreviation="ATRM" geoCode="ATRM" geoId="NIRL-ATRM" geoName="Antrim" geoTypeId="COUNTY"/> + <Geo abbreviation="ARMG" geoCode="ARMG" geoId="NIRL-ARMG" geoName="Armagh" geoTypeId="COUNTY"/> + <Geo abbreviation="DOWN" geoCode="DOWN" geoId="NIRL-DOWN" geoName="Down" geoTypeId="COUNTY"/> + <Geo abbreviation="FMNH" geoCode="FMNH" geoId="NIRL-FMNH" geoName="Fermanagh" geoTypeId="COUNTY"/> + <Geo abbreviation="LDRY" geoCode="LDRY" geoId="NIRL-LDRY" geoName="Londonderry" geoTypeId="COUNTY"/> + <Geo abbreviation="TYR" geoCode="TYR" geoId="NIRL-TYR" geoName="Tyrone" geoTypeId="COUNTY"/> + <GeoAssoc geoId="NIRL" geoIdTo="NIRL-ATRM" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="NIRL" geoIdTo="NIRL-ARMG" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="NIRL" geoIdTo="NIRL-DOWN" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="NIRL" geoIdTo="NIRL-FMNH" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="NIRL" geoIdTo="NIRL-LDRY" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="NIRL" geoIdTo="NIRL-TYR" geoAssocTypeId="REGIONS"/> + <!-- End of N.Ireland --> </entity-engine-xml> Modified: ofbiz/trunk/framework/common/data/GeoData_UK.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/GeoData_UK.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/common/data/GeoData_UK.xml (original) +++ ofbiz/trunk/framework/common/data/GeoData_UK.xml Fri Jan 23 03:08:47 2009 @@ -19,176 +19,176 @@ --> <entity-engine-xml> - <Geo abbreviation="ABDN" geoCode="ABDN" geoId="GB-ABDN" geoName="Aberdeenshire" geoTypeId="COUNTY"/> - <Geo abbreviation="ANGS" geoCode="ANGS" geoId="GB-ANGS" geoName="Angus/Forfarshire" geoTypeId="COUNTY"/> - <Geo abbreviation="ARGL" geoCode="ARGL" geoId="GB-ARGL" geoName="Argyllshire" geoTypeId="COUNTY"/> - <Geo abbreviation="AYRS" geoCode="AYRS" geoId="GB-AYRS" geoName="Ayrshire" geoTypeId="COUNTY"/> - <Geo abbreviation="BANF" geoCode="BANF" geoId="GB-BANF" geoName="Banffshire" geoTypeId="COUNTY"/> - <Geo abbreviation="BDFD" geoCode="BDFD" geoId="GB-BDFD" geoName="Bedfordshire" geoTypeId="COUNTY"/> - <Geo abbreviation="BRKS" geoCode="BRKS" geoId="GB-BRKS" geoName="Berkshire" geoTypeId="COUNTY"/> - <Geo abbreviation="BWKS" geoCode="BWKS" geoId="GB-BWKS" geoName="Berwickshire" geoTypeId="COUNTY"/> - <Geo abbreviation="BUCKS" geoCode="BUCKS" geoId="GB-BUCKS" geoName="Buckinghamshire" geoTypeId="COUNTY"/> - <Geo abbreviation="BUTE" geoCode="BUTE" geoId="GB-BUTE" geoName="Buteshire" geoTypeId="COUNTY"/> - <Geo abbreviation="CTHN" geoCode="CTHN" geoId="GB-CTHN" geoName="Caithness" geoTypeId="COUNTY"/> - <Geo abbreviation="CAMBS" geoCode="CAMBS" geoId="GB-CAMBS" geoName="Cambridgeshire" geoTypeId="COUNTY"/> - <Geo abbreviation="CDGN" geoCode="CDGN" geoId="GB-CDGN" geoName="Cardiganshire/Ceredigion" geoTypeId="COUNTY"/> - <Geo abbreviation="CHES" geoCode="CHES" geoId="GB-CHES" geoName="Cheshire" geoTypeId="COUNTY"/> - <Geo abbreviation="CLAK" geoCode="CLAK" geoId="GB-CLAK" geoName="Clackmannanshire" geoTypeId="COUNTY"/> - <Geo abbreviation="CNWL" geoCode="CNWL" geoId="GB-CNWL" geoName="Cornwall" geoTypeId="COUNTY"/> - <Geo abbreviation="CMTY" geoCode="CMTY" geoId="GB-CMTY" geoName="Cromartyshire" geoTypeId="COUNTY"/> - <Geo abbreviation="CUMB" geoCode="CUMB" geoId="GB-CUMB" geoName="Cumberland" geoTypeId="COUNTY"/> - <Geo abbreviation="DRBYS" geoCode="DRBYS" geoId="GB-DRBYS" geoName="Derbyshire" geoTypeId="COUNTY"/> - <Geo abbreviation="DEVON" geoCode="DEVON" geoId="GB-DEVON" geoName="Devon" geoTypeId="COUNTY"/> - <Geo abbreviation="DRST" geoCode="DRST" geoId="GB-DRST" geoName="Dorset" geoTypeId="COUNTY"/> - <Geo abbreviation="DMFS" geoCode="DMFS" geoId="GB-DMFS" geoName="Dumfriesshire" geoTypeId="COUNTY"/> - <Geo abbreviation="DMBR" geoCode="DMBR" geoId="GB-DMBR" geoName="Dunbartonshire/Dumbartonshire" geoTypeId="COUNTY"/> - <Geo abbreviation="DRHM" geoCode="DRHM" geoId="GB-DRHM" geoName="Durham" geoTypeId="COUNTY"/> - <Geo abbreviation="ESSX" geoCode="ESSX" geoId="GB-ESSX" geoName="Essex" geoTypeId="COUNTY"/> - <Geo abbreviation="FIFE" geoCode="FIFE" geoId="GB-FIFE" geoName="Fife" geoTypeId="COUNTY"/> - <Geo abbreviation="GLAM" geoCode="GLAM" geoId="GB-GLAM" geoName="Glamorgan/Morgannwg" geoTypeId="COUNTY"/> - <Geo abbreviation="GLOU" geoCode="GLOU" geoId="GB-GLOU" geoName="Gloucestershire" geoTypeId="COUNTY"/> - <Geo abbreviation="HAMPS" geoCode="HAMPS" geoId="GB-HAMPS" geoName="Hampshire" geoTypeId="COUNTY"/> - <Geo abbreviation="HRFDS" geoCode="HRFDS" geoId="GB-HRFDS" geoName="Herefordshire" geoTypeId="COUNTY"/> - <Geo abbreviation="HERTS" geoCode="HERTS" geoId="GB-HERTS" geoName="Hertfordshire" geoTypeId="COUNTY"/> - <Geo abbreviation="HUNTS" geoCode="HUNTS" geoId="GB-HUNTS" geoName="Huntingdonshire" geoTypeId="COUNTY"/> - <Geo abbreviation="INVER" geoCode="INVER" geoId="GB-INVER" geoName="Inverness-shire" geoTypeId="COUNTY"/> - <Geo abbreviation="KENT" geoCode="KENT" geoId="GB-KENT" geoName="Kent" geoTypeId="COUNTY"/> - <Geo abbreviation="KNDN" geoCode="KNDN" geoId="GB-KNDN" geoName="Kincardineshire" geoTypeId="COUNTY"/> - <Geo abbreviation="KRSS" geoCode="KRSS" geoId="GB-KRSS" geoName="Kinross-shire" geoTypeId="COUNTY"/> - <Geo abbreviation="KRCUD" geoCode="KRCUD" geoId="GB-KRCUD" geoName="Kirkcudbrightshire" geoTypeId="COUNTY"/> - <Geo abbreviation="LRKS" geoCode="LRKS" geoId="GB-LRKS" geoName="Lanarkshire" geoTypeId="COUNTY"/> - <Geo abbreviation="LANCS" geoCode="LANCS" geoId="GB-LANCS" geoName="Lancashire" geoTypeId="COUNTY"/> - <Geo abbreviation="LIECS" geoCode="LIECS" geoId="GB-LIECS" geoName="Leicestershire" geoTypeId="COUNTY"/> - <Geo abbreviation="LINCS" geoCode="LINCS" geoId="GB-LINCS" geoName="Lincolnshire" geoTypeId="COUNTY"/> - <Geo abbreviation="MIENT" geoCode="MIENT" geoId="GB-MIENT" geoName="Merioneth/Meirionnydd" geoTypeId="COUNTY"/> - <Geo abbreviation="MSEX" geoCode="MSEX" geoId="GB-MSEX" geoName="Middlesex" geoTypeId="COUNTY"/> - <Geo abbreviation="MLOTH" geoCode="MLOTH" geoId="GB-MLOTH" geoName="Midlothian/Edinburghshire" geoTypeId="COUNTY"/> - <Geo abbreviation="MORAY" geoCode="MORAY" geoId="GB-MORAY" geoName="Morayshire" geoTypeId="COUNTY"/> - <Geo abbreviation="NAIRN" geoCode="NAIRN" geoId="GB-NAIRN" geoName="Nairnshire" geoTypeId="COUNTY"/> - <Geo abbreviation="NFLK" geoCode="NFLK" geoId="GB-NFLK" geoName="Norfolk" geoTypeId="COUNTY"/> - <Geo abbreviation="NHANTS" geoCode="NHANTS" geoId="GB-NHANTS" geoName="Northamptonshire" geoTypeId="COUNTY"/> - <Geo abbreviation="NHUMB" geoCode="NHUMB" geoId="GB-NHUMB" geoName="Northumberland" geoTypeId="COUNTY"/> - <Geo abbreviation="NOTTS" geoCode="NOTTS" geoId="GB-NOTTS" geoName="Nottinghamshire" geoTypeId="COUNTY"/> - <Geo abbreviation="ORK" geoCode="ORK" geoId="GB-ORK" geoName="Orkney" geoTypeId="COUNTY"/> - <Geo abbreviation="OXFD" geoCode="OXFD" geoId="GB-OXFD" geoName="Oxfordshire" geoTypeId="COUNTY"/> - <Geo abbreviation="PEEBS" geoCode="PEEBS" geoId="GB-PEEBS" geoName="Peeblesshire" geoTypeId="COUNTY"/> - <Geo abbreviation="PERTH" geoCode="PERTH" geoId="GB-PERTH" geoName="Perthshire" geoTypeId="COUNTY"/> - <Geo abbreviation="RNFR" geoCode="RNFR" geoId="GB-RNFR" geoName="Renfrewshire" geoTypeId="COUNTY"/> - <Geo abbreviation="ROSS" geoCode="ROSS" geoId="GB-ROSS" geoName="Ross-shire" geoTypeId="COUNTY"/> - <Geo abbreviation="ROXB" geoCode="ROXB" geoId="GB-ROXB" geoName="Roxburghshire" geoTypeId="COUNTY"/> - <Geo abbreviation="RUTL" geoCode="RUTL" geoId="GB-RUTL" geoName="Rutland" geoTypeId="COUNTY"/> - <Geo abbreviation="SELKS" geoCode="SELKS" geoId="GB-SELKS" geoName="Selkirkshire" geoTypeId="COUNTY"/> - <Geo abbreviation="SHET" geoCode="SHET" geoId="GB-SHET" geoName="Shetland" geoTypeId="COUNTY"/> - <Geo abbreviation="SHROPS" geoCode="SHROPS" geoId="GB-SHROPS" geoName="Shropshire" geoTypeId="COUNTY"/> - <Geo abbreviation="SOMST" geoCode="SOMST" geoId="GB-SOMST" geoName="Somerset" geoTypeId="COUNTY"/> - <Geo abbreviation="STAFFS" geoCode="STAFFS" geoId="GB-STAFFS" geoName="Staffordshire" geoTypeId="COUNTY"/> - <Geo abbreviation="STLNG" geoCode="STLNG" geoId="GB-STLNG" geoName="Stirlingshire" geoTypeId="COUNTY"/> - <Geo abbreviation="SFFK" geoCode="SFFK" geoId="GB-SFFK" geoName="Suffolk" geoTypeId="COUNTY"/> - <Geo abbreviation="SURR" geoCode="SURR" geoId="GB-SURR" geoName="Surrey" geoTypeId="COUNTY"/> - <Geo abbreviation="SUSX" geoCode="SUSX" geoId="GB-SUSX" geoName="Sussex" geoTypeId="COUNTY"/> - <Geo abbreviation="SUTH" geoCode="SUTH" geoId="GB-SUTH" geoName="Sutherland" geoTypeId="COUNTY"/> - <Geo abbreviation="WWKS" geoCode="WWKS" geoId="GB-WWKS" geoName="Warwickshire" geoTypeId="COUNTY"/> - <Geo abbreviation="WMLD" geoCode="WMLD" geoId="GB-WMLD" geoName="Westmorland" geoTypeId="COUNTY"/> - <Geo abbreviation="WGNSH" geoCode="WGNSH" geoId="GB-WGNSH" geoName="Wigtownshire" geoTypeId="COUNTY"/> - <Geo abbreviation="WILTS" geoCode="WILTS" geoId="GB-WILTS" geoName="Wiltshire" geoTypeId="COUNTY"/> - <Geo abbreviation="WORCS" geoCode="WORCS" geoId="GB-WORCS" geoName="Worcestershire" geoTypeId="COUNTY"/> - <Geo abbreviation="YORKS" geoCode="YORKS" geoId="GB-YORKS" geoName="Yorkshire" geoTypeId="COUNTY"/> - <Geo abbreviation="AGSY" geoCode="AGSY" geoId="GB-AGSY" geoName="Anglesey/Sir Fon" geoTypeId="COUNTY"/> - <Geo abbreviation="BREK" geoCode="BREK" geoId="GB-BREK" geoName="Brecknockshire/Sir Frycheiniog" geoTypeId="COUNTY"/> - <Geo abbreviation="CNFN" geoCode="CNFN" geoId="GB-CNFN" geoName="Caernarfonshire/Sir Gaernarfon" geoTypeId="COUNTY"/> - <Geo abbreviation="CMRN" geoCode="CMRN" geoId="GB-CMRN" geoName="Carmarthenshire/Sir Gaerfyrddin" geoTypeId="COUNTY"/> - <Geo abbreviation="DENB" geoCode="DENB" geoId="GB-DENB" geoName="Denbighshire/Sir Ddinbych" geoTypeId="COUNTY"/> - <Geo abbreviation="ELOTH" geoCode="ELOTH" geoId="GB-ELOTH" geoName="East Lothian/Haddingtonshire" geoTypeId="COUNTY"/> - <Geo abbreviation="FTSH" geoCode="FTSH" geoId="GB-FTSH" geoName="Flintshire/Sir Fflint" geoTypeId="COUNTY"/> - <Geo abbreviation="MMTH" geoCode="MMTH" geoId="GB-MMTH" geoName="Monmouthshire/Sir Fynwy" geoTypeId="COUNTY"/> - <Geo abbreviation="MNTGS" geoCode="MNTGS" geoId="GB-MNTGS" geoName="Montgomeryshire/Sir Drefaldwyn" geoTypeId="COUNTY"/> - <Geo abbreviation="PMBRK" geoCode="PMBRK" geoId="GB-PMBRK" geoName="Pembrokeshire/Sir Benfro" geoTypeId="COUNTY"/> - <Geo abbreviation="RNRS" geoCode="RNRS" geoId="GB-RNRS" geoName="Radnorshire/Sir Faesyfed" geoTypeId="COUNTY"/> - <Geo abbreviation="WLOTH" geoCode="WLOTH" geoId="GB-WLOTH" geoName="West Lothian/Linlithgowshire" geoTypeId="COUNTY"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-ABDN" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-ANGS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-ARGL" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-AYRS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-BANF" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-BDFD" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-BRKS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-BWKS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-BUCKS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-BUTE" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="WALS" geoIdTo="GB-CTHN" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-CAMBS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="WALS" geoIdTo="GB-CDGN" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-CHES" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-CLAK" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-CNWL" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-CMTY" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-CUMB" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-DRBYS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-DEVON" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-DRST" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-DMFS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-DMBR" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-DRHM" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-ESSX" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-FIFE" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="WALS" geoIdTo="GB-GLAM" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-GLOU" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-HAMPS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-HRFDS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-HERTS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-HUNTS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-INVER" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-KENT" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-KNDN" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-KRSS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-KRCUD" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-LRKS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-LANCS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-LIECS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-LINCS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="WALS" geoIdTo="GB-MIENT" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-MSEX" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-MLOTH" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-MORAY" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-NAIRN" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-NFLK" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-NHANTS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-NHUMB" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-NOTTS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-ORK" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-OXFD" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-PEEBS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-PERTH" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-RNFR" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-ROSS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-ROXB" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-RUTL" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-SELKS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-SHET" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-SHROPS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-SOMST" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-STAFFS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-STLNG" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-SFFK" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-SURR" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-SUSX" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-SUTH" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-WWKS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-WMLD" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-WGNSH" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-WILTS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-WORCS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="ENGL" geoIdTo="GB-YORKS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="WALS" geoIdTo="GB-AGSY" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="WALS" geoIdTo="GB-BREK" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="WALS" geoIdTo="GB-CNFN" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="WALS" geoIdTo="GB-CMRN" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="WALS" geoIdTo="GB-DENB" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-ELOTH" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="WALS" geoIdTo="GB-FTSH" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="WALS" geoIdTo="GB-MMTH" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="WALS" geoIdTo="GB-MNTGS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="WALS" geoIdTo="GB-PMBRK" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="WALS" geoIdTo="GB-RNRS" geoAssocTypeId="REGIONS"/> - <GeoAssoc geoId="SCOT" geoIdTo="GB-WLOTH" geoAssocTypeId="REGIONS"/> + <Geo abbreviation="ABDN" geoCode="ABDN" geoId="GB-ABDN" geoName="Aberdeenshire" geoTypeId="COUNTY"/> + <Geo abbreviation="ANGS" geoCode="ANGS" geoId="GB-ANGS" geoName="Angus/Forfarshire" geoTypeId="COUNTY"/> + <Geo abbreviation="ARGL" geoCode="ARGL" geoId="GB-ARGL" geoName="Argyllshire" geoTypeId="COUNTY"/> + <Geo abbreviation="AYRS" geoCode="AYRS" geoId="GB-AYRS" geoName="Ayrshire" geoTypeId="COUNTY"/> + <Geo abbreviation="BANF" geoCode="BANF" geoId="GB-BANF" geoName="Banffshire" geoTypeId="COUNTY"/> + <Geo abbreviation="BDFD" geoCode="BDFD" geoId="GB-BDFD" geoName="Bedfordshire" geoTypeId="COUNTY"/> + <Geo abbreviation="BRKS" geoCode="BRKS" geoId="GB-BRKS" geoName="Berkshire" geoTypeId="COUNTY"/> + <Geo abbreviation="BWKS" geoCode="BWKS" geoId="GB-BWKS" geoName="Berwickshire" geoTypeId="COUNTY"/> + <Geo abbreviation="BUCKS" geoCode="BUCKS" geoId="GB-BUCKS" geoName="Buckinghamshire" geoTypeId="COUNTY"/> + <Geo abbreviation="BUTE" geoCode="BUTE" geoId="GB-BUTE" geoName="Buteshire" geoTypeId="COUNTY"/> + <Geo abbreviation="CTHN" geoCode="CTHN" geoId="GB-CTHN" geoName="Caithness" geoTypeId="COUNTY"/> + <Geo abbreviation="CAMBS" geoCode="CAMBS" geoId="GB-CAMBS" geoName="Cambridgeshire" geoTypeId="COUNTY"/> + <Geo abbreviation="CDGN" geoCode="CDGN" geoId="GB-CDGN" geoName="Cardiganshire/Ceredigion" geoTypeId="COUNTY"/> + <Geo abbreviation="CHES" geoCode="CHES" geoId="GB-CHES" geoName="Cheshire" geoTypeId="COUNTY"/> + <Geo abbreviation="CLAK" geoCode="CLAK" geoId="GB-CLAK" geoName="Clackmannanshire" geoTypeId="COUNTY"/> + <Geo abbreviation="CNWL" geoCode="CNWL" geoId="GB-CNWL" geoName="Cornwall" geoTypeId="COUNTY"/> + <Geo abbreviation="CMTY" geoCode="CMTY" geoId="GB-CMTY" geoName="Cromartyshire" geoTypeId="COUNTY"/> + <Geo abbreviation="CUMB" geoCode="CUMB" geoId="GB-CUMB" geoName="Cumberland" geoTypeId="COUNTY"/> + <Geo abbreviation="DRBYS" geoCode="DRBYS" geoId="GB-DRBYS" geoName="Derbyshire" geoTypeId="COUNTY"/> + <Geo abbreviation="DEVON" geoCode="DEVON" geoId="GB-DEVON" geoName="Devon" geoTypeId="COUNTY"/> + <Geo abbreviation="DRST" geoCode="DRST" geoId="GB-DRST" geoName="Dorset" geoTypeId="COUNTY"/> + <Geo abbreviation="DMFS" geoCode="DMFS" geoId="GB-DMFS" geoName="Dumfriesshire" geoTypeId="COUNTY"/> + <Geo abbreviation="DMBR" geoCode="DMBR" geoId="GB-DMBR" geoName="Dunbartonshire/Dumbartonshire" geoTypeId="COUNTY"/> + <Geo abbreviation="DRHM" geoCode="DRHM" geoId="GB-DRHM" geoName="Durham" geoTypeId="COUNTY"/> + <Geo abbreviation="ESSX" geoCode="ESSX" geoId="GB-ESSX" geoName="Essex" geoTypeId="COUNTY"/> + <Geo abbreviation="FIFE" geoCode="FIFE" geoId="GB-FIFE" geoName="Fife" geoTypeId="COUNTY"/> + <Geo abbreviation="GLAM" geoCode="GLAM" geoId="GB-GLAM" geoName="Glamorgan/Morgannwg" geoTypeId="COUNTY"/> + <Geo abbreviation="GLOU" geoCode="GLOU" geoId="GB-GLOU" geoName="Gloucestershire" geoTypeId="COUNTY"/> + <Geo abbreviation="HAMPS" geoCode="HAMPS" geoId="GB-HAMPS" geoName="Hampshire" geoTypeId="COUNTY"/> + <Geo abbreviation="HRFDS" geoCode="HRFDS" geoId="GB-HRFDS" geoName="Herefordshire" geoTypeId="COUNTY"/> + <Geo abbreviation="HERTS" geoCode="HERTS" geoId="GB-HERTS" geoName="Hertfordshire" geoTypeId="COUNTY"/> + <Geo abbreviation="HUNTS" geoCode="HUNTS" geoId="GB-HUNTS" geoName="Huntingdonshire" geoTypeId="COUNTY"/> + <Geo abbreviation="INVER" geoCode="INVER" geoId="GB-INVER" geoName="Inverness-shire" geoTypeId="COUNTY"/> + <Geo abbreviation="KENT" geoCode="KENT" geoId="GB-KENT" geoName="Kent" geoTypeId="COUNTY"/> + <Geo abbreviation="KNDN" geoCode="KNDN" geoId="GB-KNDN" geoName="Kincardineshire" geoTypeId="COUNTY"/> + <Geo abbreviation="KRSS" geoCode="KRSS" geoId="GB-KRSS" geoName="Kinross-shire" geoTypeId="COUNTY"/> + <Geo abbreviation="KRCUD" geoCode="KRCUD" geoId="GB-KRCUD" geoName="Kirkcudbrightshire" geoTypeId="COUNTY"/> + <Geo abbreviation="LRKS" geoCode="LRKS" geoId="GB-LRKS" geoName="Lanarkshire" geoTypeId="COUNTY"/> + <Geo abbreviation="LANCS" geoCode="LANCS" geoId="GB-LANCS" geoName="Lancashire" geoTypeId="COUNTY"/> + <Geo abbreviation="LIECS" geoCode="LIECS" geoId="GB-LIECS" geoName="Leicestershire" geoTypeId="COUNTY"/> + <Geo abbreviation="LINCS" geoCode="LINCS" geoId="GB-LINCS" geoName="Lincolnshire" geoTypeId="COUNTY"/> + <Geo abbreviation="MIENT" geoCode="MIENT" geoId="GB-MIENT" geoName="Merioneth/Meirionnydd" geoTypeId="COUNTY"/> + <Geo abbreviation="MSEX" geoCode="MSEX" geoId="GB-MSEX" geoName="Middlesex" geoTypeId="COUNTY"/> + <Geo abbreviation="MLOTH" geoCode="MLOTH" geoId="GB-MLOTH" geoName="Midlothian/Edinburghshire" geoTypeId="COUNTY"/> + <Geo abbreviation="MORAY" geoCode="MORAY" geoId="GB-MORAY" geoName="Morayshire" geoTypeId="COUNTY"/> + <Geo abbreviation="NAIRN" geoCode="NAIRN" geoId="GB-NAIRN" geoName="Nairnshire" geoTypeId="COUNTY"/> + <Geo abbreviation="NFLK" geoCode="NFLK" geoId="GB-NFLK" geoName="Norfolk" geoTypeId="COUNTY"/> + <Geo abbreviation="NHANTS" geoCode="NHANTS" geoId="GB-NHANTS" geoName="Northamptonshire" geoTypeId="COUNTY"/> + <Geo abbreviation="NHUMB" geoCode="NHUMB" geoId="GB-NHUMB" geoName="Northumberland" geoTypeId="COUNTY"/> + <Geo abbreviation="NOTTS" geoCode="NOTTS" geoId="GB-NOTTS" geoName="Nottinghamshire" geoTypeId="COUNTY"/> + <Geo abbreviation="ORK" geoCode="ORK" geoId="GB-ORK" geoName="Orkney" geoTypeId="COUNTY"/> + <Geo abbreviation="OXFD" geoCode="OXFD" geoId="GB-OXFD" geoName="Oxfordshire" geoTypeId="COUNTY"/> + <Geo abbreviation="PEEBS" geoCode="PEEBS" geoId="GB-PEEBS" geoName="Peeblesshire" geoTypeId="COUNTY"/> + <Geo abbreviation="PERTH" geoCode="PERTH" geoId="GB-PERTH" geoName="Perthshire" geoTypeId="COUNTY"/> + <Geo abbreviation="RNFR" geoCode="RNFR" geoId="GB-RNFR" geoName="Renfrewshire" geoTypeId="COUNTY"/> + <Geo abbreviation="ROSS" geoCode="ROSS" geoId="GB-ROSS" geoName="Ross-shire" geoTypeId="COUNTY"/> + <Geo abbreviation="ROXB" geoCode="ROXB" geoId="GB-ROXB" geoName="Roxburghshire" geoTypeId="COUNTY"/> + <Geo abbreviation="RUTL" geoCode="RUTL" geoId="GB-RUTL" geoName="Rutland" geoTypeId="COUNTY"/> + <Geo abbreviation="SELKS" geoCode="SELKS" geoId="GB-SELKS" geoName="Selkirkshire" geoTypeId="COUNTY"/> + <Geo abbreviation="SHET" geoCode="SHET" geoId="GB-SHET" geoName="Shetland" geoTypeId="COUNTY"/> + <Geo abbreviation="SHROPS" geoCode="SHROPS" geoId="GB-SHROPS" geoName="Shropshire" geoTypeId="COUNTY"/> + <Geo abbreviation="SOMST" geoCode="SOMST" geoId="GB-SOMST" geoName="Somerset" geoTypeId="COUNTY"/> + <Geo abbreviation="STAFFS" geoCode="STAFFS" geoId="GB-STAFFS" geoName="Staffordshire" geoTypeId="COUNTY"/> + <Geo abbreviation="STLNG" geoCode="STLNG" geoId="GB-STLNG" geoName="Stirlingshire" geoTypeId="COUNTY"/> + <Geo abbreviation="SFFK" geoCode="SFFK" geoId="GB-SFFK" geoName="Suffolk" geoTypeId="COUNTY"/> + <Geo abbreviation="SURR" geoCode="SURR" geoId="GB-SURR" geoName="Surrey" geoTypeId="COUNTY"/> + <Geo abbreviation="SUSX" geoCode="SUSX" geoId="GB-SUSX" geoName="Sussex" geoTypeId="COUNTY"/> + <Geo abbreviation="SUTH" geoCode="SUTH" geoId="GB-SUTH" geoName="Sutherland" geoTypeId="COUNTY"/> + <Geo abbreviation="WWKS" geoCode="WWKS" geoId="GB-WWKS" geoName="Warwickshire" geoTypeId="COUNTY"/> + <Geo abbreviation="WMLD" geoCode="WMLD" geoId="GB-WMLD" geoName="Westmorland" geoTypeId="COUNTY"/> + <Geo abbreviation="WGNSH" geoCode="WGNSH" geoId="GB-WGNSH" geoName="Wigtownshire" geoTypeId="COUNTY"/> + <Geo abbreviation="WILTS" geoCode="WILTS" geoId="GB-WILTS" geoName="Wiltshire" geoTypeId="COUNTY"/> + <Geo abbreviation="WORCS" geoCode="WORCS" geoId="GB-WORCS" geoName="Worcestershire" geoTypeId="COUNTY"/> + <Geo abbreviation="YORKS" geoCode="YORKS" geoId="GB-YORKS" geoName="Yorkshire" geoTypeId="COUNTY"/> + <Geo abbreviation="AGSY" geoCode="AGSY" geoId="GB-AGSY" geoName="Anglesey/Sir Fon" geoTypeId="COUNTY"/> + <Geo abbreviation="BREK" geoCode="BREK" geoId="GB-BREK" geoName="Brecknockshire/Sir Frycheiniog" geoTypeId="COUNTY"/> + <Geo abbreviation="CNFN" geoCode="CNFN" geoId="GB-CNFN" geoName="Caernarfonshire/Sir Gaernarfon" geoTypeId="COUNTY"/> + <Geo abbreviation="CMRN" geoCode="CMRN" geoId="GB-CMRN" geoName="Carmarthenshire/Sir Gaerfyrddin" geoTypeId="COUNTY"/> + <Geo abbreviation="DENB" geoCode="DENB" geoId="GB-DENB" geoName="Denbighshire/Sir Ddinbych" geoTypeId="COUNTY"/> + <Geo abbreviation="ELOTH" geoCode="ELOTH" geoId="GB-ELOTH" geoName="East Lothian/Haddingtonshire" geoTypeId="COUNTY"/> + <Geo abbreviation="FTSH" geoCode="FTSH" geoId="GB-FTSH" geoName="Flintshire/Sir Fflint" geoTypeId="COUNTY"/> + <Geo abbreviation="MMTH" geoCode="MMTH" geoId="GB-MMTH" geoName="Monmouthshire/Sir Fynwy" geoTypeId="COUNTY"/> + <Geo abbreviation="MNTGS" geoCode="MNTGS" geoId="GB-MNTGS" geoName="Montgomeryshire/Sir Drefaldwyn" geoTypeId="COUNTY"/> + <Geo abbreviation="PMBRK" geoCode="PMBRK" geoId="GB-PMBRK" geoName="Pembrokeshire/Sir Benfro" geoTypeId="COUNTY"/> + <Geo abbreviation="RNRS" geoCode="RNRS" geoId="GB-RNRS" geoName="Radnorshire/Sir Faesyfed" geoTypeId="COUNTY"/> + <Geo abbreviation="WLOTH" geoCode="WLOTH" geoId="GB-WLOTH" geoName="West Lothian/Linlithgowshire" geoTypeId="COUNTY"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-ABDN" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-ANGS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-ARGL" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-AYRS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-BANF" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-BDFD" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-BRKS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-BWKS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-BUCKS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-BUTE" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="WALS" geoIdTo="GB-CTHN" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-CAMBS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="WALS" geoIdTo="GB-CDGN" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-CHES" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-CLAK" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-CNWL" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-CMTY" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-CUMB" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-DRBYS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-DEVON" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-DRST" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-DMFS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-DMBR" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-DRHM" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-ESSX" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-FIFE" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="WALS" geoIdTo="GB-GLAM" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-GLOU" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-HAMPS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-HRFDS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-HERTS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-HUNTS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-INVER" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-KENT" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-KNDN" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-KRSS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-KRCUD" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-LRKS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-LANCS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-LIECS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-LINCS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="WALS" geoIdTo="GB-MIENT" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-MSEX" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-MLOTH" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-MORAY" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-NAIRN" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-NFLK" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-NHANTS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-NHUMB" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-NOTTS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-ORK" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-OXFD" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-PEEBS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-PERTH" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-RNFR" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-ROSS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-ROXB" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-RUTL" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-SELKS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-SHET" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-SHROPS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-SOMST" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-STAFFS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-STLNG" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-SFFK" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-SURR" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-SUSX" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-SUTH" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-WWKS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-WMLD" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-WGNSH" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-WILTS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-WORCS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="ENGL" geoIdTo="GB-YORKS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="WALS" geoIdTo="GB-AGSY" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="WALS" geoIdTo="GB-BREK" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="WALS" geoIdTo="GB-CNFN" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="WALS" geoIdTo="GB-CMRN" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="WALS" geoIdTo="GB-DENB" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-ELOTH" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="WALS" geoIdTo="GB-FTSH" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="WALS" geoIdTo="GB-MMTH" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="WALS" geoIdTo="GB-MNTGS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="WALS" geoIdTo="GB-PMBRK" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="WALS" geoIdTo="GB-RNRS" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="SCOT" geoIdTo="GB-WLOTH" geoAssocTypeId="REGIONS"/> </entity-engine-xml> Modified: ofbiz/trunk/framework/common/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/entitydef/entitymodel.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/common/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/framework/common/entitydef/entitymodel.xml Fri Jan 23 03:08:47 2009 @@ -76,7 +76,7 @@ <entity entity-name="Enumeration" package-name="org.ofbiz.common.enum" - default-resource-name="CommonEntityLabels" + default-resource-name="CommonEntityLabels" title="Enumeration Entity"> <field name="enumId" type="id-ne"></field> <field name="enumTypeId" type="id-ne"></field> @@ -90,7 +90,7 @@ </entity> <entity entity-name="EnumerationType" package-name="org.ofbiz.common.enum" - default-resource-name="CommonEntityLabels" + default-resource-name="CommonEntityLabels" title="Enumeration Type Entity"> <field name="enumTypeId" type="id-ne"></field> <field name="parentTypeId" type="id"></field> @@ -262,7 +262,7 @@ <entity entity-name="CustomMethod" package-name="org.ofbiz.common.method" - default-resource-name="CommonEntityLabels" + default-resource-name="CommonEntityLabels" title="Custom Method Entity"> <field name="customMethodId" type="id-ne"></field> <field name="customMethodTypeId" type="id"></field> @@ -355,7 +355,7 @@ <entity entity-name="StatusItem" package-name="org.ofbiz.common.status" - default-resource-name="CommonEntityLabels" + default-resource-name="CommonEntityLabels" title="Status Entity"> <field name="statusId" type="id-ne"></field> <field name="statusTypeId" type="id-ne"></field> @@ -369,7 +369,7 @@ </entity> <entity entity-name="StatusType" package-name="org.ofbiz.common.status" - default-resource-name="CommonEntityLabels" + default-resource-name="CommonEntityLabels" title="Status Type Entity"> <field name="statusTypeId" type="id-ne"></field> <field name="parentTypeId" type="id"></field> @@ -382,7 +382,7 @@ </entity> <entity entity-name="StatusValidChange" package-name="org.ofbiz.common.status" - default-resource-name="CommonEntityLabels" + default-resource-name="CommonEntityLabels" title="Status Valid Change Entity"> <field name="statusId" type="id-ne"></field> <field name="statusIdTo" type="id-ne"></field> @@ -422,7 +422,7 @@ <entity entity-name="Uom" package-name="org.ofbiz.common.uom" - default-resource-name="CommonEntityLabels" + default-resource-name="CommonEntityLabels" title="Unit Of Measure Entity"> <field name="uomId" type="id-ne"></field> <field name="uomTypeId" type="id"></field> @@ -495,7 +495,7 @@ </entity> <entity entity-name="UomType" package-name="org.ofbiz.common.uom" - default-resource-name="CommonEntityLabels" + default-resource-name="CommonEntityLabels" title="Unit Of Measure Type Entity"> <field name="uomTypeId" type="id-ne"></field> <field name="parentTypeId" type="id-ne"></field> Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml (original) +++ ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml Fri Jan 23 03:08:47 2009 @@ -29,14 +29,14 @@ </if-not-empty> <find-by-and entity-name="Person" map="LookupMap" list="parties" /> <iterate entry="party" list="parties"> - <set from-field="party.firstName" field="resultEntry.label"/> - <set from-field="party.partyId" field="resultEntry.value"/> - <field-to-list field="resultEntry" list="lookupResult"/> + <set from-field="party.firstName" field="resultEntry.label"/> + <set from-field="party.partyId" field="resultEntry.value"/> + <field-to-list field="resultEntry" list="lookupResult"/> </iterate> <if-empty field="parties"> - <set value="No match" field="resultEntry.label"/> - <set value="" field="resultEntry.value"/> - <field-to-list field="resultEntry" list="lookupResult"/> + <set value="No match" field="resultEntry.label"/> + <set value="" field="resultEntry.value"/> + <field-to-list field="resultEntry" list="lookupResult"/> </if-empty> <field-to-result field="lookupResult"/> </simple-method> Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml (original) +++ ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml Fri Jan 23 03:08:47 2009 @@ -20,7 +20,7 @@ <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd"> - <!-- CustomTimePeriod Services --> + <!-- CustomTimePeriod Services --> <simple-method method-name="createCustomTimePeriod" short-description="Create a CustomTimePeriod"> <check-permission permission="PERIOD_MAINT"><fail-message message="Security Error: to run createCustomTimePeriod you must have the PERIOD_MAINT permission"/></check-permission> <check-errors/> Modified: ofbiz/trunk/framework/common/servicedef/services_test.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/servicedef/services_test.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/common/servicedef/services_test.xml (original) +++ ofbiz/trunk/framework/common/servicedef/services_test.xml Fri Jan 23 03:08:47 2009 @@ -126,7 +126,7 @@ </service> <service name="testRoute" engine="route" location="" invoke="" auth="true"> - <description>Test the Route engine</description> + <description>Test the Route engine</description> </service> <service name="simpleMapListTest" engine="java" auth="false" export="true" @@ -137,10 +137,10 @@ </service> <service name="testJavaScript" engine="javascript" auth="false" - location="org/ofbiz/common/JavaScriptTest.js" invoke=""> - <description>Test JavaScript Service</description> - <attribute name="message" type="String" mode="IN" optional="true"/> - <attribute name="result" type="String" mode="OUT" optional="true"/> + location="org/ofbiz/common/JavaScriptTest.js" invoke=""> + <description>Test JavaScript Service</description> + <attribute name="message" type="String" mode="IN" optional="true"/> + <attribute name="result" type="String" mode="OUT" optional="true"/> </service> <service name="testEntityFailure" engine="java" auth="false" validate="false" Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/Captcha.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/Captcha.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/Captcha.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/Captcha.java Fri Jan 23 03:08:47 2009 @@ -35,11 +35,11 @@ public static String ID_KEY = null; public static String CAPTCHA_FILE_NAME = null; - public static String CAPTCHA_FILE_PATH = null; + public static String CAPTCHA_FILE_PATH = null; public static String getCodeCaptcha(HttpServletRequest request,HttpServletResponse response) { - if(CAPTCHA_FILE_PATH != null) deleteFile(); - StringBuffer finalString = new StringBuffer(); + if(CAPTCHA_FILE_PATH != null) deleteFile(); + StringBuffer finalString = new StringBuffer(); String elegibleChars = "ABCDEFGHJKLMPQRSTUVWXYabcdefhjkmnpqrstuvwxy23456789"; int charsToPrint = 6; char[] chars = elegibleChars.toCharArray(); @@ -56,7 +56,7 @@ } public static boolean createImageCaptcha (HttpServletRequest request,HttpServletResponse response) { - try { + try { //It is possible to pass the font size, image width and height with the request as well Color backgroundColor = Color.gray; Color borderColor = Color.DARK_GRAY; @@ -138,35 +138,35 @@ return true; } - public static void writeImage(BufferedImage image, HttpServletRequest request) - { - String fileName = UtilHttp.getSessionId(request).substring(0,6); - fileName += "_"+UtilHttp.getSessionId(request).substring(UtilHttp.getSessionId(request).length()-11,UtilHttp.getSessionId(request).indexOf(".")); - try { - CAPTCHA_FILE_PATH = new java.io.File(".").getCanonicalPath(); - CAPTCHA_FILE_PATH += File.separator + "runtime" + File.separator + "tempfiles"; - CAPTCHA_FILE_PATH += File.separator + "captcha" + File.separator; - File test = new File(CAPTCHA_FILE_PATH); - if (!test.exists()) { - test.mkdir(); - } - CAPTCHA_FILE_PATH += fileName + ".png"; - CAPTCHA_FILE_NAME = fileName + ".png"; - request.setAttribute("fileName", CAPTCHA_FILE_NAME); - System.out.println("\n\nPath = "+CAPTCHA_FILE_PATH+"\n"); - System.out.println("Captcha Key = "+ID_KEY+"\n\n"); - ImageIO.write(image, "png", new File( CAPTCHA_FILE_PATH )); - } catch (IOException e) { - return; - } - } - - public static void deleteFile() { - if(CAPTCHA_FILE_PATH != null){ - File file = new File(CAPTCHA_FILE_PATH); - file.delete(); - } - } + public static void writeImage(BufferedImage image, HttpServletRequest request) + { + String fileName = UtilHttp.getSessionId(request).substring(0,6); + fileName += "_"+UtilHttp.getSessionId(request).substring(UtilHttp.getSessionId(request).length()-11,UtilHttp.getSessionId(request).indexOf(".")); + try { + CAPTCHA_FILE_PATH = new java.io.File(".").getCanonicalPath(); + CAPTCHA_FILE_PATH += File.separator + "runtime" + File.separator + "tempfiles"; + CAPTCHA_FILE_PATH += File.separator + "captcha" + File.separator; + File test = new File(CAPTCHA_FILE_PATH); + if (!test.exists()) { + test.mkdir(); + } + CAPTCHA_FILE_PATH += fileName + ".png"; + CAPTCHA_FILE_NAME = fileName + ".png"; + request.setAttribute("fileName", CAPTCHA_FILE_NAME); + System.out.println("\n\nPath = "+CAPTCHA_FILE_PATH+"\n"); + System.out.println("Captcha Key = "+ID_KEY+"\n\n"); + ImageIO.write(image, "png", new File( CAPTCHA_FILE_PATH )); + } catch (IOException e) { + return; + } + } + + public static void deleteFile() { + if(CAPTCHA_FILE_PATH != null){ + File file = new File(CAPTCHA_FILE_PATH); + file.delete(); + } + } public static String paramString(HttpServletRequest request, String paramName, String defaultString) { Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java Fri Jan 23 03:08:47 2009 @@ -53,12 +53,12 @@ } } try { - List<GenericValue> countryGeoList = delegator.findByAndCache("Geo", UtilMisc.toMap("geoTypeId", "COUNTRY"), UtilMisc.toList("geoName")); + List<GenericValue> countryGeoList = delegator.findByAndCache("Geo", UtilMisc.toMap("geoTypeId", "COUNTRY"), UtilMisc.toList("geoName")); if (defaultGeo != null) { geoList.add(defaultGeo); - geoList.addAll(countryGeoList); + geoList.addAll(countryGeoList); } else { - geoList = countryGeoList; + geoList = countryGeoList; } } catch (GenericEntityException e) { Debug.logError(e, "Cannot lookup Geo", module); Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java Fri Jan 23 03:08:47 2009 @@ -494,13 +494,13 @@ */ if ((tmpList.size() > 0) || ((noConditionFind != null) && (noConditionFind.equals("Y")))) { if (!UtilValidate.isEmpty(filterByDate) && "Y".equals(filterByDate)) { - if (UtilValidate.isEmpty(filterByDateValue)) { - EntityCondition filterByDateCondition = EntityUtil.getFilterByDateExpr(); - tmpList.add(filterByDateCondition); - } else { - EntityCondition filterByDateCondition = EntityUtil.getFilterByDateExpr(filterByDateValue); - tmpList.add(filterByDateCondition); - } + if (UtilValidate.isEmpty(filterByDateValue)) { + EntityCondition filterByDateCondition = EntityUtil.getFilterByDateExpr(); + tmpList.add(filterByDateCondition); + } else { + EntityCondition filterByDateCondition = EntityUtil.getFilterByDateExpr(filterByDateValue); + tmpList.add(filterByDateCondition); + } } } @@ -664,7 +664,7 @@ } if (!UtilValidate.isEmpty(item)) { - result.put("item",item); + result.put("item",item); } result.remove("listIt"); return result; Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy (original) +++ ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy Fri Jan 23 03:08:47 2009 @@ -22,7 +22,7 @@ import org.ofbiz.entity.condition.*; // only execute when a user is logged in if (parameters.userLogin) { - ppCond = + ppCond = EntityCondition.makeCondition([ EntityCondition.makeCondition([ EntityCondition.makeCondition("parentPortalPageId", EntityOperator.EQUALS, parameters.parentPortalPageId), @@ -34,16 +34,16 @@ EntityCondition.makeCondition("ownerUserLoginId", EntityOperator.EQUALS, "_NA_") ],EntityOperator.OR), ],EntityOperator.AND); - portalPages = delegator.findList("PortalPage", ppCond, null, null, null, false); - // remove overridden system pages - portalPages.each { portalPage -> - if (portalPage.ownerUserLoginId.equals("_NA_")) { - userPortalPages = delegator.findByAnd("PortalPage", [originalPortalPageId : portalPage.portalPageId, ownerUserLoginId : parameters.userLogin.userLoginId]); - if (userPortalPages) { - portalPages.remove(portalPage); - } - } - } - context.portalPages = portalPages; + portalPages = delegator.findList("PortalPage", ppCond, null, null, null, false); + // remove overridden system pages + portalPages.each { portalPage -> + if (portalPage.ownerUserLoginId.equals("_NA_")) { + userPortalPages = delegator.findByAnd("PortalPage", [originalPortalPageId : portalPage.portalPageId, ownerUserLoginId : parameters.userLogin.userLoginId]); + if (userPortalPages) { + portalPages.remove(portalPage); + } + } + } + context.portalPages = portalPages; } Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPortlets.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPortlets.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPortlets.groovy (original) +++ ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPortlets.groovy Fri Jan 23 03:08:47 2009 @@ -27,18 +27,18 @@ inMap = [:]; while (portlet = ppIter.next()) { - if (portlet.securityServiceName && portlet.securityMainAction) { - inMap.mainAction = portlet.securityMainAction; - inMap.userLogin = context.userLogin; - result = dispatcher.runSync(portlet.securityServiceName, inMap) - hasPermission = result.hasPermission; - } else { - hasPermission = true; - } - - if (hasPermission) { - portalPortlets.add(portlet); - } + if (portlet.securityServiceName && portlet.securityMainAction) { + inMap.mainAction = portlet.securityMainAction; + inMap.userLogin = context.userLogin; + result = dispatcher.runSync(portlet.securityServiceName, inMap) + hasPermission = result.hasPermission; + } else { + hasPermission = true; + } + + if (hasPermission) { + portalPortlets.add(portlet); + } } context.portalPortlets = portalPortlets; Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy (original) +++ ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy Fri Jan 23 03:08:47 2009 @@ -23,16 +23,16 @@ portalPageId = parameters.portalPageId; if(!portalPageId){ - portalPageId = parameters.parentPortalPageId; + portalPageId = parameters.parentPortalPageId; } portalPage = delegator.findByPrimaryKey("PortalPage", [portalPageId : portalPageId]); // check if the user created a private page for a system page if (portalPage.ownerUserLoginId.equals("_NA_")) { - portalPages = delegator.findByAnd("PortalPage", [originalPortalPageId : portalPageId, ownerUserLoginId : parameters.userLogin.userLoginId]); - if (UtilValidate.isNotEmpty(portalPages)) { - portalPage = portalPages.get(0); - } + portalPages = delegator.findByAnd("PortalPage", [originalPortalPageId : portalPageId, ownerUserLoginId : parameters.userLogin.userLoginId]); + if (UtilValidate.isNotEmpty(portalPages)) { + portalPage = portalPages.get(0); + } } parameters.portalPageId = portalPage.portalPageId; context.portalPage = portalPage; Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java Fri Jan 23 03:08:47 2009 @@ -53,7 +53,7 @@ protected EntityCondition condition = null; protected EntityConditionFunction(int id, String code, EntityCondition condition) { - init(id, code, condition); + init(id, code, condition); } public void init(int id, String code, EntityCondition condition) { Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java Fri Jan 23 03:08:47 2009 @@ -41,11 +41,11 @@ protected EntityConditionListBase() {} public EntityConditionListBase(EntityJoinOperator operator, T... conditionList) { - this.init(operator, conditionList); + this.init(operator, conditionList); } public EntityConditionListBase(List<T> conditionList, EntityJoinOperator operator) { - this.init(conditionList, operator); + this.init(conditionList, operator); } public void init(EntityJoinOperator operator, T... conditionList) { @@ -59,8 +59,8 @@ } public void reset() { - this.conditionList = null; - this.operator = null; + this.conditionList = null; + this.operator = null; } public EntityOperator getOperator() { Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java Fri Jan 23 03:08:47 2009 @@ -45,7 +45,7 @@ /** @deprecated Use EntityCondition.makeConditionDate() instead */ public EntityDateFilterCondition(String fromDateName, String thruDateName) { - init(fromDateName, thruDateName); + init(fromDateName, thruDateName); } public void init(String fromDateName, String thruDateName) { @@ -54,8 +54,8 @@ } public void reset() { - this.fromDateName = null; - this.thruDateName = null; + this.fromDateName = null; + this.thruDateName = null; } public String makeWhereString(ModelEntity modelEntity, List<EntityConditionParam> entityConditionParams, DatasourceInfo datasourceInfo) { Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java Fri Jan 23 03:08:47 2009 @@ -68,7 +68,7 @@ /** @deprecated Use EntityCondition.makeCondition() instead */ public EntityFieldMap(Map<String, ? extends Object> fieldMap, EntityComparisonOperator compOp, EntityJoinOperator joinOp) { - this.init(fieldMap, compOp, joinOp); + this.init(fieldMap, compOp, joinOp); } /** @deprecated Use EntityCondition.makeCondition() instead */ @@ -96,8 +96,8 @@ } public void reset() { - super.reset(); - this.fieldMap = null; + super.reset(); + this.fieldMap = null; } public Object getField(String name) { Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityWhereString.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityWhereString.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityWhereString.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityWhereString.java Fri Jan 23 03:08:47 2009 @@ -54,7 +54,7 @@ /** @deprecated Use EntityCondition.makeConditionWhere() instead */ public EntityWhereString(String sqlString) { - init(sqlString); + init(sqlString); } public void init(String sqlString) { @@ -62,7 +62,7 @@ } public void reset() { - this.sqlString = null; + this.sqlString = null; } public String makeWhereString(ModelEntity modelEntity, List<EntityConditionParam> entityConditionParams, DatasourceInfo datasourceInfo) { @@ -72,9 +72,9 @@ public void checkCondition(ModelEntity modelEntity) throws GenericModelException {// no nothing, this is always assumed to be fine... could do funky SQL syntax checking, but hey this is a HACK anyway } - public boolean entityMatches(GenericEntity entity) { - throw new UnsupportedOperationException("Cannot do entityMatches on a WhereString, ie no SQL evaluation in EE; Where String is: " + sqlString); - } + public boolean entityMatches(GenericEntity entity) { + throw new UnsupportedOperationException("Cannot do entityMatches on a WhereString, ie no SQL evaluation in EE; Where String is: " + sqlString); + } public boolean mapMatches(GenericDelegator delegator, Map<String, ? extends Object> map) { throw new UnsupportedOperationException("Cannot do mapMatches on a WhereString, ie no SQL evaluation in EE; Where String is: " + sqlString); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |