wink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jra...@apache.org
Subject svn commit: r896181 - in /incubator/wink/trunk: wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/ wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/ wink-common/src/main/resources/META-INF/cor...
Date Tue, 05 Jan 2010 19:11:11 GMT
Author: jramos
Date: Tue Jan  5 19:11:11 2010
New Revision: 896181

URL: http://svn.apache.org/viewvc?rev=896181&view=rev
Log:
Refactore JAXB Collection Provider into wink-common module

Added:
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JAXBArrayJSONProvider.java
      - copied, changed from r896137, incubator/wink/trunk/wink-providers/wink-jaxbcollection-provider/src/main/java/org/apache/wink/providers/json/JAXBArrayJSONProvider.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBCollectionProvider.java
      - copied, changed from r896137, incubator/wink/trunk/wink-providers/wink-jaxbcollection-provider/src/main/java/org/apache/wink/providers/xml/AbstractJAXBCollectionProvider.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBArrayXmlProvider.java
      - copied, changed from r896137, incubator/wink/trunk/wink-providers/wink-jaxbcollection-provider/src/main/java/org/apache/wink/providers/xml/JAXBArrayXmlProvider.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBCollectionXmlProvider.java
      - copied, changed from r896137, incubator/wink/trunk/wink-providers/wink-jaxbcollection-provider/src/main/java/org/apache/wink/providers/xml/JAXBCollectionXmlProvider.java
    incubator/wink/trunk/wink-providers/wink-jackson-provider/src/test/java/org/apache/wink/providers/jackson/internal/JAXBCollectionJSONTest.java
      - copied, changed from r896137, incubator/wink/trunk/wink-providers/wink-jaxbcollection-provider/src/test/java/org/apache/wink/providers/internal/JAXBCollectionJSONTest.java
    incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/JAXBCollectionXMLProviderTest.java
      - copied, changed from r896137, incubator/wink/trunk/wink-providers/wink-jaxbcollection-provider/src/test/java/org/apache/wink/providers/internal/JAXBCollectionXMLProviderTest.java
Modified:
    incubator/wink/trunk/wink-common/src/main/resources/META-INF/core/wink-providers
    incubator/wink/trunk/wink-providers/pom.xml

Copied: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JAXBArrayJSONProvider.java
(from r896137, incubator/wink/trunk/wink-providers/wink-jaxbcollection-provider/src/main/java/org/apache/wink/providers/json/JAXBArrayJSONProvider.java)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JAXBArrayJSONProvider.java?p2=incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JAXBArrayJSONProvider.java&p1=incubator/wink/trunk/wink-providers/wink-jaxbcollection-provider/src/main/java/org/apache/wink/providers/json/JAXBArrayJSONProvider.java&r1=896137&r2=896181&rev=896181&view=diff
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-jaxbcollection-provider/src/main/java/org/apache/wink/providers/json/JAXBArrayJSONProvider.java
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JAXBArrayJSONProvider.java
Tue Jan  5 19:11:11 2010
@@ -18,7 +18,7 @@
  *  
  *******************************************************************************/
 
-package org.apache.wink.providers.json;
+package org.apache.wink.common.internal.providers.entity.json;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -45,7 +45,7 @@
 import javax.ws.rs.ext.Provider;
 import javax.ws.rs.ext.Providers;
 
-import org.apache.wink.providers.xml.AbstractJAXBCollectionProvider;
+import org.apache.wink.common.internal.providers.entity.xml.AbstractJAXBCollectionProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Copied: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBCollectionProvider.java
(from r896137, incubator/wink/trunk/wink-providers/wink-jaxbcollection-provider/src/main/java/org/apache/wink/providers/xml/AbstractJAXBCollectionProvider.java)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBCollectionProvider.java?p2=incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBCollectionProvider.java&p1=incubator/wink/trunk/wink-providers/wink-jaxbcollection-provider/src/main/java/org/apache/wink/providers/xml/AbstractJAXBCollectionProvider.java&r1=896137&r2=896181&rev=896181&view=diff
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-jaxbcollection-provider/src/main/java/org/apache/wink/providers/xml/AbstractJAXBCollectionProvider.java
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBCollectionProvider.java
Tue Jan  5 19:11:11 2010
@@ -18,7 +18,7 @@
  *  
  *******************************************************************************/
 
-package org.apache.wink.providers.xml;
+package org.apache.wink.common.internal.providers.entity.xml;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -50,7 +50,6 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.apache.wink.common.internal.i18n.Messages;
-import org.apache.wink.common.internal.providers.entity.xml.AbstractJAXBProvider;
 import org.apache.wink.common.internal.utils.GenericsUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Copied: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBArrayXmlProvider.java
(from r896137, incubator/wink/trunk/wink-providers/wink-jaxbcollection-provider/src/main/java/org/apache/wink/providers/xml/JAXBArrayXmlProvider.java)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBArrayXmlProvider.java?p2=incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBArrayXmlProvider.java&p1=incubator/wink/trunk/wink-providers/wink-jaxbcollection-provider/src/main/java/org/apache/wink/providers/xml/JAXBArrayXmlProvider.java&r1=896137&r2=896181&rev=896181&view=diff
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-jaxbcollection-provider/src/main/java/org/apache/wink/providers/xml/JAXBArrayXmlProvider.java
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBArrayXmlProvider.java
Tue Jan  5 19:11:11 2010
@@ -18,7 +18,7 @@
  *  
  *******************************************************************************/
 
-package org.apache.wink.providers.xml;
+package org.apache.wink.common.internal.providers.entity.xml;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBCollectionXmlProvider.java
(from r896137, incubator/wink/trunk/wink-providers/wink-jaxbcollection-provider/src/main/java/org/apache/wink/providers/xml/JAXBCollectionXmlProvider.java)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBCollectionXmlProvider.java?p2=incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBCollectionXmlProvider.java&p1=incubator/wink/trunk/wink-providers/wink-jaxbcollection-provider/src/main/java/org/apache/wink/providers/xml/JAXBCollectionXmlProvider.java&r1=896137&r2=896181&rev=896181&view=diff
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-jaxbcollection-provider/src/main/java/org/apache/wink/providers/xml/JAXBCollectionXmlProvider.java
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBCollectionXmlProvider.java
Tue Jan  5 19:11:11 2010
@@ -18,7 +18,7 @@
  *  
  *******************************************************************************/
 
-package org.apache.wink.providers.xml;
+package org.apache.wink.common.internal.providers.entity.xml;
 
 import java.io.IOException;
 import java.io.InputStream;

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=896181&r1=896180&r2=896181&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 Tue Jan
 5 19:11:11 2010
@@ -63,6 +63,7 @@
 org.apache.wink.common.internal.providers.multipart.InMultiPartProvider
 org.apache.wink.common.internal.providers.multipart.BufferedInMultiPartProvider
 
-
-
-
+# JAXB Collection Providers
+org.apache.wink.common.internal.providers.entity.xml.JAXBCollectionXmlProvider
+org.apache.wink.common.internal.providers.entity.xml.JAXBArrayXmlProvider
+org.apache.wink.common.internal.providers.entity.json.JAXBArrayJSONProvider

Modified: incubator/wink/trunk/wink-providers/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/pom.xml?rev=896181&r1=896180&r2=896181&view=diff
==============================================================================
--- incubator/wink/trunk/wink-providers/pom.xml (original)
+++ incubator/wink/trunk/wink-providers/pom.xml Tue Jan  5 19:11:11 2010
@@ -34,7 +34,6 @@
 		<module>wink-jettison-provider</module>
 		<module>wink-abdera-provider</module>
 		<module>wink-jackson-provider</module>
-        <module>wink-jaxbcollection-provider</module>
 	</modules>
 	<dependencies>
         <dependency>

Copied: incubator/wink/trunk/wink-providers/wink-jackson-provider/src/test/java/org/apache/wink/providers/jackson/internal/JAXBCollectionJSONTest.java
(from r896137, incubator/wink/trunk/wink-providers/wink-jaxbcollection-provider/src/test/java/org/apache/wink/providers/internal/JAXBCollectionJSONTest.java)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/wink-jackson-provider/src/test/java/org/apache/wink/providers/jackson/internal/JAXBCollectionJSONTest.java?p2=incubator/wink/trunk/wink-providers/wink-jackson-provider/src/test/java/org/apache/wink/providers/jackson/internal/JAXBCollectionJSONTest.java&p1=incubator/wink/trunk/wink-providers/wink-jaxbcollection-provider/src/test/java/org/apache/wink/providers/internal/JAXBCollectionJSONTest.java&r1=896137&r2=896181&rev=896181&view=diff
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-jaxbcollection-provider/src/test/java/org/apache/wink/providers/internal/JAXBCollectionJSONTest.java
(original)
+++ incubator/wink/trunk/wink-providers/wink-jackson-provider/src/test/java/org/apache/wink/providers/jackson/internal/JAXBCollectionJSONTest.java
Tue Jan  5 19:11:11 2010
@@ -18,7 +18,7 @@
  *  
  *******************************************************************************/
 
-package org.apache.wink.providers.internal;
+package org.apache.wink.providers.jackson.internal;
 
 import java.io.IOException;
 import java.io.StringReader;
@@ -37,7 +37,7 @@
 import javax.xml.namespace.QName;
 
 import org.apache.wink.common.model.atom.AtomEntry;
-import org.apache.wink.providers.internal.jaxb.Person;
+import org.apache.wink.providers.jackson.internal.jaxb.Person;
 import org.apache.wink.providers.json.JSONUtils;
 import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
 import org.apache.wink.test.mock.MockRequestConstructor;
@@ -288,7 +288,7 @@
 
         assertTrue(JSONUtils
             .equals(new JSONArray(
-                                  "[{\"name\":{\"namespaceURI\":\"\",\"localPart\":\"person\",\"prefix\":\"\"},\"declaredType\":\"org.apache.wink.providers.internal.jaxb.Person\",\"scope\":\"javax.xml.bind.JAXBElement$GlobalScope\",\"value\":{\"name\":\"My
Name\",\"desc\":\"My desc\"},\"nil\":false},{\"name\":{\"namespaceURI\":\"\",\"localPart\":\"person\",\"prefix\":\"\"},\"declaredType\":\"org.apache.wink.providers.internal.jaxb.Person\",\"scope\":\"javax.xml.bind.JAXBElement$GlobalScope\",\"value\":{\"name\":\"My
Name 2\",\"desc\":\"My desc 2\"},\"nil\":false}]"),
+                                  "[{\"name\":{\"namespaceURI\":\"\",\"localPart\":\"person\",\"prefix\":\"\"},\"declaredType\":\"org.apache.wink.providers.jackson.internal.jaxb.Person\",\"scope\":\"javax.xml.bind.JAXBElement$GlobalScope\",\"value\":{\"name\":\"My
Name\",\"desc\":\"My desc\"},\"nil\":false},{\"name\":{\"namespaceURI\":\"\",\"localPart\":\"person\",\"prefix\":\"\"},\"declaredType\":\"org.apache.wink.providers.jackson.internal.jaxb.Person\",\"scope\":\"javax.xml.bind.JAXBElement$GlobalScope\",\"value\":{\"name\":\"My
Name 2\",\"desc\":\"My desc 2\"},\"nil\":false}]"),
                     new JSONArray(response.getContentAsString())));
     }
 

Copied: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/JAXBCollectionXMLProviderTest.java
(from r896137, incubator/wink/trunk/wink-providers/wink-jaxbcollection-provider/src/test/java/org/apache/wink/providers/internal/JAXBCollectionXMLProviderTest.java)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/JAXBCollectionXMLProviderTest.java?p2=incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/JAXBCollectionXMLProviderTest.java&p1=incubator/wink/trunk/wink-providers/wink-jaxbcollection-provider/src/test/java/org/apache/wink/providers/internal/JAXBCollectionXMLProviderTest.java&r1=896137&r2=896181&rev=896181&view=diff
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-jaxbcollection-provider/src/test/java/org/apache/wink/providers/internal/JAXBCollectionXMLProviderTest.java
(original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/JAXBCollectionXMLProviderTest.java
Tue Jan  5 19:11:11 2010
@@ -18,7 +18,7 @@
  *  
  *******************************************************************************/
 
-package org.apache.wink.providers.internal;
+package org.apache.wink.server.internal.providers.entity;
 
 import java.io.ByteArrayInputStream;
 import java.util.ArrayList;
@@ -43,10 +43,10 @@
 import javax.xml.namespace.QName;
 
 import org.apache.wink.common.annotations.Asset;
+import org.apache.wink.common.internal.providers.entity.xml.JAXBArrayXmlProvider;
+import org.apache.wink.common.internal.providers.entity.xml.JAXBCollectionXmlProvider;
 import org.apache.wink.common.model.atom.AtomFeed;
 import org.apache.wink.common.model.atom.ObjectFactory;
-import org.apache.wink.providers.xml.JAXBArrayXmlProvider;
-import org.apache.wink.providers.xml.JAXBCollectionXmlProvider;
 import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
 import org.apache.wink.test.mock.MockRequestConstructor;
 import org.apache.wink.test.mock.TestUtils;



Mime
View raw message