Author: heiko.braun(a)jboss.com Date: 2007-08-01 10:55:50 -0400 (Wed, 01 Aug 2007) New Revision: 4058 Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/CalculatorBean.java Modified: trunk/JBossWS-Trunk.iws trunk/integration/sunri/int-sunri.iml trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java Log: Update WSProvideTestCase for Sun-RI Modified: trunk/JBossWS-Trunk.iws =================================================================== --- trunk/JBossWS-Trunk.iws 2007-08-01 14:52:29 UTC (rev 4057) +++ trunk/JBossWS-Trunk.iws 2007-08-01 14:55:50 UTC (rev 4058) @@ -20,16 +20,16 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/ant-import/build-testsuite.xml" afterPath="$PROJECT_DIR$/build/ant-import/build-testsuite.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/spi/build.xml" afterPath="$PROJECT_DIR$/integration/spi/build.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jbossws-core/ant-import-tests/build-testsuite.xml" afterPath="$PROJECT_DIR$/jbossws-core/ant-import-tests/build-testsuite.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/sunri/ant-import/build-testsuite.xml" afterPath="$PROJECT_DIR$/integration/sunri/ant-import/build-testsuite.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/native/ant-import/build-testsuite.xml" afterPath="$PROJECT_DIR$/integration/native/ant-import/build-testsuite.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/sunri/int-sunri.iml" afterPath="$PROJECT_DIR$/integration/sunri/int-sunri.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/xfire/build.xml" afterPath="$PROJECT_DIR$/integration/xfire/build.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/CalculatorBean.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/sunri/ant-import/macros-deploy-sunri.xml" afterPath="$PROJECT_DIR$/integration/sunri/ant-import/macros-deploy-sunri.xml" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_0.dtd" afterPath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_0.dtd" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/sunri/ant-import/build-thirdparty.xml" afterPath="$PROJECT_DIR$/integration/sunri/ant-import/build-thirdparty.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/xfire/ant-import/macros-deploy-xfire.xml" afterPath="$PROJECT_DIR$/integration/xfire/ant-import/macros-deploy-xfire.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/sunri/build.xml" afterPath="$PROJECT_DIR$/integration/sunri/build.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_2.dtd" afterPath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_2.dtd" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/integration/spi/src/main/etc/default.mf" /> </list> </component> <component name="ChangeListSynchronizer" /> @@ -205,7 +205,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java" line="63" class="org.jboss.ws.integration.ResourceLoaderAdapter" package="org.jboss.ws.integration"> + <breakpoint url="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java" line="97" class="com.sun.tools.ws.processor.modeler.annotation.WebServiceWrapperGenerator" package="com.sun.tools.ws.processor.modeler.annotation"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -218,7 +218,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java" line="97" class="com.sun.tools.ws.processor.modeler.annotation.WebServiceWrapperGenerator" package="com.sun.tools.ws.processor.modeler.annotation"> + <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java" line="193" class="org.jboss.test.ws.jaxws.tools.WSConsumerTestCase" package="org.jboss.test.ws.jaxws.tools"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -231,7 +231,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java" line="193" class="org.jboss.test.ws.jaxws.tools.WSConsumerTestCase" package="org.jboss.test.ws.jaxws.tools"> + <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java" line="257" class="org.jboss.test.ws.jaxws.tools.WSConsumerTestCase" package="org.jboss.test.ws.jaxws.tools"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -244,7 +244,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java" line="257" class="org.jboss.test.ws.jaxws.tools.WSConsumerTestCase" package="org.jboss.test.ws.jaxws.tools"> + <breakpoint url="file://$PROJECT_DIR$/jbossws-core/src/main/java/javax/xml/ws/spi/ProviderLoader.java" line="72" class="javax.xml.ws.spi.ProviderLoader" package="javax.xml.ws.spi"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -257,7 +257,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/common/ServiceLoader.java" line="60" class="org.jboss.wsf.common.ServiceLoader" package="org.jboss.wsf.common"> + <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java" line="115" class="org.jboss.test.ws.jaxws.tools.WSProvideTestCase" package="org.jboss.test.ws.jaxws.tools"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -270,6 +270,45 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> + <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java" line="80" class="org.jboss.test.ws.jaxws.tools.WSProvideTestCase" package="org.jboss.test.ws.jaxws.tools"> + <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://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java" line="83" class="org.jboss.test.ws.jaxws.tools.WSProvideTestCase" package="org.jboss.test.ws.jaxws.tools"> + <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/jaxws-2.1.1/src/com/sun/tools/ws/wscompile/WsgenTool.java" line="91" class="com.sun.tools.ws.wscompile.WsgenTool" package="com.sun.tools.ws.wscompile"> + <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> @@ -338,15 +377,89 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="build-testsuite.xml" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/integration/xfire/ant-import/build-testsuite.xml"> + <file leaf-file-name="SunRIProviderImpl.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="44" column="36" selection-start="2341" selection-end="2341" vertical-scroll-proportion="0.53995156"> + <state line="182" column="34" selection-start="5521" selection-end="5521" vertical-scroll-proportion="0.6294046"> <folding /> </state> </provider> </entry> </file> + <file leaf-file-name="WsgenTool.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/wscompile/WsgenTool.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="335" column="113" selection-start="13365" selection-end="13395" vertical-scroll-proportion="5.9764853"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="WebServiceVisitor.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceVisitor.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="352" column="18" selection-start="15735" selection-end="15735" vertical-scroll-proportion="0.33415842"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ModelBuilder.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/ModelBuilder.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="56" column="18" selection-start="2306" selection-end="2306" vertical-scroll-proportion="0.60024303"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="WebServiceWrapperGenerator.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="69" column="28" selection-start="2591" selection-end="2591" vertical-scroll-proportion="0.31064355"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="WebServiceAP.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceAP.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="106" column="19" selection-start="3831" selection-end="3831" vertical-scroll-proportion="0.19183168"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="AnnotationProcessorContext.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/AnnotationProcessorContext.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="41" column="13" selection-start="1444" selection-end="1444" vertical-scroll-proportion="0.09234508"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="WsimportListener.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/wscompile/WsimportListener.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="28" column="13" selection-start="934" selection-end="934" vertical-scroll-proportion="0.20777643"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="CalculatorBean.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/CalculatorBean.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="41" column="0" selection-start="1361" selection-end="1361" vertical-scroll-proportion="0.48481166"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> </leaf> </component> <component name="FindManager"> @@ -439,6 +552,14 @@ <option name="myItemId" value="JBossWS-Trunk.ipr" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="testsuite" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -446,9 +567,21 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="spi" /> + <option name="myItemId" value="testsuite" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -456,14 +589,196 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="spi" /> + <option name="myItemId" value="testsuite" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/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$/testsuite/src/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$/testsuite/src/java/org/jboss/test/ws" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="testsuite" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/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$/testsuite/src/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$/testsuite/src/java/org/jboss/test/ws" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="testsuite" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/ant-import" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="build" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="build" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/build" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="build" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/build" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/build/ant-import" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> </subPane> </component> <component name="ProjectReloadState"> @@ -530,17 +845,24 @@ </component> <component name="RestoreUpdateTree" /> <component name="RunManager" selected="Remote.client"> - <tempConfiguration default="false" name="Comparator" type="Application" factoryName="Application" enabled="false" merge="false"> - <option name="MAIN_CLASS_NAME" value="org.jboss.test.ws.jaxws.tools.Comparator" /> + <tempConfiguration default="false" name="WSProvideTestCase.testOutputDirectory" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> + <pattern value="org.jboss.test.ws.jaxws.tools.*" /> + <module name="testsuite" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="PACKAGE_NAME" value="org.jboss.test.ws.jaxws.tools" /> + <option name="MAIN_CLASS_NAME" value="org.jboss.test.ws.jaxws.tools.WSProvideTestCase" /> + <option name="METHOD_NAME" value="testOutputDirectory" /> + <option name="TEST_OBJECT" value="method" /> <option name="VM_PARAMETERS" /> - <option name="PROGRAM_PARAMETERS" /> + <option name="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="testsuite" /> + <option name="ADDITIONAL_CLASS_PATH" /> + <option name="TEST_SEARCH_SCOPE"> + <value defaultName="wholeProject" /> + </option> <RunnerSettings RunnerId="Debug"> - <option name="DEBUG_PORT" value="36149" /> + <option name="DEBUG_PORT" value="60976" /> <option name="TRANSPORT" value="0" /> <option name="LOCAL" value="true" /> </RunnerSettings> @@ -731,7 +1053,7 @@ </component> <component name="ToolWindowManager"> <frame x="0" y="25" width="1680" height="1000" extended-state="0" /> - <editor active="false" /> + <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" /> @@ -742,7 +1064,7 @@ <window_info id="simpleUML" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <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="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.27592593" order="0" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25432098" order="0" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.51376146" order="2" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25617284" order="2" /> <window_info id="soapUI Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> @@ -750,7 +1072,7 @@ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38417432" order="1" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39793578" order="4" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32912844" order="8" /> - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25555557" order="1" /> + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25555557" 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="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298397" order="3" /> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> @@ -779,7 +1101,7 @@ <option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" /> <option name="PUT_FOCUS_INTO_COMMENT" value="false" /> <option name="FORCE_NON_EMPTY_COMMENT" value="false" /> - <option name="LAST_COMMIT_MESSAGE" /> + <option name="LAST_COMMIT_MESSAGE" value="Display information about output and source directories being used" /> <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" /> <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" /> <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" /> @@ -792,6 +1114,7 @@ <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" /> + <MESSAGE value="Display information about output and source directories being used" /> </component> <component name="VssConfiguration"> <option name="CLIENT_PATH" value="" /> @@ -839,113 +1162,115 @@ </component> <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.322179,0.5" version="1"> <option name="myPlainMode" value="false" /> - <option name="myLastEditedConfigurable" value="jbossws-core" /> + <option name="myLastEditedConfigurable" value="int-sunri" /> </component> <component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="0.16666667" version="1"> <option name="myLastEditedConfigurable" value="IDE Profiles" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/common/ServiceLoader.java"> + <entry file="file://$PROJECT_DIR$/build/ant.properties.example"> <provider selected="true" editor-type-id="text-editor"> - <state line="60" column="0" selection-start="2482" selection-end="2482" vertical-scroll-proportion="0.19007264"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/xfire/ant-import/build-thirdparty.xml"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/management/ContextServlet.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="61" column="41" selection-start="4394" selection-end="4394" vertical-scroll-proportion="0.7820823"> + <state line="176" column="12" selection-start="6518" selection-end="6518" vertical-scroll-proportion="0.7514863"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/xfire/src/test/resources/test-excludes-jboss42.txt"> + <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="56" column="96" selection-start="1942" selection-end="1942" vertical-scroll-proportion="0.79809976"> + <state line="32" column="35" selection-start="1347" selection-end="1347" vertical-scroll-proportion="0.24851367"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/xfire/src/test/resources/test-excludes-jboss50.txt"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProvider.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="56" column="96" selection-start="1846" selection-end="1942" vertical-scroll-proportion="0.79809976"> + <state line="46" column="36" selection-start="1534" selection-end="1534" vertical-scroll-proportion="0.3329298"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/native/ant-import/build-thirdparty.xml"> + <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/CalculatorBean.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> - <folding /> + <state line="41" column="0" selection-start="1361" selection-end="1361" vertical-scroll-proportion="0.48481166"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/etc/default.mf"> + <entry file="jar://$PROJECT_DIR$/integration/sunri/thirdparty/jaxws-tools.jar!/com/sun/tools/ws/wscompile/WsgenTool.class"> <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="17" column="10" selection-start="898" selection-end="898" vertical-scroll-proportion="0.3329298"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/build.xml"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/wscompile/WsimportListener.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="74" column="34" selection-start="3586" selection-end="3586" vertical-scroll-proportion="0.30992737"> + <state line="28" column="13" selection-start="934" selection-end="934" vertical-scroll-proportion="0.20777643"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/native/ant-import/build-testsuite.xml"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/AnnotationProcessorContext.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="11" column="0" selection-start="486" selection-end="486" vertical-scroll-proportion="0.25302663"> + <state line="41" column="13" selection-start="1444" selection-end="1444" vertical-scroll-proportion="0.09234508"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/jbossws-core/ant-import-tests/build-testsuite.xml"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="74" column="84" selection-start="3477" selection-end="3477" vertical-scroll-proportion="-1.5411623"> + <state line="69" column="28" selection-start="2591" selection-end="2591" vertical-scroll-proportion="0.31064355"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/build/ant-import/build-testsuite.xml"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceVisitor.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="131" column="36" selection-start="5806" selection-end="5828" vertical-scroll-proportion="0.5290557"> + <state line="352" column="18" selection-start="15735" selection-end="15735" vertical-scroll-proportion="0.33415842"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/etc/default.mf"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/ModelBuilder.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="10" column="64" selection-start="524" selection-end="524" vertical-scroll-proportion="0.22592153"> + <state line="56" column="18" selection-start="2306" selection-end="2306" vertical-scroll-proportion="0.60024303"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/native/build.xml"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceAP.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="42" column="29" selection-start="2464" selection-end="2464" vertical-scroll-proportion="0.0"> + <state line="106" column="19" selection-start="3831" selection-end="3831" vertical-scroll-proportion="0.19183168"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/sunri/ant-import/build-thirdparty.xml"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/wscompile/WsgenTool.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="20" selection-start="1406" selection-end="1406" vertical-scroll-proportion="0.13801453"> + <state line="335" column="113" selection-start="13365" selection-end="13395" vertical-scroll-proportion="5.9764853"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/sunri/ant-import/build-testsuite.xml"> + <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="12" column="2" selection-start="491" selection-end="491" vertical-scroll-proportion="-0.311138"> + <state line="188" column="16" selection-start="5832" selection-end="5832" vertical-scroll-proportion="0.42284325"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/xfire/ant-import/build-testsuite.xml"> + <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="44" column="36" selection-start="2341" selection-end="2341" vertical-scroll-proportion="0.53995156"> + <state line="182" column="34" selection-start="5521" selection-end="5521" vertical-scroll-proportion="0.6294046"> <folding /> </state> </provider> Modified: trunk/integration/sunri/int-sunri.iml =================================================================== --- trunk/integration/sunri/int-sunri.iml 2007-08-01 14:52:29 UTC (rev 4057) +++ trunk/integration/sunri/int-sunri.iml 2007-08-01 14:55:50 UTC (rev 4058) @@ -8,26 +8,17 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="spi" /> + <orderEntry type="module" module-name="sunri-sources" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jaxws-tools.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/jaxb-xjc.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="spi" /> - <orderEntry type="module" module-name="sunri-sources" /> <orderEntry type="module-library"> <library> <CLASSES> @@ -67,15 +58,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jaxws-rt.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/saaj-api.jar!/" /> </CLASSES> <JAVADOC /> @@ -199,7 +181,6 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="library" name="jboss-logging-spi" level="project" /> <orderEntryProperties /> </component> </module> Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/CalculatorBean.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/CalculatorBean.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/CalculatorBean.java 2007-08-01 14:55:50 UTC (rev 4058) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.tools; + +import javax.jws.WebService; +import javax.jws.WebMethod; + +@WebService(targetNamespace = "http://foo.bar.com/calculator") +public class CalculatorBean +{ + @WebMethod + public int add(int a, int b) + { + return a+b; + } + + @WebMethod + public int subtract(int a, int b) + { + return a-b; + } +} Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/CalculatorBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java 2007-08-01 14:52:29 UTC (rev 4057) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java 2007-08-01 14:55:50 UTC (rev 4058) @@ -24,6 +24,7 @@ import junit.framework.TestCase; import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.spi.tools.WSContractProvider; +import org.jboss.wsf.test.JBossWSTest; import org.w3c.dom.Element; import javax.jws.WebMethod; @@ -40,7 +41,7 @@ * @author Heiko.Braun(a)jboss.com * @version $Revision$ */ -public class WSProvideTestCase extends TestCase +public class WSProvideTestCase extends JBossWSTest { // tools delegate WSContractProvider provider; @@ -139,13 +140,13 @@ { File wsdl = new File( outputDirectory.getAbsolutePath()+ - "/WSProvideTestCase$CalculatorBeanService.wsdl" + "/CalculatorBeanService.wsdl" ); assertTrue("WSDL not generated", wsdl.exists()); Element root = DOMUtils.parse( new FileInputStream(wsdl)); Element serviceElement = DOMUtils.getFirstChildElement(root, "service"); - assertEquals(serviceElement.getAttribute("name"), "WSProvideTestCase$CalculatorBeanService"); + assertEquals(serviceElement.getAttribute("name"), "CalculatorBeanService"); } /** @@ -181,6 +182,13 @@ */ public void testMessageStream() throws Exception { + + if(isIntegrationSunRI()) + { + System.out.println("FIXME [JBWS-1777]: WSProvide output is not correctly redirected"); + return; + } + ByteArrayOutputStream bout = new ByteArrayOutputStream(); PrintStream pout = new PrintStream(bout); @@ -204,19 +212,4 @@ provider.provide(CalculatorBean.class); } - @WebService(targetNamespace = "http://foo.bar.com/calculator") - public class CalculatorBean - { - @WebMethod - public int add(int a, int b) - { - return a+b; - } - - @WebMethod - public int subtract(int a, int b) - { - return a-b; - } - } }