[jbossws-commits] JBossWS SVN: r3972 - in trunk: integration/native/src/main/java/org/jboss/wsf/stack/jbws and 4 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Jul 24 08:30:16 EDT 2007
Author: heiko.braun at jboss.com
Date: 2007-07-24 08:30:15 -0400 (Tue, 24 Jul 2007)
New Revision: 3972
Added:
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebAppResolver.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentResolver.java
Removed:
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/PortComponentResolver.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/RegistryComponent.java
Modified:
trunk/JBossWS-Trunk.iws
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistry.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointResolver.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java
Log:
Introduce EndpointResolver API
Modified: trunk/JBossWS-Trunk.iws
===================================================================
--- trunk/JBossWS-Trunk.iws 2007-07-24 09:32:33 UTC (rev 3971)
+++ trunk/JBossWS-Trunk.iws 2007-07-24 12:30:15 UTC (rev 3972)
@@ -186,6 +186,32 @@
<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">
+ <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>
+ <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>
@@ -241,74 +267,80 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="WSServletContextListenerJBWS.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerJBWS.java">
+ <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="67" column="0" selection-start="2558" selection-end="2558" vertical-scroll-proportion="0.5031056">
+ <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="DeploymentAspectManagerFactoryImpl.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectManagerFactoryImpl.java">
+ <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="46" column="0" selection-start="1907" selection-end="1907" vertical-scroll-proportion="0.5365854">
+ <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="WSServletContextListenerExt.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerExt.java">
+ <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="0" selection-start="4060" selection-end="4060" vertical-scroll-proportion="0.1863354">
- <folding />
+ <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="NativeMethodAccessorImpl.class" pinned="false" current="false" current-in-tab="false">
- <entry file="jar:///usr/local/jdk/64/jdk1.5.0_11/jre/lib/rt.jar!/sun/reflect/NativeMethodAccessorImpl.class">
+ <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="14" column="0" selection-start="433" selection-end="433" vertical-scroll-proportion="0.32298136">
+ <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="WebAppGeneratorDeploymentAspect.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java">
+ <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="82" column="0" selection-start="2991" selection-end="2991" vertical-scroll-proportion="0.1863354">
+ <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="SunJaxwsDeploymentAspect.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java">
+ <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="50" column="0" selection-start="1832" selection-end="1832" vertical-scroll-proportion="0.1863354">
- <folding />
+ <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="AbstractDeployerHook.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java">
+ <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="74" column="0" selection-start="2569" selection-end="2569" vertical-scroll-proportion="0.19378883">
+ <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="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">
+ <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="39" column="0" selection-start="1518" selection-end="1518" vertical-scroll-proportion="0.19378883">
- <folding />
+ <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>
@@ -344,8 +376,8 @@
<setting name="SHOW_AS_DEPLOYMENT_VIEW" value="false" />
</component>
<component name="ModuleEditorState">
- <option name="LAST_EDITED_MODULE_NAME" value="int-42" />
- <option name="LAST_EDITED_TAB_NAME" value="Libraries (Classpath)" />
+ <option name="LAST_EDITED_MODULE_NAME" value="int-native" />
+ <option name="LAST_EDITED_TAB_NAME" value="Dependencies" />
</component>
<component name="NamedScopeManager" />
<component name="PackagesPane">
@@ -453,7 +485,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="int-xfire" />
+ <option name="myItemId" value="spi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
</PATH>
@@ -463,11 +495,11 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="int-xfire" />
+ <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/xfire" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -477,41 +509,31 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="int-xfire" />
+ <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/xfire" />
+ <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/xfire/src" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- </PATH>
- <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="JBossWS-Trunk.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="int-xfire" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire" />
+ <option name="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/xfire/src" />
+ <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/xfire/src/main" />
+ <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/xfire/src/main/resources" />
+ <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>
@@ -521,35 +543,35 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="int-xfire" />
+ <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/xfire" />
+ <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/xfire/src" />
+ <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/xfire/src/main" />
+ <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/xfire/src/main/resources" />
+ <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/xfire/src/main/resources/jbossws-xfire.jar" />
+ <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/xfire/src/main/resources/jbossws-xfire.jar/META-INF" />
+ <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/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services" />
+ <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>
@@ -559,49 +581,39 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="int-xfire" />
+ <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/xfire" />
+ <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/xfire/src" />
+ <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/xfire/src/main" />
+ <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/xfire/src/main/java" />
+ <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/xfire/src/main/java/org/jboss/wsf/stack/xfire" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- </PATH>
- <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="JBossWS-Trunk.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="int-xfire" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire" />
+ <option name="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/xfire/src" />
+ <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/xfire/src/main" />
+ <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>
@@ -611,65 +623,35 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="int-sunri" />
+ <option name="myItemId" value="spi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
- </PATH>
- <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="JBossWS-Trunk.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="int-sunri" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/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="int-sunri" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri" />
+ <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/sunri/src" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- </PATH>
- <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="JBossWS-Trunk.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="int-sunri" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri" />
+ <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/sunri/src" />
+ <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/sunri/src/main" />
+ <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/sunri/src/main/resources" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -679,37 +661,41 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="int-sunri" />
+ <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/sunri" />
+ <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/sunri/src" />
+ <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/sunri/src/main" />
+ <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/sunri/src/main/resources" />
+ <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/sunri/src/main/resources/jbossws-sunri.jar" />
+ <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/sunri/src/main/resources/jbossws-sunri.jar/META-INF" />
+ <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/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -717,27 +703,27 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="int-sunri" />
+ <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/sunri" />
+ <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/sunri/src" />
+ <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/sunri/src/main" />
+ <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/sunri/src/main/java" />
+ <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/sunri/src/main/java/org/jboss/wsf/stack/sunri" />
+ <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>
@@ -747,19 +733,19 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="int-sunri" />
+ <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/sunri" />
+ <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/sunri/src" />
+ <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/sunri/src/main" />
+ <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>
@@ -796,6 +782,8 @@
</component>
<component name="RecentsManager">
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
+ <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" />
@@ -925,7 +913,7 @@
<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.33600494" order="0" />
+ <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="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" />
@@ -1011,115 +999,119 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.deployment.LifecycleHandlerFactory">
+ <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistry.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="62" selection-start="35" selection-end="62" vertical-scroll-proportion="0.0">
+ <state line="39" column="13" selection-start="1457" selection-end="1457" vertical-scroll-proportion="0.3096647">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory">
+ <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="51" selection-start="26" selection-end="51" vertical-scroll-proportion="0.0">
+ <state line="189" column="89" selection-start="8285" selection-end="8285" vertical-scroll-proportion="0.20372671">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java">
+ <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="55" column="3" selection-start="2045" selection-end="2045" vertical-scroll-proportion="0.44720498">
+ <state line="81" column="80" selection-start="3425" selection-end="3425" vertical-scroll-proportion="0.4878049">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerFactoryImpl.java">
+ <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistry.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="26" selection-start="1386" selection-end="1386" vertical-scroll-proportion="0.34146342">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory">
- <provider selected="true" editor-type-id="text-editor">
- <state line="0" column="47" selection-start="47" selection-end="47" vertical-scroll-proportion="0.0">
+ <state line="58" column="0" selection-start="2118" selection-end="2118" vertical-scroll-proportion="0.29268292">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java">
+ <entry file="file://$PROJECT_DIR$/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="52" column="3" selection-start="1942" selection-end="1942" vertical-scroll-proportion="0.44720498">
+ <state line="21" column="40" selection-start="1040" selection-end="1072" vertical-scroll-proportion="0.023809524">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerFactoryImpl.java">
+ <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentResolver.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="22" selection-start="1382" selection-end="1382" vertical-scroll-proportion="0.34146342">
+ <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://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java">
+ <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="74" column="0" selection-start="2569" selection-end="2569" vertical-scroll-proportion="0.19378883">
+ <state line="177" column="0" selection-start="6879" selection-end="6879" vertical-scroll-proportion="0.18902439">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java">
+ <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="39" column="0" selection-start="1518" selection-end="1518" vertical-scroll-proportion="0.19378883">
+ <state line="40" column="17" selection-start="1544" selection-end="1544" vertical-scroll-proportion="-1.8780488">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectManagerFactoryImpl.java">
+ <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="46" column="0" selection-start="1907" selection-end="1907" vertical-scroll-proportion="0.5365854">
- <folding />
+ <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>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java">
+ <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="82" column="0" selection-start="2991" selection-end="2991" vertical-scroll-proportion="0.1863354">
- <folding />
+ <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>
- <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerJBWS.java">
+ <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="67" column="0" selection-start="2558" selection-end="2558" vertical-scroll-proportion="0.5031056">
+ <state line="61" column="0" selection-start="2164" selection-end="2164" vertical-scroll-proportion="0.18902439">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerExt.java">
+ <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="107" column="0" selection-start="4060" selection-end="4060" vertical-scroll-proportion="0.1863354">
+ <state line="67" column="28" selection-start="2753" selection-end="2753" vertical-scroll-proportion="0.4390244">
<folding />
</state>
</provider>
</entry>
- <entry file="jar:///usr/local/jdk/64/jdk1.5.0_11/jre/lib/rt.jar!/sun/reflect/NativeMethodAccessorImpl.class">
+ <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="0" selection-start="433" selection-end="433" vertical-scroll-proportion="0.32298136">
+ <state line="52" column="13" selection-start="1869" selection-end="1869" vertical-scroll-proportion="0.09756097">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java">
+ <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="50" column="0" selection-start="1832" selection-end="1832" vertical-scroll-proportion="0.1863354">
+ <state line="37" column="3" selection-start="1400" selection-end="1400" vertical-scroll-proportion="0.17073171">
<folding />
</state>
</provider>
</entry>
+ <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>
</component>
</project>
Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistry.java
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistry.java 2007-07-24 09:32:33 UTC (rev 3971)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistry.java 2007-07-24 12:30:15 UTC (rev 3972)
@@ -57,44 +57,6 @@
return UnifiedMetaData.getImplementationVersion();
}
- /** Resolve a port-component-link, like:
- *
- * [deployment.war]#PortComponentName
- * [deployment.jar]#PortComponentName
- *
- */
- public Endpoint resolvePortComponentLink(String pcLink)
- {
- String pcName = pcLink;
- int hashIndex = pcLink.indexOf("#");
- if (hashIndex > 0)
- {
- pcName = pcLink.substring(hashIndex + 1);
- }
-
- Endpoint endpoint = null;
- for (ObjectName sepID : getEndpoints())
- {
- Endpoint auxEndpoint = getEndpoint(sepID);
- ServerEndpointMetaData sepMetaData = auxEndpoint.getAttachment(ServerEndpointMetaData.class);
- if (pcName.equals(sepMetaData.getPortComponentName()))
- {
- if (endpoint != null)
- {
- log.warn("Multiple service endoints found for: " + pcLink);
- endpoint = null;
- break;
- }
- endpoint = auxEndpoint;
- }
- }
-
- if (endpoint == null)
- log.warn("No ServiceEndpoint found for pcLink: " + pcLink);
-
- return endpoint;
- }
-
@Override
public void register(Endpoint endpoint)
{
Modified: 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 09:32:33 UTC (rev 3971)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java 2007-07-24 12:30:15 UTC (rev 3972)
@@ -23,7 +23,15 @@
// $Id$
-import java.io.IOException;
+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;
@@ -32,18 +40,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.xml.ws.WebServiceException;
+import java.io.IOException;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import org.jboss.wsf.spi.management.EndpointRegistry;
-import org.jboss.wsf.spi.management.EndpointRegistryFactory;
-import org.jboss.wsf.common.ObjectNameFactory;
-import org.jboss.wsf.spi.invocation.RequestHandler;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.framework.invocation.EndpointAssociation;
-
/**
* The JAX-WS dispatcher servlet.
*
@@ -74,7 +72,7 @@
try
{
EndpointAssociation.setEndpoint(endpoint);
- RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler();
+ RequestHandler requestHandler = endpoint.getRequestHandler();
requestHandler.handleHttpRequest(endpoint, req, res, getServletContext());
}
finally
@@ -87,25 +85,15 @@
*/
protected void initServiceEndpoint(String contextPath)
{
- if (contextPath.startsWith("/"))
- contextPath = contextPath.substring(1);
+ WebAppResolver resolver = new WebAppResolver(contextPath, getServletName());
+ this.endpoint = epRegistry.resolve(resolver);
- String servletName = getServletName();
- for (ObjectName sepId : epRegistry.getEndpoints())
+ if (this.endpoint == null)
{
- String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT);
- String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT);
- if (servletName.equals(propEndpoint) && contextPath.equals(propContext))
- {
- endpoint = epRegistry.getEndpoint(sepId);
- break;
- }
- }
-
- if (endpoint == null)
- {
- ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + ","
- + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName);
+ 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);
}
Added: 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 (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebAppResolver.java 2007-07-24 12:30:15 UTC (rev 3972)
@@ -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.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;
+ }
+}
Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebAppResolver.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java 2007-07-24 09:32:33 UTC (rev 3971)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java 2007-07-24 12:30:15 UTC (rev 3972)
@@ -57,9 +57,9 @@
return endpoint;
}
- public Endpoint resolvePortComponentLink(String pcLink)
+ public Endpoint resolve(EndpointResolver resolver)
{
- throw new IllegalArgumentException("Not implemented");
+ return resolver.query(endpoints.values().iterator());
}
public boolean isRegistered(ObjectName epName)
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java 2007-07-24 09:32:33 UTC (rev 3971)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java 2007-07-24 12:30:15 UTC (rev 3972)
@@ -34,6 +34,8 @@
* A general endpoint registry.
*
* @author Thomas.Diesler at jboss.com
+ * @author Heiko.Braun at jboss.com
+ *
* @since 20-Apr-2007
*/
public interface EndpointRegistry
@@ -49,10 +51,10 @@
/** Get the registered endpoint */
Endpoint getEndpoint(ObjectName epName);
+
+ /** Resolve endpoints thrrough a resolve instance **/
+ Endpoint resolve(EndpointResolver resolver);
- /** Resolve a port component link */
- Endpoint resolvePortComponentLink(String pcLink);
-
/** True is an endpoint for that name is registered */
boolean isRegistered(ObjectName epName);
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointResolver.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointResolver.java 2007-07-24 09:32:33 UTC (rev 3971)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointResolver.java 2007-07-24 12:30:15 UTC (rev 3972)
@@ -23,12 +23,13 @@
import org.jboss.wsf.spi.deployment.Endpoint;
+import java.util.Iterator;
+
/**
* @author Heiko.Braun at jboss.com
* Created: Jul 23, 2007
*/
public interface EndpointResolver
{
- Endpoint getResult();
- void setResult(Endpoint result);
+ Endpoint query(Iterator<Endpoint> endpoints);
}
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/PortComponentResolver.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/PortComponentResolver.java 2007-07-24 09:32:33 UTC (rev 3971)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/PortComponentResolver.java 2007-07-24 12:30:15 UTC (rev 3972)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.spi.management;
-
-import org.jboss.wsf.spi.deployment.Endpoint;
-
-/**
- * @author Heiko.Braun at jboss.com
- * Created: Jul 23, 2007
- */
-public class PortComponentResolver implements EndpointResolver
-{
- private String pcref;
- private Endpoint result;
-
- public PortComponentResolver(String pcref)
- {
- this.pcref = pcref;
- }
-
- public String getPcref()
- {
- return pcref;
- }
-
- public void setResult(Endpoint result)
- {
- this.result = result;
- }
-
- public Endpoint getResult()
- {
- return this.result;
- }
-}
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/RegistryComponent.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/RegistryComponent.java 2007-07-24 09:32:33 UTC (rev 3971)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/RegistryComponent.java 2007-07-24 12:30:15 UTC (rev 3972)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.spi.management;
-
-import org.jboss.wsf.spi.deployment.Endpoint;
-
-/**
- * Allows endpoint registry composition
- *
- * @author Heiko.Braun at jboss.com
- * Created: Jul 23, 2007
- */
-public interface RegistryComponent
-{
- /** Register an endpoint */
- void register(Endpoint endpoint);
-
- /** Unregister an endpoint */
- void unregister(Endpoint endpoint);
-
- /** Resolve a port component link */
- void resolve(EndpointResolver resolver);
-}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java 2007-07-24 09:32:33 UTC (rev 3971)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java 2007-07-24 12:30:15 UTC (rev 3972)
@@ -52,6 +52,7 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.client.ServiceObjectFactory;
+import org.jboss.ws.core.server.PortComponentResolver;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
@@ -186,7 +187,7 @@
{
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
EndpointRegistry epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).createEndpointRegistry();
- Endpoint endpoint = epRegistry.resolvePortComponentLink(pcLink);
+ Endpoint endpoint = epRegistry.resolve( new PortComponentResolver(pcLink) );
if (endpoint == null)
throw new WSException("Cannot resolve port-component-link: " + pcLink);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java 2007-07-24 09:32:33 UTC (rev 3971)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java 2007-07-24 12:30:15 UTC (rev 3972)
@@ -79,7 +79,7 @@
if (pcLink == null)
throw new IllegalArgumentException("Cannot obtain request parameter 'pcLink'");
- Endpoint endpoint = epRegistry.resolvePortComponentLink(pcLink);
+ Endpoint endpoint = epRegistry.resolve( new PortComponentResolver(pcLink) );
if (endpoint == null)
throw new WSException("Cannot resolve port-component-link: " + pcLink);
Added: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentResolver.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentResolver.java (rev 0)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentResolver.java 2007-07-24 12:30:15 UTC (rev 3972)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.core.server;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.management.EndpointResolver;
+
+import java.util.Iterator;
+
+/**
+ * @author Heiko.Braun at jboss.com
+ * Created: Jul 23, 2007
+ */
+public class PortComponentResolver implements EndpointResolver
+{
+ private static final Logger log = Logger.getLogger(PortComponentResolver.class);
+
+ private String pcLink;
+ private Endpoint result;
+
+ public PortComponentResolver(String pcref)
+ {
+ this.pcLink = pcref;
+ }
+
+ public Endpoint query(Iterator<Endpoint> endpoints)
+ {
+ Endpoint endpoint = null;
+
+ String pcName = this.pcLink;
+ int hashIndex = this.pcLink.indexOf("#");
+ if (hashIndex > 0)
+ {
+ pcName = pcLink.substring(hashIndex + 1);
+ }
+
+ while(endpoints.hasNext())
+ {
+ Endpoint auxEndpoint = endpoints.next();
+ ServerEndpointMetaData sepMetaData = auxEndpoint.getAttachment(ServerEndpointMetaData.class);
+ if (pcName.equals(sepMetaData.getPortComponentName()))
+ {
+ if (endpoint != null)
+ {
+ log.warn("Multiple service endoints found for: " + pcLink);
+ endpoint = null;
+ break;
+ }
+ endpoint = auxEndpoint;
+ }
+
+ }
+
+ return endpoint;
+ }
+
+}
Property changes on: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentResolver.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
More information about the jbossws-commits
mailing list