svn commit: r431023 - in /incubator/ofbiz/trunk: applications/ecommerce/script/org/ofbiz/ecommerce/customer/ applications/party/script/org/ofbiz/party/customer/ applications/party/script/org/ofbiz/party/user/ applications/securityext/servicedef/ applic...

[jonesde]

Author: jonesde
Date: Sat Aug 12 05:38:51 2006
New Revision: 431023

URL: http://svn.apache.org/viewvc?rev=431023&view=rev
Log:
Moved LoginServices to the common component because it is used by framework components, and doesn't depend on the application components

Added:
    incubator/ofbiz/trunk/framework/common/src/org/ofbiz/common/login/
    incubator/ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java
      - copied, changed from r431021, incubator/ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/login/LoginServices.java
Removed:
    incubator/ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/login/LoginServices.java
Modified:
    incubator/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
    incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml
    incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml
    incubator/ofbiz/trunk/applications/securityext/servicedef/services.xml
    incubator/ofbiz/trunk/framework/common/servicedef/services.xml

Modified: incubator/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=431023&r1=431022&r2=431023&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Sat Aug 12 05:38:51 2006
@@ -88,7 +88,7 @@
             String password = (String) userLoginContext.get("currentPassword");
             String confirmPassword = (String) userLoginContext.get("currentPasswordVerify");
             String passwordHint = (String) userLoginContext.get("passwordHint");
-            org.ofbiz.securityext.login.LoginServices.checkNewPassword(newUserLogin, null, password, confirmPassword, passwordHint, error_list, true, locale);
+            org.ofbiz.common.login.LoginServices.checkNewPassword(newUserLogin, null, password, confirmPassword, passwordHint, error_list, true, locale);
         ]]></call-bsh>
 
         <!-- Create the Person -->

Modified: incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml?rev=431023&r1=431022&r2=431023&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml (original)
+++ incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml Sat Aug 12 05:38:51 2006
@@ -77,7 +77,7 @@
             String password = (String) userLoginContext.get("currentPassword");
             String confirmPassword = (String) userLoginContext.get("currentPasswordVerify");
             String passwordHint = (String) userLoginContext.get("passwordHint");
-            org.ofbiz.securityext.login.LoginServices.checkNewPassword(newUserLogin, null, password, confirmPassword, passwordHint, error_list, true, locale);
+            org.ofbiz.common.login.LoginServices.checkNewPassword(newUserLogin, null, password, confirmPassword, passwordHint, error_list, true, locale);
         ]]></call-bsh>
 
         <!-- Create the Person -->

Modified: incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml?rev=431023&r1=431022&r2=431023&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml (original)
+++ incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml Sat Aug 12 05:38:51 2006
@@ -112,7 +112,7 @@
                 String password = (String) userLoginContext.get("currentPassword");
                 String confirmPassword = (String) userLoginContext.get("currentPasswordVerify");
                 String passwordHint = (String) userLoginContext.get("passwordHint");
-                org.ofbiz.securityext.login.LoginServices.checkNewPassword(newUserLogin, null, password, confirmPassword, passwordHint, error_list, true, locale);
+                org.ofbiz.common.login.LoginServices.checkNewPassword(newUserLogin, null, password, confirmPassword, passwordHint, error_list, true, locale);
             ]]></call-bsh>
         <else>
             <if-compare field-name="require_login" operator="equals" value="true">

Modified: incubator/ofbiz/trunk/applications/securityext/servicedef/services.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/securityext/servicedef/services.xml?rev=431023&r1=431022&r2=431023&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/securityext/servicedef/services.xml (original)
+++ incubator/ofbiz/trunk/applications/securityext/servicedef/services.xml Sat Aug 12 05:38:51 2006
@@ -22,49 +22,6 @@
     <vendor>OFBiz</vendor>
     <version>1.0</version>
     
-    <!-- UserLogin services -->
-    <service name="userLogin" engine="java" location="org.ofbiz.securityext.login.LoginServices" invoke="userLogin">
-        <description>Used to Automatically Authenticate a username/password; create a UserLogin object</description>
-        <attribute name="login.username" type="String" mode="IN"/>
-        <attribute name="login.password" type="String" mode="IN"/>
-        <attribute name="visitId" type="String" mode="IN" optional="true"/>
-        <attribute name="isServiceAuth" type="Boolean" mode="IN" optional="true"/>
-        <attribute name="userLogin" type="org.ofbiz.entity.GenericValue" mode="OUT"/>
-        <attribute name="userLoginSession" type="java.util.Map" mode="OUT" optional="true"/>
-    </service>
-    <service name="createUserLogin" engine="java" auth="false"
-            location="org.ofbiz.securityext.login.LoginServices" invoke="createUserLogin">
-        <description>Create a UserLogin</description>
-        <attribute name="userLoginId" type="String" mode="IN" optional="false"/>
-        <attribute name="currentPassword" type="String" mode="IN" optional="false"/>
-        <attribute name="currentPasswordVerify" type="String" mode="IN" optional="false"/>
-        <attribute name="passwordHint" type="String" mode="IN" optional="true"/>
-        <attribute name="partyId" type="String" mode="IN" optional="true"/>
-    </service>
-    <service name="updateUserLoginId" engine="java" location="org.ofbiz.securityext.login.LoginServices" invoke="updateUserLoginId" auth="true">
-        <description>Update a UserLoginId by creating a new one and expiring the old one</description>
-        <attribute name="userLoginId" type="String" mode="IN" optional="false"/>
-        <attribute name="newUserLogin" type="org.ofbiz.entity.GenericValue" mode="OUT" optional="false"/>
-    </service>
-    <service name="updatePassword" engine="java" default-entity-name="UserLogin"
-            location="org.ofbiz.securityext.login.LoginServices" invoke="updatePassword" auth="true">
-        <description>Update a UserLogin Password</description>
-        <attribute name="userLoginId" type="String" mode="IN" optional="true"/>
-        <attribute name="currentPassword" type="String" mode="IN" optional="true"/>
-        <attribute name="newPassword" type="String" mode="IN" optional="true"/>
-        <attribute name="newPasswordVerify" type="String" mode="IN" optional="true"/>
-        <attribute name="passwordHint" type="String" mode="IN" optional="true"/>
-        <attribute name="updatedUserLogin" type="org.ofbiz.entity.GenericValue" mode="OUT" optional="false"/>
-    </service>
-    <service name="updateUserLoginSecurity" engine="java" default-entity-name="UserLogin"
-            location="org.ofbiz.securityext.login.LoginServices" invoke="updateUserLoginSecurity" auth="true">
-        <description>Update UserLogin Security Settings</description>
-        <attribute name="userLoginId" type="String" mode="IN" optional="false"/>
-        <attribute name="enabled" type="String" mode="IN" optional="false"/>
-        <attribute name="disabledDateTime" type="java.sql.Timestamp" mode="IN" optional="true"/>
-        <attribute name="successiveFailedLogins" type="Long" mode="IN" optional="true"/>
-    </service>
-
     <!-- SecurityGroup services -->
     <service name="createSecurityGroup" engine="simple" location="org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml" invoke="createSecurityGroup" auth="true">
         <description>Create an SecurityGroup</description>

Modified: incubator/ofbiz/trunk/framework/common/servicedef/services.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/servicedef/services.xml?rev=431023&r1=431022&r2=431023&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/common/servicedef/services.xml (original)
+++ incubator/ofbiz/trunk/framework/common/servicedef/services.xml Sat Aug 12 05:38:51 2006
@@ -293,4 +293,47 @@
         location="org.ofbiz.common.FtpServices" invoke="getFile">
         <implements service="ftpInterface"/>
     </service>
+
+    <!-- UserLogin services -->
+    <service name="userLogin" engine="java" location="org.ofbiz.common.login.LoginServices" invoke="userLogin">
+        <description>Used to Automatically Authenticate a username/password; create a UserLogin object</description>
+        <attribute name="login.username" type="String" mode="IN"/>
+        <attribute name="login.password" type="String" mode="IN"/>
+        <attribute name="visitId" type="String" mode="IN" optional="true"/>
+        <attribute name="isServiceAuth" type="Boolean" mode="IN" optional="true"/>
+        <attribute name="userLogin" type="org.ofbiz.entity.GenericValue" mode="OUT"/>
+        <attribute name="userLoginSession" type="java.util.Map" mode="OUT" optional="true"/>
+    </service>
+    <service name="createUserLogin" engine="java" auth="false"
+        location="org.ofbiz.common.login.LoginServices" invoke="createUserLogin">
+        <description>Create a UserLogin</description>
+        <attribute name="userLoginId" type="String" mode="IN" optional="false"/>
+        <attribute name="currentPassword" type="String" mode="IN" optional="false"/>
+        <attribute name="currentPasswordVerify" type="String" mode="IN" optional="false"/>
+        <attribute name="passwordHint" type="String" mode="IN" optional="true"/>
+        <attribute name="partyId" type="String" mode="IN" optional="true"/>
+    </service>
+    <service name="updateUserLoginId" engine="java" location="org.ofbiz.common.login.LoginServices" invoke="updateUserLoginId" auth="true">
+        <description>Update a UserLoginId by creating a new one and expiring the old one</description>
+        <attribute name="userLoginId" type="String" mode="IN" optional="false"/>
+        <attribute name="newUserLogin" type="org.ofbiz.entity.GenericValue" mode="OUT" optional="false"/>
+    </service>
+    <service name="updatePassword" engine="java" default-entity-name="UserLogin"
+        location="org.ofbiz.common.login.LoginServices" invoke="updatePassword" auth="true">
+        <description>Update a UserLogin Password</description>
+        <attribute name="userLoginId" type="String" mode="IN" optional="true"/>
+        <attribute name="currentPassword" type="String" mode="IN" optional="true"/>
+        <attribute name="newPassword" type="String" mode="IN" optional="true"/>
+        <attribute name="newPasswordVerify" type="String" mode="IN" optional="true"/>
+        <attribute name="passwordHint" type="String" mode="IN" optional="true"/>
+        <attribute name="updatedUserLogin" type="org.ofbiz.entity.GenericValue" mode="OUT" optional="false"/>
+    </service>
+    <service name="updateUserLoginSecurity" engine="java" default-entity-name="UserLogin"
+        location="org.ofbiz.common.login.LoginServices" invoke="updateUserLoginSecurity" auth="true">
+        <description>Update UserLogin Security Settings</description>
+        <attribute name="userLoginId" type="String" mode="IN" optional="false"/>
+        <attribute name="enabled" type="String" mode="IN" optional="false"/>
+        <attribute name="disabledDateTime" type="java.sql.Timestamp" mode="IN" optional="true"/>
+        <attribute name="successiveFailedLogins" type="Long" mode="IN" optional="true"/>
+    </service>
 </services>

Copied: incubator/ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java (from r431021, incubator/ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/login/LoginServices.java)
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java?p2=incubator/ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java&p1=incubator/ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/login/LoginServices.java&r1=431021&r2=431023&rev=431023&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/login/LoginServices.java (original)
+++ incubator/ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java Sat Aug 12 05:38:51 2006
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package org.ofbiz.securityext.login;
+package org.ofbiz.common.login;
 
 import java.sql.Timestamp;
 import java.util.HashMap;