Author: heiko.braun(a)jboss.com Date: 2007-07-31 10:47:35 -0400 (Tue, 31 Jul 2007) New Revision: 4036 Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java trunk/testsuite/src/resources/jaxws/tools/ trunk/testsuite/src/resources/jaxws/tools/wsdl/ trunk/testsuite/src/resources/jaxws/tools/wsdl/TestService.wsdl trunk/testsuite/src/resources/jaxws/tools/wsdl/TestServiceCatalog.wsdl trunk/testsuite/src/resources/jaxws/tools/wsdl/async-binding.xml trunk/testsuite/src/resources/jaxws/tools/wsdl/jax-ws-catalog.xml trunk/testsuite/src/resources/jaxws/tools/wsdl/ws-addr-wsdl.xsd Modified: trunk/JBossWS-Trunk.iws trunk/integration/jboss40/int-40.iml trunk/jbossws-core/ant-import-tests/build-testsuite.xml trunk/jbossws-core/jbossws-core.iml trunk/testsuite/testsuite.iml Log: Added WSConsume testcase Modified: trunk/JBossWS-Trunk.iws =================================================================== --- trunk/JBossWS-Trunk.iws 2007-07-31 14:46:49 UTC (rev 4035) +++ trunk/JBossWS-Trunk.iws 2007-07-31 14:47:35 UTC (rev 4036) @@ -20,41 +20,22 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> - <change type="DELETED" beforePath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifierImpl.java" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultWebAppDesciptorModifierImpl.java" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss50/int-50.iml" afterPath="$PROJECT_DIR$/integration/jboss50/int-50.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml" afterPath="$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebXMLRewriterImpl.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml" afterPath="$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebXMLRewriterImpl.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java" afterPath="$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java" afterPath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDesciptorModifier.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/RewriteResults.java" afterPath="" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/RewriteResults.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/xfire/src/main/resources/jbossws-xfire-config.xml" afterPath="$PROJECT_DIR$/integration/xfire/src/main/resources/jbossws-xfire-config.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDesciptorModifier.java" /> + <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="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="/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$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/RewriteResults.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java" afterPath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native-config.xml" afterPath="$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native-config.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools" /> <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="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java" afterPath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss42/int-42.iml" afterPath="$PROJECT_DIR$/integration/jboss42/int-42.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java" afterPath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri-config.xml" afterPath="$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri-config.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DefaultWebAppDesciptorModifierImpl.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml" afterPath="$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DefaultWebAppDesciptorModifierImpl.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifier.java" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java" afterPath="$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java" afterPath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataAdapter.java" afterPath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataAdapter.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ContainerMetaDataAdapter.java" afterPath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ContainerMetaDataAdapter.java" /> + <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" /> </list> </component> <component name="ChangeListSynchronizer" /> @@ -165,8 +146,8 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="51" class="org.jboss.wsf.framework.DefaultSPIProviderResolver" package="org.jboss.wsf.framework"> - <option name="ENABLED" value="false" /> + <breakpoint url="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java" line="48" class="org.jboss.wsf.stack.sunri.SunJaxwsDeploymentAspect" package="org.jboss.wsf.stack.sunri"> + <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> <option name="LOG_EXPRESSION_ENABLED" value="false" /> @@ -178,7 +159,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java" line="48" class="org.jboss.wsf.stack.sunri.SunJaxwsDeploymentAspect" package="org.jboss.wsf.stack.sunri"> + <breakpoint url="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerJBWS.java" line="57" class="org.jboss.wsf.stack.sunri.WSServletContextListenerJBWS" package="org.jboss.wsf.stack.sunri"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -191,7 +172,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerJBWS.java" line="57" class="org.jboss.wsf.stack.sunri.WSServletContextListenerJBWS" package="org.jboss.wsf.stack.sunri"> + <breakpoint url="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerExt.java" line="103" class="org.jboss.wsf.stack.sunri.WSServletContextListenerExt" package="org.jboss.wsf.stack.sunri"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -204,7 +185,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerExt.java" line="103" class="org.jboss.wsf.stack.sunri.WSServletContextListenerExt" package="org.jboss.wsf.stack.sunri"> + <breakpoint url="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java" line="95" class="org.jboss.wsf.stack.jbws.EndpointServlet" package="org.jboss.wsf.stack.jbws"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -217,7 +198,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java" line="95" class="org.jboss.wsf.stack.jbws.EndpointServlet" package="org.jboss.wsf.stack.jbws"> + <breakpoint url="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java" line="132" class="org.jboss.ws.core.jaxrpc.client.ServiceReferenceable" package="org.jboss.ws.core.jaxrpc.client"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -230,7 +211,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="101" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> + <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java" line="63" class="org.jboss.ws.integration.ResourceLoaderAdapter" package="org.jboss.ws.integration"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -243,7 +224,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="109" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> + <breakpoint url="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java" line="97" class="com.sun.tools.ws.processor.modeler.annotation.WebServiceWrapperGenerator" package="com.sun.tools.ws.processor.modeler.annotation"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -256,6 +237,32 @@ <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"> + <option name="ENABLED" value="true" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> + <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/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" /> + <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> @@ -299,7 +306,16 @@ <component name="FavoritesManager"> <favorites_list name="JBossWS-Trunk" /> </component> - <component name="FavoritesProjectViewPane" /> + <component name="FavoritesProjectViewPane"> + <subPane subId="JBossWS-Trunk"> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" /> + <option name="myItemType" value="com.intellij.ide.favoritesTreeView.FavoritesTreeNodeDescriptor" /> + </PATH_ELEMENT> + </PATH> + </subPane> + </component> <component name="FavoritesViewImpl"> <favorites_list name="JBossWS-Trunk"> <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> @@ -314,7 +330,55 @@ <option name="myCurrentFavoritesList" value="JBossWS-Trunk" /> </component> <component name="FileEditorManager"> - <leaf /> + <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"> + <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"> + <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"> <FindUsagesManager> @@ -326,6 +390,9 @@ <option name="SORT_ALPHABETICALLY" value="false" /> <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" /> + </component> <component name="InspectionManager"> <option name="AUTOSCROLL_TO_SOURCE" value="false" /> <option name="SPLITTER_PROPORTION" value="0.5" /> @@ -345,236 +412,419 @@ <option name="LAST_EDITED_TAB_NAME" value="Libraries (Classpath)" /> </component> <component name="NamedScopeManager" /> - <component name="PackagesPane"> + <component name="PackagesPane" /> + <component name="PerforceChangeBrowserSettings"> + <option name="USE_CLIENT_FILTER" value="true" /> + <option name="CLIENT" value="" /> + </component> + <component name="PerforceDirect.Settings"> + <option name="useP4CONFIG" value="true" /> + <option name="port" value="&lt;perforce_server&gt;:1666" /> + <option name="client" value="" /> + <option name="user" value="" /> + <option name="passwd" value="" /> + <option name="showCmds" value="false" /> + <option name="useNativeApi" value="false" /> + <option name="pathToExec" value="p4" /> + <option name="useCustomPathToExec" value="false" /> + <option name="SYNC_FORCE" value="false" /> + <option name="SYNC_RUN_RESOLVE" value="true" /> + <option name="REVERT_UNCHANGED_FILES" value="true" /> + <option name="CHARSET" value="none" /> + <option name="SHOW_BRANCHES_HISTORY" value="true" /> + <option name="ENABLED" value="true" /> + <option name="USE_LOGIN" value="false" /> + <option name="LOGIN_SILENTLY" value="false" /> + <option name="INTEGRATE_RUN_RESOLVE" value="true" /> + <option name="INTEGRATE_REVERT_UNCHANGED" value="true" /> + <option name="SERVER_TIMEOUT" value="20000" /> + </component> + <component name="ProjectLevelVcsManager"> + <OptionsSetting value="true" id="Add" /> + <OptionsSetting value="true" id="Remove" /> + <OptionsSetting value="true" id="Checkin" /> + <OptionsSetting value="true" id="Checkout" /> + <OptionsSetting value="true" id="Update" /> + <OptionsSetting value="true" id="Status" /> + <OptionsSetting value="true" id="Edit" /> + <OptionsSetting value="true" id="Undo Check Out" /> + <OptionsSetting value="true" id="Compare with SourceSafe Version" /> + <OptionsSetting value="true" id="Get Latest Version" /> + <ConfirmationsSetting value="0" id="Add" /> + <ConfirmationsSetting value="0" id="Remove" /> + </component> + <component name="ProjectPane"> <subPane> <PATH> <PATH_ELEMENT> <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + <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> <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + <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/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.PackageViewModuleNode" /> + <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.PackageViewProjectNode" /> + <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.PackageViewModuleNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <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="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <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.PackageViewProjectNode" /> + <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.PackageViewModuleNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <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="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <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="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <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.PackageElementNode" /> + <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.PackageViewProjectNode" /> + <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.PackageViewModuleNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <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="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <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="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <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="framework" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <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.PackageViewProjectNode" /> + <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.PackageViewModuleNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <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="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <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="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <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="framework" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <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="deployment" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <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.PackageViewProjectNode" /> + <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.PackageViewModuleNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <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="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <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.PackageViewProjectNode" /> + <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.PackageViewModuleNode" /> + <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.PackageViewProjectNode" /> + <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.PackageViewModuleNode" /> + <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="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <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="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <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="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <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="stack" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <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="jbws" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <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> - </subPane> - </component> - <component name="PerforceChangeBrowserSettings"> - <option name="USE_CLIENT_FILTER" value="true" /> - <option name="CLIENT" value="" /> - </component> - <component name="PerforceDirect.Settings"> - <option name="useP4CONFIG" value="true" /> - <option name="port" value="&lt;perforce_server&gt;:1666" /> - <option name="client" value="" /> - <option name="user" value="" /> - <option name="passwd" value="" /> - <option name="showCmds" value="false" /> - <option name="useNativeApi" value="false" /> - <option name="pathToExec" value="p4" /> - <option name="useCustomPathToExec" value="false" /> - <option name="SYNC_FORCE" value="false" /> - <option name="SYNC_RUN_RESOLVE" value="true" /> - <option name="REVERT_UNCHANGED_FILES" value="true" /> - <option name="CHARSET" value="none" /> - <option name="SHOW_BRANCHES_HISTORY" value="true" /> - <option name="ENABLED" value="true" /> - <option name="USE_LOGIN" value="false" /> - <option name="LOGIN_SILENTLY" value="false" /> - <option name="INTEGRATE_RUN_RESOLVE" value="true" /> - <option name="INTEGRATE_REVERT_UNCHANGED" value="true" /> - <option name="SERVER_TIMEOUT" value="20000" /> - </component> - <component name="ProjectLevelVcsManager"> - <OptionsSetting value="true" id="Add" /> - <OptionsSetting value="true" id="Remove" /> - <OptionsSetting value="true" id="Checkin" /> - <OptionsSetting value="true" id="Checkout" /> - <OptionsSetting value="true" id="Update" /> - <OptionsSetting value="true" id="Status" /> - <OptionsSetting value="true" id="Edit" /> - <OptionsSetting value="true" id="Undo Check Out" /> - <OptionsSetting value="true" id="Compare with SourceSafe Version" /> - <OptionsSetting value="true" id="Get Latest Version" /> - <ConfirmationsSetting value="0" id="Add" /> - <ConfirmationsSetting value="0" id="Remove" /> - </component> - <component name="ProjectPane"> - <subPane> <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"> @@ -582,13 +832,13 @@ </component> <component name="ProjectView"> <navigator currentView="ProjectPane" proportions="0.16666667" version="1" splitterProportion="0.5"> - <flattenPackages PackagesPane="false" /> + <flattenPackages PackagesPane="false" ProjectPane="false" /> <showMembers /> <showModules /> <showLibraryContents /> - <hideEmptyPackages PackagesPane="false" /> + <hideEmptyPackages PackagesPane="false" ProjectPane="false" /> <abbreviatePackageNames /> - <showStructure PackagesPane="false" ProjectPane="false" /> + <showStructure Favorites="false" PackagesPane="false" ProjectPane="false" /> <autoscrollToSource /> <autoscrollFromSource /> <sortByType /> @@ -596,13 +846,29 @@ </component> <component name="PropertiesComponent"> <property name="GoToFile.includeJavaFiles" value="false" /> - <property name="GoToClass.toSaveIncludeLibraries" value="false" /> + <property name="cvs_file_history_treeOrder2" value="2" /> + <property name="cvs_file_history_treeOrder1" value="1" /> <property name="RunManagerConfig.compileBeforeRunning" value="false" /> <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" /> + <property name="cvs_file_history_treeOrder3" value="3" /> <property name="MemberChooser.sorted" value="false" /> + <property name="cvs_file_history_flatOrder2" value="2" /> + <property name="cvs_file_history_flatOrder3" value="3" /> + <property name="cvs_file_history_flatOrder0" value="0" /> + <property name="cvs_file_history_flatOrder1" value="1" /> + <property name="MemberChooser.copyJavadoc" value="false" /> + <property name="GoToClass.toSaveIncludeLibraries" value="false" /> + <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_flatWidth3" value="391" /> <property name="MemberChooser.showClasses" value="true" /> + <property name="cvs_file_history_flatWidth0" value="391" /> <property name="GoToClass.includeLibraries" value="false" /> - <property name="MemberChooser.copyJavadoc" value="false" /> + <property name="cvs_file_history_flatWidth1" value="391" /> </component> <component name="ReadonlyStatusHandler"> <option name="SHOW_DIALOG" value="true" /> @@ -624,16 +890,41 @@ </key> </component> <component name="RestoreUpdateTree" /> - <component name="RunManager" selected="Remote.client"> - <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> - <option name="MAIN_CLASS_NAME" /> - <option name="VM_PARAMETERS" /> - <option name="PROGRAM_PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <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" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="ENABLE_SWING_INSPECTOR" value="false" /> - <module name="" /> + <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> + <RunnerSettings RunnerId="Debug"> + <option name="DEBUG_PORT" value="49408" /> + <option name="TRANSPORT" value="0" /> + <option name="LOCAL" value="true" /> + </RunnerSettings> + <RunnerSettings RunnerId="Run" /> + <ConfigurationWrapper RunnerId="Debug" /> + <ConfigurationWrapper RunnerId="Run" /> + <method> + <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="" /> @@ -666,13 +957,47 @@ <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 default="true" type="Application" factoryName="Application" enabled="false" merge="false"> + <option name="MAIN_CLASS_NAME" /> + <option name="VM_PARAMETERS" /> + <option name="PROGRAM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="ENABLE_SWING_INSPECTOR" value="false" /> + <module name="" /> + <method> + <option name="Make" value="true" /> + </method> </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="METHOD_NAME" value="testWsdlLocation" /> + <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> + <RunnerSettings RunnerId="Debug"> + <option name="DEBUG_PORT" value="59919" /> + <option name="TRANSPORT" value="0" /> + <option name="LOCAL" value="true" /> + </RunnerSettings> + <RunnerSettings RunnerId="Run" /> + <ConfigurationWrapper RunnerId="Debug" /> + <ConfigurationWrapper RunnerId="Run" /> + <method> + <option name="Make" value="true" /> + </method> + </configuration> <configuration default="false" name="server" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> <option name="SERVER_MODE" value="false" /> @@ -685,6 +1010,9 @@ <option name="LOCAL" value="false" /> </RunnerSettings> <ConfigurationWrapper RunnerId="Debug" /> + <method> + <option name="Make" value="true" /> + </method> </configuration> <configuration default="false" name="client" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> @@ -698,6 +1026,9 @@ <option name="LOCAL" value="false" /> </RunnerSettings> <ConfigurationWrapper RunnerId="Debug" /> + <method> + <option name="Make" value="true" /> + </method> </configuration> </component> <component name="ScopeViewComponent" /> @@ -768,31 +1099,31 @@ </component> <component name="ToolWindowManager"> <frame x="0" y="25" width="1680" height="1000" extended-state="0" /> - <editor active="false" /> + <editor active="true" /> <layout> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" /> <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295325" order="8" /> + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32912844" order="8" /> <window_info id="simpleUML" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" /> <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27469134" order="0" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="2" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2080247" 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="-1" /> + <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="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" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.5080275" order="1" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39862543" order="4" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25585696" order="1" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38417432" order="1" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39793578" order="4" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32912844" order="8" /> + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25555557" order="1" /> <window_info id="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" /> - <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6536697" order="8" /> - <window_info id="soapUI Navigator" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.49082568" order="8" /> + <window_info id="soapUI Navigator" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" /> <window_info id="TunnelliJ 1.3" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" /> @@ -874,125 +1205,115 @@ <component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="0.16666667" version="1"> <option name="myLastEditedConfigurable" value="Local Scopes" /> </component> - <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.322179" version="1"> + <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.322179,0.5" version="1"> <option name="myPlainMode" value="false" /> - <option name="myLastEditedConfigurable" value="int-42" /> + <option name="myLastEditedConfigurable" value="jbossws-core" /> </component> - <component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="" version="1"> - <option name="myLastEditedConfigurable" /> + <component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="0.16666667" version="1"> + <option name="myLastEditedConfigurable" value="IDE Profiles" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="31" column="22" selection-start="1291" selection-end="1291" vertical-scroll-proportion="0.25866336"> + <state line="62" column="39" selection-start="2753" selection-end="2753" vertical-scroll-proportion="-0.2235723"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/wsdl/framework/WSDLLocation.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="29" column="22" selection-start="1184" selection-end="1184" vertical-scroll-proportion="0.20777643"> + <state line="30" column="13" selection-start="1098" selection-end="1098" vertical-scroll-proportion="0.23086269"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandlerFactory.java"> + <entry file="file://$PROJECT_DIR$/testsuite/src/resources/jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl"> <provider selected="true" editor-type-id="text-editor"> - <state line="31" column="47" selection-start="1276" selection-end="1276" vertical-scroll-proportion="0.25394896"> + <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/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java"> + <entry file="file://$PROJECT_DIR$/testsuite/src/resources/jaxws/tools/wsdl/async-binding.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="22" selection-start="1273" selection-end="1273" vertical-scroll-proportion="0.25394896"> + <state line="2" column="18" selection-start="78" selection-end="78" vertical-scroll-proportion="0.045184303"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandler.java"> + <entry file="file://$PROJECT_DIR$/testsuite/src/resources/jaxws/tools/wsdl/TestService.wsdl"> <provider selected="true" editor-type-id="text-editor"> - <state line="30" column="17" selection-start="1179" selection-end="1179" vertical-scroll-proportion="0.23086269"> + <state line="7" column="13" selection-start="337" selection-end="337" vertical-scroll-proportion="0.15814507"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/test/resources/jaxws/samples/wsaddressing/META-INF/wsdl/TestService.wsdl"> <provider selected="true" editor-type-id="text-editor"> - <state line="49" column="56" selection-start="1870" selection-end="1902" vertical-scroll-proportion="0.31510106"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.54116225"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/native/output/lib/jbossws-native50/jbossws-beans.xml"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/test/resources/interop/wsa/WEB-INF/wsdl/wsdl1.wsdl"> <provider selected="true" editor-type-id="text-editor"> - <state line="55" column="52" selection-start="3022" selection-end="3022" vertical-scroll-proportion="0.15133172"> + <state line="0" column="581" selection-start="577" selection-end="581" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native-config.xml"> + <entry file="file://$PROJECT_DIR$/testsuite/src/resources/jaxws/tools/wsdl/TestServiceCatalog.wsdl"> <provider selected="true" editor-type-id="text-editor"> - <state line="53" column="40" selection-start="2940" selection-end="2960" vertical-scroll-proportion="-0.055690072"> + <state line="8" column="66" selection-start="413" selection-end="454" vertical-scroll-proportion="0.18073721"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri-config.xml"> + <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="69" column="40" selection-start="3657" selection-end="3657" vertical-scroll-proportion="0.3329298"> + <state line="12" column="64" selection-start="1407" selection-end="1407" vertical-scroll-proportion="0.27602905"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/resources/jbossws-xfire-config.xml"> + <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="34" column="40" selection-start="1858" selection-end="1858" vertical-scroll-proportion="0.3329298"> + <state line="1" column="86" selection-start="164" selection-end="164" vertical-scroll-proportion="0.022592152"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebXMLRewriterImpl.java"> + <entry file="file://$PROJECT_DIR$/testsuite/ant-import/build-testsuite.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="109" column="52" selection-start="3569" selection-end="3569" vertical-scroll-proportion="0.59334123"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <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/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DefaultWebAppDesciptorModifierImpl.java"> + <entry file="file://$PROJECT_DIR$/testsuite/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="118" column="58" selection-start="4478" selection-end="4478" vertical-scroll-proportion="2.214031"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <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/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java"> + <entry file="file://$PROJECT_DIR$/build/ant.properties"> <provider selected="true" editor-type-id="text-editor"> - <state line="47" column="23" selection-start="1854" selection-end="1854" vertical-scroll-proportion="-0.27602905"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <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/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDesciptorModifier.java"> + <entry file="file://$PROJECT_DIR$/jbossws-core/ant-import-tests/build-testsuite.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="23" column="47" selection-start="1103" selection-end="1103" vertical-scroll-proportion="0.06777646"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="12" column="31" selection-start="521" selection-end="521" vertical-scroll-proportion="0.27602905"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebXMLRewriterImpl.java"> + <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="25" column="0" selection-start="1141" selection-end="1263" vertical-scroll-proportion="0.11058264"> + <state line="238" column="42" selection-start="8673" selection-end="8673" vertical-scroll-proportion="0.59806293"> <folding> <element signature="imports" expanded="true" /> </folding> Modified: trunk/integration/jboss40/int-40.iml =================================================================== --- trunk/integration/jboss40/int-40.iml 2007-07-31 14:46:49 UTC (rev 4035) +++ trunk/integration/jboss40/int-40.iml 2007-07-31 14:47:35 UTC (rev 4036) @@ -21,11 +21,52 @@ <orderEntry type="module" module-name="int-42" /> <orderEntry type="module" module-name="jbossws-core" /> <orderEntry type="module" module-name="42-server" /> - <orderEntry type="library" name="jboss-jmx" level="project" /> - <orderEntry type="library" name="jboss-logging-spi" level="project" /> - <orderEntry type="library" name="jboss-system" level="project" /> - <orderEntry type="library" name="jboss-system-jmx" level="project" /> <orderEntry type="library" name="jaxws-api" level="application" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../jbossas/tags/JBoss_4_0_5_GA_CP05/build/output/jboss-4.0.5.GA_CP05-ejb3/lib/log4j-boot.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../jbossas/tags/JBoss_4_0_5_GA_CP05/build/output/jboss-4.0.5.GA_CP05-ejb3/lib/jboss-system.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../jbossas/tags/JBoss_4_0_5_GA_CP05/build/output/jboss-4.0.5.GA_CP05-ejb3/lib/jboss-jmx.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../jbossas/tags/JBoss_4_0_5_GA_CP05/build/output/jboss-4.0.5.GA_CP05-ejb3/lib/jboss-common.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../jbossas/tags/JBoss_4_0_5_GA_CP05/build/output/jboss-4.0.5.GA_CP05-ejb3/client/jbossall-client.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-07-31 14:46:49 UTC (rev 4035) +++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-07-31 14:47:35 UTC (rev 4036) @@ -10,7 +10,8 @@ <project> - <property name="tests.output.dir" value="${core.dir}/output/tests"/> + <property environment="env"/> + <property name="tests.output.dir" value="${core.dir}/output/tests"/> <import file="${build.dir}/ant-import/build-testsuite.xml"/> <property name="tests.dir" value="${core.dir}/src/test"/> @@ -38,12 +39,26 @@ <pathelement location="${core.dir}/thirdparty/wstx.jar"/> </path> - <path id="tests.extra.classpath"> + <path id="wsconsume.classpath"> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${core.dir}/thirdparty/jaxb-xjc.jar"/> + <pathelement location="${core.dir}/thirdparty/jaxb-impl.jar"/> + <pathelement location="${core.dir}/thirdparty/jaxws-rt.jar"/> + <pathelement location="${core.dir}/thirdparty/jaxws-tools.jar"/> + <pathelement location="${core.dir}/thirdparty/stax-api.jar"/> + <pathelement location="${core.dir}/thirdparty/stax-ex.jar"/> + <pathelement location="${core.dir}/thirdparty/streambuffer.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> - <!-- The jBPM BPEL classpath --> + <!-- The jBPM BPEL classpath --> <path id="jbpm.bpel.classpath"> <path refid="ws.stack.classpath"/> <pathelement location="${core.dir}/thirdparty/jbpm-bpel"/> <!-- jbpm.cfg.xml --> @@ -72,17 +87,8 @@ <!-- Define the JAX-WS wsconsume task --> <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> - <classpath refid="ws.stack.classpath"/> - <classpath location="${spi.dir}/output/lib/jbossws-spi.jar"/> - - <classpath location="${core.dir}/thirdparty/jaxb-xjc.jar"/> - <classpath location="${core.dir}/thirdparty/jaxb-impl.jar"/> - <classpath location="${core.dir}/thirdparty/jaxws-rt.jar"/> - <classpath location="${core.dir}/thirdparty/jaxws-tools.jar"/> - <classpath location="${core.dir}/thirdparty/stax-api.jar"/> - <classpath location="${core.dir}/thirdparty/stax-ex.jar"/> - <classpath location="${core.dir}/thirdparty/streambuffer.jar"/> - <classpath location="${core.dir}/thirdparty/wstx.jar"/> + <classpath refid="ws.stack.classpath"/> + <classpath refid="wsconsume.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"/> Modified: trunk/jbossws-core/jbossws-core.iml =================================================================== --- trunk/jbossws-core/jbossws-core.iml 2007-07-31 14:46:49 UTC (rev 4035) +++ trunk/jbossws-core/jbossws-core.iml 2007-07-31 14:47:35 UTC (rev 4036) @@ -76,15 +76,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/apache-tomcat.zip!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/jboss-deployers.jar!/" /> </CLASSES> <JAVADOC /> @@ -292,15 +283,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jaxws-rt.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/javassist.jar!/" /> </CLASSES> <JAVADOC /> @@ -400,15 +382,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jbossws-wsconsume-impl.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/jaxen.jar!/" /> </CLASSES> <JAVADOC /> @@ -490,15 +463,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jaxws-tools.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/xercesImpl.jar!/" /> </CLASSES> <JAVADOC /> @@ -526,15 +490,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/hudson.war!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/ejb3.deployer/jboss-ejb3.jar!/" /> </CLASSES> <JAVADOC /> @@ -560,7 +515,7 @@ </library> </orderEntry> <orderEntry type="module" module-name="spi" /> - <orderEntry type="library" name="junit" level="application" /> + <orderEntry type="module" module-name="sunri-sources" /> <orderEntryProperties /> </component> </module> Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java 2007-07-31 14:47:35 UTC (rev 4036) @@ -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.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/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/tools/wsdl/jax-ws-catalog.xml") ); + consumer.setGenerateSource(true); + consumer.setOutputDirectory(outputDirectory); + consumer.consume("resources/jaxws/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/tools/wsdl/TestService.wsdl"); + } + +} Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/testsuite/src/resources/jaxws/tools/wsdl/TestService.wsdl =================================================================== --- trunk/testsuite/src/resources/jaxws/tools/wsdl/TestService.wsdl (rev 0) +++ trunk/testsuite/src/resources/jaxws/tools/wsdl/TestService.wsdl 2007-07-31 14:47:35 UTC (rev 4036) @@ -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/tools/wsdl/TestService.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/testsuite/src/resources/jaxws/tools/wsdl/TestServiceCatalog.wsdl =================================================================== --- trunk/testsuite/src/resources/jaxws/tools/wsdl/TestServiceCatalog.wsdl (rev 0) +++ trunk/testsuite/src/resources/jaxws/tools/wsdl/TestServiceCatalog.wsdl 2007-07-31 14:47:35 UTC (rev 4036) @@ -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/tools/wsdl/TestServiceCatalog.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/testsuite/src/resources/jaxws/tools/wsdl/async-binding.xml =================================================================== --- trunk/testsuite/src/resources/jaxws/tools/wsdl/async-binding.xml (rev 0) +++ trunk/testsuite/src/resources/jaxws/tools/wsdl/async-binding.xml 2007-07-31 14:47:35 UTC (rev 4036) @@ -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/tools/wsdl/async-binding.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/testsuite/src/resources/jaxws/tools/wsdl/jax-ws-catalog.xml =================================================================== --- trunk/testsuite/src/resources/jaxws/tools/wsdl/jax-ws-catalog.xml (rev 0) +++ trunk/testsuite/src/resources/jaxws/tools/wsdl/jax-ws-catalog.xml 2007-07-31 14:47:35 UTC (rev 4036) @@ -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/tools/wsdl/jax-ws-catalog.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/testsuite/src/resources/jaxws/tools/wsdl/ws-addr-wsdl.xsd =================================================================== --- trunk/testsuite/src/resources/jaxws/tools/wsdl/ws-addr-wsdl.xsd (rev 0) +++ trunk/testsuite/src/resources/jaxws/tools/wsdl/ws-addr-wsdl.xsd 2007-07-31 14:47:35 UTC (rev 4036) @@ -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/tools/wsdl/ws-addr-wsdl.xsd ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/testsuite/testsuite.iml =================================================================== --- trunk/testsuite/testsuite.iml 2007-07-31 14:46:49 UTC (rev 4035) +++ trunk/testsuite/testsuite.iml 2007-07-31 14:47:35 UTC (rev 4036) @@ -2,7 +2,9 @@ <module version="4" relativePaths="true" type="JAVA_MODULE"> <component name="ModuleRootManager" /> <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/../integration/spi/output/classes" /> <exclude-output /> + <output-test url="file://$MODULE_DIR$/../integration/spi/output/tests/classes" /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" /> </content> @@ -71,8 +73,19 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="library" name="junit" level="application" /> <orderEntry type="module" module-name="spi" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../integration/spi/thirdparty/junit.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module" module-name="jbossws-core" /> + <orderEntry type="library" name="tools" level="application" /> + <orderEntry type="module" module-name="sunri-sources" /> <orderEntryProperties /> </component> </module>