You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by el...@apache.org on 2009/10/04 11:51:02 UTC
svn commit: r821493 - in /incubator/wink/trunk/wink-examples/apps/Bookmarks:
build.xml
src/main/java/org/apache/wink/example/bookmarks/BookmarksResource.java
Author: elman
Date: Sun Oct 4 09:51:01 2009
New Revision: 821493
URL: http://svn.apache.org/viewvc?rev=821493&view=rev
Log:
Remove json related code.
Modified:
incubator/wink/trunk/wink-examples/apps/Bookmarks/build.xml
incubator/wink/trunk/wink-examples/apps/Bookmarks/src/main/java/org/apache/wink/example/bookmarks/BookmarksResource.java
Modified: incubator/wink/trunk/wink-examples/apps/Bookmarks/build.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/Bookmarks/build.xml?rev=821493&r1=821492&r2=821493&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/Bookmarks/build.xml (original)
+++ incubator/wink/trunk/wink-examples/apps/Bookmarks/build.xml Sun Oct 4 09:51:01 2009
@@ -41,8 +41,6 @@
<target name="init">
- <!-- Create the time stamp -->
- <tstamp />
<!-- Create the build directory structure used by compile -->
<mkdir dir="${build.classes}" />
</target>
@@ -68,7 +66,7 @@
<war destfile="${final.war}" webxml="${webapp}/WEB-INF/web.xml">
<webinf dir="${webapp}/WEB-INF" includes="**/*" />
<classes dir="${build.classes}" includes="**/*" />
- <lib dir="${sdk.lib}" includes="*.jar" excludes="spring*.jar"/>
+ <lib dir="${sdk.lib}" includes="*.jar" />
<lib file="${sdk.jar}" />
</war>
</target>
Modified: incubator/wink/trunk/wink-examples/apps/Bookmarks/src/main/java/org/apache/wink/example/bookmarks/BookmarksResource.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/Bookmarks/src/main/java/org/apache/wink/example/bookmarks/BookmarksResource.java?rev=821493&r1=821492&r2=821493&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/Bookmarks/src/main/java/org/apache/wink/example/bookmarks/BookmarksResource.java (original)
+++ incubator/wink/trunk/wink-examples/apps/Bookmarks/src/main/java/org/apache/wink/example/bookmarks/BookmarksResource.java Sun Oct 4 09:51:01 2009
@@ -56,17 +56,16 @@
/**
* This method is invoked when the HTTP GET method is issued by the client.
* This occurs only when the requested representation (Http Accept header)
- * is Atom (application/atom+xml) or Json (application/json). The feed is
- * created with the mandatory fields. The feed will also contain the entries
- * found in the BookmarksStore. Links are generated for the feed and for the
- * entries.
+ * is Atom (application/atom+xml). The feed is created with the mandatory
+ * fields. The feed will also contain the entries found in the
+ * BookmarksStore. Links are generated for the feed and for the entries.
*
* @param linksBuilders
* @param uriInfo
* @return syndFeed
*/
@GET
- @Produces( {MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
+ @Produces( {MediaType.APPLICATION_ATOM_XML})
public SyndFeed getBookmarks(@Context LinkBuilders linksBuilders, @Context UriInfo uriInfo) {
SyndFeed feed = new SyndFeed();
feed.setId("urn:collection:bookmarks");
@@ -102,11 +101,11 @@
/**
* This method is invoked when the HTTP POST method is issued by the client.
* This occurs only when the requested representation (Http Accept header)
- * is Atom (application/atom+xml) or Json (application/json) and plain text
- * is provided in the HTTP request message body of content MIME type
- * "text/plain" (header "Content-Type" must be "text/plain"). This method
- * creates a new Bookmark resource based on the data in the request and puts
- * the new Bookmark into the BookmarkStore.
+ * is Atom (application/atom+xml) and plain text is provided in the HTTP
+ * request message body of content MIME type "text/plain" (header
+ * "Content-Type" must be "text/plain"). This method creates a new Bookmark
+ * resource based on the data in the request and puts the new Bookmark into
+ * the BookmarkStore.
*
* @param bookmark to create
* @param uriInfo object
@@ -115,7 +114,7 @@
*/
@POST
@Consumes( {MediaType.TEXT_PLAIN})
- @Produces( {MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
+ @Produces( {MediaType.APPLICATION_ATOM_XML})
public Response createBookmark(String bookmark,
@Context UriInfo uriInfo,
@Context LinkBuilders linksBuilders) {
@@ -139,10 +138,10 @@
/**
* This method is invoked when the HTTP GET method is issued by the client.
* This occurs only when the requested representation (Http Accept header)
- * is Atom (application/atom+xml) or Json (application/json). In the case
- * that the requested bookmark is found in the BookmarkStore a synd entry is
- * created with mandatory metadata fields and with metadata content that is
- * taken from the BookmarkStore.
+ * is Atom (application/atom+xml). In the case that the requested bookmark
+ * is found in the BookmarkStore a synd entry is created with mandatory
+ * metadata fields and with metadata content that is taken from the
+ * BookmarkStore.
*
* @param linksBuilders
* @param uriInfo
@@ -151,7 +150,7 @@
*/
@Path(SUB_RESOURCE_PATH)
@GET
- @Produces( {MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
+ @Produces( {MediaType.APPLICATION_ATOM_XML})
public SyndEntry getBookmark(@Context LinkBuilders linksBuilders,
@Context UriInfo uriInfo,
@PathParam(BOOKMARK) String bookmarkId) {
@@ -173,11 +172,11 @@
/**
* This method is invoked when the HTTP PUT method is issued by the client.
* This occurs only when the requested representation (Http Accept header)
- * is Atom (application/atom+xml) or Json (application/json) and plain text
- * is provided in the HTTP request message body of content MIME type
- * "text/plain" (header "Content-Type" must be "text/plain"). This method
- * will update the requested bookmark in the BookmarkStore with new content
- * taken from the request message body.
+ * is Atom (application/atom+xml) and plain text is provided in the HTTP
+ * request message body of content MIME type "text/plain" (header
+ * "Content-Type" must be "text/plain"). This method will update the
+ * requested bookmark in the BookmarkStore with new content taken from the
+ * request message body.
*
* @param bookmarkId the bookmark id to update as it appears on the request
* uri
@@ -187,7 +186,7 @@
@Path(SUB_RESOURCE_PATH)
@PUT
@Consumes(MediaType.TEXT_PLAIN)
- @Produces( {MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
+ @Produces( {MediaType.APPLICATION_ATOM_XML})
public SyndEntry updateBookmark(String bookmark,
@Context LinkBuilders linksBuilders,
@Context UriInfo uriInfo,
@@ -213,9 +212,8 @@
/**
* This method is invoked when the HTTP DELETE method is issued by the
* client. This occurs only when the requested representation (Http Accept
- * header) is Atom (application/atom+xml) or Json (application/json). This
- * method deletes the bookmark from the BookmarkStore and returns the
- * deleted bookmark.
+ * header) is Atom (application/atom+xml). This method deletes the bookmark
+ * from the BookmarkStore and returns the deleted bookmark.
*
* @param linksBuilders
* @param uriInfo
@@ -225,7 +223,7 @@
*/
@Path(SUB_RESOURCE_PATH)
@DELETE
- @Produces( {MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
+ @Produces( {MediaType.APPLICATION_ATOM_XML})
public SyndEntry deleteBookmark(@Context LinkBuilders linksBuilders,
@Context UriInfo uriInfo,
@PathParam(BOOKMARK) String bookmarkId) {