svn commit: r1304623 [1/2] - in /cxf/trunk: distribution/src/main/release/samples/logbrowser/src/main/java/demo/logbrowser/ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ rt/management-web/src/main/java/org/apache/cxf/management/web/bro...

[se...@apache.org]

Author: sergeyb
Date: Fri Mar 23 21:47:43 2012
New Revision: 1304623

URL: http://svn.apache.org/viewvc?rev=1304623&view=rev
Log:
[CXF-4198] Removing 'ext' package segment to shorten the package names of optional providers

Added:
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXRSDataBinding.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/JAXRSDataBinding.java
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AbstractAegisProvider.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/aegis/AbstractAegisProvider.java
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProvider.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/aegis/AegisElementProvider.java
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AegisJSONProvider.java
      - copied, changed from r1304292, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/aegis/AegisJSONProvider.java
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AbstractAtomElementBuilder.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AbstractAtomElementBuilder.java
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AbstractAtomProvider.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AbstractAtomProvider.java
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AbstractEntryBuilder.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AbstractEntryBuilder.java
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AbstractFeedBuilder.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AbstractFeedBuilder.java
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomElementReader.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomElementReader.java
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomElementWriter.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomElementWriter.java
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProvider.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomEntryProvider.java
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProvider.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomFeedProvider.java
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomPojoProvider.java
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/DataBindingJSONProvider.java
      - copied, changed from r1304292, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/DataBindingJSONProvider.java
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
      - copied, changed from r1304292, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/json/JSONProvider.java
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java
      - copied, changed from r1304292, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/JSONUtils.java
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/PrefixCollectingXMLStreamWriter.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/PrefixCollectingXMLStreamWriter.java
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/PrefixRespectingMappedNamespaceConvention.java
      - copied, changed from r1304292, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/PrefixRespectingMappedNamespaceConvention.java
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/AbstractJsonpOutInterceptor.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/jsonp/AbstractJsonpOutInterceptor.java
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInInterceptor.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/jsonp/JsonpInInterceptor.java
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpPostStreamInterceptor.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/jsonp/JsonpPostStreamInterceptor.java
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpPreStreamInterceptor.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/jsonp/JsonpPreStreamInterceptor.java
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/xmlbeans/
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/xmlbeans/XMLBeanStreamSerializer.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/xmlbeans/XMLBeanStreamSerializer.java
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/xmlbeans/XMLBeansElementProvider.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/xmlbeans/XMLBeansElementProvider.java
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/xmlbeans/XMLBeansJSONProvider.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/xmlbeans/XMLBeansJSONProvider.java
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProviderTest.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/aegis/AegisElementProviderTest.java
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisJSONProviderTest.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/aegis/AegisJSONProviderTest.java
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/NoNamespaceAegisElementProvider.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/aegis/NoNamespaceAegisElementProvider.java
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/NoNamespaceJava5TypeCreator.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/aegis/NoNamespaceJava5TypeCreator.java
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/NoNamespaceTypeCreator.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/aegis/NoNamespaceTypeCreator.java
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/jsonCases.xml
      - copied unchanged from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/aegis/jsonCases.xml
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomEntryProviderTest.java
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomFeedProviderTest.java
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomPojoProviderTest.java
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/atomEntry.xml
      - copied unchanged from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/atom/atomEntry.xml
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/atomFeed.xml
      - copied unchanged from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/atom/atomFeed.xml
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/servers.xml
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/atom/servers.xml
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/DataBindingJSONProviderTest.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/DataBindingJSONProviderTest.java
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
      - copied, changed from r1304292, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/json/JSONProviderTest.java
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/ProviderFactoryJsonTest.java
      - copied, changed from r1304292, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/json/ProviderFactoryJsonTest.java
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/WadlGeneratorTest.java
      - copied, changed from r1304292, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/json/WadlGeneratorTest.java
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/book.xml
      - copied unchanged from r1304292, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/json/book.xml
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/book2.xml
      - copied unchanged from r1304292, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/json/book2.xml
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/utils/
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/jsonp/JsonpInterceptorTest.java
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/SdoFactory.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/SdoFactory.java
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/Structure.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/Structure.java
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/SdoFactoryImpl.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/impl/SdoFactoryImpl.java
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/StructureImpl.java
      - copied, changed from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/impl/StructureImpl.java
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/structure.xsd
      - copied unchanged from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/structure.xsd
Removed:
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/
    cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/
Modified:
    cxf/trunk/distribution/src/main/release/samples/logbrowser/src/main/java/demo/logbrowser/App.java
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
    cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/bootstrapping/BootstrapStorage.java
    cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/converter/StandardConverter.java
    cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/deliverer/WebClientDeliverer.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/CustomAtomFeedProvider.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSDataBindingTest.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushTest.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
    cxf/trunk/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml
    cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/beans.xml
    cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_databinding/WEB-INF/beans.xml
    cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml
    cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompush/WEB-INF/beans.xml
    cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/beans.xml

Modified: cxf/trunk/distribution/src/main/release/samples/logbrowser/src/main/java/demo/logbrowser/App.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/logbrowser/src/main/java/demo/logbrowser/App.java?rev=1304623&r1=1304622&r2=1304623&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/logbrowser/src/main/java/demo/logbrowser/App.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/logbrowser/src/main/java/demo/logbrowser/App.java Fri Mar 23 21:47:43 2012
@@ -23,8 +23,8 @@ import java.util.HashSet;
 import java.util.Set;
 import javax.ws.rs.core.Application;
 
-import org.apache.cxf.jaxrs.ext.provider.atom.AtomEntryProvider;
-import org.apache.cxf.jaxrs.ext.provider.atom.AtomFeedProvider;
+import org.apache.cxf.jaxrs.provider.atom.AtomEntryProvider;
+import org.apache.cxf.jaxrs.provider.atom.AtomFeedProvider;
 
 import org.apache.cxf.management.web.browser.bootstrapping.BootstrapStorage;
 import org.apache.cxf.management.web.browser.bootstrapping.SimpleXMLSettingsStorage;

Copied: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXRSDataBinding.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/JAXRSDataBinding.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXRSDataBinding.java?p2=cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXRSDataBinding.java&p1=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/JAXRSDataBinding.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/JAXRSDataBinding.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXRSDataBinding.java Fri Mar 23 21:47:43 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.jaxrs.ext.provider;
+package org.apache.cxf.jaxrs.provider;
 
 import java.io.IOException;
 import java.lang.reflect.Method;

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java?rev=1304623&r1=1304622&r2=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java Fri Mar 23 21:47:43 2012
@@ -69,7 +69,7 @@ public final class ProviderFactory {
     private static final ProviderFactory SHARED_FACTORY = new ProviderFactory();
     
     private static final String JAXB_PROVIDER_NAME = "org.apache.cxf.jaxrs.provider.JAXBElementProvider";
-    private static final String JSON_PROVIDER_NAME = "org.apache.cxf.jaxrs.ext.provider.json.JSONProvider";
+    private static final String JSON_PROVIDER_NAME = "org.apache.cxf.jaxrs.provider.json.JSONProvider";
     
     static {
         SHARED_FACTORY.setProviders(new BinaryDataProvider<Object>(),

Modified: cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/bootstrapping/BootstrapStorage.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/bootstrapping/BootstrapStorage.java?rev=1304623&r1=1304622&r2=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/bootstrapping/BootstrapStorage.java (original)
+++ cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/bootstrapping/BootstrapStorage.java Fri Mar 23 21:47:43 2012
@@ -51,7 +51,7 @@ import org.apache.commons.lang.Validate;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.jaxrs.ext.MessageContext;
-import org.apache.cxf.jaxrs.ext.provider.json.JSONProvider;
+import org.apache.cxf.jaxrs.provider.json.JSONProvider;
 
 @Path("/browser")
 public class BootstrapStorage {

Modified: cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/converter/StandardConverter.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/converter/StandardConverter.java?rev=1304623&r1=1304622&r2=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/converter/StandardConverter.java (original)
+++ cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/converter/StandardConverter.java Fri Mar 23 21:47:43 2012
@@ -41,8 +41,8 @@ import org.apache.abdera.model.Entry;
 import org.apache.abdera.model.ExtensibleElement;
 import org.apache.abdera.model.Feed;
 import org.apache.commons.lang.Validate;
-import org.apache.cxf.jaxrs.ext.provider.atom.AbstractEntryBuilder;
-import org.apache.cxf.jaxrs.ext.provider.atom.AbstractFeedBuilder;
+import org.apache.cxf.jaxrs.provider.atom.AbstractEntryBuilder;
+import org.apache.cxf.jaxrs.provider.atom.AbstractFeedBuilder;
 import org.apache.cxf.management.web.logging.LogRecord;
 import org.apache.cxf.management.web.logging.LogRecords;
 

Modified: cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/deliverer/WebClientDeliverer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/deliverer/WebClientDeliverer.java?rev=1304623&r1=1304622&r2=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/deliverer/WebClientDeliverer.java (original)
+++ cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/deliverer/WebClientDeliverer.java Fri Mar 23 21:47:43 2012
@@ -27,8 +27,8 @@ import org.apache.abdera.model.Element;
 import org.apache.abdera.model.Feed;
 import org.apache.commons.lang.Validate;
 import org.apache.cxf.jaxrs.client.WebClient;
-import org.apache.cxf.jaxrs.ext.provider.atom.AtomEntryProvider;
-import org.apache.cxf.jaxrs.ext.provider.atom.AtomFeedProvider;
+import org.apache.cxf.jaxrs.provider.atom.AtomEntryProvider;
+import org.apache.cxf.jaxrs.provider.atom.AtomFeedProvider;
 
 /**
  * Marshaling and delivering based on JAXRS' WebClient.

Copied: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AbstractAegisProvider.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/aegis/AbstractAegisProvider.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AbstractAegisProvider.java?p2=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AbstractAegisProvider.java&p1=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/aegis/AbstractAegisProvider.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/aegis/AbstractAegisProvider.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AbstractAegisProvider.java Fri Mar 23 21:47:43 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider.aegis;
+package org.apache.cxf.jaxrs.provider.aegis;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;

Copied: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProvider.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/aegis/AegisElementProvider.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProvider.java?p2=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProvider.java&p1=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/aegis/AegisElementProvider.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/aegis/AegisElementProvider.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProvider.java Fri Mar 23 21:47:43 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider.aegis;
+package org.apache.cxf.jaxrs.provider.aegis;
 
 
 import java.io.IOException;

Copied: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AegisJSONProvider.java (from r1304292, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/aegis/AegisJSONProvider.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AegisJSONProvider.java?p2=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AegisJSONProvider.java&p1=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/aegis/AegisJSONProvider.java&r1=1304292&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/aegis/AegisJSONProvider.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AegisJSONProvider.java Fri Mar 23 21:47:43 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider.aegis;
+package org.apache.cxf.jaxrs.provider.aegis;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -43,8 +43,8 @@ import org.w3c.dom.Document;
 import org.apache.cxf.aegis.AegisContext;
 import org.apache.cxf.aegis.AegisWriter;
 import org.apache.cxf.aegis.type.AegisType;
-import org.apache.cxf.jaxrs.ext.provider.JSONUtils;
-import org.apache.cxf.jaxrs.ext.provider.PrefixCollectingXMLStreamWriter;
+import org.apache.cxf.jaxrs.provider.json.utils.JSONUtils;
+import org.apache.cxf.jaxrs.provider.json.utils.PrefixCollectingXMLStreamWriter;
 import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.cxf.staxutils.W3CDOMStreamWriter;
 import org.codehaus.jettison.mapped.Configuration;

Copied: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AbstractAtomElementBuilder.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AbstractAtomElementBuilder.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AbstractAtomElementBuilder.java?p2=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AbstractAtomElementBuilder.java&p1=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AbstractAtomElementBuilder.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AbstractAtomElementBuilder.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AbstractAtomElementBuilder.java Fri Mar 23 21:47:43 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.jaxrs.ext.provider.atom;
+package org.apache.cxf.jaxrs.provider.atom;
 
 import java.util.List;
 import java.util.Map;

Copied: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AbstractAtomProvider.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AbstractAtomProvider.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AbstractAtomProvider.java?p2=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AbstractAtomProvider.java&p1=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AbstractAtomProvider.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AbstractAtomProvider.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AbstractAtomProvider.java Fri Mar 23 21:47:43 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider.atom;
+package org.apache.cxf.jaxrs.provider.atom;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AbstractEntryBuilder.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AbstractEntryBuilder.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AbstractEntryBuilder.java?p2=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AbstractEntryBuilder.java&p1=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AbstractEntryBuilder.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AbstractEntryBuilder.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AbstractEntryBuilder.java Fri Mar 23 21:47:43 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.jaxrs.ext.provider.atom;
+package org.apache.cxf.jaxrs.provider.atom;
 
 /**
  * A callback-style provider which can be used to map an object to Atom Entry

Copied: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AbstractFeedBuilder.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AbstractFeedBuilder.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AbstractFeedBuilder.java?p2=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AbstractFeedBuilder.java&p1=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AbstractFeedBuilder.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AbstractFeedBuilder.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AbstractFeedBuilder.java Fri Mar 23 21:47:43 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.jaxrs.ext.provider.atom;
+package org.apache.cxf.jaxrs.provider.atom;
 
 /**
  * A callback-style provider which can be used to map an object to Atom Feed

Copied: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomElementReader.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomElementReader.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomElementReader.java?p2=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomElementReader.java&p1=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomElementReader.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomElementReader.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomElementReader.java Fri Mar 23 21:47:43 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.jaxrs.ext.provider.atom;
+package org.apache.cxf.jaxrs.provider.atom;
 
 import org.apache.abdera.model.Element;
 

Copied: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomElementWriter.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomElementWriter.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomElementWriter.java?p2=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomElementWriter.java&p1=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomElementWriter.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomElementWriter.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomElementWriter.java Fri Mar 23 21:47:43 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.jaxrs.ext.provider.atom;
+package org.apache.cxf.jaxrs.provider.atom;
 
 import org.apache.abdera.model.Element;
 

Copied: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProvider.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomEntryProvider.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProvider.java?p2=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProvider.java&p1=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomEntryProvider.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomEntryProvider.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProvider.java Fri Mar 23 21:47:43 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider.atom;
+package org.apache.cxf.jaxrs.provider.atom;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;

Copied: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProvider.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomFeedProvider.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProvider.java?p2=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProvider.java&p1=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomFeedProvider.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomFeedProvider.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProvider.java Fri Mar 23 21:47:43 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider.atom;
+package org.apache.cxf.jaxrs.provider.atom;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;

Copied: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomPojoProvider.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java?p2=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java&p1=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomPojoProvider.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomPojoProvider.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java Fri Mar 23 21:47:43 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.jaxrs.ext.provider.atom;
+package org.apache.cxf.jaxrs.provider.atom;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/DataBindingJSONProvider.java (from r1304292, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/DataBindingJSONProvider.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/DataBindingJSONProvider.java?p2=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/DataBindingJSONProvider.java&p1=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/DataBindingJSONProvider.java&r1=1304292&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/DataBindingJSONProvider.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/DataBindingJSONProvider.java Fri Mar 23 21:47:43 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.jaxrs.ext.provider;
+package org.apache.cxf.jaxrs.provider.json;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -35,6 +35,7 @@ import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 
 import org.apache.cxf.jaxrs.provider.DataBindingProvider;
+import org.apache.cxf.jaxrs.provider.json.utils.JSONUtils;
 import org.apache.cxf.jaxrs.utils.InjectionUtils;
 import org.apache.cxf.jaxrs.utils.JAXRSUtils;
 import org.codehaus.jettison.mapped.Configuration;

Copied: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java (from r1304292, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/json/JSONProvider.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java?p2=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java&p1=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/json/JSONProvider.java&r1=1304292&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/json/JSONProvider.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java Fri Mar 23 21:47:43 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider.json;
+package org.apache.cxf.jaxrs.provider.json;
 
 
 import java.io.ByteArrayInputStream;
@@ -60,8 +60,8 @@ import org.w3c.dom.Document;
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.io.CachedOutputStream;
 import org.apache.cxf.jaxrs.ext.MessageContext;
-import org.apache.cxf.jaxrs.ext.provider.JSONUtils;
 import org.apache.cxf.jaxrs.provider.AbstractJAXBProvider;
+import org.apache.cxf.jaxrs.provider.json.utils.JSONUtils;
 import org.apache.cxf.jaxrs.utils.HttpUtils;
 import org.apache.cxf.jaxrs.utils.InjectionUtils;
 import org.apache.cxf.jaxrs.utils.JAXBUtils;

Copied: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java (from r1304292, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/JSONUtils.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java?p2=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java&p1=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/JSONUtils.java&r1=1304292&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/JSONUtils.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java Fri Mar 23 21:47:43 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.jaxrs.ext.provider;
+package org.apache.cxf.jaxrs.provider.json.utils;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

Copied: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/PrefixCollectingXMLStreamWriter.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/PrefixCollectingXMLStreamWriter.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/PrefixCollectingXMLStreamWriter.java?p2=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/PrefixCollectingXMLStreamWriter.java&p1=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/PrefixCollectingXMLStreamWriter.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/PrefixCollectingXMLStreamWriter.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/PrefixCollectingXMLStreamWriter.java Fri Mar 23 21:47:43 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider;
+package org.apache.cxf.jaxrs.provider.json.utils;
 
 import java.util.Map;
 

Copied: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/PrefixRespectingMappedNamespaceConvention.java (from r1304292, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/PrefixRespectingMappedNamespaceConvention.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/PrefixRespectingMappedNamespaceConvention.java?p2=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/PrefixRespectingMappedNamespaceConvention.java&p1=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/PrefixRespectingMappedNamespaceConvention.java&r1=1304292&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/PrefixRespectingMappedNamespaceConvention.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/PrefixRespectingMappedNamespaceConvention.java Fri Mar 23 21:47:43 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider;
+package org.apache.cxf.jaxrs.provider.json.utils;
 
 import org.codehaus.jettison.mapped.Configuration;
 import org.codehaus.jettison.mapped.MappedNamespaceConvention;

Copied: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/AbstractJsonpOutInterceptor.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/jsonp/AbstractJsonpOutInterceptor.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/AbstractJsonpOutInterceptor.java?p2=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/AbstractJsonpOutInterceptor.java&p1=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/jsonp/AbstractJsonpOutInterceptor.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/jsonp/AbstractJsonpOutInterceptor.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/AbstractJsonpOutInterceptor.java Fri Mar 23 21:47:43 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider.jsonp;
+package org.apache.cxf.jaxrs.provider.jsonp;
 
 import java.io.IOException;
 

Copied: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInInterceptor.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/jsonp/JsonpInInterceptor.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInInterceptor.java?p2=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInInterceptor.java&p1=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/jsonp/JsonpInInterceptor.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/jsonp/JsonpInInterceptor.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInInterceptor.java Fri Mar 23 21:47:43 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider.jsonp;
+package org.apache.cxf.jaxrs.provider.jsonp;
 
 import javax.servlet.http.HttpServletRequest;
 

Copied: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpPostStreamInterceptor.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/jsonp/JsonpPostStreamInterceptor.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpPostStreamInterceptor.java?p2=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpPostStreamInterceptor.java&p1=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/jsonp/JsonpPostStreamInterceptor.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/jsonp/JsonpPostStreamInterceptor.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpPostStreamInterceptor.java Fri Mar 23 21:47:43 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider.jsonp;
+package org.apache.cxf.jaxrs.provider.jsonp;
 
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.interceptor.Fault;

Copied: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpPreStreamInterceptor.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/jsonp/JsonpPreStreamInterceptor.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpPreStreamInterceptor.java?p2=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpPreStreamInterceptor.java&p1=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/jsonp/JsonpPreStreamInterceptor.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/jsonp/JsonpPreStreamInterceptor.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpPreStreamInterceptor.java Fri Mar 23 21:47:43 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider.jsonp;
+package org.apache.cxf.jaxrs.provider.jsonp;
 
 import java.util.Collections;
 import java.util.HashMap;

Copied: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/xmlbeans/XMLBeanStreamSerializer.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/xmlbeans/XMLBeanStreamSerializer.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/xmlbeans/XMLBeanStreamSerializer.java?p2=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/xmlbeans/XMLBeanStreamSerializer.java&p1=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/xmlbeans/XMLBeanStreamSerializer.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/xmlbeans/XMLBeanStreamSerializer.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/xmlbeans/XMLBeanStreamSerializer.java Fri Mar 23 21:47:43 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider.xmlbeans;
+package org.apache.cxf.jaxrs.provider.xmlbeans;
 
 import java.io.File;
 import java.io.FileInputStream;

Copied: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/xmlbeans/XMLBeansElementProvider.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/xmlbeans/XMLBeansElementProvider.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/xmlbeans/XMLBeansElementProvider.java?p2=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/xmlbeans/XMLBeansElementProvider.java&p1=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/xmlbeans/XMLBeansElementProvider.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/xmlbeans/XMLBeansElementProvider.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/xmlbeans/XMLBeansElementProvider.java Fri Mar 23 21:47:43 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.jaxrs.ext.provider.xmlbeans;
+package org.apache.cxf.jaxrs.provider.xmlbeans;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/xmlbeans/XMLBeansJSONProvider.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/xmlbeans/XMLBeansJSONProvider.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/xmlbeans/XMLBeansJSONProvider.java?p2=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/xmlbeans/XMLBeansJSONProvider.java&p1=cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/xmlbeans/XMLBeansJSONProvider.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/ext/provider/xmlbeans/XMLBeansJSONProvider.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/xmlbeans/XMLBeansJSONProvider.java Fri Mar 23 21:47:43 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider.xmlbeans;
+package org.apache.cxf.jaxrs.provider.xmlbeans;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProviderTest.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/aegis/AegisElementProviderTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProviderTest.java?p2=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProviderTest.java&p1=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/aegis/AegisElementProviderTest.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/aegis/AegisElementProviderTest.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProviderTest.java Fri Mar 23 21:47:43 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider.aegis;
+package org.apache.cxf.jaxrs.provider.aegis;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

Copied: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisJSONProviderTest.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/aegis/AegisJSONProviderTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisJSONProviderTest.java?p2=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisJSONProviderTest.java&p1=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/aegis/AegisJSONProviderTest.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/aegis/AegisJSONProviderTest.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisJSONProviderTest.java Fri Mar 23 21:47:43 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider.aegis;
+package org.apache.cxf.jaxrs.provider.aegis;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

Copied: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/NoNamespaceAegisElementProvider.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/aegis/NoNamespaceAegisElementProvider.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/NoNamespaceAegisElementProvider.java?p2=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/NoNamespaceAegisElementProvider.java&p1=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/aegis/NoNamespaceAegisElementProvider.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/aegis/NoNamespaceAegisElementProvider.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/NoNamespaceAegisElementProvider.java Fri Mar 23 21:47:43 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider.aegis;
+package org.apache.cxf.jaxrs.provider.aegis;
 
 import java.lang.reflect.Type;
 import java.util.HashSet;

Copied: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/NoNamespaceJava5TypeCreator.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/aegis/NoNamespaceJava5TypeCreator.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/NoNamespaceJava5TypeCreator.java?p2=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/NoNamespaceJava5TypeCreator.java&p1=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/aegis/NoNamespaceJava5TypeCreator.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/aegis/NoNamespaceJava5TypeCreator.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/NoNamespaceJava5TypeCreator.java Fri Mar 23 21:47:43 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider.aegis;
+package org.apache.cxf.jaxrs.provider.aegis;
 
 import javax.xml.namespace.QName;
 

Copied: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/NoNamespaceTypeCreator.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/aegis/NoNamespaceTypeCreator.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/NoNamespaceTypeCreator.java?p2=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/NoNamespaceTypeCreator.java&p1=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/aegis/NoNamespaceTypeCreator.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/aegis/NoNamespaceTypeCreator.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/NoNamespaceTypeCreator.java Fri Mar 23 21:47:43 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider.aegis;
+package org.apache.cxf.jaxrs.provider.aegis;
 
 import javax.xml.namespace.QName;
 

Copied: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomEntryProviderTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java?p2=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java&p1=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomEntryProviderTest.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomEntryProviderTest.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java Fri Mar 23 21:47:43 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider.atom;
+package org.apache.cxf.jaxrs.provider.atom;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

Copied: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomFeedProviderTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java?p2=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java&p1=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomFeedProviderTest.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomFeedProviderTest.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java Fri Mar 23 21:47:43 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider.atom;
+package org.apache.cxf.jaxrs.provider.atom;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

Copied: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomPojoProviderTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java?p2=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java&p1=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomPojoProviderTest.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/atom/AtomPojoProviderTest.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProviderTest.java Fri Mar 23 21:47:43 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.jaxrs.ext.provider.atom;
+package org.apache.cxf.jaxrs.provider.atom;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -47,7 +47,7 @@ public class AtomPojoProviderTest extend
     public void setUp() {
         ctx = 
             new ClassPathXmlApplicationContext(
-                new String[] {"/org/apache/cxf/jaxrs/ext/provider/atom/servers.xml"});
+                new String[] {"/org/apache/cxf/jaxrs/provider/atom/servers.xml"});
     }
     
     @Test

Copied: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/servers.xml (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/atom/servers.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/servers.xml?p2=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/servers.xml&p1=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/atom/servers.xml&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/atom/servers.xml (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/servers.xml Fri Mar 23 21:47:43 2012
@@ -26,59 +26,59 @@ http://www.springframework.org/schema/be
 http://www.springframework.org/schema/util 
 http://www.springframework.org/schema/util/spring-util.xsd">
 
-  <bean id="atom" class="org.apache.cxf.jaxrs.ext.provider.atom.AtomPojoProvider">
+  <bean id="atom" class="org.apache.cxf.jaxrs.provider.atom.AtomPojoProvider">
     <property name="atomWriters" ref="atomWriters"/>
     <property name="atomBuilders" ref="atomBuilders"/>
   </bean>
   
-  <bean id="atom2" class="org.apache.cxf.jaxrs.ext.provider.atom.AtomPojoProvider">
+  <bean id="atom2" class="org.apache.cxf.jaxrs.provider.atom.AtomPojoProvider">
     <property name="atomWriters" ref="atomWriters2"/>
     <property name="atomBuilders" ref="atomBuilders2"/>
   </bean>
   
-  <bean id="atom3" class="org.apache.cxf.jaxrs.ext.provider.atom.AtomPojoProvider">
+  <bean id="atom3" class="org.apache.cxf.jaxrs.provider.atom.AtomPojoProvider">
     <property name="atomWriters" ref="atomWriters2"/>
     <property name="atomReaders" ref="atomReaders2"/>
   </bean>
   
-  <bean id="atom4" class="org.apache.cxf.jaxrs.ext.provider.atom.AtomPojoProvider">
+  <bean id="atom4" class="org.apache.cxf.jaxrs.provider.atom.AtomPojoProvider">
     <property name="atomWriters" ref="atomWriters"/>
     <property name="atomReaders" ref="atomReaders"/>
   </bean>
   
   <util:map id="atomWriters">
-     <entry key="org.apache.cxf.jaxrs.ext.provider.atom.AtomPojoProviderTest$Books" value-ref="feedWriter"/>
-     <entry key="org.apache.cxf.jaxrs.ext.provider.atom.AtomPojoProviderTest$Book" value-ref="entryWriter"/>
+     <entry key="org.apache.cxf.jaxrs.provider.atom.AtomPojoProviderTest$Books" value-ref="feedWriter"/>
+     <entry key="org.apache.cxf.jaxrs.provider.atom.AtomPojoProviderTest$Book" value-ref="entryWriter"/>
   </util:map>  
   
   <util:map id="atomWriters2">
-     <entry key="org.apache.cxf.jaxrs.ext.provider.atom.AtomPojoProviderTest$Book" value-ref="entryWriter"/>
+     <entry key="org.apache.cxf.jaxrs.provider.atom.AtomPojoProviderTest$Book" value-ref="entryWriter"/>
   </util:map>  
   
   <util:map id="atomReaders">
-     <entry key="org.apache.cxf.jaxrs.ext.provider.atom.AtomPojoProviderTest$Books" value-ref="feedReader"/>
+     <entry key="org.apache.cxf.jaxrs.provider.atom.AtomPojoProviderTest$Books" value-ref="feedReader"/>
   </util:map>
   
   <util:map id="atomReaders2">
-     <entry key="org.apache.cxf.jaxrs.ext.provider.atom.AtomPojoProviderTest$Book" value-ref="entryReader"/>
+     <entry key="org.apache.cxf.jaxrs.provider.atom.AtomPojoProviderTest$Book" value-ref="entryReader"/>
   </util:map>
   
-  <bean id="feedWriter" class="org.apache.cxf.jaxrs.ext.provider.atom.AtomPojoProviderTest$CustomFeedWriter"/>
-  <bean id="entryWriter" class="org.apache.cxf.jaxrs.ext.provider.atom.AtomPojoProviderTest$CustomEntryWriter"/>
-  <bean id="entryReader" class="org.apache.cxf.jaxrs.ext.provider.atom.AtomPojoProviderTest$CustomEntryReader"/>
-  <bean id="feedReader" class="org.apache.cxf.jaxrs.ext.provider.atom.AtomPojoProviderTest$CustomFeedReader"/>
+  <bean id="feedWriter" class="org.apache.cxf.jaxrs.provider.atom.AtomPojoProviderTest$CustomFeedWriter"/>
+  <bean id="entryWriter" class="org.apache.cxf.jaxrs.provider.atom.AtomPojoProviderTest$CustomEntryWriter"/>
+  <bean id="entryReader" class="org.apache.cxf.jaxrs.provider.atom.AtomPojoProviderTest$CustomEntryReader"/>
+  <bean id="feedReader" class="org.apache.cxf.jaxrs.provider.atom.AtomPojoProviderTest$CustomFeedReader"/>
   
   <util:map id="atomBuilders">
-    <entry key="org.apache.cxf.jaxrs.ext.provider.atom.AtomPojoProviderTest$Books" value-ref="simpleFeedBuilder"/>
-    <entry key="org.apache.cxf.jaxrs.ext.provider.atom.AtomPojoProviderTest$Book" value-ref="simpleEntryBuilder"/>
+    <entry key="org.apache.cxf.jaxrs.provider.atom.AtomPojoProviderTest$Books" value-ref="simpleFeedBuilder"/>
+    <entry key="org.apache.cxf.jaxrs.provider.atom.AtomPojoProviderTest$Book" value-ref="simpleEntryBuilder"/>
   </util:map>  
   
-  <bean id="simpleFeedBuilder" class="org.apache.cxf.jaxrs.ext.provider.atom.AtomPojoProviderTest$CustomFeedBuilder"/>
+  <bean id="simpleFeedBuilder" class="org.apache.cxf.jaxrs.provider.atom.AtomPojoProviderTest$CustomFeedBuilder"/>
   
   <util:map id="atomBuilders2">
-    <entry key="org.apache.cxf.jaxrs.ext.provider.atom.AtomPojoProviderTest$Book" value-ref="simpleEntryBuilder"/>
+    <entry key="org.apache.cxf.jaxrs.provider.atom.AtomPojoProviderTest$Book" value-ref="simpleEntryBuilder"/>
   </util:map>  
   
-  <bean id="simpleEntryBuilder" class="org.apache.cxf.jaxrs.ext.provider.atom.AtomPojoProviderTest$CustomEntryBuilder"/>
+  <bean id="simpleEntryBuilder" class="org.apache.cxf.jaxrs.provider.atom.AtomPojoProviderTest$CustomEntryBuilder"/>
   
 </beans>

Copied: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/DataBindingJSONProviderTest.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/DataBindingJSONProviderTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/DataBindingJSONProviderTest.java?p2=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/DataBindingJSONProviderTest.java&p1=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/DataBindingJSONProviderTest.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/DataBindingJSONProviderTest.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/DataBindingJSONProviderTest.java Fri Mar 23 21:47:43 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider;
+package org.apache.cxf.jaxrs.provider.json;
 
 
 import java.io.ByteArrayInputStream;
@@ -37,11 +37,11 @@ import org.apache.cxf.aegis.databinding.
 import org.apache.cxf.databinding.DataBinding;
 import org.apache.cxf.jaxb.JAXBDataBinding;
 import org.apache.cxf.jaxrs.JAXRSServiceImpl;
-import org.apache.cxf.jaxrs.ext.provider.resources.sdo.Structure;
-import org.apache.cxf.jaxrs.ext.provider.resources.sdo.impl.StructureImpl;
 import org.apache.cxf.jaxrs.impl.MetadataMap;
 import org.apache.cxf.jaxrs.model.ClassResourceInfo;
 import org.apache.cxf.jaxrs.resources.Book;
+import org.apache.cxf.jaxrs.resources.sdo.Structure;
+import org.apache.cxf.jaxrs.resources.sdo.impl.StructureImpl;
 import org.apache.cxf.jaxrs.utils.ResourceUtils;
 import org.apache.cxf.sdo.SDODataBinding;
 import org.apache.cxf.service.Service;

Copied: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java (from r1304292, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/json/JSONProviderTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java?p2=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java&p1=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/json/JSONProviderTest.java&r1=1304292&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/json/JSONProviderTest.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java Fri Mar 23 21:47:43 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider.json;
+package org.apache.cxf.jaxrs.provider.json;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

Copied: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/ProviderFactoryJsonTest.java (from r1304292, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/json/ProviderFactoryJsonTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/ProviderFactoryJsonTest.java?p2=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/ProviderFactoryJsonTest.java&p1=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/json/ProviderFactoryJsonTest.java&r1=1304292&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/json/ProviderFactoryJsonTest.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/ProviderFactoryJsonTest.java Fri Mar 23 21:47:43 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider.json;
+package org.apache.cxf.jaxrs.provider.json;
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.ext.MessageBodyReader;

Copied: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/WadlGeneratorTest.java (from r1304292, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/json/WadlGeneratorTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/WadlGeneratorTest.java?p2=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/WadlGeneratorTest.java&p1=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/json/WadlGeneratorTest.java&r1=1304292&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/json/WadlGeneratorTest.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/WadlGeneratorTest.java Fri Mar 23 21:47:43 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.jaxrs.ext.provider.json;
+package org.apache.cxf.jaxrs.provider.json;
 
 import java.io.ByteArrayOutputStream;
 import java.lang.annotation.Annotation;

Copied: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/jsonp/JsonpInterceptorTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java?p2=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java&p1=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/jsonp/JsonpInterceptorTest.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/jsonp/JsonpInterceptorTest.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java Fri Mar 23 21:47:43 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider.jsonp;
+package org.apache.cxf.jaxrs.provider.jsonp;
 
 import java.io.IOException;
 

Copied: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/SdoFactory.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/SdoFactory.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/SdoFactory.java?p2=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/SdoFactory.java&p1=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/SdoFactory.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/SdoFactory.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/SdoFactory.java Fri Mar 23 21:47:43 2012
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.jaxrs.ext.provider.resources.sdo;
+package org.apache.cxf.jaxrs.resources.sdo;
 
 import commonj.sdo.helper.HelperContext;
 
 public interface SdoFactory {
 
-    SdoFactory INSTANCE = org.apache.cxf.jaxrs.ext.provider.resources.sdo.impl.SdoFactoryImpl.init();
+    SdoFactory INSTANCE = org.apache.cxf.jaxrs.resources.sdo.impl.SdoFactoryImpl.init();
     Structure createStructure();
     
     void register(HelperContext scope);

Copied: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/Structure.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/Structure.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/Structure.java?p2=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/Structure.java&p1=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/Structure.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/Structure.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/Structure.java Fri Mar 23 21:47:43 2012
@@ -34,7 +34,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.jaxrs.ext.provider.resources.sdo;
+package org.apache.cxf.jaxrs.resources.sdo;
 
 import java.io.Serializable;
 

Copied: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/SdoFactoryImpl.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/impl/SdoFactoryImpl.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/SdoFactoryImpl.java?p2=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/SdoFactoryImpl.java&p1=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/impl/SdoFactoryImpl.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/impl/SdoFactoryImpl.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/SdoFactoryImpl.java Fri Mar 23 21:47:43 2012
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.apache.cxf.jaxrs.ext.provider.resources.sdo.impl;
+package org.apache.cxf.jaxrs.resources.sdo.impl;
 
-import org.apache.cxf.jaxrs.ext.provider.resources.sdo.SdoFactory;
-import org.apache.cxf.jaxrs.ext.provider.resources.sdo.Structure;
+import org.apache.cxf.jaxrs.resources.sdo.SdoFactory;
+import org.apache.cxf.jaxrs.resources.sdo.Structure;
 import org.apache.tuscany.sdo.helper.HelperContextImpl;
 import org.apache.tuscany.sdo.impl.FactoryBase;
 import org.apache.tuscany.sdo.model.ModelFactory;

Copied: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/StructureImpl.java (from r1304290, cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/impl/StructureImpl.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/StructureImpl.java?p2=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/StructureImpl.java&p1=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/impl/StructureImpl.java&r1=1304290&r2=1304623&rev=1304623&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/impl/StructureImpl.java (original)
+++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/StructureImpl.java Fri Mar 23 21:47:43 2012
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.jaxrs.ext.provider.resources.sdo.impl;
+package org.apache.cxf.jaxrs.resources.sdo.impl;
 
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.cxf.jaxrs.ext.provider.resources.sdo.SdoFactory;
-import org.apache.cxf.jaxrs.ext.provider.resources.sdo.Structure;
+import org.apache.cxf.jaxrs.resources.sdo.SdoFactory;
+import org.apache.cxf.jaxrs.resources.sdo.Structure;
 import org.apache.tuscany.sdo.impl.DataObjectBase;
 
 import commonj.sdo.Type;

Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/CustomAtomFeedProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/CustomAtomFeedProvider.java?rev=1304623&r1=1304622&r2=1304623&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/CustomAtomFeedProvider.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/CustomAtomFeedProvider.java Fri Mar 23 21:47:43 2012
@@ -30,7 +30,7 @@ import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.ext.Provider;
 
 import org.apache.abdera.model.Feed;
-import org.apache.cxf.jaxrs.ext.provider.atom.AtomFeedProvider;
+import org.apache.cxf.jaxrs.provider.atom.AtomFeedProvider;
 
 @Produces({"application/atom+xml", "application/atom+xml;type=feed", "application/json" })
 @Consumes({"application/atom+xml", "application/atom+xml;type=feed" })

Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java?rev=1304623&r1=1304622&r2=1304623&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java Fri Mar 23 21:47:43 2012
@@ -49,10 +49,10 @@ import org.apache.cxf.io.CachedOutputStr
 import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
 import org.apache.cxf.jaxrs.client.WebClient;
 import org.apache.cxf.jaxrs.ext.form.Form;
-import org.apache.cxf.jaxrs.ext.provider.aegis.AegisElementProvider;
 import org.apache.cxf.jaxrs.ext.xml.XMLSource;
 import org.apache.cxf.jaxrs.model.wadl.WadlGenerator;
 import org.apache.cxf.jaxrs.provider.JAXBElementProvider;
+import org.apache.cxf.jaxrs.provider.aegis.AegisElementProvider;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 
 import org.junit.BeforeClass;

Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSDataBindingTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSDataBindingTest.java?rev=1304623&r1=1304622&r2=1304623&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSDataBindingTest.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSDataBindingTest.java Fri Mar 23 21:47:43 2012
@@ -28,8 +28,8 @@ import org.apache.cxf.interceptor.Interc
 import org.apache.cxf.interceptor.LoggingInInterceptor;
 import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
 import org.apache.cxf.jaxrs.client.WebClient;
-import org.apache.cxf.jaxrs.ext.provider.DataBindingJSONProvider;
-import org.apache.cxf.jaxrs.ext.provider.aegis.AegisElementProvider;
+import org.apache.cxf.jaxrs.provider.aegis.AegisElementProvider;
+import org.apache.cxf.jaxrs.provider.json.DataBindingJSONProvider;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.sdo.SDODataBinding;
 import org.apache.cxf.systest.jaxrs.sdo.SDOResource;

Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java?rev=1304623&r1=1304622&r2=1304623&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java Fri Mar 23 21:47:43 2012
@@ -39,9 +39,9 @@ import org.apache.abdera.model.Feed;
 import org.apache.abdera.model.Link;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.jaxrs.client.WebClient;
-import org.apache.cxf.jaxrs.ext.provider.atom.AtomEntryProvider;
-import org.apache.cxf.jaxrs.ext.provider.atom.AtomFeedProvider;
 import org.apache.cxf.jaxrs.ext.search.SearchCondition;
+import org.apache.cxf.jaxrs.provider.atom.AtomEntryProvider;
+import org.apache.cxf.jaxrs.provider.atom.AtomFeedProvider;
 import org.apache.cxf.management.web.logging.LogLevel;
 import org.apache.cxf.management.web.logging.ReadWriteLogStorage;
 import org.apache.cxf.management.web.logging.ReadableLogStorage;