wink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From el...@apache.org
Subject svn commit: r821532 - in /incubator/wink/trunk/wink-examples/ext/LinkBuilders: build.xml src/main/java/org/apache/wink/example/linkbuilders/UsersResource.java
Date Sun, 04 Oct 2009 12:35:30 GMT
Author: elman
Date: Sun Oct  4 12:35:30 2009
New Revision: 821532

URL: http://svn.apache.org/viewvc?rev=821532&view=rev
Log:
Remove json related code and redundant "spring" exclude.

Modified:
    incubator/wink/trunk/wink-examples/ext/LinkBuilders/build.xml
    incubator/wink/trunk/wink-examples/ext/LinkBuilders/src/main/java/org/apache/wink/example/linkbuilders/UsersResource.java

Modified: incubator/wink/trunk/wink-examples/ext/LinkBuilders/build.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/LinkBuilders/build.xml?rev=821532&r1=821531&r2=821532&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/LinkBuilders/build.xml (original)
+++ incubator/wink/trunk/wink-examples/ext/LinkBuilders/build.xml Sun Oct  4 12:35:30 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/LinkBuilders/src/main/java/org/apache/wink/example/linkbuilders/UsersResource.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/LinkBuilders/src/main/java/org/apache/wink/example/linkbuilders/UsersResource.java?rev=821532&r1=821531&r2=821532&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/LinkBuilders/src/main/java/org/apache/wink/example/linkbuilders/UsersResource.java
(original)
+++ incubator/wink/trunk/wink-examples/ext/LinkBuilders/src/main/java/org/apache/wink/example/linkbuilders/UsersResource.java
Sun Oct  4 12:35:30 2009
@@ -85,13 +85,13 @@
     /**
      * Get a list of all the existing users. The method returns SyndFeed as a
      * response. That is, Client will be able to request a users collection
-     * information as an XML or JSON
+     * information as an XML.
      * 
      * @param linkBuilders reference to LinkBuilders instance
      * @return an instance of SyndFeed
      */
     @GET
-    @Produces( {MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
+    @Produces( {MediaType.APPLICATION_ATOM_XML})
     public SyndFeed getUsers(@Context LinkBuilders linkBuilders) {
 
         // Build SyndFeed that holds users collection.
@@ -148,8 +148,7 @@
 
     /**
      * Get a single user by user id. The method returns SyndEntry as a response.
-     * That is, Client will be able to request a user information as an XML or
-     * JSON
+     * That is, Client will be able to request a user information as an XML.
      * 
      * @param userId an id of a user that is to be retrieved
      * @param linkBuilders reference to LinkBuilders instance
@@ -158,7 +157,7 @@
      */
     @Path(USER_INFO)
     @GET
-    @Produces( {MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
+    @Produces( {MediaType.APPLICATION_ATOM_XML})
     public SyndEntry getUserInfo(@PathParam(USER_ID) Integer userId,
                                  @Context LinkBuilders linkBuilders) throws URISyntaxException
{
 



Mime
View raw message