This commit prevents OFBiz from starting:
load-demo: [java] Start.java using configuration file org/ofbiz/base/start/load-data.properties [java] Set OFBIZ_HOME to - C:/Develop/ofbiz [java] Admin socket not configured; set to port 0 [java] Exception in thread "main" java.lang.ExceptionInInitializerError [java] at org.ofbiz.base.container.ContainerLoader.load(ContainerLoader.java:74) [java] at org.ofbiz.base.start.Start.initStartLoaders(Start.java:315) [java] at org.ofbiz.base.start.Start.init(Start.java:239) [java] at org.ofbiz.base.start.Start.main(Start.java:127) [java] Caused by: java.lang.IllegalStateException: debug.properties file not found [java] at org.ofbiz.base.util.Debug.<clinit>(Debug.java:74) [java] ... 4 more [java] Exception in thread "Thread-0" java.lang.NoClassDefFoundError: Could not initialize class org.ofbiz.base.util.Debug [java] at org.ofbiz.base.container.ContainerLoader.unload(ContainerLoader.java:255) [java] at org.ofbiz.base.start.Start.shutdownServer(Start.java:384) [java] at org.ofbiz.base.start.Start$1.run(Start.java:231) [java] Java Result: 1 Adrian Crum Sandglass Software www.sandglass-software.com On 11/16/2015 11:02 AM, [hidden email] wrote: > Author: jleroux > Date: Mon Nov 16 19:02:25 2015 > New Revision: 1714652 > > URL: http://svn.apache.org/viewvc?rev=1714652&view=rev > Log: > No functional change, completes r1713985: removes superfluous .properties extension from UtilProperties requests (and yes I checked UspsServicesTests ;)) > > Modified: > ofbiz/trunk/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/taxware/TaxwareUTL.java > ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java > ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java > ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java > ofbiz/trunk/framework/base/src/org/ofbiz/base/location/FlexibleLocation.java > ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Debug.java > ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GroovyUtil.java > ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java > ofbiz/trunk/framework/base/src/org/ofbiz/base/util/SSLUtil.java > ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java > ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java > ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java > ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java > ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java > ofbiz/trunk/framework/common/src/org/ofbiz/common/qrcode/QRCodeServices.java > ofbiz/trunk/framework/entity/src/org/ofbiz/entity/config/model/EntityConfig.java > ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java > ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java > ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangUtil.java > ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangValidate.java > ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/test/MiniLangTests.java > ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java > ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java > ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java > ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavUtil.java > ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelForm.java > ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoScreenRenderer.java > ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlFormRenderer.java > ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java > ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenRenderer.java > ofbiz/trunk/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/janrain/JanrainHelper.java > ofbiz/trunk/specialpurpose/passport/src/org/ofbiz/passport/event/GitHubEvents.java > ofbiz/trunk/specialpurpose/passport/src/org/ofbiz/passport/event/LinkedInEvents.java > ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiSession.java > ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java > ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java > ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Scanner.java > ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java > ofbiz/trunk/specialpurpose/solr/src/org/ofbiz/solr/SolrUtil.java > > Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java (original) > +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java Mon Nov 16 19:02:25 2015 > @@ -57,7 +57,7 @@ public class PermissionRecorder { > public static final String [] fieldTitles = { "Purpose", "Operation", "Role", "Status", "Privilege"}; > > public PermissionRecorder() { > - isOn = UtilProperties.propertyValueEqualsIgnoreCase("content.properties", "permissionRecorderOn", "true"); > + isOn = UtilProperties.propertyValueEqualsIgnoreCase("content", "permissionRecorderOn", "true"); > } > > public void setCheckMode(int val) { > > Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java (original) > +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java Mon Nov 16 19:02:25 2015 > @@ -471,8 +471,8 @@ public class DataResourceWorker impleme > } > > public static String getDataResourceContentUploadPath(boolean absolute) { > - String initialPath = UtilProperties.getPropertyValue("content.properties", "content.upload.path.prefix"); > - double maxFiles = UtilProperties.getPropertyNumber("content.properties", "content.upload.max.files"); > + String initialPath = UtilProperties.getPropertyValue("content", "content.upload.path.prefix"); > + double maxFiles = UtilProperties.getPropertyNumber("content", "content.upload.max.files"); > if (maxFiles < 1) { > maxFiles = 250; > } > @@ -482,7 +482,7 @@ public class DataResourceWorker impleme > > public static String getDataResourceContentUploadPath(Delegator delegator, boolean absolute) { > String initialPath = EntityUtilProperties.getPropertyValue("content", "content.upload.path.prefix", delegator); > - double maxFiles = UtilProperties.getPropertyNumber("content.properties", "content.upload.max.files"); > + double maxFiles = UtilProperties.getPropertyNumber("content", "content.upload.max.files"); > if (maxFiles < 1) { > maxFiles = 250; > } > > Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/taxware/TaxwareUTL.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/taxware/TaxwareUTL.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/taxware/TaxwareUTL.java (original) > +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/taxware/TaxwareUTL.java Mon Nov 16 19:02:25 2015 > @@ -198,20 +198,20 @@ public class TaxwareUTL { > > private void addStaticData(Record record) { > // grab a taxware properties file and get static data > - record.set("COMPANY_ID", UtilProperties.getPropertyValue("taxware.properties", "COMPANY_ID", " ")); > - record.set("AUDIT_FILE_INDICATOR", UtilProperties.getPropertyValue("taxware.properties", "AUDIT_FILE_INDICATOR", "2")); > - record.set("SF_COUNTRY_CODE", UtilProperties.getPropertyValue("taxware.properties", "SF_COUNTRY_CODE", "")); > - record.set("SF_STATE_PROVINCE", UtilProperties.getPropertyValue("taxware.properties", "SF_STATE_PROVINCE", " ")); > - record.set("SF_CITY", UtilProperties.getPropertyValue("taxware.properties", "SF_CITY", " ")); > - record.set("SF_POSTAL_CODE", UtilProperties.getPropertyValue("taxware.properties", "SF_POSTAL_CODE", " ")); > - record.set("POO_COUNTRY_CODE", UtilProperties.getPropertyValue("taxware.properties", "POO_COUNTRY_CODE", "")); > - record.set("POO_STATE_PROVINCE", UtilProperties.getPropertyValue("taxware.properties", "POO_STATE_PROVINCE", " ")); > - record.set("POO_CITY", UtilProperties.getPropertyValue("taxware.properties", "POO_CITY", " ")); > - record.set("POO_POSTAL_CODE", UtilProperties.getPropertyValue("taxware.properties", "POO_POSTAL_CODE", " ")); > - record.set("POA_COUNTRY_CODE", UtilProperties.getPropertyValue("taxware.properties", "POA_COUNTRY_CODE", "")); > - record.set("POA_STATE_PROVINCE", UtilProperties.getPropertyValue("taxware.properties", "POA_STATE_PROVINCE", " ")); > - record.set("POA_CITY", UtilProperties.getPropertyValue("taxware.properties", "POA_CITY", " ")); > - record.set("POA_POSTAL_CODE", UtilProperties.getPropertyValue("taxware.properties", "POA_POSTAL_CODE", " ")); > + record.set("COMPANY_ID", UtilProperties.getPropertyValue("taxware", "COMPANY_ID", " ")); > + record.set("AUDIT_FILE_INDICATOR", UtilProperties.getPropertyValue("taxware", "AUDIT_FILE_INDICATOR", "2")); > + record.set("SF_COUNTRY_CODE", UtilProperties.getPropertyValue("taxware", "SF_COUNTRY_CODE", "")); > + record.set("SF_STATE_PROVINCE", UtilProperties.getPropertyValue("taxware", "SF_STATE_PROVINCE", " ")); > + record.set("SF_CITY", UtilProperties.getPropertyValue("taxware", "SF_CITY", " ")); > + record.set("SF_POSTAL_CODE", UtilProperties.getPropertyValue("taxware", "SF_POSTAL_CODE", " ")); > + record.set("POO_COUNTRY_CODE", UtilProperties.getPropertyValue("taxware", "POO_COUNTRY_CODE", "")); > + record.set("POO_STATE_PROVINCE", UtilProperties.getPropertyValue("taxware", "POO_STATE_PROVINCE", " ")); > + record.set("POO_CITY", UtilProperties.getPropertyValue("taxware", "POO_CITY", " ")); > + record.set("POO_POSTAL_CODE", UtilProperties.getPropertyValue("taxware", "POO_POSTAL_CODE", " ")); > + record.set("POA_COUNTRY_CODE", UtilProperties.getPropertyValue("taxware", "POA_COUNTRY_CODE", "")); > + record.set("POA_STATE_PROVINCE", UtilProperties.getPropertyValue("taxware", "POA_STATE_PROVINCE", " ")); > + record.set("POA_CITY", UtilProperties.getPropertyValue("taxware", "POA_CITY", " ")); > + record.set("POA_POSTAL_CODE", UtilProperties.getPropertyValue("taxware", "POA_POSTAL_CODE", " ")); > } > > private void addAddresses(Record record) { > > Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java (original) > +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java Mon Nov 16 19:02:25 2015 > @@ -53,7 +53,7 @@ public class UspsServicesTests extends O > public void testUspsTrackConfirm() throws Exception { > > // run the service > - Map<String, Object> result = dispatcher.runSync("uspsTrackConfirm", UtilMisc.toMap("trackingId", "EJ958083578US", "shipmentGatewayConfigId", "USPS_CONFIG", "configProps", "shipment.properties")); > + Map<String, Object> result = dispatcher.runSync("uspsTrackConfirm", UtilMisc.toMap("trackingId", "EJ958083578US", "shipmentGatewayConfigId", "USPS_CONFIG", "configProps", "shipment")); > > // verify the results > String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE); > @@ -86,7 +86,7 @@ public class UspsServicesTests extends O > // run the service > Map<String, String> paramInp = UtilMisc.toMap("address1", "6406 Ivy Lane", "city", "Greenbelt", "state", "MD"); > paramInp.put("shipmentGatewayConfigId", "USPS_CONFIG"); > - paramInp.put("configProps", "shipment.properties"); > + paramInp.put("configProps", "shipment"); > Map<String, Object> result = dispatcher.runSync("uspsAddressValidation", paramInp); > > // verify the results > @@ -118,7 +118,7 @@ public class UspsServicesTests extends O > public void testUspsCityStateLookup() throws Exception { > > // run the service > - Map<String, Object> result = dispatcher.runSync("uspsCityStateLookup", UtilMisc.toMap("zip5", "90210", "shipmentGatewayConfigId", "USPS_CONFIG", "configProps", "shipment.properties")); > + Map<String, Object> result = dispatcher.runSync("uspsCityStateLookup", UtilMisc.toMap("zip5", "90210", "shipmentGatewayConfigId", "USPS_CONFIG", "configProps", "shipment")); > > // verify the results > String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE); > @@ -137,7 +137,7 @@ public class UspsServicesTests extends O > public void testUspsPriorityMailStandard() throws Exception { > > // run the service > - Map<String, Object> result = dispatcher.runSync("uspsPriorityMailStandard", UtilMisc.toMap("originZip", "4", "destinationZip", "4", "shipmentGatewayConfigId", "USPS_CONFIG", "configProps", "shipment.properties")); > + Map<String, Object> result = dispatcher.runSync("uspsPriorityMailStandard", UtilMisc.toMap("originZip", "4", "destinationZip", "4", "shipmentGatewayConfigId", "USPS_CONFIG", "configProps", "shipment")); > > // verify the results > String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE); > @@ -152,7 +152,7 @@ public class UspsServicesTests extends O > public void testUspsPackageServicesStandard() throws Exception { > > // run the service > - Map<String, Object> result = dispatcher.runSync("uspsPackageServicesStandard", UtilMisc.toMap("originZip", "4", "destinationZip", "4", "shipmentGatewayConfigId", "USPS_CONFIG", "configProps", "shipment.properties")); > + Map<String, Object> result = dispatcher.runSync("uspsPackageServicesStandard", UtilMisc.toMap("originZip", "4", "destinationZip", "4", "shipmentGatewayConfigId", "USPS_CONFIG", "configProps", "shipment")); > > // verify the results > String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE); > @@ -178,7 +178,7 @@ public class UspsServicesTests extends O > context.put("size", "Regular"); > context.put("machinable", "False"); > context.put("shipmentGatewayConfigId", "USPS_CONFIG"); > - context.put("configProps", "shipment.properties"); > + context.put("configProps", "shipment"); > > // run the service > Map<String, Object> result = dispatcher.runSync("uspsDomesticRate", context); > > Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java (original) > +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java Mon Nov 16 19:02:25 2015 > @@ -388,7 +388,7 @@ public class WeightPackageSession implem > > protected boolean diffInShipCost(BigDecimal actualShippingCost) throws GeneralException { > BigDecimal estimatedShipCost = this.getEstimatedShipCost(); > - BigDecimal doEstimates = new BigDecimal(UtilProperties.getPropertyValue("shipment.properties", "shipment.default.cost_actual_over_estimated_percent_allowed", "10")); > + BigDecimal doEstimates = new BigDecimal(UtilProperties.getPropertyValue("shipment", "shipment.default.cost_actual_over_estimated_percent_allowed", "10")); > BigDecimal diffInShipCostInPerc = ZERO; > if (estimatedShipCost.compareTo(ZERO) == 0) { > diffInShipCostInPerc = actualShippingCost; > > Modified: ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java (original) > +++ ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java Mon Nov 16 19:02:25 2015 > @@ -63,21 +63,21 @@ public class TruitionCoReg { > String domainName = EntityUtilProperties.getPropertyValue("truition", "truition.domain.name", delegator); > String cookiePath = EntityUtilProperties.getPropertyValue("truition", "truition.cookie.path", delegator); > String cookieName = EntityUtilProperties.getPropertyValue("truition", "truition.cookie.name", delegator); > - int time = (int) UtilProperties.getPropertyNumber("truition.properties", "truition.cookie.time"); > + int time = (int) UtilProperties.getPropertyNumber("truition", "truition.cookie.time"); > if (UtilValidate.isEmpty(domainName)) { > Debug.logError("Truition is not properly configured; domainName missing; see truition.properties", module); > return "error"; > } > if (UtilValidate.isEmpty(cookiePath)) { > - Debug.logError("Truition is not properly configured; cookiePath missing; see truition.properties", module); > + Debug.logError("Truition is not properly configured; cookiePath missing;see truition.properties", module); > return "error"; > } > if (UtilValidate.isEmpty(cookieName)) { > - Debug.logError("Truition is not properly configured; cookieName missing; see truition.properties", module); > + Debug.logError("Truition is not properly configured; cookieName missing;see truition.properties", module); > return "error"; > } > if (time == 0) { > - Debug.logError("Truition is not properly configured; cookieTime missing; see trution.properties", module); > + Debug.logError("Truition is not properly configured; cookieTime missing; see trution", module); > return "error"; > } > > @@ -113,7 +113,7 @@ public class TruitionCoReg { > return "error"; > } > if (UtilValidate.isEmpty(cookieName)) { > - Debug.logError("Truition is not properly configured; cookieName missing; see truition.properties", module); > + Debug.logError("Truition is not properly configured; cookieName missing;see truition.properties", module); > return "error"; > } > > @@ -321,6 +321,6 @@ public class TruitionCoReg { > } > > public static boolean truitionEnabled() { > - return "Y".equalsIgnoreCase(UtilProperties.getPropertyValue("truition.properties", "truition.enabled", "N")); > + return "Y".equalsIgnoreCase(UtilProperties.getPropertyValue("truition", "truition.enabled", "N")); > } > } > > Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/location/FlexibleLocation.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/location/FlexibleLocation.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/framework/base/src/org/ofbiz/base/location/FlexibleLocation.java (original) > +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/location/FlexibleLocation.java Mon Nov 16 19:02:25 2015 > @@ -53,7 +53,7 @@ public final class FlexibleLocation { > * because this class may be initialized before all components > * are loaded. > */ > - Properties properties = UtilProperties.createProperties("locationresolvers.properties"); > + Properties properties = UtilProperties.createProperties("locationresolvers"); > if (properties != null) { > ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); > for (Entry<Object, Object> entry : properties.entrySet()) { > > Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Debug.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Debug.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Debug.java (original) > +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Debug.java Mon Nov 16 19:02:25 2015 > @@ -65,7 +65,7 @@ public final class Debug { > levelStringMap.put("always", Debug.ALWAYS); > > // initialize levelOnCache > - Properties properties = UtilProperties.createProperties("debug.properties"); > + Properties properties = UtilProperties.createProperties("debug"); > if (properties != null) { > for (int i = 0; i < levelOnCache.length; i++) { > levelOnCache[i] = (i == Debug.ALWAYS || "true".equalsIgnoreCase(properties.getProperty(levelProps[i]))); > > Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GroovyUtil.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GroovyUtil.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GroovyUtil.java (original) > +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GroovyUtil.java Mon Nov 16 19:02:25 2015 > @@ -50,7 +50,7 @@ public class GroovyUtil { > private static final GroovyClassLoader groovyScriptClassLoader; > static { > GroovyClassLoader groovyClassLoader = null; > - String scriptBaseClass = UtilProperties.getPropertyValue("groovy.properties", "scriptBaseClass"); > + String scriptBaseClass = UtilProperties.getPropertyValue("groovy", "scriptBaseClass"); > if (!scriptBaseClass.isEmpty()) { > CompilerConfiguration conf = new CompilerConfiguration(); > conf.setScriptBaseClass(scriptBaseClass); > > Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java (original) > +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java Mon Nov 16 19:02:25 2015 > @@ -62,7 +62,7 @@ public class MultiTrustManager implement > if (isTrusted(certs)) { > return; > } > - if (!"true".equals(UtilProperties.getPropertyValue("certificate.properties", "client.all-trusted", "true"))) { > + if (!"true".equals(UtilProperties.getPropertyValue("certificate", "client.all-trusted", "true"))) { > throw new CertificateException("No trusted certificate found"); > } > } > @@ -71,7 +71,7 @@ public class MultiTrustManager implement > if (isTrusted(certs)) { > return; > } > - if (!"true".equals(UtilProperties.getPropertyValue("certificate.properties", "server.all-trusted", "true"))) { > + if (!"true".equals(UtilProperties.getPropertyValue("certificate", "server.all-trusted", "true"))) { > throw new CertificateException("No trusted certificate found"); > } > } > > Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/SSLUtil.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/SSLUtil.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/SSLUtil.java (original) > +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/SSLUtil.java Mon Nov 16 19:02:25 2015 > @@ -255,10 +255,10 @@ public class SSLUtil { > > public static synchronized void loadJsseProperties(boolean debug) { > if (!loadedProps) { > - String protocol = UtilProperties.getPropertyValue("jsse.properties", "java.protocol.handler.pkgs", "NONE"); > - String proxyHost = UtilProperties.getPropertyValue("jsse.properties", "https.proxyHost", "NONE"); > - String proxyPort = UtilProperties.getPropertyValue("jsse.properties", "https.proxyPort", "NONE"); > - String cypher = UtilProperties.getPropertyValue("jsse.properties", "https.cipherSuites", "NONE"); > + String protocol = UtilProperties.getPropertyValue("jsse", "java.protocol.handler.pkgs", "NONE"); > + String proxyHost = UtilProperties.getPropertyValue("jsse", "https.proxyHost", "NONE"); > + String proxyPort = UtilProperties.getPropertyValue("jsse", "https.proxyPort", "NONE"); > + String cypher = UtilProperties.getPropertyValue("jsse", "https.cipherSuites", "NONE"); > if (protocol != null && !protocol.equals("NONE")) { > System.setProperty("java.protocol.handler.pkgs", protocol); > } > > Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java (original) > +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java Mon Nov 16 19:02:25 2015 > @@ -43,7 +43,7 @@ public class UtilFormatOut { > > // ------------------- price format handlers ------------------- > // FIXME: This is not thread-safe! DecimalFormat is not synchronized. > - static DecimalFormat priceDecimalFormat = new DecimalFormat(UtilProperties.getPropertyValue("general.properties", "currency.decimal.format", "#,##0.00")); > + static DecimalFormat priceDecimalFormat = new DecimalFormat(UtilProperties.getPropertyValue("general", "currency.decimal.format", "#,##0.00")); > > /** Formats a Double representing a price into a string > * @param price The price Double to be formatted > > Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java (original) > +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java Mon Nov 16 19:02:25 2015 > @@ -1010,7 +1010,7 @@ public class UtilXml { > public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException { > //Debug.logInfo("resolving XML entity with publicId [" + publicId + "], systemId [" + systemId + "]", module); > hasDTD = false; > - String dtd = UtilProperties.getSplitPropertyValue(UtilURL.fromResource("localdtds.properties"), publicId); > + String dtd = UtilProperties.getSplitPropertyValue(UtilURL.fromResource("localdtds"), publicId); > if (UtilValidate.isNotEmpty(dtd)) { > if (Debug.verboseOn()) Debug.logVerbose("[UtilXml.LocalResolver.resolveEntity] resolving DTD with publicId [" + publicId + > "], systemId [" + systemId + "] and the dtd file is [" + dtd + "]", module); > > Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java (original) > +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java Mon Nov 16 19:02:25 2015 > @@ -114,7 +114,7 @@ public class FreeMarkerWorker { > ClassLoader loader = Thread.currentThread().getContextClassLoader(); > Enumeration<URL> resources; > try { > - resources = loader.getResources("freemarkerTransforms.properties"); > + resources = loader.getResources("freemarkerTransforms"); > } catch (IOException e) { > Debug.logError(e, "Could not load list of freemarkerTransforms.properties", module); > throw UtilMisc.initCause(new InternalError(e.getMessage()), e); > > Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java (original) > +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java Mon Nov 16 19:02:25 2015 > @@ -402,7 +402,7 @@ public class CommonEvents { > final int fontSize = Integer.parseInt(captchaSizeConfigs[0]); > final int height = Integer.parseInt(captchaSizeConfigs[1]); > final int width = Integer.parseInt(captchaSizeConfigs[2]); > - final int charsToPrint = UtilProperties.getPropertyAsInteger("captcha.properties", "captcha.code_length", 6); > + final int charsToPrint = UtilProperties.getPropertyAsInteger("captcha", "captcha.code_length", 6); > final char[] availableChars = EntityUtilProperties.getPropertyValue("captcha", "captcha.characters", delegator).toCharArray(); > > //It is possible to pass the font size, image width and height with the request as well > > Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java (original) > +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java Mon Nov 16 19:02:25 2015 > @@ -708,7 +708,7 @@ public class LoginServices { > List<String> errorMessageList = new LinkedList<String>(); > Locale locale = (Locale) context.get("locale"); > > - //boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security.properties", "password.encrypt")); > + //boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security", "password.encrypt")); > > String userLoginId = (String) context.get("userLoginId"); > String errMsg = null; > > Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/qrcode/QRCodeServices.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/qrcode/QRCodeServices.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/framework/common/src/org/ofbiz/common/qrcode/QRCodeServices.java (original) > +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/qrcode/QRCodeServices.java Mon Nov 16 19:02:25 2015 > @@ -62,15 +62,15 @@ public class QRCodeServices { > > public static final String module = QRCodeServices.class.getName(); > > - public static final String QRCODE_DEFAULT_WIDTH = UtilProperties.getPropertyValue("qrcode.properties", "qrcode.default.width", "200"); > + public static final String QRCODE_DEFAULT_WIDTH = UtilProperties.getPropertyValue("qrcode", "qrcode.default.width", "200"); > > - public static final String QRCODE_DEFAULT_HEIGHT = UtilProperties.getPropertyValue("qrcode.properties", "qrcode.default.height", "200"); > + public static final String QRCODE_DEFAULT_HEIGHT = UtilProperties.getPropertyValue("qrcode", "qrcode.default.height", "200"); > > - public static final String QRCODE_DEFAULT_FORMAT = UtilProperties.getPropertyValue("qrcode.properties", "qrcode.default.format", "jpg"); > + public static final String QRCODE_DEFAULT_FORMAT = UtilProperties.getPropertyValue("qrcode", "qrcode.default.format", "jpg"); > > - public static final String QRCODE_FORMAT_SUPPORTED = UtilProperties.getPropertyValue("qrcode.properties", "qrcode.format.supported", "jpg|png|bmp"); > + public static final String QRCODE_FORMAT_SUPPORTED = UtilProperties.getPropertyValue("qrcode", "qrcode.format.supported", "jpg|png|bmp"); > > - public static final String QRCODE_DEFAULT_LOGOIMAGE = UtilProperties.getPropertyValue("qrcode.properties", "qrcode.default.logoimage"); > + public static final String QRCODE_DEFAULT_LOGOIMAGE = UtilProperties.getPropertyValue("qrcode", "qrcode.default.logoimage"); > > public static BufferedImage defaultLogoImage; > > > Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/config/model/EntityConfig.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/config/model/EntityConfig.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/config/model/EntityConfig.java (original) > +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/config/model/EntityConfig.java Mon Nov 16 19:02:25 2015 > @@ -359,7 +359,7 @@ public final class EntityConfig { > throw new GenericEntityConfException("No jdbc-password or jdbc-password-lookup specified for inline-jdbc element, line: " + inlineJdbcElement.getLineNumber()); > } > String key = "jdbc-password.".concat(jdbcPasswordLookup); > - jdbcPassword = UtilProperties.getPropertyValue("passwords.properties", key); > + jdbcPassword = UtilProperties.getPropertyValue("passwords", key); > if (jdbcPassword.isEmpty()) { > throw new GenericEntityConfException("'" + key + "' property not found in passwords.properties file for inline-jdbc element, line: " + inlineJdbcElement.getLineNumber()); > } > > Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java (original) > +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java Mon Nov 16 19:02:25 2015 > @@ -210,7 +210,7 @@ public class EntityDataLoader { > for (ReadData readerInfo : datasourceInfo.getReadDataList()) { > String readerName = readerInfo.getReaderName(); > // ignore the "tenant" reader if the multitenant property is "N" > - if ("tenant".equals(readerName) && "N".equals(UtilProperties.getPropertyValue("general.properties", "multitenant"))) { > + if ("tenant".equals(readerName) && "N".equals(UtilProperties.getPropertyValue("general", "multitenant"))) { > continue; > } > > > Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java (original) > +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java Mon Nov 16 19:02:25 2015 > @@ -525,6 +525,6 @@ public class EntityUtil { > * property in <code>general.properties</code> to "Y".</p> > */ > public static boolean isMultiTenantEnabled() { > - return "Y".equalsIgnoreCase(UtilProperties.getPropertyValue("general.properties", "multitenant")); > + return "Y".equalsIgnoreCase(UtilProperties.getPropertyValue("general", "multitenant")); > } > } > > Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangUtil.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangUtil.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangUtil.java (original) > +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangUtil.java Mon Nov 16 19:02:25 2015 > @@ -92,7 +92,7 @@ public final class MiniLangUtil { > * auto-correct version changes > */ > public static boolean autoCorrectOn() { > - return "true".equals(UtilProperties.getPropertyValue("minilang.properties", "autocorrect")); > + return "true".equals(UtilProperties.getPropertyValue("minilang", "autocorrect")); > } > > /** > > Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangValidate.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangValidate.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangValidate.java (original) > +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangValidate.java Mon Nov 16 19:02:25 2015 > @@ -192,7 +192,7 @@ public final class MiniLangValidate { > * @return <code>true</code> if <code>validation.level=lenient</code> > */ > public static boolean lenientOn() { > - return "lenient".equals(UtilProperties.getPropertyValue("minilang.properties", "validation.level")); > + return "lenient".equals(UtilProperties.getPropertyValue("minilang", "validation.level")); > } > > /** > @@ -345,7 +345,7 @@ public final class MiniLangValidate { > * @return <code>true</code> if <code>validation.level=strict</code> > */ > public static boolean strictOn() { > - return "strict".equals(UtilProperties.getPropertyValue("minilang.properties", "validation.level")); > + return "strict".equals(UtilProperties.getPropertyValue("minilang", "validation.level")); > } > > /** > @@ -354,7 +354,7 @@ public final class MiniLangValidate { > * @return <code>true</code> if <code>validation.level</code> is set to lenient or strict > */ > public static boolean validationOn() { > - return !"none".equals(UtilProperties.getPropertyValue("minilang.properties", "validation.level")); > + return !"none".equals(UtilProperties.getPropertyValue("minilang", "validation.level")); > } > > private MiniLangValidate() {} > > Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/test/MiniLangTests.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/test/MiniLangTests.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/test/MiniLangTests.java (original) > +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/test/MiniLangTests.java Mon Nov 16 19:02:25 2015 > @@ -39,7 +39,7 @@ public class MiniLangTests extends OFBiz > > public MiniLangTests(String name) { > super(name); > - traceEnabled = "true".equals(UtilProperties.getPropertyValue("minilang.properties", "unit.tests.trace.enabled")); > + traceEnabled = "true".equals(UtilProperties.getPropertyValue("minilang", "unit.tests.trace.enabled")); > } > > private Map<String, Object> createContext() { > > Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java (original) > +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java Mon Nov 16 19:02:25 2015 > @@ -69,7 +69,7 @@ import com.ibm.icu.util.Calendar; > public final class JobManager { > > public static final String module = JobManager.class.getName(); > - public static final String instanceId = UtilProperties.getPropertyValue("general.properties", "unique.instanceId", "ofbiz0"); > + public static final String instanceId = UtilProperties.getPropertyValue("general", "unique.instanceId", "ofbiz0"); > private static final ConcurrentHashMap<String, JobManager> registeredManagers = new ConcurrentHashMap<String, JobManager>(); > private static boolean isShutDown = false; > > > Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java (original) > +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java Mon Nov 16 19:02:25 2015 > @@ -70,7 +70,7 @@ import org.ofbiz.webapp.website.WebSiteW > public class RequestHandler { > > public static final String module = RequestHandler.class.getName(); > - private final String defaultStatusCodeString = UtilProperties.getPropertyValue("requestHandler.properties", "status-code", "302"); > + private final String defaultStatusCodeString = UtilProperties.getPropertyValue("requestHandler", "status-code", "302"); > private final ViewFactory viewFactory; > private final EventFactory eventFactory; > private final URL controllerConfigURL; > > Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java (original) > +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java Mon Nov 16 19:02:25 2015 > @@ -63,33 +63,33 @@ public class ApacheFopWorker { > > public static final int encryptionLengthBitsDefault = 128; > > - public static final String encryptionLengthDefault = UtilProperties.getPropertyValue("fop.properties", "fop.encryption-length.default", String.valueOf(encryptionLengthBitsDefault)); > + public static final String encryptionLengthDefault = UtilProperties.getPropertyValue("fop", "fop.encryption-length.default", String.valueOf(encryptionLengthBitsDefault)); > > - public static final String userPasswordDefault = UtilProperties.getPropertyValue("fop.properties", "fop.userPassword.default"); > + public static final String userPasswordDefault = UtilProperties.getPropertyValue("fop", "fop.userPassword.default"); > > - public static final String ownerPasswordDefault = UtilProperties.getPropertyValue("fop.properties", "fop.ownerPassword.default"); > + public static final String ownerPasswordDefault = UtilProperties.getPropertyValue("fop", "fop.ownerPassword.default"); > > - public static final String allowPrintDefault = UtilProperties.getPropertyValue("fop.properties", "fop.allowPrint.default", "true"); > + public static final String allowPrintDefault = UtilProperties.getPropertyValue("fop", "fop.allowPrint.default", "true"); > > - public static final String allowCopyContentDefault = UtilProperties.getPropertyValue("fop.properties", "fop.allowCopyContent.default", "true"); > + public static final String allowCopyContentDefault = UtilProperties.getPropertyValue("fop", "fop.allowCopyContent.default", "true"); > > - public static final String allowEditContentDefault = UtilProperties.getPropertyValue("fop.properties", "fop.allowEditContent.default", "true"); > + public static final String allowEditContentDefault = UtilProperties.getPropertyValue("fop", "fop.allowEditContent.default", "true"); > > - public static final String allowEditAnnotationsDefault = UtilProperties.getPropertyValue("fop.properties", "fop.allowEditAnnotations.default", "true"); > + public static final String allowEditAnnotationsDefault = UtilProperties.getPropertyValue("fop", "fop.allowEditAnnotations.default", "true"); > > - public static final String allowFillInFormsDefault = UtilProperties.getPropertyValue("fop.properties", "fop.allowFillInForms.default", "true"); > + public static final String allowFillInFormsDefault = UtilProperties.getPropertyValue("fop", "fop.allowFillInForms.default", "true"); > > - public static final String allowAccessContentDefault = UtilProperties.getPropertyValue("fop.properties", "fop.allowAccessContent.default", "true"); > + public static final String allowAccessContentDefault = UtilProperties.getPropertyValue("fop", "fop.allowAccessContent.default", "true"); > > - public static final String allowAssembleDocumentDefault = UtilProperties.getPropertyValue("fop.properties", "fop.allowAssembleDocument.default", "true"); > + public static final String allowAssembleDocumentDefault = UtilProperties.getPropertyValue("fop", "fop.allowAssembleDocument.default", "true"); > > - public static final String allowPrintHqDefault = UtilProperties.getPropertyValue("fop.properties", "fop.allowPrintHq.default", "true"); > + public static final String allowPrintHqDefault = UtilProperties.getPropertyValue("fop", "fop.allowPrintHq.default", "true"); > > - public static final String encryptMetadataDefault = UtilProperties.getPropertyValue("fop.properties", "fop.encrypt-metadata.default", "true"); > + public static final String encryptMetadataDefault = UtilProperties.getPropertyValue("fop", "fop.encrypt-metadata.default", "true"); > > - public static final String fopPath = UtilProperties.getPropertyValue("fop.properties", "fop.path", "/framework/webapp/config"); > + public static final String fopPath = UtilProperties.getPropertyValue("fop", "fop.path", "/framework/webapp/config"); > > - public static final String fopFontBaseProperty = UtilProperties.getPropertyValue("fop.properties", "fop.font.base.url", "/framework/webapp/config/"); > + public static final String fopFontBaseProperty = UtilProperties.getPropertyValue("fop", "fop.font.base.url", "/framework/webapp/config/"); > > > /** Returns an instance of the FopFactory class. FOP documentation recommends > > Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavUtil.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavUtil.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavUtil.java (original) > +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavUtil.java Mon Nov 16 19:02:25 2015 > @@ -94,10 +94,10 @@ public class WebDavUtil { > return null; > } > } > - if ("true".equalsIgnoreCase(UtilProperties.getPropertyValue("security.properties", "username.lowercase"))) { > + if ("true".equalsIgnoreCase(UtilProperties.getPropertyValue("security", "username.lowercase"))) { > username = username.toLowerCase(); > } > - if ("true".equalsIgnoreCase(UtilProperties.getPropertyValue("security.properties", "password.lowercase"))) { > + if ("true".equalsIgnoreCase(UtilProperties.getPropertyValue("security", "password.lowercase"))) { > password = password.toLowerCase(); > } > Map<String, Object> result = new HashMap<String, Object>(); > > Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelForm.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelForm.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelForm.java (original) > +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelForm.java Mon Nov 16 19:02:25 2015 > @@ -204,7 +204,7 @@ public abstract class ModelForm extends > if (parentModel != null) { > defaultViewSizeInt = parentModel.defaultViewSize; > } else { > - defaultViewSizeInt = UtilProperties.getPropertyAsInteger("widget.properties", "widget.form.defaultViewSize", > + defaultViewSizeInt = UtilProperties.getPropertyAsInteger("widget", "widget.form.defaultViewSize", > defaultViewSizeInt); > } > } else { > > Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoScreenRenderer.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoScreenRenderer.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoScreenRenderer.java (original) > +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoScreenRenderer.java Mon Nov 16 19:02:25 2015 > @@ -43,7 +43,7 @@ public class FoScreenRenderer extends Ht > > // This is a util method to get the style from a property file > public static String getFoStyle(String styleName) { > - String value = UtilProperties.getPropertyValue("fo-styles.properties", styleName); > + String value = UtilProperties.getPropertyValue("fo-styles", styleName); > if (value.equals(styleName)) { > return ""; > } > > Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlFormRenderer.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlFormRenderer.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlFormRenderer.java (original) > +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlFormRenderer.java Mon Nov 16 19:02:25 2015 > @@ -1102,7 +1102,7 @@ public class HtmlFormRenderer extends Ht > > if (UtilValidate.isNotEmpty(titleText)) { > // copied from MacroFormRenderer renderFieldTitle > - String displayHelpText = UtilProperties.getPropertyValue("widget.properties", "widget.form.displayhelpText"); > + String displayHelpText = UtilProperties.getPropertyValue("widget", "widget.form.displayhelpText"); > String helpText = null; > if ("Y".equals(displayHelpText)) { > Delegator delegator = WidgetWorker.getDelegator(context); > > Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java (original) > +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java Mon Nov 16 19:02:25 2015 > @@ -1305,7 +1305,7 @@ public final class MacroFormRenderer imp > sr.append("<@renderFieldTitle "); > sr.append(" style=\""); > sr.append(style); > - String displayHelpText = UtilProperties.getPropertyValue("widget.properties", "widget.form.displayhelpText"); > + String displayHelpText = UtilProperties.getPropertyValue("widget", "widget.form.displayhelpText"); > if ("Y".equals(displayHelpText)) { > Delegator delegator = WidgetWorker.getDelegator(context); > Locale locale = (Locale) context.get("locale"); > @@ -3088,12 +3088,12 @@ public final class MacroFormRenderer imp > String uniqueItemName = "Modal_".concat(UUID.randomUUID().toString()); > String width = (String) this.request.getAttribute("width"); > if (UtilValidate.isEmpty(width)) { > - width = String.valueOf(UtilProperties.getPropertyValue("widget.properties", "widget.link.default.layered-modal.width", "800")); > + width = String.valueOf(UtilProperties.getPropertyValue("widget", "widget.link.default.layered-modal.width", "800")); > this.request.setAttribute("width", width); > } > String height = (String) this.request.getAttribute("height"); > if (UtilValidate.isEmpty(height)) { > - height = String.valueOf(UtilProperties.getPropertyValue("widget.properties", "widget.link.default.layered-modal.height", "600")); > + height = String.valueOf(UtilProperties.getPropertyValue("widget", "widget.link.default.layered-modal.height", "600")); > this.request.setAttribute("height", height); > } > this.request.setAttribute("uniqueItemName", uniqueItemName); > > Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenRenderer.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenRenderer.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenRenderer.java (original) > +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenRenderer.java Mon Nov 16 19:02:25 2015 > @@ -235,11 +235,11 @@ public class MacroScreenRenderer impleme > StringBuilder parameters = new StringBuilder(); > String width = link.getWidth(); > if (UtilValidate.isEmpty(width)) { > - width = String.valueOf(UtilProperties.getPropertyValue("widget.properties", "widget.link.default.layered-modal.width", "800")); > + width = String.valueOf(UtilProperties.getPropertyValue("widget", "widget.link.default.layered-modal.width", "800")); > } > String height = link.getHeight(); > if (UtilValidate.isEmpty(height)) { > - height = String.valueOf(UtilProperties.getPropertyValue("widget.properties", "widget.link.default.layered-modal.height", "600")); > + height = String.valueOf(UtilProperties.getPropertyValue("widget", "widget.link.default.layered-modal.height", "600")); > } > if ("hidden-form".equals(linkType) || "layered-modal".equals(linkType)) { > StringBuilder sb = new StringBuilder(); > > Modified: ofbiz/trunk/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/janrain/JanrainHelper.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/janrain/JanrainHelper.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/janrain/JanrainHelper.java (original) > +++ ofbiz/trunk/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/janrain/JanrainHelper.java Mon Nov 16 19:02:25 2015 > @@ -62,8 +62,8 @@ import org.xml.sax.SAXException; > public class JanrainHelper { > > public static final String module = JanrainHelper.class.getName(); > - private static String apiKey = UtilProperties.getPropertyValue("ecommerce.properties", "janrain.apiKey"); > - private static String baseUrl = UtilProperties.getPropertyValue("ecommerce.properties", "janrain.baseUrl"); > + private static String apiKey = UtilProperties.getPropertyValue("ecommerce", "janrain.apiKey"); > + private static String baseUrl = UtilProperties.getPropertyValue("ecommerce", "janrain.baseUrl"); > public JanrainHelper(String apiKey, String baseUrl) { > while (baseUrl.endsWith("/")) > baseUrl = baseUrl.substring(0, baseUrl.length() - 1); > > Modified: ofbiz/trunk/specialpurpose/passport/src/org/ofbiz/passport/event/GitHubEvents.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/passport/src/org/ofbiz/passport/event/GitHubEvents.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/specialpurpose/passport/src/org/ofbiz/passport/event/GitHubEvents.java (original) > +++ ofbiz/trunk/specialpurpose/passport/src/org/ofbiz/passport/event/GitHubEvents.java Mon Nov 16 19:02:25 2015 > @@ -286,7 +286,7 @@ public class GitHubEvents { > userLogin = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId", userLoginId), false); > } > String password = PassportUtil.randomString(); > - boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security.properties", "password.encrypt")); > + boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security", "password.encrypt")); > userLogin.set("currentPassword", useEncryption ? HashCrypt.digestHash(LoginServices.getHashType(), null, password) : password); > userLogin.store(); > request.setAttribute("USERNAME", userLogin.getString("userLoginId")); > > Modified: ofbiz/trunk/specialpurpose/passport/src/org/ofbiz/passport/event/LinkedInEvents.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/passport/src/org/ofbiz/passport/event/LinkedInEvents.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/specialpurpose/passport/src/org/ofbiz/passport/event/LinkedInEvents.java (original) > +++ ofbiz/trunk/specialpurpose/passport/src/org/ofbiz/passport/event/LinkedInEvents.java Mon Nov 16 19:02:25 2015 > @@ -290,7 +290,7 @@ public class LinkedInEvents { > userLogin = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId", userLoginId), false); > } > String password = PassportUtil.randomString(); > - boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security.properties", "password.encrypt")); > + boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security", "password.encrypt")); > userLogin.set("currentPassword", useEncryption ? HashCrypt.digestHash(LoginServices.getHashType(), null, password) : password); > userLogin.store(); > request.setAttribute("USERNAME", userLogin.getString("userLoginId")); > > Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiSession.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiSession.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiSession.java (original) > +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiSession.java Mon Nov 16 19:02:25 2015 > @@ -46,7 +46,7 @@ public class XuiSession { > protected XuiContainer container = null; > protected Map<String, Object> attributes = new HashMap<String, Object>(); > protected String id = null; > - protected final boolean IS_SAME_LOGIN = UtilProperties.propertyValueEqualsIgnoreCase("xui.properties", "isSameLogin", "true"); > + protected final boolean IS_SAME_LOGIN = UtilProperties.propertyValueEqualsIgnoreCase("xui", "isSameLogin", "true"); > private Locale locale = Locale.getDefault(); > > public XuiSession(String id, Delegator delegator, LocalDispatcher dispatcher, XuiContainer container) { > > Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original) > +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Mon Nov 16 19:02:25 2015 > @@ -1940,7 +1940,7 @@ public class PosTransaction implements S > try { > > passwordAcceptEncryptedAndPlain = EntityUtilProperties.getPropertyValue("security", "password.accept.encrypted.and.plain", delegator); > - UtilProperties.setPropertyValueInMemory("security.properties", "password.accept.encrypted.and.plain", "true"); > + UtilProperties.setPropertyValueInMemory("security", "password.accept.encrypted.and.plain", "true"); > svcRes = dispatcher.runSync("updatePassword", > UtilMisc.toMap("userLogin", userLogin, > "userLoginId", userLogin.getString("userLoginId"), > @@ -1950,11 +1950,11 @@ public class PosTransaction implements S > } catch (GenericServiceException e) { > Debug.logError(e, "Error calling updatePassword service", module); > pos.showDialog("dialog/error/exception", e.getMessage()); > - UtilProperties.setPropertyValueInMemory("security.properties", "password.accept.encrypted.and.plain", passwordAcceptEncryptedAndPlain); > + UtilProperties.setPropertyValueInMemory("security", "password.accept.encrypted.and.plain", passwordAcceptEncryptedAndPlain); > return null; > } finally { > // Put back passwordAcceptEncryptedAndPlain value in memory > - UtilProperties.setPropertyValueInMemory("security.properties", "password.accept.encrypted.and.plain", passwordAcceptEncryptedAndPlain); > + UtilProperties.setPropertyValueInMemory("security", "password.accept.encrypted.and.plain", passwordAcceptEncryptedAndPlain); > } > if (ServiceUtil.isError(svcRes)) { > pos.showDialog("dialog/error/exception", ServiceUtil.getErrorMessage(svcRes)); > > Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java (original) > +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java Mon Nov 16 19:02:25 2015 > @@ -116,8 +116,8 @@ public class KeyboardAdaptor { > > private class KeyboardListener extends Thread { > > - public final Long MAX_WAIT_SCANNER = new Long(Long.parseLong(UtilProperties.getPropertyValue("jpos.properties", "MaxWaitScanner", "100"))); > - public final Long MAX_WAIT_KEYBOARD = new Long(Long.parseLong(UtilProperties.getPropertyValue("jpos.properties", "MaxWaitKeyboard", "10"))); > + public final Long MAX_WAIT_SCANNER = new Long(Long.parseLong(UtilProperties.getPropertyValue("jpos", "MaxWaitScanner", "100"))); > + public final Long MAX_WAIT_KEYBOARD = new Long(Long.parseLong(UtilProperties.getPropertyValue("jpos", "MaxWaitKeyboard", "10"))); > // By default keyboard entry (login & password 1st) > public Long MAX_WAIT = MAX_WAIT_KEYBOARD; > > > Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Scanner.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Scanner.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Scanner.java (original) > +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Scanner.java Mon Nov 16 19:02:25 2015 > @@ -34,7 +34,7 @@ public class Scanner extends GenericDevi > > protected String deviceName = null; > protected int timeout = -1; > - private static final boolean MULTI_BARCODES_ALLOWED = UtilProperties.propertyValueEqualsIgnoreCase("jpos.properties", "MultiBarCodesAllowed", "Y"); > + private static final boolean MULTI_BARCODES_ALLOWED = UtilProperties.propertyValueEqualsIgnoreCase("jpos", "MultiBarCodesAllowed", "Y"); > > public Scanner(String deviceName, int timeout) { > super(deviceName, timeout); > > Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java (original) > +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java Mon Nov 16 19:02:25 2015 > @@ -380,11 +380,11 @@ public class ManagerEvents { > pos.showDialog("dialog/error/mgrnotloggedin"); > } else { > String showKeyboardInSaveSale = null; > - showKeyboardInSaveSale = UtilProperties.getPropertyValue("parameters.properties", "ShowKeyboardInSaveSale"); > + showKeyboardInSaveSale = UtilProperties.getPropertyValue("parameters", "ShowKeyboardInSaveSale"); > if ("N".equalsIgnoreCase(showKeyboardInSaveSale)) { > - UtilProperties.setPropertyValueInMemory("parameters.properties", "ShowKeyboardInSaveSale", "Y"); > + UtilProperties.setPropertyValueInMemory("parameters", "ShowKeyboardInSaveSale", "Y"); > } else { > - UtilProperties.setPropertyValueInMemory("parameters.properties", "ShowKeyboardInSaveSale", "N"); > + UtilProperties.setPropertyValueInMemory("parameters", "ShowKeyboardInSaveSale", "N"); > } > } > } > > Modified: ofbiz/trunk/specialpurpose/solr/src/org/ofbiz/solr/SolrUtil.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/src/org/ofbiz/solr/SolrUtil.java?rev=1714652&r1=1714651&r2=1714652&view=diff > ============================================================================== > --- ofbiz/trunk/specialpurpose/solr/src/org/ofbiz/solr/SolrUtil.java (original) > +++ ofbiz/trunk/specialpurpose/solr/src/org/ofbiz/solr/SolrUtil.java Mon Nov 16 19:02:25 2015 > @@ -60,7 +60,7 @@ public abstract class SolrUtil { > solrPort = solrWebappPortOverride; > } > else { > - solrPort = UtilProperties.getPropertyValue("url.properties", ("https".equals(solrWebappProtocol) ? "port.https" : "port.http")); > + solrPort = UtilProperties.getPropertyValue("url", ("https".equals(solrWebappProtocol) ? "port.https" : "port.http")); > } > > return solrWebappProtocol + "://" + solrWebappDomainName + ":" + solrPort + solrWebappPath; > > |
Administrator
|
Yes just spotted that, on it...
Jacques Le 16/11/2015 22:20, Adrian Crum a écrit : > This commit prevents OFBiz from starting: > > load-demo: > [java] Start.java using configuration file org/ofbiz/base/start/load-data.properties > [java] Set OFBIZ_HOME to - C:/Develop/ofbiz > [java] Admin socket not configured; set to port 0 > [java] Exception in thread "main" java.lang.ExceptionInInitializerError > [java] at org.ofbiz.base.container.ContainerLoader.load(ContainerLoader.java:74) > [java] at org.ofbiz.base.start.Start.initStartLoaders(Start.java:315) > [java] at org.ofbiz.base.start.Start.init(Start.java:239) > [java] at org.ofbiz.base.start.Start.main(Start.java:127) > [java] Caused by: java.lang.IllegalStateException: debug.properties file not found > [java] at org.ofbiz.base.util.Debug.<clinit>(Debug.java:74) > [java] ... 4 more > [java] Exception in thread "Thread-0" java.lang.NoClassDefFoundError: Could not initialize class org.ofbiz.base.util.Debug > [java] at org.ofbiz.base.container.ContainerLoader.unload(ContainerLoader.java:255) > [java] at org.ofbiz.base.start.Start.shutdownServer(Start.java:384) > [java] at org.ofbiz.base.start.Start$1.run(Start.java:231) > [java] Java Result: 1 > > > Adrian Crum > Sandglass Software > www.sandglass-software.com > > On 11/16/2015 11:02 AM, [hidden email] wrote: >> Author: jleroux >> Date: Mon Nov 16 19:02:25 2015 >> New Revision: 1714652 >> >> URL: http://svn.apache.org/viewvc?rev=1714652&view=rev >> Log: >> No functional change, completes r1713985: removes superfluous .properties extension from UtilProperties requests (and yes I checked >> UspsServicesTests ;)) >> >> Modified: >> ofbiz/trunk/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/taxware/TaxwareUTL.java >> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java >> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java >> ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java >> ofbiz/trunk/framework/base/src/org/ofbiz/base/location/FlexibleLocation.java >> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Debug.java >> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GroovyUtil.java >> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java >> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/SSLUtil.java >> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java >> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java >> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java >> ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java >> ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java >> ofbiz/trunk/framework/common/src/org/ofbiz/common/qrcode/QRCodeServices.java >> ofbiz/trunk/framework/entity/src/org/ofbiz/entity/config/model/EntityConfig.java >> ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java >> ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java >> ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangUtil.java >> ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangValidate.java >> ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/test/MiniLangTests.java >> ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java >> ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java >> ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java >> ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavUtil.java >> ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelForm.java >> ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoScreenRenderer.java >> ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlFormRenderer.java >> ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java >> ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenRenderer.java >> ofbiz/trunk/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/janrain/JanrainHelper.java >> ofbiz/trunk/specialpurpose/passport/src/org/ofbiz/passport/event/GitHubEvents.java >> ofbiz/trunk/specialpurpose/passport/src/org/ofbiz/passport/event/LinkedInEvents.java >> ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiSession.java >> ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java >> ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java >> ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Scanner.java >> ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java >> ofbiz/trunk/specialpurpose/solr/src/org/ofbiz/solr/SolrUtil.java >> >> Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java (original) >> +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java Mon Nov 16 19:02:25 2015 >> @@ -57,7 +57,7 @@ public class PermissionRecorder { >> public static final String [] fieldTitles = { "Purpose", "Operation", "Role", "Status", "Privilege"}; >> >> public PermissionRecorder() { >> - isOn = UtilProperties.propertyValueEqualsIgnoreCase("content.properties", "permissionRecorderOn", "true"); >> + isOn = UtilProperties.propertyValueEqualsIgnoreCase("content", "permissionRecorderOn", "true"); >> } >> >> public void setCheckMode(int val) { >> >> Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java (original) >> +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java Mon Nov 16 19:02:25 2015 >> @@ -471,8 +471,8 @@ public class DataResourceWorker impleme >> } >> >> public static String getDataResourceContentUploadPath(boolean absolute) { >> - String initialPath = UtilProperties.getPropertyValue("content.properties", "content.upload.path.prefix"); >> - double maxFiles = UtilProperties.getPropertyNumber("content.properties", "content.upload.max.files"); >> + String initialPath = UtilProperties.getPropertyValue("content", "content.upload.path.prefix"); >> + double maxFiles = UtilProperties.getPropertyNumber("content", "content.upload.max.files"); >> if (maxFiles < 1) { >> maxFiles = 250; >> } >> @@ -482,7 +482,7 @@ public class DataResourceWorker impleme >> >> public static String getDataResourceContentUploadPath(Delegator delegator, boolean absolute) { >> String initialPath = EntityUtilProperties.getPropertyValue("content", "content.upload.path.prefix", delegator); >> - double maxFiles = UtilProperties.getPropertyNumber("content.properties", "content.upload.max.files"); >> + double maxFiles = UtilProperties.getPropertyNumber("content", "content.upload.max.files"); >> if (maxFiles < 1) { >> maxFiles = 250; >> } >> >> Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/taxware/TaxwareUTL.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/taxware/TaxwareUTL.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/taxware/TaxwareUTL.java (original) >> +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/taxware/TaxwareUTL.java Mon Nov 16 19:02:25 2015 >> @@ -198,20 +198,20 @@ public class TaxwareUTL { >> >> private void addStaticData(Record record) { >> // grab a taxware properties file and get static data >> - record.set("COMPANY_ID", UtilProperties.getPropertyValue("taxware.properties", "COMPANY_ID", " ")); >> - record.set("AUDIT_FILE_INDICATOR", UtilProperties.getPropertyValue("taxware.properties", "AUDIT_FILE_INDICATOR", "2")); >> - record.set("SF_COUNTRY_CODE", UtilProperties.getPropertyValue("taxware.properties", "SF_COUNTRY_CODE", "")); >> - record.set("SF_STATE_PROVINCE", UtilProperties.getPropertyValue("taxware.properties", "SF_STATE_PROVINCE", " ")); >> - record.set("SF_CITY", UtilProperties.getPropertyValue("taxware.properties", "SF_CITY", " ")); >> - record.set("SF_POSTAL_CODE", UtilProperties.getPropertyValue("taxware.properties", "SF_POSTAL_CODE", " ")); >> - record.set("POO_COUNTRY_CODE", UtilProperties.getPropertyValue("taxware.properties", "POO_COUNTRY_CODE", "")); >> - record.set("POO_STATE_PROVINCE", UtilProperties.getPropertyValue("taxware.properties", "POO_STATE_PROVINCE", " ")); >> - record.set("POO_CITY", UtilProperties.getPropertyValue("taxware.properties", "POO_CITY", " ")); >> - record.set("POO_POSTAL_CODE", UtilProperties.getPropertyValue("taxware.properties", "POO_POSTAL_CODE", " ")); >> - record.set("POA_COUNTRY_CODE", UtilProperties.getPropertyValue("taxware.properties", "POA_COUNTRY_CODE", "")); >> - record.set("POA_STATE_PROVINCE", UtilProperties.getPropertyValue("taxware.properties", "POA_STATE_PROVINCE", " ")); >> - record.set("POA_CITY", UtilProperties.getPropertyValue("taxware.properties", "POA_CITY", " ")); >> - record.set("POA_POSTAL_CODE", UtilProperties.getPropertyValue("taxware.properties", "POA_POSTAL_CODE", " ")); >> + record.set("COMPANY_ID", UtilProperties.getPropertyValue("taxware", "COMPANY_ID", " ")); >> + record.set("AUDIT_FILE_INDICATOR", UtilProperties.getPropertyValue("taxware", "AUDIT_FILE_INDICATOR", "2")); >> + record.set("SF_COUNTRY_CODE", UtilProperties.getPropertyValue("taxware", "SF_COUNTRY_CODE", "")); >> + record.set("SF_STATE_PROVINCE", UtilProperties.getPropertyValue("taxware", "SF_STATE_PROVINCE", " ")); >> + record.set("SF_CITY", UtilProperties.getPropertyValue("taxware", "SF_CITY", " ")); >> + record.set("SF_POSTAL_CODE", UtilProperties.getPropertyValue("taxware", "SF_POSTAL_CODE", " ")); >> + record.set("POO_COUNTRY_CODE", UtilProperties.getPropertyValue("taxware", "POO_COUNTRY_CODE", "")); >> + record.set("POO_STATE_PROVINCE", UtilProperties.getPropertyValue("taxware", "POO_STATE_PROVINCE", " ")); >> + record.set("POO_CITY", UtilProperties.getPropertyValue("taxware", "POO_CITY", " ")); >> + record.set("POO_POSTAL_CODE", UtilProperties.getPropertyValue("taxware", "POO_POSTAL_CODE", " ")); >> + record.set("POA_COUNTRY_CODE", UtilProperties.getPropertyValue("taxware", "POA_COUNTRY_CODE", "")); >> + record.set("POA_STATE_PROVINCE", UtilProperties.getPropertyValue("taxware", "POA_STATE_PROVINCE", " ")); >> + record.set("POA_CITY", UtilProperties.getPropertyValue("taxware", "POA_CITY", " ")); >> + record.set("POA_POSTAL_CODE", UtilProperties.getPropertyValue("taxware", "POA_POSTAL_CODE", " ")); >> } >> >> private void addAddresses(Record record) { >> >> Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java (original) >> +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java Mon Nov 16 19:02:25 2015 >> @@ -53,7 +53,7 @@ public class UspsServicesTests extends O >> public void testUspsTrackConfirm() throws Exception { >> >> // run the service >> - Map<String, Object> result = dispatcher.runSync("uspsTrackConfirm", UtilMisc.toMap("trackingId", "EJ958083578US", >> "shipmentGatewayConfigId", "USPS_CONFIG", "configProps", "shipment.properties")); >> + Map<String, Object> result = dispatcher.runSync("uspsTrackConfirm", UtilMisc.toMap("trackingId", "EJ958083578US", >> "shipmentGatewayConfigId", "USPS_CONFIG", "configProps", "shipment")); >> >> // verify the results >> String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE); >> @@ -86,7 +86,7 @@ public class UspsServicesTests extends O >> // run the service >> Map<String, String> paramInp = UtilMisc.toMap("address1", "6406 Ivy Lane", "city", "Greenbelt", "state", "MD"); >> paramInp.put("shipmentGatewayConfigId", "USPS_CONFIG"); >> - paramInp.put("configProps", "shipment.properties"); >> + paramInp.put("configProps", "shipment"); >> Map<String, Object> result = dispatcher.runSync("uspsAddressValidation", paramInp); >> >> // verify the results >> @@ -118,7 +118,7 @@ public class UspsServicesTests extends O >> public void testUspsCityStateLookup() throws Exception { >> >> // run the service >> - Map<String, Object> result = dispatcher.runSync("uspsCityStateLookup", UtilMisc.toMap("zip5", "90210", "shipmentGatewayConfigId", >> "USPS_CONFIG", "configProps", "shipment.properties")); >> + Map<String, Object> result = dispatcher.runSync("uspsCityStateLookup", UtilMisc.toMap("zip5", "90210", "shipmentGatewayConfigId", >> "USPS_CONFIG", "configProps", "shipment")); >> >> // verify the results >> String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE); >> @@ -137,7 +137,7 @@ public class UspsServicesTests extends O >> public void testUspsPriorityMailStandard() throws Exception { >> >> // run the service >> - Map<String, Object> result = dispatcher.runSync("uspsPriorityMailStandard", UtilMisc.toMap("originZip", "4", "destinationZip", "4", >> "shipmentGatewayConfigId", "USPS_CONFIG", "configProps", "shipment.properties")); >> + Map<String, Object> result = dispatcher.runSync("uspsPriorityMailStandard", UtilMisc.toMap("originZip", "4", "destinationZip", "4", >> "shipmentGatewayConfigId", "USPS_CONFIG", "configProps", "shipment")); >> >> // verify the results >> String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE); >> @@ -152,7 +152,7 @@ public class UspsServicesTests extends O >> public void testUspsPackageServicesStandard() throws Exception { >> >> // run the service >> - Map<String, Object> result = dispatcher.runSync("uspsPackageServicesStandard", UtilMisc.toMap("originZip", "4", "destinationZip", "4", >> "shipmentGatewayConfigId", "USPS_CONFIG", "configProps", "shipment.properties")); >> + Map<String, Object> result = dispatcher.runSync("uspsPackageServicesStandard", UtilMisc.toMap("originZip", "4", "destinationZip", "4", >> "shipmentGatewayConfigId", "USPS_CONFIG", "configProps", "shipment")); >> >> // verify the results >> String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE); >> @@ -178,7 +178,7 @@ public class UspsServicesTests extends O >> context.put("size", "Regular"); >> context.put("machinable", "False"); >> context.put("shipmentGatewayConfigId", "USPS_CONFIG"); >> - context.put("configProps", "shipment.properties"); >> + context.put("configProps", "shipment"); >> >> // run the service >> Map<String, Object> result = dispatcher.runSync("uspsDomesticRate", context); >> >> Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java (original) >> +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java Mon Nov 16 19:02:25 2015 >> @@ -388,7 +388,7 @@ public class WeightPackageSession implem >> >> protected boolean diffInShipCost(BigDecimal actualShippingCost) throws GeneralException { >> BigDecimal estimatedShipCost = this.getEstimatedShipCost(); >> - BigDecimal doEstimates = new BigDecimal(UtilProperties.getPropertyValue("shipment.properties", >> "shipment.default.cost_actual_over_estimated_percent_allowed", "10")); >> + BigDecimal doEstimates = new BigDecimal(UtilProperties.getPropertyValue("shipment", >> "shipment.default.cost_actual_over_estimated_percent_allowed", "10")); >> BigDecimal diffInShipCostInPerc = ZERO; >> if (estimatedShipCost.compareTo(ZERO) == 0) { >> diffInShipCostInPerc = actualShippingCost; >> >> Modified: ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java (original) >> +++ ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java Mon Nov 16 19:02:25 2015 >> @@ -63,21 +63,21 @@ public class TruitionCoReg { >> String domainName = EntityUtilProperties.getPropertyValue("truition", "truition.domain.name", delegator); >> String cookiePath = EntityUtilProperties.getPropertyValue("truition", "truition.cookie.path", delegator); >> String cookieName = EntityUtilProperties.getPropertyValue("truition", "truition.cookie.name", delegator); >> - int time = (int) UtilProperties.getPropertyNumber("truition.properties", "truition.cookie.time"); >> + int time = (int) UtilProperties.getPropertyNumber("truition", "truition.cookie.time"); >> if (UtilValidate.isEmpty(domainName)) { >> Debug.logError("Truition is not properly configured; domainName missing; see truition.properties", module); >> return "error"; >> } >> if (UtilValidate.isEmpty(cookiePath)) { >> - Debug.logError("Truition is not properly configured; cookiePath missing; see truition.properties", module); >> + Debug.logError("Truition is not properly configured; cookiePath missing;see truition.properties", module); >> return "error"; >> } >> if (UtilValidate.isEmpty(cookieName)) { >> - Debug.logError("Truition is not properly configured; cookieName missing; see truition.properties", module); >> + Debug.logError("Truition is not properly configured; cookieName missing;see truition.properties", module); >> return "error"; >> } >> if (time == 0) { >> - Debug.logError("Truition is not properly configured; cookieTime missing; see trution.properties", module); >> + Debug.logError("Truition is not properly configured; cookieTime missing; see trution", module); >> return "error"; >> } >> >> @@ -113,7 +113,7 @@ public class TruitionCoReg { >> return "error"; >> } >> if (UtilValidate.isEmpty(cookieName)) { >> - Debug.logError("Truition is not properly configured; cookieName missing; see truition.properties", module); >> + Debug.logError("Truition is not properly configured; cookieName missing;see truition.properties", module); >> return "error"; >> } >> >> @@ -321,6 +321,6 @@ public class TruitionCoReg { >> } >> >> public static boolean truitionEnabled() { >> - return "Y".equalsIgnoreCase(UtilProperties.getPropertyValue("truition.properties", "truition.enabled", "N")); >> + return "Y".equalsIgnoreCase(UtilProperties.getPropertyValue("truition", "truition.enabled", "N")); >> } >> } >> >> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/location/FlexibleLocation.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/location/FlexibleLocation.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/location/FlexibleLocation.java (original) >> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/location/FlexibleLocation.java Mon Nov 16 19:02:25 2015 >> @@ -53,7 +53,7 @@ public final class FlexibleLocation { >> * because this class may be initialized before all components >> * are loaded. >> */ >> - Properties properties = UtilProperties.createProperties("locationresolvers.properties"); >> + Properties properties = UtilProperties.createProperties("locationresolvers"); >> if (properties != null) { >> ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); >> for (Entry<Object, Object> entry : properties.entrySet()) { >> >> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Debug.java >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Debug.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Debug.java (original) >> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Debug.java Mon Nov 16 19:02:25 2015 >> @@ -65,7 +65,7 @@ public final class Debug { >> levelStringMap.put("always", Debug.ALWAYS); >> >> // initialize levelOnCache >> - Properties properties = UtilProperties.createProperties("debug.properties"); >> + Properties properties = UtilProperties.createProperties("debug"); >> if (properties != null) { >> for (int i = 0; i < levelOnCache.length; i++) { >> levelOnCache[i] = (i == Debug.ALWAYS || "true".equalsIgnoreCase(properties.getProperty(levelProps[i]))); >> >> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GroovyUtil.java >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GroovyUtil.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GroovyUtil.java (original) >> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/GroovyUtil.java Mon Nov 16 19:02:25 2015 >> @@ -50,7 +50,7 @@ public class GroovyUtil { >> private static final GroovyClassLoader groovyScriptClassLoader; >> static { >> GroovyClassLoader groovyClassLoader = null; >> - String scriptBaseClass = UtilProperties.getPropertyValue("groovy.properties", "scriptBaseClass"); >> + String scriptBaseClass = UtilProperties.getPropertyValue("groovy", "scriptBaseClass"); >> if (!scriptBaseClass.isEmpty()) { >> CompilerConfiguration conf = new CompilerConfiguration(); >> conf.setScriptBaseClass(scriptBaseClass); >> >> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java (original) >> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java Mon Nov 16 19:02:25 2015 >> @@ -62,7 +62,7 @@ public class MultiTrustManager implement >> if (isTrusted(certs)) { >> return; >> } >> - if (!"true".equals(UtilProperties.getPropertyValue("certificate.properties", "client.all-trusted", "true"))) { >> + if (!"true".equals(UtilProperties.getPropertyValue("certificate", "client.all-trusted", "true"))) { >> throw new CertificateException("No trusted certificate found"); >> } >> } >> @@ -71,7 +71,7 @@ public class MultiTrustManager implement >> if (isTrusted(certs)) { >> return; >> } >> - if (!"true".equals(UtilProperties.getPropertyValue("certificate.properties", "server.all-trusted", "true"))) { >> + if (!"true".equals(UtilProperties.getPropertyValue("certificate", "server.all-trusted", "true"))) { >> throw new CertificateException("No trusted certificate found"); >> } >> } >> >> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/SSLUtil.java >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/SSLUtil.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/SSLUtil.java (original) >> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/SSLUtil.java Mon Nov 16 19:02:25 2015 >> @@ -255,10 +255,10 @@ public class SSLUtil { >> >> public static synchronized void loadJsseProperties(boolean debug) { >> if (!loadedProps) { >> - String protocol = UtilProperties.getPropertyValue("jsse.properties", "java.protocol.handler.pkgs", "NONE"); >> - String proxyHost = UtilProperties.getPropertyValue("jsse.properties", "https.proxyHost", "NONE"); >> - String proxyPort = UtilProperties.getPropertyValue("jsse.properties", "https.proxyPort", "NONE"); >> - String cypher = UtilProperties.getPropertyValue("jsse.properties", "https.cipherSuites", "NONE"); >> + String protocol = UtilProperties.getPropertyValue("jsse", "java.protocol.handler.pkgs", "NONE"); >> + String proxyHost = UtilProperties.getPropertyValue("jsse", "https.proxyHost", "NONE"); >> + String proxyPort = UtilProperties.getPropertyValue("jsse", "https.proxyPort", "NONE"); >> + String cypher = UtilProperties.getPropertyValue("jsse", "https.cipherSuites", "NONE"); >> if (protocol != null && !protocol.equals("NONE")) { >> System.setProperty("java.protocol.handler.pkgs", protocol); >> } >> >> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java (original) >> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java Mon Nov 16 19:02:25 2015 >> @@ -43,7 +43,7 @@ public class UtilFormatOut { >> >> // ------------------- price format handlers ------------------- >> // FIXME: This is not thread-safe! DecimalFormat is not synchronized. >> - static DecimalFormat priceDecimalFormat = new DecimalFormat(UtilProperties.getPropertyValue("general.properties", "currency.decimal.format", >> "#,##0.00")); >> + static DecimalFormat priceDecimalFormat = new DecimalFormat(UtilProperties.getPropertyValue("general", "currency.decimal.format", "#,##0.00")); >> >> /** Formats a Double representing a price into a string >> * @param price The price Double to be formatted >> >> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java (original) >> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java Mon Nov 16 19:02:25 2015 >> @@ -1010,7 +1010,7 @@ public class UtilXml { >> public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException { >> //Debug.logInfo("resolving XML entity with publicId [" + publicId + "], systemId [" + systemId + "]", module); >> hasDTD = false; >> - String dtd = UtilProperties.getSplitPropertyValue(UtilURL.fromResource("localdtds.properties"), publicId); >> + String dtd = UtilProperties.getSplitPropertyValue(UtilURL.fromResource("localdtds"), publicId); >> if (UtilValidate.isNotEmpty(dtd)) { >> if (Debug.verboseOn()) Debug.logVerbose("[UtilXml.LocalResolver.resolveEntity] resolving DTD with publicId [" + publicId + >> "], systemId [" + systemId + "] and the dtd file is [" + dtd + "]", module); >> >> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java (original) >> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java Mon Nov 16 19:02:25 2015 >> @@ -114,7 +114,7 @@ public class FreeMarkerWorker { >> ClassLoader loader = Thread.currentThread().getContextClassLoader(); >> Enumeration<URL> resources; >> try { >> - resources = loader.getResources("freemarkerTransforms.properties"); >> + resources = loader.getResources("freemarkerTransforms"); >> } catch (IOException e) { >> Debug.logError(e, "Could not load list of freemarkerTransforms.properties", module); >> throw UtilMisc.initCause(new InternalError(e.getMessage()), e); >> >> Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java (original) >> +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java Mon Nov 16 19:02:25 2015 >> @@ -402,7 +402,7 @@ public class CommonEvents { >> final int fontSize = Integer.parseInt(captchaSizeConfigs[0]); >> final int height = Integer.parseInt(captchaSizeConfigs[1]); >> final int width = Integer.parseInt(captchaSizeConfigs[2]); >> - final int charsToPrint = UtilProperties.getPropertyAsInteger("captcha.properties", "captcha.code_length", 6); >> + final int charsToPrint = UtilProperties.getPropertyAsInteger("captcha", "captcha.code_length", 6); >> final char[] availableChars = EntityUtilProperties.getPropertyValue("captcha", "captcha.characters", delegator).toCharArray(); >> >> //It is possible to pass the font size, image width and height with the request as well >> >> Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java (original) >> +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java Mon Nov 16 19:02:25 2015 >> @@ -708,7 +708,7 @@ public class LoginServices { >> List<String> errorMessageList = new LinkedList<String>(); >> Locale locale = (Locale) context.get("locale"); >> >> - //boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security.properties", "password.encrypt")); >> + //boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security", "password.encrypt")); >> >> String userLoginId = (String) context.get("userLoginId"); >> String errMsg = null; >> >> Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/qrcode/QRCodeServices.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/qrcode/QRCodeServices.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/common/src/org/ofbiz/common/qrcode/QRCodeServices.java (original) >> +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/qrcode/QRCodeServices.java Mon Nov 16 19:02:25 2015 >> @@ -62,15 +62,15 @@ public class QRCodeServices { >> >> public static final String module = QRCodeServices.class.getName(); >> >> - public static final String QRCODE_DEFAULT_WIDTH = UtilProperties.getPropertyValue("qrcode.properties", "qrcode.default.width", "200"); >> + public static final String QRCODE_DEFAULT_WIDTH = UtilProperties.getPropertyValue("qrcode", "qrcode.default.width", "200"); >> >> - public static final String QRCODE_DEFAULT_HEIGHT = UtilProperties.getPropertyValue("qrcode.properties", "qrcode.default.height", "200"); >> + public static final String QRCODE_DEFAULT_HEIGHT = UtilProperties.getPropertyValue("qrcode", "qrcode.default.height", "200"); >> >> - public static final String QRCODE_DEFAULT_FORMAT = UtilProperties.getPropertyValue("qrcode.properties", "qrcode.default.format", "jpg"); >> + public static final String QRCODE_DEFAULT_FORMAT = UtilProperties.getPropertyValue("qrcode", "qrcode.default.format", "jpg"); >> >> - public static final String QRCODE_FORMAT_SUPPORTED = UtilProperties.getPropertyValue("qrcode.properties", "qrcode.format.supported", >> "jpg|png|bmp"); >> + public static final String QRCODE_FORMAT_SUPPORTED = UtilProperties.getPropertyValue("qrcode", "qrcode.format.supported", "jpg|png|bmp"); >> >> - public static final String QRCODE_DEFAULT_LOGOIMAGE = UtilProperties.getPropertyValue("qrcode.properties", "qrcode.default.logoimage"); >> + public static final String QRCODE_DEFAULT_LOGOIMAGE = UtilProperties.getPropertyValue("qrcode", "qrcode.default.logoimage"); >> >> public static BufferedImage defaultLogoImage; >> >> >> Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/config/model/EntityConfig.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/config/model/EntityConfig.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/config/model/EntityConfig.java (original) >> +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/config/model/EntityConfig.java Mon Nov 16 19:02:25 2015 >> @@ -359,7 +359,7 @@ public final class EntityConfig { >> throw new GenericEntityConfException("No jdbc-password or jdbc-password-lookup specified for inline-jdbc element, line: " + >> inlineJdbcElement.getLineNumber()); >> } >> String key = "jdbc-password.".concat(jdbcPasswordLookup); >> - jdbcPassword = UtilProperties.getPropertyValue("passwords.properties", key); >> + jdbcPassword = UtilProperties.getPropertyValue("passwords", key); >> if (jdbcPassword.isEmpty()) { >> throw new GenericEntityConfException("'" + key + "' property not found in passwords.properties file for inline-jdbc element, line: " >> + inlineJdbcElement.getLineNumber()); >> } >> >> Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java (original) >> +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java Mon Nov 16 19:02:25 2015 >> @@ -210,7 +210,7 @@ public class EntityDataLoader { >> for (ReadData readerInfo : datasourceInfo.getReadDataList()) { >> String readerName = readerInfo.getReaderName(); >> // ignore the "tenant" reader if the multitenant property is "N" >> - if ("tenant".equals(readerName) && "N".equals(UtilProperties.getPropertyValue("general.properties", "multitenant"))) { >> + if ("tenant".equals(readerName) && "N".equals(UtilProperties.getPropertyValue("general", "multitenant"))) { >> continue; >> } >> >> >> Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java (original) >> +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java Mon Nov 16 19:02:25 2015 >> @@ -525,6 +525,6 @@ public class EntityUtil { >> * property in <code>general.properties</code> to "Y".</p> >> */ >> public static boolean isMultiTenantEnabled() { >> - return "Y".equalsIgnoreCase(UtilProperties.getPropertyValue("general.properties", "multitenant")); >> + return "Y".equalsIgnoreCase(UtilProperties.getPropertyValue("general", "multitenant")); >> } >> } >> >> Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangUtil.java >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangUtil.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangUtil.java (original) >> +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangUtil.java Mon Nov 16 19:02:25 2015 >> @@ -92,7 +92,7 @@ public final class MiniLangUtil { >> * auto-correct version changes >> */ >> public static boolean autoCorrectOn() { >> - return "true".equals(UtilProperties.getPropertyValue("minilang.properties", "autocorrect")); >> + return "true".equals(UtilProperties.getPropertyValue("minilang", "autocorrect")); >> } >> >> /** >> >> Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangValidate.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangValidate.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangValidate.java (original) >> +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangValidate.java Mon Nov 16 19:02:25 2015 >> @@ -192,7 +192,7 @@ public final class MiniLangValidate { >> * @return <code>true</code> if <code>validation.level=lenient</code> >> */ >> public static boolean lenientOn() { >> - return "lenient".equals(UtilProperties.getPropertyValue("minilang.properties", "validation.level")); >> + return "lenient".equals(UtilProperties.getPropertyValue("minilang", "validation.level")); >> } >> >> /** >> @@ -345,7 +345,7 @@ public final class MiniLangValidate { >> * @return <code>true</code> if <code>validation.level=strict</code> >> */ >> public static boolean strictOn() { >> - return "strict".equals(UtilProperties.getPropertyValue("minilang.properties", "validation.level")); >> + return "strict".equals(UtilProperties.getPropertyValue("minilang", "validation.level")); >> } >> >> /** >> @@ -354,7 +354,7 @@ public final class MiniLangValidate { >> * @return <code>true</code> if <code>validation.level</code> is set to lenient or strict >> */ >> public static boolean validationOn() { >> - return !"none".equals(UtilProperties.getPropertyValue("minilang.properties", "validation.level")); >> + return !"none".equals(UtilProperties.getPropertyValue("minilang", "validation.level")); >> } >> >> private MiniLangValidate() {} >> >> Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/test/MiniLangTests.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/test/MiniLangTests.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/test/MiniLangTests.java (original) >> +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/test/MiniLangTests.java Mon Nov 16 19:02:25 2015 >> @@ -39,7 +39,7 @@ public class MiniLangTests extends OFBiz >> >> public MiniLangTests(String name) { >> super(name); >> - traceEnabled = "true".equals(UtilProperties.getPropertyValue("minilang.properties", "unit.tests.trace.enabled")); >> + traceEnabled = "true".equals(UtilProperties.getPropertyValue("minilang", "unit.tests.trace.enabled")); >> } >> >> private Map<String, Object> createContext() { >> >> Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java (original) >> +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java Mon Nov 16 19:02:25 2015 >> @@ -69,7 +69,7 @@ import com.ibm.icu.util.Calendar; >> public final class JobManager { >> >> public static final String module = JobManager.class.getName(); >> - public static final String instanceId = UtilProperties.getPropertyValue("general.properties", "unique.instanceId", "ofbiz0"); >> + public static final String instanceId = UtilProperties.getPropertyValue("general", "unique.instanceId", "ofbiz0"); >> private static final ConcurrentHashMap<String, JobManager> registeredManagers = new ConcurrentHashMap<String, JobManager>(); >> private static boolean isShutDown = false; >> >> >> Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java (original) >> +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java Mon Nov 16 19:02:25 2015 >> @@ -70,7 +70,7 @@ import org.ofbiz.webapp.website.WebSiteW >> public class RequestHandler { >> >> public static final String module = RequestHandler.class.getName(); >> - private final String defaultStatusCodeString = UtilProperties.getPropertyValue("requestHandler.properties", "status-code", "302"); >> + private final String defaultStatusCodeString = UtilProperties.getPropertyValue("requestHandler", "status-code", "302"); >> private final ViewFactory viewFactory; >> private final EventFactory eventFactory; >> private final URL controllerConfigURL; >> >> Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java (original) >> +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java Mon Nov 16 19:02:25 2015 >> @@ -63,33 +63,33 @@ public class ApacheFopWorker { >> >> public static final int encryptionLengthBitsDefault = 128; >> >> - public static final String encryptionLengthDefault = UtilProperties.getPropertyValue("fop.properties", "fop.encryption-length.default", >> String.valueOf(encryptionLengthBitsDefault)); >> + public static final String encryptionLengthDefault = UtilProperties.getPropertyValue("fop", "fop.encryption-length.default", >> String.valueOf(encryptionLengthBitsDefault)); >> >> - public static final String userPasswordDefault = UtilProperties.getPropertyValue("fop.properties", "fop.userPassword.default"); >> + public static final String userPasswordDefault = UtilProperties.getPropertyValue("fop", "fop.userPassword.default"); >> >> - public static final String ownerPasswordDefault = UtilProperties.getPropertyValue("fop.properties", "fop.ownerPassword.default"); >> + public static final String ownerPasswordDefault = UtilProperties.getPropertyValue("fop", "fop.ownerPassword.default"); >> >> - public static final String allowPrintDefault = UtilProperties.getPropertyValue("fop.properties", "fop.allowPrint.default", "true"); >> + public static final String allowPrintDefault = UtilProperties.getPropertyValue("fop", "fop.allowPrint.default", "true"); >> >> - public static final String allowCopyContentDefault = UtilProperties.getPropertyValue("fop.properties", "fop.allowCopyContent.default", "true"); >> + public static final String allowCopyContentDefault = UtilProperties.getPropertyValue("fop", "fop.allowCopyContent.default", "true"); >> >> - public static final String allowEditContentDefault = UtilProperties.getPropertyValue("fop.properties", "fop.allowEditContent.default", "true"); >> + public static final String allowEditContentDefault = UtilProperties.getPropertyValue("fop", "fop.allowEditContent.default", "true"); >> >> - public static final String allowEditAnnotationsDefault = UtilProperties.getPropertyValue("fop.properties", "fop.allowEditAnnotations.default", >> "true"); >> + public static final String allowEditAnnotationsDefault = UtilProperties.getPropertyValue("fop", "fop.allowEditAnnotations.default", "true"); >> >> - public static final String allowFillInFormsDefault = UtilProperties.getPropertyValue("fop.properties", "fop.allowFillInForms.default", "true"); >> + public static final String allowFillInFormsDefault = UtilProperties.getPropertyValue("fop", "fop.allowFillInForms.default", "true"); >> >> - public static final String allowAccessContentDefault = UtilProperties.getPropertyValue("fop.properties", "fop.allowAccessContent.default", >> "true"); >> + public static final String allowAccessContentDefault = UtilProperties.getPropertyValue("fop", "fop.allowAccessContent.default", "true"); >> >> - public static final String allowAssembleDocumentDefault = UtilProperties.getPropertyValue("fop.properties", >> "fop.allowAssembleDocument.default", "true"); >> + public static final String allowAssembleDocumentDefault = UtilProperties.getPropertyValue("fop", "fop.allowAssembleDocument.default", "true"); >> >> - public static final String allowPrintHqDefault = UtilProperties.getPropertyValue("fop.properties", "fop.allowPrintHq.default", "true"); >> + public static final String allowPrintHqDefault = UtilProperties.getPropertyValue("fop", "fop.allowPrintHq.default", "true"); >> >> - public static final String encryptMetadataDefault = UtilProperties.getPropertyValue("fop.properties", "fop.encrypt-metadata.default", "true"); >> + public static final String encryptMetadataDefault = UtilProperties.getPropertyValue("fop", "fop.encrypt-metadata.default", "true"); >> >> - public static final String fopPath = UtilProperties.getPropertyValue("fop.properties", "fop.path", "/framework/webapp/config"); >> + public static final String fopPath = UtilProperties.getPropertyValue("fop", "fop.path", "/framework/webapp/config"); >> >> - public static final String fopFontBaseProperty = UtilProperties.getPropertyValue("fop.properties", "fop.font.base.url", >> "/framework/webapp/config/"); >> + public static final String fopFontBaseProperty = UtilProperties.getPropertyValue("fop", "fop.font.base.url", "/framework/webapp/config/"); >> >> >> /** Returns an instance of the FopFactory class. FOP documentation recommends >> >> Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavUtil.java >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavUtil.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavUtil.java (original) >> +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavUtil.java Mon Nov 16 19:02:25 2015 >> @@ -94,10 +94,10 @@ public class WebDavUtil { >> return null; >> } >> } >> - if ("true".equalsIgnoreCase(UtilProperties.getPropertyValue("security.properties", "username.lowercase"))) { >> + if ("true".equalsIgnoreCase(UtilProperties.getPropertyValue("security", "username.lowercase"))) { >> username = username.toLowerCase(); >> } >> - if ("true".equalsIgnoreCase(UtilProperties.getPropertyValue("security.properties", "password.lowercase"))) { >> + if ("true".equalsIgnoreCase(UtilProperties.getPropertyValue("security", "password.lowercase"))) { >> password = password.toLowerCase(); >> } >> Map<String, Object> result = new HashMap<String, Object>(); >> >> Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelForm.java >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelForm.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelForm.java (original) >> +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelForm.java Mon Nov 16 19:02:25 2015 >> @@ -204,7 +204,7 @@ public abstract class ModelForm extends >> if (parentModel != null) { >> defaultViewSizeInt = parentModel.defaultViewSize; >> } else { >> - defaultViewSizeInt = UtilProperties.getPropertyAsInteger("widget.properties", "widget.form.defaultViewSize", >> + defaultViewSizeInt = UtilProperties.getPropertyAsInteger("widget", "widget.form.defaultViewSize", >> defaultViewSizeInt); >> } >> } else { >> >> Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoScreenRenderer.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoScreenRenderer.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoScreenRenderer.java (original) >> +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoScreenRenderer.java Mon Nov 16 19:02:25 2015 >> @@ -43,7 +43,7 @@ public class FoScreenRenderer extends Ht >> >> // This is a util method to get the style from a property file >> public static String getFoStyle(String styleName) { >> - String value = UtilProperties.getPropertyValue("fo-styles.properties", styleName); >> + String value = UtilProperties.getPropertyValue("fo-styles", styleName); >> if (value.equals(styleName)) { >> return ""; >> } >> >> Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlFormRenderer.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlFormRenderer.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlFormRenderer.java (original) >> +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlFormRenderer.java Mon Nov 16 19:02:25 2015 >> @@ -1102,7 +1102,7 @@ public class HtmlFormRenderer extends Ht >> >> if (UtilValidate.isNotEmpty(titleText)) { >> // copied from MacroFormRenderer renderFieldTitle >> - String displayHelpText = UtilProperties.getPropertyValue("widget.properties", "widget.form.displayhelpText"); >> + String displayHelpText = UtilProperties.getPropertyValue("widget", "widget.form.displayhelpText"); >> String helpText = null; >> if ("Y".equals(displayHelpText)) { >> Delegator delegator = WidgetWorker.getDelegator(context); >> >> Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java (original) >> +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java Mon Nov 16 19:02:25 2015 >> @@ -1305,7 +1305,7 @@ public final class MacroFormRenderer imp >> sr.append("<@renderFieldTitle "); >> sr.append(" style=\""); >> sr.append(style); >> - String displayHelpText = UtilProperties.getPropertyValue("widget.properties", "widget.form.displayhelpText"); >> + String displayHelpText = UtilProperties.getPropertyValue("widget", "widget.form.displayhelpText"); >> if ("Y".equals(displayHelpText)) { >> Delegator delegator = WidgetWorker.getDelegator(context); >> Locale locale = (Locale) context.get("locale"); >> @@ -3088,12 +3088,12 @@ public final class MacroFormRenderer imp >> String uniqueItemName = "Modal_".concat(UUID.randomUUID().toString()); >> String width = (String) this.request.getAttribute("width"); >> if (UtilValidate.isEmpty(width)) { >> - width = String.valueOf(UtilProperties.getPropertyValue("widget.properties", "widget.link.default.layered-modal.width", "800")); >> + width = String.valueOf(UtilProperties.getPropertyValue("widget", "widget.link.default.layered-modal.width", "800")); >> this.request.setAttribute("width", width); >> } >> String height = (String) this.request.getAttribute("height"); >> if (UtilValidate.isEmpty(height)) { >> - height = String.valueOf(UtilProperties.getPropertyValue("widget.properties", "widget.link.default.layered-modal.height", "600")); >> + height = String.valueOf(UtilProperties.getPropertyValue("widget", "widget.link.default.layered-modal.height", "600")); >> this.request.setAttribute("height", height); >> } >> this.request.setAttribute("uniqueItemName", uniqueItemName); >> >> Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenRenderer.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenRenderer.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenRenderer.java (original) >> +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenRenderer.java Mon Nov 16 19:02:25 2015 >> @@ -235,11 +235,11 @@ public class MacroScreenRenderer impleme >> StringBuilder parameters = new StringBuilder(); >> String width = link.getWidth(); >> if (UtilValidate.isEmpty(width)) { >> - width = String.valueOf(UtilProperties.getPropertyValue("widget.properties", "widget.link.default.layered-modal.width", "800")); >> + width = String.valueOf(UtilProperties.getPropertyValue("widget", "widget.link.default.layered-modal.width", "800")); >> } >> String height = link.getHeight(); >> if (UtilValidate.isEmpty(height)) { >> - height = String.valueOf(UtilProperties.getPropertyValue("widget.properties", "widget.link.default.layered-modal.height", "600")); >> + height = String.valueOf(UtilProperties.getPropertyValue("widget", "widget.link.default.layered-modal.height", "600")); >> } >> if ("hidden-form".equals(linkType) || "layered-modal".equals(linkType)) { >> StringBuilder sb = new StringBuilder(); >> >> Modified: ofbiz/trunk/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/janrain/JanrainHelper.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/janrain/JanrainHelper.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/janrain/JanrainHelper.java (original) >> +++ ofbiz/trunk/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/janrain/JanrainHelper.java Mon Nov 16 19:02:25 2015 >> @@ -62,8 +62,8 @@ import org.xml.sax.SAXException; >> public class JanrainHelper { >> >> public static final String module = JanrainHelper.class.getName(); >> - private static String apiKey = UtilProperties.getPropertyValue("ecommerce.properties", "janrain.apiKey"); >> - private static String baseUrl = UtilProperties.getPropertyValue("ecommerce.properties", "janrain.baseUrl"); >> + private static String apiKey = UtilProperties.getPropertyValue("ecommerce", "janrain.apiKey"); >> + private static String baseUrl = UtilProperties.getPropertyValue("ecommerce", "janrain.baseUrl"); >> public JanrainHelper(String apiKey, String baseUrl) { >> while (baseUrl.endsWith("/")) >> baseUrl = baseUrl.substring(0, baseUrl.length() - 1); >> >> Modified: ofbiz/trunk/specialpurpose/passport/src/org/ofbiz/passport/event/GitHubEvents.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/passport/src/org/ofbiz/passport/event/GitHubEvents.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/specialpurpose/passport/src/org/ofbiz/passport/event/GitHubEvents.java (original) >> +++ ofbiz/trunk/specialpurpose/passport/src/org/ofbiz/passport/event/GitHubEvents.java Mon Nov 16 19:02:25 2015 >> @@ -286,7 +286,7 @@ public class GitHubEvents { >> userLogin = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId", userLoginId), false); >> } >> String password = PassportUtil.randomString(); >> - boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security.properties", "password.encrypt")); >> + boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security", "password.encrypt")); >> userLogin.set("currentPassword", useEncryption ? HashCrypt.digestHash(LoginServices.getHashType(), null, password) : password); >> userLogin.store(); >> request.setAttribute("USERNAME", userLogin.getString("userLoginId")); >> >> Modified: ofbiz/trunk/specialpurpose/passport/src/org/ofbiz/passport/event/LinkedInEvents.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/passport/src/org/ofbiz/passport/event/LinkedInEvents.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/specialpurpose/passport/src/org/ofbiz/passport/event/LinkedInEvents.java (original) >> +++ ofbiz/trunk/specialpurpose/passport/src/org/ofbiz/passport/event/LinkedInEvents.java Mon Nov 16 19:02:25 2015 >> @@ -290,7 +290,7 @@ public class LinkedInEvents { >> userLogin = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId", userLoginId), false); >> } >> String password = PassportUtil.randomString(); >> - boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security.properties", "password.encrypt")); >> + boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security", "password.encrypt")); >> userLogin.set("currentPassword", useEncryption ? HashCrypt.digestHash(LoginServices.getHashType(), null, password) : password); >> userLogin.store(); >> request.setAttribute("USERNAME", userLogin.getString("userLoginId")); >> >> Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiSession.java >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiSession.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiSession.java (original) >> +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiSession.java Mon Nov 16 19:02:25 2015 >> @@ -46,7 +46,7 @@ public class XuiSession { >> protected XuiContainer container = null; >> protected Map<String, Object> attributes = new HashMap<String, Object>(); >> protected String id = null; >> - protected final boolean IS_SAME_LOGIN = UtilProperties.propertyValueEqualsIgnoreCase("xui.properties", "isSameLogin", "true"); >> + protected final boolean IS_SAME_LOGIN = UtilProperties.propertyValueEqualsIgnoreCase("xui", "isSameLogin", "true"); >> private Locale locale = Locale.getDefault(); >> >> public XuiSession(String id, Delegator delegator, LocalDispatcher dispatcher, XuiContainer container) { >> >> Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original) >> +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Mon Nov 16 19:02:25 2015 >> @@ -1940,7 +1940,7 @@ public class PosTransaction implements S >> try { >> >> passwordAcceptEncryptedAndPlain = EntityUtilProperties.getPropertyValue("security", "password.accept.encrypted.and.plain", delegator); >> - UtilProperties.setPropertyValueInMemory("security.properties", "password.accept.encrypted.and.plain", "true"); >> + UtilProperties.setPropertyValueInMemory("security", "password.accept.encrypted.and.plain", "true"); >> svcRes = dispatcher.runSync("updatePassword", >> UtilMisc.toMap("userLogin", userLogin, >> "userLoginId", userLogin.getString("userLoginId"), >> @@ -1950,11 +1950,11 @@ public class PosTransaction implements S >> } catch (GenericServiceException e) { >> Debug.logError(e, "Error calling updatePassword service", module); >> pos.showDialog("dialog/error/exception", e.getMessage()); >> - UtilProperties.setPropertyValueInMemory("security.properties", "password.accept.encrypted.and.plain", passwordAcceptEncryptedAndPlain); >> + UtilProperties.setPropertyValueInMemory("security", "password.accept.encrypted.and.plain", passwordAcceptEncryptedAndPlain); >> return null; >> } finally { >> // Put back passwordAcceptEncryptedAndPlain value in memory >> - UtilProperties.setPropertyValueInMemory("security.properties", "password.accept.encrypted.and.plain", passwordAcceptEncryptedAndPlain); >> + UtilProperties.setPropertyValueInMemory("security", "password.accept.encrypted.and.plain", passwordAcceptEncryptedAndPlain); >> } >> if (ServiceUtil.isError(svcRes)) { >> pos.showDialog("dialog/error/exception", ServiceUtil.getErrorMessage(svcRes)); >> >> Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java (original) >> +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java Mon Nov 16 19:02:25 2015 >> @@ -116,8 +116,8 @@ public class KeyboardAdaptor { >> >> private class KeyboardListener extends Thread { >> >> - public final Long MAX_WAIT_SCANNER = new Long(Long.parseLong(UtilProperties.getPropertyValue("jpos.properties", "MaxWaitScanner", "100"))); >> - public final Long MAX_WAIT_KEYBOARD = new Long(Long.parseLong(UtilProperties.getPropertyValue("jpos.properties", "MaxWaitKeyboard", "10"))); >> + public final Long MAX_WAIT_SCANNER = new Long(Long.parseLong(UtilProperties.getPropertyValue("jpos", "MaxWaitScanner", "100"))); >> + public final Long MAX_WAIT_KEYBOARD = new Long(Long.parseLong(UtilProperties.getPropertyValue("jpos", "MaxWaitKeyboard", "10"))); >> // By default keyboard entry (login & password 1st) >> public Long MAX_WAIT = MAX_WAIT_KEYBOARD; >> >> >> Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Scanner.java >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Scanner.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Scanner.java (original) >> +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Scanner.java Mon Nov 16 19:02:25 2015 >> @@ -34,7 +34,7 @@ public class Scanner extends GenericDevi >> >> protected String deviceName = null; >> protected int timeout = -1; >> - private static final boolean MULTI_BARCODES_ALLOWED = UtilProperties.propertyValueEqualsIgnoreCase("jpos.properties", "MultiBarCodesAllowed", >> "Y"); >> + private static final boolean MULTI_BARCODES_ALLOWED = UtilProperties.propertyValueEqualsIgnoreCase("jpos", "MultiBarCodesAllowed", "Y"); >> >> public Scanner(String deviceName, int timeout) { >> super(deviceName, timeout); >> >> Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java (original) >> +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java Mon Nov 16 19:02:25 2015 >> @@ -380,11 +380,11 @@ public class ManagerEvents { >> pos.showDialog("dialog/error/mgrnotloggedin"); >> } else { >> String showKeyboardInSaveSale = null; >> - showKeyboardInSaveSale = UtilProperties.getPropertyValue("parameters.properties", "ShowKeyboardInSaveSale"); >> + showKeyboardInSaveSale = UtilProperties.getPropertyValue("parameters", "ShowKeyboardInSaveSale"); >> if ("N".equalsIgnoreCase(showKeyboardInSaveSale)) { >> - UtilProperties.setPropertyValueInMemory("parameters.properties", "ShowKeyboardInSaveSale", "Y"); >> + UtilProperties.setPropertyValueInMemory("parameters", "ShowKeyboardInSaveSale", "Y"); >> } else { >> - UtilProperties.setPropertyValueInMemory("parameters.properties", "ShowKeyboardInSaveSale", "N"); >> + UtilProperties.setPropertyValueInMemory("parameters", "ShowKeyboardInSaveSale", "N"); >> } >> } >> } >> >> Modified: ofbiz/trunk/specialpurpose/solr/src/org/ofbiz/solr/SolrUtil.java >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/src/org/ofbiz/solr/SolrUtil.java?rev=1714652&r1=1714651&r2=1714652&view=diff >> ============================================================================== >> --- ofbiz/trunk/specialpurpose/solr/src/org/ofbiz/solr/SolrUtil.java (original) >> +++ ofbiz/trunk/specialpurpose/solr/src/org/ofbiz/solr/SolrUtil.java Mon Nov 16 19:02:25 2015 >> @@ -60,7 +60,7 @@ public abstract class SolrUtil { >> solrPort = solrWebappPortOverride; >> } >> else { >> - solrPort = UtilProperties.getPropertyValue("url.properties", ("https".equals(solrWebappProtocol) ? "port.https" : "port.http")); >> + solrPort = UtilProperties.getPropertyValue("url", ("https".equals(solrWebappProtocol) ? "port.https" : "port.http")); >> } >> >> return solrWebappProtocol + "://" + solrWebappDomainName + ":" + solrPort + solrWebappPath; >> >> > |
Free forum by Nabble | Edit this page |