jbossws-commits August 2007

jbossws-commits@lists.jboss.org

1 participants
464 discussions

JBossWS SVN: r4047 - in trunk: build/ant-import and 3 other directories.

by jbossws-commits＠lists.jboss.org

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

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r4046 - trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-08-01 06:15:24 -0400 (Wed, 01 Aug 2007) New Revision: 4046 Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java Log: Begin WSPorvide test case implementation Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java 2007-08-01 10:15:24 UTC (rev 4046) @@ -0,0 +1,131 @@ +/* + * 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 java.io.File; +import java.io.PrintStream; + +import org.jboss.wsf.spi.tools.WSContractConsumer; +import org.jboss.wsf.spi.tools.WSContractProvider; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class WSProvideTestCase extends TestCase +{ + // tools delegate + WSContractProvider provider; + + boolean toogleMessageOut; + + 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"); + } + + /** + * Enables/Disables WSDL generation. + * + */ + public void testGenerateWsdl() + { + + } + + /** + * Enables/Disables Java source generation. + * + */ + public void testGenerateSource() + { + + } + + /** + * Sets the main output directory. + * If the directory does not exist, it will be created. + */ + public void testOutputDirectory() + { + + } + + /** + * 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() + { + + } + + /** + * 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() + { + + } + + /** + * Sets the ClassLoader used to discover types. + * This defaults to the one used in instantiation. + * + */ + public void testClassLoader() + { + + } + + /** + * Sets the PrintStream to use for status feedback. The simplest example + * would be to use System.out. + * + */ + public void testMessageStream() + { + + } + + private void provide() throws Exception + { + + } + +} Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r4045 - in trunk/integration/spi: src/main/etc and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-08-01 06:14:38 -0400 (Wed, 01 Aug 2007) New Revision: 4045 Added: trunk/integration/spi/src/main/etc/default.mf Modified: trunk/integration/spi/build.xml Log: Include tools jars in spi Class-Path attribute. Makes the tooling steup much easier Modified: trunk/integration/spi/build.xml =================================================================== --- trunk/integration/spi/build.xml 2007-08-01 08:23:22 UTC (rev 4044) +++ trunk/integration/spi/build.xml 2007-08-01 10:14:38 UTC (rev 4045) @@ -72,7 +72,7 @@ <mkdir dir="${spi.output.etc.dir}"/> <copy todir="${spi.output.etc.dir}" filtering="yes"> <fileset dir="${spi.etc.dir}"/> - <fileset dir="${build.dir}/etc"> + <fileset dir="${spi.etc.dir}"> <include name="default.mf"/> </fileset> <filterset> Added: trunk/integration/spi/src/main/etc/default.mf =================================================================== --- trunk/integration/spi/src/main/etc/default.mf (rev 0) +++ trunk/integration/spi/src/main/etc/default.mf 2007-08-01 10:14:38 UTC (rev 4045) @@ -0,0 +1,11 @@ +Manifest-Version: 1.2 +Created-By: @java.vm.version@ (@java.vm.vendor@) +Specification-Title: @specification.title@ +Specification-Version: @specification.version@ +Specification-Vendor: @specification.vendor@ +Implementation-Title: @implementation.title@ +Implementation-URL: @implementation.url@ +Implementation-Version: @implementation.version@ (build=(a)build.id@) +Implementation-Vendor: @implementation.vendor@ +Implementation-Vendor-Id: @implementation.vendor.id@ +Class-Path: jaxb-xjc.jar jaxb-impl.jar stax-api.jar stax-ex.jar streambuffer.jar jaxws-rt.jar jaxws-tools.jar wstx.jar \ No newline at end of file

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r4044 - in trunk: integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42 and 21 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-01 04:23:22 -0400 (Wed, 01 Aug 2007) New Revision: 4044 Added: trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java Removed: trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java trunk/integration/spi/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java trunk/integration/spi/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedVirtualFile.java Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java Log: Restore serviceref handling through ws.integration Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java =================================================================== --- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -35,7 +35,7 @@ import org.jboss.webservice.metadata.serviceref.InitParamMetaData; import org.jboss.webservice.metadata.serviceref.PortComponentRefMetaData; import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -28,8 +28,8 @@ import org.jboss.deployment.DeploymentException; import org.jboss.deployment.DeploymentInfo; -import org.jboss.wsf.common.ResourceLoaderAdapter; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.ws.integration.ResourceLoaderAdapter; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.WSFDeploymentException; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -26,7 +26,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.BeanMetaData; -import org.jboss.wsf.common.URLLoaderAdapter; +import org.jboss.ws.integration.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -29,7 +29,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.WebMetaData; -import org.jboss.wsf.common.URLLoaderAdapter; +import org.jboss.ws.integration.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -30,7 +30,7 @@ import org.jboss.ejb3.EJBContainer; import org.jboss.ejb3.Ejb3ModuleMBean; import org.jboss.ejb3.stateless.StatelessContainer; -import org.jboss.wsf.common.URLLoaderAdapter; +import org.jboss.ws.integration.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -34,7 +34,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.WebMetaData; -import org.jboss.wsf.common.URLLoaderAdapter; +import org.jboss.ws.integration.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -27,7 +27,7 @@ import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; import org.jboss.virtual.VirtualFile; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -22,7 +22,7 @@ package org.jboss.wsf.container.jboss50; import org.jboss.virtual.VirtualFile; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; import java.io.IOException; import java.net.URL; Deleted: trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -1,46 +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.ws.integration; - -//$Id$ - -import org.jboss.kernel.Kernel; -import org.jboss.util.NotImplementedException; - -/** - * @deprecated - * @see org.jboss.wsf.common.KernelLocator - */ -public class KernelLocator -{ - @Deprecated - public static Kernel getKernel() - { - return org.jboss.wsf.common.KernelLocator.getKernel(); - } - - @Deprecated - public void setKernel(Kernel kernel) - { - throw new NotImplementedException("Deprecated, use: " + org.jboss.wsf.common.KernelLocator.class.getName()); - } -} Deleted: trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -1,42 +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.ws.integration; - -// $Id$ - -/** - * @deprecated - * @see org.jboss.wsf.common.ResourceLoaderAdapter - */ -public class ResourceLoaderAdapter extends org.jboss.wsf.common.ResourceLoaderAdapter implements UnifiedVirtualFile -{ - @Deprecated - public ResourceLoaderAdapter() - { - } - - @Deprecated - public ResourceLoaderAdapter(ClassLoader loader) - { - super(loader); - } -} Added: trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -0,0 +1,116 @@ +/* + * 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.ws.integration; + +// $Id$ + +import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; + + +/** + * The default file adapter loads resources through an associated classloader. + * If no classload is set, the the thread context classloader will be used. + * + * @author Heiko.Braun(a)jboss.org + * @since 25.01.2007 + */ +public class ResourceLoaderAdapter implements UnifiedVirtualFile +{ + private URL resourceURL; + private ClassLoader loader; + + public ResourceLoaderAdapter() + { + this(Thread.currentThread().getContextClassLoader()); + } + + public ResourceLoaderAdapter(ClassLoader loader) + { + this.loader = loader; + } + + private ResourceLoaderAdapter(ClassLoader loader, URL resourceURL) + { + this.resourceURL = resourceURL; + this.loader = loader; + } + + public UnifiedVirtualFile findChild(String resourcePath) throws IOException + { + URL resourceURL = null; + if (resourcePath != null) + { + // Try the child as URL + try + { + resourceURL = new URL(resourcePath); + } + catch (MalformedURLException ex) + { + // ignore + } + + // Try the filename as File + if (resourceURL == null) + { + try + { + File file = new File(resourcePath); + if (file.exists()) + resourceURL = file.toURL(); + } + catch (MalformedURLException e) + { + // ignore + } + } + + // Try the filename as Resource + if (resourceURL == null) + { + try + { + resourceURL = loader.getResource(resourcePath); + } + catch (Exception ex) + { + // ignore + } + } + } + + if (resourceURL == null) + throw new IOException("Cannot get URL for: " + resourcePath); + + return new ResourceLoaderAdapter(loader, resourceURL); + } + + public URL toURL() + { + if (null == this.resourceURL) + throw new IllegalStateException("UnifiedVirtualFile not initialized"); + return resourceURL; + } +} Modified: trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -27,6 +27,7 @@ import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; import org.jboss.wsf.common.ServiceLoader; +import org.jboss.wsf.common.KernelLocator; /** * A factory for the ServiceRefHandler Deleted: trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -1,39 +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.ws.integration; - -// $Id$ - -import java.net.URL; - -/** - * @deprecated - * @see org.jboss.wsf.common.URLLoaderAdapter - */ -public class URLLoaderAdapter extends org.jboss.wsf.common.URLLoaderAdapter implements UnifiedVirtualFile -{ - @Deprecated - public URLLoaderAdapter(URL rootURL) - { - super(rootURL); - } -} Added: trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -0,0 +1,125 @@ +/* + * 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.ws.integration; + +// $Id$ + +import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; + + +/** + * Load resources through a URLClassLoader.<br> + * NOTE: The associated classloader doesn't do parent delegation. + * + * + * @author Heiko.Braun(a)jboss.org + * @since 25.01.2007 + */ +public class URLLoaderAdapter implements UnifiedVirtualFile +{ + private URL rootURL; + private URL resourceURL; + private transient URLClassLoader loader; + + public URLLoaderAdapter(URL rootURL) + { + this.rootURL = rootURL; + } + + private URLLoaderAdapter(URL rootURL, URLClassLoader loader, URL resourceURL) + { + this.rootURL = rootURL; + this.resourceURL = resourceURL; + this.loader = loader; + } + + public UnifiedVirtualFile findChild(String resourcePath) throws IOException + { + URL resourceURL = null; + if (resourcePath != null) + { + // Try the child as URL + try + { + resourceURL = new URL(resourcePath); + } + catch (MalformedURLException ex) + { + // ignore + } + + // Try the filename as File + if (resourceURL == null) + { + try + { + File file = new File(resourcePath); + if (file.exists()) + resourceURL = file.toURL(); + } + catch (MalformedURLException e) + { + // ignore + } + } + + // Try the filename as Resource + if (resourceURL == null) + { + try + { + resourceURL = getResourceLoader().getResource(resourcePath); + } + catch (Exception ex) + { + // ignore + } + } + } + + if (resourceURL == null) + throw new IOException("Cannot get URL for: " + resourcePath); + + return new URLLoaderAdapter(rootURL, loader, resourceURL); + } + + public URL toURL() + { + if (resourceURL != null) + return resourceURL; + else + return rootURL; + } + + private URLClassLoader getResourceLoader() + { + if (loader == null) + { + loader = new URLClassLoader(new URL[] { rootURL }); + } + return loader; + } +} Deleted: trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -1,32 +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.ws.integration; - -// $Id$ - -/** - * @deprecated - * @see org.jboss.wsf.spi.deployment.UnifiedVirtualFile - */ -public interface UnifiedVirtualFile extends org.jboss.wsf.spi.deployment.UnifiedVirtualFile -{ -} Added: trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -0,0 +1,42 @@ +/* + * 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.ws.integration; + +// $Id$ + +import java.io.IOException; +import java.io.Serializable; +import java.net.URL; + +/** + * An adaptor to a VirtualFile from jboss-vfs.jar + * jboss-vfs cannot be used in jboss-4.x because of its dependeny on jboss-common-core.jar + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public interface UnifiedVirtualFile extends Serializable +{ + UnifiedVirtualFile findChild(String child) throws IOException; + + URL toURL(); +} Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -1,117 +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.wsf.common; - -// $Id: ResourceLoaderAdapter.java 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $ - -import java.io.File; -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; - -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; - -/** - * The default file adapter loads resources through an associated classloader. - * If no classload is set, the the thread context classloader will be used. - * - * @author Heiko.Braun(a)jboss.org - * @since 25.01.2007 - */ -public class ResourceLoaderAdapter implements UnifiedVirtualFile -{ - private URL resourceURL; - private ClassLoader loader; - - public ResourceLoaderAdapter() - { - this(Thread.currentThread().getContextClassLoader()); - } - - public ResourceLoaderAdapter(ClassLoader loader) - { - this.loader = loader; - } - - private ResourceLoaderAdapter(ClassLoader loader, URL resourceURL) - { - this.resourceURL = resourceURL; - this.loader = loader; - } - - public UnifiedVirtualFile findChild(String resourcePath) throws IOException - { - URL resourceURL = null; - if (resourcePath != null) - { - // Try the child as URL - try - { - resourceURL = new URL(resourcePath); - } - catch (MalformedURLException ex) - { - // ignore - } - - // Try the filename as File - if (resourceURL == null) - { - try - { - File file = new File(resourcePath); - if (file.exists()) - resourceURL = file.toURL(); - } - catch (MalformedURLException e) - { - // ignore - } - } - - // Try the filename as Resource - if (resourceURL == null) - { - try - { - resourceURL = loader.getResource(resourcePath); - } - catch (Exception ex) - { - // ignore - } - } - } - - if (resourceURL == null) - throw new IOException("Cannot get URL for: " + resourcePath); - - return new ResourceLoaderAdapter(loader, resourceURL); - } - - public URL toURL() - { - if (null == this.resourceURL) - throw new IllegalStateException("UnifiedVirtualFile not initialized"); - return resourceURL; - } -} Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -1,126 +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.wsf.common; - -// $Id: URLLoaderAdapter.java 3830 2007-07-09 17:01:33Z heiko.braun(a)jboss.com $ - -import java.io.File; -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLClassLoader; - -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; - -/** - * Load resources through a URLClassLoader.<br> - * NOTE: The associated classloader doesn't do parent delegation. - * - * - * @author Heiko.Braun(a)jboss.org - * @since 25.01.2007 - */ -public class URLLoaderAdapter implements UnifiedVirtualFile -{ - private URL rootURL; - private URL resourceURL; - private transient URLClassLoader loader; - - public URLLoaderAdapter(URL rootURL) - { - this.rootURL = rootURL; - } - - private URLLoaderAdapter(URL rootURL, URLClassLoader loader, URL resourceURL) - { - this.rootURL = rootURL; - this.resourceURL = resourceURL; - this.loader = loader; - } - - public UnifiedVirtualFile findChild(String resourcePath) throws IOException - { - URL resourceURL = null; - if (resourcePath != null) - { - // Try the child as URL - try - { - resourceURL = new URL(resourcePath); - } - catch (MalformedURLException ex) - { - // ignore - } - - // Try the filename as File - if (resourceURL == null) - { - try - { - File file = new File(resourcePath); - if (file.exists()) - resourceURL = file.toURL(); - } - catch (MalformedURLException e) - { - // ignore - } - } - - // Try the filename as Resource - if (resourceURL == null) - { - try - { - resourceURL = getResourceLoader().getResource(resourcePath); - } - catch (Exception ex) - { - // ignore - } - } - } - - if (resourceURL == null) - throw new IOException("Cannot get URL for: " + resourcePath); - - return new URLLoaderAdapter(rootURL, loader, resourceURL); - } - - public URL toURL() - { - if (resourceURL != null) - return resourceURL; - else - return rootURL; - } - - private URLClassLoader getResourceLoader() - { - if (loader == null) - { - loader = new URLClassLoader(new URL[] { rootURL }); - } - return loader; - } -} Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -27,8 +27,8 @@ import java.net.MalformedURLException; import java.net.URL; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; /** * A general web service deployment that is based on an archive. Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -23,12 +23,12 @@ //$Id: EndpointAddressDeploymentAspect.java 4018 2007-07-27 06:31:03Z thomas.diesler(a)jboss.com $ -import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.ws.integration.ResourceLoaderAdapter; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; /** Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -26,6 +26,8 @@ import java.io.IOException; import java.net.URL; +import org.jboss.ws.integration.UnifiedVirtualFile; + /** * A general web service deployment dep. * Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedVirtualFile.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedVirtualFile.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedVirtualFile.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -1,42 +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.wsf.spi.deployment; - -// $Id: UnifiedVirtualFile.java 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $ - -import java.io.IOException; -import java.io.Serializable; -import java.net.URL; - -/** - * An adaptor to a VirtualFile from jboss-vfs.jar - * jboss-vfs cannot be used in jboss-4.x because of its dependeny on jboss-common-core.jar - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public interface UnifiedVirtualFile extends Serializable -{ - UnifiedVirtualFile findChild(String child) throws IOException; - - URL toURL(); -} Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -34,7 +34,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.integration.ServiceRefMetaData; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.w3c.dom.Element; /** Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -30,7 +30,7 @@ import javax.xml.ws.WebServiceException; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -54,7 +54,8 @@ import org.jboss.ws.core.soap.UnboundHeader; import org.jboss.ws.core.utils.HolderUtils; import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; -import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.ws.integration.ResourceLoaderAdapter; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; @@ -64,7 +65,6 @@ import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -44,6 +44,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.StubExt; +import org.jboss.ws.integration.ResourceLoaderAdapter; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCClientMetaDataBuilder; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.umdm.EndpointMetaData; @@ -53,7 +54,6 @@ import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; -import org.jboss.wsf.common.ResourceLoaderAdapter; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -37,7 +37,7 @@ import javax.naming.StringRefAddr; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; import org.jboss.wsf.spi.management.ServerConfig; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -56,8 +56,8 @@ import org.jboss.ws.core.jaxws.client.DispatchImpl; import org.jboss.ws.core.jaxws.client.ServiceObjectFactoryJAXWS; import org.jboss.ws.core.jaxws.handler.HandlerResolverImpl; -import org.jboss.wsf.common.ResourceLoaderAdapter; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.ws.integration.ResourceLoaderAdapter; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.builder.jaxws.JAXWSClientMetaDataBuilder; import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilder; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -37,7 +37,7 @@ import org.jboss.ws.extensions.policy.annotation.PolicyAttachment; import org.jboss.ws.extensions.policy.deployer.PolicyDeployer; import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedPolicy; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ExtensibleMetaData; import org.jboss.ws.metadata.wsdl.WSDLBinding; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -35,7 +35,7 @@ import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.extensions.security.Constants; import org.jboss.ws.extensions.security.WSSecurityDispatcher; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -38,7 +38,7 @@ import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.ws.extensions.security.Constants; import org.jboss.ws.extensions.security.WSSecurityDispatcher; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -32,6 +32,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; +import org.jboss.ws.integration.ResourceLoaderAdapter; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; import org.jboss.ws.metadata.jaxrpcmapping.ServiceEndpointInterfaceMapping; @@ -46,8 +48,6 @@ import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; -import org.jboss.wsf.common.ResourceLoaderAdapter; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -36,6 +36,8 @@ import org.jboss.ws.core.jaxws.client.ServiceObjectFactoryJAXWS; import org.jboss.ws.core.soap.Style; import org.jboss.ws.extensions.policy.metadata.PolicyMetaDataBuilder; +import org.jboss.ws.integration.ResourceLoaderAdapter; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; @@ -51,8 +53,6 @@ import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.wsf.common.ResourceLoaderAdapter; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -28,12 +28,12 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; +import org.jboss.ws.integration.ResourceLoaderAdapter; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.config.binding.OMFactoryJAXRPC; import org.jboss.ws.metadata.config.binding.OMFactoryJAXWS; import org.jboss.ws.metadata.config.jaxrpc.ConfigRootJAXRPC; import org.jboss.ws.metadata.config.jaxws.ConfigRootJAXWS; -import org.jboss.wsf.common.ResourceLoaderAdapter; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.common.DOMUtils; import org.jboss.xb.binding.JBossXBException; import org.jboss.xb.binding.Unmarshaller; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -57,7 +57,7 @@ import org.jboss.ws.core.jaxws.client.DispatchBinding; import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.Use; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.config.CommonConfig; import org.jboss.ws.metadata.config.Configurable; import org.jboss.ws.metadata.config.ConfigurationProvider; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -37,8 +37,8 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.Use; +import org.jboss.ws.integration.ResourceLoaderAdapter; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; -import org.jboss.wsf.common.ResourceLoaderAdapter; import org.jboss.wsf.common.JavaUtils; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -42,6 +42,7 @@ import org.jboss.ws.core.jaxrpc.TypeMappingRegistryImpl; import org.jboss.ws.core.jaxrpc.binding.jbossxb.SchemaBindingBuilder; import org.jboss.ws.core.soap.Use; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; @@ -50,7 +51,6 @@ import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -30,9 +30,9 @@ import java.util.StringTokenizer; import org.jboss.logging.Logger; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; /** * The top level meta data. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -29,8 +29,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCServerMetaDataBuilder; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; /** * Create a WSSecurityConfiguration Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -28,7 +28,7 @@ import java.net.URLClassLoader; import org.jboss.ws.WSException; -import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.ws.integration.ResourceLoaderAdapter; import org.jboss.ws.metadata.builder.jaxws.JAXWSWebServiceMetaDataBuilder; import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.wsf.spi.SPIProvider; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -33,11 +33,11 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.soap.Style; +import org.jboss.ws.integration.ResourceLoaderAdapter; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.tools.Configuration.OperationConfig; -import org.jboss.wsf.common.ResourceLoaderAdapter; /** * Builder class that builds the Tools Meta Data Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-07-31 17:11:42 UTC (rev 4043) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-08-01 08:23:22 UTC (rev 4044) @@ -36,8 +36,8 @@ import org.jboss.ws.extensions.policy.deployer.domainAssertion.NopAssertionDeployer; import org.jboss.ws.extensions.policy.metadata.PolicyMetaDataBuilder; import org.jboss.ws.extensions.policy.metadata.PolicyMetaExtension; -import org.jboss.wsf.common.URLLoaderAdapter; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.ws.integration.URLLoaderAdapter; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData;

17 years, 5 months

1
0
0 / 0

← Newer
1
...
44
45
46
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits August 2007