You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/09/07 06:21:04 UTC
svn commit: r993211 - in /shindig/trunk/java:
common/src/main/java/org/apache/shindig/common/servlet/
common/src/test/java/org/apache/shindig/common/cache/ehcache/
gadgets/src/main/java/org/apache/shindig/gadgets/
gadgets/src/main/java/org/apache/shind...
Author: lindner
Date: Tue Sep 7 04:21:03 2010
New Revision: 993211
URL: http://svn.apache.org/viewvc?rev=993211&view=rev
Log:
replace tabs with spaces
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProviderTest.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthArgumentsTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthResponseParamsTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PipelinedDataTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/XmlTemplateLibraryTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java
shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulJsonActivityTest.java
shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulJsonPeopleTest.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AlbumService.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MediaItemService.java
shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java
shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamConverterTest.java
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java?rev=993211&r1=993210&r2=993211&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java Tue Sep 7 04:21:03 2010
@@ -99,9 +99,9 @@ public class GuiceServletContextListener
String value=null;
if(systemProperties!=null && systemProperties.trim().length()>0){
for (String aProperty : StringUtils.split(systemProperties, '\n')){
- String[] keyAndvalue = StringUtils.split(aProperty.trim(), "=",2);
+ String[] keyAndvalue = StringUtils.split(aProperty.trim(), "=",2);
if(keyAndvalue.length==2){
- key=keyAndvalue[0];
+ key=keyAndvalue[0];
value=keyAndvalue[1];
//set the system property if they are not empty
if(key!=null && key.trim().length()>0 && value!=null && value.trim().length()>0){
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProviderTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProviderTest.java?rev=993211&r1=993210&r2=993211&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProviderTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProviderTest.java Tue Sep 7 04:21:03 2010
@@ -35,7 +35,7 @@ public class EhCacheCacheProviderTest {
public static void setup() throws Exception {
defaultProvider = new EhCacheCacheProvider(
"res://org/apache/shindig/common/cache/ehcache/ehcacheConfig.xml", true, true);
- }
+ }
@Test
public void getNamedCache() throws Exception {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java?rev=993211&r1=993210&r2=993211&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java Tue Sep 7 04:21:03 2010
@@ -137,7 +137,7 @@ public class DefaultGuiceModule extends
public static final ThreadFactory DAEMON_THREAD_FACTORY =
new ThreadFactory() {
private final ThreadFactory factory = Executors.defaultThreadFactory();
-
+
public Thread newThread(Runnable r) {
Thread t = factory.newThread(r);
t.setDaemon(true);
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java?rev=993211&r1=993210&r2=993211&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java Tue Sep 7 04:21:03 2010
@@ -619,11 +619,11 @@ public final class HttpResponse implemen
responseBytes = new byte[bodyLength];
int cnt, offset = 0;
while ((cnt = in.read(responseBytes, offset, bodyLength)) > 0) {
- offset += cnt;
- bodyLength -= cnt;
+ offset += cnt;
+ bodyLength -= cnt;
}
if (offset != responseBytes.length) {
- throw new IOException("Invalid body! Expected length = " + responseBytes.length + ", bytes readed = " + offset + '.');
+ throw new IOException("Invalid body! Expected length = " + responseBytes.length + ", bytes readed = " + offset + '.');
}
date = getAndUpdateDate(headerCopy);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthArgumentsTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthArgumentsTest.java?rev=993211&r1=993210&r2=993211&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthArgumentsTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthArgumentsTest.java Tue Sep 7 04:21:03 2010
@@ -43,13 +43,13 @@ public class OAuthArgumentsTest {
@Test
public void testInitFromPreload() throws Exception {
String xml = "<Preload href='http://www.example.com' " +
- "oauth_service_name='service' " +
- "OAUTH_TOKEN_NAME='token' " +
- "OAUTH_REQuest_token='requesttoken' " +
- "oauth_request_token_secret='tokensecret' " +
- "OAUTH_USE_TOKEN='never' " +
- "random='stuff'" +
- "/>";
+ "oauth_service_name='service' " +
+ "OAUTH_TOKEN_NAME='token' " +
+ "OAUTH_REQuest_token='requesttoken' " +
+ "oauth_request_token_secret='tokensecret' " +
+ "OAUTH_USE_TOKEN='never' " +
+ "random='stuff'" +
+ "/>";
Preload preload = new Preload(XmlUtil.parse(xml), Uri.parse(""));
OAuthArguments params = new OAuthArguments(preload);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthResponseParamsTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthResponseParamsTest.java?rev=993211&r1=993210&r2=993211&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthResponseParamsTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthResponseParamsTest.java Tue Sep 7 04:21:03 2010
@@ -170,7 +170,7 @@ public class OAuthResponseParamsTest {
@Test
public void testStripSensitiveFromResponse() {
verifyStrip("oauth_token=dbce9de6d6da692b99b39cdcde60fd83&oauth_token_secret=60c1aabe0f6db96" +
- "f2719956168c08d9d");
+ "f2719956168c08d9d");
String out = verifyStrip("oauth_token=dbce9de6d6da692b99b39cdcde60fd83&oauth_token_secret" +
"=60c1aabe0f6db96f2719956168c08d9d&oauth_session_handle=ABCDEFGH");
@@ -203,11 +203,11 @@ public class OAuthResponseParamsTest {
public void testStripSecretsFromRequestHeader() {
HttpRequest req = new HttpRequest(Uri.parse("http://www.example.com/foo"));
req.setHeader("Authorization", "OAuth opensocial_owner_id=\"owner\", opensocial_viewer_id=" +
- "\"owner\", opensocial_app_id=\"app\", opensocial_app_url=\"http%3A%2F%2Fwww.examp" +
- "le.com%2Fheader.xml\", oauth_version=\"1.0\", oauth_timestamp=\"1231461306\", oau" +
- "th_consumer_key=\"consumer\", oauth_signature_method=\"HMAC-SHA1\", oauth_nonce" +
- "=\"1231461308333563000\", oauth_session_handle=\"w0zAI1yN5ZRvmBX5kcVdra5%2BbZE%" +
- "3D\"");
+ "\"owner\", opensocial_app_id=\"app\", opensocial_app_url=\"http%3A%2F%2Fwww.examp" +
+ "le.com%2Fheader.xml\", oauth_version=\"1.0\", oauth_timestamp=\"1231461306\", oau" +
+ "th_consumer_key=\"consumer\", oauth_signature_method=\"HMAC-SHA1\", oauth_nonce" +
+ "=\"1231461308333563000\", oauth_session_handle=\"w0zAI1yN5ZRvmBX5kcVdra5%2BbZE%" +
+ "3D\"");
String filtered = OAuthResponseParams.filterSecrets(req.toString());
checkStringContains(filtered, "oauth_session_handle=REMOVED");
}
@@ -215,11 +215,11 @@ public class OAuthResponseParamsTest {
@Test
public void testStripSecretsFromRequestUrl() {
HttpRequest req = new HttpRequest(Uri.parse("http://www.example.com/access?param=foo&openso" +
- "cial_owner_id=owner&opensocial_viewer_id=owner&opensocial_app_id=app&" +
- "oauth_session_handle" +
- "=http%3A%2F%2Fwww.example.com%2Fgadget.xml&oauth_version=1.0&oauth_timestamp=12" +
- "31461132&oauth_consumer_key=consumer&oauth_signature_method=HMAC-SHA1&oauth_nonce=1" +
- "231461160262578000&oauth_signature=HuFQ%2BRYTrRzcgsi3al6ld9Msvoo%3D"));
+ "cial_owner_id=owner&opensocial_viewer_id=owner&opensocial_app_id=app&" +
+ "oauth_session_handle" +
+ "=http%3A%2F%2Fwww.example.com%2Fgadget.xml&oauth_version=1.0&oauth_timestamp=12" +
+ "31461132&oauth_consumer_key=consumer&oauth_signature_method=HMAC-SHA1&oauth_nonce=1" +
+ "231461160262578000&oauth_signature=HuFQ%2BRYTrRzcgsi3al6ld9Msvoo%3D"));
String filtered = OAuthResponseParams.filterSecrets(req.toString());
checkStringContains(filtered, "oauth_session_handle=REMOVED");
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java?rev=993211&r1=993210&r2=993211&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java Tue Sep 7 04:21:03 2010
@@ -74,7 +74,7 @@ public class PipelinedDataPreloaderTest
+ "refreshInterval=\"60\" method=\"POST\"/>" + "</Content></Module>";
private static final String XML_WITH_VARIABLE = "<Module " +
- "xmlns:os=\"" + PipelinedData.OPENSOCIAL_NAMESPACE + "\" " +
+ "xmlns:os=\"" + PipelinedData.OPENSOCIAL_NAMESPACE + "\" " +
"xmlns:osx=\"" + PipelinedData.EXTENSION_NAMESPACE + "\">"
+ "<ModulePrefs title=\"Title\"/>"
+ "<Content href=\"http://example.org/proxied.php\" view=\"profile\">"
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java?rev=993211&r1=993210&r2=993211&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java Tue Sep 7 04:21:03 2010
@@ -111,8 +111,7 @@ public class ConcatVisitorTest extends D
css3 = elem("link", "rel", "stylesheet", "type", "text/css", "href", CSS3_URL_STR);
css4 = elem("link", "rel", "stylesheet", "type", "text/css", "href", CSS4_URL_STR);
css5 = elem("link", "rel", "stylesheet", "type", "text/css", "media", "print", "href", CSS5_URL_STR);
- css6 = elem("link", "rel", "stylesheet", "type", "text/css", "media", "print", "href",
- CSS6_URL_STR);
+ css6 = elem("link", "rel", "stylesheet", "type", "text/css", "media", "print", "href", CSS6_URL_STR);
css7 = elem("link", "rel", "stylesheet", "type", "text/css", "media", "screen", "href", CSS7_URL_STR);
css8 = elem("link", "rel", "stylesheet", "type", "text/css", "media", "screen", "href", CSS8_URL_STR);
css9 = elem("link", "rel", "stylesheet", "type", "text/css", "href", CSS9_URL_STR);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PipelinedDataTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PipelinedDataTest.java?rev=993211&r1=993210&r2=993211&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PipelinedDataTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PipelinedDataTest.java Tue Sep 7 04:21:03 2010
@@ -282,8 +282,8 @@ public class PipelinedDataTest {
@Test
public void testBatching() throws Exception {
String xml = "<Content xmlns=\"" + PipelinedData.OPENSOCIAL_NAMESPACE + "\">"
- + "<PeopleRequest key=\"key\" userId=\"${userId}\"/>"
- + "<HttpRequest key=\"key2\" href=\"${key}\"/>"
+ + "<PeopleRequest key=\"key\" userId=\"${userId}\"/>"
+ + "<HttpRequest key=\"key2\" href=\"${key}\"/>"
+ "</Content>";
PipelinedData socialData = new PipelinedData(XmlUtil.parse(xml), GADGET_URI);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java?rev=993211&r1=993210&r2=993211&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java Tue Sep 7 04:21:03 2010
@@ -97,7 +97,7 @@ public class DefaultTemplateProcessorTes
variables.put("toys", new JSONObject("{ list: [{name: 'Ball'}, {name: 'Car'}]}"));
variables.put("countries", new JSONArray("['Ireland','France']"));
variables.put("xss", new JSONObject("{ script: '<script>alert();</script>'," +
- "quote:'\"><script>alert();</script>'}"));
+ "quote:'\"><script>alert();</script>'}"));
}
@Test
@@ -210,7 +210,7 @@ public class DefaultTemplateProcessorTes
@Test
public void testBooleanAttributes() throws Exception {
String output = executeTemplate("<input class=\"${1 == 2}\" readonly=\"${1 == 2}\"" +
- "disabled=\"${1 == 1}\">");
+ "disabled=\"${1 == 1}\">");
assertEquals("<input class=\"false\" disabled=\"disabled\">", output);
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/XmlTemplateLibraryTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/XmlTemplateLibraryTest.java?rev=993211&r1=993210&r2=993211&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/XmlTemplateLibraryTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/XmlTemplateLibraryTest.java Tue Sep 7 04:21:03 2010
@@ -106,8 +106,8 @@ public class XmlTemplateLibraryTest {
// with the first tag for the whole library
handlerWithNoResources.process(result, tag, processor);
assertEquals("<STYLE>libstyle\nlibstyle2</STYLE>" +
- "<JAVASCRIPT>libscript\nlibscript2</JAVASCRIPT>",
- serializeResources(context));
+ "<JAVASCRIPT>libscript\nlibscript2</JAVASCRIPT>",
+ serializeResources(context));
// Now script and style elements for the tag should get registered
handlerWithResources.process(result, tag, processor);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java?rev=993211&r1=993210&r2=993211&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java Tue Sep 7 04:21:03 2010
@@ -84,10 +84,10 @@ public class VariableSubstituterTest {
@Test
public void userPrefsSubstituted() throws Exception {
String xml = "<Module>" +
- "<ModulePrefs title='I heart __UP_foo__'/>" +
- "<UserPref name='foo'/>" +
- "<Content/>" +
- "</Module>";
+ "<ModulePrefs title='I heart __UP_foo__'/>" +
+ "<UserPref name='foo'/>" +
+ "<Content/>" +
+ "</Module>";
GadgetSpec spec = new GadgetSpec(Uri.parse("#"), xml);
GadgetContext context = new GadgetContext() {
@Override
Modified: shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulJsonActivityTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulJsonActivityTest.java?rev=993211&r1=993210&r2=993211&view=diff
==============================================================================
--- shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulJsonActivityTest.java (original)
+++ shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulJsonActivityTest.java Tue Sep 7 04:21:03 2010
@@ -41,19 +41,19 @@ public class JpaRestfulJsonActivityTest
*
* @throws Exception the exception
*/
- @Before
- public void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
- // Init config
- Injector injector = JpaRestfulTestConfigHelper.init();
- this.setServlet(JpaRestfulTestConfigHelper.getDataServiceServlet(injector));
-
- // Bootstrap hibernate and associated test db, and setup db with test data
- this.bootstrap = injector.getInstance(SpiDatabaseBootstrap.class);
+ // Init config
+ Injector injector = JpaRestfulTestConfigHelper.init();
+ this.setServlet(JpaRestfulTestConfigHelper.getDataServiceServlet(injector));
+
+ // Bootstrap hibernate and associated test db, and setup db with test data
+ this.bootstrap = injector.getInstance(SpiDatabaseBootstrap.class);
this.bootstrap.init();
- }
-
- @After
+ }
+
+ @After
public void tearDown() throws Exception {
this.bootstrap.tearDown();
}
Modified: shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulJsonPeopleTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulJsonPeopleTest.java?rev=993211&r1=993210&r2=993211&view=diff
==============================================================================
--- shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulJsonPeopleTest.java (original)
+++ shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulJsonPeopleTest.java Tue Sep 7 04:21:03 2010
@@ -55,6 +55,6 @@ public class JpaRestfulJsonPeopleTest ex
@After
public void tearDown() throws Exception {
this.bootstrap.tearDown();
- }
+ }
}
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java?rev=993211&r1=993210&r2=993211&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java Tue Sep 7 04:21:03 2010
@@ -43,10 +43,10 @@ public class MediaItemHandler {
*
* Allowed end-points: /mediaItems/{userId}+/{groupId}/{albumId}/{mediaItemId}+
*
- * Examples: /mediaItems/john.doe/@self
- * /mediaItems/john.doe,jane.doe/@self
- * /mediaItems/john.doe/@self/album123
- * /mediaItems/john.doe/@self/album123/1,2,3
+ * Examples: /mediaItems/john.doe/@self
+ * /mediaItems/john.doe,jane.doe/@self
+ * /mediaItems/john.doe/@self/album123
+ * /mediaItems/john.doe/@self/album123/1,2,3
*/
@Operation(httpMethods = "GET")
public Future<?> get(SocialRequestItem request) throws ProtocolException {
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AlbumService.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AlbumService.java?rev=993211&r1=993210&r2=993211&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AlbumService.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AlbumService.java Tue Sep 7 04:21:03 2010
@@ -40,11 +40,11 @@ public interface AlbumService {
/*
* Retrieves a single album for the given user with the given album ID.
*
- * @param userId Identifies the person to retrieve the album from
- * @param appId Identifies the application to retrieve the album from
- * @param fields Indicates the fields to return. Empty set implies all
- * @param albumId Identifies the album to retrieve
- * @param token A valid SecurityToken
+ * @param userId Identifies the person to retrieve the album from
+ * @param appId Identifies the application to retrieve the album from
+ * @param fields Indicates the fields to return. Empty set implies all
+ * @param albumId Identifies the album to retrieve
+ * @param token A valid SecurityToken
*
* @return a response item with the requested album
*/
@@ -54,12 +54,12 @@ public interface AlbumService {
/*
* Retrieves albums for the given user with the given album IDs.
*
- * @param userId Identifies the person to retrieve albums for
- * @param appId Identifies the application to retrieve albums from
- * @param fields The fields to return; empty set implies all
- * @param options The sorting/filtering/pagination options
- * @param albumIds The set of album ids to fetch
- * @param token A valid SecurityToken
+ * @param userId Identifies the person to retrieve albums for
+ * @param appId Identifies the application to retrieve albums from
+ * @param fields The fields to return; empty set implies all
+ * @param options The sorting/filtering/pagination options
+ * @param albumIds The set of album ids to fetch
+ * @param token A valid SecurityToken
*
* @return a response item with requested albums
*/
@@ -70,12 +70,12 @@ public interface AlbumService {
/*
* Retrieves albums for the given user and group.
*
- * @param userIds Identifies the users to retrieve albums from
- * @param groupId Identifies the group to retrieve albums from
- * @param appId Identifies the application to retrieve albums from
- * @param fields The fields to return. Empty set implies all
- * @param options The sorting/filtering/pagination options
- * @param token A valid SecurityToken
+ * @param userIds Identifies the users to retrieve albums from
+ * @param groupId Identifies the group to retrieve albums from
+ * @param appId Identifies the application to retrieve albums from
+ * @param fields The fields to return. Empty set implies all
+ * @param options The sorting/filtering/pagination options
+ * @param token A valid SecurityToken
*
* @return a response item with the requested albums
*/
@@ -87,10 +87,10 @@ public interface AlbumService {
/*
* Deletes a single album for the given user with the given album ID.
*
- * @param userId Identifies the user to delete the album from
- * @param appId Identifies the application to delete the album from
- * @param albumId Identifies the album to delete
- * @param token A valid SecurityToken
+ * @param userId Identifies the user to delete the album from
+ * @param appId Identifies the application to delete the album from
+ * @param albumId Identifies the album to delete
+ * @param token A valid SecurityToken
*
* @return a response item containing any errors
*/
@@ -100,10 +100,10 @@ public interface AlbumService {
/*
* Creates an album for the given user.
*
- * @param userId Identifies the user to create the album for
- * @param appId Identifies the application to create the album in
- * @param album The album to create
- * @param token A valid SecurityToken
+ * @param userId Identifies the user to create the album for
+ * @param appId Identifies the application to create the album in
+ * @param album The album to create
+ * @param token A valid SecurityToken
*
* @return a response containing any errors
*/
@@ -114,11 +114,11 @@ public interface AlbumService {
* Updates an album for the given user. The album ID specified in the REST
* end-point is used, even if the album also defines an ID.
*
- * @param userId Identifies the user to update the album for
- * @param appId Identifies the application to update the album in
- * @param album Defines the updated album
- * @param albumId Identifies the ID of the album to update
- * @param token A valid SecurityToken
+ * @param userId Identifies the user to update the album for
+ * @param appId Identifies the application to update the album in
+ * @param album Defines the updated album
+ * @param albumId Identifies the ID of the album to update
+ * @param token A valid SecurityToken
*
* @return a response containing any errors
*/
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MediaItemService.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MediaItemService.java?rev=993211&r1=993210&r2=993211&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MediaItemService.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MediaItemService.java Tue Sep 7 04:21:03 2010
@@ -21,12 +21,12 @@ public interface MediaItemService {
/*
* Retrieves a MediaItem by ID.
*
- * @param userId Identifies the owner of the MediaItem to retrieve
- * @param appId Identifies the application of the MeiaItem to retrieve
- * @param albumId Identifies the album containing the MediaItem
- * @param mediaItemId Identifies the MediaItem to retrieve
- * @param fields Indicates fields to be returned; empty set implies all
- * @param token A valid SecurityToken
+ * @param userId Identifies the owner of the MediaItem to retrieve
+ * @param appId Identifies the application of the MeiaItem to retrieve
+ * @param albumId Identifies the album containing the MediaItem
+ * @param mediaItemId Identifies the MediaItem to retrieve
+ * @param fields Indicates fields to be returned; empty set implies all
+ * @param token A valid SecurityToken
*
* @return a response item with the requested MediaItem
*/
@@ -37,13 +37,13 @@ public interface MediaItemService {
/*
* Retrieves MediaItems by IDs.
*
- * @param userId Identifies the owner of the MediaItems
- * @param appId Identifies the application of the MediaItems
- * @param albumId Identifies the album containing the MediaItems
- * @param mediaItemIds Identifies the MediaItems to retrieve
- * @param fields Specifies the fields to return; empty set implies all
- * @param options Sorting/filtering/pagination options
- * @param token A valid SecurityToken
+ * @param userId Identifies the owner of the MediaItems
+ * @param appId Identifies the application of the MediaItems
+ * @param albumId Identifies the album containing the MediaItems
+ * @param mediaItemIds Identifies the MediaItems to retrieve
+ * @param fields Specifies the fields to return; empty set implies all
+ * @param options Sorting/filtering/pagination options
+ * @param token A valid SecurityToken
*
* @return a response item with the requested MediaItems
*/
@@ -55,12 +55,12 @@ public interface MediaItemService {
/*
* Retrieves MediaItems by Album.
*
- * @param userId Identifies the owner of the MediaItems
- * @param appId Identifies the application of the MediaItems
- * @param albumId Identifies the Album containing the MediaItems
- * @param fields Specifies the fields to return; empty set implies all
- * @param options Sorting/filtering/pagination options
- * @param token A valid SecurityToken
+ * @param userId Identifies the owner of the MediaItems
+ * @param appId Identifies the application of the MediaItems
+ * @param albumId Identifies the Album containing the MediaItems
+ * @param fields Specifies the fields to return; empty set implies all
+ * @param options Sorting/filtering/pagination options
+ * @param token A valid SecurityToken
*
* @return a response item with the requested MediaItems
*/
@@ -72,12 +72,12 @@ public interface MediaItemService {
/*
* Retrieves MediaItems by users and groups.
*
- * @param userIds Identifies the users that this request is relative to
- * @param groupId Identifies the users' groups to retrieve MediaItems from
- * @param appId Identifies the application to retrieve MediaItems from
- * @param fields The fields to return; empty set implies all
- * @param options Sorting/filtering/pagination options
- * @param token A valid SecurityToken
+ * @param userIds Identifies the users that this request is relative to
+ * @param groupId Identifies the users' groups to retrieve MediaItems from
+ * @param appId Identifies the application to retrieve MediaItems from
+ * @param fields The fields to return; empty set implies all
+ * @param options Sorting/filtering/pagination options
+ * @param token A valid SecurityToken
*
* @return a response item with the requested MediaItems
*/
@@ -89,11 +89,11 @@ public interface MediaItemService {
/*
* Deletes a MediaItem by ID.
*
- * @param userId Identifies the owner of the MediaItem to delete
- * @param appId Identifies the application hosting the MediaItem
- * @param albumId Identifies the parent album of the MediaItem
- * @param mediaItemId Identifies the MediaItem to delete
- * @param token A valid SecurityToken
+ * @param userId Identifies the owner of the MediaItem to delete
+ * @param appId Identifies the application hosting the MediaItem
+ * @param albumId Identifies the parent album of the MediaItem
+ * @param mediaItemId Identifies the MediaItem to delete
+ * @param token A valid SecurityToken
*
* @return a response item containing any errors
*/
@@ -103,11 +103,11 @@ public interface MediaItemService {
/*
* Create a MediaItem in the given album for the given user.
*
- * @param userId Identifies the owner of the MediaItem to create
- * @param appId Identifies the application hosting the MediaItem
- * @param albumId Identifies the album to contain the MediaItem
- * @param mediaItem The MediaItem to create
- * @param token A valid SecurityToken
+ * @param userId Identifies the owner of the MediaItem to create
+ * @param appId Identifies the application hosting the MediaItem
+ * @param albumId Identifies the album to contain the MediaItem
+ * @param mediaItem The MediaItem to create
+ * @param token A valid SecurityToken
*
* @return a response containing any errors
*/
@@ -118,12 +118,12 @@ public interface MediaItemService {
* Updates a MediaItem for the given user. The MediaItem ID specified in
* the REST end-point is used, even if the MediaItem also defines an ID.
*
- * @param userId Identifies the owner of the MediaItem to update
- * @param appId Identifies the application hosting the MediaItem
- * @param albumId Identifies the album containing the MediaItem
- * @param mediaItemId Identifies the MediaItem to update
- * @param mediaItem The updated MediaItem to persist
- * @param token A valid SecurityToken
+ * @param userId Identifies the owner of the MediaItem to update
+ * @param appId Identifies the application hosting the MediaItem
+ * @param albumId Identifies the album containing the MediaItem
+ * @param mediaItemId Identifies the MediaItem to update
+ * @param mediaItem The updated MediaItem to persist
+ * @param token A valid SecurityToken
*
* @return a response containing any errors
*/
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java?rev=993211&r1=993210&r2=993211&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java Tue Sep 7 04:21:03 2010
@@ -163,8 +163,8 @@ public class BeanXStreamAtomConverterTes
+ " <osearch:startIndex>0</osearch:startIndex> "
+ " <osearch:totalResults>2</osearch:totalResults> "
+ " <osearch:itemsPerPage>2</osearch:itemsPerPage></feed> ";
- XMLUnit.setIgnoreWhitespace(true);
- XMLAssert.assertXMLEqual(expectedXml, xml);
+ XMLUnit.setIgnoreWhitespace(true);
+ XMLAssert.assertXMLEqual(expectedXml, xml);
}
@Test
@@ -185,8 +185,8 @@ public class BeanXStreamAtomConverterTes
+ " <osearch:startIndex>0</osearch:startIndex>"
+ " <osearch:totalResults>2</osearch:totalResults>"
+ " <osearch:itemsPerPage>2</osearch:itemsPerPage></feed>";
- XMLUnit.setIgnoreWhitespace(true);
- XMLAssert.assertXMLEqual(expectedXml, xml);
+ XMLUnit.setIgnoreWhitespace(true);
+ XMLAssert.assertXMLEqual(expectedXml, xml);
}
@Test
@@ -200,8 +200,8 @@ public class BeanXStreamAtomConverterTes
+ "<osearch:startIndex>0</osearch:startIndex>"
+ "<osearch:totalResults>1</osearch:totalResults>"
+ "<osearch:itemsPerPage>1</osearch:itemsPerPage></feed>";
- XMLUnit.setIgnoreWhitespace(true);
- XMLAssert.assertXMLEqual(expectedXml, xml);
+ XMLUnit.setIgnoreWhitespace(true);
+ XMLAssert.assertXMLEqual(expectedXml, xml);
List<List<String>> emptyLists = Lists.newArrayList();
List<String> emptyList = Lists.newArrayList();
@@ -216,8 +216,8 @@ public class BeanXStreamAtomConverterTes
+ "<osearch:startIndex>0</osearch:startIndex>"
+ "<osearch:totalResults>1</osearch:totalResults>"
+ "<osearch:itemsPerPage>1</osearch:itemsPerPage></feed>";
- XMLUnit.setIgnoreWhitespace(true);
- XMLAssert.assertXMLEqual(expectedXml, xml);
+ XMLUnit.setIgnoreWhitespace(true);
+ XMLAssert.assertXMLEqual(expectedXml, xml);
}
@Test
@@ -276,7 +276,7 @@ public class BeanXStreamAtomConverterTes
+ "<osearch:startIndex>0</osearch:startIndex>"
+ "<osearch:totalResults>1</osearch:totalResults>"
+ "<osearch:itemsPerPage>1</osearch:itemsPerPage>" + "</feed>";
- XMLUnit.setIgnoreWhitespace(true);
- XMLAssert.assertXMLEqual(expectedXml, xml);
+ XMLUnit.setIgnoreWhitespace(true);
+ XMLAssert.assertXMLEqual(expectedXml, xml);
}
}
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamConverterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamConverterTest.java?rev=993211&r1=993210&r2=993211&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamConverterTest.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamConverterTest.java Tue Sep 7 04:21:03 2010
@@ -247,8 +247,8 @@ public class BeanXStreamConverterTest ex
+ "</list.container>"
+ "</response>";
expectedXml = XSDValidator.insertSchema(expectedXml, XMLSCHEMA, true);
- XMLUnit.setIgnoreWhitespace(true);
- XMLAssert.assertXMLEqual(expectedXml, xml);
+ XMLUnit.setIgnoreWhitespace(true);
+ XMLAssert.assertXMLEqual(expectedXml, xml);
}
@Test