SAK-32243 Hide profile2 wall by default (sakaiproject#3978)

alaminreaz · Mar 14, 2017 · ffec1e1 · ffec1e1
1 parent 82df5e5
commit ffec1e1
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 2 deletions.
diff --git a/.../configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties b/.../configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties
@@ -2631,7 +2631,10 @@
 
 # Wall Support
 # Enable/disable the Profile2 wall page globally (true/false)
-# DEFAULT: true
+#
+# DEPRECATED: UNLESS THERE IS AN EXPRESSED DESIRE FOR THIS FUNCTIONALITY THE WALL WILL BE REMOVED FOR 13.
+#
+# DEFAULT: false
 # profile2.wall.enabled=true
 
 # Use the wall page as the default Profile2 page (true/false)

diff --git a/profile2/api/src/java/org/sakaiproject/profile2/logic/ProfileWallLogic.java b/profile2/api/src/java/org/sakaiproject/profile2/logic/ProfileWallLogic.java
@@ -25,7 +25,9 @@
  * Logic interface for the Profile2 wall.
  * 
  * @author [email protected]
+ * @deprecated The wall functionality will be removed from Sakai for the 13 release.
  */
+@Deprecated
 public interface ProfileWallLogic {
 
 	/**

diff --git a/profile2/api/src/java/org/sakaiproject/profile2/logic/SakaiProxy.java b/profile2/api/src/java/org/sakaiproject/profile2/logic/SakaiProxy.java
@@ -492,8 +492,11 @@ public interface SakaiProxy {
 	/**
 	 * Is the profile2.wall.enabled flag set in sakai.properties? If not set, defaults to <code>false</code>.
 	 *
+	 * DEPRECATED: UNLESS THERE IS AN EXPRESSED DESIRE FOR THIS FUNCTIONALITY THE WALL WILL BE REMOVED FOR 13.
+	 *
 	 * @return <code>true</code> if the profile2.wall.enabled flag is set, otherwise returns <code>false</code>.
 	 */
+	@Deprecated
 	public boolean isWallEnabledGlobally();
 
 	/**

diff --git a/profile2/api/src/java/org/sakaiproject/profile2/util/ProfileConstants.java b/profile2/api/src/java/org/sakaiproject/profile2/util/ProfileConstants.java
@@ -212,7 +212,7 @@ public class ProfileConstants {
 	public static final boolean SAKAI_PROP_PROFILE2_PROFILE_INTERESTS_ENABLED = true; //profile2.profile.interests.enabled
 	public static final boolean SAKAI_PROP_PROFILE2_OFFICIAL_IMAGE_ENABLED = false; //profile2.official.image.enabled
 	public static final boolean SAKAI_PROP_PROFILE2_GRAVATAR_IMAGE_ENABLED = true; //profile2.gravatar.image.enabled
-	public static final boolean SAKAI_PROP_PROFILE2_WALL_ENABLED = true; //profile2.wall.enabled
+	public static final boolean SAKAI_PROP_PROFILE2_WALL_ENABLED = false; //profile2.wall.enabled
 	public static final boolean SAKAI_PROP_PROFILE2_WALL_DEFAULT = false; //profile2.wall.default
 	public static final boolean SAKAI_PROP_PROFILE2_GOOGLE_INTEGRATION_ENABLED = false; //profile2.integration.google.enabled
 	public static final boolean SAKAI_PROP_PROFILE2_IMPORT_ENABLED = false; //profile2.import

diff --git a/profile2/impl/src/java/org/sakaiproject/profile2/logic/ProfileWallLogicImpl.java b/profile2/impl/src/java/org/sakaiproject/profile2/logic/ProfileWallLogicImpl.java
@@ -40,7 +40,9 @@
  * Implementation of ProfileWallLogic API for Profile2 wall.
  * 
  * @author [email protected]
+ * @deprecated The wall functionality will be removed from Sakai for the 13 release.
  */
+@Deprecated
 public class ProfileWallLogicImpl implements ProfileWallLogic {
 
 	private static final Logger log = LoggerFactory.getLogger(ProfileWallLogic.class);

diff --git a/profile2/tool/src/java/org/sakaiproject/profile2/tool/pages/MyProfile.java b/profile2/tool/src/java/org/sakaiproject/profile2/tool/pages/MyProfile.java
@@ -513,6 +513,7 @@ public Panel getPanel(String panelId) {
 			});
 		}
 
+		// DEPRECATED: UNLESS THERE IS AN EXPRESSED DESIRE FOR THIS FUNCTIONALITY THE WALL WILL BE REMOVED FOR 13.
 		if (sakaiProxy.isWallEnabledGlobally()) {
 
 			tabs.add(new AbstractTab(new ResourceModel("link.tab.wall")) {

diff --git a/profile2/tool/src/java/org/sakaiproject/profile2/tool/pages/ViewProfile.java b/profile2/tool/src/java/org/sakaiproject/profile2/tool/pages/ViewProfile.java
@@ -206,6 +206,7 @@ public Panel getPanel(final String panelId) {
 			});
 		}
 
+		// DEPRECATED: UNLESS THERE IS AN EXPRESSED DESIRE FOR THIS FUNCTIONALITY THE WALL WILL BE REMOVED FOR 13.
 		if (this.sakaiProxy.isWallEnabledGlobally()) {
 
 			tabs.add(new AbstractTab(new ResourceModel("link.tab.wall")) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -513,6 +513,7 @@ public Panel getPanel(String panelId) { @@
     			});
     		}
+    		// DEPRECATED: UNLESS THERE IS AN EXPRESSED DESIRE FOR THIS FUNCTIONALITY THE WALL WILL BE REMOVED FOR 13.
     		if (sakaiProxy.isWallEnabledGlobally()) {
     			tabs.add(new AbstractTab(new ResourceModel("link.tab.wall")) {
@@ Expand Down @@