Author: doll
Date: Mon Sep 8 09:13:33 2008
New Revision: 693150
URL: http://svn.apache.org/viewvc?rev=693150&view=rev
Log:
SHINDIG-576
The java social code now outputs a displayName field and the name.unstructured
field has been renamed to name.formatted in order to align with portable
contacts.
The js changes should be fine with php as it already conforms to this pc stuff
and so has a displayName field being output.
Modified:
incubator/shindig/trunk/features/opensocial-current/jsonperson.js
incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js
incubator/shindig/trunk/java/server/src/test/resources/endtoend/fetchPeopleTest.xml
incubator/shindig/trunk/java/server/src/test/resources/endtoend/fetchPersonTest.xml
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/NameImpl.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXmlConverterTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java
incubator/shindig/trunk/javascript/sampledata/canonicaldb.json
Modified: incubator/shindig/trunk/features/opensocial-current/jsonperson.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-current/jsonperson.js?rev=693150&r1=693149&r2=693150&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-current/jsonperson.js (original)
+++ incubator/shindig/trunk/features/opensocial-current/jsonperson.js Mon Sep
8 09:13:33 2008
@@ -87,3 +87,7 @@
}
}
}
+
+JsonPerson.prototype.getDisplayName = function() {
+ return this.getField("displayName");
+}
Modified:
incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js?rev=693150&r1=693149&r2=693150&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js
(original)
+++ incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js Mon
Sep 8 09:13:33 2008
@@ -265,6 +265,10 @@
profileDetails[i] = 'utcOffset';
}
}
+
+ // displayName and id always need to be requested
+ profileDetails.push("id");
+ profileDetails.push("displayName");
}
JsonRpcContainer.prototype.createPersonFromJson = function(serverJson) {
@@ -329,6 +333,10 @@
}
}
+ if (serverJson.name) {
+ serverJson.name.unstructured = serverJson.name.formatted;
+ }
+
return new JsonPerson(serverJson);
};
Modified:
incubator/shindig/trunk/java/server/src/test/resources/endtoend/fetchPeopleTest.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/resources/endtoend/fetchPeopleTest.xml?rev=693150&r1=693149&r2=693150&view=diff
==============================================================================
---
incubator/shindig/trunk/java/server/src/test/resources/endtoend/fetchPeopleTest.xml
(original)
+++
incubator/shindig/trunk/java/server/src/test/resources/endtoend/fetchPeopleTest.xml
Mon Sep 8 09:13:33 2008
@@ -40,7 +40,7 @@
assertEquals('Wrong friend count', 4, ownerFriends.size());
var johnDoe = ownerFriends.getById('john.doe');
- assertEquals('Wrong name for john doe', 'John Doe',
johnDoe.getDisplayName());
+ assertEquals('Wrong name for john doe', 'Johnny',
johnDoe.getDisplayName());
finished();
}
@@ -80,7 +80,7 @@
req.send(receivedData);
}
};
-
+
function getAndCheckError(response, key) {
assertFalse('Data error', response.hadError());
Modified:
incubator/shindig/trunk/java/server/src/test/resources/endtoend/fetchPersonTest.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/resources/endtoend/fetchPersonTest.xml?rev=693150&r1=693149&r2=693150&view=diff
==============================================================================
---
incubator/shindig/trunk/java/server/src/test/resources/endtoend/fetchPersonTest.xml
(original)
+++
incubator/shindig/trunk/java/server/src/test/resources/endtoend/fetchPersonTest.xml
Mon Sep 8 09:13:33 2008
@@ -37,7 +37,7 @@
function receivedData(response) {
var user = getAndCheckError(response, "canonical");
assertEquals("Names don't match",
- "Sir Shin H. Digg Social Butterfly", user.getDisplayName());
+ "Shin Digg", user.getDisplayName());
finished();
}
@@ -55,7 +55,7 @@
function receivedData(response) {
var user = getAndCheckError(response, "owner");
assertEquals("Names don't match",
- "Sir Shin H. Digg Social Butterfly", user.getDisplayName());
+ "Shin Digg", user.getDisplayName());
finished();
}
@@ -73,7 +73,7 @@
function receivedData(response) {
var user = getAndCheckError(response, "viewer");
assertEquals("Names don't match",
- "John Doe", user.getDisplayName());
+ "Johnny", user.getDisplayName());
finished();
}
@@ -93,11 +93,11 @@
function receivedData(response) {
var user = getAndCheckError(response, "owner");
assertEquals("Names don't match",
- "Sir Shin H. Digg Social Butterfly", user.getDisplayName());
+ "Shin Digg", user.getDisplayName());
user = getAndCheckError(response, "viewer");
assertEquals("Names don't match",
- "John Doe", user.getDisplayName());
+ "Johnny", user.getDisplayName());
finished();
}
@@ -124,7 +124,7 @@
req.send(receivedData);
}
};
-
+
function getAndCheckError(response, key) {
assertFalse("Data error", response.hadError());
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/NameImpl.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/NameImpl.java?rev=693150&r1=693149&r2=693150&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/NameImpl.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/NameImpl.java
Mon Sep 8 09:13:33 2008
@@ -26,21 +26,21 @@
private String givenName;
private String honorificPrefix;
private String honorificSuffix;
- private String unstructured;
+ private String formatted;
public NameImpl() {
}
- public NameImpl(String unstructured) {
- this.unstructured = unstructured;
+ public NameImpl(String formatted) {
+ this.formatted = formatted;
}
- public String getUnstructured() {
- return unstructured;
+ public String getFormatted() {
+ return formatted;
}
- public void setUnstructured(String unstructured) {
- this.unstructured = unstructured;
+ public void setFormatted(String formatted) {
+ this.formatted = formatted;
}
public String getAdditionalName() {
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java?rev=693150&r1=693149&r2=693150&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java
Mon Sep 8 09:13:33 2008
@@ -48,6 +48,7 @@
private Address currentLocation;
private Date birthday;
private Enum<Enum.Drinker> drinker;
+ private String displayName;
private List<ListField> emails;
private String ethnicity;
private String fashion;
@@ -100,8 +101,15 @@
public PersonImpl() {
}
- public PersonImpl(String id, Name name) {
+ /**
+ * A constructor which contains all of the required fields on a person object
+ * @param id The id of the person
+ * @param displayName The displayName of the person
+ * @param name The person's name broken down into components
+ */
+ public PersonImpl(String id, String displayName, Name name) {
this.id = id;
+ this.displayName = displayName;
this.name = name;
}
@@ -200,6 +208,14 @@
}
}
+ public String getDisplayName() {
+ return displayName;
+ }
+
+ public void setDisplayName(String displayName) {
+ this.displayName = displayName;
+ }
+
public Enum<Enum.Drinker> getDrinker() {
return this.drinker;
}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java?rev=693150&r1=693149&r2=693150&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java
Mon Sep 8 09:13:33 2008
@@ -37,7 +37,7 @@
GIVEN_NAME("givenName"),
HONORIFIC_PREFIX("honorificPrefix"),
HONORIFIC_SUFFIX("honorificSuffix"),
- UNSTRUCTURED("unstructured");
+ FORMATTED("formatted");
private final String jsonString;
@@ -51,9 +51,9 @@
}
}
- String getUnstructured();
+ String getFormatted();
- void setUnstructured(String unstructured);
+ void setFormatted(String formatted);
String getAdditionalName();
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java?rev=693150&r1=693149&r2=693150&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
Mon Sep 8 09:13:33 2008
@@ -45,6 +45,10 @@
*/
public static final String THUMBNAIL_PHOTO_TYPE = "thumbnail";
+ String getDisplayName();
+
+ void setDisplayName(String displayName);
+
/**
* Enumeration of genders.
*/
@@ -78,6 +82,8 @@
CURRENT_LOCATION("currentLocation"),
/** the json field for birthday. */
BIRTHDAY("birthday"),
+ /** the json field for display name. */
+ DISPLAY_NAME("displayName"), /** Needed to support the RESTful api. */
/** the json field for drinker. */
DRINKER("drinker"),
/** the json field for emails. */
@@ -109,7 +115,7 @@
/** the json field for languagesSpoken. */
LANGUAGES_SPOKEN("languagesSpoken"),
/** the json field for updated. */
- LAST_UPDATED("updated"), /* Needed to support the RESTful api. */
+ LAST_UPDATED("updated"), /** Needed to support the RESTful api. */
/** the json field for livingArrangement. */
LIVING_ARRANGEMENT("livingArrangement"),
/** the json field for lookingFor. */
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java?rev=693150&r1=693149&r2=693150&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
Mon Sep 8 09:13:33 2008
@@ -63,8 +63,8 @@
private static final Comparator<Person> NAME_COMPARATOR = new
Comparator<Person>() {
public int compare(Person person, Person person1) {
- String name = person.getName().getUnstructured();
- String name1 = person1.getName().getUnstructured();
+ String name = person.getName().getFormatted();
+ String name1 = person1.getName().getFormatted();
return name.compareTo(name1);
}
};
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java?rev=693150&r1=693149&r2=693150&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
Mon Sep 8 09:13:33 2008
@@ -56,7 +56,7 @@
name.setGivenName("Shin");
name.setHonorificPrefix("Sir");
name.setHonorificSuffix("Social Butterfly");
- canonical = new PersonImpl("canonical", name);
+ canonical = new PersonImpl("canonical", "Shin Digg", name);
canonical.setAboutMe("I have an example of every piece of data");
canonical.setActivities(Lists.newArrayList("Coding Shindig"));
@@ -245,6 +245,8 @@
assertFloatField(currentLocation,
canonical.getCurrentLocation().getLongitude(),
Address.Field.LONGITUDE);
+ assertStringField(result, canonical.getDisplayName(),
Person.Field.DISPLAY_NAME);
+
// assertLongField(result, canonical.getBirthday().getTime(),
// Person.Field.BIRTHDAY);
// assertEnumField(result, canonical.getDrinker(), Person.Field.DRINKER);
@@ -289,9 +291,9 @@
assertStringListField(result, canonical.getMovies(), Person.Field.MOVIES);
assertStringListField(result, canonical.getMusic(), Person.Field.MUSIC);
- assertEquals(canonical.getName().getUnstructured(),
+ assertEquals(canonical.getName().getFormatted(),
result.getJSONObject(Person.Field.NAME.toString()).getString(
- Name.Field.UNSTRUCTURED.toString()));
+ Name.Field.FORMATTED.toString()));
assertEnumField(result, canonical.getNetworkPresence(),
Person.Field.NETWORKPRESENCE);
@@ -496,7 +498,7 @@
private void assertPerson(JSONObject person, String expectedId, String
expectedName)
throws Exception {
assertEquals(expectedId, person.getString("id"));
- assertEquals(expectedName,
person.getJSONObject("name").getString("unstructured"));
+ assertEquals(expectedName,
person.getJSONObject("name").getString("formatted"));
}
// TODO: Add tests for fields parameter
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java?rev=693150&r1=693149&r2=693150&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
Mon Sep 8 09:13:33 2008
@@ -50,7 +50,7 @@
@Override
public void setUp() throws Exception {
super.setUp();
- johnDoe = new PersonImpl("johnDoeId", new NameImpl("John Doe"));
+ johnDoe = new PersonImpl("johnDoeId", "Johnny", new NameImpl("John Doe"));
johnDoe.setPhoneNumbers(Lists.<ListField>newArrayList(
new ListFieldImpl("home", "+33H000000000"),
new ListFieldImpl("mobile", "+33M000000000"),
@@ -75,7 +75,7 @@
private String newfield;
public SpecialPerson(String id, String name, String newfield) {
- super(id, new NameImpl(name));
+ super(id, name, new NameImpl(name));
this.newfield = newfield;
}
@@ -97,8 +97,8 @@
assertEquals(johnDoe.getId(), result.getString("id"));
- assertEquals(johnDoe.getName().getUnstructured(),
- result.getJSONObject("name").getString("unstructured"));
+ assertEquals(johnDoe.getName().getFormatted(),
+ result.getJSONObject("name").getString("formatted"));
assertEquals(johnDoe.getAddresses().get(0).getFormatted(),
result.getJSONArray("addresses").getJSONObject(0)
@@ -187,8 +187,8 @@
}
public void testJsonToActivity() throws Exception {
- String jsonActivity = "{userId : 5, id : 6, mediaItems : ["
- + "{url : 'hello', mimeType : 'mimey', type : 'video'}"
+ String jsonActivity = "{userId : 5, id : 6, mediaItems : ["
+ + "{url : 'hello', mimeType : 'mimey', type : 'video'}"
+ "]}";
// TODO: rename the enums to be lowercase
Activity result = beanJsonConverter.convertToObject(jsonActivity,
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java?rev=693150&r1=693149&r2=693150&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java
Mon Sep 8 09:13:33 2008
@@ -62,7 +62,7 @@
// taken from opensocial-reference/name.js
private static final String[] NAME_FIELDS = { "familyName", "givenName",
"additionalName",
- "honorificPrefix", "honorificSuffix", "unstructured" };
+ "honorificPrefix", "honorificSuffix", "formatted" };
private Person johnDoe;
private Activity activity;
@@ -75,7 +75,7 @@
@Override
public void setUp() throws Exception {
super.setUp();
- johnDoe = new PersonImpl("johnDoeId", new NameImpl("John Doe"));
+ johnDoe = new PersonImpl("johnDoeId", "Johnny", new NameImpl("John Doe"));
johnDoe.setPhoneNumbers(Lists.<ListField>newArrayList(
new ListFieldImpl("home", "+33H000000000"),
new ListFieldImpl("mobile", "+33M000000000"),
@@ -117,7 +117,7 @@
}
public SpecialPerson(String id, String name, String newfield) {
- super(id, new NameImpl(name));
+ super(id, name, new NameImpl(name));
this.newfield = newfield;
}
@@ -157,7 +157,7 @@
Name name = parseCassie.getName();
Name cassieName = cassie.getName();
assertNotNull(name);
- assertEquals(cassieName.getUnstructured(), name.getUnstructured());
+ assertEquals(cassieName.getFormatted(), name.getFormatted());
assertEquals(cassieName.getAdditionalName(), name.getAdditionalName());
assertEquals(cassieName.getFamilyName(), name.getFamilyName());
assertEquals(cassieName.getGivenName(), name.getGivenName());
@@ -184,9 +184,9 @@
optional, nullfields);
ApiValidator.dump(nameJSON);
- assertNotNull(nameJSON.get("unstructured"));
- assertEquals(String.class, nameJSON.get("unstructured").getClass());
- assertEquals(name, nameJSON.get("unstructured"));
+ assertNotNull(nameJSON.get("formatted"));
+ assertEquals(String.class, nameJSON.get("formatted").getClass());
+ assertEquals(name, nameJSON.get("formatted"));
// additional name
assertNull(nameJSON.get("additionalName"));
@@ -201,7 +201,7 @@
Person parsedPerson = beanJsonConverter.convertToObject(result,
Person.class);
assertEquals(johnDoe.getId(), parsedPerson.getId());
- assertEquals(johnDoe.getName().getUnstructured(),
parsedPerson.getName().getUnstructured());
+ assertEquals(johnDoe.getName().getFormatted(),
parsedPerson.getName().getFormatted());
List<Address> addresses = parsedPerson.getAddresses();
if (outputInfo) {
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXmlConverterTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXmlConverterTest.java?rev=693150&r1=693149&r2=693150&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXmlConverterTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXmlConverterTest.java
Mon Sep 8 09:13:33 2008
@@ -50,7 +50,7 @@
@Override
public void setUp() throws Exception {
super.setUp();
- johnDoe = new PersonImpl("johnDoeId", new NameImpl("John Doe"));
+ johnDoe = new PersonImpl("johnDoeId", "Johnny", new NameImpl("John Doe"));
johnDoe.setPhoneNumbers(Lists.<ListField>newArrayList(
new ListFieldImpl("home", "+33H000000000"),
new ListFieldImpl("mobile", "+33M000000000"),
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java?rev=693150&r1=693149&r2=693150&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java
Mon Sep 8 09:13:33 2008
@@ -54,7 +54,7 @@
@Override
public void setUp() throws Exception {
super.setUp();
- johnDoe = new PersonImpl("johnDoeId", new NameImpl("John Doe"));
+ johnDoe = new PersonImpl("johnDoeId", "Johnny", new NameImpl("John Doe"));
johnDoe.setPhoneNumbers(Lists.<ListField> newArrayList(new
ListFieldImpl("home",
"+33H000000000"), new ListFieldImpl("mobile", "+33M000000000"), new
ListFieldImpl("work",
"+33W000000000")));
@@ -86,7 +86,7 @@
}
public SpecialPerson(String id, String name, String newfield) {
- super(id, new NameImpl(name));
+ super(id, name, new NameImpl(name));
this.newfield = newfield;
}
Modified: incubator/shindig/trunk/javascript/sampledata/canonicaldb.json
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/sampledata/canonicaldb.json?rev=693150&r1=693149&r2=693150&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/sampledata/canonicaldb.json (original)
+++ incubator/shindig/trunk/javascript/sampledata/canonicaldb.json Mon Sep 8
09:13:33 2008
@@ -53,6 +53,7 @@
"longitude" : "2.29419"
},
"birthday" : "1975-01-01",
+"displayName" : "Shin Digg",
"drinker" : {
"value" : "SOCIALLY",
"displayValue" : "Socially"
@@ -115,7 +116,7 @@
"givenName" : "Shin",
"honorificPrefix" : "Sir",
"honorificSuffix" : "Social Butterfly",
-"unstructured" : "Sir Shin H. Digg Social Butterfly"
+"formatted" : "Sir Shin H. Digg Social Butterfly"
},
"networkPresence" : {
"value" : "ONLINE",
@@ -172,52 +173,57 @@
},
{
"id" : "john.doe",
+"displayName" : "Johnny",
"gender" : "male",
"hasApp" : true,
"name" : {
"familyName" : "Doe",
"givenName" : "John",
-"unstructured" : "John Doe"
+"formatted" : "John Doe"
}
},
{
"id" : "jane.doe",
+"displayName" : "Janey",
"gender" : "female",
"hasApp" : true,
"name" : {
"familyName" : "Doe",
"givenName" : "Jane",
-"unstructured" : "Jane Doe"
+"formatted" : "Jane Doe"
}
},
{
"id" : "george.doe",
+"displayName" : "Georgey",
"gender" : "male",
"hasApp" : true,
"name" : {
"familyName" : "Doe",
"givenName" : "George",
-"unstructured" : "George Doe"
+"formatted" : "George Doe"
}
},
{
"id" : "mario.rossi",
+"displayName" : "Mario",
"gender" : "male",
"hasApp" : true,
"name" : {
"familyName" : "Rossi",
"givenName" : "Mario",
-"unstructured" : "Mario Rossi"
+"formatted" : "Mario Rossi"
}
},
{
"id" : "maija.m",
+"displayName" : "Maija",
"gender" : "female",
"hasApp" : true,
"name" : {
"familyName" : "Meikäläinen",
"givenName" : "Maija",
-"unstructured" : "Maija Meikäläinen"
+"formatted" : "Maija Meikäläinen"
}
}],
//
