[jbossws-commits] JBossWS SVN: r5102 - in rest: ant-import and 17 other directories.

Author: heiko.braun(a)jboss.com Date: 2007-11-22 12:10:00 -0500 (Thu, 22 Nov 2007) New Revision: 5102 Added: rest/ant-import-tests/build-jars-rest.xml rest/src/test/java/org/jboss/test/rest/samples/ rest/src/test/java/org/jboss/test/rest/samples/resourceview/ rest/src/test/java/org/jboss/test/rest/samples/resourceview/RegistryResource.java rest/src/test/resources/rest/samples/ rest/src/test/resources/rest/samples/resourceview/ rest/src/test/resources/rest/samples/resourceview/WEB-INF/ rest/src/test/resources/rest/samples/resourceview/WEB-INF/jboss-web.xml rest/src/test/resources/rest/samples/resourceview/WEB-INF/jbossrs.xml rest/src/test/resources/rest/samples/resourceview/WEB-INF/web.xml Removed: rest/ant-import-tests/build-jars-jaxws.xml rest/src/main/java/org/jboss/rest/container/wsf/ResourceViewServlet.java Modified: rest/ant-import-tests/build-testsuite.xml rest/ant-import/macros-deploy-rs.xml rest/jboss-rest.ipr rest/jboss-rest.iws rest/src/main/distro/bin-dist-build.xml rest/src/main/java/org/jboss/rest/ResourceRegistry.java rest/src/main/java/org/jboss/rest/container/wsf/DescriptorDeploymentAspect.java rest/src/main/java/org/jboss/rest/container/wsf/ModelDeploymentAspect.java rest/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java rest/src/main/java/org/jboss/rest/model/dd/DeploymentDescriptorParser.java rest/src/main/resources/jbossrest-context.war/WEB-INF/web.xml rest/src/main/resources/jbossrest-context.war/index.html rest/src/test/java/org/jboss/test/rest/deployment/DeploymentTestCase.java rest/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java rest/src/test/java/org/jboss/test/rest/model/RunRegex.java Log: registry view sample Modified: rest/ant-import/macros-deploy-rs.xml =================================================================== --- rest/ant-import/macros-deploy-rs.xml 2007-11-22 10:32:14 UTC (rev 5101) +++ rest/ant-import/macros-deploy-rs.xml 2007-11-22 17:10:00 UTC (rev 5102) @@ -472,7 +472,7 @@ </fileset> </delete> - <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossrs.sar"/> + <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossrest.sar"/> </sequential> </macrodef> Deleted: rest/ant-import-tests/build-jars-jaxws.xml =================================================================== --- rest/ant-import-tests/build-jars-jaxws.xml 2007-11-22 10:32:14 UTC (rev 5101) +++ rest/ant-import-tests/build-jars-jaxws.xml 2007-11-22 17:10:00 UTC (rev 5102) @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ============================================================ --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- ============================================================ --> - -<!-- $Id$ --> - -<project> - - <description>JBossWS test archive builder</description> - - <!-- ================================================================== --> - <!-- Building --> - <!-- ================================================================== --> - - <target name="build-jars-jaxws" description="Build the deployments."> - - <mkdir dir="${tests.output.dir}/libs"/> - - <!-- RS stuff --> - - <war warfile="${tests.output.dir}/libs/jbossrs-deployment.war" webxml="${tests.output.dir}/resources/rest/deployment/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/rest/WidgetList.class"/> - <include name="org/jboss/test/rest/Widget.class"/> - <include name="org/jboss/test/rest/Specification.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/rest/deployment"> - <include name="jbossrs.xml"/> - </webinf> - </war> - - <war warfile="${tests.output.dir}/libs/jbossrs-mediatype.war" webxml="${tests.output.dir}/resources/rest/media/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/rest/media/BookResource.class"/> - <include name="org/jboss/test/rest/media/BookStoreResource.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/rest/media"> - <include name="jbossrs.xml"/> - </webinf> - </war> - - </target> - - -</project> Copied: rest/ant-import-tests/build-jars-rest.xml (from rev 5095, rest/ant-import-tests/build-jars-jaxws.xml) =================================================================== --- rest/ant-import-tests/build-jars-rest.xml (rev 0) +++ rest/ant-import-tests/build-jars-rest.xml 2007-11-22 17:10:00 UTC (rev 5102) @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ============================================================ --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- ============================================================ --> + +<!-- $Id$ --> + +<project> + + <description>JBoss REST test archive builder</description> + + <!-- ================================================================== --> + <!-- Building --> + <!-- ================================================================== --> + + <target name="build-jars-jaxws" description="Build the deployments."> + + <mkdir dir="${tests.output.dir}/libs"/> + + <!-- deployment --> + <war warfile="${tests.output.dir}/libs/rest-deployment.war" webxml="${tests.output.dir}/resources/rest/deployment/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/rest/WidgetList.class"/> + <include name="org/jboss/test/rest/Widget.class"/> + <include name="org/jboss/test/rest/Specification.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/rest/deployment"> + <include name="jbossrs.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"> + <include name="org/jboss/test/rest/media/BookResource.class"/> + <include name="org/jboss/test/rest/media/BookStoreResource.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/rest/media"> + <include name="jbossrs.xml"/> + </webinf> + </war> + + <!-- samples/resourceview --> + <war warfile="${tests.output.dir}/libs/rest-samples-resourceview.war" webxml="${tests.output.dir}/resources/rest/samples/resourceview/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/rest/samples/resourceview/*.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/rest/samples/resourceview/WEB-INF/"> + <include name="*.xml"/> + </webinf> + </war> + + </target> + + +</project> Property changes on: rest/ant-import-tests/build-jars-rest.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: rest/ant-import-tests/build-testsuite.xml =================================================================== --- rest/ant-import-tests/build-testsuite.xml 2007-11-22 10:32:14 UTC (rev 5101) +++ rest/ant-import-tests/build-testsuite.xml 2007-11-22 17:10:00 UTC (rev 5102) @@ -62,7 +62,7 @@ </target> <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> - <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/> + <ant antfile="${core.dir}/ant-import-tests/build-jars-rest.xml" target="build-jars-jaxws"/> </target> <target name="tests-main" depends="tests-jars" description="Build the deployments."/> Modified: rest/jboss-rest.ipr =================================================================== --- rest/jboss-rest.ipr 2007-11-22 10:32:14 UTC (rev 5101) +++ rest/jboss-rest.ipr 2007-11-22 17:10:00 UTC (rev 5102) @@ -254,6 +254,7 @@ <modules> <module fileurl="file://$PROJECT_DIR$/jboss-rest.iml" filepath="$PROJECT_DIR$/jboss-rest.iml" /> <module fileurl="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/jboss50.iml" filepath="/home/hbraun/dev/prj/jbossas/trunk/webservices/jboss50.iml" /> + <module fileurl="file:///home/hbraun/dev/prj/jbossws/spi/trunk/spi.iml" filepath="/home/hbraun/dev/prj/jbossws/spi/trunk/spi.iml" /> <module fileurl="file:///home/hbraun/dev/prj/jbossws/common/trunk/trunk.iml" filepath="/home/hbraun/dev/prj/jbossws/common/trunk/trunk.iml" /> </modules> </component> Modified: rest/jboss-rest.iws =================================================================== --- rest/jboss-rest.iws 2007-11-22 10:32:14 UTC (rev 5101) +++ rest/jboss-rest.iws 2007-11-22 17:10:00 UTC (rev 5102) @@ -16,7 +16,39 @@ <option name="USER" value="" /> </component> <component name="ChangeListManager"> - <list default="true" name="Default" comment="" /> + <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/samples/resourceview/WEB-INF" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/resources/rest/samples/resourceview/WEB-INF/jbossrs.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/samples" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/resources/rest/samples/resourceview/WEB-INF/web.xml" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceViewServlet.java" afterPath="" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/ant-import-tests/build-jars-rest.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/resources/rest/samples/resourceview" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ModelDeploymentAspect.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ModelDeploymentAspect.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/jbossrest-context.war/WEB-INF/web.xml" afterPath="$PROJECT_DIR$/src/main/resources/jbossrest-context.war/WEB-INF/web.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/ant-import-tests/build-testsuite.xml" afterPath="$PROJECT_DIR$/ant-import-tests/build-testsuite.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/ant-import/macros-deploy-rs.xml" afterPath="$PROJECT_DIR$/ant-import/macros-deploy-rs.xml" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/ant-import-tests/build-jars-jaxws.xml" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/jbossrest-context.war/index.html" afterPath="$PROJECT_DIR$/src/main/resources/jbossrest-context.war/index.html" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/distro/bin-dist-build.xml" afterPath="$PROJECT_DIR$/src/main/distro/bin-dist-build.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jboss-rest.ipr" afterPath="$PROJECT_DIR$/jboss-rest.ipr" /> + <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="NEW" beforePath="" afterPath="/home/hbraun/dev/prj/jbossas/trunk/webservices/jboss50.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java" /> + <change type="MODIFICATION" beforePath="/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/test/java/org/jboss/test/rest/model/RunRegex.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/model/RunRegex.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/dd/DeploymentDescriptorParser.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/dd/DeploymentDescriptorParser.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/resources/rest/samples" /> + <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/ResourceRegistry.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/ResourceRegistry.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/resources/rest/samples/resourceview/WEB-INF/jboss-web.xml" /> + <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/main/java/org/jboss/rest/container/wsf/DescriptorDeploymentAspect.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/DescriptorDeploymentAspect.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jboss-rest.iws" afterPath="$PROJECT_DIR$/jboss-rest.iws" /> + </list> </component> <component name="ChangeListSynchronizer" /> <component name="ChangesViewManager" flattened_view="true" /> @@ -87,7 +119,7 @@ </component> <component name="DebuggerManager"> <line_breakpoints> - <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"> + <breakpoint url="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ModelDeploymentAspect.java" line="72" class="org.jboss.rest.container.wsf.ModelDeploymentAspect" package="org.jboss.rest.container.wsf"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -100,6 +132,32 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> + <breakpoint url="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java" line="101" class="org.jboss.wsf.container.jboss50.ArchiveDeployerHook" package="org.jboss.wsf.container.jboss50"> + <option name="ENABLED" value="true" /> + <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:///home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java" line="81" class="org.jboss.wsf.container.jboss50.ArchiveDeployerHook" package="org.jboss.wsf.container.jboss50"> + <option name="ENABLED" value="true" /> + <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> @@ -163,28 +221,37 @@ <component name="FavoritesProjectViewPane" /> <component name="FileEditorManager"> <leaf> - <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"> + <file leaf-file-name="ResourceRegistry.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/ResourceRegistry.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="96" column="0" selection-start="3556" selection-end="3556" vertical-scroll-proportion="0.38822114"> + <state line="33" column="13" selection-start="1237" selection-end="1237" vertical-scroll-proportion="0.24675325"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="DeploymentTestCase.java" pinned="false" current="true" current-in-tab="true"> + <file leaf-file-name="build-jars-rest.xml" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/ant-import-tests/build-jars-rest.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="50" column="88" selection-start="2447" selection-end="2447" vertical-scroll-proportion="0.72596157"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="DeploymentTestCase.java" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/deployment/DeploymentTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="63" column="65" selection-start="2100" selection-end="2100" vertical-scroll-proportion="0.10271547"> + <state line="63" column="51" selection-start="2080" selection-end="2080" vertical-scroll-proportion="0.11216056"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="ArchiveDeployerHook.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java"> + <file leaf-file-name="MediaTypeTestCase.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="94" column="0" selection-start="3414" selection-end="3414" vertical-scroll-proportion="0.19244392"> + <state line="32" column="51" selection-start="849" selection-end="849" vertical-scroll-proportion="0.08028335"> <folding /> </state> </provider> @@ -228,10 +295,6 @@ <option name="myItemId" value="jboss-rest.ipr" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-rest" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -242,17 +305,7 @@ <option name="myItemId" value="jboss-rest" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="org.jboss.test.rs" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-rest.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - </PATH> </subPane> </component> <component name="PerforceChangeBrowserSettings"> @@ -344,10 +397,6 @@ <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-framework" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -367,11 +416,11 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test-framework" /> + <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-framework/ant-import" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -396,6 +445,26 @@ <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/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> @@ -419,11 +488,11 @@ <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="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/java/org/jboss/test/rest" /> + <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> @@ -453,13 +522,43 @@ <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> + <PATH> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/rest/deployment" /> + <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> @@ -577,6 +676,14 @@ <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> @@ -607,11 +714,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/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/wsf" /> + <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> @@ -636,6 +751,30 @@ <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/model" /> + <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/dd" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -651,6 +790,28 @@ <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> @@ -662,11 +823,11 @@ </component> <component name="ProjectView"> <navigator currentView="ProjectPane" proportions="0.16666667" version="1" splitterProportion="0.5"> - <flattenPackages /> + <flattenPackages ProjectPane="false" /> <showMembers /> <showModules /> <showLibraryContents /> - <hideEmptyPackages /> + <hideEmptyPackages ProjectPane="false" /> <abbreviatePackageNames /> <showStructure PackagesPane="false" ProjectPane="false" /> <autoscrollToSource /> @@ -693,12 +854,40 @@ <recent name="org.jboss.test.rest.util" /> </key> <key name="MoveClassesOrPackagesDialog.RECENTS_KEY"> + <recent name="org.jboss.test.rest.samples.resourceview" /> <recent name="org.jboss.wsf.container.jboss50.rest" /> <recent name="org.jboss.rs.container.wsf" /> </key> </component> <component name="RestoreUpdateTree" /> - <component name="RunManager" selected="Remote.server"> + <component name="RunManager" selected="Application.RunRegex"> + <tempConfiguration default="false" name="RunRegex" type="Application" factoryName="Application" enabled="false" merge="false"> + <option name="MAIN_CLASS_NAME" value="org.jboss.test.rest.model.RunRegex" /> + <option name="VM_PARAMETERS" /> + <option name="PROGRAM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="ENABLE_SWING_INSPECTOR" value="false" /> + <module name="jboss-rest" /> + <RunnerSettings RunnerId="Run" /> + <ConfigurationWrapper RunnerId="Run" /> + <method> + <option name="Make" value="true" /> + </method> + </tempConfiguration> + <configuration default="true" type="Applet" factoryName="Applet"> + <module name="" /> + <option name="MAIN_CLASS_NAME" /> + <option name="HTML_FILE_NAME" /> + <option name="HTML_USED" value="false" /> + <option name="WIDTH" value="400" /> + <option name="HEIGHT" value="300" /> + <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> + <option name="VM_PARAMETERS" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + </configuration> <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> <option name="MAIN_CLASS_NAME" /> <option name="VM_PARAMETERS" /> @@ -708,7 +897,17 @@ <option name="ALTERNATIVE_JRE_PATH" /> <option name="ENABLE_SWING_INSPECTOR" value="false" /> <module name="" /> + <method> + <option name="Make" value="true" /> + </method> </configuration> + <configuration default="true" type="Remote" factoryName="Remote"> + <option name="USE_SOCKET_TRANSPORT" value="true" /> + <option name="SERVER_MODE" value="false" /> + <option name="SHMEM_ADDRESS" value="javadebug" /> + <option name="HOST" value="localhost" /> + <option name="PORT" value="5005" /> + </configuration> <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> <module name="" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> @@ -728,25 +927,6 @@ <option name="Make" value="true" /> </method> </configuration> - <configuration default="true" type="Applet" factoryName="Applet"> - <module name="" /> - <option name="MAIN_CLASS_NAME" /> - <option name="HTML_FILE_NAME" /> - <option name="HTML_USED" value="false" /> - <option name="WIDTH" value="400" /> - <option name="HEIGHT" value="300" /> - <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> - <option name="VM_PARAMETERS" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - </configuration> - <configuration default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> - </configuration> <configuration default="false" name="server" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> <option name="SERVER_MODE" value="false" /> @@ -817,6 +997,7 @@ <option name="UPDATE_RUN_STATUS" value="false" /> <option name="UPDATE_RECURSIVELY" value="true" /> <option name="MERGE_DRY_RUN" value="false" /> + <configuration useDefault="true">/home/hbraun/.subversion</configuration> </component> <component name="TodoView" selected-index="0"> <todo-panel id="selected-file"> @@ -836,27 +1017,27 @@ <frame x="-3" y="25" width="1686" height="1003" 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="-1" /> - <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> - <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> + <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> + <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4498861" order="1" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3997722" 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="-1" /> - <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39863327" 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" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32915717" order="8" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24954017" order="1" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" /> - <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> - <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> - <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.74943054" order="-1" /> - <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.33476394" order="0" /> + <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> + <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> + <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.74943054" order="8" /> + <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29368487" 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.33" order="2" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32914287" order="2" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" /> <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" /> @@ -886,7 +1067,7 @@ <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" /> <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" /> <option name="ERROR_OCCURED" value="false" /> - <option name="ACTIVE_VCS_NAME" /> + <option name="ACTIVE_VCS_NAME" value="svn" /> <option name="UPDATE_GROUP_BY_PACKAGES" value="false" /> <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" /> <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" /> @@ -937,43 +1118,43 @@ </component> <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.16666667,0.5" version="1"> <option name="myPlainMode" value="false" /> - <option name="myLastEditedConfigurable" value="jboss-rest" /> + <option name="myLastEditedConfigurable" value="spi" /> </component> <component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="" version="1"> <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/ant-import-tests/build-jars-jaxws.xml"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/StatefulResourceResolver.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="24" column="111" selection-start="1043" selection-end="1043" vertical-scroll-proportion="0.60745615"> + <state line="38" column="13" selection-start="1586" selection-end="1586" vertical-scroll-proportion="0.1794569"> <folding /> </state> </provider> </entry> - <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java"> + <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="64" column="0" selection-start="2343" selection-end="2343" vertical-scroll-proportion="0.18673219"> + <state line="76" column="83" selection-start="2851" selection-end="2986" vertical-scroll-proportion="0.40023613"> <folding /> </state> </provider> </entry> - <entry file="jar://$PROJECT_DIR$/thirdparty/jboss-logging-spi.jar!/org/jboss/logging/Logger.class"> + <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/rest/RestDeployerHookPostJSE.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="56" column="0" selection-start="2198" selection-end="2198" vertical-scroll-proportion="0.46314496"> + <state line="43" column="76" selection-start="1701" selection-end="1701" vertical-scroll-proportion="0.6505313"> <folding /> </state> </provider> </entry> - <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java"> + <entry file="file://$PROJECT_DIR$/src/main/resources/jbossrest-context.war/WEB-INF/web.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="62" column="0" selection-start="2276" selection-end="2276" vertical-scroll-proportion="0.63329315"> + <state line="13" column="0" selection-start="456" selection-end="456" vertical-scroll-proportion="0.29161748"> <folding /> </state> </provider> </entry> - <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/rest/RestDeployerHookPostJSE.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/DescriptorDeploymentAspect.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="47" column="10" selection-start="1601" selection-end="1818" vertical-scroll-proportion="0.893848"> + <state line="42" column="13" selection-start="1619" selection-end="1619" vertical-scroll-proportion="-0.08972845"> <folding /> </state> </provider> @@ -985,69 +1166,62 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/resources/jbossrest-context.war/WEB-INF/web.xml"> + <entry file="file://$PROJECT_DIR$/src/test/resources/rest/samples/resourceview/WEB-INF/web.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="1" column="0" selection-start="44" selection-end="44" vertical-scroll-proportion="0.022432113"> <folding /> </state> </provider> </entry> - <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPostJSE.java"> + <entry file="file://$PROJECT_DIR$/src/test/resources/rest/samples/resourceview/WEB-INF/jbossrs.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="56" column="49" selection-start="2202" selection-end="2202" vertical-scroll-proportion="0.6875754"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPreJSE.java"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/deployment/DeploymentTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="105" column="0" selection-start="3744" selection-end="3744" vertical-scroll-proportion="0.1893848"> + <state line="63" column="51" selection-start="2080" selection-end="2080" vertical-scroll-proportion="0.11216056"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/resources/rest/deployment/web.xml"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="9" column="63" selection-start="338" selection-end="382" vertical-scroll-proportion="0.20627262"> + <state line="32" column="51" selection-start="849" selection-end="849" vertical-scroll-proportion="0.08028335"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/resources/rest/media/web.xml"> + <entry file="file://$PROJECT_DIR$/ant-import-tests/build-jars-rest.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="9" column="63" selection-start="382" selection-end="382" vertical-scroll-proportion="0.20627262"> + <state line="50" column="88" selection-start="2447" selection-end="2447" vertical-scroll-proportion="0.72596157"> <folding /> </state> </provider> </entry> - <entry file="jar:///home/hbraun/dev/prj/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-structure-spi.jar!/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentUnit.class"> + <entry file="file://$PROJECT_DIR$/src/test/resources/rest/samples/resourceview/WEB-INF/jboss-web.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="79" column="0" selection-start="4046" selection-end="4046" vertical-scroll-proportion="0.50982803"> + <state line="12" column="25" selection-start="324" selection-end="324" vertical-scroll-proportion="0.26918536"> <folding /> </state> </provider> </entry> - <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java"> + <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/samples/resourceview/RegistryResource.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="94" column="0" selection-start="3414" selection-end="3414" vertical-scroll-proportion="0.19244392"> + <state line="13" column="18" selection-start="408" selection-end="408" vertical-scroll-proportion="0.022836538"> <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/ResourceRegistry.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="96" column="0" selection-start="3556" selection-end="3556" vertical-scroll-proportion="0.38822114"> + <state line="33" column="13" selection-start="1237" selection-end="1237" vertical-scroll-proportion="0.24675325"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/deployment/DeploymentTestCase.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="63" column="65" selection-start="2100" selection-end="2100" vertical-scroll-proportion="0.10271547"> - <folding /> - </state> - </provider> - </entry> </component> </project> Modified: rest/src/main/distro/bin-dist-build.xml =================================================================== --- rest/src/main/distro/bin-dist-build.xml 2007-11-22 10:32:14 UTC (rev 5101) +++ rest/src/main/distro/bin-dist-build.xml 2007-11-22 17:10:00 UTC (rev 5102) @@ -150,7 +150,7 @@ </target> <target name="tests-jars" depends="tests-compile,tests-copy-resources"> - <ant antfile="${tests.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> + <ant antfile="${tests.dir}/ant-import/build-jars-rest.xml" target="build-jars-jaxws" inheritall="true"/> </target> <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> Modified: rest/src/main/java/org/jboss/rest/ResourceRegistry.java =================================================================== --- rest/src/main/java/org/jboss/rest/ResourceRegistry.java 2007-11-22 10:32:14 UTC (rev 5101) +++ rest/src/main/java/org/jboss/rest/ResourceRegistry.java 2007-11-22 17:10:00 UTC (rev 5102) @@ -23,10 +23,7 @@ import org.jboss.rest.model.ResourceModel; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Register root resources for webContext's. @@ -53,5 +50,16 @@ return webContextMapping.get(webContext); } - + + public void clearContext(String context) + { + assert webContextMapping.keySet().contains(context); + webContextMapping.remove(context); + } + + public Set<String> getContexts() + { + return webContextMapping.keySet(); + } + } Modified: rest/src/main/java/org/jboss/rest/container/wsf/DescriptorDeploymentAspect.java =================================================================== --- rest/src/main/java/org/jboss/rest/container/wsf/DescriptorDeploymentAspect.java 2007-11-22 10:32:14 UTC (rev 5101) +++ rest/src/main/java/org/jboss/rest/container/wsf/DescriptorDeploymentAspect.java 2007-11-22 17:10:00 UTC (rev 5102) @@ -29,6 +29,7 @@ import org.jboss.wsf.spi.deployment.*; import java.io.IOException; +import java.net.URL; /** * Parses the jbossrs descriptor and turns it into a @@ -49,7 +50,8 @@ try { UnifiedVirtualFile vf = getJBossRSDescriptor(deployment); - JbossrsType dd = DeploymentDescriptorParser.read(vf.toURL().openStream()); + URL url = vf.toURL(); + JbossrsType dd = DeploymentDescriptorParser.read(url.openStream()); // keep the DD model deployment.addAttachment(JbossrsType.class, dd); Modified: rest/src/main/java/org/jboss/rest/container/wsf/ModelDeploymentAspect.java =================================================================== --- rest/src/main/java/org/jboss/rest/container/wsf/ModelDeploymentAspect.java 2007-11-22 10:32:14 UTC (rev 5101) +++ rest/src/main/java/org/jboss/rest/container/wsf/ModelDeploymentAspect.java 2007-11-22 17:10:00 UTC (rev 5102) @@ -41,9 +41,9 @@ { Service service = deployment.getService(); - String contextRoot = service.getContextRoot(); + String webContext = service.getContextRoot(); - if(null == contextRoot) + if(null == webContext) throw new IllegalArgumentException("Null context root"); ResourceRegistry registry = ResourceRegistryFactory.newInstance().createResourceRegistry(); @@ -57,7 +57,7 @@ { Class c = runtimeLoader.loadClass(ep.getTargetBeanName()); ResourceModel rootResource = parser.parse(c); - registry.addResourceModelForContext(contextRoot, rootResource); + registry.addResourceModelForContext(webContext, rootResource); } catch (Exception e) { @@ -67,4 +67,14 @@ } } + + public void destroy(Deployment deployment) + { + Service service = deployment.getService(); + String webContext = service.getContextRoot(); + ResourceRegistry registry = ResourceRegistryFactory.newInstance().createResourceRegistry(); + registry.clearContext(webContext); + + super.destroy(deployment); + } } 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-22 10:32:14 UTC (rev 5101) +++ rest/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java 2007-11-22 17:10:00 UTC (rev 5102) @@ -138,7 +138,7 @@ private void parseAcceptHeader(HttpServletRequest req, RuntimeContext rt) throws ServletException { String requestAccept = req.getHeader("Accept"); if(requestAccept!=null) - rt.parseAcceptHeader("text/plain, text/html"); + rt.parseAcceptHeader(requestAccept); else throw new ServletException("Accept header is missing"); } Deleted: rest/src/main/java/org/jboss/rest/container/wsf/ResourceViewServlet.java =================================================================== --- rest/src/main/java/org/jboss/rest/container/wsf/ResourceViewServlet.java 2007-11-22 10:32:14 UTC (rev 5101) +++ rest/src/main/java/org/jboss/rest/container/wsf/ResourceViewServlet.java 2007-11-22 17:10:00 UTC (rev 5102) @@ -1,19 +0,0 @@ -package org.jboss.rest.container.wsf; - -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import java.io.IOException; -import java.io.PrintWriter; - -public class ResourceViewServlet extends HttpServlet -{ - - protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException - { - PrintWriter writer = res.getWriter(); - writer.write("ResourceViewServlet"); - writer.close(); - } -} Modified: rest/src/main/java/org/jboss/rest/model/dd/DeploymentDescriptorParser.java =================================================================== --- rest/src/main/java/org/jboss/rest/model/dd/DeploymentDescriptorParser.java 2007-11-22 10:32:14 UTC (rev 5101) +++ rest/src/main/java/org/jboss/rest/model/dd/DeploymentDescriptorParser.java 2007-11-22 17:10:00 UTC (rev 5102) @@ -50,6 +50,10 @@ { throw new RuntimeException("Failed to unmarshall container descriptor", e); } + finally + { + inputStream.close(); + } } public static void write(JbossrsType dd, OutputStream outputStream) Modified: rest/src/main/resources/jbossrest-context.war/WEB-INF/web.xml =================================================================== --- rest/src/main/resources/jbossrest-context.war/WEB-INF/web.xml 2007-11-22 10:32:14 UTC (rev 5101) +++ rest/src/main/resources/jbossrest-context.war/WEB-INF/web.xml 2007-11-22 17:10:00 UTC (rev 5102) @@ -10,64 +10,16 @@ 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> + <display-name>JBossRest</display-name> - <servlet> - <servlet-name>ResourceViewServlet</servlet-name> - <servlet-class>org.jboss.rest.container.wsf.ResourceViewServlet</servlet-class> - </servlet> - - <!-- now the mappings --> - - <servlet-mapping> - <servlet-name>ResourceViewServlet</servlet-name> - <url-pattern>/resources/*</url-pattern> - </servlet-mapping> - - - <!-- A security constraint that restricts access - <security-constraint> - <web-resource-collection> - <web-resource-name>ContextServlet</web-resource-name> - <description>An example security config that only allows users with the - role 'friend' to access the JBossWS console web application - </description> - <url-pattern>/*</url-pattern> - <http-method>GET</http-method> - <http-method>POST</http-method> - </web-resource-collection> - <auth-constraint> - <role-name>friend</role-name> - </auth-constraint> - </security-constraint> + <!-- + currently the W3C haven't settled on a media type for WSDL; + http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft + for now we go with the basic 'it's XML' response --> + + <welcome-file-list id="WelcomeFileList"> + <welcome-file>index.html</welcome-file> + </welcome-file-list> - <login-config> - <auth-method>BASIC</auth-method> - <realm-name>JBossWS Management Console</realm-name> - </login-config> - - <security-role> - <role-name>friend</role-name> - </security-role> - - <!-- - currently the W3C haven't settled on a media type for WSDL; - http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft - for now we go with the basic 'it's XML' response - --> - <mime-mapping> - <extension>wsdl</extension> - <mime-type>text/xml</mime-type> - </mime-mapping> - - <mime-mapping> - <extension>xsd</extension> - <mime-type>text/xml</mime-type> - </mime-mapping> - - <welcome-file-list id="WelcomeFileList"> - <welcome-file>index.html</welcome-file> - </welcome-file-list> - </web-app> Modified: rest/src/main/resources/jbossrest-context.war/index.html =================================================================== --- rest/src/main/resources/jbossrest-context.war/index.html 2007-11-22 10:32:14 UTC (rev 5101) +++ rest/src/main/resources/jbossrest-context.war/index.html 2007-11-22 17:10:00 UTC (rev 5102) @@ -1,11 +1,11 @@ <html><head> <meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'> -<title>JBossRS</title> +<title>JBoss REST</title> <link rel='stylesheet' href='./styles.css'> </head> <body> -<div class='pageHeader'>Welcome to JBoss RESTful services</div> +<h1>Welcome to JBoss REST </h1> </body> </html> 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-22 10:32:14 UTC (rev 5101) +++ rest/src/test/java/org/jboss/test/rest/deployment/DeploymentTestCase.java 2007-11-22 17:10:00 UTC (rev 5102) @@ -39,7 +39,7 @@ { public static Test suite() { - return new RestTestSetup(DeploymentTestCase.class, "jbossrs-deployment.war"); + return new RestTestSetup(DeploymentTestCase.class, "rest-deployment.war"); } /** @@ -48,7 +48,7 @@ */ public void testRequest1() throws Exception { - URL url = new URL("http://localhost:8080/jbossrs-deployment/widgets"); + URL url = new URL("http://localhost:8080/rest-deployment/widgets"); String response = doTextPlainRequest(url, null); assertNotNull(response); assertEquals("A widgetlist", response); @@ -61,7 +61,7 @@ */ public void testRequest2() throws Exception { - URL url = new URL("http://localhost:8080/jbossrs-deployment/widgets/123/id"); + URL url = new URL("http://localhost:8080/rest-deployment/widgets/123/id"); String response = doTextPlainRequest(url, null); assertNotNull(response); assertEquals("123", response); Modified: rest/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java =================================================================== --- rest/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java 2007-11-22 10:32:14 UTC (rev 5101) +++ rest/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java 2007-11-22 17:10:00 UTC (rev 5102) @@ -20,7 +20,7 @@ { public static Test suite() { - return new RestTestSetup(MediaTypeTestCase.class, "jbossrs-mediatype.war"); + return new RestTestSetup(MediaTypeTestCase.class, "rest-mediatype.war"); } /** @@ -30,7 +30,7 @@ */ public void testRequest1() throws Exception { - URL url = new URL("http://localhost:8080/jbossrs-mediatype/books/3897217279"); + URL url = new URL("http://localhost:8080/rest-mediatype/books/3897217279"); Object response = doMediaRequest(url, null); assertNotNull(response ); Modified: rest/src/test/java/org/jboss/test/rest/model/RunRegex.java =================================================================== --- rest/src/test/java/org/jboss/test/rest/model/RunRegex.java 2007-11-22 10:32:14 UTC (rev 5101) +++ rest/src/test/java/org/jboss/test/rest/model/RunRegex.java 2007-11-22 17:10:00 UTC (rev 5102) @@ -24,6 +24,9 @@ import java.net.URI; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.Collection; +import java.util.List; +import java.util.ArrayList; /** * @author Heiko.Braun(a)jboss.com @@ -34,7 +37,7 @@ public static void main(String[] args) throws Exception { - URI uri = new URI("http://jboss.com/widgets/special"); + /*URI uri = new URI("http://jboss.com/widgets/special"); System.out.println(uri.getPath()); String s = "spec"; @@ -56,8 +59,20 @@ System.out.println("! "+matchingGroups); System.out.println("< "+m.group(m.groupCount())); - System.out.println("---"); + System.out.println("---"); */ + List<String> l = new ArrayList<String>(); + Class type = getComponentType(l); + System.out.println(type); + System.out.println( type == String.class ); + } + + public static Class getComponentType(Collection<?> c) + { + System.out.println(c.getClass().getConstructors()[0].getParameterTypes()); + return c.getClass(); + } + } Added: rest/src/test/java/org/jboss/test/rest/samples/resourceview/RegistryResource.java =================================================================== --- rest/src/test/java/org/jboss/test/rest/samples/resourceview/RegistryResource.java (rev 0) +++ rest/src/test/java/org/jboss/test/rest/samples/resourceview/RegistryResource.java 2007-11-22 17:10:00 UTC (rev 5102) @@ -0,0 +1,87 @@ +package org.jboss.test.rest.samples.resourceview; + +import org.jboss.rest.ResourceRegistryFactory; +import org.jboss.rest.ResourceRegistry; +import org.jboss.rest.model.ResourceModel; +import org.jboss.rest.model.ResourceMethod; +import org.jboss.rest.model.ResourceLocator; + +import javax.ws.rs.UriTemplate; +import javax.ws.rs.HttpMethod; +import javax.ws.rs.ProduceMime; +import java.util.List; + +@UriTemplate("view") +public class RegistryResource +{ + @HttpMethod + @ProduceMime("text/html") + public String getResources() + { + StringBuffer sb = new StringBuffer(); + + ResourceRegistry registry = ResourceRegistryFactory.newInstance().createResourceRegistry(); + + sb.append("<html><body>"); + sb.append("<h1>Root resources</h1>"); + + sb.append("<table border=1>"); + sb.append("<th colspan=2>Root resource</th><th>Resource methods</th><th>Locator</th><th>Sub resource methods</th>"); + + for(String context : registry.getContexts()) + { + List<ResourceModel> resources = registry.getResourceModelsForContext(context); + sb.append("<tr><td colspan=5><h2>").append(context).append("</h2></td></tr>"); + + for(ResourceModel model : resources) + { + sb.append("<tr valign=top>"); + sb.append("<td colspan=2>"); + sb.append("<ul>"); + sb.append("<li><b>").append(model.getUriTemplate()).append("</b></br>"); + sb.append(model.getInvocationTarget()); + sb.append("</ul>"); + sb.append("</td>"); + + // resource methods + sb.append("<td><ul>"); + for(ResourceMethod m : model.getResourceMethods()) + { + sb.append("<li><b>"); + sb.append(m.getMethodHTTP()).append(": ").append(m.getUriTemplate()).append("</b><br>"); + sb.append("Produces: ").append(m.getProduceMimeTypes()).append("<br>"); + sb.append("Consumes: ").append(m.getConsumeMimeTypes()).append("<br>"); + } + sb.append("</ul></td>"); + + // locators + sb.append("<td><ul>"); + for(ResourceLocator l : model.getResourceLocator()) + { + sb.append("<li><b>"); + sb.append(l.getUriTemplate()).append("</b><br>"); + sb.append("Locates: ").append(l.field().getInvocationTarget()); + } + sb.append("</ul>&nbsp;</td>"); + + // subresource methods + sb.append("<td><ul>"); + for(ResourceMethod m : model.getSubResourceMethods()) + { + sb.append("<li><b>"); + sb.append(m.getMethodHTTP()).append(": ").append(m.getUriTemplate()).append("</b><br>"); + sb.append("Produces: ").append(m.getProduceMimeTypes()).append("<br>"); + sb.append("Consumes: ").append(m.getConsumeMimeTypes()).append("<br>"); + } + sb.append("</ul>&nbsp;</td>"); + + sb.append("</tr>"); + } + + } + + sb.append("</table>"); + sb.append("</body></html>"); + return sb.toString(); + } +} Property changes on: rest/src/test/java/org/jboss/test/rest/samples/resourceview/RegistryResource.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: rest/src/test/resources/rest/samples/resourceview/WEB-INF/jboss-web.xml =================================================================== --- rest/src/test/resources/rest/samples/resourceview/WEB-INF/jboss-web.xml (rev 0) +++ rest/src/test/resources/rest/samples/resourceview/WEB-INF/jboss-web.xml 2007-11-22 17:10:00 UTC (rev 5102) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<!DOCTYPE jboss-web + PUBLIC "-//JBoss//DTD Web Application 2.3V2//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_3_2.dtd"> + +<jboss-web> + + <!-- A security domain that restricts access + <security-domain>java:/jaas/JBossWS</security-domain> + --> + + <context-root>resources</context-root> + +</jboss-web> Property changes on: rest/src/test/resources/rest/samples/resourceview/WEB-INF/jboss-web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: rest/src/test/resources/rest/samples/resourceview/WEB-INF/jbossrs.xml =================================================================== --- rest/src/test/resources/rest/samples/resourceview/WEB-INF/jbossrs.xml (rev 0) +++ rest/src/test/resources/rest/samples/resourceview/WEB-INF/jbossrs.xml 2007-11-22 17:10:00 UTC (rev 5102) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> + +<jbossrs xmlns="http://org.jboss.rest/"> + <resource> + <name>Registry</name> + <implementation>org.jboss.test.rest.samples.resourceview.RegistryResource</implementation> + </resource> +</jbossrs> Property changes on: rest/src/test/resources/rest/samples/resourceview/WEB-INF/jbossrs.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: rest/src/test/resources/rest/samples/resourceview/WEB-INF/web.xml =================================================================== --- rest/src/test/resources/rest/samples/resourceview/WEB-INF/web.xml (rev 0) +++ rest/src/test/resources/rest/samples/resourceview/WEB-INF/web.xml 2007-11-22 17:10:00 UTC (rev 5102) @@ -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/samples/resourceview/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF