Author: heiko.braun(a)jboss.com Date: 2007-07-19 10:34:04 -0400 (Thu, 19 Jul 2007) New Revision: 3953 Added: branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java branches/hbraun/trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java branches/hbraun/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory Removed: branches/hbraun/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceLifecycleInvocationHandler.java Modified: branches/hbraun/trunk/hbraun-trunk.iws branches/hbraun/trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml branches/hbraun/trunk/integration/jboss42/int-42.iml branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerMDB21.java branches/hbraun/trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml branches/hbraun/trunk/integration/jboss50/int-50.iml branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdaptorImpl.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB21.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB3.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ServiceEndpointInterceptor.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java branches/hbraun/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml branches/hbraun/trunk/integration/native/src/main/resources/jbossws-native-config.xml branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/DelegatingInvocation.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServletRequestContext.java Log: Add WebServiceContext creation to InvocationModelFactory Modified: branches/hbraun/trunk/hbraun-trunk.iws =================================================================== --- branches/hbraun/trunk/hbraun-trunk.iws 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/hbraun-trunk.iws 2007-07-19 14:34:04 UTC (rev 3953) @@ -132,6 +132,19 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> + <breakpoint url="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java" line="272" class="org.jboss.ws.core.server.ServiceEndpointInvoker" package="org.jboss.ws.core.server"> + <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> @@ -186,7 +199,50 @@ <option name="myCurrentFavoritesList" value=".ipr" /> </component> <component name="FileEditorManager"> - <leaf /> + <leaf> + <file leaf-file-name="WebServiceContextEJB.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextEJB.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="48" column="12" selection-start="1737" selection-end="1737" vertical-scroll-proportion="0.54761904"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ServiceEndpointInvoker.java" pinned="false" current="true" current-in-tab="true"> + <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="282" column="41" selection-start="11806" selection-end="11806" vertical-scroll-proportion="0.17939393"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="DefaultSPIProviderResolver.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="57" column="0" selection-start="2110" selection-end="2110" vertical-scroll-proportion="0.15833333"> + <folding> + <element signature="imports" expanded="true" /> + </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="39" column="0" selection-start="1518" selection-end="1518" vertical-scroll-proportion="0.15833333"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + </leaf> </component> <component name="FindManager"> <FindUsagesManager> @@ -217,8 +273,8 @@ <setting name="SHOW_AS_DEPLOYMENT_VIEW" value="false" /> </component> <component name="ModuleEditorState"> - <option name="LAST_EDITED_MODULE_NAME" value="int-50" /> - <option name="LAST_EDITED_TAB_NAME" value="Libraries (Classpath)" /> + <option name="LAST_EDITED_MODULE_NAME" value="int-42" /> + <option name="LAST_EDITED_TAB_NAME" value="Dependencies" /> </component> <component name="NamedScopeManager" /> <component name="PackagesPane"> @@ -300,7 +356,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="deployment" /> + <option name="myItemId" value="invocation" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> </PATH> @@ -348,7 +404,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="deployment" /> + <option name="myItemId" value="invocation" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> </PATH> @@ -376,10 +432,48 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jbossws-core" /> + <option name="myItemId" value="int-native" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="hbraun-trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="org.jboss.wsf.stack.jbws" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="hbraun-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="hbraun-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.jboss.wsf.container.jboss50" /> + <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" /> @@ -574,9 +668,13 @@ <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="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/invocation" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -611,6 +709,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/ws" /> + <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/ws/integration" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -636,7 +742,7 @@ </PATH> </component> <component name="ProjectReloadState"> - <option name="STATE" value="2" /> + <option name="STATE" value="0" /> </component> <component name="ProjectView"> <navigator currentView="ProjectPane" splitterProportion="0.5"> @@ -668,15 +774,16 @@ </component> <component name="RecentsManager"> <key name="CopyClassDialog.RECENTS_KEY"> + <recent name="org.jboss.wsf.spi.invocation" /> <recent name="org.jboss.wsf.test" /> <recent name="org.jboss.test.ws.jaxws.webserviceref" /> </key> <key name="MoveClassesOrPackagesDialog.RECENTS_KEY"> + <recent name="org.jboss.wsf.spi.invocation" /> + <recent name="org.jboss.wsf.framework.invocation" /> + <recent name="org.jboss.wsf.stack.jbws" /> + <recent name="org.jboss.wsf.container.jboss50" /> <recent name="org.jboss.wsf.common.log" /> - <recent name="org.jboss.wsf.common" /> - <recent name="org.jboss.wsf.spi.deployment" /> - <recent name="org.jboss.ws.integration" /> - <recent name="org.jboss.wsf.framework.deployment" /> </key> </component> <component name="RestoreUpdateTree" /> @@ -698,6 +805,18 @@ <option name="HOST" value="localhost" /> <option name="PORT" value="5005" /> </configuration> + <configuration selected="false" 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 selected="false" default="true" type="JUnit" factoryName="JUnit"> <module name="" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> @@ -714,18 +833,6 @@ <value defaultName="wholeProject" /> </option> </configuration> - <configuration selected="false" 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 selected="true" default="false" name="server" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> <option name="SERVER_MODE" value="false" /> @@ -799,12 +906,12 @@ </component> <component name="ToolWindowManager"> <frame x="0" y="25" width="1680" height="1000" extended-state="0" /> - <editor active="false" /> + <editor active="true" /> <layout> <window_info id="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="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.33415535" order="0" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.5200458" order="1" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.27928483" order="0" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.44673538" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.24969174" 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" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" /> @@ -813,9 +920,9 @@ <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.24907522" order="2" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.21763255" 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.49714938" order="4" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.49713632" 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" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" /> @@ -889,120 +996,128 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/DefaultInvocationHandlerJAXWS.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="74" column="66" selection-start="2850" selection-end="2850" vertical-scroll-proportion="1.2848485"> + <state line="82" column="20" selection-start="2777" selection-end="2777" vertical-scroll-proportion="0.85365856"> <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/DeploymentInfoAdapterFactory.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationContext.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="13" selection-start="1390" selection-end="1390" vertical-scroll-proportion="0.2682927"> - <folding /> + <state line="61" column="15" selection-start="1508" selection-end="1807" vertical-scroll-proportion="1.6619385"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri-config.xml"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/CommonMessageContext.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="21" column="28" selection-start="1299" selection-end="1299" vertical-scroll-proportion="0.5090909"> + <state line="47" column="22" selection-start="1763" selection-end="1763" vertical-scroll-proportion="0.31707317"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/SPIProvider.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="29" column="22" selection-start="1184" selection-end="1184" vertical-scroll-proportion="0.21428572"> - <folding /> + <state line="125" column="12" selection-start="4846" selection-end="4846" vertical-scroll-proportion="0.45341614"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/SPIProvision.java"> + <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="26" column="3" selection-start="1126" selection-end="1126" vertical-scroll-proportion="0.14285715"> - <folding /> + <state line="31" column="57" selection-start="1272" selection-end="1272" vertical-scroll-proportion="0.2682927"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationModelFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="29" column="22" selection-start="1189" selection-end="1189" vertical-scroll-proportion="0.2195122"> - <folding /> + <state line="33" column="22" selection-start="1273" selection-end="1273" vertical-scroll-proportion="0.32298136"> + <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/DeploymentModelFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="32" column="58" selection-start="1391" selection-end="1391" vertical-scroll-proportion="0.29268292"> + <state line="131" column="57" selection-start="5156" selection-end="5156" vertical-scroll-proportion="0.5031056"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCDeployment.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/ExtendableWebServiceContext.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="47" column="10" selection-start="1869" selection-end="1869" vertical-scroll-proportion="0.6585366"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="43" column="22" selection-start="1724" selection-end="1724" vertical-scroll-proportion="0.14634146"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/SOAPMessageContextJAXWS.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="68" column="30" selection-start="2805" selection-end="2805" vertical-scroll-proportion="0.78571427"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="50" column="54" selection-start="1999" selection-end="1999" vertical-scroll-proportion="0.3341615"> + <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$/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="49" column="10" selection-start="1793" selection-end="1793" vertical-scroll-proportion="0.7204969"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="45" column="22" selection-start="1972" selection-end="1972" vertical-scroll-proportion="0.33292684"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextJSE.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="43" column="13" selection-start="1715" selection-end="1715" vertical-scroll-proportion="0.3416149"> + <state line="43" column="4" selection-start="1655" selection-end="1655" vertical-scroll-proportion="0.34146342"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextEJB.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="40" column="13" selection-start="1493" selection-end="1493" vertical-scroll-proportion="0.3151515"> + <state line="48" column="12" selection-start="1737" selection-end="1737" vertical-scroll-proportion="0.54761904"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXWSDeployment.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="20" selection-start="1396" selection-end="1396" vertical-scroll-proportion="0.30952382"> - <folding /> + <state line="57" column="0" selection-start="2110" selection-end="2110" vertical-scroll-proportion="0.15833333"> + <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/WebXMLRewriter.java"> + <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="46" column="15" selection-start="1708" selection-end="1708" vertical-scroll-proportion="0.8208955"> - <folding /> + <state line="39" column="0" selection-start="1518" selection-end="1518" vertical-scroll-proportion="0.15833333"> + <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/WebAppDesciptorModifier.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="51" column="13" selection-start="1843" selection-end="1843" vertical-scroll-proportion="0.61904764"> - <folding /> + <state line="282" column="41" selection-start="11806" selection-end="11806" vertical-scroll-proportion="0.17939393"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> Modified: branches/hbraun/trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml =================================================================== --- branches/hbraun/trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-19 14:34:04 UTC (rev 3953) @@ -95,7 +95,7 @@ <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry><key>JAXRPC_EJB21</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB21</value></entry> <entry><key>JAXRPC_MDB21</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerMDB21</value></entry> - <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.framework.invocation.InvocationHandlerJSE</value></entry> + <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.spi.invocation.DefaultInvocationHandlerJAXWS</value></entry> <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss40.InvocationHandlerEJB3</value></entry> </map> </property> Modified: branches/hbraun/trunk/integration/jboss42/int-42.iml =================================================================== --- branches/hbraun/trunk/integration/jboss42/int-42.iml 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss42/int-42.iml 2007-07-19 14:34:04 UTC (rev 3953) @@ -8,9 +8,28 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="jboss-system" level="project" /> <orderEntry type="module" module-name="spi" /> <orderEntry type="library" name="jboss-logging-spi" level="project" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../spi/thirdparty/jaxws-api.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module" module-name="42-server" /> + <orderEntry type="module" module-name="42-system" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/ejb3.deployer/jboss-ejb3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java =================================================================== --- branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,15 +23,6 @@ // $Id$ -import java.lang.reflect.Method; -import java.security.Principal; - -import javax.management.MBeanServer; -import javax.management.ObjectName; -import javax.xml.rpc.handler.MessageContext; -import javax.xml.rpc.handler.soap.SOAPMessageContext; -import javax.xml.ws.WebServiceException; - import org.jboss.ejb.EjbModule; import org.jboss.ejb.Interceptor; import org.jboss.ejb.StatelessSessionContainer; @@ -40,24 +31,28 @@ import org.jboss.invocation.PayloadKey; import org.jboss.logging.Logger; import org.jboss.mx.util.MBeanServerLocator; +import org.jboss.wsf.common.ObjectNameFactory; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.framework.invocation.BasicInvocationHandler; -import org.jboss.wsf.spi.invocation.HandlerCallback; -import org.jboss.wsf.spi.invocation.Invocation; -import org.jboss.wsf.spi.invocation.SecurityAdaptor; -import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; +import org.jboss.wsf.spi.invocation.*; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsf.common.ObjectNameFactory; +import javax.management.MBeanServer; +import javax.management.ObjectName; +import javax.xml.rpc.handler.MessageContext; +import javax.xml.rpc.handler.soap.SOAPMessageContext; +import javax.xml.ws.WebServiceException; +import java.lang.reflect.Method; +import java.security.Principal; + /** * Handles invocations on EJB21 endpoints. * * @author Thomas.Diesler(a)jboss.org * @since 25-Apr-2007 */ -public class InvocationHandlerEJB21 extends BasicInvocationHandler +public class InvocationHandlerEJB21 extends InvocationHandler { // provide logging private static final Logger log = Logger.getLogger(InvocationHandlerEJB21.class); @@ -66,10 +61,13 @@ private MBeanServer server; private ObjectName objectName; - public void create(Endpoint ep) + public Invocation createInvocation() { - super.create(ep); + return new Invocation(); + } + public void init(Endpoint ep) + { String ejbName = ep.getShortName(); UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class); UnifiedApplicationMetaData applMetaData = (UnifiedApplicationMetaData)udi.metaData; Modified: branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java =================================================================== --- branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,12 +23,6 @@ // $Id$ -import java.lang.reflect.Method; - -import javax.ejb.EJBContext; -import javax.management.ObjectName; -import javax.xml.ws.WebServiceException; - import org.jboss.aop.Dispatcher; import org.jboss.aop.MethodInfo; import org.jboss.ejb3.BeanContext; @@ -37,27 +31,35 @@ import org.jboss.ejb3.stateless.StatelessBeanContext; import org.jboss.ejb3.stateless.StatelessContainer; import org.jboss.injection.lang.reflect.BeanProperty; +import org.jboss.wsf.common.ObjectNameFactory; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.framework.invocation.BasicInvocationHandler; -import org.jboss.wsf.spi.invocation.Invocation; -import org.jboss.wsf.framework.invocation.WebServiceContextEJB; -import org.jboss.wsf.common.ObjectNameFactory; +import org.jboss.wsf.spi.invocation.*; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import javax.ejb.EJBContext; +import javax.management.ObjectName; +import javax.xml.ws.WebServiceException; +import java.lang.reflect.Method; + /** * Handles invocations on EJB3 endpoints. * * @author Thomas.Diesler(a)jboss.org * @since 25-Apr-2007 */ -public class InvocationHandlerEJB3 extends BasicInvocationHandler +public class InvocationHandlerEJB3 extends InvocationHandler { private ObjectName objectName; - public void create(Endpoint ep) + public Invocation createInvocation() { - super.create(ep); + return new Invocation(); + } + public void init(Endpoint ep) + { String ejbName = ep.getShortName(); UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class); String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + udi.simpleName; @@ -67,12 +69,7 @@ } objectName = ObjectNameFactory.create(nameStr.toString()); - } - public void start(Endpoint ep) - { - super.start(ep); - Dispatcher dispatcher = Dispatcher.singleton; if (dispatcher.getRegistered(objectName.getCanonicalName()) == null) throw new WebServiceException("Cannot find service endpoint target: " + objectName); @@ -125,7 +122,10 @@ if (beanProp != null) { EJBContext ejbCtx = beanCtx.getEJBContext(); - beanProp.set(beanCtx.getInstance(), new WebServiceContextEJB(jaxwsMessageContext, ejbCtx)); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + ExtendableWebServiceContext wsContext = spiProvider.getSPI(InvocationModelFactory.class).createWebServiceContext(InvocationType.JAXWS_EJB3, jaxwsMessageContext); + wsContext.addAttachment(EJBContext.class, ejbCtx); + beanProp.set(beanCtx.getInstance(), wsContext); } } Modified: branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerMDB21.java =================================================================== --- branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerMDB21.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerMDB21.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,25 +23,35 @@ // $Id: InvocationHandlerEJB21.java 3524 2007-06-09 17:28:37Z thomas.diesler(a)jboss.com $ -import java.lang.reflect.Method; - import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.framework.invocation.BasicInvocationHandler; import org.jboss.wsf.spi.invocation.Invocation; import org.jboss.wsf.spi.invocation.InvocationContext; +import org.jboss.wsf.spi.invocation.InvocationHandler; +import java.lang.reflect.Method; + /** * Handles invocations on MDB EJB21 endpoints. * * @author Thomas.Diesler(a)jboss.org * @since 25-Apr-2007 */ -public class InvocationHandlerMDB21 extends BasicInvocationHandler +public class InvocationHandlerMDB21 extends InvocationHandler { // provide logging private static final Logger log = Logger.getLogger(InvocationHandlerMDB21.class); + public Invocation createInvocation() + { + return new Invocation(); + } + + public void init(Endpoint ep) + { + + } + public void invoke(Endpoint ep, Invocation epInv) throws Exception { log.debug("Invoke: " + epInv.getJavaMethod().getName()); Added: branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java =================================================================== --- branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java (rev 0) +++ branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -0,0 +1,48 @@ +/* + * 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) + { + throw new IllegalArgumentException("Not implemented"); + } + + public InvocationContext createInvocationContext(InvocationType type) + { + throw new IllegalArgumentException("Not implemented"); + } + + public ExtendableWebServiceContext createWebServiceContext(InvocationType type, MessageContext messageContext) + { + throw new IllegalArgumentException("Not implemented"); + } +} Property changes on: branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/hbraun/trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml =================================================================== --- branches/hbraun/trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-19 14:34:04 UTC (rev 3953) @@ -95,7 +95,7 @@ <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry><key>JAXRPC_EJB21</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB21</value></entry> <entry><key>JAXRPC_MDB21</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerMDB21</value></entry> - <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.framework.invocation.InvocationHandlerJSE</value></entry> + <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.spi.invocation.DefaultInvocationHandlerJAXWS</value></entry> <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB3</value></entry> </map> </property> Added: branches/hbraun/trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory =================================================================== --- branches/hbraun/trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory (rev 0) +++ branches/hbraun/trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory 2007-07-19 14:34:04 UTC (rev 3953) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss42.InvocationModelFactoryImpl \ No newline at end of file Modified: branches/hbraun/trunk/integration/jboss50/int-50.iml =================================================================== --- branches/hbraun/trunk/integration/jboss50/int-50.iml 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/int-50.iml 2007-07-19 14:34:04 UTC (rev 3953) @@ -509,6 +509,15 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../spi/thirdparty/jaxws-api.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -21,15 +21,15 @@ */ package org.jboss.wsf.container.jboss50; -import java.util.LinkedList; -import java.util.List; - import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.spi.deployer.helpers.AbstractComponentDeployer; import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer; import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.logging.Logger; +import java.util.LinkedList; +import java.util.List; + //$Id$ /** Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,28 +23,20 @@ // $Id$ -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.logging.Logger; -import org.jboss.metadata.ApplicationMetaData; -import org.jboss.metadata.BeanMetaData; -import org.jboss.metadata.EjbPortComponentMetaData; -import org.jboss.metadata.MessageDrivenMetaData; -import org.jboss.metadata.SessionMetaData; +import org.jboss.metadata.*; import org.jboss.metadata.ApplicationMetaData.WebserviceDescription; import org.jboss.metadata.ApplicationMetaData.Webservices; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedSessionMetaData; +import org.jboss.wsf.spi.metadata.j2ee.*; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + /** * Build container independent application meta data * Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,31 +23,23 @@ // $Id$ -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.ejb3.Container; import org.jboss.ejb3.EJBContainer; import org.jboss.ejb3.Ejb3Deployment; import org.jboss.ejb3.SessionContainer; import org.jboss.ejb3.mdb.MessagingContainer; -import org.jboss.ejb3.metamodel.Ejb3PortComponent; -import org.jboss.ejb3.metamodel.EjbJarDD; -import org.jboss.ejb3.metamodel.EnterpriseBean; -import org.jboss.ejb3.metamodel.WebserviceDescription; -import org.jboss.ejb3.metamodel.Webservices; +import org.jboss.ejb3.metamodel.*; import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedSessionMetaData; +import org.jboss.wsf.spi.metadata.j2ee.*; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + /** * Build container independent application meta data * Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,24 +23,24 @@ //$Id$ -import java.net.URL; - import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; import org.jboss.virtual.VirtualFile; 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; import org.jboss.wsf.spi.deployment.WSFDeploymentException; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; -import org.jboss.wsf.common.DOMUtils; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; import org.w3c.dom.Element; +import java.net.URL; + /** * An abstract web service deployer. * Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -21,9 +21,6 @@ */ package org.jboss.wsf.container.jboss50; -import java.net.URL; -import java.net.URLClassLoader; - import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; import org.jboss.ejb3.Ejb3Deployment; @@ -33,6 +30,9 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import java.net.URL; +import java.net.URLClassLoader; + // $Id$ /** Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,15 +23,6 @@ // $Id$ -import java.lang.reflect.Method; -import java.security.Principal; - -import javax.management.MBeanServer; -import javax.management.ObjectName; -import javax.xml.rpc.handler.MessageContext; -import javax.xml.rpc.handler.soap.SOAPMessageContext; -import javax.xml.ws.WebServiceException; - import org.jboss.ejb.EjbModule; import org.jboss.ejb.Interceptor; import org.jboss.ejb.StatelessSessionContainer; @@ -42,24 +33,28 @@ import org.jboss.mx.util.MBeanServerLocator; import org.jboss.security.SecurityContext; import org.jboss.security.plugins.SecurityContextAssociation; +import org.jboss.wsf.common.ObjectNameFactory; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.framework.invocation.BasicInvocationHandler; -import org.jboss.wsf.spi.invocation.HandlerCallback; -import org.jboss.wsf.spi.invocation.Invocation; -import org.jboss.wsf.spi.invocation.SecurityAdaptor; -import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; +import org.jboss.wsf.spi.invocation.*; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsf.common.ObjectNameFactory; +import javax.management.MBeanServer; +import javax.management.ObjectName; +import javax.xml.rpc.handler.MessageContext; +import javax.xml.rpc.handler.soap.SOAPMessageContext; +import javax.xml.ws.WebServiceException; +import java.lang.reflect.Method; +import java.security.Principal; + /** - * Handles invocations on EJB3 endpoints. + * Handles invocations on EJB21 endpoints. * * @author Thomas.Diesler(a)jboss.org * @since 25-Apr-2007 */ -public class InvocationHandlerEJB21 extends BasicInvocationHandler +public class InvocationHandlerEJB21 extends InvocationHandler { // provide logging private static final Logger log = Logger.getLogger(InvocationHandlerEJB21.class); @@ -68,10 +63,17 @@ private MBeanServer server; private ObjectName objectName; - public void create(Endpoint ep) + InvocationHandlerEJB21() { - super.create(ep); + } + public Invocation createInvocation() + { + return new Invocation(); + } + + public void init(Endpoint ep) + { String ejbName = ep.getShortName(); UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class); UnifiedApplicationMetaData applMetaData = (UnifiedApplicationMetaData)udi.metaData; Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,12 +23,6 @@ // $Id$ -import java.lang.reflect.Method; - -import javax.ejb.EJBContext; -import javax.management.ObjectName; -import javax.xml.ws.WebServiceException; - import org.jboss.aop.Dispatcher; import org.jboss.aop.MethodInfo; import org.jboss.ejb3.BeanContext; @@ -37,25 +31,39 @@ import org.jboss.ejb3.stateless.StatelessBeanContext; import org.jboss.ejb3.stateless.StatelessContainer; import org.jboss.injection.lang.reflect.BeanProperty; +import org.jboss.wsf.common.ObjectNameFactory; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; -import org.jboss.wsf.framework.invocation.BasicInvocationHandler; -import org.jboss.wsf.spi.invocation.Invocation; -import org.jboss.wsf.framework.invocation.WebServiceContextEJB; -import org.jboss.wsf.common.ObjectNameFactory; +import org.jboss.wsf.spi.invocation.*; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import javax.ejb.EJBContext; +import javax.management.ObjectName; +import javax.xml.ws.WebServiceException; +import java.lang.reflect.Method; + /** * Handles invocations on EJB3 endpoints. * * @author Thomas.Diesler(a)jboss.org * @since 25-Apr-2007 */ -public class InvocationHandlerEJB3 extends BasicInvocationHandler +public class InvocationHandlerEJB3 extends InvocationHandler { private ObjectName objectName; - public void create(Endpoint ep) + InvocationHandlerEJB3() { + } + + public Invocation createInvocation() + { + return new Invocation(); + } + + public void init(Endpoint ep) + { String ejbName = ep.getShortName(); UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class); String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + udi.simpleName; @@ -65,12 +73,7 @@ } objectName = ObjectNameFactory.create(nameStr.toString()); - } - public void start(Endpoint ep) - { - super.start(ep); - Dispatcher dispatcher = Dispatcher.singleton; if (dispatcher.getRegistered(objectName.getCanonicalName()) == null) throw new WebServiceException("Cannot find service endpoint target: " + objectName); @@ -123,7 +126,10 @@ if (beanProp != null) { EJBContext ejbCtx = beanCtx.getEJBContext(); - beanProp.set(beanCtx.getInstance(), new WebServiceContextEJB(jaxwsMessageContext, ejbCtx)); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + ExtendableWebServiceContext wsContext = spiProvider.getSPI(InvocationModelFactory.class).createWebServiceContext(InvocationType.JAXWS_EJB3, jaxwsMessageContext); + wsContext.addAttachment(EJBContext.class, ejbCtx); + beanProp.set(beanCtx.getInstance(), wsContext); } } Added: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java (rev 0) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -0,0 +1,82 @@ +/* + * 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 InvocationContext createInvocationContext(InvocationType type) + { + return null; + } + + 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: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -28,9 +28,9 @@ import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.BeanMetaData; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -28,9 +28,9 @@ import org.jboss.metadata.WebMetaData; import org.jboss.metadata.web.Servlet; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,21 +23,20 @@ //$Id$ -import java.util.Iterator; - -import javax.jws.WebService; -import javax.xml.ws.WebServiceProvider; - import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; import org.jboss.ejb3.EJBContainer; import org.jboss.ejb3.Ejb3Deployment; import org.jboss.ejb3.stateless.StatelessContainer; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import javax.jws.WebService; +import javax.xml.ws.WebServiceProvider; +import java.util.Iterator; + /** * A deployer JAXWS EJB3 Endpoints * Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,21 +23,20 @@ //$Id$ -import java.util.ArrayList; -import java.util.List; - -import javax.jws.WebService; -import javax.xml.ws.WebServiceProvider; - import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; import org.jboss.metadata.WebMetaData; import org.jboss.metadata.web.Servlet; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import javax.jws.WebService; +import javax.xml.ws.WebServiceProvider; +import java.util.ArrayList; +import java.util.List; + /** * A deployer JAXWS JSE Endpoints * Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -25,7 +25,6 @@ import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.wsf.container.jboss50.AbstractDeployerHook; import org.jboss.wsf.spi.deployment.Deployment; /** Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,20 +23,20 @@ //$Id: ModifyWebMetaDataDeployer.java 3150 2007-05-20 00:29:48Z thomas.diesler(a)jboss.com $ -import java.util.Iterator; -import java.util.Map; - import org.jboss.metadata.Listener; import org.jboss.metadata.NameValuePair; import org.jboss.metadata.WebMetaData; import org.jboss.metadata.web.ParamValue; +import org.jboss.metadata.web.ParamValue.ParamType; import org.jboss.metadata.web.Servlet; -import org.jboss.metadata.web.ParamValue.ParamType; +import org.jboss.wsf.framework.deployment.WebAppDesciptorModifier; 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.framework.deployment.WebAppDesciptorModifier; +import java.util.Iterator; +import java.util.Map; + /** * A deployer that modifies the web.xml meta data * Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdaptorImpl.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdaptorImpl.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdaptorImpl.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,11 +23,11 @@ // $Id$ -import java.security.Principal; - import org.jboss.security.SecurityAssociation; import org.jboss.wsf.spi.invocation.SecurityAdaptor; +import java.security.Principal; + /** * A JBoss specific SecurityAssociationAdaptor * Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB21.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB21.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB21.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,9 +23,6 @@ //$Id$ -import java.util.Iterator; -import java.util.Map; - import org.dom4j.Element; import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.AssemblyDescriptorMetaData; @@ -33,6 +30,9 @@ import org.jboss.wsf.spi.deployment.SecurityHandler; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; +import java.util.Iterator; +import java.util.Map; + /** * Generate a service endpoint deployment for EJB endpoints * Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB3.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB3.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB3.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,10 +23,6 @@ //$Id$ -import java.util.Iterator; - -import javax.annotation.security.RolesAllowed; - import org.dom4j.Element; import org.jboss.annotation.security.SecurityDomain; import org.jboss.ejb3.EJBContainer; @@ -34,6 +30,9 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.SecurityHandler; +import javax.annotation.security.RolesAllowed; +import java.util.Iterator; + /** * Generate a service endpoint deployment for EJB endpoints * Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ServiceEndpointInterceptor.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ServiceEndpointInterceptor.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ServiceEndpointInterceptor.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,8 +23,6 @@ // $Id$ -import javax.xml.rpc.handler.soap.SOAPMessageContext; - import org.jboss.ejb.plugins.AbstractInterceptor; import org.jboss.invocation.InvocationKey; import org.jboss.logging.Logger; @@ -32,6 +30,8 @@ import org.jboss.wsf.spi.invocation.Invocation; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import javax.xml.rpc.handler.soap.SOAPMessageContext; + /** * This Interceptor does the ws4ee handler processing. * Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -24,11 +24,7 @@ //$Id: UnifiedDeploymentInfoDeployer.java 3772 2007-07-01 19:29:13Z thomas.diesler(a)jboss.com $ import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.wsf.spi.deployment.DeploymentAspect; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.JAXRPCDeployment; -import org.jboss.wsf.spi.deployment.JAXWSDeployment; -import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.deployment.*; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -21,12 +21,12 @@ */ package org.jboss.wsf.container.jboss50; +import org.jboss.virtual.VirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; + import java.io.IOException; import java.net.URL; -import org.jboss.virtual.VirtualFile; -import org.jboss.ws.integration.UnifiedVirtualFile; - // $Id$ /** Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,21 +23,21 @@ // $Id: WebAppDeployerDeployer.java 3772 2007-07-01 19:29:13Z thomas.diesler(a)jboss.com $ -import java.net.URL; -import java.util.HashMap; -import java.util.Map; - import org.jboss.deployers.client.spi.DeployerClient; import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory; import org.jboss.logging.Logger; import org.jboss.virtual.VFS; import org.jboss.virtual.VirtualFile; +import org.jboss.wsf.framework.deployment.WebXMLRewriter; +import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; -import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.deployment.WSFDeploymentException; -import org.jboss.wsf.framework.deployment.WebXMLRewriter; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + /** * Publish the HTTP service endpoint to Tomcat * Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,12 +23,6 @@ // $Id$ -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.deployment.J2eeApplicationMetaData; import org.jboss.deployment.J2eeModuleMetaData; @@ -40,10 +34,12 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; +import java.util.*; + /** * Build container independent web meta data * Modified: branches/hbraun/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-19 14:34:04 UTC (rev 3953) @@ -144,14 +144,7 @@ </bean> <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> - <property name="provides">ContainerEndpointHandler</property> - <property name="invocationHandler"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>JAXRPC_EJB21</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerEJB21</value></entry> - <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.framework.invocation.InvocationHandlerJSE</value></entry> - <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerEJB3</value></entry> - </map> - </property> + <property name="provides">ContainerEndpointHandler</property> </bean> <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect"> Added: branches/hbraun/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory (rev 0) +++ branches/hbraun/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory 2007-07-19 14:34:04 UTC (rev 3953) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss50.InvocationModelFactoryImpl \ No newline at end of file Deleted: branches/hbraun/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceLifecycleInvocationHandler.java =================================================================== --- branches/hbraun/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceLifecycleInvocationHandler.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceLifecycleInvocationHandler.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -1,74 +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.stack.jbws; - -// $Id$ - -import javax.xml.rpc.server.ServiceLifecycle; -import javax.xml.rpc.server.ServletEndpointContext; - -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.invocation.Invocation; -import org.jboss.wsf.spi.invocation.InvocationContext; -import org.jboss.wsf.framework.invocation.InvocationHandlerJSE; - -/** - * Handles invocations on JSE endpoints. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class ServiceLifecycleInvocationHandler extends InvocationHandlerJSE -{ - @Override - public void invoke(Endpoint ep, Invocation epInv) throws Exception - { - try - { - Object targetBean = getTargetBean(ep, epInv); - - InvocationContext invContext = epInv.getInvocationContext(); - if (targetBean instanceof ServiceLifecycle) - { - ServletEndpointContext sepContext = invContext.getAttachment(ServletEndpointContext.class); - if (sepContext != null) - ((ServiceLifecycle)targetBean).init(sepContext); - } - - try - { - super.invoke(ep, epInv); - } - finally - { - if (targetBean instanceof ServiceLifecycle) - { - ((ServiceLifecycle)targetBean).destroy(); - } - } - } - catch (Exception e) - { - handleInvocationException(e); - } - } -} Modified: branches/hbraun/trunk/integration/native/src/main/resources/jbossws-native-config.xml =================================================================== --- branches/hbraun/trunk/integration/native/src/main/resources/jbossws-native-config.xml 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/integration/native/src/main/resources/jbossws-native-config.xml 2007-07-19 14:34:04 UTC (rev 3953) @@ -68,7 +68,7 @@ <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property> <property name="invocationHandler"> <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry> + <entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.spi.invocation.DefaultInvocationHandlerJAXRPC</value></entry> </map> </property> </bean> Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/DelegatingInvocation.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/DelegatingInvocation.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/DelegatingInvocation.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,23 +23,23 @@ // $Id$ -import javax.xml.rpc.handler.soap.SOAPMessageContext; -import javax.xml.soap.SOAPMessage; - import org.jboss.ws.WSException; import org.jboss.ws.core.CommonBinding; import org.jboss.ws.core.CommonBindingProvider; import org.jboss.ws.core.EndpointInvocation; import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.wsf.framework.invocation.BasicEndpointInvocation; +import org.jboss.wsf.spi.invocation.Invocation; +import javax.xml.rpc.handler.soap.SOAPMessageContext; +import javax.xml.soap.SOAPMessage; + /** An invocation that delegates to the jbossws-core EndpointInvocation * * @author Thomas.Diesler(a)jboss.org * @since 25-Apr-2007 */ -public class DelegatingInvocation extends BasicEndpointInvocation +public class DelegatingInvocation extends Invocation { private EndpointInvocation getEndpointInvocation() { Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,31 +23,9 @@ // $Id$ -import java.lang.reflect.Method; -import java.util.HashMap; - -import javax.activation.DataHandler; -import javax.xml.namespace.QName; -import javax.xml.rpc.server.ServiceLifecycle; -import javax.xml.rpc.server.ServletEndpointContext; -import javax.xml.soap.Name; -import javax.xml.soap.SOAPBodyElement; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPHeader; -import javax.xml.ws.WebServiceContext; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.http.HTTPBinding; - import org.jboss.logging.Logger; import org.jboss.ws.Constants; -import org.jboss.ws.core.CommonBinding; -import org.jboss.ws.core.CommonBindingProvider; -import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.CommonSOAPBinding; -import org.jboss.ws.core.CommonSOAPFaultException; -import org.jboss.ws.core.DirectionHolder; -import org.jboss.ws.core.EndpointInvocation; -import org.jboss.ws.core.MessageAbstraction; +import org.jboss.ws.core.*; import org.jboss.ws.core.DirectionHolder.Direction; import org.jboss.ws.core.jaxrpc.ServletEndpointContextImpl; import org.jboss.ws.core.jaxrpc.handler.HandlerDelegateJAXRPC; @@ -64,16 +42,28 @@ import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.common.JavaUtils; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.invocation.Invocation; -import org.jboss.wsf.spi.invocation.InvocationContext; -import org.jboss.wsf.spi.invocation.InvocationHandler; -import org.jboss.wsf.framework.invocation.WebServiceContextDummy; -import org.jboss.wsf.framework.invocation.WebServiceContextJSE; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.*; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; -import org.jboss.wsf.common.JavaUtils; +import javax.activation.DataHandler; +import javax.xml.namespace.QName; +import javax.xml.rpc.server.ServiceLifecycle; +import javax.xml.rpc.server.ServletEndpointContext; +import javax.xml.soap.Name; +import javax.xml.soap.SOAPBodyElement; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPHeader; +import javax.xml.ws.WebServiceContext; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.http.HTTPBinding; +import java.lang.reflect.Method; +import java.util.HashMap; + /** An implementation handles invocations on the endpoint * * @author Thomas.Diesler(a)jboss.org @@ -288,11 +278,17 @@ WebServiceContext wsContext; if (msgContext.get(MessageContext.SERVLET_REQUEST) != null) { - wsContext = new WebServiceContextJSE((SOAPMessageContextJAXWS)msgContext); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + wsContext = spiProvider.getSPI(InvocationModelFactory.class).createWebServiceContext( + InvocationType.JAXWS_JSE, (SOAPMessageContextJAXWS)msgContext + ); } else { - wsContext = new WebServiceContextDummy((SOAPMessageContextJAXWS)msgContext); + // 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"); } invContext.addAttachment(WebServiceContext.class, wsContext); } Modified: branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServletRequestContext.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServletRequestContext.java 2007-07-19 14:32:24 UTC (rev 3952) +++ branches/hbraun/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServletRequestContext.java 2007-07-19 14:34:04 UTC (rev 3953) @@ -23,19 +23,19 @@ // $Id$ +import org.jboss.wsf.spi.invocation.InvocationContext; + import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.jboss.wsf.framework.invocation.BasicInvocationContext; - /** * Implementation of ServletEndpointContext * * @author Thomas.Diesler(a)jboss.org */ -public class ServletRequestContext extends BasicInvocationContext +public class ServletRequestContext extends InvocationContext { private ServletContext context; private HttpServletRequest request;