svn commit: r757103 - in /ofbiz/trunk/specialpurpose/ld
Locked
 
|
Author: doogie
Date: Sat Mar 21 23:48:00 2009 New Revision: 757103 URL: http://svn.apache.org/viewvc?rev=757103&view=rev Log: Fix purely empty whitespace lines, and remove trailing whitespace. Modified: ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/LdapLoginWorker.java ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/activedirectory/OFBizActiveDirectoryAuthenticationHandler.java ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/cas/OFBizCasAuthenticationHandler.java ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/commons/AbstractOFBizAuthenticationHandler.java ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/commons/InterfaceOFBizAuthenticationHandler.java ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/openldap/OFBizLdapAuthenticationHandler.java Modified: ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/LdapLoginWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/LdapLoginWorker.java?rev=757103&r1=757102&r2=757103&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/LdapLoginWorker.java (original) +++ ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/LdapLoginWorker.java Sat Mar 21 23:48:00 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -259,6 +259,6 @@ } } - return rootElement; + return rootElement; } } Modified: ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/activedirectory/OFBizActiveDirectoryAuthenticationHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/activedirectory/OFBizActiveDirectoryAuthenticationHandler.java?rev=757103&r1=757102&r2=757103&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/activedirectory/OFBizActiveDirectoryAuthenticationHandler.java (original) +++ ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/activedirectory/OFBizActiveDirectoryAuthenticationHandler.java Sat Mar 21 23:48:00 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -37,17 +37,17 @@ /** * The OFBiz ActiveDirectory Authentication Handler.<p> - * + * * The ACL of a user is still controlled by OFBiz. * */ public final class OFBizActiveDirectoryAuthenticationHandler extends AbstractOFBizAuthenticationHandler { /** - * Public constructor, initializes some required member variables.<p> + * Public constructor, initializes some required member variables.<p> */ public OFBizActiveDirectoryAuthenticationHandler() { - + } public SearchResult getLdapSearchResult(String username, String password, @@ -111,8 +111,8 @@ // No ldap service found, or cannot login. throw new NamingException(e.getLocalizedMessage()); } - + return result; } - + } Modified: ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/cas/OFBizCasAuthenticationHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/cas/OFBizCasAuthenticationHandler.java?rev=757103&r1=757102&r2=757103&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/cas/OFBizCasAuthenticationHandler.java (original) +++ ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/cas/OFBizCasAuthenticationHandler.java Sat Mar 21 23:48:00 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -38,32 +38,32 @@ /** * The OFBiz CAS-LDAP Authentication Handler.<p> - * + * * The ACL of a user is still controlled by OFBiz. * */ public final class OFBizCasAuthenticationHandler extends AbstractOFBizAuthenticationHandler { public static final String PARAM_TICKET = "ticket"; - + public static final String PARAM_SERVICE = "service"; - + public static final String PARAM_RENEW = "renew"; /** - * Public constructor, initializes some required member variables.<p> + * Public constructor, initializes some required member variables.<p> */ public OFBizCasAuthenticationHandler() { - + } - - + + public String login(HttpServletRequest request, HttpServletResponse response, Element rootElement) throws Exception { String ticket = request.getParameter(PARAM_TICKET); String username = request.getParameter("USERNAME"); String password = request.getParameter("PASSWORD"); - + String casUrl = UtilXml.childElementValue(rootElement, "CasUrl", "https://localhost:8443/cas"); String loginUri = UtilXml.childElementValue(rootElement, "CasLoginUri", "/login"); String validateUri = UtilXml.childElementValue(rootElement, "CasValidateUri", "/validate"); @@ -106,7 +106,7 @@ } } } - + if (casLoggedIn && username != null) { // as we cannot get the password user input in CAS login page, we use a random one password = randomString(); Modified: ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/commons/AbstractOFBizAuthenticationHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/commons/AbstractOFBizAuthenticationHandler.java?rev=757103&r1=757102&r2=757103&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/commons/AbstractOFBizAuthenticationHandler.java (original) +++ ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/commons/AbstractOFBizAuthenticationHandler.java Sat Mar 21 23:48:00 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -48,7 +48,7 @@ /** * The abstract Authentication Handler. - * + * * The ACL of a user is still controlled by OFBiz.<p> * */ @@ -58,9 +58,9 @@ * Public constructor, initializes some required member variables.<p> */ public AbstractOFBizAuthenticationHandler() { - + } - + public Object getPartyId(Element rootElement, SearchResult result) { Object partyId = UtilXml.childElementValue(rootElement, "AutoPartyId", "admin"); return partyId; @@ -75,14 +75,14 @@ String username = request.getParameter("USERNAME"); String password = request.getParameter("PASSWORD"); - + SearchResult result = getLdapSearchResult(username, password, rootElement, true); if (result != null) { return login(request, response, username, password, rootElement, result); } return "error"; } - + public String logout(HttpServletRequest request, HttpServletResponse response, Element rootElement) { return "success"; } @@ -91,7 +91,7 @@ public String login(HttpServletRequest request, HttpServletResponse response, String username, String password, Element rootElement, SearchResult result) throws Exception { HttpSession session = request.getSession(); - + // get the visit id to pass to the userLogin for history String visitId = VisitHandler.getVisitId(session); LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); @@ -111,7 +111,7 @@ } catch (GenericEntityException e) { throw new GenericEntityException(e.getLocalizedMessage()); } - + GenericValue userLoginSecurityGroup = delegator.makeValue("UserLoginSecurityGroup", UtilMisc.toMap("userLoginId", username, "groupId", getSecurityGroup(rootElement, result), "fromDate", UtilDateTime.nowTimestamp())); try { userLoginSecurityGroup.create(); @@ -122,7 +122,7 @@ userTryToLogin.setString("currentPassword", useEncryption ? HashCrypt.getDigestHash(password, LoginServices.getHashType()) : password); userTryToLogin.store(); } - + Map<String, Object> loginResult = null; try { Modified: ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/commons/InterfaceOFBizAuthenticationHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/commons/InterfaceOFBizAuthenticationHandler.java?rev=757103&r1=757102&r2=757103&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/commons/InterfaceOFBizAuthenticationHandler.java (original) +++ ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/commons/InterfaceOFBizAuthenticationHandler.java Sat Mar 21 23:48:00 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -28,64 +28,64 @@ /** * The OFBiz LDAP Authentication Handler interface.<p> - * + * */ public interface InterfaceOFBizAuthenticationHandler { /** * Login a user. - * + * * @param request HttpServletRequest * @param response HttpServletResponse * @param rootElement Element root element of ldap config file - * + * * @return success if the user can login successfully; otherwise, error. - * @throws Exception + * @throws Exception */ String login(HttpServletRequest request, HttpServletResponse response, Element rootElement) throws Exception; - + /** * Get the security group of a user. - * + * * @param rootElement Element root element of ldap config file * @param result SearchResult - * + * * @return the SecurityGroup object. */ Object getSecurityGroup(Element rootElement, SearchResult result); - + /** * Get the party id of a user. - * + * * @param rootElement Element root element of ldap config file * @param result SearchResult - * + * * @return the PartyId object. */ Object getPartyId(Element rootElement, SearchResult result); /** * Logout a user. - * + * * @param request HttpServletRequest * @param response HttpServletResponse * @param rootElement Element root element of ldap config file - * + * * @return success if the user can login successfully; otherwise, error. - * @throws Exception + * @throws Exception */ String logout(HttpServletRequest request, HttpServletResponse response, Element rootElement); - + /** * Get LDAP search result from a username, password and configuration. - * + * * @param username String * @param password String * @param rootElement Element root element of ldap config file * @param bindRequired boolean if true, bind; false, just search the user in LDAP - * + * * @return result SearchResult if ldap search successfully; otherwise, null. - * @throws Exception + * @throws Exception */ SearchResult getLdapSearchResult(String username, String password, Element rootElement, boolean bindRequired) throws NamingException; Modified: ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/openldap/OFBizLdapAuthenticationHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/openldap/OFBizLdapAuthenticationHandler.java?rev=757103&r1=757102&r2=757103&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/openldap/OFBizLdapAuthenticationHandler.java (original) +++ ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/openldap/OFBizLdapAuthenticationHandler.java Sat Mar 21 23:48:00 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -34,14 +34,14 @@ /** * The OFBiz LDAP Authentication Handler.<p> - * + * * The ACL of a user is still controlled by OFBiz. * */ public final class OFBizLdapAuthenticationHandler extends AbstractOFBizAuthenticationHandler { /** - * Public constructor, initializes some required member variables.<p> + * Public constructor, initializes some required member variables.<p> */ public OFBizLdapAuthenticationHandler() { |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |