You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2011/10/31 22:09:31 UTC
svn commit: r1195672 - in /incubator/rave/trunk:
rave-portal-resources/src/main/webapp/WEB-INF/db/
rave-providers/rave-w3c-provider/
rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/
Author: mfranklin
Date: Mon Oct 31 21:09:30 2011
New Revision: 1195672
URL: http://svn.apache.org/viewvc?rev=1195672&view=rev
Log:
Commented out Wookie integration
Modified:
incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
incubator/rave/trunk/rave-providers/rave-w3c-provider/pom.xml
incubator/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java
Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql?rev=1195672&r1=1195671&r2=1195672&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql Mon Oct 31 21:09:30 2011
@@ -228,10 +228,10 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
-- W3C Widget data
-- simple chat widget
-set @chat_widget_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @widget_seq);
-insert into widget (entity_id, title, url, type, widget_status, description, author, owner_id)
-values(@chat_widget_id, 'Simple Chat', 'http://wookie.apache.org/widgets/simplechat', 'W3C', 'PUBLISHED', 'NOTE: This is a W3C Widget managed by a Wookie server. It is an ALPHA feature. Must have an Apache Wookie server running on the same machine as the Rave server on port 8888', 'Apache Wookie Community', @user_id_1);
-UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @widget_seq;
+-- set @chat_widget_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @widget_seq);
+-- insert into widget (entity_id, title, url, type, widget_status, description, author, owner_id)
+-- values(@chat_widget_id, 'Simple Chat', 'http://wookie.apache.org/widgets/simplechat', 'W3C', 'PUBLISHED', 'NOTE: This is a W3C Widget managed by a Wookie server. It is an ALPHA feature. Must have an Apache Wookie server running on the same machine as the Rave server on port 8888', 'Apache Wookie Community', @user_id_1);
+-- UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @widget_seq;
-- end W3C Widget data
Modified: incubator/rave/trunk/rave-providers/rave-w3c-provider/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-providers/rave-w3c-provider/pom.xml?rev=1195672&r1=1195671&r2=1195672&view=diff
==============================================================================
--- incubator/rave/trunk/rave-providers/rave-w3c-provider/pom.xml (original)
+++ incubator/rave/trunk/rave-providers/rave-w3c-provider/pom.xml Mon Oct 31 21:09:30 2011
@@ -35,12 +35,12 @@
<packaging>jar</packaging>
<dependencies>
- <dependency>
+<!-- <dependency>
<groupId>org.apache.wookie</groupId>
<artifactId>wookie-java-connector</artifactId>
<scope>compile</scope>
<version>0.9.1-incubating-SNAPSHOT</version>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.apache.rave</groupId>
<artifactId>rave-commons</artifactId>
Modified: incubator/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java?rev=1195672&r1=1195671&r2=1195672&view=diff
==============================================================================
--- incubator/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java (original)
+++ incubator/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java Mon Oct 31 21:09:30 2011
@@ -22,9 +22,9 @@ package org.apache.rave.provider.w3c.ser
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.Widget;
import org.apache.rave.portal.service.WidgetProviderService;
-import org.apache.wookie.connector.framework.WidgetInstance;
+/*import org.apache.wookie.connector.framework.WidgetInstance;
import org.apache.wookie.connector.framework.WookieConnectorException;
-import org.apache.wookie.connector.framework.WookieConnectorService;
+import org.apache.wookie.connector.framework.WookieConnectorService;*/
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@@ -42,7 +42,7 @@ public class WookieWidgetService impleme
private static final String WOOKIE_SERVER_URL = "http://bombax.oucs.ox.ac.uk:8888/wookie";
private static final String WOOKIE_API_KEY = "TEST";
private static final String WOOKIE_SHARED_DATA_KEY = "mysharedkey";
- private static WookieConnectorService connectorService;
+ //private static WookieConnectorService connectorService;
public WookieWidgetService(){
}
@@ -60,7 +60,7 @@ public class WookieWidgetService impleme
}
private Widget getWidgetForViewer(Widget widget, String context, User viewer){
- try {
+ /* try {
// TODO: parameters for WookieConnectorService should not be fixed in code.
connectorService = getWookieConnectorService(WOOKIE_SERVER_URL, WOOKIE_API_KEY, WOOKIE_SHARED_DATA_KEY);
org.apache.wookie.connector.framework.User user = new org.apache.wookie.connector.framework.User(String.valueOf(viewer.getUsername()), viewer.getUsername());
@@ -77,7 +77,9 @@ public class WookieWidgetService impleme
logger.error("Problem communicating with Wookie server", e);
// FIXME: provide a real error widget
return createWidget(new WidgetInstance("error", "error", e.getMessage(), "100", "100"));
- }
+ }*/
+ //TODO Remove
+ return null;
}
/**
@@ -85,7 +87,7 @@ public class WookieWidgetService impleme
* This is a transient object and is not persisted
* @return
*/
- private Widget createWidget(WidgetInstance instance){
+ /*private Widget createWidget(WidgetInstance instance){
Widget widget = new Widget();
widget.setUrl(instance.getUrl());
widget.setTitle(instance.getTitle());
@@ -100,7 +102,7 @@ public class WookieWidgetService impleme
connectorService = new WookieConnectorService(serverURL, apiKey, sharedDataKey);
}
return connectorService;
- }
+ }*/
}