[jbossws-commits] JBossWS SVN: r3991 - in trunk: integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40 and 9 other directories.

Author: heiko.braun(a)jboss.com Date: 2007-07-25 08:35:09 -0400 (Wed, 25 Jul 2007) New Revision: 3991 Added: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerFactoryImpl.java trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceContextFactoryImpl.java trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerFactoryImpl.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebServiceContextFactoryImpl.java trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerFactoryImpl.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebServiceContextFactoryImpl.java trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextFactory.java Removed: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationModelFactory.java Modified: trunk/JBossWS-Trunk.iws trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java Log: Split InvocationHandler and WebServiceContext factory Modified: trunk/JBossWS-Trunk.iws =================================================================== --- trunk/JBossWS-Trunk.iws 2007-07-25 12:01:46 UTC (rev 3990) +++ trunk/JBossWS-Trunk.iws 2007-07-25 12:35:09 UTC (rev 3991) @@ -121,7 +121,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="61" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> + <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="58" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> <option name="ENABLED" value="false" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -199,7 +199,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="108" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> + <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="105" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -212,7 +212,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="114" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> + <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="115" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -280,51 +280,15 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="InvocationModelFactory.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationModelFactory.java"> + <file leaf-file-name="org.jboss.wsf.spi.invocation.InvocationHandlerFactory" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory"> <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="82" selection-start="1399" selection-end="1399" vertical-scroll-proportion="0.3151515"> + <state line="0" column="49" selection-start="49" selection-end="49" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="InvocationModelFactoryImpl.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="63" column="4" selection-start="2245" selection-end="2245" vertical-scroll-proportion="0.52380955"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="InvocationModelFactoryImpl.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="62" column="4" selection-start="2288" selection-end="2288" vertical-scroll-proportion="0.52380955"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="InvocationModelFactoryImpl.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="63" column="3" selection-start="2195" selection-end="2195" vertical-scroll-proportion="0.54761904"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="InvocationHandler.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="38" column="22" selection-start="1481" selection-end="1481" vertical-scroll-proportion="0.29090908"> - <folding /> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindManager"> @@ -377,6 +341,126 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="wsf" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="container" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-42" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-42" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="wsf" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="container" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss42" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-40" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-40" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="wsf" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="container" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss40" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + </PATH> </component> <component name="PerforceChangeBrowserSettings"> <option name="USE_CLIENT_FILTER" value="true" /> @@ -596,6 +680,14 @@ <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/framework" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -618,7 +710,147 @@ <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/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="int-50" /> + <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="int-50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/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/jboss50/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/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/jboss50/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> </component> <component name="ProjectReloadState"> <option name="STATE" value="0" /> @@ -783,12 +1015,12 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="0" y="25" width="1680" height="1000" extended-state="0" /> + <frame x="0" y="25" width="1680" height="1000" extended-state="1" /> <editor active="true" /> <layout> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.28729963" order="0" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.38717633" order="0" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.5040092" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25215784" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> @@ -798,7 +1030,7 @@ <window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="2" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.27188656" order="2" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.13440198" order="2" /> <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="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39862543" order="4" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" /> @@ -874,117 +1106,119 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="46" column="13" selection-start="1840" selection-end="1840" vertical-scroll-proportion="0.096969694"> + <state line="281" column="70" selection-start="11747" selection-end="11747" vertical-scroll-proportion="0.14782609"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceContextFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="30" column="59" selection-start="1424" selection-end="1424" vertical-scroll-proportion="0.10603589"> + <state line="43" column="4" selection-start="1294" selection-end="1705" vertical-scroll-proportion="0.55757576"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="44" column="22" selection-start="1556" selection-end="1556" vertical-scroll-proportion="0.3588907"> + <state line="63" column="0" selection-start="2289" selection-end="2289" vertical-scroll-proportion="0.8060606"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebServiceContextFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="27" column="17" selection-start="1144" selection-end="1144" vertical-scroll-proportion="0.3562341"> + <state line="43" column="4" selection-start="1705" selection-end="1705" vertical-scroll-proportion="0.55757576"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerFactoryImpl.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="63" column="3" selection-start="2195" selection-end="2195" vertical-scroll-proportion="0.8060606"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="42" selection-start="1508" selection-end="1508" vertical-scroll-proportion="-0.28363636"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="63" column="4" selection-start="2245" selection-end="2245" vertical-scroll-proportion="0.8060606"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/RewriteResults.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="31" column="13" selection-start="1216" selection-end="1216" vertical-scroll-proportion="0.45801526"> + <state line="33" column="33" selection-start="1284" selection-end="1284" vertical-scroll-proportion="0.26190478"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifier.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="29" selection-start="1347" selection-end="1347" vertical-scroll-proportion="0.26666668"> + <state line="0" column="60" selection-start="60" selection-end="60" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebServiceContextFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="39" column="30" selection-start="1526" selection-end="1526" vertical-scroll-proportion="0.15272728"> + <state line="31" column="41" selection-start="1228" selection-end="1256" vertical-scroll-proportion="0.26190478"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultWebAppDesciptorModifierImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="38" column="21" selection-start="1412" selection-end="1412" vertical-scroll-proportion="0.21428572"> - <folding /> + <state line="21" column="36" selection-start="1022" selection-end="1050" vertical-scroll-proportion="0.024242423"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory"> <provider selected="true" editor-type-id="text-editor"> - <state line="157" column="78" selection-start="8211" selection-end="8236" vertical-scroll-proportion="0.14424242"> + <state line="0" column="31" selection-start="31" selection-end="31" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory"> <provider selected="true" editor-type-id="text-editor"> - <state line="38" column="22" selection-start="1481" selection-end="1481" vertical-scroll-proportion="0.29090908"> + <state line="0" column="49" selection-start="49" selection-end="49" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationModelFactory.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory"> <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="82" selection-start="1399" selection-end="1399" vertical-scroll-proportion="0.3151515"> + <state line="0" column="49" selection-start="49" selection-end="49" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory"> <provider selected="true" editor-type-id="text-editor"> - <state line="63" column="4" selection-start="2245" selection-end="2245" vertical-scroll-proportion="0.52380955"> + <state line="0" column="31" selection-start="31" selection-end="31" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory"> <provider selected="true" editor-type-id="text-editor"> - <state line="62" column="4" selection-start="2288" selection-end="2288" vertical-scroll-proportion="0.52380955"> + <state line="0" column="49" selection-start="49" selection-end="49" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="63" column="3" selection-start="2195" selection-end="2195" vertical-scroll-proportion="0.54761904"> - <folding /> - </state> - </provider> - </entry> </component> </project> Added: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerFactoryImpl.java =================================================================== --- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerFactoryImpl.java (rev 0) +++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerFactoryImpl.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -0,0 +1,63 @@ +/* + * 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.container.jboss40; + +import org.jboss.wsf.spi.invocation.*; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 20, 2007 + */ +public class InvocationHandlerFactoryImpl extends InvocationHandlerFactory +{ + public InvocationHandler createInvocationHandler(InvocationType type) + { + InvocationHandler handler = null; + + switch(type) + { + case JAXRPC_JSE: + handler = new DefaultInvocationHandlerJAXRPC(); + break; + case JAXRPC_EJB21: + handler = new org.jboss.wsf.container.jboss42.InvocationHandlerEJB21(); + break; + case JAXRPC_MDB21: + handler = new org.jboss.wsf.container.jboss42.InvocationHandlerMDB21(); + break; + case JAXWS_JSE: + handler = new DefaultInvocationHandlerJAXWS(); + break; + case JAXWS_EJB21: + handler = new org.jboss.wsf.container.jboss42.InvocationHandlerEJB21(); + break; + case JAXWS_EJB3: + handler = new InvocationHandlerEJB3(); + } + + if(null == handler) + throw new IllegalArgumentException("Unable to resolve spi.invocation.InvocationHandler for type " +type); + + return handler; + } + +} Property changes on: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java =================================================================== --- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java 2007-07-25 12:01:46 UTC (rev 3990) +++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -1,76 +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.container.jboss40; - -import org.jboss.wsf.spi.invocation.*; - -import javax.xml.ws.handler.MessageContext; - -/** - * @author Heiko.Braun(a)jboss.com - * Created: Jul 20, 2007 - */ -public class InvocationModelFactoryImpl extends InvocationModelFactory -{ - public InvocationHandler createInvocationHandler(InvocationType type) - { - InvocationHandler handler = null; - - switch(type) - { - case JAXRPC_JSE: - handler = new DefaultInvocationHandlerJAXRPC(); - break; - case JAXRPC_EJB21: - handler = new org.jboss.wsf.container.jboss42.InvocationHandlerEJB21(); - break; - case JAXRPC_MDB21: - handler = new org.jboss.wsf.container.jboss42.InvocationHandlerMDB21(); - break; - case JAXWS_JSE: - handler = new DefaultInvocationHandlerJAXWS(); - break; - case JAXWS_EJB21: - handler = new org.jboss.wsf.container.jboss42.InvocationHandlerEJB21(); - break; - case JAXWS_EJB3: - handler = new InvocationHandlerEJB3(); - } - - if(null == handler) - throw new IllegalArgumentException("Unable to resolve spi.invocation.InvocationHandler for type " +type); - - return handler; - } - - public ExtendableWebServiceContext createWebServiceContext(InvocationType type, MessageContext messageContext) - { - ExtendableWebServiceContext context = null; - - if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1) - context = new WebServiceContextEJB(messageContext); - else - context = new WebServiceContextJSE(messageContext); - - return context; - } -} Added: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceContextFactoryImpl.java =================================================================== --- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceContextFactoryImpl.java (rev 0) +++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceContextFactoryImpl.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -0,0 +1,45 @@ +/* + * 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.container.jboss40; + +import org.jboss.wsf.spi.invocation.*; + +import javax.xml.ws.handler.MessageContext; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 25, 2007 + */ +public class WebServiceContextFactoryImpl extends WebServiceContextFactory +{ + public ExtendableWebServiceContext createWebServiceContext(InvocationType type, MessageContext messageContext) + { + ExtendableWebServiceContext context = null; + + if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1) + context = new WebServiceContextEJB(messageContext); + else + context = new WebServiceContextJSE(messageContext); + + return context; + } +} Property changes on: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceContextFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory =================================================================== --- trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory (rev 0) +++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory 2007-07-25 12:35:09 UTC (rev 3991) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss40.InvocationHandlerFactoryImpl \ No newline at end of file Deleted: trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory =================================================================== --- trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory 2007-07-25 12:01:46 UTC (rev 3990) +++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory 2007-07-25 12:35:09 UTC (rev 3991) @@ -1 +0,0 @@ -org.jboss.wsf.container.jboss40.InvocationModelFactoryImpl \ No newline at end of file Added: trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory =================================================================== --- trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory (rev 0) +++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2007-07-25 12:35:09 UTC (rev 3991) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss40.WebServiceContextFactoryImpl \ No newline at end of file Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-07-25 12:01:46 UTC (rev 3990) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -127,7 +127,7 @@ { EJBContext ejbCtx = beanCtx.getEJBContext(); SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - ExtendableWebServiceContext wsContext = spiProvider.getSPI(InvocationModelFactory.class).createWebServiceContext(InvocationType.JAXWS_EJB3, jaxwsMessageContext); + ExtendableWebServiceContext wsContext = spiProvider.getSPI(WebServiceContextFactory.class).createWebServiceContext(InvocationType.JAXWS_EJB3, jaxwsMessageContext); wsContext.addAttachment(EJBContext.class, ejbCtx); beanProp.set(beanCtx.getInstance(), wsContext); } Added: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerFactoryImpl.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerFactoryImpl.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerFactoryImpl.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -0,0 +1,63 @@ +/* + * 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.container.jboss42; + +import org.jboss.wsf.spi.invocation.*; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 19, 2007 + */ +public class InvocationHandlerFactoryImpl extends InvocationHandlerFactory +{ + public InvocationHandler createInvocationHandler(InvocationType type) + { + InvocationHandler handler = null; + + switch(type) + { + case JAXRPC_JSE: + handler = new DefaultInvocationHandlerJAXRPC(); + break; + case JAXRPC_EJB21: + handler = new InvocationHandlerEJB21(); + break; + case JAXRPC_MDB21: + handler = new InvocationHandlerMDB21(); + break; + case JAXWS_JSE: + handler = new DefaultInvocationHandlerJAXWS(); + break; + case JAXWS_EJB21: + handler = new InvocationHandlerEJB21(); + break; + case JAXWS_EJB3: + handler = new InvocationHandlerEJB3(); + } + + if(null == handler) + throw new IllegalArgumentException("Unable to resolve spi.invocation.InvocationHandler for type " +type); + + return handler; + } + +} Property changes on: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java 2007-07-25 12:01:46 UTC (rev 3990) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -1,76 +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.container.jboss42; - -import org.jboss.wsf.spi.invocation.*; - -import javax.xml.ws.handler.MessageContext; - -/** - * @author Heiko.Braun(a)jboss.com - * Created: Jul 19, 2007 - */ -public class InvocationModelFactoryImpl extends InvocationModelFactory -{ - public InvocationHandler createInvocationHandler(InvocationType type) - { - InvocationHandler handler = null; - - switch(type) - { - case JAXRPC_JSE: - handler = new DefaultInvocationHandlerJAXRPC(); - break; - case JAXRPC_EJB21: - handler = new InvocationHandlerEJB21(); - break; - case JAXRPC_MDB21: - handler = new InvocationHandlerMDB21(); - break; - case JAXWS_JSE: - handler = new DefaultInvocationHandlerJAXWS(); - break; - case JAXWS_EJB21: - handler = new InvocationHandlerEJB21(); - break; - case JAXWS_EJB3: - handler = new InvocationHandlerEJB3(); - } - - if(null == handler) - throw new IllegalArgumentException("Unable to resolve spi.invocation.InvocationHandler for type " +type); - - return handler; - } - - public ExtendableWebServiceContext createWebServiceContext(InvocationType type, MessageContext messageContext) - { - ExtendableWebServiceContext context = null; - - if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1) - context = new WebServiceContextEJB(messageContext); - else - context = new WebServiceContextJSE(messageContext); - - return context; - } -} Added: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebServiceContextFactoryImpl.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebServiceContextFactoryImpl.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebServiceContextFactoryImpl.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -0,0 +1,45 @@ +/* + * 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.container.jboss42; + +import org.jboss.wsf.spi.invocation.*; + +import javax.xml.ws.handler.MessageContext; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 25, 2007 + */ +public class WebServiceContextFactoryImpl extends WebServiceContextFactory +{ + public ExtendableWebServiceContext createWebServiceContext(InvocationType type, MessageContext messageContext) + { + ExtendableWebServiceContext context = null; + + if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1) + context = new WebServiceContextEJB(messageContext); + else + context = new WebServiceContextJSE(messageContext); + + return context; + } +} Property changes on: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebServiceContextFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory =================================================================== --- trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory (rev 0) +++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory 2007-07-25 12:35:09 UTC (rev 3991) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss42.InvocationHandlerFactoryImpl \ No newline at end of file Deleted: trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory =================================================================== --- trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory 2007-07-25 12:01:46 UTC (rev 3990) +++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory 2007-07-25 12:35:09 UTC (rev 3991) @@ -1 +0,0 @@ -org.jboss.wsf.container.jboss42.InvocationModelFactoryImpl \ No newline at end of file Added: trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory =================================================================== --- trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory (rev 0) +++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2007-07-25 12:35:09 UTC (rev 3991) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss42.WebServiceContextFactoryImpl \ No newline at end of file Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-07-25 12:01:46 UTC (rev 3990) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -127,7 +127,7 @@ { EJBContext ejbCtx = beanCtx.getEJBContext(); SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - ExtendableWebServiceContext wsContext = spiProvider.getSPI(InvocationModelFactory.class).createWebServiceContext(InvocationType.JAXWS_EJB3, jaxwsMessageContext); + ExtendableWebServiceContext wsContext = spiProvider.getSPI(WebServiceContextFactory.class).createWebServiceContext(InvocationType.JAXWS_EJB3, jaxwsMessageContext); wsContext.addAttachment(EJBContext.class, ejbCtx); beanProp.set(beanCtx.getInstance(), wsContext); } Added: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerFactoryImpl.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerFactoryImpl.java (rev 0) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerFactoryImpl.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -0,0 +1,61 @@ +/* + * 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.container.jboss50; + +import org.jboss.wsf.spi.invocation.*; + +/** + * The default invocation model factory fro AS 5.0. + * + * @author Heiko.Braun(a)jboss.com + * Created: Jul 19, 2007 + */ +public class InvocationHandlerFactoryImpl extends InvocationHandlerFactory +{ + public InvocationHandler createInvocationHandler(InvocationType type) + { + InvocationHandler handler = null; + + switch(type) + { + case JAXRPC_JSE: + handler = new DefaultInvocationHandlerJAXRPC(); + break; + case JAXRPC_EJB21: + handler = new InvocationHandlerEJB21(); + break; + case JAXWS_JSE: + handler = new DefaultInvocationHandlerJAXWS(); + break; + case JAXWS_EJB21: + handler = new InvocationHandlerEJB21(); + break; + case JAXWS_EJB3: + handler = new InvocationHandlerEJB3(); + } + + if(null == handler) + throw new IllegalArgumentException("Unable to resolve spi.invocation.InvocationHandler for type " +type); + + return handler; + } +} Property changes on: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java 2007-07-25 12:01:46 UTC (rev 3990) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -1,77 +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.container.jboss50; - -import org.jboss.wsf.spi.invocation.*; -import org.jboss.wsf.spi.invocation.WebServiceContextEJB; - -import javax.xml.ws.WebServiceContext; -import javax.xml.ws.handler.MessageContext; - -/** - * The default invocation model factory fro AS 5.0. - * - * @author Heiko.Braun(a)jboss.com - * Created: Jul 19, 2007 - */ -public class InvocationModelFactoryImpl extends InvocationModelFactory -{ - public InvocationHandler createInvocationHandler(InvocationType type) - { - InvocationHandler handler = null; - - switch(type) - { - case JAXRPC_JSE: - handler = new DefaultInvocationHandlerJAXRPC(); - break; - case JAXRPC_EJB21: - handler = new InvocationHandlerEJB21(); - break; - case JAXWS_JSE: - handler = new DefaultInvocationHandlerJAXWS(); - break; - case JAXWS_EJB21: - handler = new InvocationHandlerEJB21(); - break; - case JAXWS_EJB3: - handler = new InvocationHandlerEJB3(); - } - - if(null == handler) - throw new IllegalArgumentException("Unable to resolve spi.invocation.InvocationHandler for type " +type); - - return handler; - } - - public ExtendableWebServiceContext createWebServiceContext(InvocationType type, MessageContext messageContext) - { - ExtendableWebServiceContext context = null; - - if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1) - context = new WebServiceContextEJB(messageContext); - else - context = new WebServiceContextJSE(messageContext); - - return context; - } -} Added: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebServiceContextFactoryImpl.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebServiceContextFactoryImpl.java (rev 0) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebServiceContextFactoryImpl.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -0,0 +1,45 @@ +/* + * 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.container.jboss50; + +import org.jboss.wsf.spi.invocation.*; + +import javax.xml.ws.handler.MessageContext; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 25, 2007 + */ +public class WebServiceContextFactoryImpl extends WebServiceContextFactory +{ + public ExtendableWebServiceContext createWebServiceContext(InvocationType type, MessageContext messageContext) + { + ExtendableWebServiceContext context = null; + + if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1) + context = new WebServiceContextEJB(messageContext); + else + context = new WebServiceContextJSE(messageContext); + + return context; + } +} Property changes on: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebServiceContextFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory =================================================================== --- trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory (rev 0) +++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory 2007-07-25 12:35:09 UTC (rev 3991) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss50.InvocationHandlerFactoryImpl \ No newline at end of file Deleted: trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory =================================================================== --- trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory 2007-07-25 12:01:46 UTC (rev 3990) +++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory 2007-07-25 12:35:09 UTC (rev 3991) @@ -1 +0,0 @@ -org.jboss.wsf.container.jboss50.InvocationModelFactoryImpl \ No newline at end of file Added: trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory =================================================================== --- trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory (rev 0) +++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2007-07-25 12:35:09 UTC (rev 3991) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss50.WebServiceContextFactoryImpl \ No newline at end of file Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-25 12:01:46 UTC (rev 3990) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -31,10 +31,7 @@ import org.jboss.wsf.spi.deployment.DeploymentModelFactory; import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory; import org.jboss.wsf.spi.deployment.LifecycleHandlerFactory; -import org.jboss.wsf.spi.invocation.InvocationModelFactory; -import org.jboss.wsf.spi.invocation.ResourceInjectorFactory; -import org.jboss.wsf.spi.invocation.RequestHandlerFactory; -import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; +import org.jboss.wsf.spi.invocation.*; /** * @author Heiko.Braun(a)jboss.com @@ -86,7 +83,7 @@ // SPI provided by either container or stack integration - else if(InvocationModelFactory.class.equals(spiType)) + else if(InvocationHandlerFactory.class.equals(spiType)) { returnType = (T) loadService(spiType, null); } @@ -110,6 +107,10 @@ { returnType = (T) loadService(spiType, null); } + else if(WebServiceContextFactory.class.equals(spiType)) + { + returnType = (T) loadService(spiType, null); + } // help debugging if(null == returnType) Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2007-07-25 12:01:46 UTC (rev 3990) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -31,7 +31,7 @@ import org.jboss.wsf.spi.deployment.LifecycleHandler; import org.jboss.wsf.spi.deployment.LifecycleHandlerFactory; import org.jboss.wsf.spi.invocation.InvocationHandler; -import org.jboss.wsf.spi.invocation.InvocationModelFactory; +import org.jboss.wsf.spi.invocation.InvocationHandlerFactory; import org.jboss.wsf.spi.invocation.InvocationType; import org.jboss.wsf.spi.invocation.RequestHandler; import org.jboss.wsf.spi.invocation.RequestHandlerFactory; @@ -100,7 +100,7 @@ } InvocationType type = InvocationType.valueOf(key); - InvocationHandler invocationHandler = spiProvider.getSPI(InvocationModelFactory.class).createInvocationHandler(type); + InvocationHandler invocationHandler = spiProvider.getSPI(InvocationHandlerFactory.class).createInvocationHandler(type); return invocationHandler; } } \ No newline at end of file Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -0,0 +1,37 @@ +/* + * 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.invocation; + +import org.jboss.wsf.spi.SPIView; + +import javax.xml.ws.handler.MessageContext; + +/** + * Creates invocation related artefacts. + * + * @author Heiko.Braun(a)jboss.com + * Created: Jul 19, 2007 + */ +public abstract class InvocationHandlerFactory implements SPIView +{ + public abstract InvocationHandler createInvocationHandler(InvocationType type); +} Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationModelFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationModelFactory.java 2007-07-25 12:01:46 UTC (rev 3990) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationModelFactory.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -1,38 +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.invocation; - -import org.jboss.wsf.spi.SPIView; - -import javax.xml.ws.handler.MessageContext; - -/** - * Creates invocation related artefacts. - * - * @author Heiko.Braun(a)jboss.com - * Created: Jul 19, 2007 - */ -public abstract class InvocationModelFactory implements SPIView -{ - public abstract InvocationHandler createInvocationHandler(InvocationType type); - public abstract ExtendableWebServiceContext createWebServiceContext(InvocationType type, MessageContext messageContext); -} Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextFactory.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextFactory.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -0,0 +1,35 @@ +/* + * 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.invocation; + +import org.jboss.wsf.spi.SPIView; + +import javax.xml.ws.handler.MessageContext; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 25, 2007 + */ +public abstract class WebServiceContextFactory implements SPIView +{ + public abstract ExtendableWebServiceContext createWebServiceContext(InvocationType type, MessageContext messageContext); +} Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-07-25 12:01:46 UTC (rev 3990) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-07-25 12:35:09 UTC (rev 3991) @@ -279,7 +279,7 @@ if (msgContext.get(MessageContext.SERVLET_REQUEST) != null) { SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - wsContext = spiProvider.getSPI(InvocationModelFactory.class).createWebServiceContext( + wsContext = spiProvider.getSPI(WebServiceContextFactory.class).createWebServiceContext( InvocationType.JAXWS_JSE, (SOAPMessageContextJAXWS)msgContext ); } @@ -288,7 +288,7 @@ // TODO: This is an ESB case, they require a custom MessageContext // that works independed of MessageContext.SERVLET_REQUEST throw new IllegalArgumentException("JBOSS-ESB? The current WebServiceContext impl. relies on HTTP.ServletRequest"+ - "You should provide a custom spi.invocation.InvocationModelFactory"); + "You should provide a custom spi.invocation.InvocationHandlerFactory"); } invContext.addAttachment(WebServiceContext.class, wsContext); }