9:35 a.m.
Author: heiko.braun(a)jboss.com
Date: 2007-08-02 10:35:28 -0400 (Thu, 02 Aug 2007)
New Revision: 4103
Added:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTrackerFactory.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java
Removed:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java
Modified:
trunk/JBossWS-Trunk.ipr
trunk/JBossWS-Trunk.iws
trunk/integration/jboss40/int-40.iml
trunk/integration/jboss42/int-42.iml
trunk/integration/jboss50/int-50.iml
trunk/integration/native/int-native.iml
trunk/integration/sunri/int-sunri.iml
trunk/integration/xfire/int-xfire.iml
trunk/jbossws-core/jbossws-core.iml
trunk/testsuite/testsuite.iml
Log:
Added test case for WSConsume command line interface
Modified: trunk/JBossWS-Trunk.ipr
===================================================================
--- trunk/JBossWS-Trunk.ipr 2007-08-02 14:00:54 UTC (rev 4102)
+++ trunk/JBossWS-Trunk.ipr 2007-08-02 14:35:28 UTC (rev 4103)
@@ -268,6 +268,7 @@
<module fileurl="file://$PROJECT_DIR$/integration/xfire/int-xfire.iml"
filepath="$PROJECT_DIR$/integration/xfire/int-xfire.iml" />
<module fileurl="file://$PROJECT_DIR$/jbossws-core/jbossws-core.iml"
filepath="$PROJECT_DIR$/jbossws-core/jbossws-core.iml" />
<module fileurl="file://$PROJECT_DIR$/integration/spi/spi.iml"
filepath="$PROJECT_DIR$/integration/spi/spi.iml" />
+ <module
fileurl="file:///home/hbraun/dev/prj/jbossws/spi/trunk/spi-trunk.iml"
filepath="/home/hbraun/dev/prj/jbossws/spi/trunk/spi-trunk.iml" />
<module
fileurl="file:///home/hbraun/dev/prj/jaxws-2.1.1/sunri-sources.iml"
filepath="/home/hbraun/dev/prj/jaxws-2.1.1/sunri-sources.iml" />
<module fileurl="file://$PROJECT_DIR$/testsuite/testsuite.iml"
filepath="$PROJECT_DIR$/testsuite/testsuite.iml" />
</modules>
Modified: trunk/JBossWS-Trunk.iws
===================================================================
--- trunk/JBossWS-Trunk.iws 2007-08-02 14:00:54 UTC (rev 4102)
+++ trunk/JBossWS-Trunk.iws 2007-08-02 14:35:28 UTC (rev 4103)
@@ -20,22 +20,21 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/build/ant-import/build-testsuite.xml"
afterPath="$PROJECT_DIR$/build/ant-import/build-testsuite.xml" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestService.wsdl"
/>
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java"
/>
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools"
/>
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java"
/>
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke"
/>
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools/wsdl/async-binding.xml"
/>
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools/wsdl" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools/wsdl/jax-ws-catalog.xml"
/>
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl"
/>
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBean.java"
/>
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/integration/jboss50/int-50.iml"
afterPath="$PROJECT_DIR$/integration/jboss50/int-50.iml" />
+ <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java"
/>
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/integration/sunri/int-sunri.iml"
afterPath="$PROJECT_DIR$/integration/sunri/int-sunri.iml" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/integration/jboss42/int-42.iml"
afterPath="$PROJECT_DIR$/integration/jboss42/int-42.iml" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/integration/native/int-native.iml"
afterPath="$PROJECT_DIR$/integration/native/int-native.iml" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/integration/xfire/int-xfire.iml"
afterPath="$PROJECT_DIR$/integration/xfire/int-xfire.iml" />
+ <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/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTrackerFactory.java"
/>
+ <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java"
/>
+ <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java"
/>
<change type="MODIFICATION"
beforePath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_0.dtd"
afterPath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_0.dtd"
/>
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools" />
- <change type="NEW" beforePath=""
afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools/wsdl/ws-addr-wsdl.xsd"
/>
+ <change type="DELETED"
beforePath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java"
afterPath="" />
<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$/jbossws-core/jbossws-core.iml"
afterPath="$PROJECT_DIR$/jbossws-core/jbossws-core.iml" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -224,7 +223,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint
url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java"
line="193" class="org.jboss.test.ws.jaxws.tools.WSConsumerTestCase"
package="org.jboss.test.ws.jaxws.tools">
+ <breakpoint
url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java"
line="193"
class="org.jboss.test.ws.jaxws.smoke.tools.WSConsumerTestCase"
package="org.jboss.test.ws.jaxws.smoke.tools">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -237,7 +236,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint
url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java"
line="257" class="org.jboss.test.ws.jaxws.tools.WSConsumerTestCase"
package="org.jboss.test.ws.jaxws.tools">
+ <breakpoint
url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java"
line="257"
class="org.jboss.test.ws.jaxws.smoke.tools.WSConsumerTestCase"
package="org.jboss.test.ws.jaxws.smoke.tools">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -263,7 +262,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint
url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java"
line="112" class="org.jboss.test.ws.jaxws.tools.WSProvideTestCase"
package="org.jboss.test.ws.jaxws.tools">
+ <breakpoint
url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java"
line="112"
class="org.jboss.test.ws.jaxws.smoke.tools.WSProviderTestCase"
package="org.jboss.test.ws.jaxws.smoke.tools">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -276,7 +275,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint
url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java"
line="77" class="org.jboss.test.ws.jaxws.tools.WSProvideTestCase"
package="org.jboss.test.ws.jaxws.tools">
+ <breakpoint
url="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/wscompile/WsgenTool.java"
line="91" class="com.sun.tools.ws.wscompile.WsgenTool"
package="com.sun.tools.ws.wscompile">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -289,7 +288,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint
url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java"
line="80" class="org.jboss.test.ws.jaxws.tools.WSProvideTestCase"
package="org.jboss.test.ws.jaxws.tools">
+ <breakpoint
url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java"
line="54"
class="org.jboss.test.ws.jaxws.smoke.tools.CmdConsumeTestCase.InterceptedSecurity"
package="org.jboss.test.ws.jaxws.smoke.tools">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -302,7 +301,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint
url="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/wscompile/WsgenTool.java"
line="91" class="com.sun.tools.ws.wscompile.WsgenTool"
package="com.sun.tools.ws.wscompile">
+ <breakpoint
url="file:///home/hbraun/dev/prj/jbossws/spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java"
line="122" class="org.jboss.wsf.spi.tools.cmd.WSConsume"
package="org.jboss.wsf.spi.tools.cmd">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -383,50 +382,53 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="build-testsuite.xml" pinned="false"
current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/build/ant-import/build-testsuite.xml">
+ <file leaf-file-name="CmdConsumeTestCase.java"
pinned="false" current="true" current-in-tab="true">
+ <entry
file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java">
<provider selected="true"
editor-type-id="text-editor">
- <state line="398" column="14"
selection-start="19181" selection-end="19181"
vertical-scroll-proportion="0.748184">
- <folding />
+ <state line="126" column="62"
selection-start="4043" selection-end="4043"
vertical-scroll-proportion="0.55410224">
+ <folding>
+ <element signature="imports" expanded="true"
/>
+ <element
signature="class#InterceptedExit#0;class#CmdConsumeTestCase#0"
expanded="false" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ant.properties" pinned="false"
current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/build/ant.properties">
+ <file leaf-file-name="WSConsume.java" pinned="false"
current="false" current-in-tab="false">
+ <entry
file="file:///home/hbraun/dev/prj/jbossws/spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java">
<provider selected="true"
editor-type-id="text-editor">
- <state line="47" column="26"
selection-start="1533" selection-end="1558"
vertical-scroll-proportion="0.50297266">
- <folding />
+ <state line="123" column="0"
selection-start="4912" selection-end="4912"
vertical-scroll-proportion="0.19262782">
+ <folding>
+ <element signature="imports" expanded="true"
/>
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="WSConsumerTestCase.java"
pinned="false" current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java">
+ <file leaf-file-name="WSProvide.java" pinned="false"
current="false" current-in-tab="false">
+ <entry
file="file:///home/hbraun/dev/prj/jbossws/spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java">
<provider selected="true"
editor-type-id="text-editor">
- <state line="281" column="46"
selection-start="10059" selection-end="10059"
vertical-scroll-proportion="0.7699758">
+ <state line="227" column="28"
selection-start="7508" selection-end="7508"
vertical-scroll-proportion="4.428062">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="WSProvideTestCase.java" pinned="false"
current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java">
+ <file leaf-file-name="WSConsumerTestCase.java"
pinned="false" current="false" current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java">
<provider selected="true"
editor-type-id="text-editor">
- <state line="100" column="42"
selection-start="2978" selection-end="2978"
vertical-scroll-proportion="0.4233056">
+ <state line="44" column="13"
selection-start="1668" selection-end="1668"
vertical-scroll-proportion="0.13801453">
<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$/integration/native/ant-import/build-testsuite.xml">
+ <file leaf-file-name="CmdConsumeTracker.java" pinned="false"
current="false" current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java">
<provider selected="true"
editor-type-id="text-editor">
- <state line="26" column="20"
selection-start="1252" selection-end="1252"
vertical-scroll-proportion="0.59806293">
+ <state line="34" column="13"
selection-start="1285" selection-end="1285"
vertical-scroll-proportion="0.07372176">
<folding>
- <marker date="1186047277000" expanded="true"
signature="1397:2394" placeholder="..." />
- <marker date="1186047277000" expanded="true"
signature="1397:1960" placeholder="..." />
- <marker date="1186047277000" expanded="true"
signature="1397:1774" placeholder="..." />
+ <element signature="imports" expanded="true"
/>
</folding>
</state>
</provider>
@@ -514,6 +516,10 @@
<option name="myItemId" value="JBossWS-Trunk.ipr" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="testsuite" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -521,9 +527,13 @@
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="int-native" />
+ <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>
@@ -531,13 +541,17 @@
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="int-native" />
+ <option name="myItemId" value="testsuite" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/integration/native" />
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/testsuite" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/testsuite/src" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -545,17 +559,49 @@
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="int-native" />
+ <option name="myItemId" value="testsuite" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/integration/native" />
+ <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$/integration/native/ant-import" />
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/testsuite/src" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -563,21 +609,69 @@
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="build" />
+ <option name="myItemId" value="testsuite" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/testsuite" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/testsuite/src" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="JBossWS-Trunk.ipr" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="build" />
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="int-xfire" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
<PATH_ELEMENT>
- <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/build" />
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="int-xfire" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/integration/xfire" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -587,18 +681,66 @@
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="build" />
+ <option name="myItemId" value="int-xfire" />
<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="myItemId"
value="PsiDirectory:$PROJECT_DIR$/integration/xfire" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/build/ant-import" />
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/test" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/test/resources" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="int-xfire" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/integration/xfire" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/test" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="int-xfire" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/integration/xfire" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
</subPane>
</component>
<component name="ProjectReloadState">
@@ -665,13 +807,13 @@
</component>
<component name="RestoreUpdateTree" />
<component name="RunManager" selected="Remote.client">
- <tempConfiguration default="false"
name="WSProvideTestCase.testOutputDirectory" type="JUnit"
factoryName="JUnit" enabled="false" merge="false">
+ <tempConfiguration default="false"
name="WSProviderTestCase.testOutputDirectory" type="JUnit"
factoryName="JUnit" enabled="false" merge="false">
<pattern value="org.jboss.test.ws.jaxws.tools.*" />
<module name="testsuite" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false"
/>
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME"
value="org.jboss.test.ws.jaxws.smoke.tools" />
- <option name="MAIN_CLASS_NAME"
value="org.jboss.test.ws.jaxws.smoke.tools.WSProvideTestCase" />
+ <option name="MAIN_CLASS_NAME"
value="org.jboss.test.ws.jaxws.smoke.tools.WSProviderTestCase" />
<option name="METHOD_NAME" value="testOutputDirectory"
/>
<option name="TEST_OBJECT" value="method" />
<option name="VM_PARAMETERS" />
@@ -689,9 +831,6 @@
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
- <method>
- <option name="Make" value="true" />
- </method>
</tempConfiguration>
<configuration default="true" type="JUnit"
factoryName="JUnit" enabled="false" merge="false">
<module name="" />
@@ -744,6 +883,31 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false"
/>
<option name="ALTERNATIVE_JRE_PATH" />
</configuration>
+ <configuration default="false"
name="WSProviderTestCase.testOutputDirectory" type="JUnit"
factoryName="JUnit" enabled="false" merge="false">
+ <pattern value="org.jboss.test.ws.jaxws.tools.*" />
+ <module name="testsuite" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false"
/>
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PACKAGE_NAME"
value="org.jboss.test.ws.jaxws.smoke.tools" />
+ <option name="MAIN_CLASS_NAME"
value="org.jboss.test.ws.jaxws.smoke.tools.WSProviderTestCase" />
+ <option name="METHOD_NAME" value="testOutputDirectory"
/>
+ <option name="TEST_OBJECT" value="method" />
+ <option name="VM_PARAMETERS" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$"
/>
+ <option name="ADDITIONAL_CLASS_PATH" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="wholeProject" />
+ </option>
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="60976" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="true" />
+ </RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
+ <ConfigurationWrapper RunnerId="Run" />
+ </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" />
@@ -893,7 +1057,7 @@
<window_info id="simpleUML" active="false"
anchor="left" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="false" weight="0.33"
order="3" />
<window_info id="TODO" active="false"
anchor="bottom" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="false" weight="0.33"
order="7" />
<window_info id="File View" active="false"
anchor="right" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="false" weight="0.33"
order="3" />
- <window_info id="Project" active="false"
anchor="left" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="true" weight="0.26419753"
order="0" />
+ <window_info id="Project" active="false"
anchor="left" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="true" weight="0.25555557"
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" />
@@ -901,7 +1065,7 @@
<window_info id="Find" active="false"
anchor="bottom" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="false" weight="0.38417432"
order="1" />
<window_info id="Debug" active="false"
anchor="bottom" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="false" weight="0.39793578"
order="4" />
<window_info id="Messages" active="false"
anchor="bottom" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="false" weight="0.32912844"
order="8" />
- <window_info id="Structure" active="false"
anchor="left" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="false" weight="0.25555557"
order="1" />
+ <window_info id="Structure" active="false"
anchor="left" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="false" weight="0.23024692"
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" />
@@ -930,7 +1094,7 @@
<option name="PERFORM_COMMIT_IN_BACKGROUND" value="false"
/>
<option name="PUT_FOCUS_INTO_COMMENT" value="false" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
- <option name="LAST_COMMIT_MESSAGE" value="really exclude
jaxws/tools tests for xfire" />
+ <option name="LAST_COMMIT_MESSAGE" value="update exclude
files" />
<option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
<option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8"
/>
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT"
value="false" />
@@ -946,6 +1110,8 @@
<MESSAGE value="Display information about output and source directories being
used" />
<MESSAGE value="Implement SPIView marker" />
<MESSAGE value="really exclude jaxws/tools tests for xfire" />
+ <MESSAGE value="fix deploy macros" />
+ <MESSAGE value="update exclude files" />
</component>
<component name="VssConfiguration">
<option name="CLIENT_PATH" value="" />
@@ -993,118 +1159,116 @@
</component>
<component
name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable"
proportions="0.322179,0.5" version="1">
<option name="myPlainMode" value="false" />
- <option name="myLastEditedConfigurable" value="int-sunri"
/>
+ <option name="myLastEditedConfigurable" value="testsuite"
/>
</component>
<component name="com.intellij.profile.ui.ErrorOptionsConfigurable"
proportions="0.16666667" version="1">
<option name="myLastEditedConfigurable" value="IDE Profiles"
/>
</component>
<component name="editorHistoryManager">
- <entry
file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandlerFactory.java">
+ <entry
file="file://$PROJECT_DIR$/integration/sunri/ant-import/build-deploy.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="38" column="33"
selection-start="1550" selection-end="1550"
vertical-scroll-proportion="0.39246657">
+ <state line="30" column="0"
selection-start="1635" selection-end="1635"
vertical-scroll-proportion="0.33293697">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/ServiceRefHandlerImpl.java">
+ <entry
file="file://$PROJECT_DIR$/integration/sunri/ant-import/macros-deploy-sunri.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="67" column="88"
selection-start="2423" selection-end="2423"
vertical-scroll-proportion="-0.42326733">
+ <state line="119" column="28"
selection-start="4682" selection-end="4682"
vertical-scroll-proportion="0.3329298">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java">
+ <entry
file="file://$PROJECT_DIR$/build/ant-import/build-testsuite.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="57" column="13"
selection-start="2274" selection-end="2274"
vertical-scroll-proportion="0.37623763">
+ <state line="388" column="28"
selection-start="18729" selection-end="18729"
vertical-scroll-proportion="0.4503632">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/integration/native/ant-import/macros-deploy-native.xml">
+ <entry
file="file://$PROJECT_DIR$/integration/xfire/ant-import/macros-deploy-xfire.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="160" column="55"
selection-start="7335" selection-end="7370"
vertical-scroll-proportion="3.3922517">
+ <state line="113" column="31"
selection-start="4642" selection-end="4642"
vertical-scroll-proportion="0.3329298">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/native/build.xml">
+ <entry
file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0"
selection-end="0" vertical-scroll-proportion="-0.06900726">
+ <state line="54" column="32"
selection-start="1829" selection-end="1829"
vertical-scroll-proportion="-0.97146255">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/build/build.xml">
+ <entry
file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTrackerFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0"
selection-end="0" vertical-scroll-proportion="-3.0714285">
- <folding />
+ <state line="30" column="38"
selection-start="1249" selection-end="1274"
vertical-scroll-proportion="0.23086269">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/integration/native/ant-import/build-deploy.xml">
+ <entry
file="file:///home/hbraun/dev/prj/jbossws/spi/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0"
selection-end="0" vertical-scroll-proportion="-0.34503633">
+ <state line="71" column="21"
selection-start="2786" selection-end="2786"
vertical-scroll-proportion="1.0581683">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/integration/xfire/src/test/resources/test-excludes-jboss42.txt">
+ <entry
file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="57" column="32"
selection-start="1975" selection-end="1975"
vertical-scroll-proportion="0.82066506">
+ <state line="44" column="13"
selection-start="1668" selection-end="1668"
vertical-scroll-proportion="0.13801453">
<folding />
</state>
</provider>
</entry>
<entry
file="file://$PROJECT_DIR$/integration/xfire/src/test/resources/test-excludes-jboss50.txt">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0"
selection-end="0" vertical-scroll-proportion="-0.4655582">
+ <state line="57" column="38"
selection-start="1981" selection-end="1981"
vertical-scroll-proportion="0.8192628">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/integration/native/ant-import/build-testsuite.xml">
+ <entry
file="file://$PROJECT_DIR$/integration/xfire/src/test/resources/test-excludes-jboss42.txt">
<provider selected="true" editor-type-id="text-editor">
- <state line="26" column="20"
selection-start="1252" selection-end="1252"
vertical-scroll-proportion="0.59806293">
- <folding>
- <marker date="1186047277000" expanded="true"
signature="1397:2394" placeholder="..." />
- <marker date="1186047277000" expanded="true"
signature="1397:1960" placeholder="..." />
- <marker date="1186047277000" expanded="true"
signature="1397:1774" placeholder="..." />
- </folding>
- </state>
- </provider>
- </entry>
- <entry
file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="100" column="42"
selection-start="2978" selection-end="2978"
vertical-scroll-proportion="0.4233056">
+ <state line="57" column="0"
selection-start="1943" selection-end="1981"
vertical-scroll-proportion="0.8192628">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java">
+ <entry
file="file:///home/hbraun/dev/prj/jbossws/spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="281" column="46"
selection-start="10059" selection-end="10059"
vertical-scroll-proportion="0.7699758">
+ <state line="227" column="28"
selection-start="7508" selection-end="7508"
vertical-scroll-proportion="4.428062">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/build/ant-import/build-testsuite.xml">
+ <entry
file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="398" column="14"
selection-start="19181" selection-end="19181"
vertical-scroll-proportion="0.748184">
- <folding />
+ <state line="34" column="13"
selection-start="1285" selection-end="1285"
vertical-scroll-proportion="0.07372176">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/build/version.properties">
+ <entry
file="file:///home/hbraun/dev/prj/jbossws/spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0"
selection-end="0" vertical-scroll-proportion="0.0">
- <folding />
+ <state line="123" column="0"
selection-start="4912" selection-end="4912"
vertical-scroll-proportion="0.19262782">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/build/ant.properties">
+ <entry
file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="47" column="26"
selection-start="1533" selection-end="1558"
vertical-scroll-proportion="0.50297266">
- <folding />
+ <state line="126" column="62"
selection-start="4043" selection-end="4043"
vertical-scroll-proportion="0.55410224">
+ <folding>
+ <element signature="imports" expanded="true" />
+ <element
signature="class#InterceptedExit#0;class#CmdConsumeTestCase#0"
expanded="false" />
+ </folding>
</state>
</provider>
</entry>
Modified: trunk/integration/jboss40/int-40.iml
===================================================================
--- trunk/integration/jboss40/int-40.iml 2007-08-02 14:00:54 UTC (rev 4102)
+++ trunk/integration/jboss40/int-40.iml 2007-08-02 14:35:28 UTC (rev 4103)
@@ -8,7 +8,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="spi" />
<orderEntry type="module-library">
<library>
<CLASSES>
Modified: trunk/integration/jboss42/int-42.iml
===================================================================
--- trunk/integration/jboss42/int-42.iml 2007-08-02 14:00:54 UTC (rev 4102)
+++ trunk/integration/jboss42/int-42.iml 2007-08-02 14:35:28 UTC (rev 4103)
@@ -8,7 +8,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="spi" />
<orderEntry type="module" module-name="42-ejb3" />
<orderEntry type="module" module-name="42-server" />
<orderEntry type="library" name="jaxws-api"
level="application" />
Modified: trunk/integration/jboss50/int-50.iml
===================================================================
--- trunk/integration/jboss50/int-50.iml 2007-08-02 14:00:54 UTC (rev 4102)
+++ trunk/integration/jboss50/int-50.iml 2007-08-02 14:35:28 UTC (rev 4103)
@@ -9,7 +9,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="spi" />
<orderEntry type="module" module-name="as-server" />
<orderEntry type="module" module-name="as-system" />
<orderEntry type="module" module-name="as-tomcat" />
Modified: trunk/integration/native/int-native.iml
===================================================================
--- trunk/integration/native/int-native.iml 2007-08-02 14:00:54 UTC (rev 4102)
+++ trunk/integration/native/int-native.iml 2007-08-02 14:35:28 UTC (rev 4103)
@@ -10,7 +10,6 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="jbossws-core" />
- <orderEntry type="module" module-name="spi" />
<orderEntry type="library" name="jboss-logging-spi"
level="project" />
<orderEntry type="module-library">
<library>
Modified: trunk/integration/sunri/int-sunri.iml
===================================================================
--- trunk/integration/sunri/int-sunri.iml 2007-08-02 14:00:54 UTC (rev 4102)
+++ trunk/integration/sunri/int-sunri.iml 2007-08-02 14:35:28 UTC (rev 4103)
@@ -8,7 +8,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="spi" />
<orderEntry type="module" module-name="sunri-sources" />
<orderEntry type="module-library">
<library>
Modified: trunk/integration/xfire/int-xfire.iml
===================================================================
--- trunk/integration/xfire/int-xfire.iml 2007-08-02 14:00:54 UTC (rev 4102)
+++ trunk/integration/xfire/int-xfire.iml 2007-08-02 14:35:28 UTC (rev 4103)
@@ -8,7 +8,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="spi" />
<orderEntry type="library" name="jboss-logging-spi"
level="project" />
<orderEntry type="module-library">
<library>
Modified: trunk/jbossws-core/jbossws-core.iml
===================================================================
--- trunk/jbossws-core/jbossws-core.iml 2007-08-02 14:00:54 UTC (rev 4102)
+++ trunk/jbossws-core/jbossws-core.iml 2007-08-02 14:35:28 UTC (rev 4103)
@@ -514,7 +514,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module" module-name="spi" />
<orderEntry type="module" module-name="sunri-sources" />
<orderEntryProperties />
</component>
Added:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java
(rev 0)
+++
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java 2007-08-02
14:35:28 UTC (rev 4103)
@@ -0,0 +1,165 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.smoke.tools;
+
+import junit.framework.TestCase;
+import org.jboss.wsf.spi.tools.cmd.WSConsume;
+
+import java.security.Permission;
+
+/**
+ * Test the command line interface to WSConsume.
+ *
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class CmdConsumeTestCase extends TestCase
+{
+
+ SecurityManager systemDefault = System.getSecurityManager();
+ SecurityManager interceptor = new InterceptedSecurity();
+
+ class InterceptedSecurity extends SecurityManager
+ {
+ private final SecurityManager parent = systemDefault;
+
+ public void checkPermission(Permission perm)
+ {
+ if (parent != null)
+ {
+ parent.checkPermission(perm);
+ }
+ }
+
+ public void checkExit(int status)
+ {
+ String msg = (status == 0) ? "WSConsume did exit without errors" :
"WSConsume did exit with an error";
+ throw new InterceptedExit(msg, status);
+ }
+ }
+
+ class InterceptedExit extends SecurityException
+ {
+ private int exitCode;
+
+ public InterceptedExit(String s, int code)
+ {
+ super(s);
+ this.exitCode = code;
+ }
+
+
+ public int getExitCode()
+ {
+ return exitCode;
+ }
+ }
+
+ private void swapSecurityManager()
+ {
+ if(System.getSecurityManager() instanceof InterceptedSecurity)
+ System.setSecurityManager(systemDefault);
+ else
+ System.setSecurityManager(interceptor);
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ // enforce loading of the tracker implemenation
+ System.setProperty(
+ "org.jboss.wsf.spi.tools.ConsumerFactoryImpl",
+ "org.jboss.test.ws.jaxws.smoke.tools.CmdConsumeTrackerFactory"
+ );
+ }
+
+ /*
+ new LongOpt("binding", LongOpt.REQUIRED_ARGUMENT, null, 'b'),
+ new LongOpt("catalog", LongOpt.REQUIRED_ARGUMENT, null, 'c'),
+ new LongOpt("package", LongOpt.REQUIRED_ARGUMENT, null, 'p'),
+ new LongOpt("wsdlLocation", LongOpt.REQUIRED_ARGUMENT, null,
'w'),
+ new LongOpt("output", LongOpt.REQUIRED_ARGUMENT, null, 'o'),
+ new LongOpt("source", LongOpt.REQUIRED_ARGUMENT, null, 's'),
+ new LongOpt("target", LongOpt.REQUIRED_ARGUMENT, null, 't'),
+ new LongOpt("keep", LongOpt.NO_ARGUMENT, null, 'k'),
+ new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'),
+ new LongOpt("quiet", LongOpt.NO_ARGUMENT, null, 'q'),
+ new LongOpt("verbose", LongOpt.NO_ARGUMENT, null, 'v'),
+ new LongOpt("load-consumer", LongOpt.NO_ARGUMENT, null, 'l'),
+
+ */
+
+ public void testInvalidBindingOption() throws Exception
+ {
+ executeCmd("-b", true);
+ }
+
+ public void testValidBindingOption() throws Exception
+ {
+ executeCmd("-b binding-file.xml Service.wsdl", false);
+ }
+
+ public void testMissingOptions() throws Exception
+ {
+ executeCmd("", false); // strange, shouldn't this exit(1) ?
+ }
+
+ // TODO: add arbitrary combinations on a case by case basis
+
+ /**
+ * Pass a number of arguments to WSConsume and specify if
+ * you expect this to cause an exception.
+ *
+ * @param arguments
+ * @param expectedException
+ * @throws Exception
+ */
+ private void executeCmd(String arguments, boolean expectedException) throws
Exception
+ {
+ swapSecurityManager();
+
+ String[] args = arguments.split("\\s");
+ try
+ {
+ WSConsume.main(args);
+ if(expectedException)
+ fail("Did expect exception on args: " +args);
+ }
+ catch (InterceptedExit e)
+ {
+ boolean positivStatus = (e.getExitCode() == 0);
+ if( (expectedException && positivStatus)
+ || (!expectedException && !positivStatus) )
+ {
+ String s = expectedException ? "Did expect an exception, but " :
"Did not expect an exception, but ";
+ String s2 = positivStatus ? "status was positiv" : "status was
negativ";
+ throw new Exception(s+s2);
+ }
+
+ }
+ finally
+ {
+ swapSecurityManager();
+ }
+ }
+}
Property changes on:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java
(rev 0)
+++
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java 2007-08-02
14:35:28 UTC (rev 4103)
@@ -0,0 +1,93 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.smoke.tools;
+
+import org.jboss.wsf.spi.tools.WSContractConsumer;
+
+import java.io.File;
+import java.io.PrintStream;
+import java.util.List;
+import java.net.URL;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class CmdConsumeTracker extends WSContractConsumer
+{
+ public static String LAST_EVENT = "";
+
+ public void setBindingFiles(List<File> bindingFiles)
+ {
+ LAST_EVENT = "setBindingFiles";
+ }
+
+ public void setCatalog(File catalog)
+ {
+
+ }
+
+ public void setOutputDirectory(File directory)
+ {
+
+ }
+
+ public void setSourceDirectory(File directory)
+ {
+
+ }
+
+ public void setGenerateSource(boolean generateSource)
+ {
+
+ }
+
+ public void setTargetPackage(String targetPackage)
+ {
+
+ }
+
+ public void setWsdlLocation(String wsdlLocation)
+ {
+
+ }
+
+ public void setMessageStream(PrintStream messageStream)
+ {
+
+ }
+
+ public void setAdditionalCompilerClassPath(List<String> classPath)
+ {
+
+ }
+
+ public void setTarget(String target)
+ {
+
+ }
+
+ public void consume(URL wsdl)
+ {
+
+ }
+}
Property changes on:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTrackerFactory.java
===================================================================
---
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTrackerFactory.java
(rev 0)
+++
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTrackerFactory.java 2007-08-02
14:35:28 UTC (rev 4103)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.smoke.tools;
+
+import org.jboss.wsf.spi.tools.WSContractConsumerFactory;
+import org.jboss.wsf.spi.tools.WSContractConsumer;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class CmdConsumeTrackerFactory implements WSContractConsumerFactory
+{
+
+ public WSContractConsumer createConsumer()
+ {
+ return new CmdConsumeTracker();
+ }
+}
Property changes on:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTrackerFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java
===================================================================
---
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java 2007-08-02
14:00:54 UTC (rev 4102)
+++
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java 2007-08-02
14:35:28 UTC (rev 4103)
@@ -1,212 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.smoke.tools;
-
-import org.jboss.wsf.common.DOMUtils;
-import org.jboss.wsf.spi.tools.WSContractProvider;
-import org.jboss.wsf.test.JBossWSTest;
-import org.w3c.dom.Element;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.PrintStream;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-/**
- * @author Heiko.Braun(a)jboss.com
- * @version $Revision$
- */
-public class WSProvideTestCase extends JBossWSTest
-{
- // tools delegate
- WSContractProvider provider;
-
- // redirect tools message to System.out ?
- boolean toogleMessageOut = false;
-
- // relative to test execution
- File outputDirectory;
-
- protected void setUp() throws Exception
- {
- super.setUp();
-
- // create a new consumer for every test case
- provider = WSContractProvider.newInstance();
- if(toogleMessageOut) provider.setMessageStream(System.out);
-
- // shared output directory, relative to test execution
- outputDirectory = new File("wsprovide/java");
- }
-
- private ClassLoader getArtefactClassLoader() throws Exception {
- URLClassLoader loader = new URLClassLoader(new URL[] {
- new
URL("file:"+System.getProperty("user.dir")+"/wsprovide/java/")
}
- );
-
- return loader;
- }
-
- /**
- * Enables/Disables WSDL generation.
- *
- */
- public void testGenerateWsdl() throws Exception
- {
- provider.setGenerateWsdl(true);
- provide();
-
- verifyWSDL(outputDirectory);
- }
-
- /**
- * Enables/Disables Java source generation.
- *
- */
- public void testGenerateSource() throws Exception
- {
- provider.setGenerateSource(true);
- provide();
-
- verifyJavaSource(outputDirectory);
-
- }
-
- private void verifyJavaSource(File directory)
- {
- File javaSource = new File(
- directory.getAbsolutePath()+
- "/org/jboss/test/ws/jaxws/smoke/tools/jaxws/AddResponse.java"
- );
-
- assertTrue("Source not generated", javaSource.exists());
- }
-
- /**
- * Sets the main output directory.
- * If the directory does not exist, it will be created.
- */
- public void testOutputDirectory() throws Exception
- {
- provide();
- ClassLoader loader = getArtefactClassLoader();
- Class responseWrapper =
loader.loadClass("org.jboss.test.ws.jaxws.smoke.tools.jaxws.AddResponse");
- XmlRootElement rootElement = (XmlRootElement)
responseWrapper.getAnnotation(XmlRootElement.class);
- assertNotNull("@XmlRootElement missing form response wrapper",
rootElement);
- assertEquals("Wrong namespace", rootElement.namespace(),
"http://foo.bar.com/calculator");
- }
-
- /**
- * Sets the resource directory. This directory will contain any generated
- * WSDL and XSD files. If the directory does not exist, it will be created.
- * If not specified, the output directory will be used instead.
- *
- */
- public void testResourceDirectory() throws Exception
- {
- File directory = new File("wsprovide/resources");
- provider.setResourceDirectory(directory);
- provide();
-
- verifyWSDL(directory);
- }
-
- private void verifyWSDL(File directory) throws Exception
- {
- File wsdl = new File(
- outputDirectory.getAbsolutePath()+
- "/CalculatorBeanService.wsdl"
- );
-
- assertTrue("WSDL not generated", wsdl.exists());
- Element root = DOMUtils.parse( new FileInputStream(wsdl));
- Element serviceElement = DOMUtils.getFirstChildElement(root, "service");
- assertEquals(serviceElement.getAttribute("name"),
"CalculatorBeanService");
- }
-
- /**
- * Sets the source directory. This directory will contain any generated Java source.
- * If the directory does not exist, it will be created. If not specified,
- * the output directory will be used instead.
- *
- */
- public void testSourceDirectory() throws Exception
- {
- File sourceDir = new File("wsprovide/sources");
- provider.setSourceDirectory(sourceDir);
- provider.setGenerateSource(true);
- provide();
-
- verifyJavaSource(sourceDir);
- }
-
- /**
- * Sets the ClassLoader used to discover types.
- * This defaults to the one used in instantiation.
- *
- */
- public void testClassLoader()
- {
- System.out.println("FIXME [JBWS-1776]: Verify isolated classloading with
WSProvide");
- }
-
- /**
- * Sets the PrintStream to use for status feedback. The simplest example
- * would be to use System.out.
- *
- */
- public void testMessageStream() throws Exception
- {
-
- if(isIntegrationSunRI())
- {
- System.out.println("FIXME [JBWS-1777]: WSProvide output is not correctly
redirected");
- return;
- }
-
- ByteArrayOutputStream bout = new ByteArrayOutputStream();
- PrintStream pout = new PrintStream(bout);
-
- provider.setMessageStream(pout);
- provide();
-
- String messageOut = new String(bout.toByteArray());
-
- System.out.println("-- Begin captured output --");
- System.out.println(messageOut);
- System.out.println("-- End captured output --");
-
- assertTrue("Provider messages not correctly redirected",
-
messageOut.indexOf("org/jboss/test/ws/jaxws/smoke/tools/jaxws/Add.class") != -1
);
- }
-
- private void provide() throws Exception
- {
- //provider.setGenerateSource(true);
- provider.setOutputDirectory(outputDirectory);
- provider.provide(CalculatorBean.class);
- }
-
-}
Copied:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java (from
rev 4083,
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java)
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java
(rev 0)
+++
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java 2007-08-02
14:35:28 UTC (rev 4103)
@@ -0,0 +1,212 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.smoke.tools;
+
+import org.jboss.wsf.common.DOMUtils;
+import org.jboss.wsf.spi.tools.WSContractProvider;
+import org.jboss.wsf.test.JBossWSTest;
+import org.w3c.dom.Element;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.PrintStream;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class WSProviderTestCase extends JBossWSTest
+{
+ // tools delegate
+ WSContractProvider provider;
+
+ // redirect tools message to System.out ?
+ boolean toogleMessageOut = false;
+
+ // relative to test execution
+ File outputDirectory;
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ // create a new consumer for every test case
+ provider = WSContractProvider.newInstance();
+ if(toogleMessageOut) provider.setMessageStream(System.out);
+
+ // shared output directory, relative to test execution
+ outputDirectory = new File("wsprovide/java");
+ }
+
+ private ClassLoader getArtefactClassLoader() throws Exception {
+ URLClassLoader loader = new URLClassLoader(new URL[] {
+ new
URL("file:"+System.getProperty("user.dir")+"/wsprovide/java/")
}
+ );
+
+ return loader;
+ }
+
+ /**
+ * Enables/Disables WSDL generation.
+ *
+ */
+ public void testGenerateWsdl() throws Exception
+ {
+ provider.setGenerateWsdl(true);
+ provide();
+
+ verifyWSDL(outputDirectory);
+ }
+
+ /**
+ * Enables/Disables Java source generation.
+ *
+ */
+ public void testGenerateSource() throws Exception
+ {
+ provider.setGenerateSource(true);
+ provide();
+
+ verifyJavaSource(outputDirectory);
+
+ }
+
+ private void verifyJavaSource(File directory)
+ {
+ File javaSource = new File(
+ directory.getAbsolutePath()+
+ "/org/jboss/test/ws/jaxws/smoke/tools/jaxws/AddResponse.java"
+ );
+
+ assertTrue("Source not generated", javaSource.exists());
+ }
+
+ /**
+ * Sets the main output directory.
+ * If the directory does not exist, it will be created.
+ */
+ public void testOutputDirectory() throws Exception
+ {
+ provide();
+ ClassLoader loader = getArtefactClassLoader();
+ Class responseWrapper =
loader.loadClass("org.jboss.test.ws.jaxws.smoke.tools.jaxws.AddResponse");
+ XmlRootElement rootElement = (XmlRootElement)
responseWrapper.getAnnotation(XmlRootElement.class);
+ assertNotNull("@XmlRootElement missing form response wrapper",
rootElement);
+ assertEquals("Wrong namespace", rootElement.namespace(),
"http://foo.bar.com/calculator");
+ }
+
+ /**
+ * Sets the resource directory. This directory will contain any generated
+ * WSDL and XSD files. If the directory does not exist, it will be created.
+ * If not specified, the output directory will be used instead.
+ *
+ */
+ public void testResourceDirectory() throws Exception
+ {
+ File directory = new File("wsprovide/resources");
+ provider.setResourceDirectory(directory);
+ provide();
+
+ verifyWSDL(directory);
+ }
+
+ private void verifyWSDL(File directory) throws Exception
+ {
+ File wsdl = new File(
+ outputDirectory.getAbsolutePath()+
+ "/CalculatorBeanService.wsdl"
+ );
+
+ assertTrue("WSDL not generated", wsdl.exists());
+ Element root = DOMUtils.parse( new FileInputStream(wsdl));
+ Element serviceElement = DOMUtils.getFirstChildElement(root, "service");
+ assertEquals(serviceElement.getAttribute("name"),
"CalculatorBeanService");
+ }
+
+ /**
+ * Sets the source directory. This directory will contain any generated Java source.
+ * If the directory does not exist, it will be created. If not specified,
+ * the output directory will be used instead.
+ *
+ */
+ public void testSourceDirectory() throws Exception
+ {
+ File sourceDir = new File("wsprovide/sources");
+ provider.setSourceDirectory(sourceDir);
+ provider.setGenerateSource(true);
+ provide();
+
+ verifyJavaSource(sourceDir);
+ }
+
+ /**
+ * Sets the ClassLoader used to discover types.
+ * This defaults to the one used in instantiation.
+ *
+ */
+ public void testClassLoader()
+ {
+ System.out.println("FIXME [JBWS-1776]: Verify isolated classloading with
WSProvide");
+ }
+
+ /**
+ * Sets the PrintStream to use for status feedback. The simplest example
+ * would be to use System.out.
+ *
+ */
+ public void testMessageStream() throws Exception
+ {
+
+ if(isIntegrationSunRI())
+ {
+ System.out.println("FIXME [JBWS-1777]: WSProvide output is not correctly
redirected");
+ return;
+ }
+
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ PrintStream pout = new PrintStream(bout);
+
+ provider.setMessageStream(pout);
+ provide();
+
+ String messageOut = new String(bout.toByteArray());
+
+ System.out.println("-- Begin captured output --");
+ System.out.println(messageOut);
+ System.out.println("-- End captured output --");
+
+ assertTrue("Provider messages not correctly redirected",
+
messageOut.indexOf("org/jboss/test/ws/jaxws/smoke/tools/jaxws/Add.class") != -1
);
+ }
+
+ private void provide() throws Exception
+ {
+ //provider.setGenerateSource(true);
+ provider.setOutputDirectory(outputDirectory);
+ provider.provide(CalculatorBean.class);
+ }
+
+}
Property changes on:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/testsuite/testsuite.iml
===================================================================
--- trunk/testsuite/testsuite.iml 2007-08-02 14:00:54 UTC (rev 4102)
+++ trunk/testsuite/testsuite.iml 2007-08-02 14:35:28 UTC (rev 4103)
@@ -73,7 +73,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module" module-name="spi" />
<orderEntry type="module-library">
<library>
<CLASSES>
@@ -86,6 +85,8 @@
<orderEntry type="module" module-name="jbossws-core" />
<orderEntry type="library" name="tools"
level="application" />
<orderEntry type="module" module-name="sunri-sources" />
+ <orderEntry type="module" module-name="spi" />
+ <orderEntry type="module" module-name="spi-trunk" />
<orderEntryProperties />
</component>
</module>