[gatein-commits] gatein SVN: r4722 - in components/shindig/trunk/java/gadgets/src: test/java/org/apache/shindig/gadgets/render and 1 other directory.

Author: thomas.heute(a)jboss.com Date: 2010-10-19 08:32:08 -0400 (Tue, 19 Oct 2010) New Revision: 4722 Modified: components/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java components/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java Log: GTNPORTAL-1539: Remove gadget Error 404 in logs Reverted previious fix tentative Modified: components/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java =================================================================== --- components/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java 2010-10-19 09:45:31 UTC (rev 4721) +++ components/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java 2010-10-19 12:32:08 UTC (rev 4722) @@ -51,7 +51,7 @@ static final Logger logger = Logger.getLogger(Renderer.class.getName()); - static final String JSON_RESPONSE_WRAPPER_ELEMENT = "result"; + static final String JSON_RESPONSE_WRAPPER_ELEMENT = "data"; static final String OSAPI_FEATURE_CONFIG = "osapi"; Modified: components/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java =================================================================== --- components/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java 2010-10-19 09:45:31 UTC (rev 4721) +++ components/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java 2010-10-19 12:32:08 UTC (rev 4722) @@ -113,11 +113,11 @@ public void testReadConfigWithValidEndpoints() throws Exception { List<String> endPoint1Services = ImmutableList.of("do.something", "delete.someting"); JSONObject service1 = new JSONObject(); - service1.put("result", endPoint1Services); + service1.put("data", endPoint1Services); List<String> endPoint2Services = ImmutableList.of("weather.get"); JSONObject service2 = new JSONObject(); - service2.put("result", endPoint2Services); + service2.put("data", endPoint2Services); EasyMock.expect(mockFetcher.fetch(EasyMock.isA(HttpRequest.class))).andReturn( new HttpResponse(service1.toString()));