JBossWS SVN: r5121 - in stack/metro/trunk: ant-import and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-11-27 09:05:34 -0500 (Tue, 27 Nov 2007)
New Revision: 5121
Added:
stack/metro/trunk/metro-trunk.iml
Modified:
stack/metro/trunk/ant-import/build-bin-dist.xml
stack/metro/trunk/src/main/distro/ant.properties.example
stack/metro/trunk/src/main/distro/bin-dist-deploy.xml
Log:
Fix bin dist targets
Modified: stack/metro/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/metro/trunk/ant-import/build-bin-dist.xml 2007-11-27 11:06:56 UTC (rev 5120)
+++ stack/metro/trunk/ant-import/build-bin-dist.xml 2007-11-27 14:05:34 UTC (rev 5121)
@@ -13,141 +13,141 @@
<project>
- <!-- ================================================================== -->
- <!-- Binary distribution -->
- <!-- ================================================================== -->
+ <!-- ================================================================== -->
+ <!-- Binary distribution -->
+ <!-- ================================================================== -->
- <target name="build-bin-dist" depends="jars, javadoc" description="Build the binary distribution">
+ <target name="build-bin-dist" depends="jars, javadoc" description="Build the binary distribution">
- <property name="bindist.dir" value="${sunri.output.dir}/jbossws-metro-${version.id}"/>
- <property name="bindist.build.dir" value="${bindist.dir}/build"/>
- <property name="bindist.bin.dir" value="${bindist.dir}/bin"/>
- <property name="bindist.lib.dir" value="${bindist.dir}/lib"/>
- <property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
- <property name="bindist.tests.dir" value="${bindist.dir}/tests"/>
- <property name="bindist.tools.dir" value="${bindist.dir}/tools"/>
+ <property name="bindist.dir" value="${sunri.output.dir}/jbossws-metro-${version.id}"/>
+ <property name="bindist.build.dir" value="${bindist.dir}/build"/>
+ <property name="bindist.bin.dir" value="${bindist.dir}/bin"/>
+ <property name="bindist.lib.dir" value="${bindist.dir}/lib"/>
+ <property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
+ <property name="bindist.tests.dir" value="${bindist.dir}/tests"/>
+ <property name="bindist.tools.dir" value="${bindist.dir}/tools"/>
- <delete dir="${bindist.dir}"/>
- <mkdir dir="${bindist.build.dir}"/>
- <mkdir dir="${bindist.bin.dir}"/>
- <mkdir dir="${bindist.docs.dir}"/>
- <mkdir dir="${bindist.tests.dir}"/>
- <mkdir dir="${bindist.tools.dir}"/>
+ <delete dir="${bindist.dir}"/>
+ <mkdir dir="${bindist.build.dir}"/>
+ <mkdir dir="${bindist.bin.dir}"/>
+ <mkdir dir="${bindist.docs.dir}"/>
+ <mkdir dir="${bindist.tests.dir}"/>
+ <mkdir dir="${bindist.tools.dir}"/>
- <!-- root -->
- <copy tofile="${bindist.dir}/ant.properties" file="${sunri.distro.dir}/ant.properties.example">
- <filterset>
- <filtersfile file="${sunri.dir}/ant.properties"/>
- </filterset>
- </copy>
- <copy tofile="${bindist.dir}/version.properties" file="${sunri.dir}/version.properties"/>
- <copy tofile="${bindist.dir}/build.xml" file="${sunri.distro.dir}/bin-dist-build.xml"/>
- <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${sunri.distro.dir}/bin-dist-deploy.xml"/>
+ <!-- root -->
+ <copy tofile="${bindist.dir}/ant.properties" file="${sunri.distro.dir}/ant.properties.example" >
+ <filterset>
+ <filtersfile file="${sunri.dir}/ant.properties"/>
+ </filterset>
+ </copy>
+ <copy tofile="${bindist.dir}/version.properties" file="${sunri.dir}/version.properties"/>
+ <copy tofile="${bindist.dir}/build.xml" file="${sunri.distro.dir}/bin-dist-build.xml"/>
+ <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${sunri.distro.dir}/bin-dist-deploy.xml"/>
- <!-- build -->
- <copy todir="${bindist.build.dir}">
- <fileset dir="${sunri.dir}/ant-import">
- <include name="macros-deploy-framework.xml"/>
- <include name="macros-deploy-sunri.xml"/>
- </fileset>
- </copy>
+ <!-- build -->
+ <copy todir="${bindist.build.dir}">
+ <fileset dir="${sunri.dir}/ant-import">
+ <include name="macros-deploy-framework.xml"/>
+ <include name="macros-deploy-sunri.xml"/>
+ </fileset>
+ </copy>
- <unzip dest="${bindist.bin.dir}" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/>
+ <unzip dest="${bindist.bin.dir}" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/>
- <copy todir="${bindist.bin.dir}">
- <fileset dir="${sunri.dir}/src/main/etc">
- <include name="*.sh"/>
- <include name="*.bat"/>
- </fileset>
- </copy>
+ <copy todir="${bindist.bin.dir}">
+ <fileset dir="${sunri.dir}/src/main/etc">
+ <include name="*.sh"/>
+ <include name="*.bat"/>
+ </fileset>
+ </copy>
- <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/>
+ <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/>
- <!-- docs -->
- <copy todir="${bindist.docs.dir}" >
- <fileset dir="${sunri.output.dir}">
- <include name="apidocs/**"/>
- </fileset>
- </copy>
- <copy todir="${bindist.docs.dir}" filtering="yes">
- <fileset dir="${sunri.distro.dir}">
- <include name="Install.txt"/>
- <include name="ReleaseNotes.txt"/>
- </fileset>
- <filterset>
- <filtersfile file="${sunri.dir}/version.properties"/>
- </filterset>
- </copy>
+ <!-- docs -->
+ <copy todir="${bindist.docs.dir}" >
+ <fileset dir="${sunri.output.dir}">
+ <include name="apidocs/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${bindist.docs.dir}" filtering="yes">
+ <fileset dir="${sunri.distro.dir}">
+ <include name="Install.txt"/>
+ <include name="ReleaseNotes.txt"/>
+ </fileset>
+ <filterset>
+ <filtersfile file="${sunri.dir}/version.properties"/>
+ </filterset>
+ </copy>
- <copy todir="${bindist.docs.dir}">
- <fileset dir="${sunri.etc.dir}">
- <include name="JBossORG-EULA.txt"/>
- </fileset>
- </copy>
+ <copy todir="${bindist.docs.dir}">
+ <fileset dir="${sunri.etc.dir}">
+ <include name="JBossORG-EULA.txt"/>
+ </fileset>
+ </copy>
- <!-- lib -->
- <copy todir="${bindist.lib.dir}" overwrite="true">
- <fileset dir="${thirdparty.dir}">
- <include name="jbossws-common.jar"/>
- <include name="jbossws-framework.jar"/>
- <include name="jbossws-framework-scripts.zip"/>
- <include name="jbossws-spi.jar"/>
- </fileset>
- <fileset dir="${sunri.dir}/output/lib">
- <include name="jbossws-context.war"/>
- <include name="jbossws-sunri.jar"/>
- <include name="jbossws-sunri-client.jar"/>
- <include name="jbossws-sunri42.sar"/>
- <include name="jbossws-sunri50.sar"/>
- </fileset>
- <fileset dir="${thirdparty.dir}">
- <include name="FastInfoset.jar"/>
- <include name="http.jar"/>
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="jaxrpc-api.jar"/>
- <include name="jaxws-api.jar"/>
- <include name="jaxws-rt.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jsr173_api.jar"/>
- <include name="jsr181-api.jar"/>
- <include name="jsr250-api.jar"/>
- <include name="juddi-service.sar"/>
- <include name="resolver.jar"/>
- <include name="saaj-api.jar"/>
- <include name="saaj-impl.jar"/>
- <include name="sjsxp.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wstx.jar"/>
- <include name="wsdl4j.jar"/>
- </fileset>
- </copy>
+ <!-- lib -->
+ <copy todir="${bindist.lib.dir}" overwrite="true">
+ <fileset dir="${thirdparty.dir}">
+ <include name="jbossws-common.jar"/>
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-framework-scripts.zip"/>
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ <fileset dir="${sunri.dir}/output/lib">
+ <include name="jbossws-context.war"/>
+ <include name="jbossws-sunri.jar"/>
+ <include name="jbossws-sunri-client.jar"/>
+ <include name="jbossws-sunri42.sar"/>
+ <include name="jbossws-sunri50.sar"/>
+ </fileset>
+ <fileset dir="${thirdparty.dir}">
+ <include name="FastInfoset.jar"/>
+ <include name="http.jar"/>
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxrpc-api.jar"/>
+ <include name="jaxws-api.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jsr173_api.jar"/>
+ <include name="jsr181-api.jar"/>
+ <include name="jsr250-api.jar"/>
+ <include name="juddi-service.sar"/>
+ <include name="resolver.jar"/>
+ <include name="saaj-api.jar"/>
+ <include name="saaj-impl.jar"/>
+ <include name="sjsxp.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wstx.jar"/>
+ <include name="wsdl4j.jar"/>
+ </fileset>
+ </copy>
- <!-- tests -->
- <copy todir="${bindist.tests.dir}" overwrite="true">
- <fileset dir="${sunri.dir}/src/test-framework"/>
- <fileset dir="${sunri.dir}/src/test">
- <include name="resources/test-excludes-*.txt"/>
- </fileset>
- </copy>
+ <!-- tests -->
+ <copy todir="${bindist.tests.dir}" overwrite="true">
+ <fileset dir="${sunri.dir}/src/test-framework"/>
+ <fileset dir="${sunri.dir}/src/test">
+ <include name="resources/test-excludes-*.txt"/>
+ </fileset>
+ </copy>
- <!-- build tools -->
- <copy todir="${bindist.tools.dir}" overwrite="true">
- <fileset dir="${sunri.dir}/tools/ant"/>
- </copy>
- <copy todir="${bindist.dir}" overwrite="true">
- <fileset dir="${sunri.dir}">
- <include name="build.bat"/>
- <include name="build.sh"/>
- </fileset>
- </copy>
- <chmod file="${bindist.dir}/build.sh" perm="+x"/>
+ <!-- build tools -->
+ <copy todir="${bindist.tools.dir}" overwrite="true">
+ <fileset dir="${sunri.dir}/tools/ant"/>
+ </copy>
+ <copy todir="${bindist.dir}" overwrite="true">
+ <fileset dir="${sunri.dir}">
+ <include name="build.bat"/>
+ <include name="build.sh"/>
+ </fileset>
+ </copy>
+ <chmod file="${bindist.dir}/build.sh" perm="+x"/>
- <zip destfile="${sunri.output.dir}/jbossws-metro-${version.id}.zip">
- <fileset dir="${sunri.output.dir}" includes="jbossws-metro-${version.id}/**"/>
- </zip>
- </target>
+ <zip destfile="${sunri.output.dir}/jbossws-metro-${version.id}.zip">
+ <fileset dir="${sunri.output.dir}" includes="jbossws-metro-${version.id}/**"/>
+ </zip>
+ </target>
</project>
Added: stack/metro/trunk/metro-trunk.iml
===================================================================
--- stack/metro/trunk/metro-trunk.iml (rev 0)
+++ stack/metro/trunk/metro-trunk.iml 2007-11-27 14:05:34 UTC (rev 5121)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+ <component name="ModuleRootManager" />
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test-framework/java" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntryProperties />
+ </component>
+</module>
+
Modified: stack/metro/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/metro/trunk/src/main/distro/ant.properties.example 2007-11-27 11:06:56 UTC (rev 5120)
+++ stack/metro/trunk/src/main/distro/ant.properties.example 2007-11-27 14:05:34 UTC (rev 5121)
@@ -4,11 +4,11 @@
# $Id: ant.properties.example 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $
# Optional JBoss Home
-jboss50.home=(a)jboss50.home@
-jboss42.home=(a)jboss42.home@
+jboss500.home=(a)jboss500.home@
+jboss422.home=(a)jboss422.home@
-# The JBoss server under test. This can be [jboss50|jboss42]
-jbossws.integration.target=jboss42
+# The JBoss server under test. This can be [jboss500|jboss422]
+jbossws.integration.target=jboss422
# The JBoss settings
jboss.server.instance=default
Modified: stack/metro/trunk/src/main/distro/bin-dist-deploy.xml
===================================================================
--- stack/metro/trunk/src/main/distro/bin-dist-deploy.xml 2007-11-27 11:06:56 UTC (rev 5120)
+++ stack/metro/trunk/src/main/distro/bin-dist-deploy.xml 2007-11-27 14:05:34 UTC (rev 5121)
@@ -18,47 +18,47 @@
<!-- ================================================================== -->
<!-- Deploy jbossws/sunri to jboss50 -->
- <target name="deploy-jboss50" depends="undeploy-jboss50,deploy-jboss50-endorsed" description="Deploy jbossws/sunri to jboss50">
- <macro-deploy-sunri50
+ <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws/sunri to jboss50">
+ <macro-deploy-sunri500
stacklibs="${lib.dir}"
thirdpartylibs="${lib.dir}"/>
<macro-deploy-framework
thirdpartylibs="${lib.dir}"
jbosshome="${jboss500.home}"/>
</target>
- <target name="deploy-jboss50-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <target name="deploy-jboss500-endorsed" depends="prepare" if="HAVE_JDK_1.6">
<macro-deploy-endorsed
jbosshome="${jboss500.home}"
thirdpartylibs="${lib.dir}"/>
</target>
<!-- Remove jbossws/sunri from jboss50 -->
- <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50">
- <macro-undeploy-sunri50/>
+ <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/sunri from jboss50">
+ <macro-undeploy-sunri500/>
<macro-undeploy-framework jbosshome="${jboss500.home}"/>
</target>
<!-- Deploy jbossws/sunri to jboss42 -->
- <target name="deploy-jboss42" depends="undeploy-jboss42,deploy-jboss42-endorsed" description="Deploy jbossws/sunri to jboss42">
- <macro-deploy-sunri42
+ <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws/sunri to jboss42">
+ <macro-deploy-sunri422
stacklibs="${lib.dir}"
thirdpartylibs="${lib.dir}"/>
<macro-deploy-framework
thirdpartylibs="${lib.dir}"
jbosshome="${jboss422.home}"/>
</target>
- <target name="deploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <target name="deploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6">
<macro-deploy-endorsed
jbosshome="${jboss422.home}"
thirdpartylibs="${lib.dir}"/>
</target>
<!-- Remove jbossws/sunri from jboss42 -->
- <target name="undeploy-jboss42" depends="prepare,undeploy-jboss42-endorsed" description="Remove jbossws/sunri from jboss42">
- <macro-undeploy-sunri42/>
+ <target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws/sunri from jboss42">
+ <macro-undeploy-sunri422/>
<macro-undeploy-framework jbosshome="${jboss422.home}"/>
</target>
- <target name="undeploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <target name="undeploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6">
<macro-undeploy-endorsed jbosshome="${jboss422.home}"/>
</target>
16 years, 5 months
JBossWS SVN: r5120 - stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-11-27 06:06:56 -0500 (Tue, 27 Nov 2007)
New Revision: 5120
Added:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/TODO
Log:
identified next steps to be done
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/TODO
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/TODO (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/TODO 2007-11-27 11:06:56 UTC (rev 5120)
@@ -0,0 +1,32 @@
+Priority | Task
+--------------------------------------------------------------------------------
+MUST | Server can send AckRequested, CloseSequence or TerminateSequence
+ | asynchronously any time. RMSender must count with that and thus
+ | register a callback handler that will listen for these messages.
+ | Once such message arrives (applies to backports only), it will
+ | call sequence registry and notifies the sequence that there's a
+ | message for it in the RMTransport. SequenceManager in next iteration
+ | will detect that sequence is in the special state and initiates
+ | dummy method call (dummy method call is the call that will not go
+ | to the wire and will not be executed through the outbound handler
+ | chain. When such dummy method call will arrive to the RMTransport,
+ | RMSender will return it the arrived AckRequested, CloseSequence or
+ | TerminateSequence message, this message will be executed throught
+ | inbound message handlers (WS-Security will be executed properly)
+ | and sequence state will change (e.g. when AckRequested message will
+ | arrive for req/res message exchange pattern, then sequence state will
+ | change to SequenceAcknowledgement requested). SequenceManager
+ | in later iteration will detect this new state and will send sequence
+ | acknowledgement message to the server (or CloseSequenceResponse)
+--------------------------------------------------------------------------------
+MUST | Create the test for above use-cases (AckRequested, Close(Terminate)S
+--------------------------------------------------------------------------------
+MUST | Implement one way method call in the same way as above investigation.
+--------------------------------------------------------------------------------
+MUST | Users must be able to specify in sequence creation code whether
+ | reliable sequence is simplex (for one way messages only) or duplex
+ | (req-res message exchange pattern) - default will be duplex
+--------------------------------------------------------------------------------
+MUST | Users must be able to specify wether client is anonymous or
+ | addressable - default will be addressable
+--------------------------------------------------------------------------------
\ No newline at end of file
16 years, 5 months
JBossWS SVN: r5119 - in spi/trunk: src/main/java/org/jboss/wsf/spi/deployment and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-11-26 12:38:22 -0500 (Mon, 26 Nov 2007)
New Revision: 5119
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java
spi/trunk/version.properties
Log:
Rollback
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-11-26 17:34:29 UTC (rev 5118)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-11-26 17:38:22 UTC (rev 5119)
@@ -25,18 +25,18 @@
// $Id$
/**
- * A general web service deployment dep.
- *
- * It has no notion of J2EE deployment packages.
- *
+ * A general web service deployment dep.
+ *
+ * It has no notion of J2EE deployment packages.
+ *
* @author Thomas.Diesler(a)jboss.com
- * @since 20-Apr-2007
+ * @since 20-Apr-2007
*/
public interface Deployment extends Extensible
{
public enum DeploymentType
{
- JAXRPC_CLIENT, JAXRPC_JSE, JAXRPC_EJB21, JAXRPC_EJB3, JAXWS_JSE, JAXWS_EJB3, REST_JSE, REST_EJB3
+ JAXRPC_CLIENT, JAXRPC_JSE, JAXRPC_EJB21, JAXRPC_EJB3, JAXWS_JSE, JAXWS_EJB3
};
public enum DeploymentState
Modified: spi/trunk/version.properties
===================================================================
--- spi/trunk/version.properties 2007-11-26 17:34:29 UTC (rev 5118)
+++ spi/trunk/version.properties 2007-11-26 17:38:22 UTC (rev 5119)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=1.0.1.DEV
-repository.id=snapshot
+version.id=1.0.0.GA
+repository.id=1.0.0.GA
implementation.title=JBoss Web Services - SPI
implementation.url=http://www.jboss.org/products/jbossws
16 years, 5 months
JBossWS SVN: r5118 - framework/trunk and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-11-26 12:34:29 -0500 (Mon, 26 Nov 2007)
New Revision: 5118
Added:
framework/trunk/framwork.iml
Removed:
rest/
Modified:
JBossWS.ipr
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java
spi/trunk/version.properties
Log:
Discard project
Modified: JBossWS.ipr
===================================================================
--- JBossWS.ipr 2007-11-26 15:21:19 UTC (rev 5117)
+++ JBossWS.ipr 2007-11-26 17:34:29 UTC (rev 5118)
@@ -2,20 +2,6 @@
<project version="4" relativePaths="true">
<component name="AntConfiguration">
<defaultAnt bundledAnt="true" />
- <buildFile url="file://$PROJECT_DIR$/framework/trunk/build.xml">
- <additionalClassPath />
- <antReference projectDefault="true" />
- <customJdkName value="" />
- <maximumHeapSize value="128" />
- <properties />
- </buildFile>
- <buildFile url="file://$PROJECT_DIR$/common/trunk/build.xml">
- <additionalClassPath />
- <antReference projectDefault="true" />
- <customJdkName value="" />
- <maximumHeapSize value="128" />
- <properties />
- </buildFile>
<buildFile url="file://$PROJECT_DIR$/stack/native/trunk/build.xml">
<additionalClassPath />
<antReference projectDefault="true" />
@@ -23,27 +9,6 @@
<maximumHeapSize value="128" />
<properties />
</buildFile>
- <buildFile url="file://$PROJECT_DIR$/container/jboss50/trunk/build.xml">
- <additionalClassPath />
- <antReference projectDefault="true" />
- <customJdkName value="" />
- <maximumHeapSize value="128" />
- <properties />
- </buildFile>
- <buildFile url="file://$PROJECT_DIR$/container/jboss42/trunk/build.xml">
- <additionalClassPath />
- <antReference projectDefault="true" />
- <customJdkName value="" />
- <maximumHeapSize value="128" />
- <properties />
- </buildFile>
- <buildFile url="file://$PROJECT_DIR$/container/jboss40/trunk/build.xml">
- <additionalClassPath />
- <antReference projectDefault="true" />
- <customJdkName value="" />
- <maximumHeapSize value="128" />
- <properties />
- </buildFile>
</component>
<component name="BuildJarProjectSettings">
<option name="BUILD_JARS_ON_MAKE" value="false" />
@@ -294,19 +259,13 @@
</component>
<component name="ProjectModuleManager">
<modules>
- <module fileurl="file://$PROJECT_DIR$/../jbossas/branches/Branch_4_2/server/42-server.iml" filepath="$PROJECT_DIR$/../jbossas/branches/Branch_4_2/server/42-server.iml" group="AS" />
- <module fileurl="file://$PROJECT_DIR$/../jbossas/branches/Branch_4_2/system/42-system.iml" filepath="$PROJECT_DIR$/../jbossas/branches/Branch_4_2/system/42-system.iml" group="AS" />
- <module fileurl="file://$PROJECT_DIR$/../jbossas/branches/Branch_4_2/tomcat/42-tomcat.iml" filepath="$PROJECT_DIR$/../jbossas/branches/Branch_4_2/tomcat/42-tomcat.iml" group="AS" />
- <module fileurl="file://$PROJECT_DIR$/../jbossas/trunk/server/as-server.iml" filepath="$PROJECT_DIR$/../jbossas/trunk/server/as-server.iml" group="AS" />
- <module fileurl="file://$PROJECT_DIR$/../jbossas/trunk/system/as-system.iml" filepath="$PROJECT_DIR$/../jbossas/trunk/system/as-system.iml" group="AS" />
- <module fileurl="file://$PROJECT_DIR$/../jbossas/trunk/tomcat/as-tomcat.iml" filepath="$PROJECT_DIR$/../jbossas/trunk/tomcat/as-tomcat.iml" group="AS" />
- <module fileurl="file://$PROJECT_DIR$/common/common.iml" filepath="$PROJECT_DIR$/common/common.iml" />
- <module fileurl="file://$PROJECT_DIR$/framework/framework.iml" filepath="$PROJECT_DIR$/framework/framework.iml" />
- <module fileurl="file://$PROJECT_DIR$/container/jboss40/trunk/jboss40.iml" filepath="$PROJECT_DIR$/container/jboss40/trunk/jboss40.iml" group="container" />
- <module fileurl="file://$PROJECT_DIR$/container/jboss42/trunk/jboss42.iml" filepath="$PROJECT_DIR$/container/jboss42/trunk/jboss42.iml" group="container" />
- <module fileurl="file://$PROJECT_DIR$/container/jboss50/trunk/jboss50.iml" filepath="$PROJECT_DIR$/container/jboss50/trunk/jboss50.iml" group="container" />
- <module fileurl="file://$PROJECT_DIR$/stack/native/trunk/native.iml" filepath="$PROJECT_DIR$/stack/native/trunk/native.iml" group="stack" />
+ <module fileurl="file://$PROJECT_DIR$/../../../Desktop/JSR-311/0.5/examples/Jersey-Examples.iml" filepath="$PROJECT_DIR$/../../../Desktop/JSR-311/0.5/examples/Jersey-Examples.iml" />
+ <module fileurl="file://$PROJECT_DIR$/framework/trunk/framwork.iml" filepath="$PROJECT_DIR$/framework/trunk/framwork.iml" />
+ <module fileurl="file://$PROJECT_DIR$/../jbossas/branches/Branch_4_2/webservices/jboss42.iml" filepath="$PROJECT_DIR$/../jbossas/branches/Branch_4_2/webservices/jboss42.iml" group="container" />
+ <module fileurl="file://$PROJECT_DIR$/../jbossas/trunk/webservices/jboss50.iml" filepath="$PROJECT_DIR$/../jbossas/trunk/webservices/jboss50.iml" group="container" />
+ <module fileurl="file://$PROJECT_DIR$/stack/native/branches/rest/rest.iml" filepath="$PROJECT_DIR$/stack/native/branches/rest/rest.iml" group="stack" />
<module fileurl="file://$PROJECT_DIR$/spi/trunk/spi.iml" filepath="$PROJECT_DIR$/spi/trunk/spi.iml" />
+ <module fileurl="file:///tmp/webservice_producer/webservice_producer.iml" filepath="/tmp/webservice_producer/webservice_producer.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK">
Added: framework/trunk/framwork.iml
===================================================================
--- framework/trunk/framwork.iml (rev 0)
+++ framework/trunk/framwork.iml 2007-11-26 17:34:29 UTC (rev 5118)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+ <component name="ModuleRootManager" />
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntryProperties />
+ </component>
+</module>
+
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-11-26 15:21:19 UTC (rev 5117)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-11-26 17:34:29 UTC (rev 5118)
@@ -36,7 +36,7 @@
{
public enum DeploymentType
{
- JAXRPC_CLIENT, JAXRPC_JSE, JAXRPC_EJB21, JAXRPC_EJB3, JAXWS_JSE, JAXWS_EJB3
+ JAXRPC_CLIENT, JAXRPC_JSE, JAXRPC_EJB21, JAXRPC_EJB3, JAXWS_JSE, JAXWS_EJB3, REST_JSE, REST_EJB3
};
public enum DeploymentState
Modified: spi/trunk/version.properties
===================================================================
--- spi/trunk/version.properties 2007-11-26 15:21:19 UTC (rev 5117)
+++ spi/trunk/version.properties 2007-11-26 17:34:29 UTC (rev 5118)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=1.0.0.GA
-repository.id=1.0.0.GA
+version.id=1.0.1.DEV
+repository.id=snapshot
implementation.title=JBoss Web Services - SPI
implementation.url=http://www.jboss.org/products/jbossws
16 years, 5 months
JBossWS SVN: r5117 - in rest: src/test/java/org/jboss/test/rest/invocation/uriparam and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-11-26 10:21:19 -0500 (Mon, 26 Nov 2007)
New Revision: 5117
Modified:
rest/jboss-rest.iws
rest/src/test/java/org/jboss/test/rest/invocation/uriparam/UriParamTestCase.java
Log:
API docs
Modified: rest/jboss-rest.iws
===================================================================
--- rest/jboss-rest.iws 2007-11-26 15:17:55 UTC (rev 5116)
+++ rest/jboss-rest.iws 2007-11-26 15:21:19 UTC (rev 5117)
@@ -17,16 +17,14 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <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="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/uriparam/UriParamTestCase.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/uriparam/UriParamTestCase.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="/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="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="/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$/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" />
@@ -247,7 +245,17 @@
</subPane>
</component>
<component name="FileEditorManager">
- <leaf />
+ <leaf>
+ <file leaf-file-name="UriParamTestCase.java" pinned="false" current="true" current-in-tab="true">
+ <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="57" column="72" selection-start="1810" selection-end="1810" vertical-scroll-proportion="0.57378983">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ </leaf>
</component>
<component name="FindManager">
<FindUsagesManager>
@@ -692,7 +700,7 @@
<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/media" />
+ <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>
@@ -717,32 +725,34 @@
<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" />
+ <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="jboss-rest" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ <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$" />
+ <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" />
+ <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/main" />
+ <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/main/resources" />
+ <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>
@@ -762,23 +772,33 @@
<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="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="PsiDirectory:$PROJECT_DIR$/src/main/resources" />
+ <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/main/resources/jbossrest.jar" />
+ <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/resources/jbossrest.jar/META-INF" />
+ <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/resources/jbossrest.jar/META-INF/services" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/resources" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -804,19 +824,19 @@
<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="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/resources" />
<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="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/resources/jbossrest.jar" />
<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="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/resources/jbossrest.jar/META-INF" />
<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="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/resources/jbossrest.jar/META-INF/services" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -857,10 +877,6 @@
<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/runtime" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -900,7 +916,7 @@
<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/model" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -1337,13 +1353,6 @@
</state>
</provider>
</entry>
- <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>
<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">
@@ -1397,6 +1406,13 @@
</state>
</provider>
</entry>
+ <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="57" column="72" selection-start="1810" selection-end="1810" vertical-scroll-proportion="0.57378983">
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
</project>
Modified: rest/src/test/java/org/jboss/test/rest/invocation/uriparam/UriParamTestCase.java
===================================================================
--- rest/src/test/java/org/jboss/test/rest/invocation/uriparam/UriParamTestCase.java 2007-11-26 15:17:55 UTC (rev 5116)
+++ rest/src/test/java/org/jboss/test/rest/invocation/uriparam/UriParamTestCase.java 2007-11-26 15:21:19 UTC (rev 5117)
@@ -19,7 +19,10 @@
/**
* Root models that carry a template 'shop/{name}' need to provide
- * a prameter binding as well.
+ * a parameter binding as well.
+ *
+ * @see org.jboss.test.rest.invocation.uriparam.ShopResource
+ *
* @throws Exception
*/
public void testRootModelParameter() throws Exception
@@ -32,10 +35,12 @@
}
/**
- * Subresources may refer uri paramter that actually
+ * Subresources may refer to uri paramter that actually
* have been resolved in parent resources, i.e. 'shop/{name}/{category}',
* whereas {category} triggers a locator.
- *
+ *
+ * @see org.jboss.test.rest.invocation.uriparam.CategoryResource
+ *
* @throws Exception
*/
public void testParentParameter() throws Exception
@@ -49,9 +54,10 @@
/**
* Subresources may refer uri paramter that actually
- * have been resolved in parent resources, i.e. 'shop/{name}/{category}',
- * whereas {category} triggers a locator.
+ * have been resolved in parent resources, i.e. 'shop/{name}/{category}'
+ * and locators may pass this information along the invocatoin chain.
*
+ *
* @throws Exception
*/
public void testLocatorAndLocalParameter() throws Exception
16 years, 5 months
JBossWS SVN: r5116 - in rest: src/main/java/org/jboss/rest/model and 1 other directory.
by jbossws-commits@lists.jboss.org
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$
16 years, 5 months
JBossWS SVN: r5115 - stack/cxf/trunk.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-11-26 10:15:07 -0500 (Mon, 26 Nov 2007)
New Revision: 5115
Modified:
stack/cxf/trunk/version.properties
Log:
update repository version
Modified: stack/cxf/trunk/version.properties
===================================================================
--- stack/cxf/trunk/version.properties 2007-11-26 15:13:01 UTC (rev 5114)
+++ stack/cxf/trunk/version.properties 2007-11-26 15:15:07 UTC (rev 5115)
@@ -6,7 +6,7 @@
specification.version=jbossws-2.0
version.id=2.1.0.DEV
-repository.id=2.1.0.DEV
+repository.id=snapshot
implementation.title=JBoss Web Services - Apache CXF
implementation.url=http://www.jboss.org/products/jbossws
16 years, 5 months
JBossWS SVN: r5114 - stack/cxf/trunk.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-11-26 10:13:01 -0500 (Mon, 26 Nov 2007)
New Revision: 5114
Modified:
stack/cxf/trunk/version.properties
Log:
Update versions
Modified: stack/cxf/trunk/version.properties
===================================================================
--- stack/cxf/trunk/version.properties 2007-11-26 15:05:57 UTC (rev 5113)
+++ stack/cxf/trunk/version.properties 2007-11-26 15:13:01 UTC (rev 5114)
@@ -31,10 +31,10 @@
cxf.xmlschema=1.3.2
# Thirdparty library versions
-jbossws-framework=snapshot
-jbossws-common=snapshot
+jbossws-framework=2.0.2.GA
+jbossws-common=1.0.2.GA
jbossws-spi=1.0.0.GA
-jbossws-jboss42=2.0.1.GA
+jbossws-jboss42=4.2.1.GA
apache-xml-commons=1.2
ibm-wsdl4j=1.6.2
16 years, 5 months
JBossWS SVN: r5113 - stack/cxf/trunk.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-11-26 10:05:57 -0500 (Mon, 26 Nov 2007)
New Revision: 5113
Modified:
stack/cxf/trunk/version.properties
Log:
Update versions
Modified: stack/cxf/trunk/version.properties
===================================================================
--- stack/cxf/trunk/version.properties 2007-11-26 15:05:07 UTC (rev 5112)
+++ stack/cxf/trunk/version.properties 2007-11-26 15:05:57 UTC (rev 5113)
@@ -21,7 +21,7 @@
cxf.version=2.1-incubator-SNAPSHOT
cxf.geronimo.javamail=1.4_spec-1.0-M1
cxf.geronimo.ws.metadata=2.0_spec-1.1.1
-cxf.jaxws.api=2.1
+cxf.jaxws.api=2.1-1
cxf.jdom=1.0
cxf.neethi=2.0.2
cxf.saaj=1.3
16 years, 5 months
JBossWS SVN: r5112 - in rest: ant-import-tests and 11 other directories.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-11-26 10:05:07 -0500 (Mon, 26 Nov 2007)
New Revision: 5112
Added:
rest/src/main/java/org/jboss/rest/model/RootParameterBinding.java
rest/src/main/java/org/jboss/rest/model/RootResourceModel.java
rest/src/test/java/org/jboss/test/rest/invocation/uriparam/
rest/src/test/java/org/jboss/test/rest/invocation/uriparam/CategoryResource.java
rest/src/test/java/org/jboss/test/rest/invocation/uriparam/ItemResource.java
rest/src/test/java/org/jboss/test/rest/invocation/uriparam/ShopResource.java
rest/src/test/java/org/jboss/test/rest/invocation/uriparam/UriParamTestCase.java
rest/src/test/java/org/jboss/test/rest/util/RequestDispatcher.java
rest/src/test/resources/rest/invocation/
rest/src/test/resources/rest/invocation/uriparam/
rest/src/test/resources/rest/invocation/uriparam/WEB-INF/
rest/src/test/resources/rest/invocation/uriparam/WEB-INF/jbossrs.xml
rest/src/test/resources/rest/invocation/uriparam/WEB-INF/web.xml
Modified:
rest/ant-import-tests/build-jars-rest.xml
rest/jboss-rest.iws
rest/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java
rest/src/main/java/org/jboss/rest/model/AbstractResourceOperation.java
rest/src/main/java/org/jboss/rest/model/ParameterBinding.java
rest/src/main/java/org/jboss/rest/model/ResourceLocator.java
rest/src/main/java/org/jboss/rest/model/ResourceMethod.java
rest/src/main/java/org/jboss/rest/model/ResourceModel.java
rest/src/main/java/org/jboss/rest/model/ResourceModelParser.java
rest/src/main/java/org/jboss/rest/runtime/Invocation.java
rest/src/main/java/org/jboss/rest/runtime/InvocationMediator.java
rest/src/test/java/org/jboss/test/rest/deployment/DeploymentTestCase.java
rest/src/test/java/org/jboss/test/rest/invocation/InvocationBuilderTestCase.java
Log:
Resolve UriParam from parent resources as well
Modified: rest/ant-import-tests/build-jars-rest.xml
===================================================================
--- rest/ant-import-tests/build-jars-rest.xml 2007-11-26 14:03:28 UTC (rev 5111)
+++ rest/ant-import-tests/build-jars-rest.xml 2007-11-26 15:05:07 UTC (rev 5112)
@@ -32,6 +32,16 @@
</webinf>
</war>
+ <!-- invocation, uri param -->
+ <war warfile="${tests.output.dir}/libs/rest-uriparam.war" webxml="${tests.output.dir}/resources/rest/invocation/uriparam/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/rest/invocation/uriparam/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/rest/invocation/uriparam/WEB-INF/">
+ <include name="*.xml"/>
+ </webinf>
+ </war>
+
<!-- mediatype -->
<war warfile="${tests.output.dir}/libs/rest-mediatype.war" webxml="${tests.output.dir}/resources/rest/media/web.xml">
<classes dir="${tests.output.dir}/classes">
Modified: rest/jboss-rest.iws
===================================================================
--- rest/jboss-rest.iws 2007-11-26 14:03:28 UTC (rev 5111)
+++ rest/jboss-rest.iws 2007-11-26 15:05:07 UTC (rev 5112)
@@ -17,19 +17,37 @@
</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="/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="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="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="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="/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="$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/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="$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="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="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" />
</list>
</component>
@@ -102,7 +120,7 @@
</component>
<component name="DebuggerManager">
<line_breakpoints>
- <breakpoint url="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/InvocationMediator.java" line="32" class="org.jboss.rest.runtime.InvocationMediator" package="org.jboss.rest.runtime">
+ <breakpoint url="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java" line="96" class="org.jboss.rest.container.wsf.ResourceServlet" package="org.jboss.rest.container.wsf">
<option name="ENABLED" value="false" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -115,8 +133,8 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java" line="96" class="org.jboss.rest.container.wsf.ResourceServlet" package="org.jboss.rest.container.wsf">
- <option name="ENABLED" value="true" />
+ <breakpoint url="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ParameterBinding.java" line="168" class="org.jboss.rest.model.ParameterBinding" package="org.jboss.rest.model">
+ <option name="ENABLED" value="false" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
<option name="LOG_EXPRESSION_ENABLED" value="false" />
@@ -128,8 +146,8 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ParameterBinding.java" line="167" class="org.jboss.rest.model.ParameterBinding" package="org.jboss.rest.model">
- <option name="ENABLED" value="true" />
+ <breakpoint url="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ResourceModel.java" line="58" class="org.jboss.rest.model.ResourceModel" package="org.jboss.rest.model">
+ <option name="ENABLED" value="false" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
<option name="LOG_EXPRESSION_ENABLED" value="false" />
@@ -141,6 +159,45 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
+ <breakpoint url="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/InvocationMediator.java" line="26" class="org.jboss.rest.runtime.InvocationMediator" package="org.jboss.rest.runtime">
+ <option name="ENABLED" value="false" />
+ <option name="SUSPEND_POLICY" value="SuspendAll" />
+ <option name="LOG_ENABLED" value="false" />
+ <option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="COUNT_FILTER_ENABLED" value="false" />
+ <option name="COUNT_FILTER" value="0" />
+ <option name="CONDITION_ENABLED" value="false" />
+ <option name="CLASS_FILTERS_ENABLED" value="false" />
+ <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+ <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">
+ <option name="ENABLED" value="false" />
+ <option name="SUSPEND_POLICY" value="SuspendAll" />
+ <option name="LOG_ENABLED" value="false" />
+ <option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="COUNT_FILTER_ENABLED" value="false" />
+ <option name="COUNT_FILTER" value="0" />
+ <option name="CONDITION_ENABLED" value="false" />
+ <option name="CLASS_FILTERS_ENABLED" value="false" />
+ <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+ <option name="CONDITION" value="" />
+ <option name="LOG_MESSAGE" value="" />
+ </breakpoint>
+ <breakpoint url="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ParameterBinding.java" line="121" class="org.jboss.rest.model.ParameterBinding" package="org.jboss.rest.model">
+ <option name="ENABLED" value="false" />
+ <option name="SUSPEND_POLICY" value="SuspendAll" />
+ <option name="LOG_ENABLED" value="false" />
+ <option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="COUNT_FILTER_ENABLED" value="false" />
+ <option name="COUNT_FILTER" value="0" />
+ <option name="CONDITION_ENABLED" value="false" />
+ <option name="CLASS_FILTERS_ENABLED" value="false" />
+ <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+ <option name="CONDITION" value="" />
+ <option name="LOG_MESSAGE" value="" />
+ </breakpoint>
</line_breakpoints>
<breakpoint_any>
<breakpoint>
@@ -212,7 +269,100 @@
</subPane>
</component>
<component name="FileEditorManager">
- <leaf />
+ <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>
</component>
<component name="FindManager">
<FindUsagesManager>
@@ -374,6 +524,10 @@
<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/resources" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -397,6 +551,154 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources/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/resources/rest/samples" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources/rest/samples/resourceview" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources/rest/samples/resourceview/WEB-INF" />
+ <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_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources/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/resources/rest/media" />
+ <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_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources/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/resources/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/resources/rest/invocation/uriparam" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources/rest/invocation/uriparam/WEB-INF" />
+ <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_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources/rest" />
+ <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_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -459,6 +761,52 @@
<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/util" />
+ <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_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/media" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -527,6 +875,78 @@
<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>
@@ -691,7 +1111,7 @@
<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/media" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rest/model" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -733,9 +1153,13 @@
<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/jaxrs" />
+ <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>
@@ -759,6 +1183,24 @@
<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>
+ </PATH>
</subPane>
</component>
<component name="ProjectReloadState">
@@ -800,6 +1242,7 @@
<recent name="" />
</key>
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
+ <recent name="org.jboss.test.rest.invocation.uriparam" />
<recent name="org.jboss.rest.jaxrs" />
<recent name="org.jboss.test.rest.samples.resourceview" />
<recent name="org.jboss.wsf.container.jboss50.rest" />
@@ -807,7 +1250,7 @@
</key>
</component>
<component name="RestoreUpdateTree" />
- <component name="RunManager" selected="Remote.client">
+ <component name="RunManager" selected="Remote.server">
<configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -992,15 +1435,15 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="3" y="25" width="1674" height="994" extended-state="2" />
- <editor active="false" />
+ <frame x="0" y="25" width="1680" height="1000" extended-state="6" />
+ <editor active="true" />
<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.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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.44874716" order="1" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39749432" 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" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
@@ -1012,7 +1455,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="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28676924" order="0" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2857143" 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" />
@@ -1102,107 +1545,111 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/AbstractResourceOperation.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/DefaultInvocationHandler.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="49" column="44" selection-start="1446" selection-end="1446" vertical-scroll-proportion="0.47044632">
+ <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/runtime/InvocationBuilder.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ResourceLocator.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="57" column="0" selection-start="1920" selection-end="1920" vertical-scroll-proportion="0.799514">
+ <state line="31" column="76" selection-start="1261" selection-end="1261" vertical-scroll-proportion="0.44186047">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/DefaultInvocationBuilder.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/AbstractRegexResolveable.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="0" selection-start="1286" selection-end="1286" vertical-scroll-proportion="0.30012152">
+ <state line="161" column="0" selection-start="4499" selection-end="4499" vertical-scroll-proportion="0.9894292">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/jaxrs/ProviderFactoryImpl.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/RootResourceModel.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 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="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/model/OperationBinding.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="55" column="0" selection-start="1811" selection-end="1811" vertical-scroll-proportion="0.73341376">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ParameterBinding.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/RootParameterBinding.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 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/test/java/org/jboss/test/rest/Widget.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="34" column="13" selection-start="1304" selection-end="1304" vertical-scroll-proportion="0.07654921">
+ <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/test/java/org/jboss/test/rest/WidgetList.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="47" column="11" selection-start="1585" selection-end="1585" vertical-scroll-proportion="0.5771567">
+ <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/InvocationBuilder.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="57" column="0" selection-start="1920" selection-end="1920" vertical-scroll-proportion="0.7937274">
<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/main/java/org/jboss/rest/runtime/DefaultInvocationBuilder.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="33" column="0" selection-start="1286" selection-end="1286" vertical-scroll-proportion="0.29794934">
<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/main/java/org/jboss/rest/container/wsf/ResourceServlet.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="103" column="0" selection-start="3873" selection-end="3873" vertical-scroll-proportion="0.1893848">
<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/invocation/uriparam/UriParamTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="112" column="40" selection-start="4346" selection-end="4346" vertical-scroll-proportion="0.3304982">
+ <state line="58" column="47" selection-start="1783" selection-end="1783" vertical-scroll-proportion="0.7020507">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/RuntimeContext.java">
+ <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="63" column="32" selection-start="2108" selection-end="2108" vertical-scroll-proportion="0.48481166">
+ <state line="9" column="13" selection-start="243" selection-end="243" vertical-scroll-proportion="0.13751508">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/Desktop/JSR-311/0.5/src/com/sun/ws/rest/impl/ResponseBuilderImpl.java">
+ <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="52" column="66" selection-start="1923" selection-end="1923" vertical-scroll-proportion="-0.60024303">
+ <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/media/BookResource.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="76" column="60" selection-start="1371" selection-end="1371" vertical-scroll-proportion="0.63791007">
+ <state line="77" column="0" selection-start="3123" selection-end="3123" vertical-scroll-proportion="0.56453556">
<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 14:03:28 UTC (rev 5111)
+++ rest/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java 2007-11-26 15:05:07 UTC (rev 5112)
@@ -140,12 +140,12 @@
}
catch(ResourceError resourceError)
{
- log.error(resourceError);
+ log.error("ResourceError", resourceError);
serverError(resourceError.status, resourceError.getMessage(), res);
}
catch (Throwable e)
{
- log.error(e);
+ log.error("Unknown Error", e);
serverError(500, e.getMessage(), res);
}
}
@@ -170,9 +170,6 @@
private void serverError(int status, String message, HttpServletResponse res)
{
-
- log.error(status + ":" + message);
-
try
{
res.setStatus(status);
Modified: rest/src/main/java/org/jboss/rest/model/AbstractResourceOperation.java
===================================================================
--- rest/src/main/java/org/jboss/rest/model/AbstractResourceOperation.java 2007-11-26 14:03:28 UTC (rev 5111)
+++ rest/src/main/java/org/jboss/rest/model/AbstractResourceOperation.java 2007-11-26 15:05:07 UTC (rev 5112)
@@ -8,7 +8,7 @@
* Common base class for {@link org.jboss.rest.model.ResourceLocator}
* and {@link org.jboss.rest.model.ResourceMethod}
*/
-abstract class AbstractResourceOperation extends AbstractRegexResolveable
+abstract class AbstractResourceOperation<T> extends AbstractRegexResolveable<T>
{
protected String uriTemplate;
protected Method invocationTarget;
@@ -36,7 +36,7 @@
setupRegexPatterns(this.uriTemplate, collectRegexInfo);
setupParameterBinding(regexInfo);
-
+
// Lock instance
this.frozen = true;
}
Modified: rest/src/main/java/org/jboss/rest/model/ParameterBinding.java
===================================================================
--- rest/src/main/java/org/jboss/rest/model/ParameterBinding.java 2007-11-26 14:03:28 UTC (rev 5111)
+++ rest/src/main/java/org/jboss/rest/model/ParameterBinding.java 2007-11-26 15:05:07 UTC (rev 5112)
@@ -39,6 +39,7 @@
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
+import java.util.TreeMap;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -83,7 +84,7 @@
Map<String, Integer> headerParam = new HashMap<String, Integer>();
/*positions of the header parameters*/
- Map<String, Integer> uriParam = new HashMap<String, Integer>();
+ Map<Integer, String> uriParam = new TreeMap<Integer, String>();
/* maps regex groups to UriTemplate wildcards */
Map<String, Integer> regexMapping = new HashMap<String, Integer>();
@@ -118,9 +119,9 @@
throw new RuntimeException("RuntimeContext doesn't match invocation model");
// @UriParam
- for(String paramName : uriParam.keySet())
- {
- int paramIndex = uriParam.get(paramName);
+ for(Integer paramIndex : uriParam.keySet())
+ {
+ String paramName = uriParam.get(paramIndex);
String paramValue;
Integer group = regexMapping.get(paramName); // can be null when parent parameter
@@ -195,7 +196,7 @@
if(annotation.annotationType() == UriParam.class)
{
UriParam p = (UriParam)annotation;
- uriParam.put(p.value(), totalParameters);
+ uriParam.put(totalParameters, p.value());
}
else if(annotation.annotationType() == HeaderParam.class)
{
Modified: rest/src/main/java/org/jboss/rest/model/ResourceLocator.java
===================================================================
--- rest/src/main/java/org/jboss/rest/model/ResourceLocator.java 2007-11-26 14:03:28 UTC (rev 5111)
+++ rest/src/main/java/org/jboss/rest/model/ResourceLocator.java 2007-11-26 15:05:07 UTC (rev 5112)
@@ -29,7 +29,7 @@
* @author Heiko.Braun(a)jboss.com
* @version $Revision$
*/
-public class ResourceLocator extends AbstractResourceOperation {
+public class ResourceLocator extends AbstractResourceOperation<ResourceModel> {
private ResourceModel link;
ResourceLocator(ResourceModel parent, Method invocationTarget, ResourceModel link)
Modified: rest/src/main/java/org/jboss/rest/model/ResourceMethod.java
===================================================================
--- rest/src/main/java/org/jboss/rest/model/ResourceMethod.java 2007-11-26 14:03:28 UTC (rev 5111)
+++ rest/src/main/java/org/jboss/rest/model/ResourceMethod.java 2007-11-26 15:05:07 UTC (rev 5112)
@@ -33,12 +33,12 @@
import java.util.List;
/**
- * Resource mthod meta data.
+ * Resource method meta data.
*
* @author Heiko.Braun(a)jboss.com
* @version $Revision$
*/
-public class ResourceMethod extends AbstractResourceOperation {
+public class ResourceMethod extends AbstractResourceOperation<ResourceModel> {
private MethodHTTP methodHTTP;
private List<MediaType> consumeMimeTypes = new ArrayList<MediaType>();
Modified: rest/src/main/java/org/jboss/rest/model/ResourceModel.java
===================================================================
--- rest/src/main/java/org/jboss/rest/model/ResourceModel.java 2007-11-26 14:03:28 UTC (rev 5111)
+++ rest/src/main/java/org/jboss/rest/model/ResourceModel.java 2007-11-26 15:05:07 UTC (rev 5112)
@@ -30,9 +30,9 @@
* @author Heiko.Braun(a)jboss.com
* @version $Revision$
*/
-public class ResourceModel extends AbstractRegexResolveable
+public class ResourceModel extends AbstractRegexResolveable<ResourceModel>
{
- private String uriTemplate;
+ protected String uriTemplate;
private Class invocationTarget;
private List<ResourceMethod> resourceMethods = new ArrayList<ResourceMethod>();
Modified: rest/src/main/java/org/jboss/rest/model/ResourceModelParser.java
===================================================================
--- rest/src/main/java/org/jboss/rest/model/ResourceModelParser.java 2007-11-26 14:03:28 UTC (rev 5111)
+++ rest/src/main/java/org/jboss/rest/model/ResourceModelParser.java 2007-11-26 15:05:07 UTC (rev 5112)
@@ -52,12 +52,14 @@
// the root resource
UriTemplate rootUri = (UriTemplate)bean.getAnnotation(UriTemplate.class);
- ResourceModel rootResource = new ResourceModel(rootUri.value(), bean);
+ RootResourceModel rootResource = new RootResourceModel(rootUri.value(), bean);
log.debug("Creating resource model from bean: " + bean);
parseInternal(rootResource);
+ logResourceTree(rootResource);
+
return rootResource;
}
@@ -73,8 +75,6 @@
// freeze root resource
resource.freeze();
-
- logResourceTree(resource);
}
private void parseMethod(Method method, ResourceModel parentResource)
Added: rest/src/main/java/org/jboss/rest/model/RootParameterBinding.java
===================================================================
--- rest/src/main/java/org/jboss/rest/model/RootParameterBinding.java (rev 0)
+++ rest/src/main/java/org/jboss/rest/model/RootParameterBinding.java 2007-11-26 15:05:07 UTC (rev 5112)
@@ -0,0 +1,50 @@
+package org.jboss.rest.model;
+
+import org.jboss.rest.runtime.Invocation;
+import org.jboss.rest.runtime.InvocationModel;
+import org.jboss.rest.runtime.RuntimeContext;
+
+import java.util.Map;
+import java.util.Iterator;
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
+
+public class RootParameterBinding implements InvocationModel
+{
+
+ private final Pattern regex;
+ private final Map<String, Integer> regexMapping;
+
+
+ public RootParameterBinding(Pattern regex, Map<String, Integer> regexMapping)
+ {
+ this.regex = regex;
+ this.regexMapping = regexMapping;
+ }
+
+ public void accept(Invocation invocation)
+ {
+
+ RuntimeContext ctx = invocation.getContext();
+ String workingPath = ctx.getWorkingPath();
+
+ assert ctx!=null;
+ assert workingPath !=null;
+
+ // local workingPath matching
+ Matcher matcher = regex.matcher(workingPath);
+ boolean matches = matcher.matches();
+
+ if(!matches)
+ throw new RuntimeException("RuntimeContext doesn't match invocation model");
+
+ Iterator<String> it = regexMapping.keySet().iterator();
+ while(it.hasNext())
+ {
+ String paramName = it.next();
+ String paramValue = matcher.group( regexMapping.get(paramName));
+ ctx.addBoundParameter(paramName, paramValue);
+ }
+
+ }
+}
Property changes on: rest/src/main/java/org/jboss/rest/model/RootParameterBinding.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: rest/src/main/java/org/jboss/rest/model/RootResourceModel.java
===================================================================
--- rest/src/main/java/org/jboss/rest/model/RootResourceModel.java (rev 0)
+++ rest/src/main/java/org/jboss/rest/model/RootResourceModel.java 2007-11-26 15:05:07 UTC (rev 5112)
@@ -0,0 +1,59 @@
+package org.jboss.rest.model;
+
+import java.util.Map;
+import java.util.HashMap;
+
+public class RootResourceModel extends ResourceModel
+{
+
+ private RootParameterBinding rootParamBinding;
+
+ RootResourceModel(String uriTemplate, Class implementation)
+ {
+ super(uriTemplate, implementation);
+ }
+
+ public RootResourceModel(ResourceModel parent, String uriTemplate, Class invocationTarget)
+ {
+ super(parent, uriTemplate, invocationTarget);
+ }
+
+ void freeze()
+ {
+ super.freeze(); // creates the regex pattern
+ }
+
+ /**
+ * Supply a UriParam handler
+ * @param uriTemplate
+ * @param handler always null in this case
+ */
+ protected void setupRegexPatterns(String uriTemplate, UriParamHandler handler)
+ {
+ // We need to know which param belongs to what regex group
+ final Map<String, Integer> regexInfo = new HashMap<String, Integer>();
+ UriParamHandler collectRegexInfo = new UriParamHandler()
+ {
+ public void newUriParam(int regexGroup, String paramName)
+ {
+ regexInfo.put(paramName, regexGroup);
+ }
+ };
+
+ super.setupRegexPatterns(uriTemplate, collectRegexInfo);
+
+ this.rootParamBinding = new RootParameterBinding(this.regexPattern, regexInfo);
+ }
+
+
+ public ResourceModel getParent()
+ {
+ return null;
+ }
+
+
+ public RootParameterBinding getRootParamBinding()
+ {
+ return rootParamBinding;
+ }
+}
Property changes on: rest/src/main/java/org/jboss/rest/model/RootResourceModel.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: rest/src/main/java/org/jboss/rest/runtime/Invocation.java
===================================================================
--- rest/src/main/java/org/jboss/rest/runtime/Invocation.java 2007-11-26 14:03:28 UTC (rev 5111)
+++ rest/src/main/java/org/jboss/rest/runtime/Invocation.java 2007-11-26 15:05:07 UTC (rev 5112)
@@ -60,6 +60,7 @@
/**
* Convinience method to work with String parameter types
+ * TODO: still required? Especially the string hack?
* @param index
* @param param
*/
Modified: rest/src/main/java/org/jboss/rest/runtime/InvocationMediator.java
===================================================================
--- rest/src/main/java/org/jboss/rest/runtime/InvocationMediator.java 2007-11-26 14:03:28 UTC (rev 5111)
+++ rest/src/main/java/org/jboss/rest/runtime/InvocationMediator.java 2007-11-26 15:05:07 UTC (rev 5112)
@@ -1,9 +1,7 @@
package org.jboss.rest.runtime;
import org.jboss.rest.ResourceError;
-import org.jboss.rest.model.ResourceLocator;
-import org.jboss.rest.model.ResourceMethod;
-import org.jboss.rest.model.StatefulResourceResolver;
+import org.jboss.rest.model.*;
import java.util.Stack;
@@ -29,7 +27,19 @@
StatefulResourceResolver resolver = StatefulResourceResolver.newInstance(runtimeContext);
ResourceMethod resourceMethod = resolver.resolve(); // not null, throws exception
- // evaluate locator stack
+ // ----------------------------------------------------------------------
+ // Resolve the actual root resource to derive the root parameter binding
+
+ ResourceModel rootResource = resolveRootResource(resourceMethod.getParent());
+
+ runtimeContext.setWorkingPath( runtimeContext.getPath() );
+ InvocationModel rootParameterBinding = ((RootResourceModel)rootResource).getRootParamBinding();
+ InvocationBuilder rootBuilder = new DefaultInvocationBuilder();
+ rootBuilder.addInvocationModel(rootParameterBinding);
+ rootBuilder.build(runtimeContext);
+
+ // ----------------------------------------------------------------------
+ // Invoke the locator - supplies a preset invocation target
Object subResourceInstance = null;
Stack<ResourceLocator> visitedLocators = resolver.getVisitedLocator();
while(!visitedLocators.isEmpty())
@@ -37,20 +47,21 @@
ResourceLocator loc = visitedLocators.pop();
runtimeContext.setWorkingPath(resolver.getLocatorWorkingPath(loc));
- InvocationBuilder builder = new DefaultInvocationBuilder();
+ InvocationBuilder locatorBuilder = new DefaultInvocationBuilder();
if(subResourceInstance!=null)
- builder.addInvocationModel(new PresetInvocationTarget(subResourceInstance));
+ locatorBuilder.addInvocationModel(new PresetInvocationTarget(subResourceInstance));
- builder.addInvocationModel(loc.getParameterBinding());
- builder.addInvocationModel(loc.getOperationBinding());
- Invocation locatorInvocation = builder.build(runtimeContext);
+ locatorBuilder.addInvocationModel(loc.getParameterBinding());
+ locatorBuilder.addInvocationModel(loc.getOperationBinding());
+ Invocation locatorInvocation = locatorBuilder.build(runtimeContext);
InvocationHandler bridgeInvoker = new DefaultInvocationHandler();
subResourceInstance = bridgeInvoker.invoke(locatorInvocation);
}
- // create an Invocation instance
+ // ----------------------------------------------------------------------
+ // Invoke the final resource method
InvocationBuilder builder = new DefaultInvocationBuilder();
runtimeContext.setWorkingPath(resolver.getMethodWorkingPath());
@@ -59,12 +70,21 @@
builder.addInvocationModel( resourceMethod.getParameterBinding() );
builder.addInvocationModel( resourceMethod.getOperationBinding() );
+
Invocation invocation = builder.build(runtimeContext);
-
- // invoke it
InvocationHandler invoker = new DefaultInvocationHandler();
returnValue = invoker.invoke(invocation); // more fine grained match
return returnValue;
}
+
+ private static ResourceModel resolveRootResource(ResourceModel child)
+ {
+ ResourceModel tmp = child.getParent();
+ if(tmp!=null)
+ tmp = resolveRootResource(tmp);
+ else
+ tmp = child;
+ return tmp;
+ }
}
Modified: rest/src/test/java/org/jboss/test/rest/deployment/DeploymentTestCase.java
===================================================================
--- rest/src/test/java/org/jboss/test/rest/deployment/DeploymentTestCase.java 2007-11-26 14:03:28 UTC (rev 5111)
+++ rest/src/test/java/org/jboss/test/rest/deployment/DeploymentTestCase.java 2007-11-26 15:05:07 UTC (rev 5112)
@@ -22,13 +22,10 @@
package org.jboss.test.rest.deployment;
import junit.framework.Test;
+import org.jboss.test.rest.util.RequestDispatcher;
import org.jboss.test.rest.util.RestCase;
import org.jboss.test.rest.util.RestTestSetup;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.net.HttpURLConnection;
import java.net.URL;
/**
@@ -49,7 +46,7 @@
public void testRequest1() throws Exception
{
URL url = new URL("http://localhost:8080/rest-deployment/widgets");
- String response = doTextPlainRequest(url, null);
+ String response = RequestDispatcher.plainText(url, null);
assertNotNull(response);
assertEquals("A widgetlist", response);
}
@@ -62,36 +59,9 @@
public void testRequest2() throws Exception
{
URL url = new URL("http://localhost:8080/rest-deployment/widgets/123/id");
- String response = doTextPlainRequest(url, null);
+ String response = RequestDispatcher.plainText(url, null);
assertNotNull(response);
assertEquals("123", response);
}
-
- private String doTextPlainRequest(URL url, String data) throws Exception
- {
- HttpURLConnection conn = (HttpURLConnection)url.openConnection();
- conn.setDoOutput( data!=null );
- conn.setRequestProperty("accept", "text/*");
- if(data !=null)
- {
- OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
-
- wr.write(data);
- wr.flush();
- wr.close();
- }
-
- // Get the response
- BufferedReader rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
- String line;
- StringBuffer sb = new StringBuffer();
- while ((line = rd.readLine()) != null)
- {
- sb.append(line);
- }
- rd.close();
-
- return sb.toString();
- }
}
Modified: rest/src/test/java/org/jboss/test/rest/invocation/InvocationBuilderTestCase.java
===================================================================
--- rest/src/test/java/org/jboss/test/rest/invocation/InvocationBuilderTestCase.java 2007-11-26 14:03:28 UTC (rev 5111)
+++ rest/src/test/java/org/jboss/test/rest/invocation/InvocationBuilderTestCase.java 2007-11-26 15:05:07 UTC (rev 5112)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.rest.invocation;
-import junit.framework.TestCase;
import org.jboss.rest.MethodHTTP;
import org.jboss.rest.ResourceRegistry;
import org.jboss.rest.model.*;
@@ -30,10 +29,10 @@
import org.jboss.test.rest.util.RestCase;
import javax.ws.rs.core.HttpHeaders;
+import java.io.ByteArrayInputStream;
import java.net.URI;
import java.util.List;
import java.util.Stack;
-import java.io.ByteArrayInputStream;
/**
* @author Heiko.Braun(a)jboss.com
Added: rest/src/test/java/org/jboss/test/rest/invocation/uriparam/CategoryResource.java
===================================================================
--- rest/src/test/java/org/jboss/test/rest/invocation/uriparam/CategoryResource.java (rev 0)
+++ rest/src/test/java/org/jboss/test/rest/invocation/uriparam/CategoryResource.java 2007-11-26 15:05:07 UTC (rev 5112)
@@ -0,0 +1,59 @@
+package org.jboss.test.rest.invocation.uriparam;
+
+import javax.ws.rs.HttpMethod;
+import javax.ws.rs.ProduceMime;
+import javax.ws.rs.UriTemplate;
+import javax.ws.rs.UriParam;
+
+@ProduceMime("text/plain")
+public class CategoryResource
+{
+ private String categoryName;
+ private String shopName;
+
+ public CategoryResource()
+ {
+ }
+
+ public CategoryResource(String shopName, String categoryName)
+ {
+ this.categoryName = categoryName;
+ this.shopName = shopName;
+ }
+
+ @HttpMethod
+ public String getCategory()
+ {
+ return "shop="+shopName+", category="+categoryName;
+ }
+
+ @UriTemplate("{item}")
+ public ItemResource getItem(
+ @UriParam("name") String shop,
+ @UriParam("category") String category,
+ @UriParam("item") String item
+ )
+ {
+ return new ItemResource(shop, category, item);
+ }
+
+ public String getCategoryName()
+ {
+ return categoryName;
+ }
+
+ public void setCategoryName(String categoryName)
+ {
+ this.categoryName = categoryName;
+ }
+
+ public String getShopName()
+ {
+ return shopName;
+ }
+
+ public void setShopName(String shopName)
+ {
+ this.shopName = shopName;
+ }
+}
Property changes on: rest/src/test/java/org/jboss/test/rest/invocation/uriparam/CategoryResource.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: rest/src/test/java/org/jboss/test/rest/invocation/uriparam/ItemResource.java
===================================================================
--- rest/src/test/java/org/jboss/test/rest/invocation/uriparam/ItemResource.java (rev 0)
+++ rest/src/test/java/org/jboss/test/rest/invocation/uriparam/ItemResource.java 2007-11-26 15:05:07 UTC (rev 5112)
@@ -0,0 +1,62 @@
+package org.jboss.test.rest.invocation.uriparam;
+
+import javax.ws.rs.HttpMethod;
+import javax.ws.rs.UriParam;
+
+public class ItemResource
+{
+ private String categoryName;
+ private String shopName;
+ private String itemName;
+
+ public ItemResource()
+ {
+ }
+
+ public ItemResource(String shopName, String categoryName, String itemName)
+ {
+ this.categoryName = categoryName;
+ this.shopName = shopName;
+ this.itemName = itemName;
+ }
+
+ @HttpMethod
+ public String getItem(
+ @UriParam("name") String shop,
+ @UriParam("category") String category,
+ @UriParam("item") String item
+ )
+ {
+
+ // This instance was located, therefore it needs to reflect the uri parameter
+ if(!shop.equals(shopName)
+ || !category.equals(categoryName)
+ || !item.equals(itemName))
+ {
+ throw new IllegalArgumentException("UriParam's don't match instance variables");
+ }
+
+ return "shop="+shopName+", category="+categoryName+", item="+itemName;
+ }
+
+
+ public String getCategoryName()
+ {
+ return categoryName;
+ }
+
+ public void setCategoryName(String categoryName)
+ {
+ this.categoryName = categoryName;
+ }
+
+ public String getShopName()
+ {
+ return shopName;
+ }
+
+ public void setShopName(String shopName)
+ {
+ this.shopName = shopName;
+ }
+}
Property changes on: rest/src/test/java/org/jboss/test/rest/invocation/uriparam/ItemResource.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: rest/src/test/java/org/jboss/test/rest/invocation/uriparam/ShopResource.java
===================================================================
--- rest/src/test/java/org/jboss/test/rest/invocation/uriparam/ShopResource.java (rev 0)
+++ rest/src/test/java/org/jboss/test/rest/invocation/uriparam/ShopResource.java 2007-11-26 15:05:07 UTC (rev 5112)
@@ -0,0 +1,26 @@
+package org.jboss.test.rest.invocation.uriparam;
+
+import javax.ws.rs.HttpMethod;
+import javax.ws.rs.UriParam;
+import javax.ws.rs.UriTemplate;
+import javax.ws.rs.ProduceMime;
+
+@UriTemplate("shop/{name}")
+@ProduceMime("text/plain")
+public class ShopResource
+{
+ @HttpMethod
+ public String getShop( @UriParam("name") String shopName )
+ {
+ return "shop="+shopName;
+ }
+
+ @UriTemplate("{category}")
+ public CategoryResource getCategory(
+ @UriParam("name") String shopName,
+ @UriParam("category") String category)
+ {
+ return new CategoryResource(shopName, category);
+ }
+
+}
Property changes on: rest/src/test/java/org/jboss/test/rest/invocation/uriparam/ShopResource.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: rest/src/test/java/org/jboss/test/rest/invocation/uriparam/UriParamTestCase.java
===================================================================
--- rest/src/test/java/org/jboss/test/rest/invocation/uriparam/UriParamTestCase.java (rev 0)
+++ rest/src/test/java/org/jboss/test/rest/invocation/uriparam/UriParamTestCase.java 2007-11-26 15:05:07 UTC (rev 5112)
@@ -0,0 +1,65 @@
+package org.jboss.test.rest.invocation.uriparam;
+
+import junit.framework.Test;
+import org.jboss.test.rest.util.RequestDispatcher;
+import org.jboss.test.rest.util.RestCase;
+import org.jboss.test.rest.util.RestTestSetup;
+
+import java.net.URL;
+
+/**
+ * Test UriParam binding across resource hierarchies
+ */
+public class UriParamTestCase extends RestCase
+{
+ public static Test suite()
+ {
+ return new RestTestSetup(UriParamTestCase.class, "rest-uriparam.war");
+ }
+
+ /**
+ * Root models that carry a template 'shop/{name}' need to provide
+ * a prameter binding as well.
+ * @throws Exception
+ */
+ public void testRootModelParameter() throws Exception
+ {
+ URL url = new URL("http://localhost:8080/rest-uriparam/shop/electronics");
+
+ String response = RequestDispatcher.plainText(url, null );
+ assertNotNull(response);
+ assertEquals( "shop=electronics", response);
+ }
+
+ /**
+ * Subresources may refer uri paramter that actually
+ * have been resolved in parent resources, i.e. 'shop/{name}/{category}',
+ * whereas {category} triggers a locator.
+ *
+ * @throws Exception
+ */
+ public void testParentParameter() throws Exception
+ {
+ URL url = new URL("http://localhost:8080/rest-uriparam/shop/electronics/hifi");
+
+ String response = RequestDispatcher.plainText(url, null );
+ assertNotNull(response);
+ assertEquals( "shop=electronics, category=hifi", response);
+ }
+
+ /**
+ * Subresources may refer uri paramter that actually
+ * have been resolved in parent resources, i.e. 'shop/{name}/{category}',
+ * whereas {category} triggers a locator.
+ *
+ * @throws Exception
+ */
+ public void testLocatorAndLocalParameter() throws Exception
+ {
+ URL url = new URL("http://localhost:8080/rest-uriparam/shop/electronics/hifi/turntable");
+
+ String response = RequestDispatcher.plainText(url, null );
+ assertNotNull(response);
+ assertEquals( "shop=electronics, category=hifi, item=turntable", response);
+ }
+}
Property changes on: rest/src/test/java/org/jboss/test/rest/invocation/uriparam/UriParamTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: rest/src/test/java/org/jboss/test/rest/util/RequestDispatcher.java
===================================================================
--- rest/src/test/java/org/jboss/test/rest/util/RequestDispatcher.java (rev 0)
+++ rest/src/test/java/org/jboss/test/rest/util/RequestDispatcher.java 2007-11-26 15:05:07 UTC (rev 5112)
@@ -0,0 +1,53 @@
+package org.jboss.test.rest.util;
+
+import java.net.URL;
+import java.net.HttpURLConnection;
+import java.io.OutputStreamWriter;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+
+/**
+ * Test utility for simple request types
+ */
+public class RequestDispatcher
+{
+ /**
+ *
+ * @param url resource url
+ * @param data POST, PUT data. Needs to be a String
+ * @return maybe null or a String value
+ * @throws Exception if anything fails
+ */
+ public static String plainText(URL url, String data) throws Exception
+ {
+ HttpURLConnection conn = (HttpURLConnection)url.openConnection();
+ conn.setDoOutput( data!=null );
+ conn.setRequestProperty("accept", "text/plain");
+
+ if(data !=null)
+ {
+ OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
+
+ wr.write(data);
+ wr.flush();
+ wr.close();
+ }
+
+ // Get the response
+ if(conn.getResponseCode()==200)
+ {
+ BufferedReader rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+ String line;
+ StringBuffer sb = new StringBuffer();
+ while ((line = rd.readLine()) != null)
+ {
+ sb.append(line);
+ }
+ rd.close();
+
+ return sb.toString();
+ }
+
+ return null;
+ }
+}
Property changes on: rest/src/test/java/org/jboss/test/rest/util/RequestDispatcher.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: rest/src/test/resources/rest/invocation/uriparam/WEB-INF/jbossrs.xml
===================================================================
--- rest/src/test/resources/rest/invocation/uriparam/WEB-INF/jbossrs.xml (rev 0)
+++ rest/src/test/resources/rest/invocation/uriparam/WEB-INF/jbossrs.xml 2007-11-26 15:05:07 UTC (rev 5112)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<jbossrs xmlns="http://org.jboss.rest/">
+ <resource>
+ <name>ShopResource</name>
+ <implementation>org.jboss.test.rest.invocation.uriparam.ShopResource</implementation>
+ </resource>
+</jbossrs>
Property changes on: rest/src/test/resources/rest/invocation/uriparam/WEB-INF/jbossrs.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: rest/src/test/resources/rest/invocation/uriparam/WEB-INF/web.xml
===================================================================
--- rest/src/test/resources/rest/invocation/uriparam/WEB-INF/web.xml (rev 0)
+++ rest/src/test/resources/rest/invocation/uriparam/WEB-INF/web.xml 2007-11-26 15:05:07 UTC (rev 5112)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <display-name>JBossRest</display-name>
+
+ <servlet>
+ <servlet-name>JBossRS</servlet-name>
+ <servlet-class>org.jboss.rest.container.wsf.ResourceServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>JBossRS</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
Property changes on: rest/src/test/resources/rest/invocation/uriparam/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 5 months