You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by lr...@apache.org on 2008/07/08 03:45:46 UTC
svn commit: r674702 - in /incubator/shindig/trunk/java/social-api: ./
src/main/java/org/apache/shindig/social/canonical/
src/test/java/org/apache/shindig/social/canonical/
Author: lryan
Date: Mon Jul 7 18:45:45 2008
New Revision: 674702
URL: http://svn.apache.org/viewvc?rev=674702&view=rev
Log:
Fixed file names and hardcoded loading of JSON file
Added:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/canonical/JsonOpensocialService.java
- copied, changed from r674686, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/canonical/JSONOpensocialService.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JsonOpensocialServiceTest.java
- copied, changed from r674686, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JSONOpensocialServiceTest.java
Removed:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/canonical/JSONOpensocialService.java
Modified:
incubator/shindig/trunk/java/social-api/pom.xml
Modified: incubator/shindig/trunk/java/social-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/pom.xml?rev=674702&r1=674701&r2=674702&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/pom.xml (original)
+++ incubator/shindig/trunk/java/social-api/pom.xml Mon Jul 7 18:45:45 2008
@@ -44,6 +44,13 @@
<resource>
<directory>conf</directory>
</resource>
+ <resource>
+ <directory>${basedir}/../../javascript/sampledata/</directory>
+ <targetPath>sampledata</targetPath>
+ <includes>
+ <include>**/*.*</include>
+ </includes>
+ </resource>
</resources>
</build>
Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/canonical/JsonOpensocialService.java (from r674686, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/canonical/JSONOpensocialService.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/canonical/JsonOpensocialService.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/canonical/JsonOpensocialService.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/canonical/JSONOpensocialService.java&r1=674686&r2=674702&rev=674702&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/canonical/JSONOpensocialService.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/canonical/JsonOpensocialService.java Mon Jul 7 18:45:45 2008
@@ -26,6 +26,7 @@
import org.apache.commons.io.IOUtils;
import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.common.util.ResourceLoader;
import org.apache.shindig.social.ResponseError;
import org.apache.shindig.social.ResponseItem;
import org.apache.shindig.social.dataservice.ActivityService;
@@ -50,7 +51,7 @@
/**
* Implementation of supported services backed by a JSON DB
*/
-public class JSONOpensocialService implements ActivityService, PersonService, AppDataService {
+public class JsonOpensocialService implements ActivityService, PersonService, AppDataService {
/**
* The DB
@@ -83,9 +84,9 @@
private static final String FRIEND_LINK_TABLE = "friendLinks";
@Inject
- public JSONOpensocialService(@Named("canonical.json.db")String jsonLocation,
+ public JsonOpensocialService(@Named("canonical.json.db")String jsonLocation,
BeanConverter converter) throws Exception {
- String content = IOUtils.toString(new java.net.URL(jsonLocation).openStream(), "UTF-8");
+ String content = IOUtils.toString(ResourceLoader.openResource(jsonLocation), "UTF-8");
this.db = new JSONObject(content);
this.converter = converter;
}
Copied: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JsonOpensocialServiceTest.java (from r674686, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JSONOpensocialServiceTest.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JsonOpensocialServiceTest.java?p2=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JsonOpensocialServiceTest.java&p1=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JSONOpensocialServiceTest.java&r1=674686&r2=674702&rev=674702&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JSONOpensocialServiceTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JsonOpensocialServiceTest.java Mon Jul 7 18:45:45 2008
@@ -40,9 +40,9 @@
/**
* Test the JSONOpensocialService
*/
-public class JSONOpensocialServiceTest extends TestCase {
+public class JsonOpensocialServiceTest extends TestCase {
- private JSONOpensocialService db;
+ private JsonOpensocialService db;
private static final UserId CANON_USER = new UserId(UserId.Type.userId, "canonical");
private static final GroupId SELF_GROUP = new GroupId(GroupId.Type.self, null);
@@ -56,8 +56,8 @@
protected void setUp() throws Exception {
BeanJsonConverter beanJsonConverter = new BeanJsonConverter(
Guice.createInjector(new SocialApiTestsGuiceModule()));
- db = new JSONOpensocialService(
- "file:///home/lryan/shindig/trunk/javascript/sampledata/canonicaldb.json",
+ db = new JsonOpensocialService(
+ "sampledata/canonicaldb.json",
beanJsonConverter);
}