[jbossws-commits] JBossWS SVN: r3974 - in trunk: integration/native and 9 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Jul 24 09:34:03 EDT 2007
Author: heiko.braun at jboss.com
Date: 2007-07-24 09:34:03 -0400 (Tue, 24 Jul 2007)
New Revision: 3974
Added:
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointAssociation.java
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointServlet.java
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppResolver.java
trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointServlet.java
trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppResolver.java
Removed:
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointAssociation.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebAppResolver.java
Modified:
trunk/JBossWS-Trunk.iws
trunk/integration/native/int-native.iml
trunk/integration/native/src/main/resources/jbossws-native-config.xml
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerJSE.java
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java
trunk/integration/sunri/src/main/resources/jbossws-sunri-config.xml
trunk/integration/xfire/int-xfire.iml
trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServletExt.java
trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java
trunk/jbossws-core/src/test/resources/jaxrpc/jbws124/WEB-INF/web.xml
Log:
Move endpoints servlets to stack integration packages
Modified: trunk/JBossWS-Trunk.iws
===================================================================
--- trunk/JBossWS-Trunk.iws 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/JBossWS-Trunk.iws 2007-07-24 13:34:03 UTC (rev 3974)
@@ -186,7 +186,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/invocation/EndpointServlet.java" line="87" class="org.jboss.wsf.framework.invocation.EndpointServlet" package="org.jboss.wsf.framework.invocation">
+ <breakpoint url="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java" line="95" class="org.jboss.wsf.stack.jbws.ServiceEndpointServlet" package="org.jboss.wsf.stack.jbws">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -199,19 +199,6 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java" line="51" class="org.jboss.wsf.stack.jbws.ServiceEndpointServlet" package="org.jboss.wsf.stack.jbws">
- <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>
@@ -266,86 +253,7 @@
<option name="myCurrentFavoritesList" value="JBossWS-Trunk" />
</component>
<component name="FileEditorManager">
- <leaf>
- <file leaf-file-name="EndpointRegistry.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="37" column="3" selection-start="1400" selection-end="1400" vertical-scroll-proportion="0.17073171">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="ServiceEndpointServlet.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="67" column="28" selection-start="2753" selection-end="2753" vertical-scroll-proportion="0.4390244">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="EndpointServlet.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="107" column="50" selection-start="4068" selection-end="4068" vertical-scroll-proportion="0.902439">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="SecurityAssociationValve.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file:///home/hbraun/dev/prj/jbossas/branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/security/SecurityAssociationValve.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="177" column="0" selection-start="6879" selection-end="6879" vertical-scroll-proportion="0.18902439">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="DefaultEndpointRegistry.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="61" column="0" selection-start="2164" selection-end="2164" vertical-scroll-proportion="0.18902439">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="WebAppResolver.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebAppResolver.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="66" column="0" selection-start="2298" selection-end="2298" vertical-scroll-proportion="0.7804878">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Endpoint.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="40" column="17" selection-start="1544" selection-end="1544" vertical-scroll-proportion="-1.8780488">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="EndpointResolver.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointResolver.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="33" column="12" selection-start="1250" selection-end="1250" vertical-scroll-proportion="0.31707317">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
+ <leaf />
</component>
<component name="FindManager">
<FindUsagesManager>
@@ -376,8 +284,8 @@
<setting name="SHOW_AS_DEPLOYMENT_VIEW" value="false" />
</component>
<component name="ModuleEditorState">
- <option name="LAST_EDITED_MODULE_NAME" value="int-native" />
- <option name="LAST_EDITED_TAB_NAME" value="Dependencies" />
+ <option name="LAST_EDITED_MODULE_NAME" value="int-xfire" />
+ <option name="LAST_EDITED_TAB_NAME" value="Libraries (Classpath)" />
</component>
<component name="NamedScopeManager" />
<component name="PackagesPane">
@@ -571,86 +479,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="JBossWS-Trunk.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="spi" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="JBossWS-Trunk.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="spi" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/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>
@@ -781,12 +609,17 @@
<option name="SHOW_DIALOG" value="true" />
</component>
<component name="RecentsManager">
+ <key name="CopyClassDialog.RECENTS_KEY">
+ <recent name="org.jboss.wsf.stack.jbws" />
+ <recent name="org.jboss.wsf.stack.sunri" />
+ <recent name="org.jboss.wsf.stack.xfire" />
+ </key>
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
+ <recent name="org.jboss.wsf.spi.invocation" />
<recent name="org.jboss.ws.core.server" />
<recent name="org.jboss.wsf.stack.jbws" />
<recent name="org.jboss.wsf.spi.management" />
<recent name="org.jboss.wsf.framework.deployment" />
- <recent name="org.jboss.wsf.framework" />
</key>
</component>
<component name="RestoreUpdateTree" />
@@ -909,12 +742,12 @@
</component>
<component name="ToolWindowManager">
<frame x="0" y="25" width="1680" height="1000" extended-state="0" />
- <editor active="true" />
+ <editor active="false" />
<layout>
<window_info id="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.25647348" order="0" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.37342498" order="1" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.30147967" order="0" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.5452463" 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" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" />
@@ -999,113 +832,115 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistry.java">
+ <entry file="jar://$PROJECT_DIR$/integration/spi/thirdparty/jboss-javaee.jar!/javax/servlet/http/HttpServlet.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="39" column="13" selection-start="1457" selection-end="1457" vertical-scroll-proportion="0.3096647">
+ <state line="5" column="22" selection-start="165" selection-end="165" vertical-scroll-proportion="0.096969694">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java">
+ <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/xml/ws/transport/http/servlet/WSServletDelegate.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="189" column="89" selection-start="8285" selection-end="8285" vertical-scroll-proportion="0.20372671">
+ <state line="55" column="30" selection-start="1956" selection-end="1956" vertical-scroll-proportion="0.26190478">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java">
+ <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="81" column="80" selection-start="3425" selection-end="3425" vertical-scroll-proportion="0.4878049">
- <folding />
+ <state line="71" column="22" selection-start="2614" selection-end="2614" vertical-scroll-proportion="0.6708075">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistry.java">
+ <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/RequestHandler.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="58" column="0" selection-start="2118" selection-end="2118" vertical-scroll-proportion="0.29268292">
+ <state line="42" column="17" selection-start="1562" selection-end="1562" vertical-scroll-proportion="0.32298136">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java">
+ <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="21" column="40" selection-start="1040" selection-end="1072" vertical-scroll-proportion="0.023809524">
+ <state line="84" column="28" selection-start="2716" selection-end="2716" vertical-scroll-proportion="0.104347825">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentResolver.java">
+ <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointAssociation.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="13" selection-start="1356" selection-end="1356" vertical-scroll-proportion="0.33333334">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file:///home/hbraun/dev/prj/jbossas/branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/security/SecurityAssociationValve.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="177" column="0" selection-start="6879" selection-end="6879" vertical-scroll-proportion="0.18902439">
+ <state line="34" column="19" selection-start="1342" selection-end="1342" vertical-scroll-proportion="0.34146342">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java">
+ <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri-config.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="40" column="17" selection-start="1544" selection-end="1544" vertical-scroll-proportion="-1.8780488">
+ <state line="69" column="70" selection-start="3687" selection-end="3687" vertical-scroll-proportion="0.33262712">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointResolver.java">
+ <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="12" selection-start="1250" selection-end="1250" vertical-scroll-proportion="0.31707317">
+ <state line="101" column="13" selection-start="4191" selection-end="4191" vertical-scroll-proportion="0.0">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebAppResolver.java">
+ <entry file="file://WebAppResolver.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="66" column="0" selection-start="2298" selection-end="2298" vertical-scroll-proportion="0.7804878">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="35" column="13" selection-start="1374" selection-end="1374" vertical-scroll-proportion="0.1904762">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java">
+ <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppResolver.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="61" column="0" selection-start="2164" selection-end="2164" vertical-scroll-proportion="0.18902439">
+ <state line="35" column="13" selection-start="1365" selection-end="1365" vertical-scroll-proportion="0.26190478">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java">
+ <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointServlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="67" column="28" selection-start="2753" selection-end="2753" vertical-scroll-proportion="0.4390244">
- <folding />
+ <state line="30" column="56" selection-start="1451" selection-end="1451" vertical-scroll-proportion="0.024242423">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java">
+ <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppResolver.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="52" column="13" selection-start="1869" selection-end="1869" vertical-scroll-proportion="0.09756097">
+ <state line="35" column="13" selection-start="1365" selection-end="1365" vertical-scroll-proportion="0.26190478">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java">
+ <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointServlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="37" column="3" selection-start="1400" selection-end="1400" vertical-scroll-proportion="0.17073171">
+ <state line="30" column="56" selection-start="1451" selection-end="1451" vertical-scroll-proportion="0.24242425">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="35" column="13" selection-start="1364" selection-end="1364" vertical-scroll-proportion="0.26190478">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java">
+ <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="107" column="50" selection-start="4068" selection-end="4068" vertical-scroll-proportion="0.902439">
+ <state line="28" column="46" selection-start="1317" selection-end="1317" vertical-scroll-proportion="0.19393939">
<folding>
<element signature="imports" expanded="true" />
</folding>
Modified: trunk/integration/native/int-native.iml
===================================================================
--- trunk/integration/native/int-native.iml 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/integration/native/int-native.iml 2007-07-24 13:34:03 UTC (rev 3974)
@@ -12,6 +12,24 @@
<orderEntry type="module" module-name="jbossws-core" />
<orderEntry type="module" module-name="spi" />
<orderEntry type="library" name="jboss-logging-spi" level="project" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../spi/thirdparty/servlet-api.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../spi/thirdparty/activation.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Added: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java (rev 0)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -0,0 +1,164 @@
+/*
+ * 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 org.jboss.logging.Logger;
+import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
+import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+import org.jboss.wsf.common.ObjectNameFactory;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.invocation.RequestHandler;
+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.Endpoint.EndpointState;
+import org.jboss.wsf.spi.management.EndpointRegistry;
+import org.jboss.wsf.spi.management.EndpointRegistryFactory;
+
+import javax.management.ObjectName;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.ws.WebServiceException;
+import java.io.IOException;
+
+/**
+ * A servlet that is installed for every web service endpoint.
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 25-Apr-2007
+ */
+public class EndpointServlet extends HttpServlet
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(EndpointServlet.class);
+
+ protected Endpoint endpoint;
+ protected EndpointRegistry epRegistry;
+
+ public void init(ServletConfig servletConfig) throws ServletException
+ {
+ super.init(servletConfig);
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).createEndpointRegistry();
+ }
+
+ public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+ {
+ if (endpoint == null)
+ {
+ String contextPath = req.getContextPath();
+ initServiceEndpoint(contextPath);
+ }
+
+ try
+ {
+ EndpointAssociation.setEndpoint(endpoint);
+ RequestHandler requestHandler = endpoint.getRequestHandler();
+ requestHandler.handleHttpRequest(endpoint, req, res, getServletContext());
+ }
+ finally
+ {
+ EndpointAssociation.removeEndpoint();
+ }
+ }
+
+ /** Initialize the service endpoint
+ */
+ protected void initServiceEndpoint(String contextPath)
+ {
+ initEndpoint(contextPath, getServletName());
+ initClassLoader();
+ initEndpointConfig();
+ initializeAndStart();
+ }
+
+ private void initializeAndStart()
+ {
+ Deployment dep = endpoint.getService().getDeployment();
+ if (dep.getType() == DeploymentType.JAXRPC_JSE || dep.getType() == DeploymentType.JAXWS_JSE)
+ {
+ // Initialize the meta data model
+ UnifiedMetaData umd = dep.getContext().getAttachment(UnifiedMetaData.class);
+ if (umd.isEagerInitialized() == false)
+ {
+ umd.setClassLoader(dep.getRuntimeClassLoader());
+ umd.eagerInitialize();
+ }
+
+ // Start the endpoint
+ if (endpoint.getState() == EndpointState.CREATED)
+ endpoint.getLifecycleHandler().start(endpoint);
+ }
+ }
+
+ private void initEndpointConfig()
+ {
+ // read the config name/file from web.xml
+ ServletContext ctx = getServletContext();
+ String configName = ctx.getInitParameter("jbossws-config-name");
+ String configFile = ctx.getInitParameter("jbossws-config-file");
+ if (configName != null || configFile != null)
+ {
+ ServerEndpointMetaData epMetaData = endpoint.getAttachment(ServerEndpointMetaData.class);
+ if (epMetaData == null)
+ throw new IllegalStateException("Cannot obtain endpoint meta data");
+
+ log.debug("Updating service endpoint config\n config-name: " + configName + "\n config-file: " + configFile);
+ epMetaData.setConfigName(configName, configFile);
+ }
+ }
+
+ private void initClassLoader()
+ {
+ // Set the runtime classloader for JSE endpoints, this should be the tomcat classloader
+ Deployment dep = endpoint.getService().getDeployment();
+ if (dep.getType() == DeploymentType.JAXRPC_JSE || dep.getType() == DeploymentType.JAXWS_JSE)
+ {
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ dep.setRuntimeClassLoader(classLoader);
+ }
+ }
+
+ private void initEndpoint(String contextPath, String servletName)
+ {
+ WebAppResolver resolver = new WebAppResolver(contextPath, servletName);
+ this.endpoint = epRegistry.resolve(resolver);
+
+ if (this.endpoint == null)
+ {
+ ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" +
+ Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," +
+ Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + getServletName()
+ );
+ throw new WebServiceException("Cannot obtain endpoint for: " + oname);
+ }
+
+ }
+}
Property changes on: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -1,84 +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.servlet.ServletContext;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
-import org.jboss.ws.metadata.umdm.UnifiedMetaData;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import org.jboss.wsf.spi.deployment.Endpoint.EndpointState;
-import org.jboss.wsf.framework.invocation.EndpointServlet;
-
-/**
- * A servlet that is installed for every web service endpoint.
- *
- * @author Thomas.Diesler at jboss.org
- * @since 25-Apr-2007
- */
-public class ServiceEndpointServlet extends EndpointServlet
-{
- // provide logging
- private static final Logger log = Logger.getLogger(ServiceEndpointServlet.class);
-
- /** Initialize the service endpoint
- */
- @Override
- protected void initServiceEndpoint(String contextPath)
- {
- super.initServiceEndpoint(contextPath);
-
- // read the config name/file from web.xml
- ServletContext ctx = getServletContext();
- String configName = ctx.getInitParameter("jbossws-config-name");
- String configFile = ctx.getInitParameter("jbossws-config-file");
- if (configName != null || configFile != null)
- {
- ServerEndpointMetaData epMetaData = endpoint.getAttachment(ServerEndpointMetaData.class);
- if (epMetaData == null)
- throw new IllegalStateException("Cannot obtain endpoint meta data");
-
- log.debug("Updating service endpoint config\n config-name: " + configName + "\n config-file: " + configFile);
- epMetaData.setConfigName(configName, configFile);
- }
-
- Deployment dep = endpoint.getService().getDeployment();
- if (dep.getType() == DeploymentType.JAXRPC_JSE || dep.getType() == DeploymentType.JAXWS_JSE)
- {
- // Initialize the meta data model
- UnifiedMetaData umd = dep.getContext().getAttachment(UnifiedMetaData.class);
- if (umd.isEagerInitialized() == false)
- {
- umd.setClassLoader(dep.getRuntimeClassLoader());
- umd.eagerInitialize();
- }
-
- // Start the endpoint
- if (endpoint.getState() == EndpointState.CREATED)
- endpoint.getLifecycleHandler().start(endpoint);
- }
- }
-}
Added: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java (rev 0)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -0,0 +1,69 @@
+/*
+ * 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;
+
+import org.jboss.wsf.spi.management.EndpointResolver;
+import org.jboss.wsf.spi.deployment.Endpoint;
+
+import javax.management.ObjectName;
+import java.util.Iterator;
+
+/**
+ * Resolves Endpoints by Servlet name and web context path.
+ *
+ * @author Heiko.Braun at jboss.com
+ * Created: Jul 24, 2007
+ */
+public class WebAppResolver implements EndpointResolver
+{
+ private String contextPath;
+ private String servletName;
+
+ public WebAppResolver(String contextPath, String servletName)
+ {
+ this.contextPath = contextPath;
+ this.servletName = servletName;
+ }
+
+ public Endpoint query(Iterator<Endpoint> endpoints)
+ {
+ Endpoint endpoint = null;
+
+ if (contextPath.startsWith("/"))
+ contextPath = contextPath.substring(1);
+
+ while(endpoints.hasNext())
+ {
+ Endpoint auxEndpoint = endpoints.next();
+ ObjectName sepId = auxEndpoint.getName();
+ String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT);
+ String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT);
+ if (servletName.equals(propEndpoint) && contextPath.equals(propContext))
+ {
+ endpoint = auxEndpoint;
+ break;
+ }
+ }
+
+ return endpoint;
+ }
+}
Property changes on: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/native/src/main/resources/jbossws-native-config.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native-config.xml 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/integration/native/src/main/resources/jbossws-native-config.xml 2007-07-24 13:34:03 UTC (rev 3974)
@@ -51,7 +51,7 @@
<property name="provides">ContextProperties</property>
<property name="contextProperties">
<map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>ServletClass</key><value>org.jboss.wsf.stack.jbws.ServiceEndpointServlet</value></entry>
+ <entry><key>ServletClass</key><value>org.jboss.wsf.stack.jbws.EndpointServlet</value></entry>
</map>
</property>
</bean>
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointAssociation.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointAssociation.java 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointAssociation.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -1,53 +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.framework.invocation;
-
-import org.jboss.wsf.spi.deployment.Endpoint;
-
-// $Id$
-
-
-/**
- * Associates the endpoint meta data with the current thead.
- *
- * @author Thomas.Diesler at jboss.org
- * @since 10-May-2007
- */
-public final class EndpointAssociation
-{
- private static final ThreadLocal<Endpoint> endpoint = new ThreadLocal<Endpoint>();
-
- public static void setEndpoint(Endpoint ep)
- {
- endpoint.set(ep);
- }
-
- public static Endpoint getEndpoint()
- {
- return endpoint.get();
- }
-
- public static void removeEndpoint()
- {
- endpoint.remove();
- }
-}
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -1,108 +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.framework.invocation;
-
-// $Id$
-
-import org.jboss.wsf.common.ObjectNameFactory;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
-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.invocation.RequestHandler;
-import org.jboss.wsf.spi.management.EndpointRegistry;
-import org.jboss.wsf.spi.management.EndpointRegistryFactory;
-
-import javax.management.ObjectName;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.ws.WebServiceException;
-import java.io.IOException;
-
-/**
- * The JAX-WS dispatcher servlet.
- *
- * @author WS Development Team
- * @author Thomas.Diesler at jboss.org
- * @since 10-May-2007
- */
-public class EndpointServlet extends HttpServlet
-{
- protected Endpoint endpoint;
- protected EndpointRegistry epRegistry;
-
- public void init(ServletConfig servletConfig) throws ServletException
- {
- super.init(servletConfig);
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).createEndpointRegistry();
- }
-
- public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
- {
- if (endpoint == null)
- {
- String contextPath = req.getContextPath();
- initServiceEndpoint(contextPath);
- }
-
- try
- {
- EndpointAssociation.setEndpoint(endpoint);
- RequestHandler requestHandler = endpoint.getRequestHandler();
- requestHandler.handleHttpRequest(endpoint, req, res, getServletContext());
- }
- finally
- {
- EndpointAssociation.removeEndpoint();
- }
- }
-
- /** Initialize the service endpoint
- */
- protected void initServiceEndpoint(String contextPath)
- {
- WebAppResolver resolver = new WebAppResolver(contextPath, getServletName());
- this.endpoint = epRegistry.resolve(resolver);
-
- if (this.endpoint == null)
- {
- ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" +
- Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," +
- Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + getServletName()
- );
- throw new WebServiceException("Cannot obtain endpoint for: " + oname);
- }
-
- // Set the runtime classloader for JSE endpoints, this should be the tomcat classloader
- Deployment dep = endpoint.getService().getDeployment();
- if (dep.getType() == DeploymentType.JAXRPC_JSE || dep.getType() == DeploymentType.JAXWS_JSE)
- {
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- dep.setRuntimeClassLoader(classLoader);
- }
- }
-}
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebAppResolver.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebAppResolver.java 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebAppResolver.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -1,69 +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.framework.invocation;
-
-import org.jboss.wsf.spi.management.EndpointResolver;
-import org.jboss.wsf.spi.deployment.Endpoint;
-
-import javax.management.ObjectName;
-import java.util.Iterator;
-
-/**
- * Resolves Endpoints by Servlet name and web context path.
- *
- * @author Heiko.Braun at jboss.com
- * Created: Jul 24, 2007
- */
-public class WebAppResolver implements EndpointResolver
-{
- private String contextPath;
- private String servletName;
-
- public WebAppResolver(String contextPath, String servletName)
- {
- this.contextPath = contextPath;
- this.servletName = servletName;
- }
-
- public Endpoint query(Iterator<Endpoint> endpoints)
- {
- Endpoint endpoint = null;
-
- if (contextPath.startsWith("/"))
- contextPath = contextPath.substring(1);
-
- while(endpoints.hasNext())
- {
- Endpoint auxEndpoint = endpoints.next();
- ObjectName sepId = auxEndpoint.getName();
- String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT);
- String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT);
- if (servletName.equals(propEndpoint) && contextPath.equals(propContext))
- {
- endpoint = auxEndpoint;
- break;
- }
- }
-
- return endpoint;
- }
-}
Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointAssociation.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointAssociation.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointAssociation.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -0,0 +1,53 @@
+/*
+ * 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.deployment.Endpoint;
+
+// $Id$
+
+
+/**
+ * Associates the endpoint meta data with the current thead.
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 10-May-2007
+ */
+public final class EndpointAssociation
+{
+ private static final ThreadLocal<Endpoint> endpoint = new ThreadLocal<Endpoint>();
+
+ public static void setEndpoint(Endpoint ep)
+ {
+ endpoint.set(ep);
+ }
+
+ public static Endpoint getEndpoint()
+ {
+ return endpoint.get();
+ }
+
+ public static void removeEndpoint()
+ {
+ endpoint.remove();
+ }
+}
Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointAssociation.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointServlet.java
===================================================================
--- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointServlet.java (rev 0)
+++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointServlet.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -0,0 +1,103 @@
+/*
+ * 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.sunri;
+
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.management.EndpointRegistry;
+import org.jboss.wsf.spi.management.EndpointRegistryFactory;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.invocation.RequestHandler;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
+import org.jboss.wsf.common.ObjectNameFactory;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServlet;
+import javax.management.ObjectName;
+import javax.xml.ws.WebServiceException;
+import java.io.IOException;
+
+/**
+ * @author Heiko.Braun at jboss.com
+ * Created: Jul 24, 2007
+ */
+public class EndpointServlet extends HttpServlet
+{
+ protected Endpoint endpoint;
+ protected EndpointRegistry epRegistry;
+
+ public void init(ServletConfig servletConfig) throws ServletException
+ {
+ super.init(servletConfig);
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).createEndpointRegistry();
+ }
+
+ public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+ {
+ if (endpoint == null)
+ {
+ String contextPath = req.getContextPath();
+ initServiceEndpoint(contextPath);
+ }
+
+ try
+ {
+ EndpointAssociation.setEndpoint(endpoint);
+ RequestHandler requestHandler = endpoint.getRequestHandler();
+ requestHandler.handleHttpRequest(endpoint, req, res, getServletContext());
+ }
+ finally
+ {
+ EndpointAssociation.removeEndpoint();
+ }
+ }
+
+ /** Initialize the service endpoint
+ */
+ protected void initServiceEndpoint(String contextPath)
+ {
+ WebAppResolver resolver = new WebAppResolver(contextPath, getServletName());
+ this.endpoint = epRegistry.resolve(resolver);
+
+ if (this.endpoint == null)
+ {
+ ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" +
+ Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," +
+ Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + getServletName()
+ );
+ throw new WebServiceException("Cannot obtain endpoint for: " + oname);
+ }
+
+ // Set the runtime classloader for JSE endpoints, this should be the tomcat classloader
+ Deployment dep = endpoint.getService().getDeployment();
+ if (dep.getType() == Deployment.DeploymentType.JAXRPC_JSE || dep.getType() == Deployment.DeploymentType.JAXWS_JSE)
+ {
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ dep.setRuntimeClassLoader(classLoader);
+ }
+ }
+}
Property changes on: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointServlet.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java
===================================================================
--- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -31,7 +31,7 @@
import javax.xml.ws.handler.MessageContext;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.framework.invocation.EndpointAssociation;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
import org.jboss.wsf.spi.invocation.Invocation;
import org.jboss.wsf.spi.invocation.InvocationHandler;
Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerJSE.java
===================================================================
--- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerJSE.java 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerJSE.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -30,7 +30,7 @@
import javax.xml.ws.WebServiceException;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.framework.invocation.EndpointAssociation;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
import org.jboss.wsf.spi.invocation.Invocation;
import org.jboss.wsf.spi.invocation.InvocationContext;
import org.jboss.wsf.spi.invocation.InvocationHandler;
Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java
===================================================================
--- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -34,7 +34,6 @@
import javax.xml.ws.WebServiceException;
import org.jboss.logging.Logger;
-import org.jboss.util.NotImplementedException;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.invocation.InvocationContext;
import org.jboss.wsf.spi.invocation.RequestHandler;
@@ -88,11 +87,11 @@
public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext context)
{
- throw new NotImplementedException();
+ throw new IllegalArgumentException("Not implemented");
}
public void handleWSDLRequest(Endpoint endpoint, OutputStream outStream, InvocationContext context)
{
- throw new NotImplementedException();
+ throw new IllegalArgumentException("Not implemented");
}
}
Added: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppResolver.java
===================================================================
--- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppResolver.java (rev 0)
+++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppResolver.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -0,0 +1,69 @@
+/*
+ * 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.sunri;
+
+import org.jboss.wsf.spi.management.EndpointResolver;
+import org.jboss.wsf.spi.deployment.Endpoint;
+
+import javax.management.ObjectName;
+import java.util.Iterator;
+
+/**
+ * Resolves Endpoints by Servlet name and web context path.
+ *
+ * @author Heiko.Braun at jboss.com
+ * Created: Jul 24, 2007
+ */
+public class WebAppResolver implements EndpointResolver
+{
+ private String contextPath;
+ private String servletName;
+
+ public WebAppResolver(String contextPath, String servletName)
+ {
+ this.contextPath = contextPath;
+ this.servletName = servletName;
+ }
+
+ public Endpoint query(Iterator<Endpoint> endpoints)
+ {
+ Endpoint endpoint = null;
+
+ if (contextPath.startsWith("/"))
+ contextPath = contextPath.substring(1);
+
+ while(endpoints.hasNext())
+ {
+ Endpoint auxEndpoint = endpoints.next();
+ ObjectName sepId = auxEndpoint.getName();
+ String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT);
+ String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT);
+ if (servletName.equals(propEndpoint) && contextPath.equals(propContext))
+ {
+ endpoint = auxEndpoint;
+ break;
+ }
+ }
+
+ return endpoint;
+ }
+}
Property changes on: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppResolver.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/sunri/src/main/resources/jbossws-sunri-config.xml
===================================================================
--- trunk/integration/sunri/src/main/resources/jbossws-sunri-config.xml 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/integration/sunri/src/main/resources/jbossws-sunri-config.xml 2007-07-24 13:34:03 UTC (rev 3974)
@@ -67,7 +67,7 @@
<property name="provides">ContextProperties</property>
<property name="contextProperties">
<map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>ServletClass</key><value>org.jboss.wsf.framework.invocation.EndpointServlet</value></entry>
+ <entry><key>ServletClass</key><value>org.jboss.wsf.stack.sunri.EndpointServlet</value></entry>
<entry><key>ServletContextListener</key><value>org.jboss.wsf.stack.sunri.WSServletContextListenerJBWS</value></entry>
</map>
</property>
Modified: trunk/integration/xfire/int-xfire.iml
===================================================================
--- trunk/integration/xfire/int-xfire.iml 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/integration/xfire/int-xfire.iml 2007-07-24 13:34:03 UTC (rev 3974)
@@ -10,6 +10,24 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="spi" />
<orderEntry type="library" name="jboss-logging-spi" level="project" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../spi/thirdparty/servlet-api.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <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: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServletExt.java
===================================================================
--- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServletExt.java 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServletExt.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -40,7 +40,7 @@
import org.apache.cxf.transport.servlet.ServletTransportFactory;
import org.jboss.logging.Logger;
import org.jboss.wsf.common.ObjectNameFactory;
-import org.jboss.wsf.framework.invocation.EndpointAssociation;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.management.EndpointRegistry;
Added: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointServlet.java
===================================================================
--- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointServlet.java (rev 0)
+++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointServlet.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -0,0 +1,103 @@
+/*
+ * 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.xfire;
+
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.management.EndpointRegistry;
+import org.jboss.wsf.spi.management.EndpointRegistryFactory;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.invocation.RequestHandler;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
+import org.jboss.wsf.common.ObjectNameFactory;
+
+import javax.management.ObjectName;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.xml.ws.WebServiceException;
+import java.io.IOException;
+
+/**
+ * @author Heiko.Braun at jboss.com
+ * Created: Jul 24, 2007
+ */
+public class EndpointServlet extends HttpServlet
+{
+ protected Endpoint endpoint;
+ protected EndpointRegistry epRegistry;
+
+ public void init(ServletConfig servletConfig) throws ServletException
+ {
+ super.init(servletConfig);
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).createEndpointRegistry();
+ }
+
+ public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+ {
+ if (endpoint == null)
+ {
+ String contextPath = req.getContextPath();
+ initServiceEndpoint(contextPath);
+ }
+
+ try
+ {
+ EndpointAssociation.setEndpoint(endpoint);
+ RequestHandler requestHandler = endpoint.getRequestHandler();
+ requestHandler.handleHttpRequest(endpoint, req, res, getServletContext());
+ }
+ finally
+ {
+ EndpointAssociation.removeEndpoint();
+ }
+ }
+
+ /** Initialize the service endpoint
+ */
+ protected void initServiceEndpoint(String contextPath)
+ {
+ WebAppResolver resolver = new WebAppResolver(contextPath, getServletName());
+ this.endpoint = epRegistry.resolve(resolver);
+
+ if (this.endpoint == null)
+ {
+ ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" +
+ Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," +
+ Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + getServletName()
+ );
+ throw new WebServiceException("Cannot obtain endpoint for: " + oname);
+ }
+
+ // Set the runtime classloader for JSE endpoints, this should be the tomcat classloader
+ Deployment dep = endpoint.getService().getDeployment();
+ if (dep.getType() == Deployment.DeploymentType.JAXRPC_JSE || dep.getType() == Deployment.DeploymentType.JAXWS_JSE)
+ {
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ dep.setRuntimeClassLoader(classLoader);
+ }
+ }
+}
Property changes on: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointServlet.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java
===================================================================
--- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -34,7 +34,7 @@
import org.apache.cxf.service.invoker.Invoker;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.framework.invocation.EndpointAssociation;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
import org.jboss.wsf.spi.invocation.Invocation;
import org.jboss.wsf.spi.invocation.InvocationContext;
import org.jboss.wsf.spi.invocation.InvocationHandler;
Added: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppResolver.java
===================================================================
--- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppResolver.java (rev 0)
+++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppResolver.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -0,0 +1,69 @@
+/*
+ * 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.xfire;
+
+import org.jboss.wsf.spi.management.EndpointResolver;
+import org.jboss.wsf.spi.deployment.Endpoint;
+
+import javax.management.ObjectName;
+import java.util.Iterator;
+
+/**
+ * Resolves Endpoints by Servlet name and web context path.
+ *
+ * @author Heiko.Braun at jboss.com
+ * Created: Jul 24, 2007
+ */
+public class WebAppResolver implements EndpointResolver
+{
+ private String contextPath;
+ private String servletName;
+
+ public WebAppResolver(String contextPath, String servletName)
+ {
+ this.contextPath = contextPath;
+ this.servletName = servletName;
+ }
+
+ public Endpoint query(Iterator<Endpoint> endpoints)
+ {
+ Endpoint endpoint = null;
+
+ if (contextPath.startsWith("/"))
+ contextPath = contextPath.substring(1);
+
+ while(endpoints.hasNext())
+ {
+ Endpoint auxEndpoint = endpoints.next();
+ ObjectName sepId = auxEndpoint.getName();
+ String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT);
+ String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT);
+ if (servletName.equals(propEndpoint) && contextPath.equals(propContext))
+ {
+ endpoint = auxEndpoint;
+ break;
+ }
+ }
+
+ return endpoint;
+ }
+}
Property changes on: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppResolver.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/jbossws-core/src/test/resources/jaxrpc/jbws124/WEB-INF/web.xml
===================================================================
--- trunk/jbossws-core/src/test/resources/jaxrpc/jbws124/WEB-INF/web.xml 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws124/WEB-INF/web.xml 2007-07-24 13:34:03 UTC (rev 3974)
@@ -8,7 +8,7 @@
<!-- Test that we can deploy an already modified web.xml -->
<servlet>
<servlet-name>Hello</servlet-name>
- <servlet-class>org.jboss.wsf.stack.jbws.ServiceEndpointServlet</servlet-class>
+ <servlet-class>org.jboss.wsf.stack.jbws.EndpointServlet</servlet-class>
<init-param>
<param-name>jboss.ws.endpoint</param-name>
<param-value>org.jboss.test.ws.jaxrpc.jbws124.HelloJavaBean</param-value>
More information about the jbossws-commits
mailing list