Author: scottbw
Date: Wed May 30 14:59:45 2012
New Revision: 1344294
URL: http://svn.apache.org/viewvc?rev=1344294&view=rev
Log:
Updated connector framework to support participant roles. See WOOKIE-66
Modified:
incubator/wookie/trunk/WebContent/demo/wookie-connector.js
incubator/wookie/trunk/connector/java/src/org/apache/wookie/connector/framework/AbstractWookieConnectorService.java
incubator/wookie/trunk/connector/java/src/org/apache/wookie/connector/framework/User.java
incubator/wookie/trunk/connector/js/wookie-connector.js
Modified: incubator/wookie/trunk/WebContent/demo/wookie-connector.js
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/demo/wookie-connector.js?rev=1344294&r1=1344293&r2=1344294&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/demo/wookie-connector.js (original)
+++ incubator/wookie/trunk/WebContent/demo/wookie-connector.js Wed May 30
14:59:45 2012
@@ -168,6 +168,8 @@ var Wookie = {
postdata = postdata + encodeURI(Wookie.currentUser.loginName);
postdata = postdata + "&widgetid=";
postdata = postdata + encodeURI(id);
+ postdata = postdata + "&participant_role=";
+ postdata = postdata + encodeURI(Wookie.currentUser.role);
postdata = postdata + "&participant_display_name=";
postdata = postdata + encodeURI(Wookie.currentUser.screenName);
postdata = postdata + "&participant_id=";
@@ -187,10 +189,11 @@ var Wookie = {
return Wookie.instances[key];
},
- setCurrentUser: function(loginName, screenName, thumbnailUrl){
+ setCurrentUser: function(loginName, screenName, thumbnailUrl, role){
var user = {};
user.loginName = loginName;
user.screenName = screenName;
+ user.role = role;
if (!thumbnailUrl || typeof thumbnailUrl === "undefined") {
user.thumbnailUrl = "";
} else {
Modified:
incubator/wookie/trunk/connector/java/src/org/apache/wookie/connector/framework/AbstractWookieConnectorService.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/connector/java/src/org/apache/wookie/connector/framework/AbstractWookieConnectorService.java?rev=1344294&r1=1344293&r2=1344294&view=diff
==============================================================================
---
incubator/wookie/trunk/connector/java/src/org/apache/wookie/connector/framework/AbstractWookieConnectorService.java
(original)
+++
incubator/wookie/trunk/connector/java/src/org/apache/wookie/connector/framework/AbstractWookieConnectorService.java
Wed May 30 14:59:45 2012
@@ -317,6 +317,8 @@ public abstract class AbstractWookieConn
postdata.append(URLEncoder.encode(user.getScreenName(),
"UTF-8"));
postdata.append("&participant_thumbnail_url=");
postdata.append(URLEncoder.encode(user.getThumbnailUrl(), "UTF-8"));
+ postdata.append("&participant_role=");
+ postdata.append(URLEncoder.encode(user.getRole(),
"UTF-8"));
}
catch (UnsupportedEncodingException e) {
throw new WookieConnectorException("Must support UTF-8
encoding", e);
@@ -766,7 +768,8 @@ public abstract class AbstractWookieConn
String id = participantEl.getAttribute("id");
String name =
participantEl.getAttribute("display_name");
String thumbnail =
participantEl.getAttribute("thumbnail_url");
- User user = new User(id, name, thumbnail);
+ String role =
participantEl.getAttribute("role");
+ User user = new User(id, name, thumbnail, role);
users[idx] = user;
}
return users;
Modified:
incubator/wookie/trunk/connector/java/src/org/apache/wookie/connector/framework/User.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/connector/java/src/org/apache/wookie/connector/framework/User.java?rev=1344294&r1=1344293&r2=1344294&view=diff
==============================================================================
---
incubator/wookie/trunk/connector/java/src/org/apache/wookie/connector/framework/User.java
(original)
+++
incubator/wookie/trunk/connector/java/src/org/apache/wookie/connector/framework/User.java
Wed May 30 14:59:45 2012
@@ -21,6 +21,7 @@ public class User {
private String loginName = "UNKNOWN";
private String screenName = "UNKNOWN";
private String thumbnailUrl = "";
+ private String role = null;
/**
* Create a new user.
@@ -38,12 +39,28 @@ public class User {
*
* @param loginName
* @param screenName
+ * @param thumbnailUrl
*/
public User(String loginName, String screenName, String thumbnailUrl) {
setLoginName(loginName);
setScreenName(screenName);
setThumbnailUrl(thumbnailUrl);
}
+
+ /**
+ * Create a new user.
+ *
+ * @param loginName
+ * @param screenName
+ * @param thumbnailUrl
+ * @param isHost
+ */
+ public User(String loginName, String screenName, String thumbnailUrl, String
role) {
+ setLoginName(loginName);
+ setScreenName(screenName);
+ setThumbnailUrl(thumbnailUrl);
+ setRole(role);
+ }
/**
* Get the login name for this user.
@@ -100,5 +117,20 @@ public class User {
*/
public String getThumbnailUrl() {
return this.thumbnailUrl;
- }
+ }
+
+ /**
+ * @return the role
+ */
+ public String getRole() {
+ return role;
+ }
+
+ /**
+ * @param role the role to set
+ */
+ public void setRole(String role) {
+ this.role = role;
+ }
+
}
Modified: incubator/wookie/trunk/connector/js/wookie-connector.js
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/connector/js/wookie-connector.js?rev=1344294&r1=1344293&r2=1344294&view=diff
==============================================================================
--- incubator/wookie/trunk/connector/js/wookie-connector.js (original)
+++ incubator/wookie/trunk/connector/js/wookie-connector.js Wed May 30 14:59:45
2012
@@ -168,6 +168,8 @@ var Wookie = {
postdata = postdata + encodeURI(Wookie.currentUser.loginName);
postdata = postdata + "&widgetid=";
postdata = postdata + encodeURI(id);
+ postdata = postdata + "&participant_role=";
+ postdata = postdata + encodeURI(Wookie.currentUser.role);
postdata = postdata + "&participant_display_name=";
postdata = postdata + encodeURI(Wookie.currentUser.screenName);
postdata = postdata + "&participant_id=";
@@ -187,10 +189,11 @@ var Wookie = {
return Wookie.instances[key];
},
- setCurrentUser: function(loginName, screenName, thumbnailUrl){
+ setCurrentUser: function(loginName, screenName, thumbnailUrl, role){
var user = {};
user.loginName = loginName;
user.screenName = screenName;
+ user.role = role;
if (!thumbnailUrl || typeof thumbnailUrl === "undefined") {
user.thumbnailUrl = "";
} else {
