[jbossws-commits] JBossWS SVN: r4083 - in trunk: build/ant-import and 7 other directories.

Author: heiko.braun(a)jboss.com Date: 2007-08-02 05:57:42 -0400 (Thu, 02 Aug 2007) New Revision: 4083 Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBean.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java trunk/testsuite/src/resources/jaxws/smoke/ trunk/testsuite/src/resources/jaxws/smoke/tools/ trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/ trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestService.wsdl trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/async-binding.xml trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/jax-ws-catalog.xml trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/ws-addr-wsdl.xsd Removed: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/ trunk/testsuite/src/resources/jaxws/tools/ Modified: trunk/JBossWS-Trunk.iws trunk/build/ant-import/build-testsuite.xml Log: Created smoke tests package and corresponding build target Modified: trunk/JBossWS-Trunk.iws =================================================================== --- trunk/JBossWS-Trunk.iws 2007-08-02 09:36:42 UTC (rev 4082) +++ trunk/JBossWS-Trunk.iws 2007-08-02 09:57:42 UTC (rev 4083) @@ -21,14 +21,20 @@ <component name="ChangeListManager"> <list default="true" name="Default" comment=""> <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/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="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestService.wsdl" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools/wsdl/async-binding.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools/wsdl" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools/wsdl/jax-ws-catalog.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBean.java" /> <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/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="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools/wsdl/ws-addr-wsdl.xsd" /> <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" /> </list> </component> @@ -218,7 +224,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/smoke/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 +237,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$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/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" /> @@ -257,7 +263,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/WSProvideTestCase.java" line="115" class="org.jboss.test.ws.jaxws.tools.WSProvideTestCase" package="org.jboss.test.ws.jaxws.tools"> + <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java" line="112" 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,7 +276,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/WSProvideTestCase.java" line="80" class="org.jboss.test.ws.jaxws.tools.WSProvideTestCase" package="org.jboss.test.ws.jaxws.tools"> + <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java" line="77" 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" /> @@ -283,7 +289,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/WSProvideTestCase.java" line="83" class="org.jboss.test.ws.jaxws.tools.WSProvideTestCase" package="org.jboss.test.ws.jaxws.tools"> + <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/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" /> @@ -377,84 +383,50 @@ </component> <component name="FileEditorManager"> <leaf> - <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"> + <file leaf-file-name="build-testsuite.xml" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/build/ant-import/build-testsuite.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="182" column="34" selection-start="5521" selection-end="5521" vertical-scroll-proportion="0.6294046"> + <state line="398" column="14" selection-start="19181" selection-end="19181" vertical-scroll-proportion="0.748184"> <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"> + <file leaf-file-name="ant.properties" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/build/ant.properties"> <provider selected="true" editor-type-id="text-editor"> - <state line="335" column="113" selection-start="13365" selection-end="13395" vertical-scroll-proportion="5.9764853"> + <state line="47" column="26" selection-start="1533" selection-end="1558" vertical-scroll-proportion="0.50297266"> <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"> + <file leaf-file-name="WSConsumerTestCase.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.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"> + <state line="281" column="46" selection-start="10059" selection-end="10059" vertical-scroll-proportion="0.7699758"> <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"> + <file leaf-file-name="WSProvideTestCase.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.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"> + <state line="100" column="42" selection-start="2978" selection-end="2978" vertical-scroll-proportion="0.4233056"> <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"> + <file leaf-file-name="build-testsuite.xml" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/native/ant-import/build-testsuite.xml"> <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"> + <state line="26" column="20" selection-start="1252" selection-end="1252" vertical-scroll-proportion="0.59806293"> <folding> - <element signature="imports" expanded="true" /> + <marker date="1186047277000" expanded="true" signature="1397:2394" placeholder="..." /> + <marker date="1186047277000" expanded="true" signature="1397:1960" placeholder="..." /> + <marker date="1186047277000" expanded="true" signature="1397:1774" placeholder="..." /> </folding> </state> </provider> @@ -473,7 +445,7 @@ <option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" /> </component> <component name="HighlightingSettingsPerFile"> - <setting file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java" root0="SKIP_INSPECTION" /> + <setting file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java" root0="SKIP_INSPECTION" /> </component> <component name="InspectionManager"> <option name="AUTOSCROLL_TO_SOURCE" value="false" /> @@ -542,10 +514,6 @@ <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> <PATH> <PATH_ELEMENT> @@ -553,154 +521,6 @@ <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> - <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/resources" /> - <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_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> @@ -792,7 +612,7 @@ <showLibraryContents /> <hideEmptyPackages PackagesPane="false" ProjectPane="false" /> <abbreviatePackageNames /> - <showStructure ProjectPane="false" PackagesPane="false" Favorites="false" /> + <showStructure Scope="false" ProjectPane="false" PackagesPane="false" Favorites="false" /> <autoscrollToSource /> <autoscrollFromSource /> <sortByType /> @@ -815,10 +635,10 @@ <property name="cvs_file_history_treeWidth0" value="391" /> <property name="cvs_file_history_treeWidth1" value="391" /> <property name="cvs_file_history_treeWidth2" value="391" /> - <property name="cvs_file_history_flatWidth2" value="391" /> <property name="cvs_file_history_treeWidth3" value="391" /> - <property name="cvs_file_history_flatWidth3" value="391" /> + <property name="cvs_file_history_flatWidth2" value="391" /> <property name="cvs_file_history_treeOrder0" value="0" /> + <property name="cvs_file_history_flatWidth3" value="391" /> <property name="MemberChooser.showClasses" value="true" /> <property name="cvs_file_history_flatWidth0" value="391" /> <property name="cvs_file_history_flatWidth1" value="391" /> @@ -836,11 +656,11 @@ <recent name="org.jboss.wsf.stack.xfire" /> </key> <key name="MoveClassesOrPackagesDialog.RECENTS_KEY"> + <recent name="org.jboss.test.ws.jaxws.smoke" /> <recent name="org.jboss.wsf.framework.deployment" /> <recent name="org.jboss.wsf.common" /> <recent name="org.jboss.wsf.spi.invocation" /> <recent name="org.jboss.ws.core.server" /> - <recent name="org.jboss.wsf.stack.jbws" /> </key> </component> <component name="RestoreUpdateTree" /> @@ -850,8 +670,8 @@ <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="PACKAGE_NAME" value="org.jboss.test.ws.jaxws.smoke.tools" /> + <option name="MAIN_CLASS_NAME" value="org.jboss.test.ws.jaxws.smoke.tools.WSProvideTestCase" /> <option name="METHOD_NAME" value="testOutputDirectory" /> <option name="TEST_OBJECT" value="method" /> <option name="VM_PARAMETERS" /> @@ -892,18 +712,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="Application" factoryName="Application" enabled="false" merge="false"> <option name="MAIN_CLASS_NAME" /> <option name="VM_PARAMETERS" /> @@ -924,13 +732,25 @@ <option name="HOST" value="localhost" /> <option name="PORT" value="5005" /> </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="false" name="WSConsumerTestCase.testWsdlLocation" 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" value="" /> - <option name="PACKAGE_NAME" value="org.jboss.test.ws.jaxws.tools" /> - <option name="MAIN_CLASS_NAME" value="org.jboss.test.ws.jaxws.tools.WSConsumerTestCase" /> + <option name="PACKAGE_NAME" value="org.jboss.test.ws.jaxws.smoke.tools" /> + <option name="MAIN_CLASS_NAME" value="org.jboss.test.ws.jaxws.smoke.tools.WSConsumerTestCase" /> <option name="METHOD_NAME" value="testWsdlLocation" /> <option name="TEST_OBJECT" value="method" /> <option name="VM_PARAMETERS" value="" /> @@ -985,7 +805,16 @@ </method> </configuration> </component> - <component name="ScopeViewComponent" /> + <component name="ScopeViewComponent"> + <subPane subId="Project"> + <PATH> + <PATH_ELEMENT USER_OBJECT="Root"> + <option name="myItemId" value="" /> + <option name="myItemType" value="" /> + </PATH_ELEMENT> + </PATH> + </subPane> + </component> <component name="SelectInManager" /> <component name="StarteamConfiguration"> <option name="SERVER" value="" /> @@ -1064,7 +893,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="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25432098" order="0" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26419753" 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" /> @@ -1072,7 +901,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="true" weight="0.25555557" order="1" /> + <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="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" /> @@ -1101,7 +930,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" value="Display information about output and source directories being used" /> + <option name="LAST_COMMIT_MESSAGE" value="really exclude jaxws/tools tests for xfire" /> <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" /> @@ -1115,6 +944,8 @@ <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" /> + <MESSAGE value="Implement SPIView marker" /> + <MESSAGE value="really exclude jaxws/tools tests for xfire" /> </component> <component name="VssConfiguration"> <option name="CLIENT_PATH" value="" /> @@ -1168,109 +999,111 @@ <option name="myLastEditedConfigurable" value="IDE Profiles" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/build/ant.properties.example"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandlerFactory.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"> + <state line="38" column="33" selection-start="1550" selection-end="1550" vertical-scroll-proportion="0.39246657"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/management/ContextServlet.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/ServiceRefHandlerImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="176" column="12" selection-start="6518" selection-end="6518" vertical-scroll-proportion="0.7514863"> + <state line="67" column="88" selection-start="2423" selection-end="2423" vertical-scroll-proportion="-0.42326733"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="32" column="35" selection-start="1347" selection-end="1347" vertical-scroll-proportion="0.24851367"> + <state line="57" column="13" selection-start="2274" selection-end="2274" vertical-scroll-proportion="0.37623763"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProvider.java"> + <entry file="file://$PROJECT_DIR$/integration/native/ant-import/macros-deploy-native.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="46" column="36" selection-start="1534" selection-end="1534" vertical-scroll-proportion="0.3329298"> + <state line="160" column="55" selection-start="7335" selection-end="7370" vertical-scroll-proportion="3.3922517"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/CalculatorBean.java"> + <entry file="file://$PROJECT_DIR$/integration/native/build.xml"> <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 line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.06900726"> + <folding /> </state> </provider> </entry> - <entry file="jar://$PROJECT_DIR$/integration/sunri/thirdparty/jaxws-tools.jar!/com/sun/tools/ws/wscompile/WsgenTool.class"> + <entry file="file://$PROJECT_DIR$/build/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="17" column="10" selection-start="898" selection-end="898" vertical-scroll-proportion="0.3329298"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-3.0714285"> <folding /> </state> </provider> </entry> - <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/wscompile/WsimportListener.java"> + <entry file="file://$PROJECT_DIR$/integration/native/ant-import/build-deploy.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="28" column="13" selection-start="934" selection-end="934" vertical-scroll-proportion="0.20777643"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.34503633"> <folding /> </state> </provider> </entry> - <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/AnnotationProcessorContext.java"> + <entry file="file://$PROJECT_DIR$/integration/xfire/src/test/resources/test-excludes-jboss42.txt"> <provider selected="true" editor-type-id="text-editor"> - <state line="41" column="13" selection-start="1444" selection-end="1444" vertical-scroll-proportion="0.09234508"> + <state line="57" column="32" selection-start="1975" selection-end="1975" vertical-scroll-proportion="0.82066506"> <folding /> </state> </provider> </entry> - <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java"> + <entry file="file://$PROJECT_DIR$/integration/xfire/src/test/resources/test-excludes-jboss50.txt"> <provider selected="true" editor-type-id="text-editor"> - <state line="69" column="28" selection-start="2591" selection-end="2591" vertical-scroll-proportion="0.31064355"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.4655582"> <folding /> </state> </provider> </entry> - <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceVisitor.java"> + <entry file="file://$PROJECT_DIR$/integration/native/ant-import/build-testsuite.xml"> <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 line="26" column="20" selection-start="1252" selection-end="1252" vertical-scroll-proportion="0.59806293"> + <folding> + <marker date="1186047277000" expanded="true" signature="1397:2394" placeholder="..." /> + <marker date="1186047277000" expanded="true" signature="1397:1960" placeholder="..." /> + <marker date="1186047277000" expanded="true" signature="1397:1774" placeholder="..." /> + </folding> </state> </provider> </entry> - <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/ModelBuilder.java"> + <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.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"> + <state line="100" column="42" selection-start="2978" selection-end="2978" vertical-scroll-proportion="0.4233056"> <folding /> </state> </provider> </entry> - <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceAP.java"> + <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.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"> + <state line="281" column="46" selection-start="10059" selection-end="10059" vertical-scroll-proportion="0.7699758"> <folding /> </state> </provider> </entry> - <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/wscompile/WsgenTool.java"> + <entry file="file://$PROJECT_DIR$/build/ant-import/build-testsuite.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="335" column="113" selection-start="13365" selection-end="13395" vertical-scroll-proportion="5.9764853"> + <state line="398" column="14" selection-start="19181" selection-end="19181" vertical-scroll-proportion="0.748184"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java"> + <entry file="file://$PROJECT_DIR$/build/version.properties"> <provider selected="true" editor-type-id="text-editor"> - <state line="188" column="16" selection-start="5832" selection-end="5832" vertical-scroll-proportion="0.42284325"> + <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/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderImpl.java"> + <entry file="file://$PROJECT_DIR$/build/ant.properties"> <provider selected="true" editor-type-id="text-editor"> - <state line="182" column="34" selection-start="5521" selection-end="5521" vertical-scroll-proportion="0.6294046"> + <state line="47" column="26" selection-start="1533" selection-end="1558" vertical-scroll-proportion="0.50297266"> <folding /> </state> </provider> Modified: trunk/build/ant-import/build-testsuite.xml =================================================================== --- trunk/build/ant-import/build-testsuite.xml 2007-08-02 09:36:42 UTC (rev 4082) +++ trunk/build/ant-import/build-testsuite.xml 2007-08-02 09:57:42 UTC (rev 4083) @@ -376,13 +376,13 @@ </antcall> <antcall target="tests-report"/> </target> - + <!-- Run samples test cases --> - <target name="tests-samples" depends="tests-init" description="Run samples unit tests"> + <target name="tests-smoke" depends="tests-init" description="Run samples unit tests"> <antcall target="tests-run-internal"> - <param name="include.wildcard" value="org/jboss/test/ws/*/samples/**/*TestCase.class"/> + <param name="include.wildcard" value="org/jboss/test/ws/*/samples/**/*TestCase.class org/jboss/test/ws/*/smoke/**/*TestCase.class"/> <param name="exclude.wildcard" value="org/jboss/test/ws/*/samples/jaxr/**"/> - <!-- + <!-- According to our commit policy, haltonfailure MUST be be true for tests-samples. It is a prerequisite for any commit that this target passes without failure. --> @@ -390,6 +390,14 @@ </antcall> <antcall target="tests-report"/> </target> + + <!-- Run samples test cases --> + <target name="tests-samples" depends="tests-init" description="Run samples unit tests"> + <antcall target="tests-run-internal"> + <param name="include.wildcard" value="org/jboss/test/ws/*/samples/**/*TestCase.class"/> + <param name="exclude.wildcard" value="org/jboss/test/ws/*/samples/jaxr/**"/> + </antcall> + </target> <!-- Run a collection of unit tests. Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBean.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBean.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBean.java 2007-08-02 09:57:42 UTC (rev 4083) @@ -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.smoke.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/smoke/tools/CalculatorBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2007-08-02 09:57:42 UTC (rev 4083) @@ -0,0 +1,285 @@ +/* + * 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.smoke.tools; + +import junit.framework.TestCase; +import org.jboss.wsf.spi.tools.WSContractConsumer; + +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.PrintStream; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.List; +import java.lang.reflect.Method; + +/** + * Test the WSContractConsumer API across different implementations. + * NOTE: All tests expect to be execurted below 'output/tests'. + * + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class WSConsumerTestCase extends TestCase +{ + + // Tools delegate. Recreated for every test. See setup(...) + WSContractConsumer consumer; + + // common output dir for all tests. Tests need to be executed below 'output/tests' + File outputDirectory; + + // default is off + boolean toogleMessageOut = false; + + /** + * Recreates a tools delegate for every test + * @throws Exception + */ + protected void setUp() throws Exception + { + super.setUp(); + + // create a new consumer for every test case + consumer = WSContractConsumer.newInstance(); + if(toogleMessageOut) consumer.setMessageStream(System.out); + + // shared output directory, relative to test execution + outputDirectory = new File("wsconsume/java"); + } + + /** + * Specifies the JAX-WS and JAXB binding files to use on import operations. + * See http://java.sun.com/webservices/docs/2.0/jaxws/customizations.html + */ + public void testBindingFiles() throws Exception + { + List<File> files = new ArrayList<File>(); + files.add( new File("resources/jaxws/smoke/tools/wsdl/async-binding.xml") ); + + consumer.setBindingFiles(files); + consumer.setTargetPackage("org.jboss.test.ws.tools.testBindingFiles"); + consumer.setGenerateSource(true); + + consumeWSDL(); + + URLClassLoader loader = new URLClassLoader(new URL[] { new URL("file:"+System.getProperty("user.dir")+"/wsconsume/java/") }); + String seiClassName = "org.jboss.test.ws.tools.testBindingFiles.EndpointInterface"; + Class sei = loader.loadClass(seiClassName); + + boolean containsAsyncOperations = false; + for(Method m : sei.getDeclaredMethods()) + { + if(m.getName().equals("echoAsync")) + { + containsAsyncOperations = true; + break; + } + } + + assertTrue("External binding file was ignored", containsAsyncOperations); + + } + + /** + * Sets the OASIS XML Catalog file to use for entity resolution. + * + */ + public void testCatalog() throws Exception + { + consumer.setTargetPackage("org.jboss.test.ws.tools.testCatalog"); + consumer.setCatalog( new File("resources/jaxws/smoke/tools/wsdl/jax-ws-catalog.xml") ); + consumer.setGenerateSource(true); + consumer.setOutputDirectory(outputDirectory); + consumer.consume("resources/jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl"); + } + + /** + * Sets the main output directory. If the directory does not exist, it will be created. + * + */ + public void testOutputDirectory() throws Exception + { + consumer.setTargetPackage("org.jboss.test.ws.tools.testOutputDirectory"); + consumer.setGenerateSource(true); + consumer.setSourceDirectory( new File("work/testOutputDirectory/java/") ); + + consumeWSDL(); + + File sei = new File("work/testOutputDirectory/java/org/jboss/test/ws/tools/testOutputDirectory/EndpointInterface.java"); + assertTrue("Output directory switch ignored", sei.exists()); + } + + /** + * Sets the source directory. This directory will contain any generated Java source. + * If the directory does not exist, it will be created. If not specified, + * the output directory will be used instead. + * + */ + public void testSourceDirectory() throws Exception + { + consumer.setTargetPackage("org.jboss.test.ws.tools.testSourceDirectory"); + consumer.setGenerateSource(true); + consumer.setSourceDirectory( new File("work/wsconsumeSource/java/") ); + + consumeWSDL(); + + File sei = new File("work/wsconsumeSource/java/org/jboss/test/ws/tools/testSourceDirectory/EndpointInterface.java"); + assertTrue("Source directory switch ignored", sei.exists()); + } + + /** + * Enables/Disables Java source generation. + * + */ + public void testGenerateSource() throws Exception + { + testTargetPackage(); + } + + /** + * Sets the target package for generated source. If not specified the default + * is based off of the XML namespace. + * + */ + public void testTargetPackage() throws Exception + { + consumer.setTargetPackage("org.jboss.test.ws.tools.testTargetPackage"); + consumer.setGenerateSource(true); + + consumeWSDL(); + + File packageDir = new File("wsconsume/java/org/jboss/test/ws/tools/testTargetPackage"); + assertTrue("Package not created", packageDir.exists()); + + File sei = new File("wsconsume/java/org/jboss/test/ws/tools/testTargetPackage/EndpointInterface.java"); + assertTrue("SEI not generated", sei.exists()); + } + + /** + * Sets the @(a)WebService.wsdlLocation and @(a)WebServiceClient.wsdlLocation attributes to a custom value. + * + */ + public void testWsdlLocation() throws Exception + { + consumer.setTargetPackage("org.jboss.test.ws.tools.testWsdlLocation"); + consumer.setWsdlLocation("http://foo.bar.com/endpoint?wsdl"); + consumer.setGenerateSource(true); + + consumeWSDL(); + + URLClassLoader loader = new URLClassLoader(new URL[] { new URL("file:"+System.getProperty("user.dir")+"/wsconsume/java/") }); + String seiClassName = "org.jboss.test.ws.tools.testWsdlLocation.TestService"; + Class sei = loader.loadClass(seiClassName); + + WebServiceClient webServiceClient = (WebServiceClient) sei.getAnnotation(WebServiceClient.class); + assertNotNull("@WebServiceClient not generated on service interface", webServiceClient); + assertEquals(&quot;(a)WebServiceClient.wsdlLocation not set", "http://foo.bar.com/endpoint?wsdl", webServiceClient.wsdlLocation()); + } + + /** + * Sets the PrintStream to use for status feedback. + * The simplest example would be to use System.out. + */ + public void testMessageStream() throws Exception + { + ByteArrayOutputStream bout = new ByteArrayOutputStream(); + PrintStream pout = new PrintStream(bout); + + consumer.setTargetPackage("org.jboss.test.ws.tools.testMessageStream"); + consumer.setMessageStream(pout); + + consumeWSDL(); + + String messageOut = new String (bout.toByteArray()); + System.out.println("-- Begin captured output -- "); + System.out.println(messageOut); + System.out.println("--- End captured output --"); + + System.out.println("FIXME [JBWS-1772]: WSConsume output is not correctly redirected"); + + /*assertTrue("Tools output not correctly redirected", + messageOut.indexOf("org/jboss/test/ws/tools/testMessageStream/EndpointInterface.java")!=-1 + );*/ + } + + /** + * Sets the additional classpath to use if/when invoking the Java compiler. + * Typically an implementation will use the system <code>java.class.path</code> + * property. So for most normal applications this method is not needed. However, + * if this API is being used from an isolated classloader, then it needs to + * be called in order to reference all jars that are required by the + * implementation. + * + */ + public void testAdditionalCompilerClassPath() + { + System.out.println("FIXME [JBWS-1773]: Verify isolated classloading with WSConsume"); + } + + /** + * Set the target JAX-WS specification target. Defaults to <code>2.0</code> + */ + public void testTarget() throws Exception + { + consumer.setTargetPackage("org.jboss.test.ws.tools.testTarget"); + consumer.setGenerateSource(true); + consumer.setTarget("2.1"); + + consumeWSDL(); + + URLClassLoader loader = new URLClassLoader(new URL[] { new URL("file:"+System.getProperty("user.dir")+"/wsconsume/java/") }); + String seiClassName = "org.jboss.test.ws.tools.testTarget.TestService"; + Class sei = loader.loadClass(seiClassName); + + + boolean featureSig = false; + for(Method m : sei.getDeclaredMethods()) + { + if(m.getName().equals("getEndpointInterfacePort")) + { + for(Class c : m.getParameterTypes()) + { + if(c.isArray() && + c.getComponentType().equals(WebServiceFeature.class)) + { + featureSig = true; + break; + } + } + } + } + + assertTrue("JAX-WS 2.1 extensions not generated with 'target=2.1'", featureSig); + + } + + private void consumeWSDL() throws Exception + { + consumer.setOutputDirectory(outputDirectory); + consumer.consume("resources/jaxws/smoke/tools/wsdl/TestService.wsdl"); + } + +} Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java 2007-08-02 09:57:42 UTC (rev 4083) @@ -0,0 +1,212 @@ +/* + * 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.smoke.tools; + +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.xml.bind.annotation.XmlRootElement; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.PrintStream; +import java.net.URL; +import java.net.URLClassLoader; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class WSProvideTestCase extends JBossWSTest +{ + // tools delegate + WSContractProvider provider; + + // redirect tools message to System.out ? + boolean toogleMessageOut = false; + + // relative to test execution + File outputDirectory; + + protected void setUp() throws Exception + { + super.setUp(); + + // create a new consumer for every test case + provider = WSContractProvider.newInstance(); + if(toogleMessageOut) provider.setMessageStream(System.out); + + // shared output directory, relative to test execution + outputDirectory = new File("wsprovide/java"); + } + + private ClassLoader getArtefactClassLoader() throws Exception { + URLClassLoader loader = new URLClassLoader(new URL[] { + new URL("file:"+System.getProperty("user.dir")+"/wsprovide/java/") } + ); + + return loader; + } + + /** + * Enables/Disables WSDL generation. + * + */ + public void testGenerateWsdl() throws Exception + { + provider.setGenerateWsdl(true); + provide(); + + verifyWSDL(outputDirectory); + } + + /** + * Enables/Disables Java source generation. + * + */ + public void testGenerateSource() throws Exception + { + provider.setGenerateSource(true); + provide(); + + verifyJavaSource(outputDirectory); + + } + + private void verifyJavaSource(File directory) + { + File javaSource = new File( + directory.getAbsolutePath()+ + "/org/jboss/test/ws/jaxws/smoke/tools/jaxws/AddResponse.java" + ); + + assertTrue("Source not generated", javaSource.exists()); + } + + /** + * Sets the main output directory. + * If the directory does not exist, it will be created. + */ + public void testOutputDirectory() throws Exception + { + provide(); + ClassLoader loader = getArtefactClassLoader(); + Class responseWrapper = loader.loadClass("org.jboss.test.ws.jaxws.smoke.tools.jaxws.AddResponse"); + XmlRootElement rootElement = (XmlRootElement) responseWrapper.getAnnotation(XmlRootElement.class); + assertNotNull("@XmlRootElement missing form response wrapper", rootElement); + assertEquals("Wrong namespace", rootElement.namespace(), "http://foo.bar.com/calculator"); + } + + /** + * Sets the resource directory. This directory will contain any generated + * WSDL and XSD files. If the directory does not exist, it will be created. + * If not specified, the output directory will be used instead. + * + */ + public void testResourceDirectory() throws Exception + { + File directory = new File("wsprovide/resources"); + provider.setResourceDirectory(directory); + provide(); + + verifyWSDL(directory); + } + + private void verifyWSDL(File directory) throws Exception + { + File wsdl = new File( + outputDirectory.getAbsolutePath()+ + "/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"), "CalculatorBeanService"); + } + + /** + * Sets the source directory. This directory will contain any generated Java source. + * If the directory does not exist, it will be created. If not specified, + * the output directory will be used instead. + * + */ + public void testSourceDirectory() throws Exception + { + File sourceDir = new File("wsprovide/sources"); + provider.setSourceDirectory(sourceDir); + provider.setGenerateSource(true); + provide(); + + verifyJavaSource(sourceDir); + } + + /** + * Sets the ClassLoader used to discover types. + * This defaults to the one used in instantiation. + * + */ + public void testClassLoader() + { + System.out.println("FIXME [JBWS-1776]: Verify isolated classloading with WSProvide"); + } + + /** + * Sets the PrintStream to use for status feedback. The simplest example + * would be to use System.out. + * + */ + 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); + + provider.setMessageStream(pout); + provide(); + + String messageOut = new String(bout.toByteArray()); + + System.out.println("-- Begin captured output --"); + System.out.println(messageOut); + System.out.println("-- End captured output --"); + + assertTrue("Provider messages not correctly redirected", + messageOut.indexOf("org/jboss/test/ws/jaxws/smoke/tools/jaxws/Add.class") != -1 ); + } + + private void provide() throws Exception + { + //provider.setGenerateSource(true); + provider.setOutputDirectory(outputDirectory); + provider.provide(CalculatorBean.class); + } + +} Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestService.wsdl =================================================================== --- trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestService.wsdl (rev 0) +++ trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestService.wsdl 2007-08-02 09:57:42 UTC (rev 4083) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<definitions name="TestService" + targetNamespace="http://www.openuri.org/2004/04/HelloWorld" + xmlns:tns="http://www.openuri.org/2004/04/HelloWorld" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + <types/> + <message name="EndpointInterface_echo"> + <part name="String_1" type="xsd:string"/> + </message> + <message name="EndpointInterface_echoResponse"> + <part name="result" type="xsd:string"/> + </message> + <portType name="EndpointInterface"> + <operation name="echo" parameterOrder="String_1"> + <input message="tns:EndpointInterface_echo"/> + <output message="tns:EndpointInterface_echoResponse"/> + </operation> + </portType> + <binding name="EndpointInterfaceBinding" type="tns:EndpointInterface"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/> + <operation name="echo"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal" namespace="http://www.openuri.org/2004/04/HelloWorld"/> + </input> + <output> + <soap:body use="literal" namespace="http://www.openuri.org/2004/04/HelloWorld"/> + </output> + </operation> + </binding> + <service name="TestService"> + <port name="EndpointInterfacePort" binding="tns:EndpointInterfaceBinding"> + <soap:address location="REPLACE_WITH_ACTUAL_URL"/> + </port> + </service> +</definitions> Property changes on: trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestService.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl =================================================================== --- trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl (rev 0) +++ trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl 2007-08-02 09:57:42 UTC (rev 4083) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<definitions name="TestService" + targetNamespace="http://www.openuri.org/2004/04/HelloWorld" + xmlns:tns="http://www.openuri.org/2004/04/HelloWorld" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:wsaw='http://www.w3.org/2006/05/addressing/wsdl'> + <types/> + <message name="EndpointInterface_echo"> + <part name="String_1" type="xsd:string"/> + </message> + <message name="EndpointInterface_echoResponse"> + <part name="result" type="xsd:string"/> + </message> + <portType name="EndpointInterface"> + <operation name="echo" parameterOrder="String_1"> + <input message="tns:EndpointInterface_echo" wsaw:Action='http://foo.bar.com/action/echo'/> + <output message="tns:EndpointInterface_echoResponse"/> + </operation> + </portType> + <binding name="EndpointInterfaceBinding" type="tns:EndpointInterface"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/> + <operation name="echo"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal" namespace="http://www.openuri.org/2004/04/HelloWorld"/> + </input> + <output> + <soap:body use="literal" namespace="http://www.openuri.org/2004/04/HelloWorld"/> + </output> + </operation> + </binding> + <service name="TestService"> + <port name="EndpointInterfacePort" binding="tns:EndpointInterfaceBinding"> + <soap:address location="REPLACE_WITH_ACTUAL_URL"/> + </port> + </service> +</definitions> Property changes on: trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/async-binding.xml =================================================================== --- trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/async-binding.xml (rev 0) +++ trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/async-binding.xml 2007-08-02 09:57:42 UTC (rev 4083) @@ -0,0 +1,9 @@ +<bindings + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + wsdlLocation="TestService.wsdl" + xmlns="http://java.sun.com/xml/ns/jaxws"> + <package name="org.jboss.test.ws.tools.testBindingFiles"/> + <enableWrapperStyle>true</enableWrapperStyle> + <enableAsyncMapping>true</enableAsyncMapping> +</bindings> + Property changes on: trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/async-binding.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/jax-ws-catalog.xml =================================================================== --- trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/jax-ws-catalog.xml (rev 0) +++ trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/jax-ws-catalog.xml 2007-08-02 09:57:42 UTC (rev 4083) @@ -0,0 +1,3 @@ +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system"> + <system systemId="http://www.w3.org/2006/05/addressing/wsdl" uri="ws-addr-wsdl.xsd"/> +</catalog> \ No newline at end of file Property changes on: trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/jax-ws-catalog.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/ws-addr-wsdl.xsd =================================================================== --- trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/ws-addr-wsdl.xsd (rev 0) +++ trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/ws-addr-wsdl.xsd 2007-08-02 09:57:42 UTC (rev 4083) @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"> +<!-- + W3C XML Schema defined in the Web Services Addressing 1.0 + - WSDL Binding specification + http://www.w3.org/TR/ws-addr-core + + Copyright © 2006 World Wide Web Consortium, + + (Massachusetts Institute of Technology, European Research Consortium for + Informatics and Mathematics, Keio University). All Rights Reserved. This + work is distributed under the W3C® Software License [1] 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. + + [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 + + $Id$ +--> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.w3.org/2006/05/addressing/wsdl" targetNamespace="http://www.w3.org/2006/05/addressing/wsdl" blockDefault="#all" elementFormDefault="qualified"> + + <xs:element name="ServiceName" type="tns:ServiceNameType"/> + <xs:complexType name="ServiceNameType"> + <xs:simpleContent> + <xs:extension base="xs:QName"> + <xs:attribute name="EndpointName" type="xs:NCName" use="optional"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + + <xs:element name="InterfaceName" type="tns:AttributedQNameType"/> + <xs:complexType name="AttributedQNameType"> + <xs:simpleContent> + <xs:extension base="xs:QName"> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + + <xs:attribute name="Action" type="xs:anyURI"/> + + <xs:element name="UsingAddressing"> + <xs:complexType> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:complexType> + </xs:element> + + <xs:simpleType name="AnonymousType"> + <xs:restriction base="xs:token"> + <xs:enumeration value="optional"/> + <xs:enumeration value="required"/> + <xs:enumeration value="prohibited"/> + </xs:restriction> + </xs:simpleType> + <xs:element name="Anonymous"> + <xs:complexType> + <xs:simpleContent> + <xs:extension base="tns:AnonymousType"> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + </xs:element> + +</xs:schema> \ No newline at end of file Property changes on: trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/ws-addr-wsdl.xsd ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF