Author: heiko.braun(a)jboss.com Date: 2007-11-26 06:26:17 -0500 (Mon, 26 Nov 2007) New Revision: 5109 Added: rest/src/main/java/org/jboss/rest/jaxrs/ rest/src/main/java/org/jboss/rest/jaxrs/ProviderFactoryImpl.java Removed: rest/src/main/java/org/jboss/rest/media/DefaultProviderFactory.java Modified: rest/jboss-rest.iws rest/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java rest/src/main/java/org/jboss/rest/model/ParameterBinding.java rest/src/main/resources/jbossrest.jar/META-INF/services/javax.ws.rs.ext.ProviderFactory rest/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java Log: Added jaxrs package that contains all 311 SPI artifacts Modified: rest/jboss-rest.iws =================================================================== --- rest/jboss-rest.iws 2007-11-26 11:22:07 UTC (rev 5108) +++ rest/jboss-rest.iws 2007-11-26 11:26:17 UTC (rev 5109) @@ -17,30 +17,19 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> - <change type="DELETED" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/model/RunRegex.java" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ParameterBinding.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ParameterBinding.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/StatefulResourceResolver.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/StatefulResourceResolver.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/BookResource.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/BookResource.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/media/DefaultProviderFactory.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/media/DefaultProviderFactory.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/InvocationBuilderTestCase.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/InvocationBuilderTestCase.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/media/MediaTypeProvider.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jboss-rest.ipr" afterPath="$PROJECT_DIR$/jboss-rest.ipr" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/resources/jbossrest.jar/META-INF/services/javax.ws.rs.ext.ProviderFactory" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/webservices/build.xml" afterPath="/home/hbraun/dev/prj/jbossas/trunk/webservices/build.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ParameterBinding.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ParameterBinding.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossws/spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java" afterPath="/home/hbraun/dev/prj/jbossws/spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java" /> <change type="NEW" beforePath="" afterPath="/home/hbraun/dev/prj/jbossas/trunk/webservices/jboss50.iml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/BookStoreResource.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/BookStoreResource.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossws/spi/trunk/version.properties" afterPath="/home/hbraun/dev/prj/jbossws/spi/trunk/version.properties" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/jaxrs" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/webservices/src/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml" afterPath="/home/hbraun/dev/prj/jbossas/trunk/webservices/src/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/InvocationMediator.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/InvocationMediator.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/media/DefaultContentNegotiation.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/media/DefaultContentNegotiation.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/util/Convert.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/util/Convert.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ResourceMethod.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ResourceMethod.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/RuntimeContext.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/RuntimeContext.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/jbossrest.jar/META-INF/services/javax.ws.rs.ext.ProviderFactory" afterPath="$PROJECT_DIR$/src/main/resources/jbossrest.jar/META-INF/services/javax.ws.rs.ext.ProviderFactory" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/media/DefaultProviderFactory.java" afterPath="" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/jaxrs/ProviderFactoryImpl.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPostJSE.java" afterPath="/home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPostJSE.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/WidgetList.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/WidgetList.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jboss-rest.iws" afterPath="$PROJECT_DIR$/jboss-rest.iws" /> </list> </component> @@ -223,98 +212,7 @@ </subPane> </component> <component name="FileEditorManager"> - <leaf> - <file leaf-file-name="ParameterBinding.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ParameterBinding.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="168" column="0" selection-start="5574" selection-end="5574" vertical-scroll-proportion="0.18688118"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="Widget.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/Widget.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="13" selection-start="1304" selection-end="1304" vertical-scroll-proportion="0.07654921"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="WidgetList.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/WidgetList.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="47" column="11" selection-start="1585" selection-end="1585" vertical-scroll-proportion="0.5771567"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="InvocationMediator.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/InvocationMediator.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="65" column="0" selection-start="2362" selection-end="2362" vertical-scroll-proportion="0.75334144"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ResourceServlet.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="99" column="17" selection-start="3734" selection-end="3734" vertical-scroll-proportion="0.41433778"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="MediaTypeTestCase.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="55" column="6" selection-start="1610" selection-end="1610" vertical-scroll-proportion="0.6148238"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="InvocationBuilderTestCase.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/InvocationBuilderTestCase.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="107" column="75" selection-start="4161" selection-end="4161" vertical-scroll-proportion="0.21506684"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="RuntimeContext.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/RuntimeContext.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="63" column="32" selection-start="2108" selection-end="2108" vertical-scroll-proportion="0.48481166"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ResponseBuilderImpl.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file:///home/hbraun/Desktop/JSR-311/0.5/src/com/sun/ws/rest/impl/ResponseBuilderImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="52" column="66" selection-start="1923" selection-end="1923" vertical-scroll-proportion="-0.60024303"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="BookResource.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/BookResource.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="76" column="60" selection-start="1371" selection-end="1371" vertical-scroll-proportion="0.63791007"> - <folding /> - </state> - </provider> - </entry> - </file> - </leaf> + <leaf /> </component> <component name="FindManager"> <FindUsagesManager> @@ -835,13 +733,9 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rest/container" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rest/jaxrs" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -906,6 +800,7 @@ <recent name="" /> </key> <key name="MoveClassesOrPackagesDialog.RECENTS_KEY"> + <recent name="org.jboss.rest.jaxrs" /> <recent name="org.jboss.test.rest.samples.resourceview" /> <recent name="org.jboss.wsf.container.jboss50.rest" /> <recent name="org.jboss.rs.container.wsf" /> @@ -1098,13 +993,13 @@ </component> <component name="ToolWindowManager"> <frame x="3" y="25" width="1674" height="994" extended-state="2" /> - <editor active="true" /> + <editor active="false" /> <layout> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4498861" order="1" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.44954127" order="1" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39793578" order="3" /> <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> @@ -1117,7 +1012,7 @@ <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.74943054" order="8" /> <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28676924" order="0" /> + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28676924" order="0" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.1563458" order="2" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.48063782" order="2" /> @@ -1228,86 +1123,86 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/media/DefaultProviderFactory.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/jaxrs/ProviderFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> <state line="48" column="0" selection-start="1355" selection-end="1355" vertical-scroll-proportion="0.6993604"> <folding /> </state> </provider> </entry> - <entry file="file:///home/hbraun/Desktop/JSR-311/0.5/src/com/sun/ws/rest/impl/ResponseBuilderImpl.java"> + <entry file="jar:///home/hbraun/Desktop/JSR-311/0.5/lib/jsr311-api.jar!/javax/ws/rs/core/EntityTag.class"> <provider selected="true" editor-type-id="text-editor"> - <state line="52" column="66" selection-start="1923" selection-end="1923" vertical-scroll-proportion="-0.60024303"> + <state line="5" column="13" selection-start="154" selection-end="154" vertical-scroll-proportion="0.16204691"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/InvocationMediator.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ParameterBinding.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="65" column="0" selection-start="2362" selection-end="2362" vertical-scroll-proportion="0.75334144"> + <state line="168" column="0" selection-start="5574" selection-end="5574" vertical-scroll-proportion="0.18688118"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/Widget.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="55" column="6" selection-start="1610" selection-end="1610" vertical-scroll-proportion="0.6148238"> + <state line="34" column="13" selection-start="1304" selection-end="1304" vertical-scroll-proportion="0.07654921"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/WidgetList.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="99" column="17" selection-start="3734" selection-end="3734" vertical-scroll-proportion="0.41433778"> + <state line="47" column="11" selection-start="1585" selection-end="1585" vertical-scroll-proportion="0.5771567"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/RuntimeContext.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/InvocationMediator.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="63" column="32" selection-start="2108" selection-end="2108" vertical-scroll-proportion="0.48481166"> + <state line="65" column="0" selection-start="2362" selection-end="2362" vertical-scroll-proportion="0.75334144"> <folding /> </state> </provider> </entry> - <entry file="jar:///home/hbraun/Desktop/JSR-311/0.5/lib/jsr311-api.jar!/javax/ws/rs/core/EntityTag.class"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="5" column="13" selection-start="154" selection-end="154" vertical-scroll-proportion="0.16204691"> + <state line="99" column="17" selection-start="3734" selection-end="3734" vertical-scroll-proportion="0.41433778"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/BookResource.java"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="76" column="60" selection-start="1371" selection-end="1371" vertical-scroll-proportion="0.63791007"> + <state line="55" column="6" selection-start="1610" selection-end="1610" vertical-scroll-proportion="0.6148238"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ParameterBinding.java"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/InvocationBuilderTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="168" column="0" selection-start="5574" selection-end="5574" vertical-scroll-proportion="0.18688118"> + <state line="112" column="40" selection-start="4346" selection-end="4346" vertical-scroll-proportion="0.3304982"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/Widget.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/RuntimeContext.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="13" selection-start="1304" selection-end="1304" vertical-scroll-proportion="0.07654921"> + <state line="63" column="32" selection-start="2108" selection-end="2108" vertical-scroll-proportion="0.48481166"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/WidgetList.java"> + <entry file="file:///home/hbraun/Desktop/JSR-311/0.5/src/com/sun/ws/rest/impl/ResponseBuilderImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="47" column="11" selection-start="1585" selection-end="1585" vertical-scroll-proportion="0.5771567"> + <state line="52" column="66" selection-start="1923" selection-end="1923" vertical-scroll-proportion="-0.60024303"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/InvocationBuilderTestCase.java"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/BookResource.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="107" column="75" selection-start="4161" selection-end="4161" vertical-scroll-proportion="0.21506684"> + <state line="76" column="60" selection-start="1371" selection-end="1371" vertical-scroll-proportion="0.63791007"> <folding /> </state> </provider> Modified: rest/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java =================================================================== --- rest/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java 2007-11-26 11:22:07 UTC (rev 5108) +++ rest/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java 2007-11-26 11:26:17 UTC (rev 5109) @@ -26,7 +26,7 @@ import org.jboss.rest.ResourceError; import org.jboss.rest.ResourceRegistry; import org.jboss.rest.ResourceRegistryFactory; -import org.jboss.rest.media.DefaultProviderFactory; +import org.jboss.rest.jaxrs.ProviderFactoryImpl; import org.jboss.rest.model.ResourceModel; import org.jboss.rest.runtime.InvocationMediator; import org.jboss.rest.runtime.RuntimeContext; @@ -124,7 +124,7 @@ // OK res.setStatus(200); - ProviderFactory providerfactory = DefaultProviderFactory.newInstance(); + ProviderFactory providerfactory = ProviderFactoryImpl.newInstance(); MessageBodyWriter writer = providerfactory.createMessageBodyWriter(returnValue.getClass(), null); OutputStream out = res.getOutputStream(); writer.writeTo(returnValue, null, null, out); Copied: rest/src/main/java/org/jboss/rest/jaxrs/ProviderFactoryImpl.java (from rev 5107, rest/src/main/java/org/jboss/rest/media/DefaultProviderFactory.java) =================================================================== --- rest/src/main/java/org/jboss/rest/jaxrs/ProviderFactoryImpl.java (rev 0) +++ rest/src/main/java/org/jboss/rest/jaxrs/ProviderFactoryImpl.java 2007-11-26 11:26:17 UTC (rev 5109) @@ -0,0 +1,110 @@ +package org.jboss.rest.jaxrs; + +import org.jboss.rest.media.simple.StringProvider; +import org.jboss.rest.media.xml.JAXBProvider; +import org.jboss.rest.media.MediaTypeProvider; + +import javax.ws.rs.core.MediaType; +import javax.ws.rs.ext.HeaderProvider; +import javax.ws.rs.ext.MessageBodyReader; +import javax.ws.rs.ext.MessageBodyWriter; +import javax.ws.rs.ext.ProviderFactory; +import java.util.ArrayList; +import java.util.List; + + +/** + * Prelimenary solution. + * + * TODO: Provide a scoped (classloading) reader/writer registry that this class can delegate to. + */ +public class ProviderFactoryImpl extends ProviderFactory +{ + + private static List<MessageBodyReader> reader = new ArrayList<MessageBodyReader>(); + private static List<MessageBodyWriter> writer = new ArrayList<MessageBodyWriter>(); + private static List<HeaderProvider> headerProvider = new ArrayList<HeaderProvider>(); + + static final JAXBProvider JAXB = new JAXBProvider(); + static final StringProvider STRING = new StringProvider(); + static final MediaTypeProvider MEDIA_TYPE = new MediaTypeProvider(); + + static + { + reader.add( JAXB ); + reader.add( STRING ); + + writer.add( JAXB ); + writer.add( STRING ); + + headerProvider.add(MEDIA_TYPE); + } + + public static ProviderFactory newInstance() + { + return new ProviderFactoryImpl(); + } + + public <T> T createInstance(Class<T> aClass) + { + throw new IllegalArgumentException("Cannot create instance for " + aClass); + } + + @SuppressWarnings("unchecked") + public <T> HeaderProvider<T> createHeaderProvider(Class<T> aClass) + { + HeaderProvider<T> provider = null; + + for(HeaderProvider h : headerProvider) + { + if(h.supports(aClass)) + { + provider = h; + break; + } + } + + if(null==provider) + throw new IllegalArgumentException("No header provider for type: " + aClass); + + return provider; + } + + public <T> MessageBodyReader<T> createMessageBodyReader(Class<T> aClass, MediaType mediaType) + { + MessageBodyReader match = null; + + for(MessageBodyReader r : reader) + { + if(r.isReadable(aClass)) + { + match = r; + break; + } + } + + if(null==match) + throw new RuntimeException("No reader for type: " + aClass + ", mediaType="+mediaType); + + return match; + } + + public <T> MessageBodyWriter<T> createMessageBodyWriter(Class<T> aClass, MediaType mediaType) + { + MessageBodyWriter match = null; + + for(MessageBodyWriter w : writer) + { + if(w.isWriteable(aClass)) + { + match = w; + break; + } + } + + if(null==match) + throw new RuntimeException("No writer for type: " + aClass + ", mediaType="+mediaType); + + return match; + } +} Property changes on: rest/src/main/java/org/jboss/rest/jaxrs/ProviderFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: rest/src/main/java/org/jboss/rest/media/DefaultProviderFactory.java =================================================================== --- rest/src/main/java/org/jboss/rest/media/DefaultProviderFactory.java 2007-11-26 11:22:07 UTC (rev 5108) +++ rest/src/main/java/org/jboss/rest/media/DefaultProviderFactory.java 2007-11-26 11:26:17 UTC (rev 5109) @@ -1,109 +0,0 @@ -package org.jboss.rest.media; - -import org.jboss.rest.media.simple.StringProvider; -import org.jboss.rest.media.xml.JAXBProvider; - -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.HeaderProvider; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.ProviderFactory; -import java.util.ArrayList; -import java.util.List; - - -/** - * Prelimenary solution. - * - * TODO: Provide a scoped (classloading) reader/writer registry that this class can delegate to. - */ -public class DefaultProviderFactory extends ProviderFactory -{ - - private static List<MessageBodyReader> reader = new ArrayList<MessageBodyReader>(); - private static List<MessageBodyWriter> writer = new ArrayList<MessageBodyWriter>(); - private static List<HeaderProvider> headerProvider = new ArrayList<HeaderProvider>(); - - static final JAXBProvider JAXB = new JAXBProvider(); - static final StringProvider STRING = new StringProvider(); - static final MediaTypeProvider MEDIA_TYPE = new MediaTypeProvider(); - - static - { - reader.add( JAXB ); - reader.add( STRING ); - - writer.add( JAXB ); - writer.add( STRING ); - - headerProvider.add(MEDIA_TYPE); - } - - public static ProviderFactory newInstance() - { - return new DefaultProviderFactory(); - } - - public <T> T createInstance(Class<T> aClass) - { - throw new IllegalArgumentException("Cannot create instance for " + aClass); - } - - @SuppressWarnings("unchecked") - public <T> HeaderProvider<T> createHeaderProvider(Class<T> aClass) - { - HeaderProvider<T> provider = null; - - for(HeaderProvider h : headerProvider) - { - if(h.supports(aClass)) - { - provider = h; - break; - } - } - - if(null==provider) - throw new IllegalArgumentException("No header provider for type: " + aClass); - - return provider; - } - - public <T> MessageBodyReader<T> createMessageBodyReader(Class<T> aClass, MediaType mediaType) - { - MessageBodyReader match = null; - - for(MessageBodyReader r : reader) - { - if(r.isReadable(aClass)) - { - match = r; - break; - } - } - - if(null==match) - throw new RuntimeException("No reader for type: " + aClass + ", mediaType="+mediaType); - - return match; - } - - public <T> MessageBodyWriter<T> createMessageBodyWriter(Class<T> aClass, MediaType mediaType) - { - MessageBodyWriter match = null; - - for(MessageBodyWriter w : writer) - { - if(w.isWriteable(aClass)) - { - match = w; - break; - } - } - - if(null==match) - throw new RuntimeException("No writer for type: " + aClass + ", mediaType="+mediaType); - - return match; - } -} Modified: rest/src/main/java/org/jboss/rest/model/ParameterBinding.java =================================================================== --- rest/src/main/java/org/jboss/rest/model/ParameterBinding.java 2007-11-26 11:22:07 UTC (rev 5108) +++ rest/src/main/java/org/jboss/rest/model/ParameterBinding.java 2007-11-26 11:26:17 UTC (rev 5109) @@ -23,7 +23,7 @@ import org.jboss.logging.Logger; import org.jboss.rest.MethodHTTP; -import org.jboss.rest.media.DefaultProviderFactory; +import org.jboss.rest.jaxrs.ProviderFactoryImpl; import org.jboss.rest.runtime.ContextAdapterBuilder; import org.jboss.rest.runtime.Invocation; import org.jboss.rest.runtime.InvocationModel; @@ -165,7 +165,7 @@ try { // unmarshall body - ProviderFactory providerfactory = DefaultProviderFactory.newInstance(); + ProviderFactory providerfactory = ProviderFactoryImpl.newInstance(); MessageBodyReader reader = providerfactory.createMessageBodyReader(entityBodyType, null); Object messageBody = reader.readFrom(entityBodyType, null, null, ctx.getInStream() ); Modified: rest/src/main/resources/jbossrest.jar/META-INF/services/javax.ws.rs.ext.ProviderFactory =================================================================== --- rest/src/main/resources/jbossrest.jar/META-INF/services/javax.ws.rs.ext.ProviderFactory 2007-11-26 11:22:07 UTC (rev 5108) +++ rest/src/main/resources/jbossrest.jar/META-INF/services/javax.ws.rs.ext.ProviderFactory 2007-11-26 11:26:17 UTC (rev 5109) @@ -1 +1 @@ -org.jboss.rest.media.DefaultProviderFactory \ No newline at end of file +org.jboss.rest.jaxrs.ProviderFactoryImpl \ No newline at end of file Modified: rest/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java =================================================================== --- rest/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java 2007-11-26 11:22:07 UTC (rev 5108) +++ rest/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java 2007-11-26 11:26:17 UTC (rev 5109) @@ -1,7 +1,7 @@ package org.jboss.test.rest.media; import junit.framework.Test; -import org.jboss.rest.media.DefaultProviderFactory; +import org.jboss.rest.jaxrs.ProviderFactoryImpl; import org.jboss.rest.MethodHTTP; import org.jboss.test.rest.util.RestCase; import org.jboss.test.rest.util.RestTestSetup; @@ -60,7 +60,7 @@ private Object executeRequest(URL url, MethodHTTP method, Object data) throws Exception { - ProviderFactory providerFactory = DefaultProviderFactory.newInstance(); + ProviderFactory providerFactory = ProviderFactoryImpl.newInstance(); HttpURLConnection conn = (HttpURLConnection)url.openConnection(); conn.setDoOutput( data!=null );