Author: doll
Date: Wed Mar 12 07:54:02 2008
New Revision: 636351
URL: http://svn.apache.org/viewvc?rev=636351&view=rev
Log:
This huge change is simply a bunch of file moves for the social directory, no
functionality was changed in any area.
These file name changes/moves make way for some more refactoring and
abstractions for the social data stuff. As soon as the next refactoring is done
I will write up a README on how things work.
Added:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/AbstractGadgetData.java
- copied, changed from r636312,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/AbstractSocialData.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/GadgetDataServlet.java
- copied, changed from r636312,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/http/SocialDataServlet.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/DataService.java
- copied, changed from r636312,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/DataHandler.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/PeopleService.java
- copied, changed from r636312,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/PeopleHandler.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java
- copied, changed from r636272,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Activity.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Address.java
- copied, changed from r636272,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Address.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java
- copied, changed from r636272,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/BodyType.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Email.java
- copied, changed from r636272,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Email.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/IdSpec.java
- copied, changed from r636272,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/IdSpec.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java
- copied, changed from r636272,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/MediaItem.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Name.java
- copied, changed from r636272,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Name.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/OpenSocialDataType.java
- copied, changed from r636272,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/SocialDataType.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java
- copied, changed from r636272,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Organization.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
- copied, changed from r636272,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Person.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Phone.java
- copied, changed from r636272,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Phone.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Url.java
- copied, changed from r636272,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Url.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/BasicDataService.java
- copied, changed from r636312,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/file/BasicDataHandler.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/BasicPeopleService.java
- copied, changed from r636312,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/file/BasicPeopleHandler.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/XmlStateFileFetcher.java
- copied, changed from r636272,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/file/XmlStateFileFetcher.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/social/GadgetDataTest.java
- copied, changed from r636312,
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/social/SocialDataTest.java
Removed:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/AbstractSocialData.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Activity.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Address.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/BodyType.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/DataHandler.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Email.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/IdSpec.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/MediaItem.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Name.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Organization.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/PeopleHandler.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Person.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Phone.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/SocialDataType.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Url.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/file/
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/http/
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/social/SocialDataTest.java
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/DataResponse.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/ResponseItem.java
incubator/shindig/trunk/java/gadgets/src/main/webapp/WEB-INF/web.xml
Copied:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/AbstractGadgetData.java
(from r636312,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/AbstractSocialData.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/AbstractGadgetData.java?p2=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/AbstractGadgetData.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/AbstractSocialData.java&r1=636312&r2=636351&rev=636351&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/AbstractSocialData.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/AbstractGadgetData.java
Wed Mar 12 07:54:02 2008
@@ -34,7 +34,9 @@
* @author Vincent Demay
*
*/
-public abstract class AbstractSocialData {
+// TODO: Move from an inheritance model to a class that can translate any java
+// object based on its getters
+public abstract class AbstractGadgetData {
private static final Class[] EMPTY_PARAM = {};
private static final Object[] EMPTY_OBJECT = {};
@@ -100,9 +102,9 @@
}
private Object translateObjectToJson(Object val) throws JSONException {
- if (val instanceof AbstractSocialData[]) {
+ if (val instanceof AbstractGadgetData[]) {
JSONArray array = new JSONArray();
- for (Object asd : (AbstractSocialData[]) val) {
+ for (Object asd : (AbstractGadgetData[]) val) {
array.put(translateObjectToJson(asd));
}
return array;
@@ -124,8 +126,8 @@
}
return map;
- } else if (val instanceof AbstractSocialData) {
- return ((AbstractSocialData) val).toJson();
+ } else if (val instanceof AbstractGadgetData) {
+ return ((AbstractGadgetData) val).toJson();
}
// Fallback to returning the original object. This works fine for primitive
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/DataResponse.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/DataResponse.java?rev=636351&r1=636350&r2=636351&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/DataResponse.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/DataResponse.java
Wed Mar 12 07:54:02 2008
@@ -24,7 +24,7 @@
/**
* Represents the response object which gets passed as json to the gadget
*/
-public class DataResponse extends AbstractSocialData {
+public class DataResponse extends AbstractGadgetData {
@Mandatory private List<ResponseItem> responses;
private ResponseError error;
Copied:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/GadgetDataServlet.java
(from r636312,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/http/SocialDataServlet.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/GadgetDataServlet.java?p2=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/GadgetDataServlet.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/http/SocialDataServlet.java&r1=636312&r2=636351&rev=636351&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/http/SocialDataServlet.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/GadgetDataServlet.java
Wed Mar 12 07:54:02 2008
@@ -15,15 +15,17 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social.http;
+package org.apache.shindig.social;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
-import org.apache.shindig.social.*;
-import static org.apache.shindig.social.IdSpec.*;
-import org.apache.shindig.social.file.BasicPeopleHandler;
-import org.apache.shindig.social.file.BasicDataHandler;
+import org.apache.shindig.social.samplecontainer.BasicPeopleService;
+import org.apache.shindig.social.samplecontainer.BasicDataService;
+import org.apache.shindig.social.opensocial.PeopleService;
+import org.apache.shindig.social.opensocial.DataService;
+import org.apache.shindig.social.opensocial.model.IdSpec;
+import org.apache.shindig.social.opensocial.model.OpenSocialDataType;
import java.io.IOException;
import java.io.PrintWriter;
@@ -39,13 +41,13 @@
* Servlet for serving social data. This is a very basic hardcoded inital file.
* This will expand to be more sophisticated as time goes on.
*/
-public class SocialDataServlet extends HttpServlet {
+public class GadgetDataServlet extends HttpServlet {
private static final Logger logger
= Logger.getLogger("org.apache.shindig.social");
// TODO: get through injection
- private PeopleHandler peopleHandler = new BasicPeopleHandler();
- private DataHandler dataHandler = new BasicDataHandler();
+ private PeopleService peopleHandler = new BasicPeopleService();
+ private DataService dataHandler = new BasicDataService();
@Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp)
@@ -80,12 +82,13 @@
JSONObject requestItem = requestItems.getJSONObject(i);
try {
- SocialDataType type = SocialDataType.valueOf(
+ OpenSocialDataType type = OpenSocialDataType.valueOf(
requestItem.getString("type"));
String jsonSpec = requestItem.getString("idSpec");
- List<String> peopleIds = peopleHandler.getIds(fromJson(jsonSpec));
+ List<String> peopleIds =
peopleHandler.getIds(IdSpec.fromJson(jsonSpec));
+ // TODO: Abstract this logic into handlers which register
switch (type) {
case FETCH_PEOPLE :
response = peopleHandler.getPeople(peopleIds);
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/ResponseItem.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/ResponseItem.java?rev=636351&r1=636350&r2=636351&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/ResponseItem.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/ResponseItem.java
Wed Mar 12 07:54:02 2008
@@ -21,7 +21,7 @@
* Represents the response items that get handed back as json within the
* DataResponse
*/
-public class ResponseItem<T> extends AbstractSocialData {
+public class ResponseItem<T> extends AbstractGadgetData {
private ResponseError error;
// Must be compatible with AbstractSocialData.toJson. This means it should be
Copied:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/DataService.java
(from r636312,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/DataHandler.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/DataService.java?p2=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/DataService.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/DataHandler.java&r1=636312&r2=636351&rev=636351&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/DataHandler.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/DataService.java
Wed Mar 12 07:54:02 2008
@@ -15,12 +15,14 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social;
+package org.apache.shindig.social.opensocial;
+
+import org.apache.shindig.social.ResponseItem;
import java.util.List;
import java.util.Map;
-public interface DataHandler {
+public interface DataService {
public ResponseItem<Map<String, Map<String, String>>>
getPersonData(List<String> ids);
/**
Copied:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/PeopleService.java
(from r636312,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/PeopleHandler.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/PeopleService.java?p2=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/PeopleService.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/PeopleHandler.java&r1=636312&r2=636351&rev=636351&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/PeopleHandler.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/PeopleService.java
Wed Mar 12 07:54:02 2008
@@ -15,13 +15,16 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social;
+package org.apache.shindig.social.opensocial;
import org.json.JSONException;
+import org.apache.shindig.social.opensocial.model.Person;
+import org.apache.shindig.social.opensocial.model.IdSpec;
+import org.apache.shindig.social.ResponseItem;
import java.util.List;
-public interface PeopleHandler {
+public interface PeopleService {
/**
* Returns a list of people ids that the other handlers (currently data
* and activities) can use to fetch their own objects
Copied:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java
(from r636272,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Activity.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java?p2=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Activity.java&r1=636272&r2=636351&rev=636351&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Activity.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java
Wed Mar 12 07:54:02 2008
@@ -15,9 +15,12 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social;
+package org.apache.shindig.social.opensocial.model;
-public class Activity extends AbstractSocialData {
+import org.apache.shindig.social.Mandatory;
+import org.apache.shindig.social.AbstractGadgetData;
+
+public class Activity extends AbstractGadgetData {
private String appId;
private String body;
private String bodyId;
Copied:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Address.java
(from r636272,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Address.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Address.java?p2=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Address.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Address.java&r1=636272&r2=636351&rev=636351&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Address.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Address.java
Wed Mar 12 07:54:02 2008
@@ -15,14 +15,16 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social;
+package org.apache.shindig.social.opensocial.model;
+
+import org.apache.shindig.social.AbstractGadgetData;
/**
* see
*
http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Address.Field.html
*
*/
-public class Address extends AbstractSocialData {
+public class Address extends AbstractGadgetData {
private String country;
private String extendedAddress;
private Float latitude;
Copied:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java
(from r636272,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/BodyType.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java?p2=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/BodyType.java&r1=636272&r2=636351&rev=636351&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/BodyType.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java
Wed Mar 12 07:54:02 2008
@@ -15,14 +15,16 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social;
+package org.apache.shindig.social.opensocial.model;
+
+import org.apache.shindig.social.AbstractGadgetData;
/**
* see
*
http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.BodyType.Field.html
*
*/
-public class BodyType extends AbstractSocialData {
+public class BodyType extends AbstractGadgetData {
private String build;
private String eyeColor;
private String hairColor;
Copied:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Email.java
(from r636272,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Email.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Email.java?p2=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Email.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Email.java&r1=636272&r2=636351&rev=636351&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Email.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Email.java
Wed Mar 12 07:54:02 2008
@@ -15,14 +15,16 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social;
+package org.apache.shindig.social.opensocial.model;
+
+import org.apache.shindig.social.AbstractGadgetData;
/**
* see
*
http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Email.Field.html
*
*/
-public class Email extends AbstractSocialData {
+public class Email extends AbstractGadgetData {
private String address;
private String type;
Copied:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/IdSpec.java
(from r636272,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/IdSpec.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/IdSpec.java?p2=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/IdSpec.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/IdSpec.java&r1=636272&r2=636351&rev=636351&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/IdSpec.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/IdSpec.java
Wed Mar 12 07:54:02 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social;
+package org.apache.shindig.social.opensocial.model;
import org.json.JSONException;
import org.json.JSONArray;
Copied:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java
(from r636272,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/MediaItem.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java?p2=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/MediaItem.java&r1=636272&r2=636351&rev=636351&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/MediaItem.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java
Wed Mar 12 07:54:02 2008
@@ -15,14 +15,16 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social;
+package org.apache.shindig.social.opensocial.model;
+
+import org.apache.shindig.social.AbstractGadgetData;
/**
* see
*
http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Activity.MediaItem.Field.html
*
*/
-public class MediaItem extends AbstractSocialData {
+public class MediaItem extends AbstractGadgetData {
private String mimeType;
private Type type;
private String url;
Copied:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Name.java
(from r636272,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Name.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Name.java?p2=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Name.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Name.java&r1=636272&r2=636351&rev=636351&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Name.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Name.java
Wed Mar 12 07:54:02 2008
@@ -15,14 +15,16 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social;
+package org.apache.shindig.social.opensocial.model;
+
+import org.apache.shindig.social.AbstractGadgetData;
/**
* see
*
http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Name.Field.html
*
*/
-public class Name extends AbstractSocialData {
+public class Name extends AbstractGadgetData {
private String additionalName;
private String familyName;
private String givenName;
Copied:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/OpenSocialDataType.java
(from r636272,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/SocialDataType.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/OpenSocialDataType.java?p2=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/OpenSocialDataType.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/SocialDataType.java&r1=636272&r2=636351&rev=636351&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/SocialDataType.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/OpenSocialDataType.java
Wed Mar 12 07:54:02 2008
@@ -15,8 +15,8 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social;
+package org.apache.shindig.social.opensocial.model;
-public enum SocialDataType {
+public enum OpenSocialDataType {
FETCH_PEOPLE, FETCH_PERSON_APP_DATA, UPDATE_PERSON_APP_DATA, FETCH_ACTIVITIES
}
Copied:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java
(from r636272,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Organization.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java?p2=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Organization.java&r1=636272&r2=636351&rev=636351&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Organization.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java
Wed Mar 12 07:54:02 2008
@@ -15,7 +15,9 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social;
+package org.apache.shindig.social.opensocial.model;
+
+import org.apache.shindig.social.AbstractGadgetData;
import java.util.Date;
@@ -24,7 +26,7 @@
*
http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Organization.Field.html
*
*/
-public class Organization extends AbstractSocialData {
+public class Organization extends AbstractGadgetData {
private Address address;
private String description;
private Date endDate;
Copied:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
(from r636272,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Person.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Person.java?p2=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Person.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Person.java&r1=636272&r2=636351&rev=636351&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Person.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
Wed Mar 12 07:54:02 2008
@@ -15,7 +15,10 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social;
+package org.apache.shindig.social.opensocial.model;
+
+import org.apache.shindig.social.AbstractGadgetData;
+import org.apache.shindig.social.Mandatory;
import java.util.Date;
@@ -24,7 +27,7 @@
*
http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Person.Field.html
*
*/
-public class Person extends AbstractSocialData{
+public class Person extends AbstractGadgetData {
// TODO: Create the rest of the person fields and objects
// TODO: Change all of the array objects to list objects for easier
// manipulation
Copied:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Phone.java
(from r636272,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Phone.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Phone.java?p2=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Phone.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Phone.java&r1=636272&r2=636351&rev=636351&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Phone.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Phone.java
Wed Mar 12 07:54:02 2008
@@ -15,14 +15,17 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social;
+package org.apache.shindig.social.opensocial.model;
+
+import org.apache.shindig.social.Mandatory;
+import org.apache.shindig.social.AbstractGadgetData;
/**
* see
*
http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Phone.Field.html
*
*/
-public class Phone extends AbstractSocialData {
+public class Phone extends AbstractGadgetData {
@Mandatory private String number;
private String type;
Copied:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Url.java
(from r636272,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Url.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Url.java?p2=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Url.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Url.java&r1=636272&r2=636351&rev=636351&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/Url.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/opensocial/model/Url.java
Wed Mar 12 07:54:02 2008
@@ -15,13 +15,15 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social;
+package org.apache.shindig.social.opensocial.model;
+
+import org.apache.shindig.social.AbstractGadgetData;
/**
* see
*
http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Url.Field.html
*/
-public class Url extends AbstractSocialData {
+public class Url extends AbstractGadgetData {
private String address;
private String linkText;
private String type;
Copied:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/BasicDataService.java
(from r636312,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/file/BasicDataHandler.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/BasicDataService.java?p2=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/BasicDataService.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/file/BasicDataHandler.java&r1=636312&r2=636351&rev=636351&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/file/BasicDataHandler.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/BasicDataService.java
Wed Mar 12 07:54:02 2008
@@ -15,11 +15,11 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social.file;
+package org.apache.shindig.social.samplecontainer;
-import org.apache.shindig.social.DataHandler;
import org.apache.shindig.social.ResponseItem;
import org.apache.shindig.social.ResponseError;
+import org.apache.shindig.social.opensocial.DataService;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -31,12 +31,12 @@
import java.util.List;
import java.util.Map;
-public class BasicDataHandler implements DataHandler {
+public class BasicDataService implements DataService {
// TODO: This obviously won't work on multiple servers
// If we care then we should do something about it
private static Map<String, Map<String, String>> allData;
- public BasicDataHandler() {
+ public BasicDataService() {
if (allData != null) {
return;
}
Copied:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/BasicPeopleService.java
(from r636312,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/file/BasicPeopleHandler.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/BasicPeopleService.java?p2=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/BasicPeopleService.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/file/BasicPeopleHandler.java&r1=636312&r2=636351&rev=636351&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/file/BasicPeopleHandler.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/BasicPeopleService.java
Wed Mar 12 07:54:02 2008
@@ -15,9 +15,14 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social.file;
+package org.apache.shindig.social.samplecontainer;
-import org.apache.shindig.social.*;
+import org.apache.shindig.social.opensocial.PeopleService;
+import org.apache.shindig.social.opensocial.model.IdSpec;
+import org.apache.shindig.social.opensocial.model.Person;
+import org.apache.shindig.social.opensocial.model.Phone;
+import org.apache.shindig.social.opensocial.model.Name;
+import org.apache.shindig.social.ResponseItem;
import org.json.JSONException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -30,13 +35,13 @@
import java.util.List;
import java.util.Map;
-public class BasicPeopleHandler implements PeopleHandler {
+public class BasicPeopleService implements PeopleService {
private Map<IdSpec.Type, List<String>> idMap
= new HashMap<IdSpec.Type, List<String>>();
private Map<String, Person> allPeople
= new HashMap<String, Person>();
- public BasicPeopleHandler() {
+ public BasicPeopleService() {
// TODO: Get file from user in web ui
String stateFile =
"http://localhost:8080/gadgets/files/samplecontainer/state-basicfriendlist.xml";;
XmlStateFileFetcher fetcher = new XmlStateFileFetcher(stateFile);
Copied:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/XmlStateFileFetcher.java
(from r636272,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/file/XmlStateFileFetcher.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/XmlStateFileFetcher.java?p2=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/XmlStateFileFetcher.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/file/XmlStateFileFetcher.java&r1=636272&r2=636351&rev=636351&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/file/XmlStateFileFetcher.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/XmlStateFileFetcher.java
Wed Mar 12 07:54:02 2008
@@ -1,4 +1,4 @@
-package org.apache.shindig.social.file;
+package org.apache.shindig.social.samplecontainer;
import org.w3c.dom.Document;
import org.apache.shindig.gadgets.RemoteContentFetcher;
Modified: incubator/shindig/trunk/java/gadgets/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/webapp/WEB-INF/web.xml?rev=636351&r1=636350&r2=636351&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/webapp/WEB-INF/web.xml
(original)
+++ incubator/shindig/trunk/java/gadgets/src/main/webapp/WEB-INF/web.xml Wed
Mar 12 07:54:02 2008
@@ -64,7 +64,7 @@
<servlet>
<servlet-name>socialdata</servlet-name>
<servlet-class>
- org.apache.shindig.social.http.SocialDataServlet
+ org.apache.shindig.social.GadgetDataServlet
</servlet-class>
</servlet>
Copied:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/social/GadgetDataTest.java
(from r636312,
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/social/SocialDataTest.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/social/GadgetDataTest.java?p2=incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/social/GadgetDataTest.java&p1=incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/social/SocialDataTest.java&r1=636312&r2=636351&rev=636351&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/social/SocialDataTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/social/GadgetDataTest.java
Wed Mar 12 07:54:02 2008
@@ -19,13 +19,14 @@
import org.json.JSONArray;
import org.json.JSONObject;
+import org.apache.shindig.social.opensocial.model.*;
import junit.framework.TestCase;
import java.util.Map;
import java.util.HashMap;
-public class SocialDataTest extends TestCase {
+public class GadgetDataTest extends TestCase {
private Person johnDoe;
private Activity activity;
