svn commit: r609173 - in /ofbiz/trunk: applications/ecommerce/script/org/ofbiz/ecommerce/customer/ applications/party/script/org/ofbiz/party/customer/ applications/party/script/org/ofbiz/party/user/ framework/base/src/base/org/ofbiz/base/util/

[adrianc]

Author: adrianc
Date: Sat Jan  5 08:44:09 2008
New Revision: 609173

URL: http://svn.apache.org/viewvc?rev=609173&view=rev
Log:
Properties file resolver fix.

Modified:
    ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
    ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
    ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml
    ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml
    ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/UtilProperties.java

Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=609173&r1=609172&r2=609173&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original)
+++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Sat Jan  5 08:44:09 2008
@@ -35,8 +35,8 @@
             <set field="defaultPassword" value="ungssblepswd"/>
         </if-empty>
 
-        <property-to-field resource="security.properties" property="username.lowercase" default="false" field-name="username_lowercase"/>
-        <property-to-field resource="security.properties" property="password.lowercase" default="false" field-name="password_lowercase"/>
+        <property-to-field resource="security" property="username.lowercase" default="false" field-name="username_lowercase"/>
+        <property-to-field resource="security" property="password.lowercase" default="false" field-name="password_lowercase"/>
 
         <now-timestamp-to-env env-name="nowStamp"/>
         <set value="CUSTOMER" field="parameters.roleTypeId"/>

Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml?rev=609173&r1=609172&r2=609173&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml (original)
+++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml Sat Jan  5 08:44:09 2008
@@ -26,8 +26,8 @@
     <!-- =========================================== -->
     
     <simple-method method-name="validateUserInfo" short-description="Validate User Information" login-required="false">
-        <property-to-field resource="security.properties" property="username.lowercase" default="false" field-name="username_lowercase"/>
-        <property-to-field resource="security.properties" property="password.lowercase" default="false" field-name="password_lowercase"/>
+        <property-to-field resource="security" property="username.lowercase" default="false" field-name="username_lowercase"/>
+        <property-to-field resource="security" property="password.lowercase" default="false" field-name="password_lowercase"/>
         <set field="default_user_password" value="ungssblepsswd" />
         <now-timestamp-to-env env-name="nowStamp"/>
 
@@ -345,7 +345,7 @@
         <if-not-empty field-name="newUserLogin">
             <!-- If password encryption is enabled, encrpyt it now -->
             <call-bsh><![CDATA[
-                boolean useEncryption = "true".equals(org.ofbiz.base.util.UtilProperties.getPropertyValue("security.properties", "password.encrypt"));
+                boolean useEncryption = "true".equals(org.ofbiz.base.util.UtilProperties.getPropertyValue("security", "password.encrypt"));
                 if (useEncryption) { newUserLogin.set("currentPassword", org.ofbiz.base.crypto.HashCrypt.getDigestHash((String) newUserLogin.get("currentPassword"))); }
             ]]></call-bsh>
             <!-- create the UserLogin manually to get around ordering and security constraints in the service -->

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml?rev=609173&r1=609172&r2=609173&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml Sat Jan  5 08:44:09 2008
@@ -26,8 +26,8 @@
         <set field="create_allow_password" value="false" />
         <set field="default_customer_password" value="ungssblepsswd" />
 
-        <property-to-field resource="security.properties" property="username.lowercase" default="false" field-name="username_lowercase"/>
-        <property-to-field resource="security.properties" property="password.lowercase" default="false" field-name="password_lowercase"/>
+        <property-to-field resource="security" property="username.lowercase" default="false" field-name="username_lowercase"/>
+        <property-to-field resource="security" property="password.lowercase" default="false" field-name="password_lowercase"/>
 
         <now-timestamp-to-env env-name="nowStamp"/>
         <set field="parameters.roleTypeId" value="CUSTOMER" />

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml?rev=609173&r1=609172&r2=609173&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml Sat Jan  5 08:44:09 2008
@@ -35,8 +35,8 @@
         <set field="require_login" value="false" />
         <set field="create_allow_password" value="true" />
 
-        <property-to-field resource="security.properties" property="username.lowercase" default="false" field-name="username_lowercase"/>
-        <property-to-field resource="security.properties" property="password.lowercase" default="false" field-name="password_lowercase"/>
+        <property-to-field resource="security" property="username.lowercase" default="false" field-name="username_lowercase"/>
+        <property-to-field resource="security" property="password.lowercase" default="false" field-name="password_lowercase"/>
 
         <now-timestamp-to-env env-name="nowStamp"/>
         <set field="parameters.roleTypeId" value="PROSPECT" />
@@ -49,8 +49,8 @@
         <set field="require_login" value="true" />
         <set field="create_allow_password" value="true" />
 
-        <property-to-field resource="security.properties" property="username.lowercase" default="false" field-name="username_lowercase"/>
-        <property-to-field resource="security.properties" property="password.lowercase" default="false" field-name="password_lowercase"/>
+        <property-to-field resource="security" property="username.lowercase" default="false" field-name="username_lowercase"/>
+        <property-to-field resource="security" property="password.lowercase" default="false" field-name="password_lowercase"/>
 
         <now-timestamp-to-env env-name="nowStamp"/>
         <set field="parameters.roleTypeId" value="EMPLOYEE" />
@@ -58,8 +58,8 @@
     </simple-method>
 
     <simple-method method-name="createUser" short-description="Create User" login-required="false">
-        <property-to-field resource="security.properties" property="username.lowercase" default="false" field-name="username_lowercase"/>
-        <property-to-field resource="security.properties" property="password.lowercase" default="false" field-name="password_lowercase"/>
+        <property-to-field resource="security" property="username.lowercase" default="false" field-name="username_lowercase"/>
+        <property-to-field resource="security" property="password.lowercase" default="false" field-name="password_lowercase"/>
         <set field="default_user_password" value="ungssblepsswd" />
         <now-timestamp-to-env env-name="nowStamp"/>
 
@@ -311,7 +311,7 @@
         <if-not-empty field-name="newUserLogin">
             <!-- If password encryption is enabled, encrpyt it now -->
             <call-bsh><![CDATA[
-                boolean useEncryption = "true".equals(org.ofbiz.base.util.UtilProperties.getPropertyValue("security.properties", "password.encrypt"));
+                boolean useEncryption = "true".equals(org.ofbiz.base.util.UtilProperties.getPropertyValue("security", "password.encrypt"));
                 if (useEncryption) { newUserLogin.set("currentPassword", org.ofbiz.base.crypto.HashCrypt.getDigestHash((String) newUserLogin.get("currentPassword"))); }
             ]]></call-bsh>
 

Modified: ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/UtilProperties.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/UtilProperties.java?rev=609173&r1=609172&r2=609173&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/UtilProperties.java (original)
+++ ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/UtilProperties.java Sat Jan  5 08:44:09 2008
@@ -703,13 +703,13 @@
                     return url;
                 }
             }
-            // Check for XML properties file next
-            url = FlexibleLocation.resolveLocation(resourceName + ".xml");
+            // Check for *.properties file
+            url = FlexibleLocation.resolveLocation(resourceName + ".properties");
             if (url != null) {
                 return url;
             }
-            // Check for *.properties file
-            url = FlexibleLocation.resolveLocation(resourceName + ".properties");
+            // Check for XML properties file
+            url = FlexibleLocation.resolveLocation(resourceName + ".xml");
             if (url != null) {
                 return url;
             }