GTNPORTAL-3482 Deprecated class of UserImpl

gatein · May 29, 2014 · 6e06d62 · 6e06d62
1 parent 775ff88
commit 6e06d62
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/...t/identity/src/main/java/org/exoplatform/services/organization/idm/IDMUserListAccess.java b/...t/identity/src/main/java/org/exoplatform/services/organization/idm/IDMUserListAccess.java
@@ -27,6 +27,7 @@
 import org.exoplatform.services.organization.OrganizationService;
 import org.exoplatform.services.organization.User;
 import org.exoplatform.services.organization.UserStatus;
+import org.exoplatform.services.organization.impl.UserImpl;
 import org.gatein.common.logging.LogLevel;
 import org.gatein.common.logging.Logger;
 import org.gatein.common.logging.LoggerFactory;

diff --git a/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserImpl.java b/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserImpl.java
@@ -29,9 +29,12 @@
 /**
  * TODO: This is temporary implementation, which should be removed after https://issues.jboss.org/browse/EXOJCR-1780 will be
  * fixed and available in GateIn.
+ * Because issue https://issues.jboss.org/browse/EXOJCR-1780 was fixed and this class will be removed soon.
+ * You should use {@org.exoplatform.services.organization.impl.UserImpl} instead of this class for avoiding error in future.
  *
  * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
  */
+@Deprecated
 public class UserImpl extends org.exoplatform.services.organization.impl.UserImpl implements Serializable {
     private String displayName;
 

diff --git a/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIGridUsers.gtmpl b/portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIGridUsers.gtmpl
@@ -68,7 +68,7 @@
 
             def beanIdField = uicomponent.getBeanIdField();
             def beanId = uicomponent.getBeanIdFor(bean);
-            if (bean instanceof org.exoplatform.services.organization.idm.UserImpl) {
+            if (bean instanceof org.exoplatform.services.organization.impl.UserImpl) {
                 if(!uicomponent.getFieldValue(bean, "enabled")) {
                     rowStyle = "font-style: italic; background: #dedfdf";
                 } else {
@@ -100,7 +100,7 @@
                }%>
 
                <!-- EnableDisableUser action -->
-               <% if (bean instanceof org.exoplatform.services.organization.idm.UserImpl) {%>
+               <% if (bean instanceof org.exoplatform.services.organization.impl.UserImpl) {%>
                    <td headers="DisableEnableUser">
                     <div class="ActionContainer">
                         <%
@@ -145,7 +145,7 @@
                             }
                             classIcon = action + "Icon";
                             if (action == "DisableEnableUser") {
-                                if (bean instanceof org.exoplatform.services.organization.idm.UserImpl) {
+                                if (bean instanceof org.exoplatform.services.organization.impl.UserImpl) {
                                     if (uicomponent.getFieldValue(bean, "enabled")) {
                                         title = "Disabled User";
                                         classIcon = "CheckDisable";

diff --git a/web/portal/src/main/webapp/groovy/webui/core/UIGrid.gtmpl b/web/portal/src/main/webapp/groovy/webui/core/UIGrid.gtmpl
@@ -64,7 +64,7 @@
             if (even) rowClass = "EvenRow";
             else rowClass = "OddRow portlet-table-alternate";
             even = !even;
-            if (bean instanceof org.exoplatform.services.organization.idm.UserImpl) {
+            if (bean instanceof org.exoplatform.services.organization.impl.UserImpl) {
                 if(!uicomponent.getFieldValue(bean, "enabled")) {
                     rowStyle = "font-style: italic; background: darkgray";
                 } else {
@@ -118,7 +118,7 @@
                         }
                         classIcon = action + "Icon";
                         if (action == "DisableEnableUser") {
-                            if (bean instanceof org.exoplatform.services.organization.idm.UserImpl) {
+                            if (bean instanceof org.exoplatform.services.organization.impl.UserImpl) {
                                 if (uicomponent.getFieldValue(bean, "enabled")) {
                                     title = "Disabled User";
                                     classIcon = "CheckDisable";

diff --git a/webui/portal/src/main/java/org/exoplatform/portal/webui/register/UIRegisterOAuth.java b/webui/portal/src/main/java/org/exoplatform/portal/webui/register/UIRegisterOAuth.java
@@ -33,7 +33,7 @@
 import org.exoplatform.services.organization.User;
 import org.exoplatform.services.organization.UserProfile;
 import org.exoplatform.services.organization.UserProfileHandler;
-import org.exoplatform.services.organization.idm.UserImpl;
+import org.exoplatform.services.organization.impl.UserImpl;
 import org.exoplatform.web.application.ApplicationMessage;
 import org.exoplatform.web.security.AuthenticationRegistry;
 import org.exoplatform.web.url.navigation.NavigationResource;