Author: deepak
Date: Sat Feb 20 11:46:08 2016
New Revision: 1731377
URL: http://svn.apache.org/viewvc?rev=1731377&view=rev
Log:
(OFBIZ-5780) Fixed some compilation warning:
- Mark some SecurityFactory method as deprecated
- Mark FoFormRender as deprecated
- Fixed deprecation warning for PassportUtil class.
Modified:
ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java
ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityFactory.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoFormRenderer.java
ofbiz/trunk/specialpurpose/passport/src/org/ofbiz/passport/util/PassportUtil.java
Modified:
ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java?rev=1731377&r1=1731376&r2=1731377&view=diff
==============================================================================
---
ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java
(original)
+++
ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java
Sat Feb 20 11:46:08 2016
@@ -43,6 +43,7 @@ import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericDelegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
+import org.ofbiz.entity.model.ModelField.EncryptMethod;
import org.ofbiz.entity.util.EntityCrypto;
import org.ofbiz.entity.util.EntityQuery;
import org.ofbiz.entity.util.EntityUtilProperties;
@@ -246,7 +247,7 @@ public class LoginEvents {
autoPassword =
RandomStringUtils.randomAlphanumeric(Integer.parseInt(EntityUtilProperties.getPropertyValue("security",
"password.length.min", "5", delegator)));
EntityCrypto entityCrypto = new EntityCrypto(delegator,null);
try {
- passwordToSend = entityCrypto.encrypt(keyValue, (Object)
autoPassword);
+ passwordToSend = entityCrypto.encrypt(keyValue,
EncryptMethod.TRUE, (Object) autoPassword);
} catch (GeneralException e) {
Debug.logWarning(e, "Problem in encryption", module);
}
Modified:
ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityFactory.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityFactory.java?rev=1731377&r1=1731376&r2=1731377&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityFactory.java
(original)
+++ ofbiz/trunk/framework/security/src/org/ofbiz/security/SecurityFactory.java
Sat Feb 20 11:46:08 2016
@@ -101,7 +101,7 @@ public final class SecurityFactory {
}
}
- @Override
+ @Deprecated
public Iterator<GenericValue>
findUserLoginSecurityGroupByUserLoginId(String userLoginId) {
try {
List<GenericValue> collection =
EntityUtil.filterByDate(EntityQuery.use(delegator).from("UserLoginSecurityGroup").where("userLoginId",
userLoginId).cache(true).queryList());
@@ -112,7 +112,7 @@ public final class SecurityFactory {
}
}
- @Override
+ @Deprecated
public Delegator getDelegator() {
return this.delegator;
}
@@ -260,7 +260,7 @@ public final class SecurityFactory {
return hasRolePermission(application, action, primaryKey, role,
userLogin);
}
- @Override
+ @Deprecated
public boolean securityGroupPermissionExists(String groupId, String
permission) {
try {
return
EntityQuery.use(delegator).from("SecurityGroupPermission").where("groupId",
groupId, "permissionId", permission).cache(true).queryOne() != null;
@@ -270,7 +270,7 @@ public final class SecurityFactory {
}
}
- @Override
+ @Deprecated
public void setDelegator(Delegator delegator) {
if (this.delegator != null) {
throw new IllegalStateException("This object has been
initialized already.");
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoFormRenderer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoFormRenderer.java?rev=1731377&r1=1731376&r2=1731377&view=diff
==============================================================================
---
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoFormRenderer.java
(original)
+++
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoFormRenderer.java
Sat Feb 20 11:46:08 2016
@@ -62,6 +62,7 @@ import org.ofbiz.widget.renderer.html.Ht
* Widget Library - FO Form Renderer implementation
*
*/
+@Deprecated
public class FoFormRenderer extends HtmlWidgetRenderer implements
FormStringRenderer {
public static final String module = FoFormRenderer.class.getName();
Modified:
ofbiz/trunk/specialpurpose/passport/src/org/ofbiz/passport/util/PassportUtil.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/passport/src/org/ofbiz/passport/util/PassportUtil.java?rev=1731377&r1=1731376&r2=1731377&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/passport/src/org/ofbiz/passport/util/PassportUtil.java
(original)
+++
ofbiz/trunk/specialpurpose/passport/src/org/ofbiz/passport/util/PassportUtil.java
Sat Feb 20 11:46:08 2016
@@ -35,7 +35,7 @@ import javax.net.ssl.X509TrustManager;
import javax.servlet.http.HttpServletRequest;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLContextBuilder;
+import org.apache.http.ssl.SSLContextBuilder;
import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
