wink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From el...@apache.org
Subject svn commit: r813428 - in /incubator/wink/trunk/wink-common/src/main: java/org/apache/wink/common/internal/providers/entity/atom/ java/org/apache/wink/common/internal/providers/entity/json/ resources/META-INF/core/
Date Thu, 10 Sep 2009 13:34:19 GMT
Author: elman
Date: Thu Sep 10 13:34:18 2009
New Revision: 813428

URL: http://svn.apache.org/viewvc?rev=813428&view=rev
Log:
more redundant providers. See [WINK-169]

Removed:
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonSyndEntryProvider.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonSyndFeedProvider.java
Modified:
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AtomEntrySyndEntryProvider.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AtomFeedSyndFeedProvider.java
    incubator/wink/trunk/wink-common/src/main/resources/META-INF/core/wink-providers

Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AtomEntrySyndEntryProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AtomEntrySyndEntryProvider.java?rev=813428&r1=813427&r2=813428&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AtomEntrySyndEntryProvider.java
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AtomEntrySyndEntryProvider.java
Thu Sep 10 13:34:18 2009
@@ -37,12 +37,13 @@
 import javax.ws.rs.ext.Provider;
 import javax.ws.rs.ext.Providers;
 
+import org.apache.wink.common.internal.utils.MediaTypeUtils;
 import org.apache.wink.common.model.atom.AtomEntry;
 import org.apache.wink.common.model.synd.SyndEntry;
 
 @Provider
-@Consumes(MediaType.APPLICATION_ATOM_XML)
-@Produces(MediaType.APPLICATION_ATOM_XML)
+@Consumes( {MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON, MediaTypeUtils.JAVASCRIPT})
+@Produces( {MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON, MediaTypeUtils.JAVASCRIPT})
 public class AtomEntrySyndEntryProvider implements MessageBodyReader<SyndEntry>,
     MessageBodyWriter<SyndEntry> {
 

Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AtomFeedSyndFeedProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AtomFeedSyndFeedProvider.java?rev=813428&r1=813427&r2=813428&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AtomFeedSyndFeedProvider.java
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AtomFeedSyndFeedProvider.java
Thu Sep 10 13:34:18 2009
@@ -37,12 +37,13 @@
 import javax.ws.rs.ext.Provider;
 import javax.ws.rs.ext.Providers;
 
+import org.apache.wink.common.internal.utils.MediaTypeUtils;
 import org.apache.wink.common.model.atom.AtomFeed;
 import org.apache.wink.common.model.synd.SyndFeed;
 
 @Provider
-@Consumes(MediaType.APPLICATION_ATOM_XML)
-@Produces(MediaType.APPLICATION_ATOM_XML)
+@Consumes( {MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON, MediaTypeUtils.JAVASCRIPT})
+@Produces( {MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON, MediaTypeUtils.JAVASCRIPT})
 public class AtomFeedSyndFeedProvider implements MessageBodyReader<SyndFeed>,
     MessageBodyWriter<SyndFeed> {
 

Modified: incubator/wink/trunk/wink-common/src/main/resources/META-INF/core/wink-providers
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/resources/META-INF/core/wink-providers?rev=813428&r1=813427&r2=813428&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/resources/META-INF/core/wink-providers (original)
+++ incubator/wink/trunk/wink-common/src/main/resources/META-INF/core/wink-providers Thu Sep
10 13:34:18 2009
@@ -54,13 +54,6 @@
 org.apache.wink.common.internal.providers.entity.json.JsonProvider
 org.apache.wink.common.internal.providers.entity.json.JsonArrayProvider
 org.apache.wink.common.internal.providers.entity.json.JsonJAXBProvider
-org.apache.wink.common.internal.providers.entity.json.JsonSyndEntryProvider
-org.apache.wink.common.internal.providers.entity.json.JsonSyndFeedProvider
-
-# Html
-org.apache.wink.server.internal.providers.entity.html.HtmlProvider
-#org.apache.wink.server.internal.providers.entity.html.HtmlSyndEntryProvider
-#org.apache.wink.server.internal.providers.entity.html.HtmlSyndFeedProvider
 
 # CSV
 org.apache.wink.common.internal.providers.entity.csv.CsvSerializerProvider



Mime
View raw message