Copied: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/jsonCases.xml (from r1237663, cxf/trunk/rt/frontend/jaxrs/src/test/resources/org/apache/cxf/jaxrs/provider/jsonCases.xml) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/jsonCases.xml?p2=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/jsonCases.xml&p1=cxf/trunk/rt/frontend/jaxrs/src/test/resources/org/apache/cxf/jaxrs/provider/jsonCases.xml&r1=1237663&r2=1238852&rev=1238852&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/test/resources/org/apache/cxf/jaxrs/provider/jsonCases.xml (original) +++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/jsonCases.xml Tue Jan 31 23:02:47 2012 @@ -1,7 +1,7 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd";> <properties> <entry key="testReadWriteComplexMap.expected">{"ns1.AegisTestBean2AegisSuperBeanMap":{"@xsi.type":"ns1:AegisTestBean2AegisSuperBeanMap","ns1.entry":{"ns1.key":{"@xsi.type":"ns2:AegisTestBean","ns2.boolValue":true,"ns2.strValue":"hovercraft"},"ns1.value":{"@xsi.type":"ns2:AegisSuperBean","ns2.boolValue":true,"ns2.strValue":"hovercraft2"}}}}</entry> -<entry key="simpleBeanXml"><?xml version='1.0' encoding='UTF-8'?><![CDATA[<ns1:AegisTestBean xmlns:ns1="http://fortest.jaxrs.cxf.apache.org"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:type="ns1:AegisTestBean"><ns1:boolValue>true</ns1:boolValue><ns1:strValue>hovercraft</ns1:strValue></ns1:AegisTestBean>]]></entry> +<entry key="simpleBeanXml"><?xml version='1.0' encoding='UTF-8'?><![CDATA[<ns1:AegisTestBean xmlns:ns1="http://resources.jaxrs.cxf.apache.org"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:type="ns1:AegisTestBean"><ns1:boolValue>true</ns1:boolValue><ns1:strValue>hovercraft</ns1:strValue></ns1:AegisTestBean>]]></entry> <entry key="noNamespaceBeanXml"><?xml version='1.0' encoding='UTF-8'?><![CDATA[<AegisTestBean xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:type="AegisTestBean"><boolValue>true</boolValue><strValue>hovercraft</strValue></AegisTestBean>]]></entry> <entry key="testAegisWriteXml"><![CDATA[<ns1:Book xmlns:ns1="http://resources.jaxrs.cxf.apache.org"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:type="ns1:Book"><ns1:id>127</ns1:id><ns1:name>CXF</ns1:name><ns1:state></ns1:state></ns1:Book>]]></entry> -</properties> \ No newline at end of file +</properties>
Copied: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/jsonp/JsonpInterceptorTest.java (from r1237663, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/jsonp/JsonpInterceptorTest.java?p2=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/jsonp/JsonpInterceptorTest.java&p1=cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java&r1=1237663&r2=1238852&rev=1238852&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpInterceptorTest.java (original) +++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/jsonp/JsonpInterceptorTest.java Tue Jan 31 23:02:47 2012 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.cxf.jaxrs.provider.jsonp; +package org.apache.cxf.jaxrs.ext.provider.jsonp; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; Copied: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/SdoFactory.java (from r1237663, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/SdoFactory.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/SdoFactory.java?p2=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/SdoFactory.java&p1=cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/SdoFactory.java&r1=1237663&r2=1238852&rev=1238852&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/SdoFactory.java (original) +++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/SdoFactory.java Tue Jan 31 23:02:47 2012 @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cxf.jaxrs.resources.sdo; +package org.apache.cxf.jaxrs.ext.provider.resources.sdo; import commonj.sdo.helper.HelperContext; public interface SdoFactory { - SdoFactory INSTANCE = org.apache.cxf.jaxrs.resources.sdo.impl.SdoFactoryImpl.init(); + SdoFactory INSTANCE = org.apache.cxf.jaxrs.ext.provider.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/ext/provider/resources/sdo/Structure.java (from r1237663, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/Structure.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/Structure.java?p2=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/Structure.java&p1=cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/Structure.java&r1=1237663&r2=1238852&rev=1238852&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/Structure.java (original) +++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/Structure.java Tue Jan 31 23:02:47 2012 @@ -34,7 +34,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cxf.jaxrs.resources.sdo; +package org.apache.cxf.jaxrs.ext.provider.resources.sdo; import java.io.Serializable; Copied: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/impl/SdoFactoryImpl.java (from r1237663, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/SdoFactoryImpl.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/impl/SdoFactoryImpl.java?p2=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/impl/SdoFactoryImpl.java&p1=cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/SdoFactoryImpl.java&r1=1237663&r2=1238852&rev=1238852&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/SdoFactoryImpl.java (original) +++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/impl/SdoFactoryImpl.java Tue Jan 31 23:02:47 2012 @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.cxf.jaxrs.resources.sdo.impl; +package org.apache.cxf.jaxrs.ext.provider.resources.sdo.impl; -import org.apache.cxf.jaxrs.resources.sdo.SdoFactory; -import org.apache.cxf.jaxrs.resources.sdo.Structure; +import org.apache.cxf.jaxrs.ext.provider.resources.sdo.SdoFactory; +import org.apache.cxf.jaxrs.ext.provider.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/ext/provider/resources/sdo/impl/StructureImpl.java (from r1237663, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/StructureImpl.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/impl/StructureImpl.java?p2=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/impl/StructureImpl.java&p1=cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/StructureImpl.java&r1=1237663&r2=1238852&rev=1238852&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/sdo/impl/StructureImpl.java (original) +++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/resources/sdo/impl/StructureImpl.java Tue Jan 31 23:02:47 2012 @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cxf.jaxrs.resources.sdo.impl; +package org.apache.cxf.jaxrs.ext.provider.resources.sdo.impl; import java.util.Collection; import java.util.List; -import org.apache.cxf.jaxrs.resources.sdo.SdoFactory; -import org.apache.cxf.jaxrs.resources.sdo.Structure; +import org.apache.cxf.jaxrs.ext.provider.resources.sdo.SdoFactory; +import org.apache.cxf.jaxrs.ext.provider.resources.sdo.Structure; import org.apache.tuscany.sdo.impl.DataObjectBase; import commonj.sdo.Type; Copied: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/servers.xml (from r1237663, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/servers.xml) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/servers.xml?p2=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/servers.xml&p1=cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/servers.xml&r1=1237663&r2=1238852&rev=1238852&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/servers.xml (original) +++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/ext/provider/servers.xml Tue Jan 31 23:02:47 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.provider.AtomPojoProvider"> + <bean id="atom" class="org.apache.cxf.jaxrs.ext.provider.AtomPojoProvider"> <property name="atomWriters" ref="atomWriters"/> <property name="atomBuilders" ref="atomBuilders"/> </bean> - <bean id="atom2" class="org.apache.cxf.jaxrs.provider.AtomPojoProvider"> + <bean id="atom2" class="org.apache.cxf.jaxrs.ext.provider.AtomPojoProvider"> <property name="atomWriters" ref="atomWriters2"/> <property name="atomBuilders" ref="atomBuilders2"/> </bean> - <bean id="atom3" class="org.apache.cxf.jaxrs.provider.AtomPojoProvider"> + <bean id="atom3" class="org.apache.cxf.jaxrs.ext.provider.AtomPojoProvider"> <property name="atomWriters" ref="atomWriters2"/> <property name="atomReaders" ref="atomReaders2"/> </bean> - <bean id="atom4" class="org.apache.cxf.jaxrs.provider.AtomPojoProvider"> + <bean id="atom4" class="org.apache.cxf.jaxrs.ext.provider.AtomPojoProvider"> <property name="atomWriters" ref="atomWriters"/> <property name="atomReaders" ref="atomReaders"/> </bean> <util:map id="atomWriters"> - <entry key="org.apache.cxf.jaxrs.provider.AtomPojoProviderTest$Books" value-ref="feedWriter"/> - <entry key="org.apache.cxf.jaxrs.provider.AtomPojoProviderTest$Book" value-ref="entryWriter"/> + <entry key="org.apache.cxf.jaxrs.ext.provider.AtomPojoProviderTest$Books" value-ref="feedWriter"/> + <entry key="org.apache.cxf.jaxrs.ext.provider.AtomPojoProviderTest$Book" value-ref="entryWriter"/> </util:map> <util:map id="atomWriters2"> - <entry key="org.apache.cxf.jaxrs.provider.AtomPojoProviderTest$Book" value-ref="entryWriter"/> + <entry key="org.apache.cxf.jaxrs.ext.provider.AtomPojoProviderTest$Book" value-ref="entryWriter"/> </util:map> <util:map id="atomReaders"> - <entry key="org.apache.cxf.jaxrs.provider.AtomPojoProviderTest$Books" value-ref="feedReader"/> + <entry key="org.apache.cxf.jaxrs.ext.provider.AtomPojoProviderTest$Books" value-ref="feedReader"/> </util:map> <util:map id="atomReaders2"> - <entry key="org.apache.cxf.jaxrs.provider.AtomPojoProviderTest$Book" value-ref="entryReader"/> + <entry key="org.apache.cxf.jaxrs.ext.provider.AtomPojoProviderTest$Book" value-ref="entryReader"/> </util:map> - <bean id="feedWriter" class="org.apache.cxf.jaxrs.provider.AtomPojoProviderTest$CustomFeedWriter"/> - <bean id="entryWriter" class="org.apache.cxf.jaxrs.provider.AtomPojoProviderTest$CustomEntryWriter"/> - <bean id="entryReader" class="org.apache.cxf.jaxrs.provider.AtomPojoProviderTest$CustomEntryReader"/> - <bean id="feedReader" class="org.apache.cxf.jaxrs.provider.AtomPojoProviderTest$CustomFeedReader"/> + <bean id="feedWriter" class="org.apache.cxf.jaxrs.ext.provider.AtomPojoProviderTest$CustomFeedWriter"/> + <bean id="entryWriter" class="org.apache.cxf.jaxrs.ext.provider.AtomPojoProviderTest$CustomEntryWriter"/> + <bean id="entryReader" class="org.apache.cxf.jaxrs.ext.provider.AtomPojoProviderTest$CustomEntryReader"/> + <bean id="feedReader" class="org.apache.cxf.jaxrs.ext.provider.AtomPojoProviderTest$CustomFeedReader"/> <util:map id="atomBuilders"> - <entry key="org.apache.cxf.jaxrs.provider.AtomPojoProviderTest$Books" value-ref="simpleFeedBuilder"/> - <entry key="org.apache.cxf.jaxrs.provider.AtomPojoProviderTest$Book" value-ref="simpleEntryBuilder"/> + <entry key="org.apache.cxf.jaxrs.ext.provider.AtomPojoProviderTest$Books" value-ref="simpleFeedBuilder"/> + <entry key="org.apache.cxf.jaxrs.ext.provider.AtomPojoProviderTest$Book" value-ref="simpleEntryBuilder"/> </util:map> - <bean id="simpleFeedBuilder" class="org.apache.cxf.jaxrs.provider.AtomPojoProviderTest$CustomFeedBuilder"/> + <bean id="simpleFeedBuilder" class="org.apache.cxf.jaxrs.ext.provider.AtomPojoProviderTest$CustomFeedBuilder"/> <util:map id="atomBuilders2"> - <entry key="org.apache.cxf.jaxrs.provider.AtomPojoProviderTest$Book" value-ref="simpleEntryBuilder"/> + <entry key="org.apache.cxf.jaxrs.ext.provider.AtomPojoProviderTest$Book" value-ref="simpleEntryBuilder"/> </util:map> - <bean id="simpleEntryBuilder" class="org.apache.cxf.jaxrs.provider.AtomPojoProviderTest$CustomEntryBuilder"/> + <bean id="simpleEntryBuilder" class="org.apache.cxf.jaxrs.ext.provider.AtomPojoProviderTest$CustomEntryBuilder"/> </beans> Copied: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/AegisTestBean.java (from r1237663, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/fortest/AegisTestBean.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/AegisTestBean.java?p2=cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/AegisTestBean.java&p1=cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/fortest/AegisTestBean.java&r1=1237663&r2=1238852&rev=1238852&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/fortest/AegisTestBean.java (original) +++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/AegisTestBean.java Tue Jan 31 23:02:47 2012 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.cxf.jaxrs.fortest; +package org.apache.cxf.jaxrs.resources; /** * A bean class. No corresponding .aegis.xml file. Added: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/Book.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/Book.java?rev=1238852&view=auto ============================================================================== --- cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/Book.java (added) +++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/Book.java Tue Jan 31 23:02:47 2012 @@ -0,0 +1,83 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.cxf.jaxrs.resources; + +import javax.ws.rs.GET; +import javax.xml.bind.annotation.XmlRootElement; + + +@XmlRootElement(name = "Book") +public class Book implements Comparable<Book> { + private String name; + private long id; + + public Book() { + } + + public Book(String name, long id) { + this.name = name; + this.id = id; + } + + public void setName(String n) { + name = n; + } + + public String getName() { + return name; + } + + public void setId(long i) { + id = i; + } + public long getId() { + return id; + } + + + @GET + public String getState() { + return ""; + } + + + public void setState(String s) { + } + + public int hashCode() { + return name.hashCode() * 37 + new Long(id).hashCode(); + } + + public boolean equals(Object o) { + if (!(o instanceof Book)) { + return false; + } + Book other = (Book)o; + + return other.name.equals(name) && other.id == id; + + } + + public int compareTo(Book b) { + Long i1 = new Long(getId()); + Long i2 = new Long(b.getId()); + return i1.compareTo(i2); + } +} Propchange: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/Book.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/Book.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/CollectionsResource.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/CollectionsResource.java?rev=1238852&view=auto ============================================================================== --- cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/CollectionsResource.java (added) +++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/CollectionsResource.java Tue Jan 31 23:02:47 2012 @@ -0,0 +1,32 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cxf.jaxrs.resources; + +import java.util.List; +import javax.ws.rs.GET; + +public class CollectionsResource { + + @GET + public List<AegisTestBean> getAegisBeans() { + return null; + } + + +} Propchange: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/CollectionsResource.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/CollectionsResource.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/ManyTags.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/ManyTags.java?rev=1238852&view=auto ============================================================================== --- cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/ManyTags.java (added) +++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/ManyTags.java Tue Jan 31 23:02:47 2012 @@ -0,0 +1,39 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cxf.jaxrs.resources; + +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement(name = "ManyTags") +public class ManyTags { + private Tags tags; + + public ManyTags() { + + } + + public void setTags(Tags t) { + tags = t; + } + + public Tags getTags() { + return tags; + } + +} Propchange: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/ManyTags.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/ManyTags.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/TagVO.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/TagVO.java?rev=1238852&view=auto ============================================================================== --- cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/TagVO.java (added) +++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/TagVO.java Tue Jan 31 23:02:47 2012 @@ -0,0 +1,54 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.cxf.jaxrs.resources; + +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement +public class TagVO { + private String name; + private String group; + + public TagVO() { + + } + + public TagVO(String name, String group) { + this.name = name; + this.group = group; + } + + public void setName(String n) { + this.name = n; + } + + public void setGroup(String g) { + this.group = g; + } + + public String getName() { + return name; + } + + public String getGroup() { + return group; + } + +} Propchange: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/TagVO.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/TagVO.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/Tags.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/Tags.java?rev=1238852&view=auto ============================================================================== --- cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/Tags.java (added) +++ cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/Tags.java Tue Jan 31 23:02:47 2012 @@ -0,0 +1,50 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cxf.jaxrs.resources; + +import java.util.ArrayList; +import java.util.List; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +import org.apache.cxf.aegis.type.java5.XmlFlattenedArray; + +@XmlRootElement(name = "Tags") +public class Tags { + private List<TagVO> list = new ArrayList<TagVO>(); + + public Tags() { + + } + + public Tags(List<TagVO> tags) { + list.addAll(tags); + } + + public void addTag(TagVO tag) { + list.add(tag); + } + + @XmlFlattenedArray + @XmlElement(name = "list") + public List<TagVO> getTags() { + return list; + } +} Propchange: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/Tags.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/Tags.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: cxf/trunk/systests/jaxrs/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/pom.xml?rev=1238852&r1=1238851&r2=1238852&view=diff ============================================================================== --- cxf/trunk/systests/jaxrs/pom.xml (original) +++ cxf/trunk/systests/jaxrs/pom.xml Tue Jan 31 23:02:47 2012 @@ -178,6 +178,11 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-rs-extension-providers</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-security-cors</artifactId> <version>${project.version}</version> <scope>test</scope> 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=1238852&r1=1238851&r2=1238852&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 Tue Jan 31 23:02:47 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.provider.AtomFeedProvider; +import org.apache.cxf.jaxrs.ext.provider.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=1238852&r1=1238851&r2=1238852&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 Tue Jan 31 23:02:47 2012 @@ -48,9 +48,9 @@ import org.apache.cxf.helpers.IOUtils; import org.apache.cxf.io.CachedOutputStream; import org.apache.cxf.jaxrs.client.JAXRSClientFactory; import org.apache.cxf.jaxrs.client.WebClient; +import org.apache.cxf.jaxrs.ext.provider.AegisElementProvider; import org.apache.cxf.jaxrs.ext.xml.XMLSource; import org.apache.cxf.jaxrs.model.wadl.WadlGenerator; -import org.apache.cxf.jaxrs.provider.AegisElementProvider; import org.apache.cxf.jaxrs.provider.JAXBElementProvider; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; 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=1238852&r1=1238851&r2=1238852&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 Tue Jan 31 23:02:47 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.provider.AegisElementProvider; -import org.apache.cxf.jaxrs.provider.DataBindingJSONProvider; +import org.apache.cxf.jaxrs.ext.provider.AegisElementProvider; +import org.apache.cxf.jaxrs.ext.provider.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=1238852&r1=1238851&r2=1238852&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 Tue Jan 31 23:02:47 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.AtomEntryProvider; +import org.apache.cxf.jaxrs.ext.provider.AtomFeedProvider; import org.apache.cxf.jaxrs.ext.search.SearchCondition; -import org.apache.cxf.jaxrs.provider.AtomEntryProvider; -import org.apache.cxf.jaxrs.provider.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; Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushTest.java?rev=1238852&r1=1238851&r2=1238852&view=diff ============================================================================== --- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushTest.java (original) +++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushTest.java Tue Jan 31 23:02:47 2012 @@ -39,10 +39,10 @@ import org.apache.cxf.common.logging.Log import org.apache.cxf.endpoint.Server; import org.apache.cxf.helpers.IOUtils; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; -import org.apache.cxf.jaxrs.ext.atom.AbstractEntryBuilder; -import org.apache.cxf.jaxrs.ext.atom.AbstractFeedBuilder; -import org.apache.cxf.jaxrs.provider.AtomEntryProvider; -import org.apache.cxf.jaxrs.provider.AtomFeedProvider; +import org.apache.cxf.jaxrs.ext.provider.AtomEntryProvider; +import org.apache.cxf.jaxrs.ext.provider.AtomFeedProvider; +import org.apache.cxf.jaxrs.ext.provider.atom.AbstractEntryBuilder; +import org.apache.cxf.jaxrs.ext.provider.atom.AbstractFeedBuilder; import org.apache.cxf.management.web.logging.atom.AtomPushHandler; import org.apache.cxf.management.web.logging.atom.converter.Converter; import org.apache.cxf.management.web.logging.atom.converter.StandardConverter; Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml?rev=1238852&r1=1238851&r2=1238852&view=diff ============================================================================== --- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml (original) +++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml Tue Jan 31 23:02:47 2012 @@ -95,7 +95,7 @@ http://cxf.apache.org/schemas/core.xsd";> </jaxrs:serviceBeans> <jaxrs:providers> - <bean class="org.apache.cxf.jaxrs.provider.AegisElementProvider"/> + <bean class="org.apache.cxf.jaxrs.ext.provider.AegisElementProvider"/> </jaxrs:providers> </jaxrs:server> @@ -139,11 +139,11 @@ http://cxf.apache.org/schemas/core.xsd";> </jaxrs:serviceBeans> <jaxrs:inInterceptors> - <bean class="org.apache.cxf.jaxrs.provider.jsonp.JsonpInInterceptor"/> + <bean class="org.apache.cxf.jaxrs.ext.provider.jsonp.JsonpInInterceptor"/> </jaxrs:inInterceptors> <jaxrs:outInterceptors> - <bean class="org.apache.cxf.jaxrs.provider.jsonp.JsonpPreStreamInterceptor"/> - <bean class="org.apache.cxf.jaxrs.provider.jsonp.JsonpPostStreamInterceptor"/> + <bean class="org.apache.cxf.jaxrs.ext.provider.jsonp.JsonpPreStreamInterceptor"/> + <bean class="org.apache.cxf.jaxrs.ext.provider.jsonp.JsonpPostStreamInterceptor"/> </jaxrs:outInterceptors> </jaxrs:server> Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/beans.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/beans.xml?rev=1238852&r1=1238851&r2=1238852&view=diff ============================================================================== --- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/beans.xml (original) +++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/beans.xml Tue Jan 31 23:02:47 2012 @@ -97,7 +97,7 @@ http://cxf.apache.org/schemas/jaxrs.xsd"; <bean id="atomstore2" class="org.apache.cxf.systest.jaxrs.AtomBookStore2"/> <bean id="atomstore3" class="org.apache.cxf.systest.jaxrs.AtomBookStore3"/> - <bean id="feed" class="org.apache.cxf.jaxrs.provider.AtomFeedProvider"> + <bean id="feed" class="org.apache.cxf.jaxrs.ext.provider.AtomFeedProvider"> <property name="formattedOutput" value="true"/> </bean> <bean id="feed2" class="org.apache.cxf.systest.jaxrs.CustomAtomFeedProvider"> @@ -105,7 +105,7 @@ http://cxf.apache.org/schemas/jaxrs.xsd"; <property name="formattedOutput" value="true"/> --> </bean> - <bean id="entry" class="org.apache.cxf.jaxrs.provider.AtomEntryProvider"/> + <bean id="entry" class="org.apache.cxf.jaxrs.ext.provider.AtomEntryProvider"/> </beans> <!-- END SNIPPET: beans --> Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_databinding/WEB-INF/beans.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_databinding/WEB-INF/beans.xml?rev=1238852&r1=1238851&r2=1238852&view=diff ============================================================================== --- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_databinding/WEB-INF/beans.xml (original) +++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_databinding/WEB-INF/beans.xml Tue Jan 31 23:02:47 2012 @@ -90,7 +90,7 @@ http://cxf.apache.org/schemas/core.xsd";> </jaxrs:server> <bean id="sdoDatabinding" class="org.apache.cxf.sdo.SDODataBinding"/> - <bean id="jsonSdoBean" class="org.apache.cxf.jaxrs.provider.DataBindingJSONProvider"> + <bean id="jsonSdoBean" class="org.apache.cxf.jaxrs.ext.provider.DataBindingJSONProvider"> <property name="dataBinding" ref="sdoDatabinding"/> <property name="namespaceMap" ref="jsonNamespaceMap"/> </bean> Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml?rev=1238852&r1=1238851&r2=1238852&view=diff ============================================================================== --- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml (original) +++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml Tue Jan 31 23:02:47 2012 @@ -107,10 +107,10 @@ http://www.springframework.org/schema/ut </bean> - <bean id="feed" class="org.apache.cxf.jaxrs.provider.AtomFeedProvider"> + <bean id="feed" class="org.apache.cxf.jaxrs.ext.provider.AtomFeedProvider"> <property name="formattedOutput" value="true"/> </bean> - <bean id="entry" class="org.apache.cxf.jaxrs.provider.AtomEntryProvider"> + <bean id="entry" class="org.apache.cxf.jaxrs.ext.provider.AtomEntryProvider"> <property name="formattedOutput" value="true"/> </bean> Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompush/WEB-INF/beans.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompush/WEB-INF/beans.xml?rev=1238852&r1=1238851&r2=1238852&view=diff ============================================================================== --- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompush/WEB-INF/beans.xml (original) +++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompush/WEB-INF/beans.xml Tue Jan 31 23:02:47 2012 @@ -138,10 +138,10 @@ factory-method="create"> <ref bean="entry"/> </util:list> - <bean id="feed" class="org.apache.cxf.jaxrs.provider.AtomFeedProvider"> + <bean id="feed" class="org.apache.cxf.jaxrs.ext.provider.AtomFeedProvider"> <property name="formattedOutput" value="true"/> </bean> - <bean id="entry" class="org.apache.cxf.jaxrs.provider.AtomEntryProvider"> + <bean id="entry" class="org.apache.cxf.jaxrs.ext.provider.AtomEntryProvider"> <property name="formattedOutput" value="true"/> </bean> Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/beans.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/beans.xml?rev=1238852&r1=1238851&r2=1238852&view=diff ============================================================================== --- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/beans.xml (original) +++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/beans.xml Tue Jan 31 23:02:47 2012 @@ -107,7 +107,7 @@ http://cxf.apache.org/schemas/jaxrs.xsd"; </jaxws:endpoint> - <bean id="jaxrs-data-binding" class="org.apache.cxf.jaxrs.provider.JAXRSDataBinding"> + <bean id="jaxrs-data-binding" class="org.apache.cxf.jaxrs.ext.provider.JAXRSDataBinding"> <property name="provider" ref="jaxbProviderSoap"/> </bean>
