[jbossws-commits] JBossWS SVN: r5116 - in rest: src/main/java/org/jboss/rest/model and 1 other directory.

Author: heiko.braun(a)jboss.com Date: 2007-11-26 10:17:55 -0500 (Mon, 26 Nov 2007) New Revision: 5116 Modified: rest/jboss-rest.iws rest/src/main/java/org/jboss/rest/model/RootParameterBinding.java rest/src/main/java/org/jboss/rest/model/RootResourceModel.java rest/src/main/java/org/jboss/rest/model/StatefulResourceResolver.java Log: API docs Modified: rest/jboss-rest.iws =================================================================== --- rest/jboss-rest.iws 2007-11-26 15:15:07 UTC (rev 5115) +++ rest/jboss-rest.iws 2007-11-26 15:17:55 UTC (rev 5116) @@ -17,38 +17,16 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/deployment/DeploymentTestCase.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/deployment/DeploymentTestCase.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/resources/rest/invocation/uriparam" /> - <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="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/resources/rest/invocation" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/RootParameterBinding.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/ant-import-tests/build-jars-rest.xml" afterPath="$PROJECT_DIR$/ant-import-tests/build-jars-rest.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ResourceLocator.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ResourceLocator.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/test/java/org/jboss/test/rest/invocation/uriparam/ItemResource.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/Invocation.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/Invocation.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/RootParameterBinding.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/RootParameterBinding.java" /> <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="/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="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/AbstractResourceOperation.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/AbstractResourceOperation.java" /> - <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="/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="NEW" beforePath="" afterPath="/home/hbraun/dev/prj/jbossas/trunk/webservices/jboss50.iml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/uriparam/ShopResource.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/resources/rest/invocation/uriparam/WEB-INF" /> + <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="/home/hbraun/dev/prj/jbossws/spi/trunk/version.properties" afterPath="/home/hbraun/dev/prj/jbossws/spi/trunk/version.properties" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ResourceModelParser.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ResourceModelParser.java" /> <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="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/util/RequestDispatcher.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/uriparam/CategoryResource.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="/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="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/uriparam/UriParamTestCase.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/resources/rest/invocation/uriparam/WEB-INF/jbossrs.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/uriparam" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/RootResourceModel.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ResourceModel.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ResourceModel.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/resources/rest/invocation/uriparam/WEB-INF/web.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jboss-rest.iws" afterPath="$PROJECT_DIR$/jboss-rest.iws" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/RootResourceModel.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/RootResourceModel.java" /> </list> </component> <component name="ChangeListSynchronizer" /> @@ -172,7 +150,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/RootResourceModel.java" line="42" class="org.jboss.rest.model.RootResourceModel" package="org.jboss.rest.model"> + <breakpoint url="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/RootResourceModel.java" line="50" class="org.jboss.rest.model.RootResourceModel" package="org.jboss.rest.model"> <option name="ENABLED" value="false" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -269,100 +247,7 @@ </subPane> </component> <component name="FileEditorManager"> - <leaf> - <file leaf-file-name="InvocationMediator.java" pinned="true" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/InvocationMediator.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="77" column="0" selection-start="3123" selection-end="3123" vertical-scroll-proportion="0.56453556"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="InvocationBuilder.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/InvocationBuilder.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="57" column="0" selection-start="1920" selection-end="1920" vertical-scroll-proportion="0.7937274"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="DefaultInvocationBuilder.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/DefaultInvocationBuilder.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="0" selection-start="1286" selection-end="1286" vertical-scroll-proportion="0.29794934"> - <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="103" column="0" selection-start="3873" selection-end="3873" vertical-scroll-proportion="0.1893848"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="UriParamTestCase.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/uriparam/UriParamTestCase.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="58" column="47" selection-start="1783" selection-end="1783" vertical-scroll-proportion="0.7020507"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ItemResource.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/uriparam/ItemResource.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="24" column="32" selection-start="530" selection-end="530" vertical-scroll-proportion="0.52714115"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ShopResource.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/uriparam/ShopResource.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="9" column="13" selection-start="243" selection-end="243" vertical-scroll-proportion="0.13751508"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="RootResourceModel.java" pinned="true" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/RootResourceModel.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="42" column="0" selection-start="1106" selection-end="1106" vertical-scroll-proportion="0.47285888"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <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="180" column="0" selection-start="6051" selection-end="6051" vertical-scroll-proportion="0.18673219"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="Invocation.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/Invocation.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="66" column="15" selection-start="1972" selection-end="1972" vertical-scroll-proportion="0.33293125"> - <folding /> - </state> - </provider> - </entry> - </file> - </leaf> + <leaf /> </component> <component name="FindManager"> <FindUsagesManager> @@ -832,30 +717,6 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/rest" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -875,78 +736,6 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/rest" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/uriparam" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-rest.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-rest" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-rest.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-rest" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -1136,30 +925,6 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main" /> <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" /> - <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" /> - <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" /> - <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" /> - <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="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> @@ -1175,28 +940,6 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-rest.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-rest" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/ant-import-tests" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -1545,13 +1288,6 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/DefaultInvocationHandler.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="0" selection-start="1258" selection-end="1258" vertical-scroll-proportion="0.54756874"> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ResourceLocator.java"> <provider selected="true" editor-type-id="text-editor"> <state line="31" column="76" selection-start="1261" selection-end="1261" vertical-scroll-proportion="0.44186047"> @@ -1566,15 +1302,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/RootResourceModel.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="42" column="0" selection-start="1106" selection-end="1106" vertical-scroll-proportion="0.47285888"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/OperationBinding.java"> <provider selected="true" editor-type-id="text-editor"> <state line="55" column="0" selection-start="1811" selection-end="1811" vertical-scroll-proportion="0.73341376"> @@ -1582,29 +1309,13 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/RootParameterBinding.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="45" column="0" selection-start="1257" selection-end="1257" vertical-scroll-proportion="0.74788904"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/Invocation.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="66" column="15" selection-start="1972" selection-end="1972" vertical-scroll-proportion="0.33293125"> + <state line="77" column="0" selection-start="3123" selection-end="3123" vertical-scroll-proportion="0.56453556"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ParameterBinding.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="180" column="0" selection-start="6051" selection-end="6051" vertical-scroll-proportion="0.18673219"> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/InvocationBuilder.java"> <provider selected="true" editor-type-id="text-editor"> <state line="57" column="0" selection-start="1920" selection-end="1920" vertical-scroll-proportion="0.7937274"> @@ -1633,6 +1344,13 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/uriparam/ItemResource.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="24" column="32" selection-start="530" selection-end="530" vertical-scroll-proportion="0.52714115"> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/uriparam/ShopResource.java"> <provider selected="true" editor-type-id="text-editor"> <state line="9" column="13" selection-start="243" selection-end="243" vertical-scroll-proportion="0.13751508"> @@ -1640,20 +1358,45 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/uriparam/ItemResource.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="24" column="32" selection-start="530" selection-end="530" vertical-scroll-proportion="0.52714115"> + <state line="180" column="0" selection-start="6051" selection-end="6051" vertical-scroll-proportion="0.18673219"> <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/runtime/Invocation.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="77" column="0" selection-start="3123" selection-end="3123" vertical-scroll-proportion="0.56453556"> + <state line="66" column="15" selection-start="1972" selection-end="1972" vertical-scroll-proportion="0.33293125"> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/RootResourceModel.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="50" column="61" selection-start="1498" selection-end="1498" vertical-scroll-proportion="1.1216056"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/RootParameterBinding.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="18" column="22" selection-start="454" selection-end="454" vertical-scroll-proportion="0.40377805"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/StatefulResourceResolver.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="45" column="51" selection-start="1989" selection-end="1989" vertical-scroll-proportion="0.47107437"> + <folding /> + </state> + </provider> + </entry> </component> </project> Modified: rest/src/main/java/org/jboss/rest/model/RootParameterBinding.java =================================================================== --- rest/src/main/java/org/jboss/rest/model/RootParameterBinding.java 2007-11-26 15:15:07 UTC (rev 5115) +++ rest/src/main/java/org/jboss/rest/model/RootParameterBinding.java 2007-11-26 15:17:55 UTC (rev 5116) @@ -9,6 +9,9 @@ import java.util.regex.Pattern; import java.util.regex.Matcher; +/** + * @see org.jboss.rest.model.RootResourceModel + */ public class RootParameterBinding implements InvocationModel { Modified: rest/src/main/java/org/jboss/rest/model/RootResourceModel.java =================================================================== --- rest/src/main/java/org/jboss/rest/model/RootResourceModel.java 2007-11-26 15:15:07 UTC (rev 5115) +++ rest/src/main/java/org/jboss/rest/model/RootResourceModel.java 2007-11-26 15:17:55 UTC (rev 5116) @@ -3,6 +3,14 @@ import java.util.Map; import java.util.HashMap; +/** + * A root resource extends a {@link org.jboss.rest.model.ResourceModel} + * in a way, that allows resolving of root {@link javax.ws.rs.UriTemplate} parameter.<br> + * It adds another {@link org.jboss.rest.runtime.InvocationModel} that supplies these + * parameter binding to the invocation. + * + * @see #getRootParamBinding() + */ public class RootResourceModel extends ResourceModel { @@ -51,7 +59,11 @@ return null; } - + /** + * An {@link org.jboss.rest.runtime.InvocationModel} that supplies + * a root UriTemplate parameter binding. + * @return InvocationModel + */ public RootParameterBinding getRootParamBinding() { return rootParamBinding; Modified: rest/src/main/java/org/jboss/rest/model/StatefulResourceResolver.java =================================================================== --- rest/src/main/java/org/jboss/rest/model/StatefulResourceResolver.java 2007-11-26 15:15:07 UTC (rev 5115) +++ rest/src/main/java/org/jboss/rest/model/StatefulResourceResolver.java 2007-11-26 15:17:55 UTC (rev 5116) @@ -32,6 +32,14 @@ * Once a set a of resource methods is identified, the resolver * delegates to a {@link org.jboss.rest.media.ContentNegotiation} plugin * to do a more fine grained media type matching. + * <p> + * An instance keeps track of locators that have been used to resolve the final ResourceMethod + * and the working path associated with every step.<br> + * The same applies to the final method working path that was used to resolve the actual resource method. + * <p> + * Both the locator and working path information will be used to build invocations later on. + * + * @see org.jboss.rest.runtime.InvocationMediator * * @author Heiko.Braun(a)jboss.com * @version $Revision$