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 14:30:36 UTC
svn commit: r821530 - in
/incubator/wink/trunk/wink-examples/ext/DynamicResource: build.xml
src/main/java/org/apache/wink/example/dynamicresource/BookmarksResource.java
Author: elman
Date: Sun Oct 4 12:30:35 2009
New Revision: 821530
URL: http://svn.apache.org/viewvc?rev=821530&view=rev
Log:
Remove json related code.
Modified:
incubator/wink/trunk/wink-examples/ext/DynamicResource/build.xml
incubator/wink/trunk/wink-examples/ext/DynamicResource/src/main/java/org/apache/wink/example/dynamicresource/BookmarksResource.java
Modified: incubator/wink/trunk/wink-examples/ext/DynamicResource/build.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/DynamicResource/build.xml?rev=821530&r1=821529&r2=821530&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/DynamicResource/build.xml (original)
+++ incubator/wink/trunk/wink-examples/ext/DynamicResource/build.xml Sun Oct 4 12:30:35 2009
@@ -40,8 +40,6 @@
<target name="init">
- <!-- Create the time stamp -->
- <tstamp />
<!-- Create the build directory structure used by compile -->
<mkdir dir="${build.classes}" />
</target>
@@ -67,7 +65,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/ext/DynamicResource/src/main/java/org/apache/wink/example/dynamicresource/BookmarksResource.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/DynamicResource/src/main/java/org/apache/wink/example/dynamicresource/BookmarksResource.java?rev=821530&r1=821529&r2=821530&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/DynamicResource/src/main/java/org/apache/wink/example/dynamicresource/BookmarksResource.java (original)
+++ incubator/wink/trunk/wink-examples/ext/DynamicResource/src/main/java/org/apache/wink/example/dynamicresource/BookmarksResource.java Sun Oct 4 12:30:35 2009
@@ -55,16 +55,15 @@
/**
* 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 in the response.
+ * 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 in
+ * the response.
*
- * @return the SyndFeed instance that will be serialized as an Atom or as
- * Json
+ * @return the SyndFeed instance that will be serialized as an Atom
*/
@GET
- @Produces( {MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
+ @Produces( {MediaType.APPLICATION_ATOM_XML})
public SyndFeed getBookmarks(@Context LinkBuilders linkBuilders, @Context UriInfo uriInfo) {
SyndFeed feed = new SyndFeed();
feed.setId("urn:collection:bookmarks");
@@ -94,17 +93,17 @@
/**
* 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.
*
* @return response indicating the creation of the bookmark
*/
@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 linkBuilders) {
@@ -126,17 +125,17 @@
/**
* 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 bookmarkId the bookmark id to get as it appears on the request uri
* @return SyndEntry with the information about the bookmark
*/
@Path(SUB_RESOURCE_PATH)
@GET
- @Produces( {MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
+ @Produces( {MediaType.APPLICATION_ATOM_XML})
public SyndEntry getBookmark(@Context LinkBuilders linkBuilders,
@Context UriInfo uriInfo,
@PathParam("bookmark") String bookmarkId) {
@@ -152,11 +151,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
@@ -166,7 +165,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 linkBuilders,
@Context UriInfo uriInfo,
@@ -187,9 +186,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 bookmarkId the bookmark id to update as it appears on the request
* uri
@@ -198,7 +196,6 @@
@Path(SUB_RESOURCE_PATH)
@DELETE
- @Produces( {MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
public SyndEntry deleteBookmark(@Context LinkBuilders linkBuilders,
@Context UriInfo uriInfo,
@PathParam("bookmark") String bookmarkId) {