Author: scottbw
Date: Thu Apr 14 20:39:25 2011
New Revision: 1092505
URL: http://svn.apache.org/viewvc?rev=1092505&view=rev
Log:
Don't enable Shindig by default in opensocial.properties; this property also
now determines whether the "add gadget" menu option appears in the admin
inteface.See WOOKIE-194.
Modified:
incubator/wookie/trunk/WebContent/admin/index.jsp
incubator/wookie/trunk/src/opensocial.properties
Modified: incubator/wookie/trunk/WebContent/admin/index.jsp
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/admin/index.jsp?rev=1092505&r1=1092504&r2=1092505&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/admin/index.jsp (original)
+++ incubator/wookie/trunk/WebContent/admin/index.jsp Thu Apr 14 20:39:25 2011
@@ -14,10 +14,13 @@
* limitations under the License.
*/
--%>
+<%@ page import='org.apache.commons.configuration.Configuration' %>
<% String version = (String)request.getAttribute("version");
if (version == null){
version="";
}
+Boolean opensocialEnabled =
((Configuration)request.getSession(true).getServletContext().getAttribute("opensocial")).getBoolean("opensocial.enable");
+if (opensocialEnabled == null) opensocialEnabled = false;
%>
<%@ page import='org.apache.wookie.helpers.FlashMessage' %>
<% FlashMessage.getInstance().appendFlashMessages(session);%>
@@ -112,6 +115,7 @@ if (version == null){
</b>
</div>
+ <%if(opensocialEnabled){%>
<div id="spacer"></div>
<div id="nifty">
@@ -129,6 +133,7 @@ if (version == null){
<b class="r1"></b>
</b>
</div>
+ <%}%>
<div id="spacer"></div>
Modified: incubator/wookie/trunk/src/opensocial.properties
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/opensocial.properties?rev=1092505&r1=1092504&r2=1092505&view=diff
==============================================================================
--- incubator/wookie/trunk/src/opensocial.properties (original)
+++ incubator/wookie/trunk/src/opensocial.properties Thu Apr 14 20:39:25 2011
@@ -1,4 +1,4 @@
-opensocial.enable=true
+opensocial.enable=false
opensocial.token=plain
opensocial.key=UNSECURED_TOKEN_KEY
opensocial.proxy.id=gadgetsdefaultkey
\ No newline at end of file
