Author: heiko.braun(a)jboss.com Date: 2007-08-01 06:16:04 -0400 (Wed, 01 Aug 2007) New Revision: 4047 Modified: trunk/JBossWS-Trunk.iws trunk/build/ant-import/build-testsuite.xml trunk/integration/native/ant-import/build-testsuite.xml trunk/integration/sunri/ant-import/build-testsuite.xml trunk/integration/sunri/ant-import/build-thirdparty.xml trunk/jbossws-core/ant-import-tests/build-testsuite.xml Log: Cleanup test.client.classpath wrt spi tools Modified: trunk/JBossWS-Trunk.iws =================================================================== --- trunk/JBossWS-Trunk.iws 2007-08-01 10:15:24 UTC (rev 4046) +++ trunk/JBossWS-Trunk.iws 2007-08-01 10:16:04 UTC (rev 4047) @@ -20,22 +20,16 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/tools/wsdl/ws-addr-wsdl.xsd" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/testsuite/testsuite.iml" afterPath="$PROJECT_DIR$/testsuite/testsuite.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss40/int-40.iml" afterPath="$PROJECT_DIR$/integration/jboss40/int-40.iml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/tools/wsdl/async-binding.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java" afterPath="$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/tools/wsdl/jax-ws-catalog.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/tools/wsdl/TestServiceCatalog.wsdl" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/tools" /> + <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="/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="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools" /> + <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="/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$/testsuite/src/resources/jaxws/tools/wsdl/TestService.wsdl" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/tools/wsdl" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jbossws-core/jbossws-core.iml" afterPath="$PROJECT_DIR$/jbossws-core/jbossws-core.iml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/integration/spi/src/main/etc/default.mf" /> </list> </component> <component name="ChangeListSynchronizer" /> @@ -263,6 +257,19 @@ <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"> + <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> @@ -331,53 +338,15 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="WSConsumerTestCase.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java"> + <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"> <provider selected="true" editor-type-id="text-editor"> - <state line="238" column="42" selection-start="8673" selection-end="8673" vertical-scroll-proportion="0.59806293"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="build-testsuite.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/jbossws-core/ant-import-tests/build-testsuite.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="12" column="31" selection-start="521" selection-end="521" vertical-scroll-proportion="0.27602905"> + <state line="44" column="36" selection-start="2341" selection-end="2341" vertical-scroll-proportion="0.53995156"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="jax-ws-catalog.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/testsuite/src/resources/jaxws/tools/wsdl/jax-ws-catalog.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="1" column="86" selection-start="164" selection-end="164" vertical-scroll-proportion="0.022592152"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="TestServiceCatalog.wsdl" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/testsuite/src/resources/jaxws/tools/wsdl/TestServiceCatalog.wsdl"> - <provider selected="true" editor-type-id="text-editor"> - <state line="8" column="66" selection-start="413" selection-end="454" vertical-scroll-proportion="0.18073721"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="wsdl0.wsdl" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/jbossws-core/src/test/resources/interop/wsa/WEB-INF/wsdl/wsdl0.wsdl"> - <provider selected="true" editor-type-id="text-editor"> - <state line="12" column="64" selection-start="1407" selection-end="1407" vertical-scroll-proportion="0.27602905"> - <folding /> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindManager"> @@ -470,14 +439,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_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> @@ -485,30 +446,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_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/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> - <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="spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> @@ -527,304 +464,6 @@ <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="spi" /> - <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="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> - <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="spi" /> - <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="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" /> - <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="spi" /> - <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="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/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="spi" /> - <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="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/tools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/tools/cmd" /> - <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="spi" /> - <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="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> - <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="spi" /> - <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="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> - <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="jbossws-core" /> - <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="jbossws-core" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core" /> - <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="jbossws-core" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/ant-import-tests" /> - <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> </subPane> </component> <component name="ProjectReloadState"> @@ -838,7 +477,7 @@ <showLibraryContents /> <hideEmptyPackages PackagesPane="false" ProjectPane="false" /> <abbreviatePackageNames /> - <showStructure Favorites="false" PackagesPane="false" ProjectPane="false" /> + <showStructure ProjectPane="false" PackagesPane="false" Favorites="false" /> <autoscrollToSource /> <autoscrollFromSource /> <sortByType /> @@ -861,14 +500,14 @@ <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_treeWidth3" value="391" /> <property name="cvs_file_history_flatWidth2" value="391" /> - <property name="cvs_file_history_treeOrder0" value="0" /> + <property name="cvs_file_history_treeWidth3" value="391" /> <property name="cvs_file_history_flatWidth3" value="391" /> + <property name="cvs_file_history_treeOrder0" value="0" /> <property name="MemberChooser.showClasses" value="true" /> <property name="cvs_file_history_flatWidth0" value="391" /> - <property name="GoToClass.includeLibraries" value="false" /> <property name="cvs_file_history_flatWidth1" value="391" /> + <property name="GoToClass.includeLibraries" value="false" /> </component> <component name="ReadonlyStatusHandler"> <option name="SHOW_DIALOG" value="true" /> @@ -890,25 +529,18 @@ </key> </component> <component name="RestoreUpdateTree" /> - <component name="RunManager" selected="JUnit.WSConsumerTestCase.testTarget"> - <tempConfiguration default="false" name="WSConsumerTestCase.testTarget" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> - <pattern value="org.jboss.test.ws.jaxws.tools.*" /> - <module name="testsuite" /> + <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" /> + <option name="VM_PARAMETERS" /> + <option name="PROGRAM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" 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="METHOD_NAME" value="testTarget" /> - <option name="TEST_OBJECT" value="method" /> - <option name="VM_PARAMETERS" value="" /> - <option name="PARAMETERS" value="" /> - <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/jbossws-core/output/tests" /> - <option name="ADDITIONAL_CLASS_PATH" /> - <option name="TEST_SEARCH_SCOPE"> - <value defaultName="wholeProject" /> - </option> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="ENABLE_SWING_INSPECTOR" value="false" /> + <module name="testsuite" /> <RunnerSettings RunnerId="Debug"> - <option name="DEBUG_PORT" value="49408" /> + <option name="DEBUG_PORT" value="36149" /> <option name="TRANSPORT" value="0" /> <option name="LOCAL" value="true" /> </RunnerSettings> @@ -919,25 +551,6 @@ <option name="Make" value="true" /> </method> </tempConfiguration> - <configuration default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> - </configuration> - <configuration default="true" type="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="JUnit" factoryName="JUnit" enabled="false" merge="false"> <module name="" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> @@ -957,6 +570,18 @@ <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" /> @@ -970,6 +595,13 @@ <option name="Make" value="true" /> </method> </configuration> + <configuration default="true" type="Remote" factoryName="Remote"> + <option name="USE_SOCKET_TRANSPORT" value="true" /> + <option name="SERVER_MODE" value="false" /> + <option name="SHMEM_ADDRESS" value="javadebug" /> + <option name="HOST" value="localhost" /> + <option name="PORT" value="5005" /> + </configuration> <configuration default="false" name="WSConsumerTestCase.testWsdlLocation" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> <pattern value="org.jboss.test.ws.jaxws.tools.*" /> <module name="testsuite" /> @@ -1099,7 +731,7 @@ </component> <component name="ToolWindowManager"> <frame x="0" y="25" width="1680" height="1000" extended-state="0" /> - <editor active="true" /> + <editor active="false" /> <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" /> @@ -1110,7 +742,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="true" weight="0.23641975" order="0" /> + <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="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" /> @@ -1213,110 +845,108 @@ <option name="myLastEditedConfigurable" value="IDE Profiles" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/common/ServiceLoader.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="62" column="39" selection-start="2753" selection-end="2753" vertical-scroll-proportion="-0.2235723"> + <state line="60" column="0" selection-start="2482" selection-end="2482" vertical-scroll-proportion="0.19007264"> <folding /> </state> </provider> </entry> - <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/wsdl/framework/WSDLLocation.java"> + <entry file="file://$PROJECT_DIR$/integration/xfire/ant-import/build-thirdparty.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="30" column="13" selection-start="1098" selection-end="1098" vertical-scroll-proportion="0.23086269"> + <state line="61" column="41" selection-start="4394" selection-end="4394" vertical-scroll-proportion="0.7820823"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/testsuite/src/resources/jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl"> + <entry file="file://$PROJECT_DIR$/integration/xfire/src/test/resources/test-excludes-jboss42.txt"> <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="56" column="96" selection-start="1942" selection-end="1942" vertical-scroll-proportion="0.79809976"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/testsuite/src/resources/jaxws/tools/wsdl/async-binding.xml"> + <entry file="file://$PROJECT_DIR$/integration/xfire/src/test/resources/test-excludes-jboss50.txt"> <provider selected="true" editor-type-id="text-editor"> - <state line="2" column="18" selection-start="78" selection-end="78" vertical-scroll-proportion="0.045184303"> + <state line="56" column="96" selection-start="1846" selection-end="1942" vertical-scroll-proportion="0.79809976"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/testsuite/src/resources/jaxws/tools/wsdl/TestService.wsdl"> + <entry file="file://$PROJECT_DIR$/integration/native/ant-import/build-thirdparty.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="7" column="13" selection-start="337" selection-end="337" vertical-scroll-proportion="0.15814507"> + <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$/jbossws-core/src/test/resources/jaxws/samples/wsaddressing/META-INF/wsdl/TestService.wsdl"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/etc/default.mf"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.54116225"> + <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$/jbossws-core/src/test/resources/interop/wsa/WEB-INF/wsdl/wsdl1.wsdl"> + <entry file="file://$PROJECT_DIR$/integration/spi/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="581" selection-start="577" selection-end="581" vertical-scroll-proportion="0.0"> + <state line="74" column="34" selection-start="3586" selection-end="3586" vertical-scroll-proportion="0.30992737"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/testsuite/src/resources/jaxws/tools/wsdl/TestServiceCatalog.wsdl"> + <entry file="file://$PROJECT_DIR$/integration/native/ant-import/build-testsuite.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="8" column="66" selection-start="413" selection-end="454" vertical-scroll-proportion="0.18073721"> + <state line="11" column="0" selection-start="486" selection-end="486" vertical-scroll-proportion="0.25302663"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/jbossws-core/src/test/resources/interop/wsa/WEB-INF/wsdl/wsdl0.wsdl"> + <entry file="file://$PROJECT_DIR$/jbossws-core/ant-import-tests/build-testsuite.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="12" column="64" selection-start="1407" selection-end="1407" vertical-scroll-proportion="0.27602905"> + <state line="74" column="84" selection-start="3477" selection-end="3477" vertical-scroll-proportion="-1.5411623"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/testsuite/src/resources/jaxws/tools/wsdl/jax-ws-catalog.xml"> + <entry file="file://$PROJECT_DIR$/build/ant-import/build-testsuite.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="1" column="86" selection-start="164" selection-end="164" vertical-scroll-proportion="0.022592152"> + <state line="131" column="36" selection-start="5806" selection-end="5828" vertical-scroll-proportion="0.5290557"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/testsuite/ant-import/build-testsuite.xml"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/etc/default.mf"> <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="10" column="64" selection-start="524" selection-end="524" vertical-scroll-proportion="0.22592153"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/testsuite/build.xml"> + <entry file="file://$PROJECT_DIR$/integration/native/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="42" column="29" selection-start="2464" selection-end="2464" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/build/ant.properties"> + <entry file="file://$PROJECT_DIR$/integration/sunri/ant-import/build-thirdparty.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="33" column="20" selection-start="1406" selection-end="1406" vertical-scroll-proportion="0.13801453"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/jbossws-core/ant-import-tests/build-testsuite.xml"> + <entry file="file://$PROJECT_DIR$/integration/sunri/ant-import/build-testsuite.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="12" column="31" selection-start="521" selection-end="521" vertical-scroll-proportion="0.27602905"> + <state line="12" column="2" selection-start="491" selection-end="491" vertical-scroll-proportion="-0.311138"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java"> + <entry file="file://$PROJECT_DIR$/integration/xfire/ant-import/build-testsuite.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="238" column="42" selection-start="8673" selection-end="8673" vertical-scroll-proportion="0.59806293"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="44" column="36" selection-start="2341" selection-end="2341" vertical-scroll-proportion="0.53995156"> + <folding /> </state> </provider> </entry> Modified: trunk/build/ant-import/build-testsuite.xml =================================================================== --- trunk/build/ant-import/build-testsuite.xml 2007-08-01 10:15:24 UTC (rev 4046) +++ trunk/build/ant-import/build-testsuite.xml 2007-08-01 10:16:04 UTC (rev 4047) @@ -9,6 +9,8 @@ <!-- $Id$ --> <project> + + <property environment="env"/> <!-- Define jboss.home --> <condition property="jboss.home" value="${jboss50.home}"> @@ -111,7 +113,11 @@ <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> <pathelement location="${jboss.client}/mail.jar"/> <pathelement location="${jboss.client}/wsdl4j.jar"/> - <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/> + + <!-- SPI tools --> + <pathelement location="${jboss.client}/jbossws-spi.jar"/> + + <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/> <pathelement location="${jboss.server.lib}/jbosssx.jar"/> <pathelement location="${jboss.server.lib}/servlet-api.jar"/> </path> @@ -147,6 +153,12 @@ <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/> <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> + + <!-- SPI tools --> + <pathelement location="${jboss.client}/jbossws-spi.jar"/> + <pathelement location="${env.JAVA_HOME}/lib/tools.jar"/> + + </path> </target> Modified: trunk/integration/native/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/native/ant-import/build-testsuite.xml 2007-08-01 10:15:24 UTC (rev 4046) +++ trunk/integration/native/ant-import/build-testsuite.xml 2007-08-01 10:16:04 UTC (rev 4047) @@ -34,24 +34,7 @@ <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/> </path> - <path id="wsconsume.classpath"> - <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> - - <pathelement location="${spi.dir}/thirdparty/jaxb-xjc.jar"/> - <pathelement location="${spi.dir}/thirdparty/jaxb-impl.jar"/> - <pathelement location="${spi.dir}/thirdparty/stax-api.jar"/> - <pathelement location="${spi.dir}/thirdparty/stax-ex.jar"/> - <pathelement location="${spi.dir}/thirdparty/streambuffer.jar"/> - - <pathelement location="${core.dir}/thirdparty/jaxws-rt.jar"/> - <pathelement location="${core.dir}/thirdparty/jaxws-tools.jar"/> - <pathelement location="${core.dir}/thirdparty/wstx.jar"/> - - <pathelement location="${env.JAVA_HOME}/lib/tools.jar"/> - </path> - <path id="tests.extra.classpath"> - <path refid="wsconsume.classpath"/> <pathelement location="${jboss.client}/policy.jar"/> <pathelement location="${jboss.client}/wsdl4j.jar"/> </path> Modified: trunk/integration/sunri/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-08-01 10:15:24 UTC (rev 4046) +++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-08-01 10:16:04 UTC (rev 4047) @@ -45,23 +45,8 @@ <pathelement location="${int.sunri.dir}/thirdparty/wstx.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/wsdl4j.jar"/> </path> - - <path id="wsconsume.classpath"> - <pathelement location="${spi.dir}/thirdparty/jaxb-xjc.jar"/> - <pathelement location="${spi.dir}/thirdparty/jaxb-impl.jar"/> - <pathelement location="${spi.dir}/thirdparty/stax-api.jar"/> - <pathelement location="${spi.dir}/thirdparty/stax-ex.jar"/> - <pathelement location="${spi.dir}/thirdparty/streambuffer.jar"/> - - <pathelement location="${int.sunri.dir}/thirdparty/jaxws-rt.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jaxws-tools.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/wstx.jar"/> - - <pathelement location="${env.JAVA_HOME}/lib/tools.jar"/> - </path> - <path id="tests.extra.classpath"> - <path refid="wsconsume.classpath"/> + <path id="tests.extra.classpath"> <pathelement location="${int.sunri.dir}/output/lib/jbossws-sunri-client.jar"/> </path> Modified: trunk/integration/sunri/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-08-01 10:15:24 UTC (rev 4046) +++ trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-08-01 10:16:04 UTC (rev 4047) @@ -49,8 +49,6 @@ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/FastInfoset.jar" dest="${thirdparty.dir}/FastInfoset.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/http.jar" dest="${thirdparty.dir}/http.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-rt.jar" dest="${thirdparty.dir}/jaxws-rt.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-tools.jar" dest="${thirdparty.dir}/jaxws-tools.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr173_api.jar" dest="${thirdparty.dir}/jsr173_api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar" dest="${thirdparty.dir}/jsr181-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr250-api.jar" dest="${thirdparty.dir}/jsr250-api.jar" usetimestamp="true" verbose="true"/> @@ -58,6 +56,7 @@ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-impl.jar" dest="${thirdparty.dir}/saaj-impl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/sjsxp.jar" dest="${thirdparty.dir}/sjsxp.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-rt.jar" dest="${thirdparty.dir}/jaxws-rt.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-tools.jar" dest="${thirdparty.dir}/jaxws-tools.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/stax-ex.jar" dest="${thirdparty.dir}/stax-ex.jar" usetimestamp="true" verbose="true"/> Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-01 10:15:24 UTC (rev 4046) +++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-01 10:16:04 UTC (rev 4047) @@ -39,22 +39,7 @@ <pathelement location="${core.dir}/thirdparty/wstx.jar"/> </path> - <path id="wsconsume.classpath"> - <pathelement location="${spi.dir}/thirdparty/jaxb-xjc.jar"/> - <pathelement location="${spi.dir}/thirdparty/jaxb-impl.jar"/> - <pathelement location="${spi.dir}/thirdparty/stax-api.jar"/> - <pathelement location="${spi.dir}/thirdparty/stax-ex.jar"/> - <pathelement location="${spi.dir}/thirdparty/streambuffer.jar"/> - - <pathelement location="${core.dir}/thirdparty/jaxws-rt.jar"/> - <pathelement location="${core.dir}/thirdparty/jaxws-tools.jar"/> - <pathelement location="${core.dir}/thirdparty/wstx.jar"/> - - <pathelement location="${env.JAVA_HOME}/lib/tools.jar"/> - </path> - <path id="tests.extra.classpath"> - <path refid="wsconsume.classpath"/> <pathelement location="${core.dir}/thirdparty/qdox.jar"/> <pathelement location="${core.dir}/thirdparty/xmlunit.jar"/> </path> @@ -87,10 +72,9 @@ <target name="wsconsume" depends="tests-init" description="Consume JAX-WS contracts"> <!-- Define the JAX-WS wsconsume task --> - <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> - <classpath refid="ws.stack.classpath"/> - <classpath refid="wsconsume.classpath"/> - </taskdef> + <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> + <classpath refid="tests.client.classpath"/> + </taskdef> <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> @@ -184,10 +168,7 @@ <!-- Define the JAX-WS wsprovide task --> <taskdef name="wsprovide" classname="org.jboss.wsf.spi.tools.ant.WSProvideTask"> - <classpath refid="ws.stack.classpath"/> - <classpath refid="thirdparty.classpath"/> - <classpath location="${core.dir}/thirdparty/concurrent.jar"/> - <classpath location="${thirdparty.dir}/commons-logging.jar"/> + <classpath refid="tests.client.classpath"/> <classpath location="${tests.output.dir}/classes"/> <classpath location="${tests.output.dir}/resources/jaxws/samples/wssecurityAnnotatedpolicy"/> </taskdef>